diff options
| -rw-r--r-- | misc/openoffice-linux/Makefile | 9 | ||||
| -rw-r--r-- | misc/openoffice-linux/PLIST | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile index 52a6e3fbd62..6f5566866b0 100644 --- a/misc/openoffice-linux/Makefile +++ b/misc/openoffice-linux/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2003/03/29 12:41:51 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/31 17:57:18 jschauma Exp $ DISTNAME= OOo_1.0.2_LinuxIntel_install PKGNAME= openoffice-linux-1.0.2 -PKGREVISION= 3 +PKGREVISION= 4 WRKSRC= ${WRKDIR}/install CATEGORIES= misc MASTER_SITES= http://sf1.mirror.openoffice.org/stable/1.0.2/ \ @@ -23,6 +23,9 @@ TEMP?= ${WRKSRC} .include "../../mk/bsd.prefs.mk" +PKG_JVM?= sun-jdk +PLIST_SUBST+= JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}" + DISPLAY?= # empty, if unset checkforx: .if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO" @@ -64,6 +67,7 @@ do-install: ${CHMOD} +x ${PREFIX}/bin/soffice ${PATCH} ${PATCH_ARGS} ${PREFIX}/OpenOffice.org1.0.2/program/soffice \ < ${FILESDIR}/soffice.test.patch + ${LN} -s ${PKG_JAVA_HOME} ${PKG_JAVA_HOME}/jre # everything specific to your OS/Arch goes into it's own Makefile # group together i386, i486, i586 and i686 (for Linux) @@ -74,4 +78,5 @@ ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g} . include "Makefile.${OPSYS}.${ARCH}" .endif +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/openoffice-linux/PLIST b/misc/openoffice-linux/PLIST index 41264d00f6d..6cceeae3530 100644 --- a/misc/openoffice-linux/PLIST +++ b/misc/openoffice-linux/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/02/27 20:59:20 mrauch Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/03/31 17:57:18 jschauma Exp $ OpenOffice.org1.0.2/LICENSE OpenOffice.org1.0.2/LICENSE.html OpenOffice.org1.0.2/README @@ -3101,6 +3101,7 @@ OpenOffice.org1.0.2/user/gallery/sg100.thm OpenOffice.org1.0.2/user/gallery/sg30.sdv OpenOffice.org1.0.2/user/gallery/sg30.thm bin/soffice +${JAVA_HOME}/jre @dirrm OpenOffice.org1.0.2/user/wordbook @dirrm OpenOffice.org1.0.2/user/template @dirrm OpenOffice.org1.0.2/user/temp |