svn commit: r515303 - head/Mk
Greg Lewis
glewis at FreeBSD.org
Wed Oct 23 19:35:58 UTC 2019
Author: glewis
Date: Wed Oct 23 19:35:57 2019
New Revision: 515303
URL: https://svnweb.freebsd.org/changeset/ports/515303
Log:
Eliminate references to 9 and 10
* All 9 and 10 JDKs have been removed and no ports explicitly list either
as a desired version, so remove references to simplify the versioning
substitutions a little.
Modified:
head/Mk/bsd.java.mk
Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk Wed Oct 23 18:49:54 2019 (r515302)
+++ head/Mk/bsd.java.mk Wed Oct 23 19:35:57 2019 (r515303)
@@ -162,7 +162,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 6 7 8 9 10 11 12 13
+__JAVA_VERSION_LIST= 6 7 8 11 12 13
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= openjdk oracle
@@ -270,7 +270,7 @@ JAVA_RUN= jre
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.9+/11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/1.9/11/:S/9/11/:S/10/11/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/9+/11+/:S/10+/11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
+_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
More information about the svn-ports-head
mailing list