From 0a3a57c1f5cd3dc99b944279dbb1b79822a3ff19 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Fri, 8 Mar 2002 23:06:20 +0000
Subject: Use autoconf, remove the ugly configure patch. Do the gcc tests and
 fix them while we are here (AWK had an endless loop), add a FreeBSD configure
 variable called with-os-version, so we can check the OSVERSION in the build
 to support both STABLE and CURRENT (there are different patches needed)

---
 editors/openoffice-1.1/files/patch-set_soenv.1 | 53 +++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 5 deletions(-)

(limited to 'editors/openoffice-1.1/files/patch-set_soenv.1')

diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1
index 7fc4bc5acc06..1e86e46d31ae 100644
--- a/editors/openoffice-1.1/files/patch-set_soenv.1
+++ b/editors/openoffice-1.1/files/patch-set_soenv.1
@@ -1,6 +1,41 @@
---- set_soenv.1.orig	Thu Mar  7 16:23:57 2002
-+++ set_soenv.1	Thu Mar  7 16:24:14 2002
-@@ -954,7 +954,7 @@
+--- set_soenv.1.orig	Tue Nov 20 18:26:33 2001
++++ set_soenv.1	Fri Mar  8 22:33:35 2002
+@@ -40,7 +40,7 @@
+ #
+ # Set this value equal to the corresponding amount of
+ # command line arguments. 
+-my $numArgs = 17;
++my $numArgs = 18;
+ # Determining the amount of arguments in the call.
+ my $numEnter = $#ARGV + 1;
+ if ( $numEnter != $numArgs ) 
+@@ -72,7 +72,7 @@
+ #
+ # Platform dependent constant values.
+ my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, 
+-     $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
++     $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH,
+      $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx );
+ #
+ #-------------------------------------------
+@@ -301,7 +301,7 @@
+    $PROSWITCH      = "-DPRODUCT";
+    $XPVERSION      = "3";
+    $SOLAR_JAVA	   = "TRUE"; 
+-      $XPVERSION      = "3";
++   $XPVERSION      = "3";
+ } 
+ elsif ( $platform eq "$FreeBSD" ) 
+ {     print "Setting FreeBSD specific values... ";
+@@ -324,6 +324,7 @@
+       $PATH_SEPERATOR = $ps;
+       $PROSWITCH      = "-DPRODUCT";
+       $XPVERSION      = "3";
++      $OSVERSION      = $ARGV[ 17 ];
+ } 
+ elsif ( $platform eq "$Linux" ) 
+ {
+@@ -954,7 +955,7 @@
                          $ps.$USR.$LIB.
                          $ps.$USR_LOCAL.$BIN;
  }
@@ -9,7 +44,7 @@
  {  $PATH              = $cur_dir.
                          $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
                          $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-@@ -968,6 +968,22 @@
+@@ -968,6 +969,22 @@
                          $ps.$USR.$BIN.$ds."X11".
                          $ps.$USR.$LIB;
  }
@@ -32,7 +67,7 @@
  elsif ($platform eq "$Winnt")
  {  $COMPATH_ROOT      = $COMPATH;
     $COMPATH_ROOT      =~ s/\/vc98$//;
-@@ -1067,25 +1083,19 @@
+@@ -1067,25 +1084,19 @@
  {
  $SOLARINC            .= $I.$USR.$INCLUDE.
  			$STLPORT_stlport;
@@ -62,3 +97,11 @@
  $SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
                          $I.'$JAVA_HOME'.$INCLUDE;
  
+@@ -1273,6 +1284,7 @@
+ ToFile( "GUIENV",            $GUIENV,            "e" );
+ ToFile( "GVER",              $GVER,              "e" );
+ ToFile( "OS",                $OS,                "e" );
++ToFile( "OSVERSION",         $OSVERSION,         "e" );
+ ToFile( "OUTPATH",           $OUTPATH,           "e" );
+ ToFile( "INPATH",            $INPATH,            "e" );
+ ToFile( "GVERDIR",           $GVERDIR,           "e" );
-- 
cgit v1.2.3