diff options
| author | tv <tv@pkgsrc.org> | 2004-07-28 21:15:38 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-07-28 21:15:38 +0000 |
| commit | cc3839d9bd914459013738fa59a1fa6c5ae40404 (patch) | |
| tree | d58fe076e40d175c06ac4acedc01498ee4c37da0 /mk/java-vm.mk | |
| parent | e4d3114d7dcbdafacc2430ccb688f2e5b6c645ae (diff) | |
| download | pkgsrc-cc3839d9bd914459013738fa59a1fa6c5ae40404.tar.gz | |
jdk12 is now in pkgsrc/lang.
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 39f92ffc55a..5d5e1ad3304 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.30 2004/07/14 13:37:09 wiz Exp $ +# $NetBSD: java-vm.mk,v 1.31 2004/07/28 21:15:38 tv Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -81,7 +81,7 @@ _PKG_JVM_DEFAULT?= kaffe _ONLY_FOR_PLATFORMS.jdk= \ NetBSD-*-i386 Linux-*-i[3-6]86 _ONLY_FOR_PLATFORMS.jdk12= \ - NetBSD-1.[6-9]*-i386 NetBSD-[2-9].*-i386 + 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= \ @@ -221,7 +221,7 @@ _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 +_JDK_PKGSRCDIR= ../../lang/jdk12 _JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR} _JAVA_HOME_DEFAULT= ${LOCALBASE}/java/jdk-1.2.2 .elif ${_PKG_JVM} == "jdk13" |