git: 9cde18fd05f0 - main - Mk/bsd.java.mk: Add support for JDKs 19, 20, and 21
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Oct 2023 04:06:42 UTC
The branch main has been updated by glewis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9cde18fd05f03f23cce0115e1cf46126372daab5
commit 9cde18fd05f03f23cce0115e1cf46126372daab5
Author: Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2023-10-24 04:05:47 +0000
Commit: Greg Lewis <glewis@FreeBSD.org>
CommitDate: 2023-10-24 04:06:28 +0000
Mk/bsd.java.mk: Add support for JDKs 19, 20, and 21
PR: 273979
---
Mk/bsd.java.mk | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index 78ecd65408ba..9a7362612c45 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -174,6 +174,12 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/
VERSION=17 OS=native VENDOR=openjdk
_JAVA_PORT_NATIVE_OPENJDK_JDK_18_INFO= PORT=java/openjdk18 HOME=${LOCALBASE}/openjdk18 \
VERSION=18 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 \
+ VERSION=21 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
@@ -191,6 +197,9 @@ __JAVA_PORTS_ALL= \
JAVA_PORT_NATIVE_OPENJDK_JDK_11 \
JAVA_PORT_NATIVE_OPENJDK_JDK_17 \
JAVA_PORT_NATIVE_OPENJDK_JDK_18 \
+ JAVA_PORT_NATIVE_OPENJDK_JDK_19 \
+ JAVA_PORT_NATIVE_OPENJDK_JDK_20 \
+ JAVA_PORT_NATIVE_OPENJDK_JDK_21 \
JAVA_PORT_LINUX_ORACLE_JDK_8
_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
@@ -265,7 +274,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/}
+_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/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif