Index: head/java/openjdk7/Makefile
===================================================================
--- head/java/openjdk7/Makefile	(revision 428240)
+++ head/java/openjdk7/Makefile	(revision 428241)
@@ -1,207 +1,221 @@
 # Created by: Greg Lewis <glewis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
 		http://download.java.net/jaxp/1.4.5/:jaxp \
 		http://icedtea.classpath.org/download/drops/:jaxp \
 		http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws \
 		http://icedtea.classpath.org/download/drops/:jaxws \
 		https://java.net/downloads/jax-ws/JDK7/:jaf \
 		http://icedtea.classpath.org/download/drops/:jaf \
 		APACHE/ant/binaries/:ant
 PATCH_SITES=	LOCAL/glewis/openjdk7
 DISTFILES=	${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
 		${ANT_DISTFILE}${EXTRACT_SUFX}:ant
 EXTRACT_ONLY=	${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
 		${ANT_DISTFILE}${EXTRACT_SUFX}
 PATCHFILES=	patch-7u45-b30.xz \
 		patch-7u51-b30.xz \
 		patch-7u55-b31.xz \
 		patch-7u60-b30.xz \
 		patch-7u65-b31.xz \
 		patch-7u71-b14.xz \
 		patch-7u76-b31.xz \
 		patch-7u80-b32.xz \
 		patch-7u85-b02.xz \
 		patch-7u91-b02.xz \
 		patch-7u95-b00.xz \
 		patch-7u101-b00.xz \
 		patch-7u111-b01.xz
 
 MAINTAINER?=	glewis@FreeBSD.org
 COMMENT?=	Java Development Kit 7
 
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		compiler dos2unix iconv gmake zip
-USE_XORG+=	x11 xext xi xrender xt xtst
+# Even when not building with X11 support, openjdk7 requires Xrender, X11, and
+# Xt headers.
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt
+# Add more X11 build deps and runtime deps when X11 is enabled
+X11_LIB_DEPENDS+=	libX11.so.6:x11/libX11
+X11_LIB_DEPENDS+=	libXext.so.6:x11/libXext
+X11_LIB_DEPENDS+=	libXi.so.6:x11/libXi
+X11_LIB_DEPENDS+=	libXrender.so.1:x11/libXrender
+X11_LIB_DEPENDS+=	libXt.so.6:x11-toolkits/libXt
+X11_LIB_DEPENDS+=	libXtst.so.6:x11/libXtst
+X11_MAKE_ENV_OFF=	BUILD_HEADLESS_ONLY=1
+
 MAKE_ARGS=	CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q}
 
-OPTIONS_DEFINE=		POLICY TZUPDATE
-OPTIONS_DEFAULT=	POLICY TZUPDATE
+OPTIONS_DEFINE=		POLICY TZUPDATE X11
+OPTIONS_DEFAULT=	POLICY TZUPDATE X11
 DEBUG_DESC=		Enable extra debugging info
 POLICY_DESC=		Install the Unlimited Strength Policy Files
 TZUPDATE_DESC=		Update the time zone data
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
 .if !defined(BUILD_JRE)
 OPTIONS_DEFINE+=	DEBUG
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}
 .else
 JAVAVMS_COMMENT+=	JRE
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}-jre
 .endif
 
 PORT_MINOR_VERSION=	111
 PORT_BUILD_NUMBER=	01
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	40
 JDK_BUILD_NUMBER=	43
 JDK_BUILD_DATE=		26_aug_2013
 JDK_SRC_DISTFILE=	${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
 
 # Use our own version of ant to avoid circular dependencies
 ANT_VERSION=		1.9.7
 ANT_DISTFILE=		apache-ant-${ANT_VERSION}-bin
 
 LIB_DEPENDS+=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 BUILD_DEPENDS+=	zip:archivers/zip \
 		${UNZIP_CMD}:archivers/unzip \
 		${LOCALBASE}/include/cups/cups.h:print/cups
 RUN_DEPENDS+=	javavm:java/javavmwrapper \
 		dejavu>0:x11-fonts/dejavu
 
 DOS2UNIX_FILES=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
 
 OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}
 
 NOPRECIOUSMAKEVARS=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 _MAKE_JOBS=	#
 MAKE_ENV+=	LANG="C" \
 		LC_ALL="C" \
 		JAVA_HOME="" \
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
 		MAKEFLAGS="" \
 		ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
 		ALT_FREETYPE_HEADERS_PATH="${LOCALBASE}/include" \
 		ALT_FREETYPE_LIB_PATH="${LOCALBASE}/lib" \
 		ALT_CUPS_HEADERS_PATH="${LOCALBASE}/include" \
 		ALT_X11_PATH="${LOCALBASE}" \
 		ALT_PKG_PATH="${LOCALBASE}" \
 		ALT_PACKAGE_PATH="${LOCALBASE}" \
 		ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \
 		JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \
 		X11DIR="${LOCALBASE}" \
 		LOCALDIR="${LOCALBASE}" \
 		COMPILER_WARNINGS_FATAL="false" \
 		NO_DOCS="true" \
 		SKIP_COMPARE_IMAGES="true" \
 		SKIP_FASTDEBUG_BUILD="true" \
 		SKIP_DEBUG_BUILD="true" \
 		ZIP_DEBUGINFO_FILES=0 \
 		ENABLE_FULL_DEBUG_SYMBOLS=0 \
 		PTHREAD_LIBS="-lpthread" \
 		MILESTONE="fcs" \
 		JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \
 		BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
 
 MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER}
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk7 \
 		${LOCALBASE}/openjdk6 \
 		${LOCALBASE}/bootstrap-openjdk
 
 DEBUG_MAKE_ENV=	ALT_OBJCOPY=${NONEXISTENT}
 POLICY_MAKE_ENV=	UNLIMITED_CRYPTO=1
 TZUPDATE_RUN_DEPENDS=	java-zoneinfo>0:java/java-zoneinfo
 
 .include <bsd.port.options.mk>
 
 # 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-openjdk
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk
 .endif
 
 .include <bsd.port.pre.mk>
 
 # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
 .if ${COMPILER_TYPE} == gcc
 MAKE_ENV+=	USE_PRECOMPILED_HEADER=0
 .endif
 
 .if empty(ICONV_LIB)
 MAKE_ENV+=	EXTRA_CFLAGS=-DLIBICONV_PLUG
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
 		${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp \
 		${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} 's| -liconv||' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/jdk/make/sun/splashscreen/Makefile \
 		${WRKSRC}/jdk/make/java/npt/Makefile \
 		${WRKSRC}/jdk/make/java/instrument/Makefile
 .endif
 
 .if ${PORT_OPTIONS:MTZUPDATE}
 pre-install:
 	@# Update time zones
 .if !defined(BUILD_JRE)
 	@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
 .else
 	@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib
 .endif
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 .if !defined(BUILD_JRE)
 	cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image && \
 	    ${PAX} -rw . ${STAGEDIR}${INSTALLDIR}
 	${INSTALL_DATA} \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/compilefontconfig.jar \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/btjars/javazic.jar \
 	    ${STAGEDIR}${INSTALLDIR}/jre/lib/
 	${INSTALL_DATA} ${FILESDIR}/cacerts \
 	    ${STAGEDIR}${INSTALLDIR}/jre/lib/security/cacerts
 .else
 	cd ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image && \
 	    ${PAX} -rw . ${STAGEDIR}${INSTALLDIR}
 	${INSTALL_DATA} ${FILESDIR}/cacerts \
 	    ${STAGEDIR}${INSTALLDIR}/lib/security/cacerts
 .endif
 	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${INSTALLDIR} -type d -empty | ${SORT} -r | \
 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: head/java/openjdk8/Makefile
===================================================================
--- head/java/openjdk8/Makefile	(revision 428240)
+++ head/java/openjdk8/Makefile	(revision 428241)
@@ -1,444 +1,465 @@
 # $FreeBSD$
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
 		LOCAL/jkim:jdk,jtreg
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 DISTNAME=	${PORTNAME}-${JDK_MAJOR_VERSION}-src-b${DIST_BUILD_NUMBER}-03_mar_2014
 DISTFILES=	${DISTNAME}.zip:jdk
 
 PATCH_SITES=	LOCAL/glewis/openjdk8
 PATCHFILES=	patch-8u05-b13.xz \
 		patch-8u11-b13.xz \
 		patch-8u20-b26.xz \
 		patch-8u25-b17.xz \
 		patch-8u31-b13.xz \
 		patch-8u40-b25.xz \
 		patch-8u45-b14.xz \
 		patch-8u51-b16.xz \
 		patch-8u60-b23.xz \
 		patch-8u66-b17-1.xz \
 		patch-8u72-b15.xz \
 		patch-8u74-b02.xz \
 		patch-8u77-b03.xz \
 		patch-8u92-b14.xz \
 		patch-8u102-b14.xz \
 		patch-8u112-b16.xz
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		${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 \
+		libfreetype.so:print/freetype2
+X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
 		libgif.so:graphics/giflib
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		dejavu>0:x11-fonts/dejavu
 
 USES=		compiler:features dos2unix gmake iconv pkgconfig \
 		shebangfix
 USE_AUTOTOOLS=	autoconf
-USE_XORG=	x11 xext xi xrender xt xtst
+# Even when not building with X11 support, openjdk8 requires Xrender, X11,
+# Xext, and Xt headers.
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender
+X11_BUILD_DEPENDS_OFF+=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt
+# Add more X11 build deps and runtime deps when X11 is enabled
+X11_LIB_DEPENDS+=	libX11.so.6:x11/libX11
+X11_LIB_DEPENDS+=	libXext.so.6:x11/libXext
+X11_LIB_DEPENDS+=	libXi.so.6:x11/libXi
+X11_LIB_DEPENDS+=	libXrender.so.1:x11/libXrender
+X11_LIB_DEPENDS+=	libXt.so.6:x11-toolkits/libXt
+X11_LIB_DEPENDS+=	libXtst.so.6:x11/libXtst
 
 .if !exists(/usr/bin/unzip)
 BUILD_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 .endif
 
 ONLY_FOR_ARCHS=	amd64 armv6 i386
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \
 		jdk/src/bsd/doc/man/extcheck.1 \
 		jdk/src/bsd/doc/man/idlj.1 \
 		jdk/src/bsd/doc/man/jar.1 \
 		jdk/src/bsd/doc/man/jarsigner.1 \
 		jdk/src/bsd/doc/man/java.1 \
 		jdk/src/bsd/doc/man/javac.1 \
 		jdk/src/bsd/doc/man/javadoc.1 \
 		jdk/src/bsd/doc/man/javah.1 \
 		jdk/src/bsd/doc/man/javap.1 \
 		jdk/src/bsd/doc/man/jcmd.1 \
 		jdk/src/bsd/doc/man/jconsole.1 \
 		jdk/src/bsd/doc/man/jdb.1 \
 		jdk/src/bsd/doc/man/jdeps.1 \
 		jdk/src/bsd/doc/man/jhat.1 \
 		jdk/src/bsd/doc/man/jinfo.1 \
 		jdk/src/bsd/doc/man/jjs.1 \
 		jdk/src/bsd/doc/man/jmap.1 \
 		jdk/src/bsd/doc/man/jps.1 \
 		jdk/src/bsd/doc/man/jrunscript.1 \
 		jdk/src/bsd/doc/man/jsadebugd.1 \
 		jdk/src/bsd/doc/man/jstack.1 \
 		jdk/src/bsd/doc/man/jstat.1 \
 		jdk/src/bsd/doc/man/jstatd.1 \
 		jdk/src/bsd/doc/man/keytool.1 \
 		jdk/src/bsd/doc/man/native2ascii.1 \
 		jdk/src/bsd/doc/man/orbd.1 \
 		jdk/src/bsd/doc/man/pack200.1 \
 		jdk/src/bsd/doc/man/policytool.1 \
 		jdk/src/bsd/doc/man/rmic.1 \
 		jdk/src/bsd/doc/man/rmid.1 \
 		jdk/src/bsd/doc/man/rmiregistry.1 \
 		jdk/src/bsd/doc/man/schemagen.1 \
 		jdk/src/bsd/doc/man/serialver.1 \
 		jdk/src/bsd/doc/man/servertool.1 \
 		jdk/src/bsd/doc/man/tnameserv.1 \
 		jdk/src/bsd/doc/man/unpack200.1 \
 		jdk/src/bsd/doc/man/wsgen.1 \
 		jdk/src/bsd/doc/man/wsimport.1 \
 		jdk/src/bsd/doc/man/xjc.1 \
 		jdk/src/linux/doc/man/appletviewer.1 \
 		jdk/src/linux/doc/man/extcheck.1 \
 		jdk/src/linux/doc/man/idlj.1 \
 		jdk/src/linux/doc/man/jar.1 \
 		jdk/src/linux/doc/man/jarsigner.1 \
 		jdk/src/linux/doc/man/java.1 \
 		jdk/src/linux/doc/man/javac.1 \
 		jdk/src/linux/doc/man/javadoc.1 \
 		jdk/src/linux/doc/man/javah.1 \
 		jdk/src/linux/doc/man/javap.1 \
 		jdk/src/linux/doc/man/jcmd.1 \
 		jdk/src/linux/doc/man/jconsole.1 \
 		jdk/src/linux/doc/man/jdb.1 \
 		jdk/src/linux/doc/man/jdeps.1 \
 		jdk/src/linux/doc/man/jhat.1 \
 		jdk/src/linux/doc/man/jinfo.1 \
 		jdk/src/linux/doc/man/jjs.1 \
 		jdk/src/linux/doc/man/jmap.1 \
 		jdk/src/linux/doc/man/jps.1 \
 		jdk/src/linux/doc/man/jrunscript.1 \
 		jdk/src/linux/doc/man/jsadebugd.1 \
 		jdk/src/linux/doc/man/jstack.1 \
 		jdk/src/linux/doc/man/jstat.1 \
 		jdk/src/linux/doc/man/jstatd.1 \
 		jdk/src/linux/doc/man/keytool.1 \
 		jdk/src/linux/doc/man/native2ascii.1 \
 		jdk/src/linux/doc/man/orbd.1 \
 		jdk/src/linux/doc/man/pack200.1 \
 		jdk/src/linux/doc/man/policytool.1 \
 		jdk/src/linux/doc/man/rmic.1 \
 		jdk/src/linux/doc/man/rmid.1 \
 		jdk/src/linux/doc/man/rmiregistry.1 \
 		jdk/src/linux/doc/man/schemagen.1 \
 		jdk/src/linux/doc/man/serialver.1 \
 		jdk/src/linux/doc/man/servertool.1 \
 		jdk/src/linux/doc/man/tnameserv.1 \
 		jdk/src/linux/doc/man/unpack200.1 \
 		jdk/src/linux/doc/man/wsgen.1 \
 		jdk/src/linux/doc/man/wsimport.1 \
 		jdk/src/linux/doc/man/xjc.1 \
 		jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \
 		jdk/src/solaris/doc/sun/man/man1/appletviewer.1 \
 		jdk/src/solaris/doc/sun/man/man1/extcheck.1 \
 		jdk/src/solaris/doc/sun/man/man1/idlj.1 \
 		jdk/src/solaris/doc/sun/man/man1/jar.1 \
 		jdk/src/solaris/doc/sun/man/man1/jarsigner.1 \
 		jdk/src/solaris/doc/sun/man/man1/java.1 \
 		jdk/src/solaris/doc/sun/man/man1/javac.1 \
 		jdk/src/solaris/doc/sun/man/man1/javadoc.1 \
 		jdk/src/solaris/doc/sun/man/man1/javah.1 \
 		jdk/src/solaris/doc/sun/man/man1/javap.1 \
 		jdk/src/solaris/doc/sun/man/man1/jcmd.1 \
 		jdk/src/solaris/doc/sun/man/man1/jconsole.1 \
 		jdk/src/solaris/doc/sun/man/man1/jdb.1 \
 		jdk/src/solaris/doc/sun/man/man1/jdeps.1 \
 		jdk/src/solaris/doc/sun/man/man1/jhat.1 \
 		jdk/src/solaris/doc/sun/man/man1/jinfo.1 \
 		jdk/src/solaris/doc/sun/man/man1/jjs.1 \
 		jdk/src/solaris/doc/sun/man/man1/jmap.1 \
 		jdk/src/solaris/doc/sun/man/man1/jps.1 \
 		jdk/src/solaris/doc/sun/man/man1/jrunscript.1 \
 		jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 \
 		jdk/src/solaris/doc/sun/man/man1/jstack.1 \
 		jdk/src/solaris/doc/sun/man/man1/jstat.1 \
 		jdk/src/solaris/doc/sun/man/man1/jstatd.1 \
 		jdk/src/solaris/doc/sun/man/man1/keytool.1 \
 		jdk/src/solaris/doc/sun/man/man1/native2ascii.1 \
 		jdk/src/solaris/doc/sun/man/man1/orbd.1 \
 		jdk/src/solaris/doc/sun/man/man1/pack200.1 \
 		jdk/src/solaris/doc/sun/man/man1/policytool.1 \
 		jdk/src/solaris/doc/sun/man/man1/rmic.1 \
 		jdk/src/solaris/doc/sun/man/man1/rmid.1 \
 		jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 \
 		jdk/src/solaris/doc/sun/man/man1/schemagen.1 \
 		jdk/src/solaris/doc/sun/man/man1/serialver.1 \
 		jdk/src/solaris/doc/sun/man/man1/servertool.1 \
 		jdk/src/solaris/doc/sun/man/man1/tnameserv.1 \
 		jdk/src/solaris/doc/sun/man/man1/unpack200.1 \
 		jdk/src/solaris/doc/sun/man/man1/wsgen.1 \
 		jdk/src/solaris/doc/sun/man/man1/wsimport.1 \
 		jdk/src/solaris/doc/sun/man/man1/xjc.1 \
 		nashorn/test/script/jfx.js \
 		nashorn/test/script/jfx/kaleidoscope.js \
 		nashorn/test/script/jfx/spread.js
 SHEBANG_FILES=	configure
 
 _MAKE_JOBS=	#
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	LANG="C" LC_ALL="C"
-MAKE_ENV+=	CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH="" MAKEFLAGS=""
+MAKE_ENV+=	CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH=""
 MAKE_ENV+=	IGNORE_OLD_CONFIG=true
 MAKE_ENV+=	COMPILER_WARNINGS_FATAL="false"
+# openjdk8 normally sets X_CFLAGS in the ./configure script, but it won't do
+# that if you say --disable-headful, even though it still needs some X headers.
+# Set it here instead.
+X11_MAKE_ENV_OFF=	MAKEFLAGS="X_CFLAGS=-I${LOCALBASE}/include" \
+			BUILD_HEADLESS_ONLY=1
 
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
 .if !defined(BUILD_JRE)
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/j2sdk-image
 JRE_IMAGEDIR=	${JDK_BUILDDIR}/images/j2sdk-image/jre
 .else
 JRE_IMAGEDIR=	${JDK_BUILDDIR}/images/j2re-image
 .endif
 JDK_JVMDIR=	lib/${ARCH:S/armv6/arm/}
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/armv6/arm/:S/i386/x86/}
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 NO_CCACHE=		yes
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
 JDK_UPDATE_VERSION=	112
 JDK_BUILD_NUMBER=	16
 DIST_BUILD_NUMBER=	132
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
 JTREG_JENKINS_BUILD=	77
 
 CONFIGURE_ARGS=		--with-boot-jdk=${BOOTSTRAPJDKDIR}
 CONFIGURE_ARGS+=	--with-build-number="b${JDK_BUILD_NUMBER}"
 .if ${JDK_UPDATE_VERSION} > 0
 CONFIGURE_ARGS+=	--with-update-version=${JDK_UPDATE_VERSION}
 .endif
 CONFIGURE_ARGS+=	--disable-ccache \
 			--disable-freetype-bundling \
 			--disable-zip-debug-info \
 			--with-alsa=${LOCALBASE} \
 			--with-cacerts-file=${FILESDIR}/cacerts \
 			--with-cups=${LOCALBASE} \
 			--with-debug-level=${JDK_BUILD_TYPE} \
 			--with-freetype=${LOCALBASE} \
 			--with-freetype-include=${LOCALBASE}/include/freetype2 \
-			--with-giflib=system \
 			--with-jobs=${MAKE_JOBS_NUMBER} \
 			--with-jvm-variants=${JDK_BUILD_JVM} \
 			--with-milestone=fcs \
 			--with-package-path=${LOCALBASE} \
 			--with-zlib=system
+X11_CONFIGURE_ON=	--with-giflib=system \
+			--x-libraries=${LOCALBASE}/lib \
+			--x-includes=${LOCALBASE}/include
+X11_CONFIGURE_OFF=	--disable-headful
 CONFIGURE_SCRIPT=	../../configure
 CONFIGURE_WRKSRC=	${WRKSRC}/common/autoconf
 
-OPTIONS_DEFINE=		POLICY TZUPDATE
+OPTIONS_DEFINE=		POLICY TZUPDATE X11
 OPTIONS_DEFINE_armv6=	FPUHACK
-OPTIONS_DEFAULT=	POLICY TZUPDATE
+OPTIONS_DEFAULT=	POLICY TZUPDATE X11
 OPTIONS_DEFAULT_armv6=	FPUHACK
 FPUHACK_DESC=		Hack denormalized numbers in flush-to-zero mode
 POLICY_DESC=		Install the Unlimited Strength Policy Files
 TZUPDATE_DESC=		Update the time zone data
 
 FPUHACK_EXTRA_PATCHES=	${PATCHDIR}/fpuhack.patch
 POLICY_CONFIGURE_ENABLE=	unlimited-crypto
 TZUPDATE_RUN_DEPENDS=	java-zoneinfo>0:java/java-zoneinfo
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
 .if !defined(BUILD_JRE)
 OPTIONS_DEFINE+=	TEST
 OPTIONS_DEFAULT+=	RELEASE
 OPTIONS_SINGLE=		BUILD
 OPTIONS_SINGLE_BUILD=	DEBUG DEBUGFAST RELEASE
 BUILD_DESC=		Select OpenJDK build type
 DEBUG_DESC=		Build for debugging (without optimizations)
 DEBUGFAST_DESC=		Build for debugging (with optimizations)
 RELEASE_DESC=		Build for release (default)
 TEST_DESC=		Run regression tests
 
 DEBUG_VARS=		JDK_BUILD_TYPE=slowdebug
 DEBUGFAST_VARS=		JDK_BUILD_TYPE=fastdebug
 RELEASE_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/objcopy:devel/binutils
 RELEASE_CONFIGURE_ON=	--disable-debug-symbols
 RELEASE_VARS=		JDK_BUILD_TYPE=release
 RELEASE_VARS_OFF=	OBJCOPY=${LOCALBASE}/bin/objcopy
 TEST_ALL_TARGET=	test
 TEST_ALL_TARGET_OFF=	images
 TEST_CONFIGURE_ON=	--with-jtreg=${WRKDIR}/jtreg
 TEST_DISTFILES=		jtreg${JTREG_VERSION}-${JTREG_BUILD_NUMBER}${EXTRACT_SUFX}:jtreg
 .else
 ALL_TARGET=		images
 CONFIGURE_ARGS+=	--disable-debug-symbols
 JAVAVMS_COMMENT+=	JRE
 JDK_BUILD_TYPE=		release
 .endif
 
 AUTOCONF_ARGS=	-I . -o generated-configure.sh generated-configure.ac
 
 # XXX configure script rejects CC/CPP/CXX with absolute paths.
 .for t in CC CPP CXX
 .if defined(${t}) && ${${t}:M/*}
 BUILD_${t}=	${${t}:C|.*/||g}
 CONFIGURE_ENV+=	${t}="${BUILD_${t}}"
 TOOLS_DIR+=	${${t}:S|/${BUILD_${t}}$||}
 .endif
 .endfor
 .if defined(TOOLS_DIR)
 CONFIGURE_ARGS+=	--with-tools-dir="${TOOLS_DIR:u:S/ /:/g}"
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv6" || ${ARCH} == "i386"
 # XXX We must limit max heap size for 32-bit targets.
 CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs="-Xmx768m"
 MAKE_ENV+=	JAVADOC_CMD_MEM="-Xmx768m"
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "i386"
 JDK_BUILD_JVM=	server
 .else
 JDK_BUILD_JVM=	zero
 LIB_DEPENDS+=	libffi.so:devel/libffi
 .endif
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk8 \
 		${LOCALBASE}/openjdk7
 .if ${ARCH} == "armv6"
 BOOTSTRAP_JDKS+=	${LOCALBASE}/bootstrap-openjdk
 .endif
 
 # 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)
 .  if ${ARCH} == "armv6"
 # bootstrap-openjdk is based on openjdk7 and can compile openjdk8
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk
 .  else
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/openjdk7
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk7
 .  endif
 .endif
 
 # PR193009: work around the rtld bug
 .if ${OSVERSION} < 1001511
 CONFIGURE_ARGS+=	--enable-static-libjli
 .endif
 
 .if ${COMPILER_TYPE} == clang
 .if ${COMPILER_VERSION} >= 35
 MAKE_ENV+=	COMPILER_WARNINGS_FATAL=false
 .endif
 MAKE_ENV+=	USE_CLANG=true
 .if ${COMPILER_FEATURES:Mlibc++}
 CONFIGURE_ENV+=	LIBCXX="-lc++"
 .endif
 .endif
 
 # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
 .if ${COMPILER_TYPE} == gcc
 MAKE_ARGS+=	USE_PRECOMPILED_HEADER=0
 .endif
 
 .if empty(ICONV_LIB)
 ICONV_CPPFLAGS=	-DLIBICONV_PLUG
 .else
 ICONV_CPPFLAGS=	-I${LOCALBASE}/include
 ICONV_LDFLAGS=	-L${LOCALBASE}/lib ${ICONV_LIB}
 .endif
 
 post-extract:
 	@${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \
 	    ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg
 	@${CP} ${FILESDIR}/nashorn-test-script-jfx-flyingimage-golden-bsd.png \
 	    ${WRKSRC}/nashorn/test/script/jfx/flyingimage/golden/bsd.png
 	@${CP} ${FILESDIR}/nashorn-test-script-jfx-kaleidoscope-golden-bsd.png \
 	    ${WRKSRC}/nashorn/test/script/jfx/kaleidoscope/golden/bsd.png
 	@${CP} ${FILESDIR}/nashorn-test-script-jfx-spread-golden-bsd.png \
 	    ${WRKSRC}/nashorn/test/script/jfx/spread/golden/bsd.png
 
 post-extract-TEST-on:
 	@${LN} -sf ${WRKDIR}/jtreg/linux/bin ${WRKDIR}/jtreg/
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${RMDIR} ${WRKSRC}/jdk/src/macosx/classes/java/net \
 	    ${WRKSRC}/jdk/src/macosx/native/sun/nio/ch \
 	    ${WRKSRC}/jdk/src/macosx/native/sun/nio
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    ${FILESDIR}/bsd.fontconfig.properties.in > \
 	    ${WRKSRC}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    -e 's|%%OBJCOPY%%|${OBJCOPY}|' \
 	    ${WRKSRC}/configure \
 	    ${WRKSRC}/common/autoconf/toolchain.m4 \
 	    ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \
 	    ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \
 	    ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java
 	@${REINPLACE_CMD} -e 's|/usr/local/share/java/classes|${LOCALBASE}/share/java/classes|' \
 	    ${WRKSRC}/jdk/src/bsd/doc/man/*.1
 	@${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \
 	    -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
 	    ${WRKSRC}/jdk/make/lib/Awt2dLibraries.gmk \
 	    ${WRKSRC}/jdk/make/lib/CoreLibraries.gmk \
 	    ${WRKSRC}/jdk/make/lib/ServiceabilityLibraries.gmk
 .if defined(BUILD_JRE)
 	@${REINPLACE_CMD} -e 's|-f Images.gmk$$|& jre-image|' \
 	    -e 's|-f Images.gmk overlay-images$$|-f Images.gmk jre-overlay-image|' \
 	    ${WRKSRC}/jdk/make/BuildJdk.gmk
 .endif
 	@${CHMOD} 755 ${WRKSRC}/configure
 
 pre-configure:
 	@cd ${CONFIGURE_WRKSRC} && \
 	${SED} -e "s|@DATE_WHEN_GENERATED@|$$(date +%s)|" configure.ac > \
 	    generated-configure.ac
 
 post-build:
 .if !defined(BUILD_JRE)
 	@${BOOTSTRAPJDKDIR}/bin/jar cfe \
 	    ${JRE_IMAGEDIR}/lib/compilefontconfig.jar \
 	    build.tools.compilefontconfig.CompileFontConfig \
 	    -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/compilefontconfig
 	@${BOOTSTRAPJDKDIR}/bin/jar cfe \
 	    ${JRE_IMAGEDIR}/lib/javazic.jar \
 	    build.tools.tzdb.TzdbZoneRulesCompiler \
 	    -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb
 .endif
 
 post-build-TZUPDATE-on:
 	@# Update time zones
 	@${RM} -r ${JRE_IMAGEDIR}/lib/zi
 	@${LN} -sf ${LOCALBASE}/share/java/zi ${JRE_IMAGEDIR}/lib
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 .if !defined(BUILD_JRE)
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
 	${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
 	${CHMOD} ${BINMODE} jre/${JDK_JVMDIR}/jexec \
 	    jre/${JDK_JVMDIR}/jspawnhelper ${JDK_JVMDIR}/jexec
 	@${ECHO} "@dir ${INSTALLDIR}/jre/lib/applet" >> ${TMPPLIST}
 .else
 	@cd ${JRE_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
 	${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
 	${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper
 	@${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST}
 .endif
 	@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
 	    ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>