diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2026-03-15 11:13:59 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2026-03-15 11:13:59 +0000 |
| commit | b755eb71ca97b704bf95d683d5c5f58c90944f19 (patch) | |
| tree | e6eb5ea0f1694ccb0dec5e6b7ba8e179d069c96f | |
| parent | 8ef049e368521a7b4e7691bebbf863b3a6590775 (diff) | |
Mk: unregister expired java/openjdk20
| -rw-r--r-- | Mk/Uses/java.mk | 9 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk index f39ad029f84d..e4e2016935fa 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[+] -# 20[+] 21[+] 22[+] 23[+] 24[+] 25[+]) +# 21[+] 22[+] 23[+] 24[+] 25[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -201,7 +201,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 8 11 17 20 21 22 23 24 25 +__JAVA_VERSION_LIST= 8 11 17 21 22 23 24 25 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -214,8 +214,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_11_INFO= PORT=java/openjdk11 HOME=${LOCALBASE}/ VERSION=11 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/openjdk17 \ VERSION=17 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_20_INFO= PORT=java/openjdk20 HOME=${LOCALBASE}/openjdk20 \ - 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 \ @@ -242,7 +240,6 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ JAVA_PORT_NATIVE_OPENJDK_JDK_17 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_20 \ JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ JAVA_PORT_NATIVE_OPENJDK_JDK_22 \ JAVA_PORT_NATIVE_OPENJDK_JDK_23 \ @@ -311,7 +308,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 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24 25+/:S/^25+/25/} +_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/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 8e0863c82044..66be7ed4067a 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, 20, 21, 22, 23, 24, 25 +# Possible values: 8, 11, 17, 21, 22, 23, 24, 25 . if ${ARCH:Marmv*} JAVA_DEFAULT?= 11 . else |