Skip to content

Commit

Permalink
cleanup: remove expired versions of OpenJDK (12 through 16)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rene0 committed May 24, 2022
1 parent 6dc209a commit c7d1c24
Show file tree
Hide file tree
Showing 85 changed files with 14 additions and 2,613 deletions.
6 changes: 6 additions & 0 deletions MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -17171,3 +17171,9 @@ security/greenbone-security-assistant|security/gsa|2022-05-22|It was splitted in
security/py-ospd|security/py-ospd-openvas|2022-05-22|It was merged into security/py-ospd-openvas
lang/perl5.30||2022-05-23|Has expired: Support ends three years after .0 release. Please upgrade to a more recent version of Perl
sysutils/ansible2||2022-05-23|Has expired: Upstream support ceases
java/jdk12-doc||2022-05-24|Only useful for removed java/openjdk12
java/openjdk12||2022-05-24|Has expired: EOLed since 30 september 2019
java/openjdk13||2022-05-24|Has expired: EOLed since 31 march 2020
java/openjdk14||2022-05-24|Has expired: EOLed since 30 september 2020
java/openjdk15||2022-05-24|Has expired: EOLed since 31 march 2021
java/openjdk16||2022-05-24|Has expired: EOLed since 30 September 2021
2 changes: 1 addition & 1 deletion Mk/bsd.default-versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
22 changes: 3 additions & 19 deletions Mk/bsd.java.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion biology/snpeff/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN_DEPENDS= bash:shells/bash
USES= python:3.6+ shebangfix zip
USE_JAVA= yes

JAVA_VERSION= 12+
JAVA_VERSION= 17+
SHEBANG_FILES= scripts/* scripts/gsa/*

NO_BUILD= yes
Expand Down
2 changes: 1 addition & 1 deletion devel/RStudio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ server_PKGNAMESUFFIX= -server

USES= cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl
USE_JAVA= yes
JAVA_VERSION= 12 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn
JAVA_VERSION= 11 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn
JAVA_BUILD= yes

USE_GITHUB= yes
Expand Down
6 changes: 0 additions & 6 deletions java/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
SUBDIR += jcommon
SUBDIR += jd-gui
SUBDIR += jdk11-doc
SUBDIR += jdk12-doc
SUBDIR += jdk8-doc
SUBDIR += jdom
SUBDIR += jflex
Expand Down Expand Up @@ -88,11 +87,6 @@
SUBDIR += netty
SUBDIR += openjdk11
SUBDIR += openjdk11-jre
SUBDIR += openjdk12
SUBDIR += openjdk13
SUBDIR += openjdk14
SUBDIR += openjdk15
SUBDIR += openjdk16
SUBDIR += openjdk17
SUBDIR += openjdk17-jre
SUBDIR += openjdk18
Expand Down
44 changes: 0 additions & 44 deletions java/jdk12-doc/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions java/jdk12-doc/distinfo

This file was deleted.

6 changes: 0 additions & 6 deletions java/jdk12-doc/pkg-descr

This file was deleted.

192 changes: 0 additions & 192 deletions java/openjdk12/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions java/openjdk12/distinfo

This file was deleted.

Binary file removed java/openjdk12/files/cacerts
Binary file not shown.

This file was deleted.

Loading

0 comments on commit c7d1c24

Please sign in to comment.