 @@ -1,47 +1,48 @@
-# $NetBSD: java-vm.mk,v 1.136 2023/11/18 15:07:17 abs Exp $
+# $NetBSD: java-vm.mk,v 1.137 2023/11/22 14:13:13 ryoon Exp $
+#
 # This Makefile fragment provides a Java VM, either at build-time or at
 # run-time, depending on the package's needs.
+#
 # User-settable variables:
+#
 # PKG_JVM_DEFAULT
 #	The JVM that should be used if nothing particular is specified.
+#
 #	Possible values: kaffe openjdk8
 #		sun-jdk7 oracle-jdk8
 #		adoptopenjdk11-bin
 #		openjdk-bin openjdk11
 #		openjdk17 oracle-jdk17
 #		openjdk21
 #	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
+#
 # 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",
 #       "7", "8", "11" and "17" require an even more recent implementation.
+#
-#	Possible values: yes no 1.4 1.5 6 7 8 11 17
+#	Possible values: yes no 1.4 1.5 6 7 8 11 17 21
 #	Default value: no
+#
 # PKG_JVMS_ACCEPTED
 #	The list of JVMs that may be used as possible implementations.
+#
 # Variables set by this file:
+#
 # JAVA_BINPREFIX
 #	The prefix for the Java binaries. The path to the real binaries
 #	is constructed by appending -${program} to it.
+#
 #	Examples:
 #	* ${JAVA_BINPREFIX}-java is the path to the Java interpreter.
 @@ -65,31 +66,32 @@ _SYS_VARS.java=		PKG_JVM PKG_JAVA_HOME J
 _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.
+#
 # adoptopenjdk11-bin and openjdk-bin do not provide native NetBSD binaries
-_PKG_JVMS.17=		openjdk17 oracle-jdk17
+_PKG_JVMS.21=		openjdk21 openjdk-bin
 _PKG_JVMS.17=		${_PKG_JVMS.21} openjdk17 oracle-jdk17
 .if ${OPSYS} == "NetBSD"
-_PKG_JVMS.11=		${_PKG_JVMS.17} openjdk11 adoptopenjdk11-bin openjdk-bin
+_PKG_JVMS.11=		${_PKG_JVMS.17} openjdk11 adoptopenjdk11-bin
 .else
-_PKG_JVMS.11=		${_PKG_JVMS.17} adoptopenjdk11-bin openjdk-bin openjdk11
+_PKG_JVMS.11=		${_PKG_JVMS.17} adoptopenjdk11-bin openjdk11
 .endif
 _PKG_JVMS.8=		${_PKG_JVMS.11} openjdk8 oracle-jdk8
 _PKG_JVMS.7=		${_PKG_JVMS.8} 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.
+#
 @@ -183,61 +185,65 @@ _ONLY_FOR_PLATFORMS.openjdk11= \
 	NetBSD-[8-9].*-x86_64		NetBSD-1[0-9].*-x86_64		\
         NetBSD-[8-9].*-i386		NetBSD-1[0-9].*i386		\
 	NetBSD-9.99.*-aarch64		NetBSD-1[0-9].*-aarch64		\
         NetBSD-9.99.*-earmv[67]hf	NetBSD-1[0-9].*-earmv[67]hf
 _ONLY_FOR_PLATFORMS.openjdk17= \
 	NetBSD-9.*-x86_64		NetBSD-1[0-9].*-x86_64		\
         NetBSD-9.*-i386			NetBSD-1[0-9].*-i386		\
 	NetBSD-9.99.*-aarch64		NetBSD-1[0-9].*-aarch64		\
         NetBSD-9.99.*-earmv[67]hf	NetBSD-1[0-9].*-earmv[67]hf
 _ONLY_FOR_PLATFORMS.oracle-jdk17= \
 	NetBSD-9.*-x86_64		NetBSD-1[0-9].*-x86_64		\
 	Darwin-*-aarch64		Darwin-*-x86_64			\
 	Linux-*-aarch64			Linux-*-x86_64
 _ONLY_FOR_PLATFORMS.openjdk21= \
 	NetBSD-9.*-x86_64		NetBSD-1[0-9].*-x86_64
 # 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.openjdk8=		openjdk8
 _JAVA_PKGBASE.sun-jdk7=		sun-jre7
 _JAVA_PKGBASE.oracle-jdk8=	oracle-jre8
 _JAVA_PKGBASE.adoptopenjdk11-bin=	adoptopenjdk11-bin
 _JAVA_PKGBASE.openjdk-bin=	openjdk-bin
 _JAVA_PKGBASE.openjdk11=	openjdk11
 _JAVA_PKGBASE.openjdk17=	openjdk17
 _JAVA_PKGBASE.oracle-jdk17=	oracle-jdk17
 _JAVA_PKGBASE.openjdk21=	openjdk21
 # The following is copied from the respective JVM Makefiles.
 _JAVA_NAME.kaffe=		kaffe
 _JAVA_NAME.openjdk8=		openjdk8
 _JAVA_NAME.sun-jdk7=		sun7
 _JAVA_NAME.oracle-jdk8=		oracle8
 _JAVA_NAME.adoptopenjdk11-bin=		adoptopenjdk11-bin
 _JAVA_NAME.openjdk-bin=		openjdk-bin
 _JAVA_NAME.openjdk11=		openjdk11
 _JAVA_NAME.openjdk17=		openjdk17
 _JAVA_NAME.oracle-jdk17=	oracle-jdk17
 _JAVA_NAME.openjdk21=		openjdk21
 # 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,...
 @@ -276,36 +282,38 @@ _PKG_JVM=		"none"
 .endif
 BUILDLINK_API_DEPENDS.kaffe?=		kaffe>=1.1.4
 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.adoptopenjdk11-bin?=	adoptopenjdk11-bin-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk-bin?=	openjdk-bin-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk11?=	openjdk11-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk17?=	openjdk17-[0-9]*
 BUILDLINK_API_DEPENDS.oracle-jdk17?=	oracle-jdk17-[0-9]*
 BUILDLINK_API_DEPENDS.openjdk21?=	openjdk21-[0-9]*
 _JRE.kaffe=		kaffe
 _JRE.openjdk8=		openjdk8
 _JRE.sun-jdk7=		sun-jre7
 _JRE.oracle-jdk8=	oracle-jre8
 _JRE.adoptopenjdk11-bin=	adoptopenjdk11-bin
 _JRE.openjdk-bin=	openjdk-bin
 _JRE.openjdk11=		openjdk11
 _JRE.openjdk17=		openjdk17
 _JRE.oracle-jdk17=	oracle-jdk17
 _JRE.openjdk21=		openjdk21
 _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} == "openjdk8"
 _JDK_PKGSRCDIR=		../../lang/openjdk8
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME=		${LOCALBASE}/java/openjdk8
 .elif ${_PKG_JVM} == "sun-jdk7"
 _JDK_PKGSRCDIR=		../../lang/sun-jdk7
 @@ -331,26 +339,31 @@ _JDK_PKGSRCDIR=		../../lang/openjdk11
 _JRE_PKGSRCDIR=		../../lang/openjdk11
 _JAVA_HOME=		${LOCALBASE}/java/openjdk11
 UNLIMIT_RESOURCES+=	datasize virtualsize
 .elif ${_PKG_JVM} == "openjdk17"
 _JDK_PKGSRCDIR=		../../lang/openjdk17
 _JRE_PKGSRCDIR=		../../lang/openjdk17
 _JAVA_HOME=		${LOCALBASE}/java/openjdk17
 UNLIMIT_RESOURCES+=	datasize virtualsize
 .elif ${_PKG_JVM} == "oracle-jdk17"
 _JDK_PKGSRCDIR=		../../lang/oracle-jdk17
 _JRE_PKGSRCDIR=		../../lang/oracle-jdk17
 _JAVA_HOME=		${LOCALBASE}/java/oracle-jdk17
 UNLIMIT_RESOURCES+=	datasize virtualsize
 .elif ${_PKG_JVM} == "openjdk21"
 _JDK_PKGSRCDIR=		../../lang/openjdk21
 _JRE_PKGSRCDIR=		../../lang/openjdk21
 _JAVA_HOME=		${LOCALBASE}/java/openjdk21
 UNLIMIT_RESOURCES+=	datasize virtualsize
 .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