Mechanical conversion to use java-vm.mk.

6 files changed, 22 insertions, 19 deletions

diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 086f6a34639..d68e342dbc3 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/10/10 01:01:12 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2002/12/31 15:44:30 jlam Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -14,17 +14,18 @@ DEPENDS+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9]
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
 USE_PERL5=	build	# for "apxs"
 
-.include "../../mk/bsd.prefs.mk"
-
-USE_JAVA=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/src/scripts/build/unix/ltconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs --with-jdk-home=${PKG_JAVA_HOME} \
-	--with-JSDK=${PREFIX}/lib/java/jsdk.jar --with-logdir=/var/log/httpd \
-	--with-servlets=${LOCALBASE}/share/httpd/servlets -enable-EAPI
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs
+CONFIGURE_ARGS+=	--with-jdk-home=${PKG_JAVA_HOME}
+CONFIGURE_ARGS+=	--with-JSDK=${PREFIX}/lib/java/jsdk.jar
+CONFIGURE_ARGS+=	--with-logdir=/var/log/httpd
+CONFIGURE_ARGS+=	--with-servlets=${LOCALBASE}/share/httpd/servlets
+CONFIGURE_ARGS+=	--enable-EAPI
 
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
 
 JSDK_HOME=	${PKG_JAVA_HOME}/jsdk
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 6625dd58b61..1ec4ceff30c 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/10/10 01:01:12 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/12/31 15:44:30 jlam Exp $
 
 DISTNAME=	Cocoon-1.8.2
 PKGNAME=	cocoon-1.8.2
@@ -13,6 +13,7 @@ COMMENT=	the Apache Project's XML/XSL based web publishing system
 # so until the interfaces stabilize more.  Until then, new versions of these
 # libraries will be tested heavily with cocoon, and if not usable will be
 # imported as -current packages.
+#
 DEPENDS+=	xalan-j-1.2:../../textproc/xalan-j
 DEPENDS+=	fop-0.15.0:../../textproc/fop
 DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
@@ -31,8 +32,6 @@ DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
 WRKSRC=		${WRKDIR}/${PKGNAME}
 NO_CONFIGURE=
 
-USE_JAVA=	yes
-
 post-extract:
 	${RM} ${WRKSRC}/lib/fop_0_15_0.jar ${WRKSRC}/lib/servlet_2_2.jar \
 		${WRKSRC}/lib/xalan_1_2_D02.jar ${WRKSRC}/lib/xerces_1_2.jar \
@@ -60,6 +59,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/cocoon.properties ${PREFIX}/share/examples/java/cocoon/WEB-INF
 	cd ${WRKSRC}/samples && ${PAX} -rwpp . ${PREFIX}/share/examples/java/cocoon
 
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
 
 CLASSPATH:=${CLASSPATH}:${LOCALBASE}/lib/java/fop.jar:${LOCALBASE}/lib/java/xalan.jar:${LOCALBASE}/lib/java/bsf.jar:${LOCALBASE}/lib/java/xerces.jar:${LOCALBASE}/lib/java/servlet.jar:${PKG_JAVA_HOME}/lib/classes.zip:${PKG_JAVA_HOME}/lib/tools.jar
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 6622c313c78..2812326ae6f 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/29 22:23:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/12/31 15:44:30 jlam Exp $
 #
 
 DISTNAME=	hiawatha
@@ -53,4 +53,5 @@ do-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/examples/hiawatha/WEBROOT/images
 	${INSTALL_SCRIPT} ${WRKDIR}/hiawatha.sh ${PREFIX}/etc/rc.d/hiawatha
 
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 1a76eb31da7..b7a955ec78e 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/07/29 22:23:30 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/12/31 15:44:30 jlam Exp $
 # STOP!  Don't update this to a later version of this software.
 # The JSDK and Apache Jakarta projects have merged, making the
 # jakarta-tomcat package the current version of this software.
@@ -71,4 +71,5 @@ do-install:
 	cd ${WRKSRC}/examples ; ${GTAR} pcf - . | ( cd ${PREFIX}/share/examples/java/jsdk20 ; ${GTAR} pvxf - )
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/java/jsdk20
 
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 98dc63828ed..19707ac7a15 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/10 01:01:12 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/12/31 15:44:30 jlam Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -14,7 +14,6 @@ DEPENDS+=	jsdk-2.0:../../www/jsdk20
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_JAVA=
 USE_GMAKE=
 NO_CONFIGURE=
 WRKSRC=		${WRKDIR}/ApacheJSSI-1.1.2/src/java
@@ -28,6 +27,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi
 	cd ${WRKSRC}/../../docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/jssi
 
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # This must be after bsd.pkg.mk is brought in
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 9bf3400580d..0e62029f58e 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/04/03 21:16:30 jwise Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/31 15:44:31 jlam Exp $
 
 DISTNAME=	spfc-0.2.0
 CATEGORIES=	www
@@ -13,7 +13,6 @@ DEPENDS+=	jsdk-2.0:../../www/jsdk20
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_JAVA=
 USE_GMAKE=
 NO_CONFIGURE=
 MAKE_ENV+=	CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
@@ -24,6 +23,7 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/java/spfc
 	cd ${WRKSRC}/../docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/spfc
 
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # This must be after the include of bsd.pkg.mk