- 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

15 files changed, 10 insertions, 311 deletions

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"