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.
svn path=/head/; revision=57248
2002-04-02 23:48:28 +00:00 · 2002-04-02 23:48:28 +00:00 · a31c45a0b4 · 2021-03-31 03:12:20 +00:00
commit a31c45a0b4
parent f8be381957
528 changed files with 2988 additions and 7356 deletions
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@ -6,9 +6,10 @@
 #

 PORTNAME=	openoffice
-PORTVERSION=	641c
+PORTVERSION=	641d
 CATEGORIES=	editors
-MASTER_SITES=	http://sf1.mirror.openoffice.org/641c/ \
+MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
+		http://sf1.mirror.openoffice.org/641c/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		http://people.freebsd.org/~mbr/distfiles/
 DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
--- a/editors/openoffice-1.0/distinfo
+++ b/editors/openoffice-1.0/distinfo
@ -1,3 +1,3 @@
-MD5 (oo_641c_src.tar.bz2) = 937fbe2534da2cb95a941945553ba7c4
+MD5 (oo_641d_src.tar.bz2) = 6f72837c9609b17ed7631ab5539259bc
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
--- a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-bridges::prj::build.lst
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk
@ -1,11 +0,0 @@
--- ../chaos/util/makefile.mk.orig	Sat Mar  2 18:09:33 2002
-+++ ../chaos/util/makefile.mk	Sat Mar  2 18:09:18 2002
-@@ -100,7 +100,7 @@
- 
- SHL1TARGET=	cnt$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=	i$(TARGET)
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=	exports.$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	exports.map
--- a/editors/openoffice-1.0/files/patch-chaos::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-chaos::util::makefile.mk
@ -1,11 +0,0 @@
--- ../chaos/util/makefile.mk.orig	Sat Mar  2 18:09:33 2002
-+++ ../chaos/util/makefile.mk	Sat Mar  2 18:09:18 2002
-@@ -100,7 +100,7 @@
- 
- SHL1TARGET=	cnt$(UPD)$(DLLPOSTFIX)
- SHL1IMPLIB=	i$(TARGET)
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=	exports.$(DLLPOSTFIX).map
- .ELSE
- SHL1VERSIONMAP=	exports.map
--- a/editors/openoffice-1.0/files/patch-comphelper+util+makefile.mk
+++ b/editors/openoffice-1.0/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"
--- a/editors/openoffice-1.0/files/patch-comphelper::util::makefile.mk
+++ b/editors/openoffice-1.0/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"
--- a/editors/openoffice-1.0/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
@ -1,11 +1,11 @@
--- ../config_office/set_soenv.1.orig	Tue Nov 20 18:26:33 2001
-+++ ../config_office/set_soenv.1	Sun Mar 10 22:56:18 2002
+--- ../config_office/set_soenv.1.orig	Tue Apr  2 23:59:46 2002
+++ ../config_office/set_soenv.1	Wed Apr  3 00:02:47 2002
@@ -40,7 +40,7 @@
 #
 # Set this value equal to the corresponding amount of
 # command line arguments. 
-my $numArgs = 17;
-+my $numArgs = 20;
+-my $numArgs = 20;
+my $numArgs = 23;
 # Determining the amount of arguments in the call.
 my $numEnter = $#ARGV + 1;
 if ( $numEnter != $numArgs ) 
@ -21,7 +21,7 @@
 #
 #-------------------------------------------
 # IIc. Declaring the environment variables.
-@@ -301,7 +302,7 @@
+@@ -316,7 +317,7 @@
    $PROSWITCH      = "-DPRODUCT";
    $XPVERSION      = "3";
    $SOLAR_JAVA	   = "TRUE"; 
@ -30,17 +30,17 @@
 } 
 elsif ( $platform eq "$FreeBSD" ) 
 {     print "Setting FreeBSD specific values... ";
-@@ -324,6 +325,9 @@
+@@ -339,6 +340,9 @@
       $PATH_SEPERATOR = $ps;
       $PROSWITCH      = "-DPRODUCT";
       $XPVERSION      = "3";
-+      $OSVERSION      = $ARGV[ 17 ];
-+      $PTHREAD_CFLAGS = $ARGV[ 18 ];
-+      $PTHREAD_LIBS   = $ARGV[ 19 ];
+      $OSVERSION      = $ARGV[ 20 ];
+      $PTHREAD_CFLAGS = $ARGV[ 21 ];
+      $PTHREAD_LIBS   = $ARGV[ 22 ];
 } 
 elsif ( $platform eq "$Linux" ) 
 {
-@@ -853,15 +857,16 @@
+@@ -929,15 +933,16 @@
                         $D.$COM.
 			$D.$CVER.
                         $D.$GVER.
@ -60,7 +60,7 @@
 {  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
 }
 $SOLARDEF            .= $D."SUPD=$UPD".
-@@ -954,7 +959,7 @@
+@@ -1034,7 +1039,7 @@
                         $ps.$USR.$LIB.
                         $ps.$USR_LOCAL.$BIN;
 }
@ -69,8 +69,8 @@
 {  $PATH              = $cur_dir.
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -968,6 +973,22 @@
-                         $ps.$USR.$BIN.$ds."X11".
+@@ -1053,6 +1058,22 @@
+ 			$ps.$USR.$ds."X11".$BIN.
                         $ps.$USR.$LIB;
 }
 +elsif ($platform eq "$FreeBSD")
@ -90,39 +90,30 @@
 +}
 +
 elsif ($platform eq "$Winnt")
- {  $COMPATH_ROOT      = $COMPATH;
-    $COMPATH_ROOT      =~ s/\/vc98$//;
-@@ -1067,25 +1088,19 @@
+ { 
+    my ( $noldPATH );
+@@ -1191,7 +1212,7 @@
+ 	$SOLARINC            .= $I.$USR.$INCLUDE;
+ }
+ $SOLARINC	     .= $STLPORT_stlport;
+-if ($platform eq "$Linux")
+if ($platform eq "$Linux" || $platform eq "$FreeBSD")
 {
- $SOLARINC            .= $I.$USR.$INCLUDE.
- 			$STLPORT_stlport;
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC            .= $STLPORT_inc_stlport;
+@@ -1205,11 +1226,6 @@
+ {  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
+ }
+ 
 -if ($platform eq "$Linux")
 -{
 -# This simply adds an include path, so even cases that break the FHS work
 -$SOLARINC            .= $STLPORT_inc_stlport;
 -}
-+
- if ($platform eq "$Solaris")
- {
- $SOLARINC            .= '/SC5 ';
-}
-# Platform dependent include path at the top of this list of include paths
-if ($platform eq "$Solaris") 
-{  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
-+$SOLARINC         .= $I.'$COMPATH'.$ds."include";
- }
- 
-if ($platform eq "$Linux")
-+if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
- {
- # This simply adds an include path, so even cases that break the FHS work
- $SOLARINC            .= $STLPORT_inc_stlport;
- }
-+
 $SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
                         $I.'$JAVA_HOME'.$INCLUDE;
 
-@@ -1273,6 +1288,9 @@
+@@ -1399,6 +1415,9 @@
 ToFile( "GUIENV",            $GUIENV,            "e" );
 ToFile( "GVER",              $GVER,              "e" );
 ToFile( "OS",                $OS,                "e" );
--- a/editors/openoffice-1.0/files/patch-config_office::configure.in
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk
@ -1,14 +0,0 @@
--- ../connectivity/source/drivers/adabas/makefile.mk.orig	Sat Mar  2 20:39:00 2002
-+++ ../connectivity/source/drivers/adabas/makefile.mk	Sat Mar  2 20:38:16 2002
-@@ -104,9 +104,9 @@
- 		$(SLO)$/BResultSetMetaData.obj			\
-         $(SLO)$/BResultSet.obj
- 		
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
-.ELSE      
-+.ELSE
- SHL1VERSIONMAP=$(ADABAS_TARGET).map
- .ENDIF
- 
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/calc/makefile.mk.orig	Sat Mar  2 20:42:07 2002
-+++ ../connectivity/source/drivers/calc/makefile.mk	Sat Mar  2 20:41:59 2002
-@@ -91,7 +91,7 @@
- 	$(SLO)$/Cservices.obj			\
- 	$(SLO)$/CDriver.obj
- 
-.IF "$(OS)"!="MACOSX"
-+.IF "$(OS)"!="MACOSX" || "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
- .ENDIF
- # --- Library -----------------------------------
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/dbase/makefile.mk.orig	Sat Mar  2 20:45:45 2002
-+++ ../connectivity/source/drivers/dbase/makefile.mk	Sat Mar  2 20:45:27 2002
-@@ -117,7 +117,7 @@
- 	$(SLO)$/DDriver.obj
- 
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/file/makefile.mk.orig	Sat Mar  2 20:47:37 2002
-+++ ../connectivity/source/drivers/file/makefile.mk	Sat Mar  2 20:48:04 2002
-@@ -112,7 +112,7 @@
- 	$(SLO)$/fanalyzer.obj			\
- 	$(SLO)$/fcomp.obj
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- #SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/flat/makefile.mk.orig	Sat Mar  2 20:51:31 2002
-+++ ../connectivity/source/drivers/flat/makefile.mk	Sat Mar  2 20:51:56 2002
-@@ -104,7 +104,7 @@
- 	$(SLO)$/EDriver.obj
- 
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/jdbc/makefile.mk.orig	Sat Mar  2 20:54:27 2002
-+++ ../connectivity/source/drivers/jdbc/makefile.mk	Sat Mar  2 20:54:52 2002
-@@ -111,7 +111,7 @@
- 		$(SLO)$/tools.obj
- 		
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(JDBC_TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ b/editors/openoffice-1.0/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 -----------------------------------
 
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@ -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)
--- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
@ -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)
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::adabas::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::adabas::makefile.mk
@ -1,14 +0,0 @@
--- ../connectivity/source/drivers/adabas/makefile.mk.orig	Sat Mar  2 20:39:00 2002
-+++ ../connectivity/source/drivers/adabas/makefile.mk	Sat Mar  2 20:38:16 2002
-@@ -104,9 +104,9 @@
- 		$(SLO)$/BResultSetMetaData.obj			\
-         $(SLO)$/BResultSet.obj
- 		
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map
-.ELSE      
-+.ELSE
- SHL1VERSIONMAP=$(ADABAS_TARGET).map
- .ENDIF
- 
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::calc::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::calc::makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/calc/makefile.mk.orig	Sat Mar  2 20:42:07 2002
-+++ ../connectivity/source/drivers/calc/makefile.mk	Sat Mar  2 20:41:59 2002
-@@ -91,7 +91,7 @@
- 	$(SLO)$/Cservices.obj			\
- 	$(SLO)$/CDriver.obj
- 
-.IF "$(OS)"!="MACOSX"
-+.IF "$(OS)"!="MACOSX" || "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP= $(TARGET).map
- .ENDIF
- # --- Library -----------------------------------
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::dbase::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::dbase::makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/dbase/makefile.mk.orig	Sat Mar  2 20:45:45 2002
-+++ ../connectivity/source/drivers/dbase/makefile.mk	Sat Mar  2 20:45:27 2002
-@@ -117,7 +117,7 @@
- 	$(SLO)$/DDriver.obj
- 
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::file::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::file::makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/file/makefile.mk.orig	Sat Mar  2 20:47:37 2002
-+++ ../connectivity/source/drivers/file/makefile.mk	Sat Mar  2 20:48:04 2002
-@@ -112,7 +112,7 @@
- 	$(SLO)$/fanalyzer.obj			\
- 	$(SLO)$/fcomp.obj
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- #SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::flat::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::flat::makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/flat/makefile.mk.orig	Sat Mar  2 20:51:31 2002
-+++ ../connectivity/source/drivers/flat/makefile.mk	Sat Mar  2 20:51:56 2002
-@@ -104,7 +104,7 @@
- 	$(SLO)$/EDriver.obj
- 
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::jdbc::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::jdbc::makefile.mk
@ -1,11 +0,0 @@
--- ../connectivity/source/drivers/jdbc/makefile.mk.orig	Sat Mar  2 20:54:27 2002
-+++ ../connectivity/source/drivers/jdbc/makefile.mk	Sat Mar  2 20:54:52 2002
-@@ -111,7 +111,7 @@
- 		$(SLO)$/tools.obj
- 		
- 
-.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
- #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map
- .ELSE      
- SHL1VERSIONMAP=$(JDBC_TARGET).map
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::makefile.mk
+++ b/editors/openoffice-1.0/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 -----------------------------------
 
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk
@ -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)
--- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozaddressbook::makefile.mk
@ -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)
--- a/editors/openoffice-1.0/files/patch-connectivity::source::manager::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::manager::makefile.mk
@ -1,16 +0,0 @@
--- ../connectivity/source/manager/makefile.mk.orig	Tue Jan  1 14:09:00 2002
-+++ ../connectivity/source/manager/makefile.mk
-@@ -92,11 +92,11 @@
- .ENDIF
- SHL1OBJS=$(SLOFILES)
- SHL1STDLIBS=\
-+	$(SALLIB)					\
- 	$(CPPULIB)					\
- 	$(CPPUHELPERLIB)			\
- 	$(VOSLIB)					\
-	$(OSLLIB)					\
-	$(SALLIB)
-+	$(OSLLIB)					
- 
- SHL1DEPN=
- SHL1IMPLIB=	i$(SHL1TARGET)
--- a/editors/openoffice-1.0/files/patch-connectivity::source::parse::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-connectivity::source::parse::makefile.mk
@ -1,10 +0,0 @@
--- ../connectivity/source/parse/makefile.mk.orig	Wed Mar  6 10:39:52 2002
-+++ ../connectivity/source/parse/makefile.mk	Wed Mar  6 10:40:07 2002
-@@ -95,6 +95,7 @@
- 	+flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l
- 
- $(MISC)$/sqlbison.cxx: sqlbison.y
-+	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx.h sqlbison.y
- 	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y
- 	-$(MKDIR) $(OUT)$/inc$/connectivity
- 	+$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx
--- a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk
@ -1,12 +0,0 @@
--- ../cppu/util/makefile.mk.orig	Sat Mar  2 21:05:22 2002
-+++ ../cppu/util/makefile.mk	Sat Mar  2 21:05:43 2002
-@@ -87,7 +87,9 @@
- SHL1IMPLIB=	i$(TARGET)
- SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=	$(TARGET).map
-+.ENDIF
- 
- DEF1NAME=	$(SHL1TARGET)
- #DEF1EXPORTFILE=	exports.dxp
--- a/editors/openoffice-1.0/files/patch-cppu::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-cppu::util::makefile.mk
@ -1,12 +0,0 @@
--- ../cppu/util/makefile.mk.orig	Sat Mar  2 21:05:22 2002
-+++ ../cppu/util/makefile.mk	Sat Mar  2 21:05:43 2002
-@@ -87,7 +87,9 @@
- SHL1IMPLIB=	i$(TARGET)
- SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
- 
-+.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=	$(TARGET).map
-+.ENDIF
- 
- DEF1NAME=	$(SHL1TARGET)
- #DEF1EXPORTFILE=	exports.dxp
--- a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.0/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"
--- a/editors/openoffice-1.0/files/patch-cppuhelper::source::makefile.mk
+++ b/editors/openoffice-1.0/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"
--- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+makefile.mk
+++ b/editors/openoffice-1.0/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)	\
--- a/editors/openoffice-1.0/files/patch-dtrans::source::X11::makefile.mk
+++ b/editors/openoffice-1.0/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)	\
--- a/editors/openoffice-1.0/files/patch-extensions::source::plugin::unx::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-extensions::source::plugin::unx::makefile.mk
@ -1,14 +0,0 @@
--- ../extensions/source/plugin/unx/makefile.mk.orig	Mon Mar 11 01:34:07 2002
-+++ ../extensions/source/plugin/unx/makefile.mk	Mon Mar 11 10:21:01 2002
-@@ -91,7 +91,11 @@
- .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
- APP1STDLIBS+=-lXm -lXt -lX11 -ldl
- .ELSE
-+IF "$(OS)"=="FREEBSD"
-+APP1STDLIBS+=-lXaw -lXt -lX11
-+.ELSE
- APP1STDLIBS+=-lXaw -lXt -lX11 -ldl
-+.ENDIF
- .ENDIF
- 
- APP1DEF=	$(MISC)$/$(TARGET).def
--- a/editors/openoffice-1.0/files/patch-idlc::source::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-idlc::source::makefile.mk
@ -1,10 +0,0 @@
--- ../idlc/source/makefile.mk.orig	Wed Mar  6 10:25:35 2002
-+++ ../idlc/source/makefile.mk	Wed Mar  6 10:25:53 2002
-@@ -147,6 +147,7 @@
- 	+flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll
- 
- $(MISC)$/parser.cxx: parser.yy
-+	+bison -v -d -o$(MISC)$/parser.cxx.h parser.yy
- 	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
- 	+$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h
- # with line statements (for debugging)
--- a/editors/openoffice-1.0/files/patch-inet::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-inet::util::makefile.mk
@ -1,4 +1,4 @@
--- ../util/makefile.mk.orig	Sat Mar  2 21:17:20 2002
+--- ../inet/util/makefile.mk.orig	Sat Mar  2 21:17:20 2002
 +++ ../inet/util/makefile.mk	Sat Mar  2 21:17:42 2002
@@ -116,7 +116,7 @@
 
--- a/editors/openoffice-1.0/files/patch-odk::pack::unzip_udk::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-odk::pack::unzip_udk::makefile.mk
@ -1,11 +0,0 @@
--- ../odk/pack/unzip_udk/makefile.mk.orig	Tue Mar  5 15:35:31 2002
-+++ ../odk/pack/unzip_udk/makefile.mk	Tue Mar  5 15:36:15 2002
-@@ -30,7 +30,7 @@
- .IF "$(GUI)"=="WNT"
- 	unzip -q -d . $(UDKNAME)
- .ELSE
-	gzip -df < $(UDKNAME).tar.gz | tar -xvf -
-+	tar -xzf $(UDKNAME).tar.gz
- .ENDIF
- 	+-$(RENAME) $(UDKNAME) 		$(ODKNAME)
- 	+rm -f $(ODKNAME)$/settings$/dk.mk
--- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.0/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 $@
--- a/editors/openoffice-1.0/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-1.0/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 $@
--- a/editors/openoffice-1.0/files/patch-rscpp::cpp.h
+++ b/editors/openoffice-1.0/files/patch-rscpp::cpp.h
@ -1,12 +0,0 @@
--- ../rscpp/cpp.h.orig	Fri Mar  1 00:15:54 2002
-+++ ../rscpp/cpp.h	Fri Mar  1 00:15:56 2002
-@@ -462,7 +462,9 @@
- extern char     *strrchr();
- extern char     *strchr();
- #if ! ( defined UNX && defined ALPHA )
-+#if ! ( defined FREEBSD )
- extern long     time();
-+#endif
- #endif
- /* extern char     *sprintf();  */           /* Lint needs this              */
- 
--- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-sablot::Sablot-0.52.patch
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.0/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 */
 
 
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c
+++ b/editors/openoffice-1.0/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 )
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c
+++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c
@ -1,6 +1,6 @@
--- ../sal/osl/unx/process.c.orig	Sat Mar  2 22:33:17 2002
-+++ ../sal/osl/unx/process.c	Sat Mar  2 22:33:58 2002
-@@ -834,7 +834,7 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jan  9 13:07:41 2002
+++ ../sal/osl/unx/process.c	Wed Apr  3 00:59:53 2002
+@@ -833,7 +833,7 @@
 
 			if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
 				OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c
+++ b/editors/openoffice-1.0/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
 
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::file.c
+++ b/editors/openoffice-1.0/files/patch-sal::osl::unx::file.c
@ -1,73 +0,0 @@
--- ../sal/osl/unx/file.c.orig	Thu Oct  4 15:09:21 2001
-+++ ../sal/osl/unx/file.c
-@@ -123,11 +123,16 @@
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
- 
-#elif defined(NETBSD)
-+#elif defined(NETBSD) || defined(FREEBSD)
-+#include <sys/param.h>
-+#include <sys/ucred.h>
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ctype.h>
-static const sal_Char* MOUNTTAB="/etc/mtab"; 
-+#define  HAVE_STATFS_H
-+/* No mounting table on *BSD
-+ * This information is stored only in the kernel. */
-+/* static const sal_Char* MOUNTTAB="/etc/mtab"; */
- 
- #elif defined(IRIX)
- #include <mntent.h>
-@@ -137,7 +142,7 @@
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
- 
-#elif defined(MACOSX) || defined(FREEBSD)
-+#elif defined(MACOSX) 
- #include <ufs/ufs/quota.h>
- #include <ctype.h>
- static const sal_Char* MOUNTTAB="/etc/mtab";
-@@ -4224,10 +4229,20 @@
-     mntfile = fopen(MOUNTTAB,"r");
- #endif /* SOLARIS */
- 
-+#if defined(NETBSD) || defined(FREEBSD)
-+    struct statfs *mntbufp;
-+    int mntentries,i;
-+    mntentries = getmntinfo(&mntbufp,MNT_WAIT);
- 
-     buffer[0] = '\0';
-     
-+    if(mntentries == 0)
-+#else    
-+
-+    buffer[0] = '\0';
-+
-     if ( mntfile == 0 )
-+#endif
-     {
-         nRet=errno;
- #ifdef DEBUG_OSL_FILE
-@@ -4286,7 +4301,21 @@
-     }
- #endif /* SOLARIS */
- 
-+#if defined(NETBSD) || defined(FREEBSD)
-+    i=0;
-+    while ( i < mntentries )
-+    {
-+       if ( strcmp(mntbufp[i].f_mntonname,buffer) == 0 )
-+       {
-+           *bMountPoint=sal_True;
-+           return osl_File_E_None;
-+       }
-+       i++;
-+    }
-+#endif
-+#if ! ( defined(NETBSD) || defined(FREEBSD) )
-     fclose(mntfile);
-+#endif
-     *bMountPoint=sal_False;
-     return osl_File_E_None;
- }
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
+++ b/editors/openoffice-1.0/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 */
 
 
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::pipe.c
+++ b/editors/openoffice-1.0/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 )
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::process.c
+++ b/editors/openoffice-1.0/files/patch-sal::osl::unx::process.c
@ -1,6 +1,6 @@
--- ../sal/osl/unx/process.c.orig	Sat Mar  2 22:33:17 2002
-+++ ../sal/osl/unx/process.c	Sat Mar  2 22:33:58 2002
-@@ -834,7 +834,7 @@
+--- ../sal/osl/unx/process.c.orig	Wed Jan  9 13:07:41 2002
+++ ../sal/osl/unx/process.c	Wed Apr  3 00:59:53 2002
+@@ -833,7 +833,7 @@
 
 			if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0))
 				OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno));
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::socket.c
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-sal::osl::unx::system.c
+++ b/editors/openoffice-1.0/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
 
--- a/editors/openoffice-1.0/files/patch-sal::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-sal::util::makefile.mk
@ -1,6 +1,6 @@
--- ../sal/util/makefile.mk.orig	Tue Mar  5 21:36:23 2002
-+++ ../sal/util/makefile.mk	Tue Mar  5 21:36:44 2002
-@@ -113,7 +113,9 @@
+--- ../sal/util/makefile.mk.orig	Sun Mar 17 12:51:30 2002
+++ ../sal/util/makefile.mk	Wed Apr  3 01:04:34 2002
+@@ -117,7 +117,9 @@
 SHL1TARGET= $(TARGET)
 SHL1IMPLIB= i$(TARGET)
 
--- a/editors/openoffice-1.0/files/patch-sal::workben::getlocaleinfotest.cxx
+++ b/editors/openoffice-1.0/files/patch-sal::workben::getlocaleinfotest.cxx
@ -1,11 +0,0 @@
--- ../sal/workben/getlocaleinfotest.cxx	Sun Mar 10 23:42:26 2002
-+++ ../sal/workben/getlocaleinfotest.cxx	Sun Mar 10 23:42:45 2002
-@@ -63,7 +63,7 @@
- #include <osl/nlsupport.h>
- #include <rtl/ustring.hxx>
- 
-int _cdecl main( int argc, char * argv[] )
-+int main( int argc, char * argv[] )
- {
-     rtl::OUString lang = rtl::OUString::createFromAscii( "de" );
-     rtl::OUString country = rtl::OUString::createFromAscii( "DE" );
--- a/editors/openoffice-1.0/files/patch-sc::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-sc::util::makefile.mk
@ -1,5 +1,5 @@
--- ../sc/util/makefile.mk.orig	Sun Mar  3 01:35:09 2002
-+++ ../sc/util/makefile.mk	Sun Mar  3 01:34:53 2002
+--- ../sc/util/makefile.mk.orig	Mon Mar 11 21:48:24 2002
+++ ../sc/util/makefile.mk	Wed Apr  3 01:06:57 2002
@@ -105,7 +105,9 @@
 # --- StarClac DLL
 
@ -9,4 +9,4 @@
 +.ENDIF
 SHL1IMPLIB= sci
 
- SHL1STDLIBS=        \
+ .IF "$(GUI)"=="UNX"
--- a/editors/openoffice-1.0/files/patch-set_soenv.1
+++ b/editors/openoffice-1.0/files/patch-set_soenv.1
@ -1,11 +1,11 @@
--- ../config_office/set_soenv.1.orig	Tue Nov 20 18:26:33 2001
-+++ ../config_office/set_soenv.1	Sun Mar 10 22:56:18 2002
+--- ../config_office/set_soenv.1.orig	Tue Apr  2 23:59:46 2002
+++ ../config_office/set_soenv.1	Wed Apr  3 00:02:47 2002
@@ -40,7 +40,7 @@
 #
 # Set this value equal to the corresponding amount of
 # command line arguments. 
-my $numArgs = 17;
-+my $numArgs = 20;
+-my $numArgs = 20;
+my $numArgs = 23;
 # Determining the amount of arguments in the call.
 my $numEnter = $#ARGV + 1;
 if ( $numEnter != $numArgs ) 
@ -21,7 +21,7 @@
 #
 #-------------------------------------------
 # IIc. Declaring the environment variables.
-@@ -301,7 +302,7 @@
+@@ -316,7 +317,7 @@
    $PROSWITCH      = "-DPRODUCT";
    $XPVERSION      = "3";
    $SOLAR_JAVA	   = "TRUE"; 
@ -30,17 +30,17 @@
 } 
 elsif ( $platform eq "$FreeBSD" ) 
 {     print "Setting FreeBSD specific values... ";
-@@ -324,6 +325,9 @@
+@@ -339,6 +340,9 @@
       $PATH_SEPERATOR = $ps;
       $PROSWITCH      = "-DPRODUCT";
       $XPVERSION      = "3";
-+      $OSVERSION      = $ARGV[ 17 ];
-+      $PTHREAD_CFLAGS = $ARGV[ 18 ];
-+      $PTHREAD_LIBS   = $ARGV[ 19 ];
+      $OSVERSION      = $ARGV[ 20 ];
+      $PTHREAD_CFLAGS = $ARGV[ 21 ];
+      $PTHREAD_LIBS   = $ARGV[ 22 ];
 } 
 elsif ( $platform eq "$Linux" ) 
 {
-@@ -853,15 +857,16 @@
+@@ -929,15 +933,16 @@
                         $D.$COM.
 			$D.$CVER.
                         $D.$GVER.
@ -60,7 +60,7 @@
 {  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
 }
 $SOLARDEF            .= $D."SUPD=$UPD".
-@@ -954,7 +959,7 @@
+@@ -1034,7 +1039,7 @@
                         $ps.$USR.$LIB.
                         $ps.$USR_LOCAL.$BIN;
 }
@ -69,8 +69,8 @@
 {  $PATH              = $cur_dir.
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -968,6 +973,22 @@
-                         $ps.$USR.$BIN.$ds."X11".
+@@ -1053,6 +1058,22 @@
+ 			$ps.$USR.$ds."X11".$BIN.
                         $ps.$USR.$LIB;
 }
 +elsif ($platform eq "$FreeBSD")
@ -90,39 +90,30 @@
 +}
 +
 elsif ($platform eq "$Winnt")
- {  $COMPATH_ROOT      = $COMPATH;
-    $COMPATH_ROOT      =~ s/\/vc98$//;
-@@ -1067,25 +1088,19 @@
+ { 
+    my ( $noldPATH );
+@@ -1191,7 +1212,7 @@
+ 	$SOLARINC            .= $I.$USR.$INCLUDE;
+ }
+ $SOLARINC	     .= $STLPORT_stlport;
+-if ($platform eq "$Linux")
+if ($platform eq "$Linux" || $platform eq "$FreeBSD")
 {
- $SOLARINC            .= $I.$USR.$INCLUDE.
- 			$STLPORT_stlport;
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC            .= $STLPORT_inc_stlport;
+@@ -1205,11 +1226,6 @@
+ {  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
+ }
+ 
 -if ($platform eq "$Linux")
 -{
 -# This simply adds an include path, so even cases that break the FHS work
 -$SOLARINC            .= $STLPORT_inc_stlport;
 -}
-+
- if ($platform eq "$Solaris")
- {
- $SOLARINC            .= '/SC5 ';
-}
-# Platform dependent include path at the top of this list of include paths
-if ($platform eq "$Solaris") 
-{  $SOLARINC         .= $I.'$COMPATH'.$ds."include";
-+$SOLARINC         .= $I.'$COMPATH'.$ds."include";
- }
- 
-if ($platform eq "$Linux")
-+if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
- {
- # This simply adds an include path, so even cases that break the FHS work
- $SOLARINC            .= $STLPORT_inc_stlport;
- }
-+
 $SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
                         $I.'$JAVA_HOME'.$INCLUDE;
 
-@@ -1273,6 +1288,9 @@
+@@ -1399,6 +1415,9 @@
 ToFile( "GUIENV",            $GUIENV,            "e" );
 ToFile( "GVER",              $GVER,              "e" );
 ToFile( "OS",                $OS,                "e" );
--- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.0/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" \
--- a/editors/openoffice-1.0/files/patch-setup2::mow::source::loader::loader.c
+++ b/editors/openoffice-1.0/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" \
--- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
+++ b/editors/openoffice-1.0/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"
- 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
- .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) | $(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 -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF          # "$(OS)"=="NETBSD"
 +.ENDIF          # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 .ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
--- a/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
+++ b/editors/openoffice-1.0/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"
- 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
- .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) | $(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 -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF          # "$(OS)"=="NETBSD"
 +.ENDIF          # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 .ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
--- a/editors/openoffice-1.0/files/patch-solenv::inc::tg_yxx.mk
+++ b/editors/openoffice-1.0/files/patch-solenv::inc::tg_yxx.mk
@ -1,12 +0,0 @@
--- ../solenv/inc/tg_yxx.mk.orig	Wed Sep 20 16:43:18 2000
-+++ ../solenv/inc/tg_yxx.mk	Wed Mar  6 10:47:24 2002
-@@ -4,7 +4,9 @@
- 	@echo ------------------------------
- 	@echo Making: $@
- #.IF "$(GUI)"!="UNX"
-+	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET).h $(YACCFILES)
- 	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
-+	$(BISON) -o $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
- #.ELSE
- #	$(BISON) $(YACCFLAGS) $(YACCFILES)
- #	mv y.tab.c $(INCCOM)/rscyacc.yxx
--- a/editors/openoffice-1.0/files/patch-svx::source::dialog::graphctl.cxx
+++ b/editors/openoffice-1.0/files/patch-svx::source::dialog::graphctl.cxx
@ -1,18 +0,0 @@
--- ../svx/source/dialog/graphctl.cxx	2001/08/16 15:41:29	1.6
-+++ ../svx/source/dialog/graphctl.cxx	2002/03/03 19:41:13
-@@ -62,12 +62,12 @@
- #if defined( OS2 ) || defined( WIN ) || defined( UNX ) || defined( WNT )
- #include <stdlib.h>			//wegen fcvt
- #endif
-#if defined(MAC) || defined(NETBSD)
-#if defined(NETBSD)
-+#if defined(MAC) || defined(NETBSD) || defined(FREEBSD)
-+#if defined(NETBSD) || defined(FREEBSD)
- extern "C" {
- #endif
- char *fcvt(double value, int ndigit, int *decpt, int *sign);
-#if defined(NETBSD)
-+#if defined(NETBSD) || defined(FREEBSD)
- }
- #endif
- #endif
--- a/editors/openoffice-1.0/files/patch-tools::inc:solar.h
+++ b/editors/openoffice-1.0/files/patch-tools::inc:solar.h
@ -1,20 +0,0 @@
--- ../tools/inc/solar.h	2001/10/12 15:11:03	1.23
-+++ ../tools/inc/solar.h	2002/03/03 19:44:00
-@@ -108,7 +108,7 @@
- #endif
- typedef short				INT16;
- typedef unsigned short		UINT16;
-#if defined LINUX || defined SCO || defined IRIX || (defined _MSC_VER && _MSC_VER >1200)
-+#if defined LINUX || defined SCO || defined IRIX || (defined _MSC_VER && _MSC_VER >1200) || defined FREEBSD
- typedef signed char 		INT8;
- #else
- 
-@@ -149,7 +149,7 @@
- 
- /*** misc. macros to leverage platform and compiler differences ********/
- 
-#if (defined ALPHA && !defined WNT) || defined IRIX || defined SOLARIS || defined HPUX || defined NETBSD
-+#if (defined ALPHA && !defined WNT) || defined IRIX || defined SOLARIS || defined HPUX || defined NETBSD || defined FREEBSD
- #define __DELETE(n) delete[]
- #else
- #define __DELETE(n) delete[n]
--- a/editors/openoffice-1.0/files/patch-tools::source::string::charset.cxx
+++ b/editors/openoffice-1.0/files/patch-tools::source::string::charset.cxx
@ -1,36 +0,0 @@
--- ../tools/source/string/charset.cxx.orig	Sun Mar 10 23:55:47 2002
-+++ ../tools/source/string/charset.cxx	Mon Mar 11 00:00:56 2002
-@@ -64,12 +64,14 @@
- #elif defined( OS2 )
- #define INCL_DOSNLS
- #include <svpm.h>
-#elif defined(LINUX) || defined(SOLARIS)
-+#elif defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
- #include <stdio.h>
- #include <stdlib.h>
- #include <strings.h>
- #include <locale.h>
-+#if !defined(FREEBSD) || OSVERSION > 500000
- #include <langinfo.h>
-+#endif
- #ifndef _TOOLS_LANG_HXX
- #include <lang.hxx>
- #endif
-@@ -126,7 +128,7 @@
- 
- // -----------------------------------------------------------------------
- 
-#if defined(NETBSD) || defined(SCO)
-+#if defined(NETBSD) || defined(SCO) || defined(FREEBSD)
- 
- // check if there is a charset qualifier at the end of the given locale string
- // e.g. de.ISO8859-15 or de.ISO8859-15@euro which strongly indicates what
-@@ -707,7 +709,7 @@
- #ifdef UNX
-         CharSet nTextEncoding;
- 
-#if defined(NETBSD) || defined(SCO)
-+#if defined(NETBSD) || defined(SCO) || defined(FREEBSD)
-         nTextEncoding = GetSystemCharSetFromEnvironment();
-         if (nTextEncoding == RTL_TEXTENCODING_DONTKNOW)
-             nTextEncoding = GetSystemCharSetFromSystemLanguage();
--- a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c
+++ b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c
@ -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
--- a/editors/openoffice-1.0/files/patch-unzip+source+misc.c
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-unzip::source::file_io.c
+++ b/editors/openoffice-1.0/files/patch-unzip::source::file_io.c
@ -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
--- a/editors/openoffice-1.0/files/patch-unzip::source::misc.c
+++ b/editors/openoffice-1.0/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
--- a/editors/openoffice-1.0/files/patch-xmlhelp::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-xmlhelp::util::makefile.mk
@ -1,6 +1,6 @@
--- ../xmlhelp/util/makefile.mk.orig	Sun Mar  3 01:49:15 2002
-+++ ../xmlhelp/util/makefile.mk	Sun Mar  3 01:49:19 2002
-@@ -94,7 +94,9 @@
+--- ../xmlhelp/util/makefile.mk.orig	Fri Nov 23 14:59:19 2001
+++ ../xmlhelp/util/makefile.mk	Wed Apr  3 01:21:02 2002
+@@ -97,7 +97,9 @@
 SHL1TARGET=$(TARGET)$(UCP_VERSION)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB=i$(TARGET)
--- a/editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst
+++ b/editors/openoffice-1.1-devel/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
--- a/editors/openoffice-1.1-devel/files/patch-comphelper+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/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"
--- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.1-devel/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
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ b/editors/openoffice-1.1-devel/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 -----------------------------------
 
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@ -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)
--- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
@ -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)
--- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.1-devel/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"
--- a/editors/openoffice-1.1-devel/files/patch-dtrans+source+X11+makefile.mk
+++ b/editors/openoffice-1.1-devel/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)	\
--- a/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.1-devel/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 $@
--- a/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch
+++ b/editors/openoffice-1.1-devel/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
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
+++ b/editors/openoffice-1.1-devel/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 */
 
 
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+pipe.c
+++ b/editors/openoffice-1.1-devel/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 )
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c
+++ b/editors/openoffice-1.1-devel/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
--- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+system.c
+++ b/editors/openoffice-1.1-devel/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
 
--- a/editors/openoffice-1.1-devel/files/patch-setup2+mow+source+loader+loader.c
+++ b/editors/openoffice-1.1-devel/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" \
--- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
+++ b/editors/openoffice-1.1-devel/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"
- 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
- .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) | $(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 -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+-.ENDIF          # "$(OS)"=="NETBSD"
 +.ENDIF          # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 .ENDIF          # "$(BSCLIENT)"!=""
 .ENDIF          # "$(GUI)"=="WNT"
--- a/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c
+++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+file_io.c
@ -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
--- a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c
+++ b/editors/openoffice-1.1-devel/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
--- a/editors/openoffice-1.1/files/patch-bridges+prj+build.lst
+++ b/editors/openoffice-1.1/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
--- a/editors/openoffice-1.1/files/patch-comphelper+util+makefile.mk
+++ b/editors/openoffice-1.1/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"
--- a/editors/openoffice-1.1/files/patch-config_office+configure.in
+++ b/editors/openoffice-1.1/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
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk
+++ b/editors/openoffice-1.1/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 -----------------------------------
 
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
@ -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)
--- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk
@ -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)
--- a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
+++ b/editors/openoffice-1.1/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"
--- a/editors/openoffice-1.1/files/patch-dtrans+source+X11+makefile.mk
+++ b/editors/openoffice-1.1/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)	\
--- a/Show More
+++ b/Show More