summaryrefslogtreecommitdiff
path: root/mk/java-vm.mk
diff options
context:
space:
mode:
authorjlam <jlam>2003-08-01 19:00:19 +0000
committerjlam <jlam>2003-08-01 19:00:19 +0000
commit790841bc217a0efcff9bc3183693238c7cf7a732 (patch)
tree67acfab918d109b7e9c8860541481599146261a9 /mk/java-vm.mk
parent292b34549b79b4c64dd5a7c1977297d298b37b31 (diff)
downloadpkgsrc-790841bc217a0efcff9bc3183693238c7cf7a732.tar.gz
Sync to HEAD.
Diffstat (limited to 'mk/java-vm.mk')
-rw-r--r--mk/java-vm.mk24
1 files changed, 21 insertions, 3 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 250e8cbb3d7..086cb14f5fb 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.14 2003/05/25 18:39:12 jlam Exp $
+# $NetBSD: java-vm.mk,v 1.14.4.1 2003/08/01 19:00:32 jlam Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -43,9 +43,9 @@ PKG_JVMS_ACCEPTED?= ${_PKG_JVMS}
# Note: The wonka configuration is still under development
#
.if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
-_PKG_JVMS?= sun-jdk13 sun-jdk14 blackdown-jdk13 wonka
+_PKG_JVMS?= sun-jdk13 sun-jdk14 blackdown-jdk13 wonka jdk12 jdk13
.else
-_PKG_JVMS?= jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka
+_PKG_JVMS?= jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka jdk12 jdk13
.endif
# To be deprecated: if PKG_JVM is explicitly set, then use it as the
@@ -78,6 +78,10 @@ _PKG_JVM_DEFAULT?= kaffe
# These lists are copied from the JVM package Makefiles.
_ONLY_FOR_PLATFORMS.jdk= \
NetBSD-*-i386 Linux-*-i[3-6]86
+_ONLY_FOR_PLATFORMS.jdk12= \
+ NetBSD-1.[6-9]*-i386 NetBSD-2*-i386
+_ONLY_FOR_PLATFORMS.jdk13= \
+ NetBSD-1.[6-9]*-i386 NetBSD-2*-i386
_ONLY_FOR_PLATFORMS.blackdown-jdk13= \
NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc
@@ -104,6 +108,8 @@ _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}}
.endfor
_JAVA_PKGBASE.jdk= jdk
+_JAVA_PKGBASE.jdk12= jdk12
+_JAVA_PKGBASE.jdk13= jdk13
_JAVA_PKGBASE.sun-jdk13= sun-jdk13
_JAVA_PKGBASE.sun-jdk14= sun-jdk14
_JAVA_PKGBASE.blackdown-jdk13= blackdown-jdk13
@@ -180,6 +186,8 @@ _PKG_JVM= "none"
.endif
BUILDLINK_DEPENDS.jdk?= jdk-[0-9]*
+BUILDLINK_DEPENDS.jdk12?= jdk12-[0-9]*
+BUILDLINK_DEPENDS.jdk13?= jdk13-[0-9]*
BUILDLINK_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]*
BUILDLINK_DEPENDS.sun-jre13?= sun-jre13-[0-9]*
BUILDLINK_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]*
@@ -190,6 +198,8 @@ BUILDLINK_DEPENDS.kaffe?= kaffe-[0-9]*
BUILDLINK_DEPENDS.wonka?= wonka-[0-9]*
_JRE.jdk= jdk
+_JRE.jdk12= jdk12
+_JRE.jdk13= jdk13
_JRE.sun-jdk13= sun-jre13
_JRE.sun-jdk14= sun-jre14
_JRE.blackdown-jdk13= blackdown-jre13
@@ -202,6 +212,14 @@ _JAVA_BASE_CLASSES= classes.zip
_JDK_PKGSRCDIR= ../../lang/jdk
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.1.8
+.elif ${_PKG_JVM} == "jdk12"
+_JDK_PKGSRCDIR= ../../wip/jdk12
+_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
+_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.2.2
+.elif ${_PKG_JVM} == "jdk13"
+_JDK_PKGSRCDIR= ../../wip/jdk13
+_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
+_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.3.1
.elif ${_PKG_JVM} == "sun-jdk13"
_JDK_PKGSRCDIR= ../../lang/sun-jdk13
_JRE_PKGSRCDIR= ../../lang/sun-jre13