 @@ -1,27 +1,27 @@
-# $NetBSD: java-vm.mk,v 1.116 2019/05/02 08:36:10 wiz Exp $
+# $NetBSD: java-vm.mk,v 1.117 2019/10/02 13:16:29 ryoon Exp $
+#
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
 # build-time or at run-time.
+#
 # User-settable variables:
+#
 # PKG_JVM_DEFAULT
 #	The JVM that should be used if nothing particular is specified.
+#
 #	Possible values: kaffe openjdk7 openjdk8
 #		sun-jdk7 oracle-jdk8
-#		openjdk-bin
+#		openjdk-bin openjdk11
 #	Default value: (platform-dependent)
+#
 # Package-settable variables:
+#
 # USE_JAVA
 #	When set to "yes", a build-time dependency on the JDK and
 #	                   a run-time dependency on the JRE are added.
 #	When set to "run", a run-time dependency on the JRE is added.
 #	When set to "build", a build-time dependency on the JRE is added.
+#
 #	Possible values: yes run build
 #	Default value: yes
+#
 @@ -62,54 +62,57 @@ _PKG_VARS.java=		USE_JAVA USE_JAVA2 PKG_
 _SYS_VARS.java=		PKG_JVM PKG_JAVA_HOME JAVA_BINPREFIX
 _SORTED_VARS.java=	PKG_JVMS_ACCEPTED
 .include "../../mk/bsd.prefs.mk"
 USE_JAVA?=	yes
 USE_JAVA2?=	no
 PKG_JVM_DEFAULT?=	# empty
 PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 # This is a list of all of the JDKs that may be used.
+#
-_PKG_JVMS.9=		openjdk-bin
+_PKG_JVMS.9=		openjdk-bin openjdk11
 _PKG_JVMS.8=		${_PKG_JVMS.9} openjdk8 oracle-jdk8
 _PKG_JVMS.7=		${_PKG_JVMS.8} openjdk7 sun-jdk7
 _PKG_JVMS.6=		${_PKG_JVMS.7} jdk16
 _PKG_JVMS.1.5=		${_PKG_JVMS.6} jdk15
 _PKG_JVMS.1.4=		${_PKG_JVMS.1.5}
 _PKG_JVMS.yes=		${_PKG_JVMS.1.4} kaffe
 _PKG_JVMS.no=		${_PKG_JVMS.yes}
 _PKG_JVMS=		${_PKG_JVMS.${USE_JAVA2}}
 # To be deprecated: if PKG_JVM is explicitly set, then use it as the
 # default JVM.  Note that this has lower precedence than PKG_JVM_DEFAULT.
+#
 .if defined(PKG_JVM)
 .  if !empty(PKG_JVM)
 _PKG_JVM_DEFAULT:=	${PKG_JVM}
 .  endif
 .endif
 # Set the default JVM for this platform.
+#
 .if !empty(PKG_JVM_DEFAULT)
 _PKG_JVM_DEFAULT=	${PKG_JVM_DEFAULT}
 .endif
 .if !defined(_PKG_JVM_DEFAULT)
-.  if   !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \
+.  if   !empty(MACHINE_PLATFORM:MNetBSD-[56].*-i386) || \
-        !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
+        !empty(MACHINE_PLATFORM:MNetBSD-[56].*-x86_64)
 _PKG_JVM_DEFAULT?=	openjdk8
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \
 	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64)
 _PKG_JVM_DEFAULT?=	openjdk11
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
 	!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || \
 	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
 _PKG_JVM_DEFAULT?=	openjdk8
 .  elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
         !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
         !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64)
 _PKG_JVM_DEFAULT?=	oracle-jdk8
 .  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
 _PKG_JVM_DEFAULT?=	openjdk7
 .  elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
 _PKG_JVM_DEFAULT?=	openjdk8
 .  elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
 @@ -158,55 +161,60 @@ _ONLY_FOR_PLATFORMS.sun-jdk7= \
 	SunOS-5.11-i386 \
 	SunOS-5.11-x86_64
 _ONLY_FOR_PLATFORMS.oracle-jdk8= \
 	Darwin-9.*-i386 Darwin-9.*-x86_64 \
 	Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \
 	FreeBSD-6.*-i386 \
 	Linux-*-i[3-6]86 \
 	Linux-*-x86_64 \
 	NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
 	SunOS-5.11-x86_64
 _ONLY_FOR_PLATFORMS.openjdk-bin= \
 	Linux-*-x86_64 \
 	NetBSD-[6-9]*-x86_64
 _ONLY_FOR_PLATFORMS.openjdk11= \
 	NetBSD-[7-9]*-x86_64 \
 	NetBSD-[7-9]*-i386
 # Set ONLY_FOR_PLATFORM based on accepted JVMs
 .for _jvm_ in ${PKG_JVMS_ACCEPTED}
 ONLY_FOR_PLATFORM+=	${_ONLY_FOR_PLATFORMS.${_jvm_}}
 .endfor
 # Set the accepted JVMs for this platform.
 .for _jvm_ in ${_PKG_JVMS}
 .  for _pattern_ in ${_ONLY_FOR_PLATFORMS.${_jvm_}}
 .    if !empty(MACHINE_PLATFORM:M${_pattern_})
 _PKG_JVMS_ACCEPTED+=	${PKG_JVMS_ACCEPTED:M${_jvm_}}
 .    endif
 .  endfor
 .endfor
 _JAVA_PKGBASE.kaffe=		kaffe
 _JAVA_PKGBASE.openjdk7=		openjdk7
 _JAVA_PKGBASE.openjdk8=		openjdk8
 _JAVA_PKGBASE.sun-jdk7=		sun-jre7
 _JAVA_PKGBASE.oracle-jdk8=	oracle-jre8
 _JAVA_PKGBASE.openjdk-bin=	openjdk-bin
 _JAVA_PKGBASE.openjdk11=	openjdk11
 # The following is copied from the respective JVM Makefiles.
 _JAVA_NAME.kaffe=		kaffe
 _JAVA_NAME.openjdk7=		openjdk7
 _JAVA_NAME.openjdk8=		openjdk8
 _JAVA_NAME.sun-jdk7=		sun7
 _JAVA_NAME.oracle-jdk8=		oracle8
 _JAVA_NAME.openjdk-bin=		openjdk-bin
 _JAVA_NAME.openjdk11=		openjdk11
 # Mark the acceptable JVMs and check which JVM packages are installed.
 .for _jvm_ in ${_PKG_JVMS_ACCEPTED}
 _PKG_JVM_OK.${_jvm_}=	yes
 _PKG_JVM_INSTALLED.${_jvm_}!= \
 	if ${PKG_INFO} -qe ${_JAVA_PKGBASE.${_jvm_}}; then		\
 		${ECHO} yes;						\
 	else								\
 		${ECHO} no;						\
 	fi
 .endfor
 # Use one of the installed JVMs,...
 @@ -242,33 +250,35 @@ _PKG_JVM=	${_PKG_JVM_FIRSTACCEPTED}
 # force an error
 PKG_FAIL_REASON+=	"no acceptable JVM found"
 _PKG_JVM=		"none"
 .endif
 BUILDLINK_API_DEPENDS.kaffe?=		kaffe>=1.1.4
 BUILDLINK_API_DEPENDS.openjdk7?=	openjdk7-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk8?=	openjdk8-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jdk7?=	sun-jdk7-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre7?=	sun-jre7-[0-9]*
 BUILDLINK_API_DEPENDS.oracle-jdk8?=	oracle-jdk8-[0-9]*
 BUILDLINK_API_DEPENDS.oracle-jre8?=	oracle-jre8-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk-bin?=	openjdk-bin-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk11?=	openjdk11-[0-9]*
 _JRE.kaffe=		kaffe
 _JRE.openjdk7=		openjdk7
 _JRE.openjdk8=		openjdk8
 _JRE.sun-jdk7=		sun-jre7
 _JRE.oracle-jdk8=	oracle-jre8
 _JRE.openjdk-bin=	openjdk-bin
 _JRE.openjdk11=		openjdk11
 _JAVA_BASE_CLASSES=	classes.zip
 .if ${_PKG_JVM} == "kaffe"
 _JDK_PKGSRCDIR=		../../lang/kaffe
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME=		${LOCALBASE}/java/kaffe
 .elif ${_PKG_JVM} == "openjdk7"
 _JDK_PKGSRCDIR=		../../lang/openjdk7
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME=		${LOCALBASE}/java/openjdk7
 .elif ${_PKG_JVM} == "openjdk8"
 _JDK_PKGSRCDIR=		../../lang/openjdk8
 @@ -279,26 +289,31 @@ _JDK_PKGSRCDIR=		../../lang/sun-jdk7
 _JRE_PKGSRCDIR=		../../lang/sun-jre7
 _JAVA_HOME=		${LOCALBASE}/java/sun-7
 UNLIMIT_RESOURCES+=	datasize
 .elif ${_PKG_JVM} == "oracle-jdk8"
 _JDK_PKGSRCDIR=		../../lang/oracle-jdk8
 _JRE_PKGSRCDIR=		../../lang/oracle-jre8
 _JAVA_HOME=		${LOCALBASE}/java/oracle-8
 UNLIMIT_RESOURCES+=	datasize
 .elif ${_PKG_JVM} == "openjdk-bin"
 _JDK_PKGSRCDIR=		../../lang/openjdk-bin
 _JRE_PKGSRCDIR=		../../lang/openjdk-bin
 _JAVA_HOME=		${LOCALBASE}/java/openjdk-bin
 UNLIMIT_RESOURCES+=	datasize
 .elif ${_PKG_JVM} == "openjdk11"
 _JDK_PKGSRCDIR=		../../lang/openjdk11
 _JRE_PKGSRCDIR=		../../lang/openjdk11
 _JAVA_HOME=		${LOCALBASE}/java/openjdk11
 UNLIMIT_RESOURCES+=	datasize
 .endif
 # If we are not using Java for building, then we need a run-time dependency on
 # the JRE, otherwise, build-time dependency on the JRE.
 .if defined(_JRE_PKGSRCDIR)
 .  if exists(${_JRE_PKGSRCDIR}/buildlink3.mk)
 .    if !empty(USE_JAVA:M[bB][uU][iI][lL][dD])
 BUILDLINK_DEPMETHOD.${_JRE.${_PKG_JVM}}=	build
 .    endif
 .    include "${_JRE_PKGSRCDIR}/buildlink3.mk"
 .  endif
 .endif