diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-28 12:56:03 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-28 12:56:03 +0000 |
| commit | 91b8ba360b680069e7e64da7ab5f07b7017486b5 (patch) | |
| tree | e3a73f86d59421bc6ce45abb7b1194a00827a7a4 /editors/openoffice.org-3-RC | |
| parent | Update to dumpasn1-20030222 (diff) | |
Remove the FreeBSD SOLARLIB part now /usr/lib and /usr/local/lib
have been removed from the default settings.
Notes
Notes:
svn path=/head/; revision=77621
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in index 5cd53275cba4..f0f9c986eca0 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ --- set_soenv.in.orig Thu Feb 27 14:12:36 2003 -+++ set_soenv.in Fri Mar 28 07:16:24 2003 ++++ set_soenv.in Fri Mar 28 12:54:52 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,16 +28,32 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -982,6 +983,8 @@ - { $SOLAREXTRALIB = $L.$LIB. - $L.$USR.$LIB; +@@ -1184,7 +1185,7 @@ + $L_STLPORT_LIB. + $L.$XLIB; } -+if ($platform eq "$FreeBSD") -+{ $SOLAREXTRALIB = $L.$JAVA_HOME/jre/lib/i386; - - # Compiler include search directory paths. - if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || -@@ -1265,7 +1268,13 @@ +-elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) ++elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD")) + { $SOLARLIB = $L.$par_dir.$LIB. + $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. + $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. +@@ -1196,15 +1197,6 @@ + $L_STLPORT_LIB. + $L.$XLIB; + } +-elsif ($platform eq "$FreeBSD") +-{ $SOLARLIB = $L.$par_dir.$LIB. +- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. +- $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. +- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. +- $L.'$JAVA_HOME'.$LIB. +- $L_STLPORT_LIB. +- $L.$XLIB; +-} + elsif ($platform eq "$Winnt") + { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. + $L.$par_dir.$LIB. +@@ -1265,7 +1257,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") |