Upgrade the development snapshot to the latest build: 642

9 files changed, 107 insertions, 88 deletions

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index ebd4f92ae8e..92cda4c84e7 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	641c
+PORTVERSION=	642
 CATEGORIES=	editors x11
-MASTER_SITES=	http://sf1.mirror.openoffice.org/641c/ \
+MASTER_SITES=	ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \
+		http://sf1.mirror.openoffice.org/${PORTVERSION}/ \
 		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
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 94eb01acc36..6c0c7fa9e17 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (oo_641c_src.tar.bz2) = 937fbe2534da2cb95a941945553ba7c4
+MD5 (oo_642_src.tar.bz2) = fc39bdf5f4b277c343d2cc38b0d70c7d
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (oo_moz_641.tar.gz) = 472f7f19b47fa5ffef41dd01d0effac1
diff --git a/editors/openoffice-devel/files/patch-config_office::configure.in b/editors/openoffice-devel/files/patch-config_office::configure.in
index 755c69de612..c5e92f21773 100644
--- a/editors/openoffice-devel/files/patch-config_office::configure.in
+++ b/editors/openoffice-devel/files/patch-config_office::configure.in
@@ -1,8 +1,8 @@
---- 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	Tue Feb 19 16:42:08 2002
++++ configure.in	Mon Mar 11 14:50:18 2002
+@@ -121,6 +121,12 @@
  
-                           Usage: --with-asm-home=<path to ml.exe directory>
+                           Usage: --enable-check-only=yes
  ],,)
 +AC_ARG_WITH(os-version,
 +[  --with-os-version       For FreeBSD users, use this option option to build OpenOffice
@@ -10,10 +10,10 @@
 +
 +                          Usage: --with-os-version=<OSVERSION>
 +],,)
- AC_ARG_WITH(unzip-home,
- [  --with-unzip-home         For Windows users, please supply the path for 
-                           unzip.exe.
-@@ -225,13 +231,13 @@
+ dnl ===================================================================
+ dnl Message.
+ dnl ===================================================================
+@@ -245,13 +251,13 @@
  
     if test $GCC; then
        AC_MSG_CHECKING([the GNU gcc compiler version])
@@ -29,34 +29,34 @@
 +         _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 
+@@ -264,13 +270,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
+@@ -335,7 +341,8 @@
                    fi
                 else
  		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
 -                  _gcc_include_path="/usr/include/g++"
-+                  _gcc_include_path="/usr"
-+                  _gxx_include_path="/usr/include/g++"
++                 _gcc_include_path="/usr"
++                 _gxx_include_path="/usr/include/g++"
  		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 @@
+@@ -779,6 +786,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,20 @@
     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 @@
+@@ -1129,6 +1140,7 @@
  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 "\$MINGWIN32="$WITH_MINGWIN
+ echo "\$USE_GCC3="$USE_GCC3
  echo
- fi
+@@ -1136,7 +1148,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 $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 $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
  else
     echo
     echo Test Complete
diff --git a/editors/openoffice-devel/files/patch-cppu::util::makefile.mk b/editors/openoffice-devel/files/patch-cppu::util::makefile.mk
index 3b98552a36c..0157a34167b 100644
--- a/editors/openoffice-devel/files/patch-cppu::util::makefile.mk
+++ b/editors/openoffice-devel/files/patch-cppu::util::makefile.mk
@@ -1,12 +1,12 @@
---- ../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
+--- ../cppu/util/makefile.mk.orig	Fri Nov  9 10:14:31 2001
++++ ../cppu/util/makefile.mk	Mon Mar 11 13:35:07 2002
+@@ -89,7 +89,9 @@
+ SHL1IMPLIB=i$(TARGET)
+ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
  
 +.IF "$(OS)"!="FREEBSD"
- SHL1VERSIONMAP=	$(TARGET).map
+ SHL1VERSIONMAP=$(TARGET).map
 +.ENDIF
  
- DEF1NAME=	$(SHL1TARGET)
- #DEF1EXPORTFILE=	exports.dxp
+ DEF1NAME=$(SHL1TARGET)
+ 
diff --git a/editors/openoffice-devel/files/patch-product::util::makefile.mk b/editors/openoffice-devel/files/patch-product::util::makefile.mk
index 919c2b2e2fa..47058f96d8c 100644
--- a/editors/openoffice-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-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	Wed Feb 27 12:32:19 2002
++++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
+@@ -115,6 +115,15 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -16,7 +16,7 @@
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -373,8 +382,8 @@
+@@ -367,8 +376,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,16 +27,16 @@
  
  
  #---------------------------------------------------------
-@@ -385,7 +394,7 @@
- 
- $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
- 	-rm -f $@
--	+ln -s libstdc++.so.3.0.1 $@
-+	+ln -fs libstdc++.so.3.0.1 $@
+@@ -379,7 +388,7 @@
+ #
+ #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ #	-rm -f $@
+-#	+ln -s libstdc++.so.3.0.1 $@
++#	+ln -fs libstdc++.so.3.0.1 $@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -393,7 +402,7 @@
+@@ -387,7 +396,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice-devel/files/patch-set_soenv.1 b/editors/openoffice-devel/files/patch-set_soenv.1
index cb0b90d9bb0..d3d34f896e8 100644
--- a/editors/openoffice-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-devel/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
+--- set_soenv.1.orig	Wed Feb 27 10:46:41 2002
++++ set_soenv.1	Mon Mar 11 13:46:57 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 = 19;
++my $numArgs = 22;
  # 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 @@
+@@ -303,7 +304,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 @@
+@@ -326,6 +327,9 @@
        $PATH_SEPERATOR = $ps;
        $PROSWITCH      = "-DPRODUCT";
        $XPVERSION      = "3";
-+      $OSVERSION      = $ARGV[ 17 ];
-+      $PTHREAD_CFLAGS = $ARGV[ 18 ];
-+      $PTHREAD_LIBS   = $ARGV[ 19 ];
++      $OSVERSION      = $ARGV[ 19 ];
++      $PTHREAD_CFLAGS = $ARGV[ 20 ];
++      $PTHREAD_LIBS   = $ARGV[ 21 ];
  } 
  elsif ( $platform eq "$Linux" ) 
  {
-@@ -853,15 +857,16 @@
+@@ -889,15 +893,16 @@
                          $D.$COM.
  			$D.$CVER.
                          $D.$GVER.
@@ -60,7 +60,7 @@
  {  $SOLARDEF         .= $D."GLIBC=".$GLIBC;
  }
  $SOLARDEF            .= $D."SUPD=$UPD".
-@@ -954,7 +959,7 @@
+@@ -990,7 +995,7 @@
                          $ps.$USR.$LIB.
                          $ps.$USR_LOCAL.$BIN;
  }
@@ -69,7 +69,7 @@
  {  $PATH              = $cur_dir.
                          $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                          $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -968,6 +973,22 @@
+@@ -1004,6 +1009,22 @@
                          $ps.$USR.$BIN.$ds."X11".
                          $ps.$USR.$LIB;
  }
@@ -92,10 +92,10 @@
  elsif ($platform eq "$Winnt")
  {  $COMPATH_ROOT      = $COMPATH;
     $COMPATH_ROOT      =~ s/\/vc98$//;
-@@ -1067,25 +1088,19 @@
- {
- $SOLARINC            .= $I.$USR.$INCLUDE.
- 			$STLPORT_stlport;
+@@ -1107,21 +1128,14 @@
+ 	$SOLARINC            .= $I.$USR.$INCLUDE;
+ }
+ $SOLARINC	     .= $STLPORT_stlport;
 -if ($platform eq "$Linux")
 -{
 -# This simply adds an include path, so even cases that break the FHS work
@@ -109,20 +109,15 @@
 -# 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";
++$SOLARINC            .= $I.'$COMPATH'.$ds."include";
  }
  
 -if ($platform eq "$Linux")
-+if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
++if (($platform eq "$Linux") || ($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 @@
+@@ -1313,6 +1327,9 @@
  ToFile( "GUIENV",            $GUIENV,            "e" );
  ToFile( "GVER",              $GVER,              "e" );
  ToFile( "OS",                $OS,                "e" );
diff --git a/editors/openoffice-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk b/editors/openoffice-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk
new file mode 100644
index 00000000000..80392c839db
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-solenv::inc::startup::FREEBSD::macros.mk
@@ -0,0 +1,5 @@
+--- /dev/null	Mon Mar 11 14:55:01 2002
++++ ../solenv/inc/startup/FREEBSD/macros.mk	Mon Mar 11 14:54:59 2002
+@@ -0,0 +1,2 @@
++
++.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/editors/openoffice-devel/files/patch-soltools::mkdepend::main.c b/editors/openoffice-devel/files/patch-soltools::mkdepend::main.c
new file mode 100644
index 00000000000..a478fc59e21
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-soltools::mkdepend::main.c
@@ -0,0 +1,14 @@
+--- ../soltools/mkdepend/main.c.orig	Mon Mar 11 20:09:35 2002
++++ ../soltools/mkdepend/main.c	Mon Mar 11 17:25:55 2002
+@@ -27,6 +27,11 @@
+ 
+ */
+ 
++#ifdef FREEBSD
++#include <sys/types.h>
++#include <sys/stat.h>
++#endif
++
+ #include "def.h"
+ #ifdef hpux
+ #define sigvec sigvector
diff --git a/editors/openoffice-devel/files/patch-stoc::source::implementationregistration::implreg.cxx b/editors/openoffice-devel/files/patch-stoc::source::implementationregistration::implreg.cxx
new file mode 100644
index 00000000000..925e924b160
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-stoc::source::implementationregistration::implreg.cxx
@@ -0,0 +1,11 @@
+--- ../stoc/source/implementationregistration/implreg.cxx.orig	Mon Mar 11 20:08:04 2002
++++ ../stoc/source/implementationregistration/implreg.cxx	Mon Mar 11 19:55:02 2002
+@@ -192,7 +192,7 @@
+         tmpPath = buf.makeStringAndClear();
+     }
+     // I am the only one to own tmpPath here, so the cast is tolerateable.
+-    OSL_VERIFY( tmpPath.getStr() == mktemp( (sal_Char * ) tmpPath.getStr() ) );
++    OSL_VERIFY( (sal_Char * ) tmpPath.getStr() == (sal_Char * ) mktemp( (sal_Char * ) tmpPath.getStr() ) );
+ 	return OStringToOUString( tmpPath, osl_getThreadTextEncoding());
+ }
+