git: 0877cf18c3a0 - main - java/openjdk11: Update to 11.0.13

The branch main has been updated by glewis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0877cf18c3a0f1caa2a6eef7a4130465cf6ae125

commit 0877cf18c3a0f1caa2a6eef7a4130465cf6ae125
Author:     Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2021-10-31 18:00:19 +0000
Commit:     Greg Lewis <glewis@FreeBSD.org>
CommitDate: 2021-10-31 18:07:42 +0000

    java/openjdk11: Update to 11.0.13
---
 java/openjdk11/Makefile                                | 13 +++----------
 java/openjdk11/distinfo                                |  6 +++---
 java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index 68fae74c20b0..e35ac4002063 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -1,12 +1,10 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	2573d73e959c3211aafe8c4077e501d48f53827e.patch:-p1
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -64,8 +62,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	12
-JDK_BUILD_NUMBER=	7
+JDK_PATCH_VERSION=	13
+JDK_BUILD_NUMBER=	8
 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
@@ -144,12 +142,7 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
 .else
 MAKE_ENV+=	USE_CLANG=true
 .if ${COMPILER_VERSION} >= 130
-# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
-# See also https://bugs.openjdk.java.net/browse/JDK-8229258
-LLVM_VER=	12
-BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
-CC=		${LOCALBASE}/bin/clang${LLVM_VER}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_VER}
+CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
 .endif
 .endif
 
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index ce4e617fd343..23e17b09a756 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 946688954
-SHA256 (battleblow-jdk11u-jdk-11.0.12+7-1_GH0.tar.gz) = 689b625a70f54096f8c193b441aa425be5c765d4db23825b461a84fd616be1cb
-SIZE (battleblow-jdk11u-jdk-11.0.12+7-1_GH0.tar.gz) = 122773821
+TIMESTAMP = 1635637615
+SHA256 (battleblow-jdk11u-jdk-11.0.13+8-1_GH0.tar.gz) = be31b53fa7dbe4d3cb52ae2d663d780b33bd37deba4b526fd58ccdae8860eb22
+SIZE (battleblow-jdk11u-jdk-11.0.13+8-1_GH0.tar.gz) = 122891542
 SHA256 (2573d73e959c3211aafe8c4077e501d48f53827e.patch) = 810cf6d32045ceab35c012cb50e745b99fcccd20f6e89ecece01e2bbe7f1fef6
 SIZE (2573d73e959c3211aafe8c4077e501d48f53827e.patch) = 2083
diff --git a/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk b/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk
index e7fe6135a16e..6bfceb7588b3 100644
--- a/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk
+++ b/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk
@@ -1,11 +1,11 @@
 --- 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 @@
+@@ -655,7 +655,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, \
+     LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
          $(WIN_AWT_LIB), \