diff options
| -rw-r--r-- | net/airportbasestationconfig/Makefile | 28 | ||||
| -rw-r--r-- | textproc/fop/Makefile | 4 | ||||
| -rw-r--r-- | textproc/saxon/Makefile | 5 | ||||
| -rw-r--r-- | textproc/saxon/PLIST | 3 |
4 files changed, 20 insertions, 20 deletions
diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile index ff1043a2613..35a70dfc986 100644 --- a/net/airportbasestationconfig/Makefile +++ b/net/airportbasestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/10/10 01:01:11 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/10/18 21:24:55 jlam Exp $ DISTNAME= configurator_152-128 PKGNAME= ${BINNAME}-1.5.2 @@ -11,8 +11,6 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Configuration program for Apple's Airport Base Station -USE_JAVA= run - PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* @@ -24,20 +22,9 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} .include "../../mk/bsd.prefs.mk" -# "jdk" and "kaffe" packages don't work. -.if ${MACHINE_ARCH} == i386 || ${OPSYS} == "Darwin" -PKG_JVM= sun-jdk -.elif ${MACHINE_ARCH} == powerpc -PKG_JVM= blackdown-jdk13 -.else -PKG_JVM= none -.endif - -.if ${PKG_JVM} == blackdown-jdk13 -JVM_OPTS+= -green -jar -.else -JVM_OPTS= -jar -.endif +USE_BUILDLINK2= # defined +USE_JAVA= run +PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 blackdown-jdk13 post-extract: ${CHMOD} -R g-w,o-w ${WRKSRC}/* @@ -61,4 +48,11 @@ do-install: ${INSTALL_DATA} ReadMe.txt ${DOCDIR}/README && \ ${INSTALL_DATA} mainscreen.jpg manual.html ${DOCDIR} +.include "../../mk/java.mk" .include "../../mk/bsd.pkg.mk" + +.if ${PKG_JVM} == "blackdown-jdk13" +JVM_OPTS+= -green -jar +.else +JVM_OPTS+= -jar +.endif diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index f2739a52cfa..7325d781812 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/07/29 22:23:27 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/10/18 21:31:56 jlam Exp $ # # Note: we currently use the pre-built (-bin) distribution of FOP, # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is @@ -22,6 +22,7 @@ HOMEPAGE= http://xml.apache.org/fop/ COMMENT= the Apache Project's XSL Formatting Objects implementation USE_JAVA= run +USE_BUILDLINK2= NO_PATCH= NO_CONFIGURE= NO_BUILD= @@ -36,4 +37,5 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/fop cd ${WRKSRC}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/fop +.include "../../mk/java.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile index 0c591004a1e..f2c62e22fb1 100644 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/07/29 22:23:28 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/18 21:33:55 jlam Exp $ # DISTNAME= saxon @@ -13,9 +13,11 @@ COMMENT= Michael H. Kay's Java XSLT processor DIST_SUBDIR= ${PKGNAME} USE_JAVA= run +USE_BUILDLINK2= NO_PATCH= NO_CONFIGURE= NO_BUILD= + WRKSRC= ${WRKDIR} do-install: @@ -26,4 +28,5 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/saxon (cd ${WRKSRC} && ${PAX} -r -w -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java) +.include "../../mk/java.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/saxon/PLIST b/textproc/saxon/PLIST index 8a486357f01..180f3d42fef 100644 --- a/textproc/saxon/PLIST +++ b/textproc/saxon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/10/18 21:33:56 jlam Exp $ lib/java/saxon.jar share/doc/java/saxon/api-guide.html share/doc/java/saxon/changes.html @@ -438,3 +438,4 @@ share/examples/java/saxon/styles/bible.xsl @dirrm share/doc/java/saxon/api/com @dirrm share/doc/java/saxon/api @dirrm share/doc/java/saxon +@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE} |