Index: head/java/openjdk12/Makefile
===================================================================
--- head/java/openjdk12/Makefile	(revision 508821)
+++ head/java/openjdk12/Makefile	(revision 508822)
@@ -1,145 +1,144 @@
 # $FreeBSD$
 
 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}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		autoconf>0:devel/autoconf \
 		${LOCALBASE}/include/cups/cups.h:print/cups \
 		bash:shells/bash
 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
 
 USES=		compiler:features gmake iconv jpeg pkgconfig
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
 GH_PROJECT=	openjdk-jdk12u
 
 NO_CCACHE=	yes
 
 _MAKE_JOBS=	#
 MAKE_ENV=	LANG="C" \
 		LC_ALL="C" \
 		CLASSPATH="" \
 		JAVA_HOME="" \
 		LD_LIBRARY_PATH="" \
 		CC=/usr/bin/cc \
 		CXX=/usr/bin/c++ \
 		MAKEFLAGS="" \
 		USE_CLANG=true
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/}
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	12
 JDK_MINOR_VERSION=	0
 JDK_PATCH_VERSION=	2
 JDK_BUILD_NUMBER=	10
-BSD_JDK_VERSION=	1
+BSD_JDK_VERSION=	2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=/usr/bin/cc \
 		CXX=/usr/bin/c++
 CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
 		--disable-ccache \
 		--disable-javac-server \
 		--disable-hotspot-gtest \
 		--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 \
 		--with-toolchain-type=clang \
 		--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib \
 		--with-cacerts-file=${FILESDIR}/cacerts \
 		--with-version-string=${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
 		--with-native-debug-symbols=none \
 		--with-debug-level=release
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
 ALL_TARGET=		images
 JDK_BUILD_TYPE=		release
 
 .include <bsd.port.pre.mk>
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk12 \
 		${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
 
 .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/openjdk12/distinfo
===================================================================
--- head/java/openjdk12/distinfo	(revision 508821)
+++ head/java/openjdk12/distinfo	(revision 508822)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563554636
-SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-1_GH0.tar.gz) = 3fb583b455007a84ef790d72a73232aef2c18c9fba07e84f71e32a63503241fc
-SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-1_GH0.tar.gz) = 110435414
+TIMESTAMP = 1565671800
+SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 7038f9264880a343334e5a80c59ac6265e32ed6e9cff0d122b0a7f70826fde67
+SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 110452445
Index: head/java/openjdk12/files/patch-make_autoconf_libraries.m4
===================================================================
--- head/java/openjdk12/files/patch-make_autoconf_libraries.m4	(revision 508821)
+++ head/java/openjdk12/files/patch-make_autoconf_libraries.m4	(revision 508822)
@@ -1,15 +1,15 @@
---- make/autoconf/libraries.m4.orig	2019-03-28 16:54:58.823145000 -0700
-+++ make/autoconf/libraries.m4	2019-03-28 16:55:45.533206000 -0700
-@@ -186,9 +186,9 @@
+--- make/autoconf/libraries.m4~	2019-08-12 19:10:36.292217000 -0700
++++ make/autoconf/libraries.m4	2019-08-12 19:18:15.523606000 -0700
+@@ -188,9 +188,9 @@
        ICONV_LDFLAGS="-L/usr/local/lib"
        ICONV_LIBS=-liconv
-     else
--      ICONV_CFLAGS=
+     elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+-      ICONV_CFLAGS=-DLIBICONV_PLUG
 -      ICONV_LDFLAGS=
 -      ICONV_LIBS=
 +      ICONV_CFLAGS=%%ICONV_CFLAGS%%
 +      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
 +      ICONV_LIBS=%%ICONV_LIBS%%
-     fi
-   else
-     ICONV_CFLAGS=
+     else
+       ICONV_CFLAGS=
+       ICONV_LDFLAGS=
Index: head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp
===================================================================
--- head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp	(nonexistent)
+++ head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp	(revision 508822)
@@ -0,0 +1,12 @@
+--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig,
+     // Handle ALL stack overflow variations here
+     if (sig == SIGSEGV || sig == SIGBUS) {
+       address addr = (address) info->si_addr;
++#ifdef __FreeBSD__
++      addr = align_down(addr, os::vm_page_size());
++#endif
+ 
+       // check if fault address is within thread stack
+       if (thread->on_local_stack(addr)) {

Property changes on: head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property