[pkgsrc/trunk]: pkgsrc jdk12 is now in pkgsrc/lang.

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41dc545f6aed
branches:  trunk
changeset: 478712:41dc545f6aed
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Jul 28 21:15:38 2004 +0000

description:
jdk12 is now in pkgsrc/lang.

diffstat:

 lang/Makefile |  4 +++-
 mk/java-vm.mk |  6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r c1dcf3589817 -r 41dc545f6aed lang/Makefile
--- a/lang/Makefile     Wed Jul 28 20:36:28 2004 +0000
+++ b/lang/Makefile     Wed Jul 28 21:15:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2004/07/23 02:05:45 minskim Exp $
+# $NetBSD: Makefile,v 1.185 2004/07/28 21:15:38 tv Exp $
 #
 
 COMMENT=       Programming languages
@@ -70,6 +70,8 @@
 SUBDIR+=       jbuilder-jit
 SUBDIR+=       jdk
 SUBDIR+=       jdk-openjit
+SUBDIR+=       jdk12
+SUBDIR+=       jdk12-openjit
 SUBDIR+=       jikes
 SUBDIR+=       jini
 SUBDIR+=       joos
diff -r c1dcf3589817 -r 41dc545f6aed mk/java-vm.mk
--- a/mk/java-vm.mk     Wed Jul 28 20:36:28 2004 +0000
+++ b/mk/java-vm.mk     Wed Jul 28 21:15:38 2004 +0000
@@ -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 @@
 _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 @@
 _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"