diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-10-23 19:35:57 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-10-23 19:35:57 +0000 |
| commit | 097eb3adecf727ee69538bb866c49a8720379be7 (patch) | |
| tree | 89473e2c0c397991161f4669087d72aacbcbb520 /Mk | |
| parent | 6c71a0761b082ea3bc029041e0d109aec76fdce7 (diff) | |
| download | freebsd-ports-097eb3adecf727ee69538bb866c49a8720379be7.zip | |
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.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.java.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index be5e825ed3b1..57623384faee 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -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 |