diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-05-21 16:50:57 +0200 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-05-24 22:09:35 +0200 |
| commit | c7d1c247d8ea8f87edd6a5012702a3cd10d99d49 (patch) | |
| tree | 26020fd6933d9df818c66aec6cba5fa901d73499 /Mk | |
| parent | 6dc209ad0a874c8fbc80859c217ecea69f6b0ade (diff) | |
| download | freebsd-ports-c7d1c247d8ea8f87edd6a5012702a3cd10d99d49.zip | |
cleanup: remove expired versions of OpenJDK (12 through 16)
Adjust ports depending on expired versions of OpenJDK:
- biology/snpeff: 12+ -> 17+
- devel/RStudio: 12 -> 11
- www/closure-compiler: 13 -> 11+
Allow java/openjdk17 to use java/openjdk17-bootstrap on i386
too, this builds just fine on 13.1-i386
Remove jdk12-doc as it is no longer relevant.
Clean up Java version calculations in bsd.java.mk
Reviewed by: jwb, java (glewis)
Differential Revision: https://reviews.freebsd.org/D35280
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.java.mk | 22 |
2 files changed, 4 insertions, 20 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index b046d2dd9bba..3fcea4473a18 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -58,7 +58,7 @@ GL_DEFAULT?= mesa-libs GHOSTSCRIPT_DEFAULT?= agpl # Possible values: 6, 6-nox11, 7, 7-nox11 IMAGEMAGICK_DEFAULT?= 7 -# Possible values: 7, 8, 11, 12, 13, 14, 15, 16, 17, 18 +# Possible values: 7, 8, 11, 17, 18 JAVA_DEFAULT?= 8 # Possible values: 2.2.0, 2.3.0 . if !defined(WANT_LAZARUS_DEVEL) diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index a88204514650..bab851824ad7 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -23,8 +23,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: 7[+] 8[+] 11[+] 12[+] 13[+] -# 14[+] 15[+] 16[+] 17[+] 18[+]) +# versions. (allowed values: 7[+] 8[+] 11[+] 17[+] 18[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -161,7 +160,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 7 8 11 12 13 14 15 16 17 18 +__JAVA_VERSION_LIST= 7 8 11 17 18 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -174,16 +173,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/op VERSION=8 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_11_INFO= PORT=java/openjdk11 HOME=${LOCALBASE}/openjdk11 \ VERSION=11 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_12_INFO= PORT=java/openjdk12 HOME=${LOCALBASE}/openjdk12 \ - VERSION=12 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_13_INFO= PORT=java/openjdk13 HOME=${LOCALBASE}/openjdk13 \ - VERSION=13 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_14_INFO= PORT=java/openjdk14 HOME=${LOCALBASE}/openjdk14 \ - VERSION=14 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_15_INFO= PORT=java/openjdk15 HOME=${LOCALBASE}/openjdk15 \ - VERSION=15 OS=native VENDOR=openjdk -_JAVA_PORT_NATIVE_OPENJDK_JDK_16_INFO= PORT=java/openjdk16 HOME=${LOCALBASE}/openjdk16 \ - VERSION=16 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/openjdk17 \ VERSION=17 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_18_INFO= PORT=java/openjdk18 HOME=${LOCALBASE}/openjdk18 \ @@ -204,11 +193,6 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ JAVA_PORT_NATIVE_OPENJDK_JDK_17 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_12 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_13 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_14 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_15 \ - JAVA_PORT_NATIVE_OPENJDK_JDK_16 \ JAVA_PORT_NATIVE_OPENJDK_JDK_18 \ JAVA_PORT_NATIVE_OPENJDK_JDK_7 \ JAVA_PORT_LINUX_ORACLE_JDK_8 @@ -285,7 +269,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/} +_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif |