Upgrade to build 641d. More work is necessary to make the build compile.

There are still at least two different gcc bugs in our compiler, one
issue has already been found by Alexander Kabaev <ak03@gte.com>. He's
working on fixing the other.

18 files changed, 118 insertions, 250 deletions

diff --git a/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
index d9af910f9803..95774375ee91 100644
--- a/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
+++ b/editors/openoffice.org-2-RC/files/patch-bridges+prj+build.lst
@@ -1,10 +1,10 @@
---- ../bridges/prj/build.lst.orig	Tue Oct 30 17:28:35 2001
-+++ ../bridges/prj/build.lst	Mon Mar  4 21:43:05 2002
-@@ -13,5 +13,7 @@
+--- ../bridges/prj/build.lst.orig	Tue Mar 19 22:06:50 2002
++++ ../bridges/prj/build.lst	Wed Apr  3 00:15:02 2002
+@@ -9,6 +9,7 @@
+ br	bridges\source\cpp_uno\gcc2_linux_intel	nmake	-	u	br_gccli br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc2_freebsd_intel	nmake	-	u	br_gccfi br_unotypes NULL
++br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc2_linux_powerpc	nmake	-	u	br_gcclp br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc2_macosx_powerpc			nmake	-	u	br_gccmacoxp br_unotypes NULL
  br	bridges\source\cpp_uno\cc50_solaris_sparc			nmake	-	u	br_cc50sols br_unotypes NULL
- br	bridges\source\cpp_uno\cc50_solaris_intel			nmake	-	u	br_cc50soli br_unotypes NULL
- br	bridges\source\cpp_uno\gcc2_solaris_sparc			nmake	-	u	br_gccsols br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc2_freebsd_intel	nmake	-	u br_gccfi br_unotypes NULL
-+br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u br_gcc3fi br_unotypes NULL
- br	bridges\source\prot_uno					nmake	-	all	br_pruno br_unotypes NULL
- br	bridges\source\java_uno					nmake	-	all	br_java_uno br_rcon NULL
diff --git a/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk
index 9bca1b144e8f..997719c43dd8 100644
--- a/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-comphelper+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../comphelper/util/makefile.mk.orig	Tue Jan  1 14:08:53 2002
-+++ ../comphelper/util/makefile.mk
+--- ../comphelper/util/makefile.mk.orig	Tue Feb 19 13:26:37 2002
++++ ../comphelper/util/makefile.mk	Wed Apr  3 00:16:43 2002
 @@ -85,11 +85,11 @@
  
  SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
@@ -12,4 +12,4 @@
 -	$(SALLIB)					\
  	$(CPPRTLLIB)
  
- SHL1DEPN=
+ .IF "$(OS)$(CPU)"=="SOLARISS"
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
index 755c69de6129..c580d786d05c 100644
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Mon Nov 12 22:45:53 2001
-+++ configure.in	Sat Mar  9 23:08:27 2002
-@@ -98,6 +98,12 @@
+--- configure.in.orig	Wed Mar 27 20:32:56 2002
++++ configure.in	Tue Apr  2 23:56:37 2002
+@@ -103,6 +103,12 @@
  
                            Usage: --with-asm-home=<path to ml.exe directory>
  ],,)
@@ -13,7 +13,7 @@
  AC_ARG_WITH(unzip-home,
  [  --with-unzip-home         For Windows users, please supply the path for 
                            unzip.exe.
-@@ -225,13 +231,13 @@
+@@ -277,13 +283,13 @@
  
     if test $GCC; then
        AC_MSG_CHECKING([the GNU gcc compiler version])
@@ -29,24 +29,24 @@
 +         _gcc_version=`$CC --version`
        fi
        _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` 
-       if test "$_gcc_major" != "2"; then
-@@ -239,13 +245,13 @@
-          AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-          COMPATH="NO_GCC"
-       else
--         _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
-+         _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
-          if test "$_gcc_middle" = "false"; then
-             AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
-             AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-             COMPATH="NO_GCC"
-          else
--            _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
-+            _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
-             if test "$_gcc_minor" = "false"; then
-                AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
-                AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-@@ -306,7 +312,8 @@
+       if test -n "$enable_gcc3"; then 
+@@ -296,13 +302,13 @@
+            AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+            COMPATH="NO_GCC"
+         else
+-           _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
++           _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
+            if test "$_gcc_middle" = "false"; then
+               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
+               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+               COMPATH="NO_GCC"
+            else
+-              _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
++              _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
+               if test "$_gcc_minor" = "false"; then
+                  AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
+                  AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+@@ -367,7 +373,8 @@
                    fi
                 else
  		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
@@ -56,7 +56,7 @@
  		else
                    AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
                    AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
-@@ -740,6 +747,10 @@
+@@ -815,6 +822,10 @@
     fi
     if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
@@ -67,27 +67,12 @@
     fi
     if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-@@ -982,7 +993,7 @@
- 	HAVE_GPC_C="yes"
- fi
- 
--if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
-+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
- 	AC_MSG_RESULT([GPC files found])
- else
- 	AC_MSG_ERROR([GPC files not found])
-@@ -1084,12 +1095,13 @@
- echo "\$with_lang="$with_lang
- echo "\$with_asm_home="$with_asm_home
- echo "\$with_unzip_home="$with_unzip_home
-+echo "\$with_os_version="$with_os_version
- echo
- fi
+@@ -1182,7 +1193,7 @@
  
  # Executing the set_soenv script to setup the environment variables.
  if test -z "$enable_check_only"; then
--   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home
-+   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
+-   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
++   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
  else
     echo
     echo Test Complete
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
index f301dffa2c0d..c527767d4f3a 100644
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+makefile.mk
@@ -1,16 +1,6 @@
---- ../connectivity/source/drivers/mozab/makefile.mk.orig	Mon Dec  3 17:20:59 2001
-+++ ../connectivity/source/drivers/mozab/makefile.mk	Sun Mar  3 17:26:52 2002
-@@ -107,7 +107,9 @@
- 
- # --- MOZAB BASE Library -----------------------------------
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
-+.ENDIF
- SHL1TARGET=	$(TARGET)$(MOZAB_MAJOR)
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
-@@ -158,7 +160,9 @@
+--- ../connectivity/source/drivers/mozab/makefile.mk.orig	Mon Mar 11 16:07:41 2002
++++ ../connectivity/source/drivers/mozab/makefile.mk	Wed Apr  3 00:23:37 2002
+@@ -159,7 +159,9 @@
  
  # --- MOZAB BASE Library -----------------------------------
  
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
deleted file mode 100644
index 27086ca55940..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig	Fri Mar 15 19:10:28 2002
-+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk	Fri Mar 15 19:11:45 2002
-@@ -152,6 +152,10 @@
-             -Wno-long-long -pthread 
- CDEFS     += -DTRACING
- .ENDIF
-+.IF "$(OS)" == "FREEBSD"
-+CFLAGSCXX += \
-+            -fno-rtti
-+.ENDIF
- .ENDIF
- 
- SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
diff --git a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
deleted file mode 100644
index 3a34e92f0e55..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../connectivity/source/drivers/mozaddressbook/makefile.mk.orig	Sat Mar  2 20:58:59 2002
-+++ ../connectivity/source/drivers/mozaddressbook/makefile.mk	Sat Mar  2 20:59:41 2002
-@@ -134,7 +134,9 @@
- SLOFILES+=$(SLO)$/staticmbmozab.obj
- .ENDIF
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
-+.ENDIF
- # --- Library -----------------------------------
- 
- SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
index 59b78a3fd844..62e971de324a 100644
--- a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk
@@ -1,5 +1,5 @@
---- ../cppuhelper/source/makefile.mk.orig	Thu Mar  7 16:37:48 2002
-+++ ../cppuhelper/source/makefile.mk	Thu Mar  7 16:37:55 2002
+--- ../cppuhelper/source/makefile.mk.orig	Mon Mar 11 22:17:52 2002
++++ ../cppuhelper/source/makefile.mk	Wed Apr  3 00:31:19 2002
 @@ -149,8 +149,8 @@
  SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
  
@@ -11,8 +11,8 @@
  
  SHL1DEPN=
  SHL1IMPLIB=i$(TARGET)
-@@ -173,6 +173,10 @@
- SHL1VERSIONMAP=gcc2_linux_intel.map
+@@ -175,6 +175,10 @@
+ #SHL1VERSIONMAP=gcc2_freebsd_intel.map
  .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
  SHL1VERSIONMAP=gcc3_linux_intel.map
 +.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
diff --git a/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk b/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk
index fa2c7a4b769c..5881f5d7f6a5 100644
--- a/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-dtrans+source+X11+makefile.mk
@@ -1,6 +1,6 @@
---- ../dtrans/source/X11/makefile.mk.orig	Sat Mar  2 21:11:32 2002
-+++ ../dtrans/source/X11/makefile.mk	Sat Mar  2 21:12:34 2002
-@@ -111,7 +111,8 @@
+--- ../dtrans/source/X11/makefile.mk.orig	Tue Dec 11 18:48:36 2001
++++ ../dtrans/source/X11/makefile.mk	Wed Apr  3 00:31:56 2002
+@@ -116,7 +116,8 @@
  APP1STDLIBS=\
  		$(CPPULIB)			\
  		$(CPPUHELPERLIB)	\
diff --git a/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk
index 919c2b2e2fad..fb3c8af3e2b2 100644
--- a/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk
@@ -1,6 +1,6 @@
---- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
-+++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
-@@ -117,6 +117,15 @@
+--- ../product/util/makefile.mk.orig	Mon Mar 11 17:09:13 2002
++++ ../product/util/makefile.mk	Wed Apr  3 00:40:40 2002
+@@ -157,6 +157,15 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -16,18 +16,7 @@
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -373,8 +382,8 @@
- 	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
- 
- $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
--	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
--	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
-+	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
-+	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
- 
- 
- #---------------------------------------------------------
-@@ -385,7 +394,7 @@
+@@ -428,7 +437,7 @@
  
  $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
@@ -36,7 +25,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -393,7 +402,7 @@
+@@ -436,7 +445,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch
index 3b44b26ac6c7..61f12e5bfe7c 100644
--- a/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch
+++ b/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch
@@ -1,35 +1,25 @@
---- ../sablot/Sablot-0.52.patch.orig	Mon Oct 29 19:18:40 2001
-+++ ../sablot/Sablot-0.52.patch	Tue Mar  5 18:16:07 2002
+--- ../sablot/Sablot-0.52.patch.orig	Mon Mar 18 16:03:02 2002
++++ ../sablot/Sablot-0.52.patch	Wed Apr  3 00:52:54 2002
 @@ -3,7 +3,7 @@
  ***************
  *** 1 ****
  ! dummy
----- 1,147 ----
-+--- 1,157 ----
+---- 1,151 ----
++--- 1,156 ----
  ! #*************************************************************************
  ! #
  ! #   $RCSfile: makefile.mk,v $
-@@ -85,12 +85,22 @@
- ! CFLAGS+=     -DHAVE_IEEEFP_H
- ! .ENDIF
- ! 
--! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
-+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- ! CFLAGS+=      -DHAVE_UNISTD_H
+@@ -90,8 +90,13 @@
  ! .ENDIF
  ! 
  ! .IF "$(GUI)"=="UNX"
-+!
-+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
++! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ ! .IF "$(OS)"=="NETBSD"
+ ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
++! .ENDIF
 +! .IF "$(OS)"=="FREEBSD"
-+! CFLAGS+=	-DHAVE_SYS_TIME_H
-+! .ELSE
-+! CFLAGS+=	-DHAVE_SYS_TIMEB_H
++! CFLAGS+=     -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
 +! .ENDIF
-+! CFLAGS+=     -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
-+! .ELSE
+ ! .ELSE
  ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
-+! .ENDIF
  ! .ENDIF
- ! 
- ! CFLAGS+=	-I$(SOLARINCDIR)$/external$/expat
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
index 29b4de4eb78b..807aeacda025 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+nlsupport.c
@@ -1,88 +1,64 @@
---- ../sal/osl/unx/nlsupport.c.orig	Sat Mar  9 00:51:17 2002
-+++ ../sal/osl/unx/nlsupport.c	Sat Mar  9 01:54:43 2002
-@@ -63,11 +63,17 @@
+--- ../sal/osl/unx/nlsupport.c.orig	Sun Mar 17 12:48:42 2002
++++ ../sal/osl/unx/nlsupport.c	Wed Apr  3 00:57:03 2002
+@@ -63,7 +63,7 @@
  #include <osl/diagnose.h>
  #include <osl/process.h>
  
--#if defined(LINUX) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD)
+-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
  #include <pthread.h>
  #include <locale.h>
-+#if defined(FREEBSD)
-+#if OSVERSION > 500000
  #include <langinfo.h>
- #endif
-+#else
-+#include <langinfo.h>
-+#endif
-+#endif
- 
- /*****************************************************************************/
- /* typedefs
-@@ -242,7 +248,7 @@
+@@ -242,7 +242,7 @@
      return NULL;
  }
          
--#if defined(LINUX) || defined(SOLARIS)
-+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD)
+-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -296,7 +302,7 @@
- /* XXX MS-874 is an extension to tis620, so this is not
-  * really equivalent */
+@@ -314,7 +314,7 @@
+    { "sjis",		RTL_TEXTENCODING_SHIFT_JIS	}, /* Japan */
+ };
  
--#elif defined(LINUX)
+-#elif defined(LINUX) || defined(NETBSD)
 +#elif defined(LINUX) || defined(NETBSD) || defined(FREEBSD)
  
  const _pair _nl_language_list[] = {
      { "ANSI_X3.110-1983",           RTL_TEXTENCODING_DONTKNOW   },  /* ISO-IR-99 NAPLPS */
-@@ -477,7 +483,7 @@
+@@ -495,7 +495,7 @@
      { "WIN-SAMI-2",                 RTL_TEXTENCODING_DONTKNOW }     /* WS2 */
  };
  
--#endif /* ifdef LINUX */
+-#endif /* ifdef LINUX || NETBSD */
 +#endif /* ifdef LINUX || NETBSD || FREEBSD */
  
  static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
  
-@@ -516,7 +522,13 @@
-     }
-         
-     /* get the charset as indicated by the LC_CTYPE locale */
-+#if defined(NETBSD) || defined(FREEBSD)
-+#if !defined(CODESET) 
-+    codeset = NULL;
-+#else
-     codeset = nl_langinfo( CODESET );
-+#endif
-+#endif
- 
-     if ( codeset != NULL )
-     {
-@@ -595,7 +607,7 @@
+@@ -617,7 +617,7 @@
      return ret;
  }
  
--#elif defined(MACOSX) /* ifdef LINUX || SOLARIS */
+-#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */
 +#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD || FREEBSD */
  
  /*
   * FIXME: the MacOS X implemetation is missing
-@@ -628,7 +640,7 @@
+@@ -650,7 +650,7 @@
      return 0;
  }
  
--#else /* ifdef LINUX || SOLARIS || MACOSX */
+-#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
  
  /*
   * This implementation of osl_getTextEncodingFromLocale maps 
-@@ -844,6 +856,6 @@
+@@ -884,6 +884,6 @@
      return 0;
  }
  
--#endif /* ifdef LINUX || SOLARIS || MACOSX*/
+-#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */
 +#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD || FREEBSD */
  
  
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+pipe.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+pipe.c
index 6802487470a2..217bd0be4d58 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+pipe.c
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+pipe.c
@@ -1,13 +1,13 @@
---- ../sal/osl/unx/pipe.c.orig	Tue May 29 07:38:32 2001
-+++ ../sal/osl/unx/pipe.c
+--- ../sal/osl/unx/pipe.c.orig	Mon Feb 18 13:48:55 2002
++++ ../sal/osl/unx/pipe.c	Wed Apr  3 00:59:15 2002
 @@ -264,7 +264,11 @@
      
  	addr.sun_family = AF_UNIX;
- 	strcpy(addr.sun_path, name);
+ 	strncpy(addr.sun_path, name, sizeof(addr.sun_path));
 +#if defined(FREEBSD)
-+        len = SUN_LEN(&addr);
++	 len = SUN_LEN(&addr);
 +#else
- 	len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+ 	len = sizeof(addr);
 +#endif
  
  	if ( Options & osl_Pipe_CREATE )
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c
index 19d390cf08eb..b6e0e2fa0901 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c
@@ -1,10 +1,10 @@
---- ../sal/osl/unx/socket.c.orig	Fri Jun 22 16:22:14 2001
-+++ ../sal/osl/unx/socket.c	Sun Mar 10 23:33:56 2002
+--- ../sal/osl/unx/socket.c.orig	Sun Mar 17 12:46:37 2002
++++ ../sal/osl/unx/socket.c	Wed Apr  3 01:01:14 2002
 @@ -82,7 +82,7 @@
  #undef HAVE_POLL_H
  #endif
  
--#if defined(LINUX) || defined (IRIX)
+-#if defined(LINUX) || defined (IRIX) || defined(NETBSD)
 +#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
  #include <sys/poll.h>
  #define HAVE_POLL_H
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c
index b0b93119f983..8dc663ac03fc 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c
+++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+system.c
@@ -1,8 +1,8 @@
---- ../sal/osl/unx/system.c.orig	Wed Feb 28 13:08:45 2001
-+++ ../sal/osl/unx/system.c
-@@ -126,6 +126,73 @@
-   	return res;
+--- ../sal/osl/unx/system.c.orig	Sun Mar 17 12:34:13 2002
++++ ../sal/osl/unx/system.c	Wed Apr  3 01:03:36 2002
+@@ -195,6 +195,73 @@
  }
+ #endif
  
 +int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
 +           size_t buflen, struct passwd **result)
@@ -74,7 +74,7 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer)
  {
  	struct tm* res;
-@@ -449,3 +516,50 @@
+@@ -518,3 +585,50 @@
  }
  #endif
  
diff --git a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
index 572d8ebcc690..a71f7b3f327c 100644
--- a/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice.org-2-RC/files/patch-setup2+mow+source+loader+loader.c
@@ -1,6 +1,6 @@
---- ../setup2/mow/source/loader/loader.c.orig	Sun Mar  3 01:41:47 2002
-+++ ../setup2/mow/source/loader/loader.c	Sun Mar  3 01:42:19 2002
-@@ -603,6 +603,14 @@
+--- ../setup2/mow/source/loader/loader.c.orig	Thu Dec 13 17:44:58 2001
++++ ../setup2/mow/source/loader/loader.c	Wed Apr  3 01:07:58 2002
+@@ -615,6 +615,14 @@
  "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
  "    export LD_LIBRARY_PATH\n" \
  "    ;;\n" \
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
index 039af7d70871..cb652ec9d1f0 100644
--- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
+++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
@@ -1,6 +1,6 @@
---- ../solenv/inc/tg_ext.mk.orig	Wed Nov 14 13:59:42 2001
-+++ ../solenv/inc/tg_ext.mk	Mon Mar  4 17:30:39 2002
-@@ -107,7 +107,7 @@
+--- ../solenv/inc/tg_ext.mk.orig	Tue Mar 19 12:43:51 2002
++++ ../solenv/inc/tg_ext.mk	Wed Apr  3 01:31:10 2002
+@@ -108,7 +108,7 @@
  	
  $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz
  	@+-$(RM) $@
@@ -9,14 +9,24 @@
  	@+$(COPY) $(mktmp $(UNPACKCMD)) $@
  
  $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar
-@@ -148,7 +148,11 @@
+@@ -147,17 +147,17 @@
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(GUI)"=="WNT"
  .IF "$(BSCLIENT)"=="TRUE"
+-.IF "$(OS)"=="NETBSD"
++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE
  	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF		# "$(OS)"=="NETBSD"
++.ENDIF		# "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
  .ELSE           # "$(BSCLIENT)"!=""
+-.IF "$(OS)"=="NETBSD"
 +.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-+	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-+.ELSE
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE
  	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF          # "$(OS)"=="NETBSD"
 +.ENDIF          # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
  .ENDIF          # "$(BSCLIENT)"!=""
  .ENDIF          # "$(GUI)"=="WNT"
diff --git a/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c b/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c
deleted file mode 100644
index 0430ff41b6a9..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-unzip+source+file_io.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- ../unzip/source/file_io.c.orig	Tue Mar  5 18:32:38 2002
-+++ ../unzip/source/file_io.c	Tue Mar  5 18:40:50 2002
-@@ -500,7 +500,7 @@
- #ifdef MPW
- 				pCallBack( 0 );
- #else
--				#if defined LINUX || defined MACOSX || defined NETBSD
-+				#if defined LINUX || defined MACOSX || defined NETBSD || defined FREEBSD
- 				pCallBack( lseek(outfd, 0, SEEK_CUR) );
- 				#else
- 				pCallBack( tell( outfd ) );
-@@ -860,8 +860,11 @@
- /*  extern char *_TZ;   no longer used? */
- #else /* !AMIGA */
- #   define YRBASE  1970
--#ifdef BSD
--#ifndef __386BSD__
-+#ifdef FREEBSD
-+#include <sys/types.h>
-+#endif */ FREEBSD */
-+#if defined BSD || defined FREEBSD
-+#if !defined __386BSD__ && !defined FREEBSD
- 	static struct timeb tbp;
- #endif /* !__386BSD__ */
- #else /* !BSD */
-@@ -932,8 +935,8 @@
- 	/* convert date & time to seconds relative to 00:00:00, 01/01/YRBASE */
- 	m_time = ((days + dy) * 86400) + (hh * 3600) + (mm * 60) + ss;
- 
--#if defined BSD && ! defined MACOSX && ! defined NETBSD
--#ifndef __386BSD__
-+#if (defined BSD || defined FREEBSD) && ! defined MACOSX && ! defined NETBSD
-+#if !defined __386BSD__ && !defined FREEBSD
- 	ftime(&tbp);
- 	m_time += tbp.timezone * 60L;
- #endif
diff --git a/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c b/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c
index 38cc972f0bce..26400cd2c1c4 100644
--- a/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c
+++ b/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c
@@ -1,5 +1,5 @@
---- ../unzip/source/misc.c.orig	Tue Mar  5 18:52:16 2002
-+++ ../unzip/source/misc.c	Tue Mar  5 18:53:03 2002
+--- ../unzip/source/misc.c.orig	Fri Feb 15 15:10:30 2002
++++ ../unzip/source/misc.c	Wed Apr  3 01:19:16 2002
 @@ -301,8 +301,8 @@
      int yr, mo, dy, hh, mm, ss, leap;
      long m_time, days=0;
@@ -11,14 +11,3 @@
      static struct timeb tbp;
  #endif /* __386BSD__ */
  #else /* !(BSD || MTS) */
-@@ -340,8 +340,8 @@
-       /* - 1;   MS-DOS times always rounded up to nearest even second */
- 
- #if (!defined(MACOS) && !defined(__GO32__))
--#if (defined(BSD) || defined(MTS) || defined (ALPHA)) && ! defined(MACOSX) && ! defined(NETBSD)
--#ifndef __386BSD__
-+#if (defined(BSD) || defined(FREEBSD) || defined(MTS) || defined (ALPHA)) && ! defined(MACOSX) && ! defined(NETBSD)
-+#if !defined __386BSD__ && !defined FREEBSD
-     ftime(&tbp);
-     m_time += tbp.timezone * 60L;
- #endif