Fix debug patches, which were not correctly applied.

Submitted by:	Hiromi Kimura <hiromi@tac.tsukuba.ac.jp>

34 files changed, 255 insertions, 255 deletions

diff --git a/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-3/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-1.1-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-1.1/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-1.1/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2-RC/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2.0-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2.0/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2.0/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-3-RC/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-RC/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-3-devel/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-3/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-3/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c
index 96c651c..b6e2fd5 100644
--- a/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-vcltesttool/files/debugpatch-setup2+mow+source+loader+loader.c
@@ -1,15 +1,15 @@
 --- ../setup2/mow/source/loader/loader.c.orig2	Thu Jun  6 11:23:17 2002
 +++ ../setup2/mow/source/loader/loader.c	Thu Jun  6 11:24:14 2002
-@@ -902,6 +902,7 @@
+@@ -1055,6 +1055,7 @@
  
  void KillSetupDir()
  {
 +#if 0
-     DIR* pDir = opendir( strTmpPath );
+     DIR* pDir;
      struct dirent* pFile;
  
-@@ -915,6 +916,10 @@
- 
+@@ -1074,6 +1075,10 @@
+     closedir( pDir );
      chdir( strInitPath );
      rmdir( strTmpPath );
 +#else
diff --git a/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk
index 52bd2b3..42dde35 100644
--- a/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-vcltesttool/files/debugpatch-solenv+inc+unxfbsdi.mk
@@ -1,18 +1,18 @@
 --- ../solenv/inc/unxfbsdi.mk.orig	Mon Jul 22 00:40:56 2002
 +++ ../solenv/inc/unxfbsdi.mk	Mon Jul 22 00:42:02 2002
-@@ -25,12 +25,12 @@
- .ENDIF
+@@ -92,12 +92,12 @@
+ CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
  
- # flags for C and C++ Compiler
--CFLAGS+=-w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
-+CFLAGS+=-g -ggdb -w -c $(INCLUDE) -I$(SOLARENV)/unxfbsdi/usr/include
- CFLAGS+=-I/usr/X11R6/include
+ # flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
++CFLAGS+= -g -ggdb -w -c $(INCLUDE)
+ CFLAGS+= -I/usr/X11R6/include
  
  # flags for the C++ Compiler
--CFLAGSCC=-pipe
--CFLAGSCXX=-pipe -fno-for-scope -fpermissive
-+CFLAGSCC=-g -ggdb -pipe
-+CFLAGSCXX=-g -ggdb -pipe -fno-for-scope -fpermissive
+-CFLAGSCC= -pipe
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive
++CFLAGSCC= -g -ggdb -pipe
++CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive
  
  # Flags for enabling exception handling
- CFLAGSEXCEPTIONS=-fexceptions
+ CFLAGSEXCEPTIONS= -fexceptions