View | Details | Raw Unified | Return to bug 273979
Collapse All | Expand All

(-)b/Mk/bsd.java.mk (-3 / +12 lines)
Lines 22-28 Java_Include_MAINTAINER= java@FreeBSD.org Link Here
22
#
22
#
23
# JAVA_VERSION		List of space-separated suitable java versions for the
23
# JAVA_VERSION		List of space-separated suitable java versions for the
24
#					port. An optional "+" allows you to specify a range of
24
#					port. An optional "+" allows you to specify a range of
25
#					versions. (allowed values: 8[+] 11[+] 17[+] 18[+])
25
#					versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+] 20[+] 21[+])
26
#
26
#
27
# JAVA_OS			List of space-separated suitable JDK port operating systems
27
# JAVA_OS			List of space-separated suitable JDK port operating systems
28
#					for the port. (allowed values: native linux)
28
#					for the port. (allowed values: native linux)
Lines 159-165 SUB_LIST+= JAVA_OS="${JAVA_OS}" Link Here
159
.    endif
159
.    endif
160
160
161
# The complete list of Java versions, os and vendors supported.
161
# The complete list of Java versions, os and vendors supported.
162
__JAVA_VERSION_LIST=	8 11 17 18
162
__JAVA_VERSION_LIST=	8 11 17 18 19 20 21
163
_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
163
_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
164
_JAVA_OS_LIST=			native linux
164
_JAVA_OS_LIST=			native linux
165
_JAVA_VENDOR_LIST=		openjdk oracle
165
_JAVA_VENDOR_LIST=		openjdk oracle
Lines 174-179 _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/ Link Here
174
											VERSION=17	OS=native	VENDOR=openjdk
174
											VERSION=17	OS=native	VENDOR=openjdk
175
_JAVA_PORT_NATIVE_OPENJDK_JDK_18_INFO=		PORT=java/openjdk18			HOME=${LOCALBASE}/openjdk18 \
175
_JAVA_PORT_NATIVE_OPENJDK_JDK_18_INFO=		PORT=java/openjdk18			HOME=${LOCALBASE}/openjdk18 \
176
											VERSION=18	OS=native	VENDOR=openjdk
176
											VERSION=18	OS=native	VENDOR=openjdk
177
_JAVA_PORT_NATIVE_OPENJDK_JDK_19_INFO=		PORT=java/openjdk19			HOME=${LOCALBASE}/openjdk19 \
178
											VERSION=19	OS=native	VENDOR=openjdk
179
_JAVA_PORT_NATIVE_OPENJDK_JDK_20_INFO=		PORT=java/openjdk20			HOME=${LOCALBASE}/openjdk20 \
180
											VERSION=20	OS=native	VENDOR=openjdk
181
_JAVA_PORT_NATIVE_OPENJDK_JDK_21_INFO=		PORT=java/openjdk21			HOME=${LOCALBASE}/openjdk21 \
182
											VERSION=21	OS=native	VENDOR=openjdk
177
_JAVA_PORT_LINUX_ORACLE_JDK_8_INFO=		PORT=java/linux-oracle-jdk18	HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
183
_JAVA_PORT_LINUX_ORACLE_JDK_8_INFO=		PORT=java/linux-oracle-jdk18	HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
178
											VERSION=8	OS=linux	VENDOR=oracle
184
											VERSION=8	OS=linux	VENDOR=oracle
179
185
Lines 191-196 __JAVA_PORTS_ALL= \ Link Here
191
					JAVA_PORT_NATIVE_OPENJDK_JDK_11 \
197
					JAVA_PORT_NATIVE_OPENJDK_JDK_11 \
192
					JAVA_PORT_NATIVE_OPENJDK_JDK_17 \
198
					JAVA_PORT_NATIVE_OPENJDK_JDK_17 \
193
					JAVA_PORT_NATIVE_OPENJDK_JDK_18 \
199
					JAVA_PORT_NATIVE_OPENJDK_JDK_18 \
200
					JAVA_PORT_NATIVE_OPENJDK_JDK_19 \
201
					JAVA_PORT_NATIVE_OPENJDK_JDK_20 \
202
					JAVA_PORT_NATIVE_OPENJDK_JDK_21 \
194
					JAVA_PORT_LINUX_ORACLE_JDK_8
203
					JAVA_PORT_LINUX_ORACLE_JDK_8
195
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
204
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
196
			JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
205
			JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
Lines 265-271 JAVA_RUN= jre Link Here
265
.		undef _JAVA_PORTS_INSTALLED
274
.		undef _JAVA_PORTS_INSTALLED
266
.		undef _JAVA_PORTS_POSSIBLE
275
.		undef _JAVA_PORTS_POSSIBLE
267
.    if defined(JAVA_VERSION)
276
.    if defined(JAVA_VERSION)
268
_JAVA_VERSION=	${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/}
277
_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/}
269
.    else
278
.    else
270
_JAVA_VERSION=	${__JAVA_VERSION_LIST}
279
_JAVA_VERSION=	${__JAVA_VERSION_LIST}
271
.    endif
280
.    endif

Return to bug 273979