From c7d1c247d8ea8f87edd6a5012702a3cd10d99d49 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 21 May 2022 16:50:57 +0200 Subject: 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 --- java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk (limited to 'java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk') diff --git a/java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk b/java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk deleted file mode 100644 index 96321e829166..000000000000 --- a/java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk +++ /dev/null @@ -1,11 +0,0 @@ ---- make/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC -+++ make/lib/Awt2dLibraries.gmk -@@ -631,7 +631,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ - LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_aix := -Wl$(COMMA)-berok, \ - LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ -- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ -+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ - -framework CoreGraphics, \ - LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ -- cgit v1.2.3