diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2026-04-12 20:17:29 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2026-04-12 20:18:07 +0000 |
| commit | c4c41dac831eb9af49140aefe27b36dc9f36c64e (patch) | |
| tree | c7a1a0cdebffa7823c9ddd590ae9904ad51aa8c8 | |
| parent | 31390ee6d9b186858cef87672a5bb13c3ac898d4 (diff) | |
Mk: unregister expired java/openjdk22
| -rw-r--r-- | Mk/Uses/java.mk | 11 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk index 14e558c9380b..cbb8624eddf5 100644 --- a/Mk/Uses/java.mk +++ b/Mk/Uses/java.mk @@ -30,7 +30,7 @@ # 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[+] -# 21[+] 22[+] 23[+] 24[+] 25[+] 26[+]) +# 21[+] 23[+] 24[+] 25[+] 26[+]) # JAVA_DEFAULT (Mk/bsd.default-versions.mk) is used if this # variable is omitted or if JAVA_DEFAULT is part of the range. # Otherwise the latest LTS from the range is preferred over @@ -205,7 +205,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 8 11 17 21 22 23 24 25 26 +__JAVA_VERSION_LIST= 8 11 17 21 23 24 25 26 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -220,8 +220,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/ VERSION=17 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_NATIVE_OPENJDK_JDK_23_INFO= PORT=java/openjdk23 HOME=${LOCALBASE}/openjdk23 \ VERSION=23 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_24_INFO= PORT=java/openjdk24 HOME=${LOCALBASE}/openjdk24 \ @@ -251,8 +249,7 @@ __JAVA_PORTS_NATIVE_LTS= \ __JAVA_PORTS_NATIVE_NON_LTS= \ JAVA_PORT_NATIVE_OPENJDK_JDK_26 \ JAVA_PORT_NATIVE_OPENJDK_JDK_24 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_23 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_22 + JAVA_PORT_NATIVE_OPENJDK_JDK_23 __JAVA_PORTS_ALL= \ ${__JAVA_PORTS_NATIVE_LTS} \ ${__JAVA_PORTS_NATIVE_NON_LTS} \ @@ -319,7 +316,7 @@ check-makevars:: . 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 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24 25+/:S/^25+/25 26+/:S/^26+/26/} +_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 21+/:S/^21+/21 23+/:S/^23+/23 24+/:S/^24+/24 25+/:S/^25+/25 26+/:S/^26+/26/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 313246180c53..1cdf877a48b2 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, 21, 22, 23, 24, 25 +# Possible values: 8, 11, 17, 21, 23, 24, 25 . if ${ARCH:Marmv*} || ${ARCH} == powerpc JAVA_DEFAULT?= 11 . elif ${ARCH:Mi386} |