[pkgsrc/trunk]: pkgsrc jdk12 was never here. "avert your eyes."

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/87aefea1cb9c
branches:  trunk
changeset: 478766:87aefea1cb9c
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Jul 29 14:43:16 2004 +0000

description:
jdk12 was never here.  "avert your eyes."

diffstat:

 doc/CHANGES   |   5 +----
 lang/Makefile |   3 +--
 mk/java-vm.mk |  24 +++---------------------
 3 files changed, 5 insertions(+), 27 deletions(-)

diffs (117 lines):

diff -r e55c6852f847 -r 87aefea1cb9c doc/CHANGES
--- a/doc/CHANGES       Thu Jul 29 14:23:05 2004 +0000
+++ b/doc/CHANGES       Thu Jul 29 14:43:16 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6724 2004/07/29 10:15:47 martti Exp $
+$NetBSD: CHANGES,v 1.6725 2004/07/29 14:43:16 tv Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3621,8 +3621,6 @@
        Added kphotools-0.2.1 [markd 2004-07-28]
        Updated gnupg to 1.2.5 [wiz 2004-07-28]
        Updated cpuflags to 0.74 [abs 2004-07-28]
-       Added jdk12-2.0.11 [tv 2004-07-28]
-       Added jdk12-openjit-1.1.16 [tv 2004-07-28]
        Updated gcc34 to 3.4.1nb3 [shannonjr 2004-07-28]
        Updated gcc34-ada to 3.4.1nb3 [shannonjr 2004-07-28]
        Added xorg-6.7.0 [xtraeme 2004-07-29]
@@ -3640,6 +3638,5 @@
        Added xorg-fontsType1-6.7.0 [xtraeme 2004-07-29]
        Added xorg-docs-6.7.0 [xtraeme 2004-07-29]
        Added xorg-dirs-1.0 [xtraeme 2004-07-29]
-       Removed jdk12 [agc 2004-07-29]
        Removed openldap1 [xtraeme 2004-07-29]
        Updated postfix to 2.1.4 [martti 2004-07-29]
diff -r e55c6852f847 -r 87aefea1cb9c lang/Makefile
--- a/lang/Makefile     Thu Jul 29 14:23:05 2004 +0000
+++ b/lang/Makefile     Thu Jul 29 14:43:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2004/07/29 07:41:02 agc Exp $
+# $NetBSD: Makefile,v 1.187 2004/07/29 14:43:16 tv Exp $
 #
 
 COMMENT=       Programming languages
@@ -70,7 +70,6 @@
 SUBDIR+=       jbuilder-jit
 SUBDIR+=       jdk
 SUBDIR+=       jdk-openjit
-SUBDIR+=       jdk12-openjit
 SUBDIR+=       jikes
 SUBDIR+=       jini
 SUBDIR+=       joos
diff -r e55c6852f847 -r 87aefea1cb9c mk/java-vm.mk
--- a/mk/java-vm.mk     Thu Jul 29 14:23:05 2004 +0000
+++ b/mk/java-vm.mk     Thu Jul 29 14:43:16 2004 +0000
@@ -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 @@
 #
 .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 @@
 # 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 @@
 .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 @@
 .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.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 @@
 _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}