pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice2-bin Add optional java support via opt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a701e543ed55
branches:  trunk
changeset: 501456:a701e543ed55
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sun Oct 23 14:38:30 2005 +0000

description:
Add optional java support via options framework.
Patch from Geert Hendrickx in mail to tech-pkg.

diffstat:

 misc/openoffice2-bin/Makefile   |  10 +++++++++-
 misc/openoffice2-bin/options.mk |  12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r 5e381c79a606 -r a701e543ed55 misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile     Sun Oct 23 14:34:41 2005 +0000
+++ b/misc/openoffice2-bin/Makefile     Sun Oct 23 14:38:30 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/10/21 12:30:58 mrauch Exp $
+# $NetBSD: Makefile,v 1.6 2005/10/23 14:38:30 mrauch Exp $
 
 PKGNAME=               openoffice-bin-2.0.0
+PKGREVISION=           1
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/2.0.0/}
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
@@ -86,14 +87,21 @@
 DISTNAME=      # Dummy to prevent error from missing DISTNAME
 .endif
 
+.include "options.mk"
+
 do-install:
        ${RM} -f ${WRKDIR}/PLIST.nouniq
        ${RPM2PKG} ${RPM2PKGARGS} ${WRKSRC}/*.rpm
        uniq ${WRKDIR}/PLIST.nouniq >${WRKDIR}/PLIST
+.if !empty(PKG_JVM)
        ${RM} -f ${PREFIX}/bin/soffice
        ${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
+               -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
                < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
        ${CHMOD} +x ${PREFIX}/bin/soffice
+.else
+       ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice
+.endif
 .for i in scalc sdraw simpress swriter
        ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}
 .endfor
diff -r 5e381c79a606 -r a701e543ed55 misc/openoffice2-bin/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/openoffice2-bin/options.mk   Sun Oct 23 14:38:30 2005 +0000
@@ -0,0 +1,12 @@
+# $NetBSD
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.openoffice-bin
+PKG_SUPPORTED_OPTIONS= java
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjava)
+PKG_JVMS_ACCEPTED=     blackdown-jdk13 sun-jdk13 sun-jdk14 sun-jdk15
+USE_JAVA=              run
+.include "../../mk/java-vm.mk"
+.endif



Home | Main Index | Thread Index | Old Index