summaryrefslogtreecommitdiff
path: root/misc/openoffice2-bin
diff options
context:
space:
mode:
authormrauch <mrauch@pkgsrc.org>2005-10-26 18:26:52 +0000
committermrauch <mrauch@pkgsrc.org>2005-10-26 18:26:52 +0000
commit24299b5cb3bb209c332aa2f839ccdb7d3f760016 (patch)
treee82b804ae9b5e2609c331fc1d0a25022d16a982c /misc/openoffice2-bin
parent466002dcd9b6baa6d48ca49488839271de1b6a52 (diff)
downloadpkgsrc-24299b5cb3bb209c332aa2f839ccdb7d3f760016.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.
Diffstat (limited to 'misc/openoffice2-bin')
-rw-r--r--misc/openoffice2-bin/Makefile4
-rw-r--r--misc/openoffice2-bin/files/soffice14
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`