diff options
Diffstat (limited to 'editors/openoffice/files/patch-config_office+set_soenv.1')
| -rw-r--r-- | editors/openoffice/files/patch-config_office+set_soenv.1 | 65 |
1 files changed, 28 insertions, 37 deletions
diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1 index cb0b90d9bb02..aa914b01327c 100644 --- a/editors/openoffice/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice/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 @@ - { - $SOLARINC .= $I.$USR.$INCLUDE. - $STLPORT_stlport; --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"; + { + my ( $noldPATH ); +@@ -1191,7 +1212,7 @@ + $SOLARINC .= $I.$USR.$INCLUDE; } - + $SOLARINC .= $STLPORT_stlport; -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; +@@ -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; +-} $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" ); |