diff options
| author | tv <tv@pkgsrc.org> | 2004-07-29 14:43:16 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-07-29 14:43:16 +0000 |
| commit | e9da8ba15a776cd0dabb716a1d3ca3281661fcd0 (patch) | |
| tree | 0529e830f0e4f384da5001da4653040eeb939a11 /mk | |
| parent | 27c3f815d8fe55b5869c736f92af2c5b82f77cb6 (diff) | |
| download | pkgsrc-e9da8ba15a776cd0dabb716a1d3ca3281661fcd0.tar.gz | |
jdk12 was never here. "avert your eyes."
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-vm.mk | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 5d5e1ad3304..e552c7ade70 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.31 2004/07/28 21:15:38 tv Exp $ +# $NetBSD: java-vm.mk,v 1.32 2004/07/29 14:43:16 tv Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -44,10 +44,10 @@ PKG_JVMS_ACCEPTED?= ${_PKG_JVMS} # .if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS]) _PKG_JVMS?= sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka \ - jdk12 jdk13 jdk14 + jdk14 .else _PKG_JVMS?= jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \ - wonka jdk12 jdk13 jdk14 + wonka jdk14 .endif # To be deprecated: if PKG_JVM is explicitly set, then use it as the @@ -80,10 +80,6 @@ _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.[4-9]*-i386 NetBSD-[2-9].*-i386 -_ONLY_FOR_PLATFORMS.jdk13= \ - NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 _ONLY_FOR_PLATFORMS.jdk14= \ NetBSD-[2-9].*-i386 _ONLY_FOR_PLATFORMS.blackdown-jdk13= \ @@ -113,8 +109,6 @@ _PKG_JVMS_ACCEPTED+= ${PKG_JVMS_ACCEPTED:M${_jvm_}} .endfor _JAVA_PKGBASE.jdk= jdk -_JAVA_PKGBASE.jdk12= jdk12 -_JAVA_PKGBASE.jdk13= jdk13 _JAVA_PKGBASE.jdk14= jdk14 _JAVA_PKGBASE.sun-jdk13= sun-jdk13 _JAVA_PKGBASE.sun-jdk14= sun-jdk14 @@ -192,8 +186,6 @@ _PKG_JVM= "none" .endif BUILDLINK_DEPENDS.jdk?= jdk-[0-9]* -BUILDLINK_DEPENDS.jdk12?= jdk12-[0-9]* -BUILDLINK_DEPENDS.jdk13?= jdk13-[0-9]* BUILDLINK_DEPENDS.jdk14?= jdk14-[0-9]* BUILDLINK_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]* BUILDLINK_DEPENDS.sun-jre13?= sun-jre13-[0-9]* @@ -205,8 +197,6 @@ BUILDLINK_DEPENDS.kaffe?= kaffe>=1.1.4 BUILDLINK_DEPENDS.wonka?= wonka-[0-9]* _JRE.jdk= jdk -_JRE.jdk12= jdk12 -_JRE.jdk13= jdk13 _JRE.jdk14= jdk14 _JRE.sun-jdk13= sun-jre13 _JRE.sun-jdk14= sun-jre14 @@ -220,14 +210,6 @@ _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= ../../lang/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} == "jdk14" _JDK_PKGSRCDIR= ../../wip/jdk14 _JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} |