- put -D__STDC_LIMIT_MACROS on command line instead of patching it everywhere

- don't use ALT_JDK_IMPORT_PATH on SunOS, just build like on other platforms
- regen all bootstraps to facilitate removal of the +UseSerialGC hacks
- bootstrap binaries on FTP are now PGP signed
- remove a handful of obsolete patches

18 files changed, 70 insertions, 389 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index c3fb0c16e70..2e1e0c66139 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2015/03/01 16:57:05 tnn Exp $
+# $NetBSD: Makefile,v 1.97 2015/03/02 03:53:26 tnn Exp $
 
 DISTNAME=	openjdk-1.7.76-20150127
 PKGNAME=	openjdk7-1.7.76
@@ -54,9 +54,6 @@ MAKE_ENV+=	HOTSPOT_BUILD_USER=pkgsrc
 MAKE_ENV+=	NO_DOCS=true
 MAKE_ENV+=	SKIP_COMPARE_IMAGES=true
 
-ALL_ENV+=	PKGSRC_BOOT_JDK_JVMARGS="-XX:+UseSerialGC -Xmx768M"
-ALL_ENV+=	PKGSRC_BOOT_JDK_TOOLARGS="-J-XX:+UseSerialGC -J-Xmx768M"
-
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=	JAVA_HOME=
 MAKE_ENV+=	CLASSPATH=
@@ -110,6 +107,9 @@ SUBST_FILES.mapfix2=	jdk/make/com/sun/java/pack/mapfile-vers
 SUBST_SED.mapfix2=	-e '/environ/d'
 .endif
 
+CFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+CXXFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+
 .if !empty(PKGSRC_COMPILER:Mclang)
 _WRAP_EXTRA_ARGS.CXX+=	-Wno-parentheses -Wno-sign-conversion \
 			-Wno-shorten-64-to-32 -Wno-conversion \
@@ -175,20 +175,13 @@ PLIST.alsa=	yes
 post-extract:
 	chmod +x ${ANT_BIN}/ant
 	${LN} -s mapfile-i586 ${WRKSRC}/jdk/make/java/main/java/mapfile-arm
-.if ${OPSYS} == "SunOS"
-	${MKDIR} ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include
-	${LN} -s ${JDK_BOOTDIR}/lib ${ALT_BOOTDIR}/lib
-	${LN} -s ${JDK_BOOTDIR}/bin/java ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/javac ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/javah ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/javap ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/idlj ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/jar ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin
-	${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin
-.elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs)
-	cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}
+# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with
+# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base.
+.if exists(/lib/libgcc_s.so.1)
+	${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so*
+.endif
+.if exists(/usr/lib/libstdc++.so.7)
+	${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so*
 .endif
 
 do-build: ${WRKDIR}/stage3-done
diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index 29030d5dd6f..a3e8bf72213 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.17 2015/02/22 08:40:07 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.18 2015/03/02 03:53:26 tnn Exp $
 #
 # This file contains a map of available binary bootstrap toolchains
 # and which kit to use for each supported platform.
@@ -14,33 +14,30 @@
 #  8) When preparing kits for NetBSD 7 and above with gcc, copy libgcc_s.so.*
 #     and libstdc++.so.* from base to bootstrap/jre/lib/${LIBDIR_ARCH}.
 #     This will ensure that MKLLVM=yes/MKGCC=no user in the future can run
-#     the bootstrap toolchain.
+#     the bootstrap toolchain. For targets that use jdk-zero-vm you need
+#     to include libffi.so.* as well.
 #  9) tar cf - bootstrap | xz -9c > bootstrap-xxx.tar.xz
-# 10) gpg --sign -a bootstrap-xxx.tar.xz
+# 10) gpg2 -a --detach-sign bootstrap-xxx.tar.xz
 # 11) Upload archive and signature to ${MASTER_SITE_LOCAL:=openjdk7/}
 #
 # All binary kits from now on MUST have an accompanying PGP signature from
 # the person who prepared the kit. Unsigned binaries on ftp will be purged.
-#
-# Initial bootstrapping on a previously non-supported architecture
-# is not trivial to do with openjdk7. It is somewhat easier with openjdk8
-# which has improved cross-compile support. Note that openjdk8 cannot be used
-# for bootstrapping openjdk7 out of the box. (It is possible with hacks.)
 
 ONLY_FOR_PLATFORM=	NetBSD-[567].*-i386 NetBSD-[567].*-x86_64
 ONLY_FOR_PLATFORM+=	NetBSD-7.*-sparc64
-ONLY_FOR_PLATFORM+=	DragonFly-[23].*-* SunOS-*-* FreeBSD-10.*-x86_64
+ONLY_FOR_PLATFORM+=	DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
 
-BOOT.nb5-i386=		bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2
-BOOT.nb5-amd64=		bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2
-BOOT.nb6-i386=		bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2
-BOOT.nb6-amd64=		bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2
-BOOT.nb7-i386=		bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2
-BOOT.nb7-amd64=		bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2
-BOOT.nb7-sparc64=	bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz
+BOOT.nb5-i386=		bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz
+BOOT.nb5-amd64=		bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz
+BOOT.nb6-i386=		bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz
+BOOT.nb6-amd64=		bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz
+BOOT.nb7-i386=		bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz
+BOOT.nb7-amd64=		bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz
+BOOT.nb7-sparc64=	bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz
+BOOT.fbsd10-amd64=	bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz
+#XXX should be regenerated
 BOOT.dfly3.6-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
 BOOT.dfly3.8-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
-BOOT.fbsd10-amd64=	bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb5-i386}
@@ -82,7 +79,7 @@ DISTFILES+=		${BOOT.dfly3.6-amd64}
 EXTRACT_ONLY+=		${BOOT.dfly3.6-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || !empty(MACHINE_PLATFORM:MDragonFly-4.*-x86_64) || make(distinfo)
 DISTFILES+=		${BOOT.dfly3.8-amd64}
 EXTRACT_ONLY+=		${BOOT.dfly3.8-amd64}
 .endif
@@ -96,8 +93,11 @@ EXTRACT_ONLY+=		${BOOT.fbsd10-amd64}
 BUILDLINK_DEPMETHOD.sun-jdk7?=	build
 .include "../../lang/sun-jdk7/buildlink3.mk"
 #NB: sun-jdk7 includes sun-jre7/buildlink3.mk
-JDK_BOOTDIR=	${BUILDLINK_JAVA_PREFIX.sun-jre7:tA}
-MAKE_ENV+=	ALT_JDK_IMPORT_PATH=${JDK_BOOTDIR}
+post-extract: copy-bootstrap-jdk
+.PHONY: copy-bootstrap-jdk
+copy-bootstrap-jdk:
+	${MKDIR} ${ALT_BOOTDIR}
+	cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR}
 .endif
 
 ALT_BOOTDIR=		${WRKDIR}/bootstrap
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 882359bd5e2..d2969874ce8 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,38 +1,38 @@
-$NetBSD: distinfo,v 1.79 2015/03/01 21:44:29 tnn Exp $
+$NetBSD: distinfo,v 1.80 2015/03/02 03:53:26 tnn Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
 Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
+Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 4ef9bc133ce3fb328f1a6334561806759f6a840d
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 04c158993165acf63015ca931cf3d37a47513d74
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 26972860 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e56a0334417146a4db8c23938a0c19ada3e3847d
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e9a88901ed05bec37c63f235cc7c4b09aaaf1ba3
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes
+SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085
+RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3
+Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = fba2e61d9b6dfa3d582259aa60125762fd3c8931
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 7a164227b077d9e86a2dd2410e83463d6d3360aa
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-amd64-20140719.tar.bz2) = 37211292 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = dece32461eaab72d3e2327106b5136461d82bd0e
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = d5ab48cd9a2cf0ac554b3fd37a7ace1e5420e3c4
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-5-i386-20140719.tar.bz2) = 39051642 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 4fac0ed96cfe1b366b50c1b88aabb8d41281f893
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = ada7af827e2e47e93f1813f0531b697125d1f44b
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-amd64-20140719.tar.bz2) = 37567181 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 76906b91e8412fefdae5ecb15e01ddbcd586d2ad
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 068fb6ad180e8b8d9c4f2cc158c40b3047d8e015
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-6-i386-20140719.tar.bz2) = 39347597 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 8a782d9cb2297b1cb24dfb022b139363d8695616
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 607c25a81ae073fb282e5a81169b93d6818e5122
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-amd64-20140719.tar.bz2) = 37593509 bytes
-SHA1 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 261eb3bf84b6ac60d30a704523efb27e7a7c715a
-RMD160 (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 1d26ee7f6443e1f4389e38d20134fb8e2969254e
-Size (openjdk7/bootstrap-jdk7u60-bin-netbsd-7-i386-20140719.tar.bz2) = 40161195 bytes
-SHA1 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 7e85c42f75f014e88eb62580979f6a0fc9b6e957
-RMD160 (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = d84d7b82205f23827ef9ce672602d0ba8a9a9c72
-Size (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 37448005 bytes
-SHA1 (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = b467ca8d14f1a8098cd90e3bb7ae664c1713cb8a
-RMD160 (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = 152c801aca81f4db5427fe2f19f4efcb2fb6355e
-Size (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = 22914116 bytes
 SHA1 (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 3210d939b5ac92f2a13c43f3616788c114958451
 RMD160 (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 683ce69d0cf0854c3ff38dd058338066e448bd62
 Size (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 52843102 bytes
@@ -47,7 +47,7 @@ SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88
 SHA1 (patch-ah) = 2d67794791d84294e0ff1a217cb538725ddd95f0
 SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897
 SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175
-SHA1 (patch-am) = 4bf7b6b211e0775dcdb0273214f57cc63b5f0ed6
+SHA1 (patch-am) = 77185fb77c7b569f1d1a389a15eb8aca76f51c92
 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
 SHA1 (patch-ao) = 5eba16fc16c9a54a855951a153dc9138956dcf08
 SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476
@@ -59,14 +59,10 @@ SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
 SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6
 SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a
 SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620
-SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 94df9729510a3c194017fb978e79e1194e393e38
 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
 SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58
-SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 90076fcafa5b7076083a71294a065a8c26ded3f7
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 0606206a28b741ee7c3c34cf62a3a227238fb98c
-SHA1 (patch-hotspot_make_bsd_makefiles_gcc.make) = 5394f1e1fc797b401f3b318d34fe2eef7a3ea262
-SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = ae10595d897a43bfd716a2b52a7836aa919e435e
 SHA1 (patch-hotspot_make_bsd_makefiles_zeroshark.make) = fe0e3d001f2ff996c44dd977595e08c06f911773
 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
@@ -101,13 +97,8 @@ SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec12
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
 SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 797e0382e5d67180757070ae5b76577809f7ad15
 SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
-SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7b2b1808dd819b3cd3f84121ddd169421231d98b
+SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 1935e8225e08870fd912737de6dee3d599d260ab
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
-SHA1 (patch-hotspot_src_share_vm_utilities_vmError.cpp) = 071f44a1ce8ecc2871067cb9758d481dad4af07d
-SHA1 (patch-jaxp_build.xml) = 3c539e2667a7ba86f1034607b3dc67fe7f14267a
-SHA1 (patch-jaxp_make_Makefile) = 4e65defb4ccd973cc13f343cf5931781c6091d51
-SHA1 (patch-jaxws_build.xml) = 7704357c5a8b9d1a564dc8bd88be2ba7dcd1b0c2
-SHA1 (patch-jaxws_make_Makefile) = fcaa667aa1187fd4f8f639d625c22f7a43abb642
 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
 SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
 SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 697467f606ff6a13127ea9027018ca401d354e58
@@ -119,7 +110,6 @@ SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df3390
 SHA1 (patch-jdk_make_common_Program.gmk) = 66edaf69cb12c1e024ba1145c98b667d54ea9239
 SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce
 SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2
-SHA1 (patch-jdk_make_common_shared_Defs-java.gmk) = b152a234b95609fb30e131eb2a244319e0f3dde5
 SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91
 SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
 SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
@@ -157,12 +147,11 @@ SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = c6f3b3bcaf67951a458f01788a9d32e5873c7e5a
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
-SHA1 (patch-jdk_test_Makefile) = 4c6e2bbc39b9d8a7825ae3cb2e49f8fbe82c5e89
+SHA1 (patch-jdk_test_Makefile) = 0bdd1af41390bb0e02244c7596d5c35b9771bfb6
 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb
 SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d
 SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c
 SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295
 SHA1 (patch-jdk_test_jprt.config) = 4eb27e773c564dde79be102e7ccfe2e42ff8f0ca
 SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32
-SHA1 (patch-langtools_make_Makefile) = 816b02a95d6e1eb2f46f3cb95a0f69bc479ba2de
-SHA1 (patch-langtools_make_build.xml) = 6e885603fd406782d05b936317dcce77cca73227
+SHA1 (patch-langtools_make_build.xml) = bf951f71b066436331869aded0d778df1b843820
diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am
index 1b1051f416d..279d1f9ce92 100644
--- a/lang/openjdk7/patches/patch-am
+++ b/lang/openjdk7/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.6 2015/02/09 00:42:17 tnn Exp $
+$NetBSD: patch-am,v 1.7 2015/03/02 03:53:26 tnn Exp $
 
 Set username to pkgsrc.
 
@@ -13,12 +13,3 @@ Set username to pkgsrc.
      USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
    endif
    export USER_RELEASE_SUFFIX
-@@ -615,7 +615,7 @@ endif
- #     To workaround this we will specify JAVA_HOME explicitly
- 
- ANT_TMPDIR = $(ABS_OUTPUTDIR)/tmp
--ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)' JAVA_HOME='$(BOOTDIR)'
-+ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'\ -XX:+UseSerialGC\ -Xmx768M JAVA_HOME='$(BOOTDIR)'
- 
- ifeq ($(ANT_HOME),)
-   ANT = $(ANT_WORKAROUNDS) ant
diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
deleted file mode 100644
index 2cc041238c6..00000000000
--- a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-java.gmk
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-corba_make_common_shared_Defs-java.gmk,v 1.4 2015/02/09 00:42:17 tnn Exp $
-
---- corba/make/common/shared/Defs-java.gmk.orig	2014-01-05 23:11:01.000000000 +0000
-+++ corba/make/common/shared/Defs-java.gmk
-@@ -59,7 +59,7 @@ endif
- # Options for hotspot to turn off printing of options with fastdebug version
- #   and creating the hotspot.log file.
- JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
--   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-+   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput $(PKGSRC_BOOT_JDK_JVMARGS)
- 
- # JVM options
- JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
-@@ -196,8 +196,8 @@ BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
- 
- BOOT_JAVA_CMD      = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
- BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
--BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
--BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
-+BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
-+BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner $(PKGSRC_BOOT_JDK_TOOLARGS)
- 
- # Various tools we need to run (FIXUP: Are these the right ones?)
- NATIVE2ASCII    = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
deleted file mode 100644
index 3988190ef67..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_buildtree.make
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_buildtree.make,v 1.3 2015/02/09 00:42:17 tnn Exp $
-
---- hotspot/make/bsd/makefiles/buildtree.make.orig	2014-01-06 02:36:18.000000000 +0000
-+++ hotspot/make/bsd/makefiles/buildtree.make
-@@ -68,7 +68,7 @@ include $(GAMMADIR)/make/altsrc.make
- QUIETLY$(MAKE_VERBOSE)	= @
- 
- # For now, until the compiler is less wobbly:
--TESTFLAGS	= -Xbatch -showversion
-+TESTFLAGS	= -Xbatch -showversion $(PKGSRC_BOOT_JDK_JVMARGS)
- 
- ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
-   PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
-@@ -494,7 +494,7 @@ test_gamma:  $(BUILDTREE_MAKE) $(GAMMADI
- 	echo "# Compile Queens program for test"; \
- 	echo ""; \
- 	echo "rm -f Queens.class"; \
--	echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
-+	echo "\$${JAVA_HOME}/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS) -d . $(GAMMADIR)/make/test/Queens.java"; \
- 	echo ""; \
- 	echo "# Set library path solely for gamma launcher test run"; \
- 	echo ""; \
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_gcc.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_gcc.make
deleted file mode 100644
index d3d361b50d5..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_gcc.make
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_gcc.make,v 1.1 2015/02/21 20:21:56 tnn Exp $
-
-Don't build with -O3 on ARM; produces flaky results with GCC 4.8.2.
-
---- hotspot/make/bsd/makefiles/gcc.make.orig	2015-01-26 15:21:52.000000000 +0000
-+++ hotspot/make/bsd/makefiles/gcc.make
-@@ -196,6 +196,8 @@ ifeq ($(OS_VENDOR), Darwin)
-   # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy
-   # <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers>
-   OPT_CFLAGS += -Os
-+else ifeq ($(LIBARCH), arm)
-+  OPT_CFLAGS += -Os
- else
-   OPT_CFLAGS += -O3
- endif
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
deleted file mode 100644
index 64dfd000789..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_rules.make
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_rules.make,v 1.3 2015/02/09 00:42:17 tnn Exp $
-
---- hotspot/make/bsd/makefiles/rules.make.orig	2015-01-26 15:21:52.000000000 +0000
-+++ hotspot/make/bsd/makefiles/rules.make
-@@ -68,24 +68,24 @@ REMOVE_TARGET   = rm -f $@
- 
- ifdef ALT_BOOTDIR
- 
--RUN.JAVA  = $(ALT_BOOTDIR)/bin/java
--RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap
--RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah
--RUN.JAR   = $(ALT_BOOTDIR)/bin/jar
--COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac
--COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic
-+RUN.JAVA  = $(ALT_BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
-+RUN.JAVAP = $(ALT_BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAVAH = $(ALT_BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAR   = $(ALT_BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.JAVAC = $(ALT_BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.RMIC = $(ALT_BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
- BOOT_JAVA_HOME = $(ALT_BOOTDIR)
- 
- else
- 
- ifdef BOOTDIR
- 
--RUN.JAVA  = $(BOOTDIR)/bin/java
--RUN.JAVAP = $(BOOTDIR)/bin/javap
--RUN.JAVAH = $(BOOTDIR)/bin/javah
--RUN.JAR   = $(BOOTDIR)/bin/jar
--COMPILE.JAVAC = $(BOOTDIR)/bin/javac
--COMPILE.RMIC  = $(BOOTDIR)/bin/rmic
-+RUN.JAVA  = $(BOOTDIR)/bin/java $(PKGSRC_BOOT_JDK_JVMARGS)
-+RUN.JAVAP = $(BOOTDIR)/bin/javap $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAVAH = $(BOOTDIR)/bin/javah $(PKGSRC_BOOT_JDK_TOOLARGS)
-+RUN.JAR   = $(BOOTDIR)/bin/jar $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.JAVAC = $(BOOTDIR)/bin/javac $(PKGSRC_BOOT_JDK_TOOLARGS)
-+COMPILE.RMIC  = $(BOOTDIR)/bin/rmic $(PKGSRC_BOOT_JDK_TOOLARGS)
- BOOT_JAVA_HOME = $(BOOTDIR)
- 
- else
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
index ef262e7f848..64fe1ba153b 100644
--- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
@@ -1,51 +1,13 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.4 2015/03/01 21:44:29 tnn Exp $
+$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.5 2015/03/02 03:53:26 tnn Exp $
 
 --- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2015-01-26 15:21:49.000000000 +0000
 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-@@ -31,6 +31,16 @@
- // globally used constants & types, class (forward)
- // declarations and a few frequently used utility functions.
- 
-+#ifndef __STDC_CONSTANT_MACROS
-+#define __STDC_CONSTANT_MACROS
-+#endif
-+#ifndef __STDC_FORMAT_MACROS
-+#define __STDC_FORMAT_MACROS
-+#endif
-+#ifndef __STDC_LIMIT_MACROS
-+#define __STDC_LIMIT_MACROS
-+#endif
-+
- #include <ctype.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -76,10 +86,7 @@
+@@ -76,7 +76,7 @@
  # include <sys/procfs.h>
  # endif
  
 -#if defined(LINUX) || defined(_ALLBSD_SOURCE)
--#ifndef __STDC_LIMIT_MACROS
--#define __STDC_LIMIT_MACROS
--#endif // __STDC_LIMIT_MACROS
 +#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS)
- #include <inttypes.h>
- #include <signal.h>
- #ifndef __OpenBSD__
-@@ -241,6 +248,7 @@ extern "C" void breakpoint();
- #define BREAKPOINT ::breakpoint()
- #endif
- 
-+#include <sys/param.h> /* for __DragonFly_version */
- // checking for nanness
- #ifdef SOLARIS
- #ifdef SPARC
-@@ -252,6 +260,9 @@ inline int g_isnan(float  f) { return is
- inline int g_isnan(double f) { return isnand(f); }
- #elif defined(__APPLE__)
- inline int g_isnan(double f) { return isnan(f); }
-+#elif defined(__DragonFly__) && __DragonFly_version < 300500
-+inline int g_isnan(float  f) { return __isnanf(f); }
-+inline int g_isnan(double f) { return __isnand(f); }
- #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
- inline int g_isnan(float  f) { return isnanf(f); }
- inline int g_isnan(double f) { return isnan(f); }
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS
+ #endif // __STDC_LIMIT_MACROS
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
deleted file mode 100644
index 25b8cf9a9cb..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_vmError.cpp,v 1.1 2015/03/01 21:44:29 tnn Exp $
-
-Don't include system headers before setting feature test macros.
-
---- hotspot/src/share/vm/utilities/vmError.cpp.orig	2015-01-26 15:21:49.000000000 +0000
-+++ hotspot/src/share/vm/utilities/vmError.cpp
-@@ -22,7 +22,6 @@
-  *
-  */
- 
--#include <fcntl.h>
- #include "precompiled.hpp"
- #include "compiler/compileBroker.hpp"
- #include "gc_interface/collectedHeap.hpp"
diff --git a/lang/openjdk7/patches/patch-jaxp_build.xml b/lang/openjdk7/patches/patch-jaxp_build.xml
deleted file mode 100644
index 6a70e1d3d07..00000000000
--- a/lang/openjdk7/patches/patch-jaxp_build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-jaxp_build.xml,v 1.2 2015/02/09 00:42:17 tnn Exp $
-
---- jaxp/build.xml.orig	2014-09-29 08:29:49.000000000 +0000
-+++ jaxp/build.xml
-@@ -125,6 +125,8 @@
- 	     debug="${javac.debug}"
-              target="${javac.target}">
-             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
-+            <compilerarg value="-J-XX:+UseSerialGC"/>
-+            <compilerarg value="-J-Xmx768M"/>
-             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
-         </javac>
-     </target>
diff --git a/lang/openjdk7/patches/patch-jaxp_make_Makefile b/lang/openjdk7/patches/patch-jaxp_make_Makefile
deleted file mode 100644
index b3fc72fa42e..00000000000
--- a/lang/openjdk7/patches/patch-jaxp_make_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-jaxp_make_Makefile,v 1.3 2015/02/09 00:42:17 tnn Exp $
-
---- jaxp/make/Makefile.orig	2014-09-12 20:54:09.000000000 +0000
-+++ jaxp/make/Makefile
-@@ -33,6 +33,8 @@
- #
- SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
- 
-+ANT_OPTS += $(PKGSRC_BOOT_JDK_JVMARGS)
-+export ANT_OPTS
- ifdef QUIET
-   ANT_OPTIONS += -quiet
- endif
diff --git a/lang/openjdk7/patches/patch-jaxws_build.xml b/lang/openjdk7/patches/patch-jaxws_build.xml
deleted file mode 100644
index f1c99f00c08..00000000000
--- a/lang/openjdk7/patches/patch-jaxws_build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-jaxws_build.xml,v 1.1 2015/02/09 00:42:17 tnn Exp $
-
---- jaxws/build.xml.orig	2015-01-26 15:22:17.000000000 +0000
-+++ jaxws/build.xml
-@@ -145,6 +145,8 @@
-              source="${javac.source}"
- 	     debug="${javac.debug}"
-              target="${javac.target}">
-+            <compilerarg value="-J-XX:+UseSerialGC"/>
-+            <compilerarg value="-J-Xmx768M"/>
-             <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
-             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
-             <src refid="src.dir.id"/>
diff --git a/lang/openjdk7/patches/patch-jaxws_make_Makefile b/lang/openjdk7/patches/patch-jaxws_make_Makefile
deleted file mode 100644
index 22826f45b63..00000000000
--- a/lang/openjdk7/patches/patch-jaxws_make_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-jaxws_make_Makefile,v 1.3 2015/02/09 00:42:17 tnn Exp $
-
---- jaxws/make/Makefile.orig	2014-10-04 13:30:47.000000000 +0000
-+++ jaxws/make/Makefile
-@@ -33,6 +33,8 @@
- #
- SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
- 
-+ANT_OPTS += $(PKGSRC_BOOT_JDK_JVMARGS)
-+export ANT_OPTS
- ifdef QUIET
-   ANT_OPTIONS += -quiet
- endif
diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
deleted file mode 100644
index 41d4450aab4..00000000000
--- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-java.gmk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-jdk_make_common_shared_Defs-java.gmk,v 1.2 2015/02/09 00:42:17 tnn Exp $
-
---- jdk/make/common/shared/Defs-java.gmk.orig	2014-01-05 23:07:37.000000000 +0000
-+++ jdk/make/common/shared/Defs-java.gmk
-@@ -63,7 +63,7 @@ endif
- # Options for hotspot to turn off printing of options with fastdebug version
- #   and creating the hotspot.log file.
- JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
--   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-+   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput $(PKGSRC_BOOT_JDK_JVMARGS)
- 
- # JVM options
- # MMM: is headless option necessary?
diff --git a/lang/openjdk7/patches/patch-jdk_test_Makefile b/lang/openjdk7/patches/patch-jdk_test_Makefile
index 4bb55294040..7ace71a97f1 100644
--- a/lang/openjdk7/patches/patch-jdk_test_Makefile
+++ b/lang/openjdk7/patches/patch-jdk_test_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-jdk_test_Makefile,v 1.4 2015/02/09 00:42:17 tnn Exp $
+$NetBSD: patch-jdk_test_Makefile,v 1.5 2015/03/02 03:53:26 tnn Exp $
 
 Use tools from pkgsrc.
 
@@ -26,21 +26,3 @@ Use tools from pkgsrc.
  ifdef CONCURRENCY
    EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY)
  endif
-@@ -641,7 +649,7 @@ JTREG_BASIC_OPTIONS += $(JTREG_IGNORE_OP
- JTREG_TIMEOUT_OPTION =  -timeoutFactor:4
- JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION)
- # Boost the max memory for jtreg to avoid gc thrashing
--JTREG_MEMORY_OPTION = -J-Xmx512m
-+JTREG_MEMORY_OPTION = $(PKGSRC_BOOT_JDK_TOOLARGS)
- JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
- 
- # Make sure jtreg exists
-@@ -825,7 +833,7 @@ endif
- 
- # The jtjck.jar utility to use to run the tests
- JTJCK_JAR = $(JCK_HOME)/lib/jtjck.jar
--JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m -Xmx512m
-+JTJCK_JAVA_ARGS =  -XX:MaxPermSize=256m $(PKGSRC_BOOT_JDK_JVMARGS)
- JTJCK_OPTIONS = -headless -v
- 
- # Default tests to run
diff --git a/lang/openjdk7/patches/patch-langtools_make_Makefile b/lang/openjdk7/patches/patch-langtools_make_Makefile
deleted file mode 100644
index f14edfe4301..00000000000
--- a/lang/openjdk7/patches/patch-langtools_make_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-langtools_make_Makefile,v 1.2 2015/02/09 00:42:17 tnn Exp $
-
---- langtools/make/Makefile.orig	2014-09-12 13:06:23.000000000 +0000
-+++ langtools/make/Makefile
-@@ -162,7 +162,7 @@ endif
- ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
- 
- ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
--ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-+ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR) $(PKGSRC_BOOT_JDK_JVMARGS)'
- 
- ifdef FINDBUGS_HOME
-   ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
diff --git a/lang/openjdk7/patches/patch-langtools_make_build.xml b/lang/openjdk7/patches/patch-langtools_make_build.xml
index 9cd083f5376..965d79f6cf9 100644
--- a/lang/openjdk7/patches/patch-langtools_make_build.xml
+++ b/lang/openjdk7/patches/patch-langtools_make_build.xml
@@ -1,8 +1,8 @@
-$NetBSD: patch-langtools_make_build.xml,v 1.3 2015/02/09 00:42:17 tnn Exp $
+$NetBSD: patch-langtools_make_build.xml,v 1.4 2015/03/02 03:53:26 tnn Exp $
 
 * Avoid *.orig files.
 
---- langtools/make/build.xml.orig	2014-01-01 05:54:07.000000000 +0000
+--- langtools/make/build.xml.orig	2015-01-26 15:22:25.000000000 +0000
 +++ langtools/make/build.xml
 @@ -235,7 +235,8 @@
          </chmod>
@@ -14,28 +14,7 @@ $NetBSD: patch-langtools_make_build.xml,v 1.3 2015/02/09 00:42:17 tnn Exp $
      </target>
  
      <target name="build-bootstrap-tools"
-@@ -336,7 +337,10 @@
-             classpath="${dist.lib.dir}/javac.jar"
-             includeAntRuntime="no"
-             debug="${javac.debug}"
--            debuglevel="${javac.debuglevel}"/>
-+            debuglevel="${javac.debuglevel}">
-+           <compilerarg value="-J-XX:+UseSerialGC"/>
-+           <compilerarg value="-J-Xmx768M"/>
-+        </javac>
-         <java fork="true"
-             jvm="${target.java.home}/bin/java"
-             dir="test/tools/javac/diags"
-@@ -795,6 +799,8 @@
-                        debuglevel="${javac.debuglevel}">
-                     <compilerarg value="-implicit:none"/>
-                     <compilerarg value="-Xprefer:source"/>
-+                    <compilerarg value="-J-XX:+UseSerialGC"/>
-+                    <compilerarg value="-J-Xmx768M"/>
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg line="@{bootclasspath.opt}"/>
-                     <compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -804,6 +810,7 @@
+@@ -804,6 +805,7 @@
                  <copy todir="@{classes.dir}" includeemptydirs="false">
                      <fileset dir="${src.classes.dir}" includes="@{includes}" excludes="@{excludes}">
                          <exclude name="**/*.java"/>
@@ -43,24 +22,3 @@ $NetBSD: patch-langtools_make_build.xml,v 1.3 2015/02/09 00:42:17 tnn Exp $
                          <exclude name="**/*.properties"/>
                          <exclude name="**/*-template"/>
                          <exclude name="**/*.rej"/>
-@@ -857,7 +864,10 @@
-                srcdir="${make.tools.dir}/CompileProperties"
-                destdir="${build.toolclasses.dir}/"
-                classpath="${ant.core.lib}"
--               includeantruntime="false"/>
-+               includeantruntime="false">
-+          <compilerarg value="-J-XX:+UseSerialGC"/>
-+          <compilerarg value="-J-Xmx768M"/>
-+        </javac>
-         <taskdef name="pcompile"
-                  classname="CompilePropertiesTask"
-                  classpath="${build.toolclasses.dir}/"/>
-@@ -874,6 +884,8 @@
-                classpath="${ant.core.lib}"
-                includeantruntime="false">
-             <compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
-+            <compilerarg value="-J-XX:+UseSerialGC"/>
-+            <compilerarg value="-J-Xmx768M"/>
-         </javac>
-         <taskdef name="genstubs"
-                  classname="GenStubs$$Ant"