From 2c140f9f2af923b873467ec83ec8e74bfc947099 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 31 Dec 2002 15:44:28 +0000 Subject: Mechanical conversion to use java-vm.mk. --- databases/db4/Makefile | 12 ++++++------ databases/jdbc-postgresql/Makefile | 5 ++--- devel/sablecc/Makefile | 5 +++-- editors/jde/Makefile | 4 ++-- games/cgoban-java/Makefile | 3 ++- lang/jbuilder-jit/Makefile | 36 +++++++++++++----------------------- lang/jbuilder-jit/PLIST | 4 ++-- net/xnap/Makefile | 8 +++++--- time/cardboard-schedule/Makefile | 22 ++++++++++------------ www/ap-jserv/Makefile | 21 +++++++++++---------- www/cocoon/Makefile | 6 +++--- www/hiawatha/Makefile | 3 ++- www/jsdk20/Makefile | 3 ++- www/jssi/Makefile | 4 ++-- www/spfc/Makefile | 4 ++-- x11/swing/Makefile | 3 ++- 16 files changed, 69 insertions(+), 74 deletions(-) diff --git a/databases/db4/Makefile b/databases/db4/Makefile index d5f14ef77dc..05422798ebc 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/11/15 00:50:19 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/31 15:44:28 jlam Exp $ DISTNAME= db-4.0.14 PKGNAME= db4-4.0.14 @@ -9,11 +9,6 @@ MAINTAINER= dolemite@wuli.nu HOMEPAGE= http://www.sleepycat.com/ COMMENT= Sleepycat Software's Berkeley DB version 4 -.if defined(WITH_JAVA) && (${WITH_JAVA} == "YES") -USE_JAVA= YES -CONFIGURE_ARGS+= --enable-java -.endif - USE_BUILDLINK2= yes USE_CXX= yes USE_LIBTOOL= yes @@ -27,6 +22,11 @@ CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db4 CONFIGURE_ARGS+= --enable-cxx CONFIGURE_ARGS+= --enable-shared +.if defined(WITH_JAVA) && (${WITH_JAVA} == "YES") +CONFIGURE_ARGS+= --enable-java +. include "../../mk/java-vm.mk" +.endif + WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix post-install: diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile index 7c4e0d1ea78..4e51aa6bb24 100644 --- a/databases/jdbc-postgresql/Makefile +++ b/databases/jdbc-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/09/26 10:07:15 abs Exp $ +# $NetBSD: Makefile,v 1.16 2002/12/31 15:44:28 jlam Exp $ # DISTNAME= postgresql-${VERSION} @@ -22,9 +22,7 @@ EXTRACT_ELEMENTS= ${DISTNAME}/src/interfaces/jdbc .include "../../mk/bsd.prefs.mk" USE_GMAKE= -USE_JAVA= NO_CONFIGURE= -CLASSPATH:= ${CLASSPATH}:. HELP_FILES= README Implementation CHANGELOG @@ -45,4 +43,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${X} ${PREFIX}/share/doc/java/jdbc-postgresql .endfor +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/sablecc/Makefile b/devel/sablecc/Makefile index 20d36cb92c6..6381e244773 100644 --- a/devel/sablecc/Makefile +++ b/devel/sablecc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/10/10 01:01:10 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/31 15:44:28 jlam Exp $ # DISTNAME= sablecc-2.16.2 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.sablecc.org/ COMMENT= Java based Compiler Compiler USE_JAVA= run -PKG_JVM= sun-jdk +USE_JAVA2= yes do-build: ${SED} -e 's,@PREFIX@,${PREFIX},g' \ @@ -22,4 +22,5 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/lib/sablecc.jar ${PREFIX}/lib/java +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/jde/Makefile b/editors/jde/Makefile index 4a149dd58ec..42f67266700 100644 --- a/editors/jde/Makefile +++ b/editors/jde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:00 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/12/31 15:44:29 jlam Exp $ # DISTNAME= jde-2.2.7.1 @@ -33,7 +33,6 @@ BUILD_ENV+= LISPDIR=${LISPDIR} PLIST_SUBST+= LISPDIR=${LISPDIR} NO_CONFIGURE= # set -USE_JAVA= yes WRKSRC= ${WRKDIR}/${DISTNAME}/lisp MAKEFILE= makefile @@ -43,4 +42,5 @@ do-install: cd ${WRKDIR}/${DISTNAME} ; tar cf - . | \ ( cd ${PREFIX}/${LISPDIR} ; tar xf - ) +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/cgoban-java/Makefile b/games/cgoban-java/Makefile index 9e143a265e6..3662da7b6f2 100644 --- a/games/cgoban-java/Makefile +++ b/games/cgoban-java/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/12/07 00:27:03 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/12/31 15:44:29 jlam Exp $ # DISTNAME= cgoban-unix-2.4.55 @@ -25,4 +25,5 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cgoban.sh ${PREFIX}/bin/cgoban-java ${INSTALL_DATA} ${WRKSRC}/cgoban.jar ${PREFIX}/libexec +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile index 0204f0415fa..b8ec8216f07 100644 --- a/lang/jbuilder-jit/Makefile +++ b/lang/jbuilder-jit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/10/10 01:01:11 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/12/31 15:44:29 jlam Exp $ # DISTNAME= unix_jb35foundation @@ -15,30 +15,22 @@ HOMEPAGE= http://www.borland.com COMMENT= Just-In-Time compiler for Linux Java Virtual Machine USE_JAVA= run -PKG_JVM= sun-jdk13 # works with both 1.2.2 and 1.3 JVMs +USE_JAVA2= yes PLIST_SUBST+= JAVADIR=${PKG_JAVA_HOME:C|${PREFIX}/||} -WRKSRC= ${WRKDIR}/javacomp-1.2.15 -EXTRACT_ELEMENTS= LinuxJIT/javacomp-1.2.15.tar.gz - -LICENSE= single-user-license -RESTRICTED= "Redistribution of binaries not permitted" -NO_BIN_ON_CDROM=${RESTRICTED} -NO_SRC_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} - -.include "../../mk/bsd.prefs.mk" +ONLY_FOR_PLATFORM= NetBSD-*-i386 -.if !defined(JDK_HOME) -JDK_HOME:= ${LOCALBASE}/java -.endif +WRKSRC= ${WRKDIR}/javacomp-1.2.15 +EXTRACT_ELEMENTS= LinuxJIT/javacomp-1.2.15.tar.gz -NO_BUILD= yes -# since we change PREFIX: -NO_MTREE= yes +LICENSE= single-user-license +RESTRICTED= "Redistribution of binaries not permitted" +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} -ONLY_FOR_PLATFORM= NetBSD-*-i386 +NO_BUILD= yes post-extract: @cd ${WRKDIR} && ${GTAR} -xzf ${EXTRACT_ELEMENTS} @@ -50,7 +42,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/jbuilder-jit/README.javacomp ${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${PREFIX}/share/doc/jbuilder-jit/LICENSE.javacomp +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" - -# This needs to be after bsd.pkg.mk -PREFIX:= ${JDK_HOME} diff --git a/lang/jbuilder-jit/PLIST b/lang/jbuilder-jit/PLIST index cfb431e4e48..06fd0409d8a 100644 --- a/lang/jbuilder-jit/PLIST +++ b/lang/jbuilder-jit/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/07 17:28:56 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/31 15:44:29 jlam Exp $ ${JAVADIR}/lib/i386/libjavacomp.so ${JAVADIR}/lib/i386/libjavacomp_g.so share/doc/jbuilder-jit/README.javacomp share/doc/jbuilder-jit/LICENSE.javacomp @dirrm share/doc/jbuilder-jit -@unexec ${RMDIR} %D/sun-1.3.1/lib/i386 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/${JAVADIR}/lib/i386 2>/dev/null || ${TRUE} diff --git a/net/xnap/Makefile b/net/xnap/Makefile index b06b8e02eb1..c91221e1e07 100644 --- a/net/xnap/Makefile +++ b/net/xnap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/04/30 14:42:38 jwise Exp $ +# $NetBSD: Makefile,v 1.3 2002/12/31 15:44:29 jlam Exp $ # DISTNAME= xnap-2.0 @@ -9,7 +9,6 @@ MAINTAINER= Benjamin.Wong@cc.gatech.edu HOMEPAGE= http://xnap.sourceforge.net/ COMMENT= Java filesharing client with support for OpenNap -USE_JAVA= yes NO_BUILD= yes do-install: @@ -20,7 +19,10 @@ do-install: ${CP} ${WRKSRC}/README ${PREFIX}/share/doc/xnap ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/xnap ${PREFIX}/share/doc/xnap -.include "../../mk/bsd.pkg.mk" +.include "../../mk/java-vm.mk" + .if ${PKG_JVM} == "jdk" || ${PKG_JVM} == "kaffe" DEPENDS+= swing-[0-9]*:../../x11/swing .endif + +.include "../../mk/bsd.pkg.mk" diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 04134cf962f..54d777d651f 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/10/10 01:01:11 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/12/31 15:44:29 jlam Exp $ # DISTNAME= cs113ins @@ -11,7 +11,6 @@ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://cardboard.nu/download.shtml COMMENT= project and resource management software implemented in Java/Swing -USE_JAVA= yes USE_X11BASE= yes DEPENDS+= unzip-[0-9]*:../../archivers/unzip DEPENDS+= swing-[0-9]*:../../x11/swing @@ -31,18 +30,17 @@ CSFILES= cs/images/Logo2.gif \ stage/CsHelp.jar post-extract: - (cd ${WRKDIR} && unzip -x InstallerData/Installer.zip) || ${TRUE} + (cd ${WRKDIR} && unzip -x InstallerData/Installer.zip) || ${TRUE} -post-build: - ${SED} -e s,@PREFIX@,${PREFIX},g < ${FILESDIR}/csched.sh > ${WRKDIR}/csched.tmp - ${SED} -e s,@LOCALBASE@,${LOCALBASE},g < ${WRKDIR}/csched.tmp > ${WRKDIR}/csched.tmp2 - ${SED} -e s,@JAVA_HOME@,${PKG_JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched +do-build: + ${SED} -e s,@PREFIX@,${PREFIX},g < ${FILESDIR}/csched.sh > ${WRKDIR}/csched.tmp + ${SED} -e s,@LOCALBASE@,${LOCALBASE},g < ${WRKDIR}/csched.tmp > ${WRKDIR}/csched.tmp2 + ${SED} -e s,@JAVA_HOME@,${PKG_JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/cardboard-schedule - @(cd ${WRKDIR}/C:/projects && ${GTAR} cf - ${CSFILES} | (cd ${PREFIX}/lib/cardboard-schedule && ${GTAR} xvf -)) - ${INSTALL_SCRIPT} ${WRKDIR}/csched ${PREFIX}/bin - -do-build: + ${INSTALL_DATA_DIR} ${PREFIX}/lib/cardboard-schedule + @(cd ${WRKDIR}/C:/projects && ${GTAR} cf - ${CSFILES} | (cd ${PREFIX}/lib/cardboard-schedule && ${GTAR} xvf -)) + ${INSTALL_SCRIPT} ${WRKDIR}/csched ${PREFIX}/bin +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" 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 diff --git a/x11/swing/Makefile b/x11/swing/Makefile index 3ef15d44530..298c58cbd6c 100644 --- a/x11/swing/Makefile +++ b/x11/swing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/07/29 22:23:30 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/12/31 15:44:31 jlam Exp $ DISTNAME= swing1_1_1 PKGNAME= swing-1.1.1 @@ -74,4 +74,5 @@ do-install: ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/doc/java/swing \ ${PREFIX}/share/examples/java/swing +.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3