Removed outdated openjdk7-bin package. No objection from abs@

2 files changed, 6 insertions, 17 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 18405ec05b4..52ddc1b62e7 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.254 2015/02/16 10:42:00 jperkin Exp $
+# $NetBSD: mk.conf,v 1.255 2015/02/25 10:39:50 tnn Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1435,7 +1435,7 @@ PILRC_USE_GTK?=	YES
 #PKG_JVM_DEFAULT=
 #       The JVM that should be used if nothing particular is specified.
 #
-#       Possible values: jdk kaffe openjdk7 openjdk7-bin
+#       Possible values: jdk kaffe openjdk7
 #               jdk14 sun-jdk6 jdk15
 
 #POPTOP_USE_MPPE=
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index e75687af76d..3993b1dbe67 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.98 2015/02/13 10:49:39 tnn Exp $
+# $NetBSD: java-vm.mk,v 1.99 2015/02/25 10:39:50 tnn Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -9,7 +9,7 @@
 # PKG_JVM_DEFAULT
 #	The JVM that should be used if nothing particular is specified.
 #
-#	Possible values: kaffe openjdk7 openjdk7-bin openjdk8
+#	Possible values: kaffe openjdk7 openjdk8
 #		sun-jdk6 sun-jdk7
 #	Default value: (platform-dependent)
 #
@@ -71,7 +71,7 @@ PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 # This is a list of all of the JDKs that may be used.
 #
 _PKG_JVMS.8=		openjdk8
-_PKG_JVMS.7=		${_PKG_JVMS.8} openjdk7 openjdk7-bin sun-jdk7
+_PKG_JVMS.7=		${_PKG_JVMS.8} openjdk7 sun-jdk7
 _PKG_JVMS.6=		${_PKG_JVMS.7} sun-jdk6 jdk16
 _PKG_JVMS.1.5=		${_PKG_JVMS.6} jdk15
 _PKG_JVMS.1.4=		${_PKG_JVMS.1.5}
@@ -97,7 +97,7 @@ _PKG_JVM_DEFAULT=	${PKG_JVM_DEFAULT}
 .  if   !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \
         !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
 _PKG_JVM_DEFAULT?=	openjdk7
-.  elif !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-sparc64)
+.  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64)
 _PKG_JVM_DEFAULT?=	openjdk8
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
         !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
@@ -141,9 +141,6 @@ _ONLY_FOR_PLATFORMS.openjdk7= \
 	NetBSD-[7-9]*-sparc64 \
 	SunOS-*-i386 \
 	SunOS-*-x86_64
-_ONLY_FOR_PLATFORMS.openjdk7-bin= \
-	NetBSD-[5-9]*-i386 \
-	NetBSD-[5-9]*-x86_64
 _ONLY_FOR_PLATFORMS.openjdk8= \
 	DragonFly-*-* \
 	NetBSD-[5-9]*-i386 \
@@ -178,7 +175,6 @@ _PKG_JVMS_ACCEPTED+=	${PKG_JVMS_ACCEPTED:M${_jvm_}}
 
 _JAVA_PKGBASE.kaffe=		kaffe
 _JAVA_PKGBASE.openjdk7=		openjdk7
-_JAVA_PKGBASE.openjdk7-bin=	openjdk7-bin
 _JAVA_PKGBASE.openjdk8=		openjdk8
 _JAVA_PKGBASE.sun-jdk6=		sun-jre6
 _JAVA_PKGBASE.sun-jdk7=		sun-jre7
@@ -186,7 +182,6 @@ _JAVA_PKGBASE.sun-jdk7=		sun-jre7
 # The following is copied from the respective JVM Makefiles.
 _JAVA_NAME.kaffe=		kaffe
 _JAVA_NAME.openjdk7=		openjdk7
-_JAVA_NAME.openjdk7-bin=	openjdk7-bin
 _JAVA_NAME.openjdk8=		openjdk8
 _JAVA_NAME.sun-jdk6=		sun6
 _JAVA_NAME.sun-jdk7=		sun7
@@ -239,7 +234,6 @@ _PKG_JVM=		"none"
 
 BUILDLINK_API_DEPENDS.kaffe?=		kaffe>=1.1.4
 BUILDLINK_API_DEPENDS.openjdk7?=	openjdk7-[0-9]*
-BUILDLINK_API_DEPENDS.openjdk7-bin?=	openjdk7-bin-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk8?=	openjdk8-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jdk6?=	sun-jdk6-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre6?=	sun-jre6-[0-9]*
@@ -248,7 +242,6 @@ BUILDLINK_API_DEPENDS.sun-jre7?=	sun-jre7-[0-9]*
 
 _JRE.kaffe=		kaffe
 _JRE.openjdk7=		openjdk7
-_JRE.openjdk7-bin=	openjdk7-bin
 _JRE.openjdk8=		openjdk8
 _JRE.sun-jdk6=		sun-jre6
 _JRE.sun-jdk7=		sun-jre7
@@ -263,10 +256,6 @@ _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/kaffe
 _JDK_PKGSRCDIR=		../../lang/openjdk7
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/openjdk7
-.elif ${_PKG_JVM} == "openjdk7-bin"
-_JDK_PKGSRCDIR=		../../lang/openjdk7-bin
-_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/openjdk7-bin
 .elif ${_PKG_JVM} == "openjdk8"
 _JDK_PKGSRCDIR=		../../lang/openjdk8
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}