diff options
author | jlam <jlam> | 2002-10-10 01:01:09 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-10-10 01:01:09 +0000 |
commit | ab8421e7610e278ec07c28a8cacfbd4cdf07c49f (patch) | |
tree | 2399291c226930979154ddf72cdfd8db4723ce29 /www | |
parent | dcdb1ecb79824b1b2783dd61490b5d78cb640edf (diff) | |
download | pkgsrc-ab8421e7610e278ec07c28a8cacfbd4cdf07c49f.tar.gz |
Use PKG_JAVA_HOME consistently instead of JAVA_HOME now that JAVA_HOME is
no longer defined by bsd.pkg.mk.
Diffstat (limited to 'www')
-rw-r--r-- | www/ap-jk/Makefile | 8 | ||||
-rw-r--r-- | www/ap-jserv/Makefile | 6 | ||||
-rw-r--r-- | www/cocoon/Makefile | 4 | ||||
-rw-r--r-- | www/jakarta-tomcat/Makefile | 5 | ||||
-rw-r--r-- | www/jssi/Makefile | 4 |
5 files changed, 13 insertions, 14 deletions
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile index 7cd695468b6..0bb3dcbc5a5 100644 --- a/www/ap-jk/Makefile +++ b/www/ap-jk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/07/29 22:23:29 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/10 01:01:11 jlam Exp $ DISTNAME= jakarta-tomcat-3.2.4-src PKGNAME= ap-jk-3.2.4 @@ -20,9 +20,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/native/apache1.3 do-build: (cd ${WRKSRC} && \ ${LOCALBASE}/sbin/apxs -o mod_jk.so \ - -I../jk -I${JAVA_HOME}/include \ - -I${JAVA_HOME}/include/netbsd \ - -I${JAVA_HOME}/include/linux \ + -I../jk -I${PKG_JAVA_HOME}/include \ + -I${PKG_JAVA_HOME}/include/netbsd \ + -I${PKG_JAVA_HOME}/include/linux \ -c *.c ../jk/*.c) do-install: diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile index 72a5d080413..086f6a34639 100644 --- a/www/ap-jserv/Makefile +++ b/www/ap-jserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/07/24 19:45:30 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/10/10 01:01:12 jlam Exp $ DISTNAME= ApacheJServ-1.1.2 PKGNAME= ap-jserv-1.1.2 @@ -21,11 +21,11 @@ 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=${JAVA_HOME} \ +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 .include "../../mk/bsd.pkg.mk" -JSDK_HOME= ${JAVA_HOME}/jsdk +JSDK_HOME= ${PKG_JAVA_HOME}/jsdk BUILD_DEFS+= JSDK_HOME diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 7ce8f9b986c..6625dd58b61 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/06/12 20:34:04 jwise Exp $ +# $NetBSD: Makefile,v 1.17 2002/10/10 01:01:12 jlam Exp $ DISTNAME= Cocoon-1.8.2 PKGNAME= cocoon-1.8.2 @@ -62,5 +62,5 @@ do-install: .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:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar +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 MAKE_ENV+= CLASSPATH=${CLASSPATH} diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index 25171d1784e..c505dabcc6f 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/06/19 09:10:00 abs Exp $ +# $NetBSD: Makefile,v 1.31 2002/10/10 01:01:12 jlam Exp $ DISTNAME= jakarta-tomcat-3.2.4-src PKGNAME= jakarta-tomcat-3.2.4 @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME} CLASSPATH:= ${LOCALBASE}/lib/java/servlet.jar:${LOCALBASE}/lib/jaxp.jar:${LOCALBASE}/lib/parser.jar:${CLASSPATH} MAKEFILE= build.xml -MAKE_ENV+= JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH} ALL_TARGET= main INSTALL_TARGET= dist @@ -27,7 +26,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL post-patch: ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ - -e "s|@JAVA_HOME@|${JAVA_HOME}|g" \ + -e "s|@JAVA_HOME@|${PKG_JAVA_HOME}|g" \ ${WRKSRC}/src/etc/workers.properties > ${WRKSRC}/src/etc/workers.properties.tmp ${MV} ${WRKSRC}/src/etc/workers.properties.tmp ${WRKSRC}/src/etc/workers.properties ${RM} -f ${WRKSRC}/src/etc/workers.properties.orig diff --git a/www/jssi/Makefile b/www/jssi/Makefile index 83803868967..98dc63828ed 100644 --- a/www/jssi/Makefile +++ b/www/jssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/04/03 21:16:30 jwise Exp $ +# $NetBSD: Makefile,v 1.12 2002/10/10 01:01:12 jlam Exp $ DISTNAME= ApacheJSSI-1.1.2 PKGNAME= jssi-1.1.2 @@ -31,4 +31,4 @@ do-install: .include "../../mk/bsd.pkg.mk" # This must be after bsd.pkg.mk is brought in -CLASSPATH:=${CLASSPATH}:${PREFIX}/lib/java/jsdk.jar:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar +CLASSPATH:=${CLASSPATH}:${PREFIX}/lib/java/jsdk.jar:${PKG_JAVA_HOME}/lib/classes.zip:${PKG_JAVA_HOME}/lib/tools.jar |