svn commit: r562170 - in head/java/openjdk11: . files

[Greg Lewis]

Author: glewis
Date: Thu Jan 21 03:04:11 2021
New Revision: 562170
URL: https://svnweb.freebsd.org/changeset/ports/562170

Log:
  Update to 11.0.10 GA

Deleted:
  head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4
  head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp
  head/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp
  head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c
  head/java/openjdk11/files/patch-src_utils_hsdis_Makefile
Modified:
  head/java/openjdk11/Makefile
  head/java/openjdk11/distinfo
  head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk

Modified: head/java/openjdk11/Makefile
==============================================================================
--- head/java/openjdk11/Makefile	Thu Jan 21 02:28:35 2021	(r562169)
+++ head/java/openjdk11/Makefile	Thu Jan 21 03:04:11 2021	(r562170)
@@ -3,7 +3,6 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -61,8 +60,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	9
-JDK_BUILD_NUMBER=	11
+JDK_PATCH_VERSION=	10
+JDK_BUILD_NUMBER=	9
 BSD_JDK_VERSION=	1
 
 JDK_BUG_URL=	https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20

Modified: head/java/openjdk11/distinfo
==============================================================================
--- head/java/openjdk11/distinfo	Thu Jan 21 02:28:35 2021	(r562169)
+++ head/java/openjdk11/distinfo	Thu Jan 21 03:04:11 2021	(r562170)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603421965
-SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.9+11-1_GH0.tar.gz) = 56e713dfcebcd401bf57f80c47393a0225054913951f651c5f004bedf33e8b31
-SIZE (battleblow-openjdk-jdk11u-jdk-11.0.9+11-1_GH0.tar.gz) = 118255644
+TIMESTAMP = 1611191020
+SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.10+9-1_GH0.tar.gz) = 635656feec548f2dc90a16c634047980e3871fe995a4f7e8baa81743585872c1
+SIZE (battleblow-openjdk-jdk11u-jdk-11.0.10+9-1_GH0.tar.gz) = 122486444

Modified: head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk
==============================================================================
--- head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk	Thu Jan 21 02:28:35 2021	(r562169)
+++ head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk	Thu Jan 21 03:04:11 2021	(r562170)
@@ -1,11 +1,11 @@
---- make/lib/Awt2dLibraries.gmk.orig	2020-06-10 15:26:21 UTC
-+++ make/lib/Awt2dLibraries.gmk
-@@ -639,7 +639,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
+--- make/lib/Awt2dLibraries.gmk.orig	2021-01-19 20:45:30.000000000 -0800
++++ make/lib/Awt2dLibraries.gmk	2021-01-20 18:23:43.116628000 -0800
+@@ -712,7 +712,7 @@
      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_macosx := -lawt_lwawt, \
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
+         $(WIN_AWT_LIB), \