git: 494efd70eca2 - main - Mk/bsd.java.mk: Hook openjdk22 into java system

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=494efd70eca284fe87800f84955dc81ea4648400

commit 494efd70eca284fe87800f84955dc81ea4648400
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-12-25 13:22:29 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-12-27 10:37:10 +0000

    Mk/bsd.java.mk: Hook openjdk22 into java system
    
    PR:             283600
    Approved by:    java, glewis
---
 Mk/bsd.default-versions.mk | 2 +-
 Mk/bsd.java.mk             | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index c55c940b2426..d94468485761 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -73,7 +73,7 @@ GUILE_DEFAULT?=		2.2
 # Format:	     version[-flavor]
 # Examples:	     6-nox11, 7
 IMAGEMAGICK_DEFAULT?=	7
-# Possible values: 8, 11, 17, 18, 19, 20, 21
+# Possible values: 8, 11, 17, 18, 19, 20, 21, 22
 JAVA_DEFAULT?=		8
 # Possible values: 3.4.0, 3.99
 .  if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64}
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index 91ea9516c846..c0725d80f9f0 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -23,7 +23,7 @@ Java_Include_MAINTAINER=	java@FreeBSD.org
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #					port. An optional "+" allows you to specify a range of
 #					versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+]
-#					20[+] 21[+])
+#					20[+] 21[+] 22[+])
 #
 # JAVA_OS			List of space-separated suitable JDK port operating systems
 #					for the port. (allowed values: native linux)
@@ -160,7 +160,7 @@ SUB_LIST+=		JAVA_OS="${JAVA_OS}"
 .    endif
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	8 11 17 18 19 20 21
+__JAVA_VERSION_LIST=	8 11 17 18 19 20 21 22
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		openjdk oracle
@@ -181,6 +181,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_20_INFO=		PORT=java/openjdk20			HOME=${LOCALBASE}/
 											VERSION=20	OS=native	VENDOR=openjdk
 _JAVA_PORT_NATIVE_OPENJDK_JDK_21_INFO=		PORT=java/openjdk21			HOME=${LOCALBASE}/openjdk21 \
 											VERSION=21	OS=native	VENDOR=openjdk
+_JAVA_PORT_NATIVE_OPENJDK_JDK_22_INFO=		PORT=java/openjdk22			HOME=${LOCALBASE}/openjdk22 \
+											VERSION=22	OS=native	VENDOR=openjdk
 _JAVA_PORT_LINUX_ORACLE_JDK_8_INFO=		PORT=java/linux-oracle-jdk18	HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
 											VERSION=8	OS=linux	VENDOR=oracle
 
@@ -201,6 +203,7 @@ __JAVA_PORTS_ALL=	\
 					JAVA_PORT_NATIVE_OPENJDK_JDK_19 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_20 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_21 \
+					JAVA_PORT_NATIVE_OPENJDK_JDK_22 \
 					JAVA_PORT_LINUX_ORACLE_JDK_8
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
 			JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
@@ -275,7 +278,7 @@ JAVA_RUN=	jre
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .    if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21/}
+_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22/}
 .    else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .    endif