Attachment 245836 Details for Bug 273979 – Add support JAVA_VERSION={19[+],20[+],21[+]} - 21 is required for www/tomcat-devel

[patch] Add support JAVA_VERSION={19[+],20[+],21[+]} - 21 is required for www/tomcat-devel

bsd.java.mk.diff (text/plain), 2.56 KB, created by Vladimir Druzenko on 2023-10-23 21:20:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2023-10-23 21:20:32 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
>index 78ecd65408ba..bca24b36bd4f 100644
>--- a/Mk/bsd.java.mk
>+++ b/Mk/bsd.java.mk
>@@ -22,7 +22,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[+])
>+#					versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+] 20[+] 21[+])
> #
> # JAVA_OS			List of space-separated suitable JDK port operating systems
> #					for the port. (allowed values: native linux)
>@@ -159,7 +159,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
>+__JAVA_VERSION_LIST=	8 11 17 18 19 20 21
> _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
> _JAVA_OS_LIST=			native linux
> _JAVA_VENDOR_LIST=		openjdk oracle
>@@ -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

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 273979: 245836