diff options
| author | mrauch <mrauch@pkgsrc.org> | 2005-10-26 18:26:52 +0000 |
|---|---|---|
| committer | mrauch <mrauch@pkgsrc.org> | 2005-10-26 18:26:52 +0000 |
| commit | 1f2bfa9fa45bbe408a2b870cb62e4e0d2e71490b (patch) | |
| tree | e82b804ae9b5e2609c331fc1d0a25022d16a982c | |
| parent | 419803ab785955f56cbe2e9f2fa71e24cc871303 (diff) | |
| download | pkgsrc-1f2bfa9fa45bbe408a2b870cb62e4e0d2e71490b.tar.gz | |
Missed one file when committing the change to enable optional java support.
This patch was part of the patch set from Geert Hendrickx.
| -rw-r--r-- | misc/openoffice2-bin/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice2-bin/files/soffice | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 36baac82345..1a5d59c0d30 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2005/10/26 11:56:12 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/10/26 18:26:52 mrauch Exp $ PKGNAME= openoffice-bin-2.0.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/2.0.0/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/misc/openoffice2-bin/files/soffice b/misc/openoffice2-bin/files/soffice index a7212b438b3..1a9723a1460 100644 --- a/misc/openoffice2-bin/files/soffice +++ b/misc/openoffice2-bin/files/soffice @@ -1,22 +1,16 @@ #!/bin/sh # -# $NetBSD: soffice,v 1.2 2005/10/10 20:08:49 mrauch Exp $ +# $NetBSD: soffice,v 1.3 2005/10/26 18:26:52 mrauch Exp $ # SOINST=@@PREFIX@@/openoffice.org@@OO_VER@@ # make sure we can find `whoami` on solaris PATH=${PATH}:/usr/ucb -# add an existing java directory to $PATH to allow OOo to +# add the chosen java directory to $PATH to allow OOo to # automatically find it -# -if [ -d "@@PREFIX@@/java" ]; then - for i in @@PREFIX@@/java/*; do - if [ -f "$i/bin/java" ]; then - export PATH=$PATH:$i/bin - fi - done -fi +PATH=${PATH}:@@JAVA_HOME@@ + # default data seg size is too small for java ulimit -d `ulimit -H -d` |