Import of pkgsrc-2015Q1

mk/java-vm.mk

@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.94 2013/12/27 00:11:38 tron Exp $
+# $NetBSD: java-vm.mk,v 1.101 2015/03/06 18:28:45 szptvlfn Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -9,8 +9,8 @@
 # PKG_JVM_DEFAULT
 #	The JVM that should be used if nothing particular is specified.
 #
-#	Possible values: kaffe openjdk7 openjdk7-bin
-#		sun-jdk6 sun-jdk7 jdk15 jdk16
+#	Possible values: kaffe openjdk7 openjdk8
+#		sun-jdk6 sun-jdk7
 #	Default value: (platform-dependent)
 #
 # Package-settable variables:
@@ -26,10 +26,10 @@
 #
 # USE_JAVA2
 #	When the package needs a Java 2 implementation, this variable
-#	should be set to "yes". It can also be set to "1.4", "1.5", "6"
-#	or "7" require an even more recent implementation.
+#	should be set to "yes". It can also be set to "1.4", "1.5", "6".
+#	"7" or "8" require an even more recent implementation.
 #
-#	Possible values: yes no 1.4 1.5 6 7
+#	Possible values: yes no 1.4 1.5 6 7 8
 #	Default value: no
 #
 # PKG_JVMS_ACCEPTED
@@ -70,7 +70,8 @@ PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 
 # This is a list of all of the JDKs that may be used.
 #
-_PKG_JVMS.7=		openjdk7 openjdk7-bin sun-jdk7
+_PKG_JVMS.8=		openjdk8
+_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}
@@ -93,12 +94,15 @@ _PKG_JVM_DEFAULT:=	${PKG_JVM}
 _PKG_JVM_DEFAULT=	${PKG_JVM_DEFAULT}
 .endif
 .if !defined(_PKG_JVM_DEFAULT)
-.  if !empty(MACHINE_PLATFORM:MNetBSD-[456789].*-i386) || \
-      !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
+.  if   !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \
+        !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
 _PKG_JVM_DEFAULT?=	openjdk7
+.  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
+	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
+_PKG_JVM_DEFAULT?=	openjdk8
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
-      !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
-      !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+        !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
+        !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
 _PKG_JVM_DEFAULT?=	sun-jdk6
 .  elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
 _PKG_JVM_DEFAULT?=	sun-jdk6
@@ -113,16 +117,9 @@ _PKG_JVM_DEFAULT?=	kaffe
 .endif
 
 # These lists are copied from the JVM package Makefiles.
-_ONLY_FOR_PLATFORMS.jdk15= \
-	DragonFly-*-* \
-	FreeBSD-8.[1-9]*-i386 FreeBSD-8.[1-9]*-x86_64 \
-	NetBSD-[2-9].*-i386 NetBSD-[4-9].*-x86_64
-_ONLY_FOR_PLATFORMS.jdk16= \
-	DragonFly-*-* \
-	NetBSD-[2-9].*-i386 NetBSD-[4-9].*-x86_64
 _ONLY_FOR_PLATFORMS.kaffe= \
 	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
-	*-*-mipsel* *-*-sparc *-*-powerpc 
+	*-*-mipsel* *-*-sparc *-*-powerpc
 # exclude *-*-x86_64 from kaffe list as it apparently doesn't work
 _ONLY_FOR_PLATFORMS.sun-jdk6= \
 	Darwin-9.*-i386 Darwin-9.*-x86_64 \
@@ -140,17 +137,23 @@ _ONLY_FOR_PLATFORMS.sun-jdk6= \
 	SunOS-5.11-x86_64
 _ONLY_FOR_PLATFORMS.openjdk7= \
 	DragonFly-*-* \
-	NetBSD-[4-9]*-i386 \
-	NetBSD-[5-9]*-x86_64 \
-	SunOS-5.11-i386 \
-	SunOS-5.11-x86_64
-_ONLY_FOR_PLATFORMS.openjdk7-bin= \
 	NetBSD-[5-9]*-i386 \
-	NetBSD-[5-9]*-x86_64
+	NetBSD-[5-9]*-x86_64 \
+	NetBSD-[7-9]*-sparc64 \
+	NetBSD-[7-9]*-earmv[67]hf \
+	SunOS-*-i386 \
+	SunOS-*-x86_64
+_ONLY_FOR_PLATFORMS.openjdk8= \
+	DragonFly-*-* \
+	NetBSD-[5-9]*-i386 \
+	NetBSD-[5-9]*-x86_64 \
+	NetBSD-[7-9]*-sparc64 \
+	NetBSD-[7-9]*-earmv[67]hf \
+	SunOS-*-i386 \
+	SunOS-*-x86_64
 _ONLY_FOR_PLATFORMS.sun-jdk7= \
 	Darwin-9.*-i386 Darwin-9.*-x86_64 \
-	Darwin-10.*-i386 Darwin-10.*-x86_64 \
-	Darwin-11.*-i386 Darwin-11.*-x86_64 \
+	Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \
 	DragonFly-*-i386 \
 	FreeBSD-6.*-i386 \
 	Linux-*-i[3-6]86 \
@@ -173,22 +176,16 @@ _PKG_JVMS_ACCEPTED+=	${PKG_JVMS_ACCEPTED:M${_jvm_}}
 .  endfor
 .endfor
 
-_JAVA_PKGBASE.jdk=		jdk
-_JAVA_PKGBASE.jdk14=		jdk14
-_JAVA_PKGBASE.jdk15=		jdk15
-_JAVA_PKGBASE.jdk16=		jdk16
 _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
 
 # The following is copied from the respective JVM Makefiles.
-_JAVA_NAME.jdk=			jdk11
-_JAVA_NAME.jdk14=		jdk14
 _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
 
@@ -238,35 +235,23 @@ PKG_FAIL_REASON=	"no acceptable JVM found"
 _PKG_JVM=		"none"
 .endif
 
-BUILDLINK_API_DEPENDS.jdk15?=		jdk15-[0-9]*
-BUILDLINK_API_DEPENDS.jdk16?=		jdk16-[0-9]*
 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]*
 BUILDLINK_API_DEPENDS.sun-jdk7?=	sun-jdk7-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre7?=	sun-jre7-[0-9]*
 
-_JRE.jdk15=		jdk15
-_JRE.jdk16=		jdk16
 _JRE.kaffe=		kaffe
 _JRE.openjdk7=		openjdk7
-_JRE.openjdk7-bin=	openjdk7-bin
+_JRE.openjdk8=		openjdk8
 _JRE.sun-jdk6=		sun-jre6
 _JRE.sun-jdk7=		sun-jre7
 
 _JAVA_BASE_CLASSES=	classes.zip
 
-.if ${_PKG_JVM} == "jdk15"
-_JDK_PKGSRCDIR=		../../wip/jdk15
-_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.5.0
-.elif ${_PKG_JVM} == "jdk16"
-_JDK_PKGSRCDIR=		../../wip/jdk16
-_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.6.0
-.elif ${_PKG_JVM} == "kaffe"
+.if ${_PKG_JVM} == "kaffe"
 _JDK_PKGSRCDIR=		../../lang/kaffe
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/kaffe
@@ -274,10 +259,10 @@ _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
+.elif ${_PKG_JVM} == "openjdk8"
+_JDK_PKGSRCDIR=		../../lang/openjdk8
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/openjdk7-bin
+_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/openjdk8
 .elif ${_PKG_JVM} == "sun-jdk6"
 _JDK_PKGSRCDIR=		../../lang/sun-jdk6
 _JRE_PKGSRCDIR=		../../lang/sun-jre6