Index: head/java/openjdk11/Makefile
===================================================================
--- head/java/openjdk11/Makefile	(revision 562169)
+++ head/java/openjdk11/Makefile	(revision 562170)
@@ -1,193 +1,192 @@
 # $FreeBSD$
 
 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}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		autoconf>0:devel/autoconf \
 		${LOCALBASE}/include/cups/cups.h:print/cups \
 		bash:shells/bash \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgif.so:graphics/giflib \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
 USES=		compiler:features gmake iconv jpeg pkgconfig xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
 GH_PROJECT=	openjdk-jdk11u
 
 NO_CCACHE=	yes
 
 _MAKE_JOBS=	#
 MAKE_ENV=	LANG="C" \
 		LC_ALL="C" \
 		CLASSPATH="" \
 		JAVA_HOME="" \
 		LD_LIBRARY_PATH="" \
 		CC=${CC} \
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
 .if defined(BUILD_JRE)
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jre
 .else
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
 .endif
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 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
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=${CC} \
 		CXX=${CXX} \
 		CPP=${CPP} \
 		ac_cv_path_SED=${LOCALBASE}/bin/gsed
 CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
 		--disable-ccache \
 		--disable-javac-server \
 		--disable-hotspot-gtest \
 		--with-jvm-features=shenandoahgc \
 		--with-alsa=${LOCALBASE} \
 		--with-cups=${LOCALBASE} \
 		--with-fontconfig=${LOCALBASE} \
 		--with-freetype=system \
 		--with-freetype-include=${LOCALBASE}/include/freetype2 \
 		--with-freetype-lib=${LOCALBASE}/lib \
 		--with-libjpeg=system \
 		--with-giflib=system \
 		--with-giflib-include=${LOCALBASE}/include \
 		--with-giflib-lib=${LOCALBASE}/lib \
 		--with-libpng=system \
 		--with-zlib=system \
 		--with-lcms=system \
 		--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib \
 		--with-cacerts-file=${FILESDIR}/cacerts \
 		--with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
 		--with-native-debug-symbols=none \
 		--with-debug-level=release \
 		--with-vendor-name="OpenJDK BSD Porting Team" \
 		--with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \
 		--with-vendor-bug-url="${JDK_BUG_URL}" \
 		--with-vendor-vm-bug-url="${JDK_BUG_URL}"
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
 .if defined(BUILD_JRE)
 ALL_TARGET=		legacy-images
 .else
 ALL_TARGET=		images
 .endif
 JDK_BUILD_TYPE=		release
 
 .include <bsd.port.pre.mk>
 
 # Support aarch64 on FreeBSD 12 and up
 .if ${OSVERSION} >= 1200500
 ONLY_FOR_ARCHS+=aarch64
 .endif
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk11 \
 		${LOCALBASE}/bootstrap-openjdk11
 
 # do we have valid native jdk installed?
 .for BJDK in ${BOOTSTRAP_JDKS}
 .  if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
 BOOTSTRAPJDKDIR=	${BJDK}
 .  endif
 .endfor
 
 # if no valid jdk found, set dependency
 .if !defined(BOOTSTRAPJDKDIR)
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk11
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11
 .endif
 
 JDK_BUILD_JVM=	server
 
 MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
 CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
 CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
 			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
 			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
 .else
 MAKE_ENV+=	USE_CLANG=true
 .endif
 
 .if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
 CONFIGURE_ARGS+=	--disable-warnings-as-errors \
 			--disable-dtrace
 .endif
 .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
 .if ${ARCH} != amd64
 CONFIGURE_ARGS+=	--enable-aot=no
 .endif
 .if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12
 EXTRA_PATCHES=		${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
 .endif
 
 .if empty(ICONV_LIB)
 ICONV_CFLAGS=	-DLIBICONV_PLUG
 .else
 ICONV_CFLAGS=	-I${LOCALBASE}/include
 ICONV_LDFLAGS=	-L${LOCALBASE}/lib
 ICONV_LIBS=	${ICONV_LIB}
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${CHMOD} 755 ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp
 	@${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \
 		-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
 		-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
 		${WRKSRC}/make/autoconf/libraries.m4
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
 		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper
 	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
 		${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: head/java/openjdk11/distinfo
===================================================================
--- head/java/openjdk11/distinfo	(revision 562169)
+++ head/java/openjdk11/distinfo	(revision 562170)
@@ -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
Index: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp
===================================================================
--- head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp	(revision 562169)
+++ head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp	(nonexistent)
@@ -1,20 +0,0 @@
---- src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp.orig	2020-11-19 20:56:24 UTC
-+++ src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp
-@@ -27,13 +27,13 @@
- #define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
- 
- #if defined(VM_LITTLE_ENDIAN)
--#include <byteswap.h>
-+#include <sys/endian.h>
- 
- // Efficient swapping of data bytes from Java byte
- // ordering to native byte ordering and vice versa.
--inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); }
--inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
--inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
-+inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); }
-+inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); }
-+inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); }
- #endif // VM_LITTLE_ENDIAN
- 
- #endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP

Property changes on: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4
===================================================================
--- head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4	(revision 562169)
+++ head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4	(nonexistent)
@@ -1,17 +0,0 @@
---- make/autoconf/flags-cflags.m4.orig	2020-01-08 09:12:31 UTC
-+++ make/autoconf/flags-cflags.m4
-@@ -770,6 +770,14 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
-         # for all archs except arm and ppc, prevent gcc to omit frame pointer
-         $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
-       fi
-+    elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
-+        if test "x$FLAGS_CPU" = xppc64; then
-+            $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
-+        elif test "x$FLAGS_CPU" = xppc64le; then
-+            # Little endian machine uses ELFv2 ABI.
-+            # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
-+            $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8"
-+        fi
-     fi
- 
-   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then

Property changes on: head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c
===================================================================
--- head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c	(revision 562169)
+++ head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c	(nonexistent)
@@ -1,20 +0,0 @@
---- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c.orig	2020-11-19 21:24:03 UTC
-+++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c
-@@ -42,7 +42,7 @@
- #include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
- #endif
- 
--#ifdef ppc64
-+#if defined(ppc64) || defined(ppc64le)
- #include "sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext.h"
- #endif
- 
-@@ -373,7 +373,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debu
- #if defined(sparc) || defined(sparcv9)
- #define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG
- #endif
--#ifdef ppc64
-+#if defined(ppc64) || defined(ppc64le)
- #define NPRGREG sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_NPRGREG
- #endif
- #ifdef aarch64

Property changes on: head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/java/openjdk11/files/patch-src_utils_hsdis_Makefile
===================================================================
--- head/java/openjdk11/files/patch-src_utils_hsdis_Makefile	(revision 562169)
+++ head/java/openjdk11/files/patch-src_utils_hsdis_Makefile	(nonexistent)
@@ -1,10 +0,0 @@
---- src/utils/hsdis/Makefile.orig	2020-11-19 21:27:40 UTC
-+++ src/utils/hsdis/Makefile
-@@ -143,6 +143,7 @@ ifdef LP64
- CFLAGS/sparcv9  += -m64
- CFLAGS/amd64    += -m64
- CFLAGS/ppc64    += -m64
-+CFLAGS/ppc64le  += -m64 -DABI_ELFv2
- else # LP64
- ARCH=$(ARCH2:amd64=i386)
- ifneq ($(findstring arm,$(ARCH)),)

Property changes on: head/java/openjdk11/files/patch-src_utils_hsdis_Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp
===================================================================
--- head/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp	(revision 562169)
+++ head/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp	(nonexistent)
@@ -1,20 +0,0 @@
---- src/hotspot/share/opto/addnode.cpp
-+++ src/hotspot/share/opto/addnode.cpp
-@@ -917,7 +917,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) {
- 
-     // Transform MIN2(x + c0, MIN2(x + c1, z)) into MIN2(x + MIN2(c0, c1), z)
-     // if x == y and the additions can't overflow.
--    if (phase->eqv(x,y) &&
-+    if (phase->eqv(x,y) && tx != NULL &&
-         !can_overflow(tx, x_off) &&
-         !can_overflow(tx, y_off)) {
-       return new MinINode(phase->transform(new AddINode(x, phase->intcon(MIN2(x_off, y_off)))), r->in(2));
-@@ -925,7 +925,7 @@ Node *MinINode::Ideal(PhaseGVN *phase, bool can_reshape) {
-   } else {
-     // Transform MIN2(x + c0, y + c1) into x + MIN2(c0, c1)
-     // if x == y and the additions can't overflow.
--    if (phase->eqv(x,y) &&
-+    if (phase->eqv(x,y) && tx != NULL &&
-         !can_overflow(tx, x_off) &&
-         !can_overflow(tx, y_off)) {
-       return new AddINode(x,phase->intcon(MIN2(x_off,y_off)));

Property changes on: head/java/openjdk11/files/patch-src_hotspot_share_opto_addnode.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk
===================================================================
--- head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk	(revision 562169)
+++ head/java/openjdk11/files/patch-make_lib_Awt2dLibraries.gmk	(revision 562170)
@@ -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), \