diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2026-02-14 12:28:38 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2026-02-14 12:29:09 +0000 |
| commit | a8fe00821f332a1a466fcea5768172aeedca18c1 (patch) | |
| tree | d720cb3640bce3bc5b2a4f91d98d1bed0d9986c1 | |
| parent | 6ddce1562faeb0be20b7af8d66c5c7ee304801b1 (diff) | |
Mk: unregister expired java/openjdk19
| -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 f5686bf9f5de..f39ad029f84d 100644 --- a/Mk/Uses/java.mk +++ b/Mk/Uses/java.mk @@ -29,7 +29,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[+] 19[+] +# versions. (allowed values: 8[+] 11[+] 17[+] # 20[+] 21[+] 22[+] 23[+] 24[+] 25[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems @@ -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 19 20 21 22 23 24 25 +__JAVA_VERSION_LIST= 8 11 17 20 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_19_INFO= PORT=java/openjdk19 HOME=${LOCALBASE}/openjdk19 \ - VERSION=19 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 \ @@ -244,7 +242,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_19 \ JAVA_PORT_NATIVE_OPENJDK_JDK_20 \ JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ JAVA_PORT_NATIVE_OPENJDK_JDK_22 \ @@ -314,7 +311,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 19+/:S/^19+/19 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 20+/:S/^20+/20 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 f578239be279..37ce80ca9e0f 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, 19, 20, 21, 22, 23, 24, 25 +# Possible values: 8, 11, 17, 20, 21, 22, 23, 24, 25 JAVA_DEFAULT?= 8 # Possible values: 4.4, 4.99 . if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} |