summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/java-db3/Makefile4
-rw-r--r--devel/jakarta-ant/Makefile5
-rw-r--r--devel/sablecc/Makefile5
-rw-r--r--lang/jbuilder-jit/Makefile6
-rw-r--r--net/airportbasestationconfig/Makefile4
-rw-r--r--net/flan/Makefile6
-rw-r--r--time/cardboard-schedule/Makefile4
-rw-r--r--www/ap-jk/Makefile8
-rw-r--r--www/ap-jserv/Makefile6
-rw-r--r--www/cocoon/Makefile4
-rw-r--r--www/jakarta-tomcat/Makefile5
-rw-r--r--www/jssi/Makefile4
12 files changed, 31 insertions, 30 deletions
diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile
index 343be0cf789..bad7018e53a 100644
--- a/databases/java-db3/Makefile
+++ b/databases/java-db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/30 11:58:31 martti Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/10 01:01:09 jlam Exp $
DISTNAME= db-3.3.11
PKGNAME= java-db3-3.11.2
@@ -17,7 +17,7 @@ DISTINFO_FILE?= ${.CURDIR}/../db3/distinfo
PATCHDIR?= ${.CURDIR}/../db3/patches
USE_JAVA= yes
-JDK_BASE= ${JAVA_HOME}
+JDK_BASE= ${PKG_JAVA_HOME}
JAVAC= ${JDK_BASE}/bin/javac
JAR= ${JDK_BASE}/bin/jar
JAVACABS= ${JAVAC}
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index d1150981a72..805f75bbcdb 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/26 09:54:36 abs Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/10 01:01:10 jlam Exp $
#
# NOTE: if you are depending on ant from another package, please be aware that
# the ant team has CHANGED the version numbering scheme. A previous version
@@ -26,7 +26,8 @@ do-build:
${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} bootstrap.sh
post-build:
- ${SED} -e 's,@PREFIX@,${PREFIX},g' -e 's,@JAVA_HOME@,${JAVA_HOME},g' \
+ ${SED} -e 's,@PREFIX@,${PREFIX},g' \
+ -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' \
< ${FILESDIR}/ant > ${WRKDIR}/ant
do-install:
diff --git a/devel/sablecc/Makefile b/devel/sablecc/Makefile
index db980dbd85d..20d36cb92c6 100644
--- a/devel/sablecc/Makefile
+++ b/devel/sablecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/26 22:56:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/10 01:01:10 jlam Exp $
#
DISTNAME= sablecc-2.16.2
@@ -13,7 +13,8 @@ USE_JAVA= run
PKG_JVM= sun-jdk
do-build:
- ${SED} -e 's,@PREFIX@,${PREFIX},g' -e 's,@JAVA_HOME@,${JAVA_HOME},g' \
+ ${SED} -e 's,@PREFIX@,${PREFIX},g' \
+ -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' \
< ${FILESDIR}/sablecc > ${WRKDIR}/sablecc
do-install:
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index 65dc8febee5..0204f0415fa 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/08/16 00:06:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/10 01:01:11 jlam Exp $
#
DISTNAME= unix_jb35foundation
@@ -16,7 +16,7 @@ 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
-PLIST_SUBST+= JAVADIR=${JAVA_HOME:C|${PREFIX}/||}
+PLIST_SUBST+= JAVADIR=${PKG_JAVA_HOME:C|${PREFIX}/||}
WRKSRC= ${WRKDIR}/javacomp-1.2.15
EXTRACT_ELEMENTS= LinuxJIT/javacomp-1.2.15.tar.gz
@@ -45,7 +45,7 @@ post-extract:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/libjavacomp.so ${WRKSRC}/libjavacomp_g.so \
- ${JAVA_HOME}/lib/i386/
+ ${PKG_JAVA_HOME}/lib/i386/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jbuilder-jit
${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/jbuilder-jit/README.javacomp
${INSTALL_DATA} ${WRKSRC}/LICENSE.TXT ${PREFIX}/share/doc/jbuilder-jit/LICENSE.javacomp
diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile
index ca4f6ff9be5..ff1043a2613 100644
--- a/net/airportbasestationconfig/Makefile
+++ b/net/airportbasestationconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/09/08 06:19:00 tron Exp $
+# $NetBSD: Makefile,v 1.17 2002/10/10 01:01:11 jlam Exp $
DISTNAME= configurator_152-128
PKGNAME= ${BINNAME}-1.5.2
@@ -44,7 +44,7 @@ post-extract:
do-build:
${ECHO} "#!/bin/sh" >${WRKSRC}/${BINNAME}
- ${ECHO} "PATH=${JAVA_HOME}/bin:\$${PATH}; export PATH" >>${WRKSRC}/${BINNAME}
+ ${ECHO} "PATH=${PKG_JAVA_HOME}/bin:\$${PATH}; export PATH" >>${WRKSRC}/${BINNAME}
.if defined(CLASSPATH)
${ECHO} "CLASSPATH=${CLASSPATH}:\$${CLASSPATH}; export CLASSPATH" >>${WRKSRC}/${BINNAME}
.endif
diff --git a/net/flan/Makefile b/net/flan/Makefile
index 97a1363fe2b..7c6eea5db26 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/07 14:32:37 agc Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/10 01:01:11 jlam Exp $
#
DISTNAME= Flan
@@ -17,8 +17,8 @@ USE_GMAKE= yes
WRKSRC= ${WRKDIR}/src
post-build:
- cd ${WRKSRC} ; ${JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
- ${SED} -e 's,@JAVA_HOME@,${JAVA_HOME},g' \
+ cd ${WRKSRC} ; ${PKG_JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
+ ${SED} -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' \
-e 's,@PREFIX@,${PREFIX},g' \
< ${FILESDIR}/flan > ${WRKDIR}/flan
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile
index ca5ee49e4a4..04134cf962f 100644
--- a/time/cardboard-schedule/Makefile
+++ b/time/cardboard-schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:48 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/10 01:01:11 jlam Exp $
#
DISTNAME= cs113ins
@@ -36,7 +36,7 @@ post-extract:
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@,${JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched
+ ${SED} -e s,@JAVA_HOME@,${PKG_JAVA_HOME},g < ${WRKDIR}/csched.tmp2 > ${WRKDIR}/csched
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/cardboard-schedule
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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 11:24:33 +0000