summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorabs <abs>2003-01-29 09:34:29 +0000
committerabs <abs>2003-01-29 09:34:29 +0000
commit39cb730bde522dccaa9223d2e2d77693f827f916 (patch)
tree8aa41a16dff5459e2fa4d70d0f804f7b403dadc9 /mk
parentd80cba644826a7a86ef44e96694e56132f5749d8 (diff)
downloadpkgsrc-39cb730bde522dccaa9223d2e2d77693f827f916.tar.gz
Set _JAVA_BASE_CLASSES to classes.zip or wre.jar in java-vm.mk, then use in
bsd.pkg.mk. We are now more wonka friendly.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
-rw-r--r--mk/java-vm.mk5
2 files changed, 7 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5005322ba3b..64847e4b573 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1134 2003/01/28 22:57:53 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1135 2003/01/29 09:34:29 abs Exp $
#
# This file is in the public domain.
#
@@ -677,8 +677,8 @@ MAKEFLAGS+= ${def:C/=.*//}=${_dir_${def:C/=.*//}}
# and it's value is indirectly set by EVAL_PREFIX.
#
.if defined(USE_JAVA)
-. if exists(${PKG_JAVA_HOME}/lib/classes.zip)
-_JAVA_CLASSES_ZIP= ${PKG_JAVA_HOME}/lib/classes.zip:
+. if exists(${PKG_JAVA_HOME}/lib/${_JAVA_BASE_CLASSES})
+_JAVA_CLASSES_ZIP= ${PKG_JAVA_HOME}/lib/${_JAVA_BASE_CLASSES}:
. endif
. if exists(${PKG_JAVA_HOME}/lib/tools.jar)
_JAVA_TOOLS_JAR= ${PKG_JAVA_HOME}/lib/tools.jar:
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 08bb53251cb..e02bfb24e2c 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.4 2002/12/31 14:42:21 jlam Exp $
+# $NetBSD: java-vm.mk,v 1.5 2003/01/29 09:34:32 abs Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -183,6 +183,8 @@ BUILDLINK_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]*
BUILDLINK_DEPENDS.kaffe?= kaffe-[0-9]*
BUILDLINK_DEPENDS.wonka?= wonka-[0-9]*
+_JAVA_BASE_CLASSES= classes.zip
+
.if ${_PKG_JVM} == "jdk"
_JDK_PKGSRCDIR= ../../lang/jdk
_JRE_PKGSRCDIR= ../../lang/jdk
@@ -219,6 +221,7 @@ _JDK_PKGSRCDIR= ../../lang/wonka
_JRE_PKGSRCDIR= ../../lang/wonka
_JRE_DEPENDENCY= wonka-[0-9]*:${_JRE_PKGSRCDIR}
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/wonka
+_JAVA_BASE_CLASSES= wre.jar
SCRIPTS_ENV+= JAVAC="jikes"
.endif
_JDK_DEPENDENCY?= ${BUILDLINK_DEPENDS.${_PKG_JVM}}:${_JDK_PKGSRCDIR}