Index: head/java/openjdk12/Makefile
===================================================================
--- head/java/openjdk12/Makefile	(revision 497172)
+++ head/java/openjdk12/Makefile	(revision 497173)
@@ -1,144 +1,139 @@
 # $FreeBSD$
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	https://github.com/battleblow/openjdk-jdk12u/archive/
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 DISTNAME=	jdk-${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_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=	libfreetype.so:print/freetype2 \
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
-		liblcms2.so:graphics/lcms2 \
+		libfreetype.so:print/freetype2 \
 		libgif.so:graphics/giflib \
+		liblcms2.so:graphics/lcms2 \
 		libpng16.so:graphics/png
 
 USES=		compiler:features gmake iconv jpeg pkgconfig
-USE_XORG=	xext x11 xrender xtst xi xt xrandr
+USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-jdk${JDK_MAJOR_VERSION}u-jdk-${JDK_MAJOR_VERSION}-${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 
 _MAKE_JOBS=	#
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	LANG="C" \
 		LC_ALL="C" \
 		CLASSPATH="" \
 		JAVA_HOME="" \
 		LD_LIBRARY_PATH="" \
-		LDFLAGS=-L${LOCALBASE}/lib \
 		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=	0
 JDK_BUILD_NUMBER=	33
-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-dtrace \
 		--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-extra-cflags=-I${LOCALBASE}/include \
-		--with-extra-cxxflags=-I${LOCALBASE}/include \
-		--with-extra-ldflags=-L${LOCALBASE}/lib \
 		--with-toolchain-type=clang \
 		--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib \
-		--with-package-path=${LOCALBASE} \
 		--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}/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
 	@${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 497172)
+++ head/java/openjdk12/distinfo	(revision 497173)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553131068
-SHA256 (jdk-12+33-1.tar.gz) = a1aae0dc0adbb00c9733b91276a6f739e3dc234fd4c019fe7ee3f4e323fbe67f
-SIZE (jdk-12+33-1.tar.gz) = 110195427
+TIMESTAMP = 1553839427
+SHA256 (jdk-12+33-2.tar.gz) = b4eb145fa003a3cfee945056a65bf4f00be00c765f3a2810218b6178bceccf95
+SIZE (jdk-12+33-2.tar.gz) = 110233939
Index: head/java/openjdk12/files/patch-make_autoconf_libraries.m4
===================================================================
--- head/java/openjdk12/files/patch-make_autoconf_libraries.m4	(revision 497172)
+++ head/java/openjdk12/files/patch-make_autoconf_libraries.m4	(revision 497173)
@@ -1,19 +1,15 @@
---- make/autoconf/libraries.m4
-+++ make/autoconf/libraries.m4
-@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
-   LIBS="$save_LIBS"
- 
-   if test "x$OPENJDK_TARGET_OS" = "xbsd"; then
--    if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
--      ICONV_CFLAGS="-I$PACKAGE_PATH/include"
--      ICONV_LDFLAGS="-L$PACKAGE_PATH/lib"
-+    if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+--- 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 @@
+       ICONV_LDFLAGS="-L/usr/local/lib"
+       ICONV_LIBS=-liconv
+     else
+-      ICONV_CFLAGS=
+-      ICONV_LDFLAGS=
+-      ICONV_LIBS=
 +      ICONV_CFLAGS=%%ICONV_CFLAGS%%
 +      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
 +      ICONV_LIBS=%%ICONV_LIBS%%
-+    elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
-+      ICONV_CFLAGS="-I/usr/local/include"
-+      ICONV_LDFLAGS="-L/usr/local/lib"
-       ICONV_LIBS=-liconv
-     else
-       ICONV_CFLAGS=
+     fi
+   else
+     ICONV_CFLAGS=
Index: head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk
===================================================================
--- head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk	(nonexistent)
+++ head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk	(revision 497173)
@@ -0,0 +1,18 @@
+--- make/hotspot/lib/JvmDtraceObjects.gmk
++++ make/hotspot/lib/JvmDtraceObjects.gmk
+@@ -201,8 +201,13 @@ ifeq ($(call check-jvm-feature, dtrace), true)
+       )
+     endif
+ 
+-    DTRACE_FLAGS := -64 -G
+-    DTRACE_CPP_FLAGS := -D_LP64 -x c
++    ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
++      DTRACE_FLAGS := -32 -G
++      DTRACE_CPP_FLAGS := -x c
++    else
++      DTRACE_FLAGS := -64 -G
++      DTRACE_CPP_FLAGS := -D_LP64 -x c
++    endif
+ 
+     # Make sure we run our selected compiler for preprocessing instead of letting
+     # the dtrace tool pick it on it's own.

Property changes on: head/java/openjdk12/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk
___________________________________________________________________
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
Index: head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp
===================================================================
--- head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp	(nonexistent)
+++ head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp	(revision 497173)
@@ -0,0 +1,11 @@
+--- src/hotspot/os/bsd/os_bsd.cpp.orig	2019-03-28 21:47:08.000000000 -0700
++++ src/hotspot/os/bsd/os_bsd.cpp	2019-03-28 23:08:55.590922000 -0700
+@@ -361,7 +361,7 @@
+     #elif defined(__NetBSD__)
+       #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
+     #else
+-      #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
++      #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
+     #endif
+   #else
+     #define DEFAULT_LIBPATH OVERRIDE_LIBPATH

Property changes on: head/java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.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