Upgrade to 1.0.1

1 files changed, 5 insertions, 38 deletions

diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
index 5a563718c8e0..2957c2be79d2 100644
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Wed Apr 17 22:37:42 2002
-+++ configure.in	Thu Jun  6 13:10:49 2002
+--- configure.in.orig	Sat Jun  8 02:49:26 2002
++++ configure.in	Mon Jul 15 13:36:23 2002
 @@ -28,6 +28,11 @@
  
                            Usage: --enable-gcc3
@@ -34,39 +34,6 @@
     dnl ******************************************
     dnl Testing for GNU compiler and version...
     dnl ******************************************
-@@ -277,13 +288,13 @@
- 
-    if test $GCC; then
-       AC_MSG_CHECKING([the GNU gcc compiler version])
--      _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
-+      _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
-       if test "$_gcc_releasetype" = "egcs"; then
-          AC_MSG_WARN([found egcs- version,  use (stable=gcc-) version of the compiler])
-          AC_MSG_WARN([found egcs- version,  use (stable=gcc-) version of the compiler]) >> warn
--         _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
-+         _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
-       else
--         _gcc_version=`$GCC --version`
-+         _gcc_version=`$CC --version`
-       fi
-       _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` 
-       if test -n "$enable_gcc3"; then 
-@@ -296,13 +307,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
 @@ -366,8 +377,9 @@
                       _gcc_include_path="NO_GCC_INCLUDE"
                    fi
@@ -180,7 +147,7 @@
  dnl **************************************************************
 @@ -815,6 +912,10 @@
     fi
-    if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
+    if test "$_os" = "NetBSD"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
 +      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
 +      if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
@@ -189,7 +156,7 @@
     fi
     if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-@@ -1169,6 +1270,12 @@
+@@ -1170,6 +1271,12 @@
     USE_GCC3="FALSE"
  fi
  
@@ -202,7 +169,7 @@
  # Print args passed to set_soenv.
  if test 1 = 1; then
  echo
-@@ -1196,12 +1303,14 @@
+@@ -1197,12 +1304,14 @@
  echo "\$MINGWIN32="$WITH_MINGWIN
  echo "\$with_use_shell="$with_use_shell
  echo "\$USE_GCC3="$USE_GCC3