diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2010-03-11 09:42:07 +0000 |
| commit | 08acf5c407242344b0047b8040900f52df620dde (patch) | |
| tree | 49936ec28d8b2a4256959f13245d757df97e04bd /editors/openoffice-3-devel/files/patch-i87583 | |
| parent | Upgrade to version 2.4.0. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_7_3_0'.release/7.3.0
Notes
Notes:
svn path=/head/; revision=250901
svn path=/tags/RELEASE_7_3_0/; revision=250902; tag=release/7.3.0
Diffstat (limited to 'editors/openoffice-3-devel/files/patch-i87583')
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i87583 | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i87583 b/editors/openoffice-3-devel/files/patch-i87583 deleted file mode 100644 index 750935a3030b..000000000000 --- a/editors/openoffice-3-devel/files/patch-i87583 +++ /dev/null @@ -1,36 +0,0 @@ ---- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400 -+++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400 -@@ -75,6 +75,15 @@ - - # extend the ld_library_path for java: javaldx checks the sofficerc for us - if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then -+ # this is a temporary hack until we can live with the default search paths -+ case "`uname -s`" in -+ FreeBSD) -+ sd_prog1="$sd_prog/../basis-link/program" -+ sd_prog2="$sd_prog/../basis-link/ure-link/lib" -+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} -+ export LD_LIBRARY_PATH -+ ;; -+ esac - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ - "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` - if [ -n "$my_path" ] ; then ---- padmin/source/spadmin.sh.orig 2008-06-27 01:18:09.000000000 -0400 -+++ padmin/source/spadmin.sh 2008-06-27 13:31:09.000000000 -0400 -@@ -58,6 +58,15 @@ - - # extend the ld_library_path for java: javaldx checks the sofficerc for us - if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then -+ # this is a temporary hack until we can live with the default search paths -+ case "`uname -s`" in -+ FreeBSD) -+ sd_prog1="$sd_prog/../basis-link/program" -+ sd_prog2="$sd_prog/../basis-link/ure-link/lib" -+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} -+ export LD_LIBRARY_PATH -+ ;; -+ esac - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ - "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` - if [ -n "$my_path" ] ; then |