[pkgsrc/trunk]: pkgsrc/misc/openoffice2-bin Missed one file when committing t...

[mrauch <mrauch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/99f7ffd15917
branches:  trunk
changeset: 501722:99f7ffd15917
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Wed Oct 26 18:26:52 2005 +0000

description:
Missed one file when committing the change to enable optional java support.
This patch was part of the patch set from Geert Hendrickx.

diffstat:

 misc/openoffice2-bin/Makefile      |   4 ++--
 misc/openoffice2-bin/files/soffice |  14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diffs (43 lines):

diff -r e81ca3db61e1 -r 99f7ffd15917 misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile     Wed Oct 26 18:22:37 2005 +0000
+++ b/misc/openoffice2-bin/Makefile     Wed Oct 26 18:26:52 2005 +0000
@@ -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 -r e81ca3db61e1 -r 99f7ffd15917 misc/openoffice2-bin/files/soffice
--- a/misc/openoffice2-bin/files/soffice        Wed Oct 26 18:22:37 2005 +0000
+++ b/misc/openoffice2-bin/files/soffice        Wed Oct 26 18:26:52 2005 +0000
@@ -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`