Update to 1.7.21 (7u21)

* Update with FreeBSD ports' patch-set file.
* Add patches from icedtea's rhino.patch file.
* Tested on NetBSD/amd64 current, NetBSD/i386 6.1, NetBSD/amd64 6.0.1,
  and DragonFly/i386 3.2.2.

Changelog:
* Unknown because I do not know previous version, 1.7.0.147.20110811.
* Many bugs and security bugs should be fixed.

52 files changed, 449 insertions, 281 deletions

diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index 7f961cb4779..afd68e00a07 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
+$NetBSD: patch-aa,v 1.8 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2012-05-12 08:57:44.793207000 +0000
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2013-05-29 03:57:57.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
 @@ -131,8 +131,11 @@
  # include <inttypes.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
  #endif
  
  #ifdef __APPLE__
-@@ -335,7 +338,12 @@ void os::Bsd::initialize_system_info() {
+@@ -342,7 +345,12 @@ void os::Bsd::initialize_system_info() {
    int mib[2];
    size_t len;
    int cpu_val;
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
  
    /* get processors count via hw.ncpus sysctl */
    mib[0] = CTL_HW;
-@@ -352,21 +360,26 @@ void os::Bsd::initialize_system_info() {
+@@ -359,21 +367,26 @@ void os::Bsd::initialize_system_info() {
     * instead of hw.physmem because we need size of allocatable memory
     */
    mib[0] = CTL_HW;
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
  #endif
  }
  #else
-@@ -2039,7 +2052,9 @@ void * os::dll_load(const char *filename
+@@ -2165,7 +2178,9 @@ void * os::dll_load(const char *filename
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
@@ -75,7 +75,7 @@ $NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
      {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
      {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
      {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-@@ -3559,7 +3574,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -3668,7 +3683,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.7 2012/11/03 20:03:03 joerg Exp $
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
-@@ -3587,7 +3602,7 @@ OSReturn os::get_native_priority(const T
+@@ -3696,7 +3711,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
diff --git a/lang/openjdk7/patches/patch-ab b/lang/openjdk7/patches/patch-ab
index 7b1a65a5ea5..c78c3b33b0d 100644
--- a/lang/openjdk7/patches/patch-ab
+++ b/lang/openjdk7/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2012/05/22 05:57:50 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/common/shared/Sanity.gmk.orig	2012-05-06 14:17:19.000000000 +0000
+--- jdk/make/common/shared/Sanity.gmk.orig	2012-08-10 17:21:34.000000000 +0000
 +++ jdk/make/common/shared/Sanity.gmk
-@@ -517,12 +517,7 @@ sane-variant:
+@@ -521,12 +521,7 @@ sane-variant:
  # LD_LIBRARY_PATH should not be set, unless you are insane.
  ######################################################
  sane-ld_library_path:
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.4 2012/05/22 05:57:50 joerg Exp $
  
  ######################################################
  # LD_LIBRARY_PATH_64 should not be set, unless you are insane.
-@@ -809,7 +804,8 @@ ifdef OPENJDK
+@@ -813,7 +808,8 @@ ifdef OPENJDK
  	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
  	    $(ECHO) "Failed to build freetypecheck." ) > $@
  
diff --git a/lang/openjdk7/patches/patch-ac b/lang/openjdk7/patches/patch-ac
index 636c212b730..cbd0b6a2886 100644
--- a/lang/openjdk7/patches/patch-ac
+++ b/lang/openjdk7/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-ac,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/java/main/java/mapfile-i586.orig	2011-06-27 17:18:37.000000000 +0000
+--- jdk/make/java/main/java/mapfile-i586.orig	2012-08-10 17:21:36.000000000 +0000
 +++ jdk/make/java/main/java/mapfile-i586
 @@ -31,6 +31,7 @@ SUNWprivate_1.1 {
  	global:
diff --git a/lang/openjdk7/patches/patch-ad b/lang/openjdk7/patches/patch-ad
index b30ccb0d341..53b687c6139 100644
--- a/lang/openjdk7/patches/patch-ad
+++ b/lang/openjdk7/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2010/01/15 19:18:42 tnn Exp $
+$NetBSD: patch-ad,v 1.4 2013/06/02 06:12:28 ryoon Exp $
 
---- corba/make/common/shared/Platform.gmk.orig	2010-01-02 13:49:48.000000000 +0000
+--- corba/make/common/shared/Platform.gmk.orig	2012-08-10 16:10:07.000000000 +0000
 +++ corba/make/common/shared/Platform.gmk
-@@ -265,6 +265,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD)
+@@ -238,6 +238,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD)
    REQUIRED_OS_VERSION = 6.0
  endif
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.3 2010/01/15 19:18:42 tnn Exp $
  ifeq ($(SYSTEM_UNAME), Darwin)
    PLATFORM = bsd
    OS_NAME = darwin
-@@ -347,9 +354,9 @@ ifeq ($(PLATFORM), bsd)
+@@ -318,9 +325,9 @@ ifeq ($(PLATFORM), bsd)
    REQUIRED_FREE_SPACE=1500000
    # How much RAM does this machine have:
    ifeq ($(OS_VENDOR), OpenBSD)
diff --git a/lang/openjdk7/patches/patch-ae b/lang/openjdk7/patches/patch-ae
index 24f7054bada..66623556689 100644
--- a/lang/openjdk7/patches/patch-ae
+++ b/lang/openjdk7/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-ae,v 1.4 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/make/bsd/makefiles/gcc.make.orig	2011-08-20 10:42:27.000000000 +0000
+--- hotspot/make/bsd/makefiles/gcc.make.orig	2013-05-29 03:57:57.000000000 +0000
 +++ hotspot/make/bsd/makefiles/gcc.make
-@@ -201,6 +201,15 @@ MAPFLAG = -Xlinker --version-script=FILE
+@@ -242,6 +242,15 @@ MAPFLAG = -Xlinker --version-script=FILE
  #
  # Shared Library
  #
diff --git a/lang/openjdk7/patches/patch-af b/lang/openjdk7/patches/patch-af
index 86b3284a293..6e9d084ae50 100644
--- a/lang/openjdk7/patches/patch-af
+++ b/lang/openjdk7/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-af,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/common/shared/Defs-utils.gmk.orig	2009-10-18 02:25:45.000000000 +0200
+--- jdk/make/common/shared/Defs-utils.gmk.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/common/shared/Defs-utils.gmk
-@@ -240,7 +240,14 @@ ifeq ($(PLATFORM),bsd)
+@@ -286,7 +286,14 @@ ifeq ($(PLATFORM),bsd)
    endif
    ifeq ($(OS_VENDOR), NetBSD)
      NAWK       = $(UTILS_USR_BIN_PATH)awk
diff --git a/lang/openjdk7/patches/patch-ag b/lang/openjdk7/patches/patch-ag
index 99225316a45..1e6ea758165 100644
--- a/lang/openjdk7/patches/patch-ag
+++ b/lang/openjdk7/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ag,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/launchers/Makefile.launcher.orig	2009-09-17 09:51:41.000000000 +0200
+--- jdk/make/launchers/Makefile.launcher.orig	2012-08-10 17:21:41.000000000 +0000
 +++ jdk/make/launchers/Makefile.launcher
-@@ -157,7 +157,7 @@ endif
- ifeq ($(GUI_TOOL),true)
+@@ -164,7 +164,7 @@ ifeq ($(GUI_TOOL),true)
    ifneq ($(PLATFORM), windows)
-     # Anything with a GUI needs X11 to be linked in.
--    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
-+    OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) -L$(OPENWIN_LIB) -lX11
+     ifneq ($(PLATFORM), macosx)
+       # Anything with a GUI needs X11 to be linked in.
+-      OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11
++      OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) -L$(OPENWIN_LIB) -lX11
+     endif
    endif
  endif
- 
diff --git a/lang/openjdk7/patches/patch-ah b/lang/openjdk7/patches/patch-ah
index 249bcfeb212..f0e34315f52 100644
--- a/lang/openjdk7/patches/patch-ah
+++ b/lang/openjdk7/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.2 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-ah,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/common/shared/Platform.gmk.orig	2009-10-17 16:49:37.000000000 +0200
+--- jdk/make/common/shared/Platform.gmk.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/common/shared/Platform.gmk
-@@ -218,6 +218,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD)
-   REQUIRED_OS_VERSION = 6.0
+@@ -224,6 +224,13 @@ ifeq ($(SYSTEM_UNAME), Linux)
+   MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
  endif
  
 +ifeq ($(SYSTEM_UNAME), DragonFly)
@@ -14,9 +14,9 @@ $NetBSD: patch-ah,v 1.2 2009/10/18 10:21:01 tnn Exp $
 +endif
 +
  ifeq ($(SYSTEM_UNAME), Darwin)
-   PLATFORM = bsd
+   PLATFORM = macosx
    OS_NAME = darwin
-@@ -288,9 +295,9 @@ ifeq ($(PLATFORM), bsd)
+@@ -371,9 +378,9 @@ ifeq ($(PLATFORM), bsd)
    REQUIRED_FREE_SPACE=1500000
    # How much RAM does this machine have:
    ifeq ($(OS_VENDOR), OpenBSD)
diff --git a/lang/openjdk7/patches/patch-ai b/lang/openjdk7/patches/patch-ai
index f7b3c8b8a8b..7f726387782 100644
--- a/lang/openjdk7/patches/patch-ai
+++ b/lang/openjdk7/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ai,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig	2009-10-12 18:15:48.000000000 +0200
+--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig	2012-08-10 16:24:15.000000000 +0000
 +++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp
-@@ -320,11 +320,16 @@ BsdAttachOperation* BsdAttachListener::d
+@@ -345,11 +345,16 @@ BsdAttachOperation* BsdAttachListener::d
  #ifdef _ALLBSD_SOURCE
      uid_t puid;
      gid_t pgid;
diff --git a/lang/openjdk7/patches/patch-aj b/lang/openjdk7/patches/patch-aj
index 37d3a1d1ba2..2e8b7e72e65 100644
--- a/lang/openjdk7/patches/patch-aj
+++ b/lang/openjdk7/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.3 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-aj,v 1.4 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2011-08-11 12:31:36.000000000 +0000
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2013-05-29 03:57:58.000000000 +0000
 +++ jdk/src/solaris/native/java/net/NetworkInterface.c
 @@ -60,13 +60,11 @@
  #include <sys/param.h>
diff --git a/lang/openjdk7/patches/patch-ak b/lang/openjdk7/patches/patch-ak
index 60a32409792..0e59e9815b3 100644
--- a/lang/openjdk7/patches/patch-ak
+++ b/lang/openjdk7/patches/patch-ak
@@ -1,27 +1,28 @@
-$NetBSD: patch-ak,v 1.4 2012/05/22 05:57:50 joerg Exp $
+$NetBSD: patch-ak,v 1.5 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/common/Defs-bsd.gmk.orig	2012-05-06 14:17:19.000000000 +0000
+--- jdk/make/common/Defs-bsd.gmk.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/common/Defs-bsd.gmk
-@@ -230,8 +230,7 @@ ifeq ($(OS_VENDOR), Apple)
-   LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -rpath -Xlinker @loader_path/%)
-   LDFLAGS_COMMON += -Xlinker -install_name -Xlinker @rpath/$(@F)
- else
--  LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN
--  LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%)
-+  LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}
- endif
+@@ -336,8 +336,8 @@ Z_ORIGIN_FLAG/zero  = -Xlinker -z -Xlink
+ 
+ LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
+ 
+-LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
+-LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
++LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}
++
  
  #
-@@ -299,7 +298,7 @@ VM_NAME         = server
- ifeq ($(OS_VENDOR),Apple)
- JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
- else
--JVMLIB          = -Xlinker -rpath -Xlinker $(LIBDIR)/$(LIBARCH)/$(VM_NAME) -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+ # -L paths for finding and -ljava
+@@ -399,7 +399,7 @@ endif
+ # the library itself should not.
+ #
+ VM_NAME         = server
+-JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
 +JVMLIB          = -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
- endif
  JAVALIB         = -ljava $(JVMLIB)
  
-@@ -365,6 +364,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
+ #
+@@ -462,6 +462,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
    SYSTEM_ZLIB = true
  endif
  
diff --git a/lang/openjdk7/patches/patch-al b/lang/openjdk7/patches/patch-al
index 2236fad84a3..239fe377c77 100644
--- a/lang/openjdk7/patches/patch-al
+++ b/lang/openjdk7/patches/patch-al
@@ -1,13 +1,45 @@
-$NetBSD: patch-al,v 1.2 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-al,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig	2011-08-20 11:24:21.000000000 +0000
+--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig	2013-06-01 14:10:31.000000000 +0000
 +++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
-@@ -68,7 +68,7 @@ public class DefaultFileSystemProvider {
+@@ -28,6 +28,8 @@ package sun.nio.fs;
+ import java.nio.file.spi.FileSystemProvider;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
++import java.util.Set;
++import java.util.HashSet;
+ import sun.security.action.GetPropertyAction;
+ 
+ /**
+@@ -37,6 +39,14 @@ import sun.security.action.GetPropertyAc
+ public class DefaultFileSystemProvider {
+     private DefaultFileSystemProvider() { }
+ 
++    private static final Set<String> validFileSystemProviders
++        = new HashSet<String>();
++    static {
++        validFileSystemProviders.add("sun.nio.fs.SolarisFileSystemProvider");
++        validFileSystemProviders.add("sun.nio.fs.LinuxFileSystemProvider");
++        validFileSystemProviders.add("sun.nio.fs.BsdFileSystemProvider");
++    }
++
+     @SuppressWarnings("unchecked")
+     private static FileSystemProvider createProvider(final String cn) {
+         return AccessController
+@@ -64,11 +74,15 @@ public class DefaultFileSystemProvider {
+     public static FileSystemProvider create() {
+         String osname = AccessController
+             .doPrivileged(new GetPropertyAction("os.name"));
++        String fileSystemProvider = System
++            .getProperty("java.nio.file.spi.DefaultFileSystemProvider");
++        if (validFileSystemProviders.contains(fileSystemProvider))
++            return createProvider(fileSystemProvider);
+         if (osname.equals("SunOS"))
              return createProvider("sun.nio.fs.SolarisFileSystemProvider");
          if (osname.equals("Linux"))
              return createProvider("sun.nio.fs.LinuxFileSystemProvider");
--        if (osname.endsWith("BSD") || osname.equals("Darwin"))
-+        if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.equals("DragonFly"))
+-        if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.contains("OS X"))
++        if (osname.endsWith("BSD") || osname.equals("Darwin") || osname.contains("OS X") || osname.equals("DragonFly"))
              return createProvider("sun.nio.fs.BsdFileSystemProvider");
          throw new AssertionError("Platform not recognized");
      }
diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am
index 3942ea2c325..c0650f34c9a 100644
--- a/lang/openjdk7/patches/patch-am
+++ b/lang/openjdk7/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-am,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/common/shared/Defs.gmk.orig	2011-06-27 17:18:31.000000000 +0000
+--- jdk/make/common/shared/Defs.gmk.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/common/shared/Defs.gmk
-@@ -290,7 +290,7 @@ else
+@@ -303,7 +303,7 @@ else
    BUILD_NUMBER = b00
    ifndef USER_RELEASE_SUFFIX
      BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
diff --git a/lang/openjdk7/patches/patch-an b/lang/openjdk7/patches/patch-an
index 59ee0806803..771aff7280c 100644
--- a/lang/openjdk7/patches/patch-an
+++ b/lang/openjdk7/patches/patch-an
@@ -1,12 +1,12 @@
-$NetBSD: patch-an,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-an,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig	2009-09-24 22:52:54.000000000 +0200
+--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig	2012-08-10 16:24:31.000000000 +0000
 +++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
-@@ -40,6 +40,7 @@
- #    define bswap_32(x)	swap32(x)
- #    define bswap_64(x)	swap64(x)
+@@ -43,6 +43,7 @@
+ #    define bswap_32(x) swap32(x)
+ #    define bswap_64(x) swap64(x)
  #  elif defined(__NetBSD__)
 +#    include <machine/bswap.h>
- #    define bswap_16(x)	bswap16(x)
- #    define bswap_32(x)	bswap32(x)
- #    define bswap_64(x)	bswap64(x)
+ #    define bswap_16(x) bswap16(x)
+ #    define bswap_32(x) bswap32(x)
+ #    define bswap_64(x) bswap64(x)
diff --git a/lang/openjdk7/patches/patch-ao b/lang/openjdk7/patches/patch-ao
index f40eaf56ee7..c04e99ba3c3 100644
--- a/lang/openjdk7/patches/patch-ao
+++ b/lang/openjdk7/patches/patch-ao
@@ -1,8 +1,16 @@
-$NetBSD: patch-ao,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ao,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/common/Release.gmk.orig	2009-01-06 21:21:32.000000000 +0100
+--- jdk/make/common/Release.gmk.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/common/Release.gmk
-@@ -1065,7 +1065,8 @@ initial-image-jdk:: initial-image-jdk-se
+@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se
+ 	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
+ 	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
+ 	$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
++	$(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
+ ifneq ($(JFR_JAR),)
+ 	$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
+ endif
+@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se
  	@#
  	@# Swing BeanInfo generation
  	@#
diff --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap
index 92c78d6d1bc..f2836da1fa8 100644
--- a/lang/openjdk7/patches/patch-ap
+++ b/lang/openjdk7/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2009/11/08 17:57:46 tnn Exp $
+$NetBSD: patch-ap,v 1.4 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/solaris/native/sun/awt/fontpath.c.orig	2009-11-08 11:51:19.000000000 +0100
+--- jdk/src/solaris/native/sun/awt/fontpath.c.orig	2013-05-29 03:57:58.000000000 +0000
 +++ jdk/src/solaris/native/sun/awt/fontpath.c
-@@ -70,8 +70,8 @@ extern Display *awt_display;
+@@ -72,8 +72,8 @@ extern Display *awt_display;
  #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1")
  #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig")
  #else
@@ -13,7 +13,7 @@ $NetBSD: patch-ap,v 1.3 2009/11/08 17:57:46 tnn Exp $
  #endif
  
  #define MAXFDIRS 512    /* Max number of directories that contain fonts */
-@@ -163,6 +163,27 @@ static char *fullLinuxFontPath[] = {
+@@ -181,6 +181,27 @@ static char *fullLinuxFontPath[] = {
      NULL, /* terminates the list */
  };
  #endif
@@ -41,7 +41,7 @@ $NetBSD: patch-ap,v 1.3 2009/11/08 17:57:46 tnn Exp $
  
  static char **getFontConfigLocations();
  
-@@ -525,6 +546,7 @@ static char *getPlatformFontPathChars(JN
+@@ -545,6 +566,7 @@ static char *getPlatformFontPathChars(JN
  #else /* IF SOLARIS */
      knowndirs = fullSolarisFontPath;
  #endif
diff --git a/lang/openjdk7/patches/patch-aq b/lang/openjdk7/patches/patch-aq
index b20aeb80940..695abb520f4 100644
--- a/lang/openjdk7/patches/patch-aq
+++ b/lang/openjdk7/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.4 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-aq,v 1.5 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/java/main/java/mapfile-amd64.orig	2011-06-27 17:18:36.000000000 +0000
+--- jdk/make/java/main/java/mapfile-amd64.orig	2012-08-10 17:21:36.000000000 +0000
 +++ jdk/make/java/main/java/mapfile-amd64
 @@ -31,6 +31,7 @@ SUNWprivate_1.1 {
  	global:
diff --git a/lang/openjdk7/patches/patch-ar b/lang/openjdk7/patches/patch-ar
index 642c6d754ef..b27295fdf30 100644
--- a/lang/openjdk7/patches/patch-ar
+++ b/lang/openjdk7/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.2 2010/05/22 17:09:55 tnn Exp $
+$NetBSD: patch-ar,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/sun/font/Makefile.orig	2010-05-21 13:27:04.000000000 +0000
+--- jdk/make/sun/font/Makefile.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/sun/font/Makefile
-@@ -129,7 +129,7 @@ else 
+@@ -134,7 +134,7 @@ else 
    ifeq ($(USING_SYSTEM_FT_LIB), false)
      FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6
    endif
diff --git a/lang/openjdk7/patches/patch-as b/lang/openjdk7/patches/patch-as
index 0a88cb9999e..e8cefdd6d3a 100644
--- a/lang/openjdk7/patches/patch-as
+++ b/lang/openjdk7/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-as,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/share/classes/sun/applet/AppletViewerPanel.java.orig	2009-09-17 09:52:11.000000000 +0200
+--- jdk/src/share/classes/sun/applet/AppletViewerPanel.java.orig	2012-08-10 17:28:21.000000000 +0000
 +++ jdk/src/share/classes/sun/applet/AppletViewerPanel.java
 @@ -42,25 +42,25 @@ import sun.tools.jar.*;
   *
@@ -29,7 +29,7 @@ $NetBSD: patch-as,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
       * The attributes of the applet.
       */
 -    Hashtable atts;
-+    protected Hashtable atts;
++    protected Hashtable<String,String> atts;
  
      /*
       * JDK 1.1 serialVersionUID
@@ -38,10 +38,19 @@ $NetBSD: patch-as,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
       * Construct an applet viewer and start the applet.
       */
 -    AppletViewerPanel(URL documentURL, Hashtable atts) {
-+    protected AppletViewerPanel(URL documentURL, Hashtable atts) {
++    protected AppletViewerPanel(URL documentURL, Hashtable<String,String> atts) {
          this.documentURL = documentURL;
          this.atts = atts;
  
+@@ -106,7 +106,7 @@ class AppletViewerPanel extends AppletPa
+      * Get an applet parameter.
+      */
+     public String getParameter(String name) {
+-        return (String)atts.get(name.toLowerCase());
++        return atts.get(name.toLowerCase());
+     }
+ 
+     /**
 @@ -202,12 +202,12 @@ class AppletViewerPanel extends AppletPa
          return (AppletContext)getParent();
      }
diff --git a/lang/openjdk7/patches/patch-at b/lang/openjdk7/patches/patch-at
index 2970f47026c..f57a039560e 100644
--- a/lang/openjdk7/patches/patch-at
+++ b/lang/openjdk7/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-at,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/share/classes/sun/applet/AppletPanel.java.orig	2009-09-17 09:52:11.000000000 +0200
+--- jdk/src/share/classes/sun/applet/AppletPanel.java.orig	2013-05-29 03:57:58.000000000 +0000
 +++ jdk/src/share/classes/sun/applet/AppletPanel.java
-@@ -67,7 +67,7 @@ abstract class AppletPanel extends Panel
+@@ -68,7 +68,7 @@ abstract class AppletPanel extends Panel
      /**
       * The applet (if loaded).
       */
@@ -11,3 +11,32 @@ $NetBSD: patch-at,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
  
      /**
       * Applet will allow initialization.  Should be
+@@ -162,7 +162,8 @@ abstract class AppletPanel extends Panel
+      * Creates a thread to run the applet. This method is called
+      * each time an applet is loaded and reloaded.
+      */
+-    synchronized void createAppletThread() {
++	//Overridden by NetxPanel.
++    protected synchronized void createAppletThread() {
+         // Create a thread group for the applet, and start a new
+         // thread to load the applet.
+         String nm = "applet-" + getCode();
+@@ -306,7 +307,7 @@ abstract class AppletPanel extends Panel
+     /**
+      * Get an event from the queue.
+      */
+-    synchronized AppletEvent getNextEvent() throws InterruptedException {
++    protected synchronized AppletEvent getNextEvent() throws InterruptedException {
+         while (queue == null || queue.isEmpty()) {
+             wait();
+         }
+@@ -692,7 +693,8 @@ abstract class AppletPanel extends Panel
+      * applet event processing so that it can be gracefully interrupted from
+      * things like HotJava.
+      */
+-    private void runLoader() {
++	//Overridden by NetxPanel.
++    protected void runLoader() {
+         if (status != APPLET_DISPOSE) {
+             showAppletStatus("notdisposed");
+             return;
diff --git a/lang/openjdk7/patches/patch-au b/lang/openjdk7/patches/patch-au
deleted file mode 100644
index 11fe6812bc8..00000000000
--- a/lang/openjdk7/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.2 2010/05/22 17:09:55 tnn Exp $
-
---- jdk/make/Makefile.orig	2010-05-06 08:44:50.000000000 +0000
-+++ jdk/make/Makefile
-@@ -241,6 +241,7 @@ import_product:
- all build:: sanity-all post-sanity-all
- 
- SUBDIRS       = tools java javax sun com
-+SUBDIRS      += net/sourceforge/jnlp
- SUBDIRS_tools = launchers
- SUBDIRS_misc  = org sunw jpda mkdemo mksample
- 
diff --git a/lang/openjdk7/patches/patch-av b/lang/openjdk7/patches/patch-av
deleted file mode 100644
index 649213756de..00000000000
--- a/lang/openjdk7/patches/patch-av
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-av,v 1.2 2011/08/21 22:57:55 tnn Exp $
-
---- jdk/make/net/sourceforge/jnlp/Makefile.orig	2011-08-19 21:44:33.000000000 +0000
-+++ jdk/make/net/sourceforge/jnlp/Makefile
-@@ -0,0 +1,19 @@
-+BUILDDIR = ../../..
-+PACKAGE = net.sourceforge.jnlp
-+PRODUCT = jnlp
-+
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+AUTO_FILES_JAVA_DIRS = net/sourceforge/jnlp net/sourceforge/nanoxml netscape
-+LOCALE_SET_DEFINITION = jre
-+
-+OTHER_PROPERTIES += $(PKGDIR)/resources/Messages.properties
-+
-+OTHER_JAVACFLAGS += -classpath $(RHINO_JAR)
-+
-+build: $(CLASSDESTDIR)/$(PKGDIR)/resources/Messages.properties
-+
-+$(CLASSDESTDIR)/$(PKGDIR)/resources/Messages.properties: $(SHARE_SRC)/classes/$(PKGDIR)/resources/Messages.properties
-+	 $(install-file)
-+
-+include $(BUILDDIR)/common/Classes.gmk
diff --git a/lang/openjdk7/patches/patch-aw b/lang/openjdk7/patches/patch-aw
index ce51fc4b8c6..c9446397344 100644
--- a/lang/openjdk7/patches/patch-aw
+++ b/lang/openjdk7/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.1 2010/05/23 13:00:04 tnn Exp $
+$NetBSD: patch-aw,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/share/lib/security/java.policy.orig	2010-05-06 08:45:24.000000000 +0000
+--- jdk/src/share/lib/security/java.policy.orig	2012-08-10 17:30:16.000000000 +0000
 +++ jdk/src/share/lib/security/java.policy
 @@ -45,5 +45,6 @@ grant { 
  	permission java.util.PropertyPermission "java.vm.version", "read";
diff --git a/lang/openjdk7/patches/patch-ba b/lang/openjdk7/patches/patch-ba
index 2d3df92df9c..26c7d927d60 100644
--- a/lang/openjdk7/patches/patch-ba
+++ b/lang/openjdk7/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-ba,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/src/share/vm/utilities/macros.hpp.orig	2009-10-17 16:49:37.000000000 +0200
+--- hotspot/src/share/vm/utilities/macros.hpp.orig	2012-08-10 16:28:55.000000000 +0000
 +++ hotspot/src/share/vm/utilities/macros.hpp
-@@ -148,7 +148,7 @@
+@@ -161,7 +161,7 @@
  #define NOT_WINDOWS(code) code
  #endif
  
diff --git a/lang/openjdk7/patches/patch-bc b/lang/openjdk7/patches/patch-bc
deleted file mode 100644
index 801e82cb5cd..00000000000
--- a/lang/openjdk7/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2011/08/21 22:57:55 tnn Exp $
-
---- hotspot/src/share/vm/utilities/globalDefinitions.hpp.orig	2011-08-18 19:00:26.000000000 +0000
-+++ hotspot/src/share/vm/utilities/globalDefinitions.hpp
-@@ -25,7 +25,9 @@
- #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
- #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
- 
-+#ifndef __STDC_FORMAT_MACROS
- #define __STDC_FORMAT_MACROS
-+#endif
- 
- #ifdef TARGET_COMPILER_gcc
- # include "utilities/globalDefinitions_gcc.hpp"
diff --git a/lang/openjdk7/patches/patch-bd b/lang/openjdk7/patches/patch-bd
index a68f9852897..1e0e1c18aa6 100644
--- a/lang/openjdk7/patches/patch-bd
+++ b/lang/openjdk7/patches/patch-bd
@@ -1,6 +1,6 @@
-$NetBSD: patch-bd,v 1.2 2011/08/21 22:57:55 tnn Exp $
+$NetBSD: patch-bd,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/com/sun/java/pack/mapfile-vers.orig	2011-06-27 17:18:17.000000000 +0000
+--- jdk/make/com/sun/java/pack/mapfile-vers.orig	2012-08-10 17:21:30.000000000 +0000
 +++ jdk/make/com/sun/java/pack/mapfile-vers
 @@ -28,6 +28,8 @@
  
diff --git a/lang/openjdk7/patches/patch-be b/lang/openjdk7/patches/patch-be
deleted file mode 100644
index 8e031218b38..00000000000
--- a/lang/openjdk7/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2009/10/18 10:21:01 tnn Exp $
-
---- jdk/src/solaris/native/java/lang/UNIXProcess_md.c.orig	2009-10-17 16:49:37.000000000 +0200
-+++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c
-@@ -53,7 +53,7 @@
- #include <fcntl.h>
- #include <limits.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <dlfcn.h>
- #include <pthread.h>
- #include <pthread_np.h>
diff --git a/lang/openjdk7/patches/patch-bf b/lang/openjdk7/patches/patch-bf
deleted file mode 100644
index 5c34a1abacc..00000000000
--- a/lang/openjdk7/patches/patch-bf
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2011/08/21 22:57:55 tnn Exp $
-
---- jdk/src/solaris/bin/java_md.c.orig	2011-08-20 11:24:21.000000000 +0000
-+++ jdk/src/solaris/bin/java_md.c
-@@ -100,7 +100,7 @@ extern char **environ;
-  *      A collection of useful strings. One should think of these as #define
-  *      entries, but actual strings can be more efficient (with many compilers).
-  */
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- static const char *system_dir	= PACKAGE_PATH "/openjdk7";
- static const char *user_dir	= "/java";
- #elif defined(__NetBSD__)
-@@ -335,6 +335,10 @@ RequiresSetenv(int wanted, const char *j
-     char *dmllp = NULL;
-     char *p; /* a utility pointer */
- 
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+    /* We always need this, since there's no $ORIGIN support in rtld. */
-+    return JNI_TRUE;
-+#endif
-     llp = getenv("LD_LIBRARY_PATH");
- #ifdef __solaris__
-     dmllp = (CURRENT_DATA_MODEL == 32)
diff --git a/lang/openjdk7/patches/patch-bg b/lang/openjdk7/patches/patch-bg
index 470aff5d359..9119cb00b4d 100644
--- a/lang/openjdk7/patches/patch-bg
+++ b/lang/openjdk7/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bg,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig	2009-10-17 16:49:37.000000000 +0200
+--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig	2013-05-29 03:57:58.000000000 +0000
 +++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
-@@ -352,7 +352,7 @@ Java_java_net_PlainDatagramSocketImpl_di
+@@ -357,7 +357,7 @@ Java_java_net_PlainDatagramSocketImpl_di
  #ifdef AF_INET6
          if (ipv6_available()) {
              struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr;
@@ -11,7 +11,7 @@ $NetBSD: patch-bg,v 1.1 2009/10/18 10:21:01 tnn Exp $
              him6->sin6_family = AF_INET6;
  #else
              him6->sin6_family = AF_UNSPEC;
-@@ -362,7 +362,7 @@ Java_java_net_PlainDatagramSocketImpl_di
+@@ -367,7 +367,7 @@ Java_java_net_PlainDatagramSocketImpl_di
  #endif
          {
              struct sockaddr_in *him4 = (struct sockaddr_in*)&addr;
diff --git a/lang/openjdk7/patches/patch-bh b/lang/openjdk7/patches/patch-bh
index 5e548964b48..9105bebfbc8 100644
--- a/lang/openjdk7/patches/patch-bh
+++ b/lang/openjdk7/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bh,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/make/defs.make.orig	2009-10-17 16:49:37.000000000 +0200
+--- hotspot/make/defs.make.orig	2012-08-10 16:23:01.000000000 +0000
 +++ hotspot/make/defs.make
-@@ -125,6 +125,9 @@ ifeq ($(OS),)
+@@ -124,6 +124,9 @@ ifeq ($(OS),)
    ifeq ($(OS), Darwin)
      OS=bsd
    endif
diff --git a/lang/openjdk7/patches/patch-bi b/lang/openjdk7/patches/patch-bi
index a13cbc24a59..e874eca0b23 100644
--- a/lang/openjdk7/patches/patch-bi
+++ b/lang/openjdk7/patches/patch-bi
@@ -1,8 +1,8 @@
-$NetBSD: patch-bi,v 1.2 2012/10/24 15:36:47 joerg Exp $
+$NetBSD: patch-bi,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2009-10-17 16:49:37.000000000 +0200
+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2012-08-10 16:24:31.000000000 +0000
 +++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
-@@ -60,7 +60,7 @@
+@@ -94,7 +94,7 @@
  #define SPELL_REG_FP "ebp"
  #endif // AMD64
  
@@ -11,27 +11,26 @@ $NetBSD: patch-bi,v 1.2 2012/10/24 15:36:47 joerg Exp $
  # define context_trapno uc_mcontext.mc_trapno
  # ifdef AMD64
  #  define context_pc uc_mcontext.mc_rip
-@@ -275,14 +275,7 @@
- #endif
- 
- address os::current_stack_pointer() {
--#ifdef SPARC_WORKS
+@@ -279,13 +279,8 @@ address os::current_stack_pointer() {
+   register void *esp;
+   __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
+   return (address) esp;
+-#elif defined(SPARC_WORKS)
 -  register void *esp;
 -  __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
 -  return (address) ((char*)esp + sizeof(long)*2);
--#else
+ #else
 -  register void *esp __asm__ (SPELL_REG_SP);
 -  return (address) esp;
--#endif
 +  return (address)__builtin_frame_address(0);
+ #endif
  }
  
- char* os::non_memory_address_word() {
-@@ -358,13 +351,7 @@ frame os::get_sender_for_C_frame(frame* 
+@@ -362,13 +357,7 @@ frame os::get_sender_for_C_frame(frame* 
  }
  
  intptr_t* _get_previous_fp() {
--#ifdef SPARC_WORKS
+-#if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__)
 -  register intptr_t **ebp;
 -  __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
 -#else
diff --git a/lang/openjdk7/patches/patch-bj b/lang/openjdk7/patches/patch-bj
index 6681f060e91..953530c7fa9 100644
--- a/lang/openjdk7/patches/patch-bj
+++ b/lang/openjdk7/patches/patch-bj
@@ -1,8 +1,8 @@
-$NetBSD: patch-bj,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bj,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2009-10-17 16:49:37.000000000 +0200
+--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2012-08-10 16:28:55.000000000 +0000
 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-@@ -243,6 +243,9 @@ inline int g_isnan(float  f) { return is
+@@ -252,6 +252,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); }
diff --git a/lang/openjdk7/patches/patch-bk b/lang/openjdk7/patches/patch-bk
index 07e1b21c3dc..434b2214026 100644
--- a/lang/openjdk7/patches/patch-bk
+++ b/lang/openjdk7/patches/patch-bk
@@ -1,13 +1,13 @@
-$NetBSD: patch-bk,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bk,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/java/npt/Makefile.orig	2009-10-17 16:49:37.000000000 +0200
+--- jdk/make/java/npt/Makefile.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/java/npt/Makefile
-@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), bsd)
-   ifeq ($(OS_VENDOR), Apple)
-     OTHER_LDLIBS += -liconv
-   else
--    ifneq ($(OS_NAME), netbsd)
-+    ifeq ($(OS_NAME), freebsd)
-       CPPFLAGS += -I$(PACKAGE_PATH)/include
-       OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
-     endif
+@@ -76,7 +76,7 @@ endif
+ 
+ # Add location of iconv headers
+ ifeq ($(PLATFORM), bsd)
+-  ifneq ($(OS_NAME), netbsd)
++  ifeq ($(OS_NAME), freebsd)
+     CPPFLAGS += -I$(PACKAGE_PATH)/include
+     OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
+   endif
diff --git a/lang/openjdk7/patches/patch-bl b/lang/openjdk7/patches/patch-bl
index 1db6524cf93..efeb5d079f8 100644
--- a/lang/openjdk7/patches/patch-bl
+++ b/lang/openjdk7/patches/patch-bl
@@ -1,8 +1,8 @@
-$NetBSD: patch-bl,v 1.1 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-bl,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/make/java/instrument/Makefile.orig	2009-10-17 16:49:37.000000000 +0200
+--- jdk/make/java/instrument/Makefile.orig	2013-05-29 03:57:57.000000000 +0000
 +++ jdk/make/java/instrument/Makefile
-@@ -111,7 +111,7 @@ ifeq ($(PLATFORM), bsd)
+@@ -115,7 +115,7 @@ ifneq (,$(findstring $(PLATFORM), macosx
      LDFLAGS += -Wl,--whole-archive
      LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
      LDFLAGS += -Wl,--no-whole-archive
diff --git a/lang/openjdk7/patches/patch-bm b/lang/openjdk7/patches/patch-bm
deleted file mode 100644
index d50c5114a59..00000000000
--- a/lang/openjdk7/patches/patch-bm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bm,v 1.1 2009/10/18 10:21:01 tnn Exp $
-
---- jdk/make/sun/splashscreen/Makefile.orig	2009-10-17 16:49:37.000000000 +0200
-+++ jdk/make/sun/splashscreen/Makefile
-@@ -76,7 +76,7 @@ ifneq ($(PLATFORM), windows)
-     ifeq ($(OS_VENDOR), Apple)
-       OTHER_LDLIBS += -liconv
-     else
--      ifneq ($(OS_NAME), netbsd)
-+      ifeq ($(OS_NAME), freebsd)
-         CPPFLAGS += -I$(PACKAGE_PATH)/include
-         OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
-       else
diff --git a/lang/openjdk7/patches/patch-bn b/lang/openjdk7/patches/patch-bn
index a6e0e9ba7d0..f6fb46ac6d2 100644
--- a/lang/openjdk7/patches/patch-bn
+++ b/lang/openjdk7/patches/patch-bn
@@ -1,6 +1,6 @@
-$NetBSD: patch-bn,v 1.2 2009/11/08 17:57:46 tnn Exp $
+$NetBSD: patch-bn,v 1.3 2013/06/02 06:12:28 ryoon Exp $
 
---- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig	2009-10-21 11:09:00.000000000 +0200
+--- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig	2012-08-10 17:31:20.000000000 +0000
 +++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
 @@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g
  
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make
index f7e79977c89..04d076524c2 100644
--- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make
@@ -1,6 +1,6 @@
-$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.1 2012/05/12 21:01:47 marino Exp $
+$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.2 2013/06/02 06:12:28 ryoon Exp $
 
---- hotspot/make/bsd/makefiles/defs.make.orig	2012-05-12 16:55:32.316262000 +0000
+--- hotspot/make/bsd/makefiles/defs.make.orig	2013-05-29 03:57:57.000000000 +0000
 +++ hotspot/make/bsd/makefiles/defs.make
 @@ -30,6 +30,10 @@ SLASH_JAVA ?= /java
  
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_constantPoolOop.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_constantPoolOop.cpp
deleted file mode 100644
index bbaf806dcfa..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_constantPoolOop.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_oops_constantPoolOop.cpp,v 1.1 2012/11/22 11:02:05 marino Exp $
-
-Patch taken from upstream: 
-SUBJ: Don't return booleans from methods returning pointers
-http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/f457154eee8b
-
-Fixes build on gcc 4.7
-
---- hotspot/src/share/vm/oops/constantPoolOop.cpp.orig	2011-06-27 16:14:04.000000000 +0000
-+++ hotspot/src/share/vm/oops/constantPoolOop.cpp
-@@ -269,7 +269,7 @@ klassOop constantPoolOopDesc::klass_ref_
- methodOop constantPoolOopDesc::method_at_if_loaded(constantPoolHandle cpool,
-                                                    int which, Bytecodes::Code invoke_code) {
-   assert(!constantPoolCacheOopDesc::is_secondary_index(which), "no indy instruction here");
--  if (cpool->cache() == NULL)  return false;  // nothing to load yet
-+  if (cpool->cache() == NULL)  return NULL;  // nothing to load yet
-   int cache_index = which - CPCACHE_INDEX_TAG;
-   if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) {
-     if (PrintMiscellaneous && (Verbose||WizardMode)) {
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_loopnode.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_loopnode.cpp
deleted file mode 100644
index 9c07c661220..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_loopnode.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_opto_loopnode.cpp,v 1.1 2012/11/22 11:02:05 marino Exp $
-
-Patch taken from upstream: 
-SUBJ: Don't return booleans from methods returning pointers
-http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/f457154eee8b
-
-Fixes build on gcc 4.7
-
---- hotspot/src/share/vm/opto/loopnode.cpp.orig	2011-06-27 16:14:21.000000000 +0000
-+++ hotspot/src/share/vm/opto/loopnode.cpp
-@@ -893,7 +893,7 @@ Node *LoopLimitNode::Identity( PhaseTran
- Node* CountedLoopNode::match_incr_with_optional_truncation(
-                       Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
-   // Quick cutouts:
--  if (expr == NULL || expr->req() != 3)  return false;
-+  if (expr == NULL || expr->req() != 3)  return NULL;
- 
-   Node *t1 = NULL;
-   Node *t2 = NULL;
diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile
new file mode 100644
index 00000000000..674fc591af5
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile
@@ -0,0 +1,29 @@
+$NetBSD: patch-jdk_make_com_sun_Makefile,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/make/com/sun/Makefile.orig	2012-08-10 17:21:29.000000000 +0000
++++ jdk/make/com/sun/Makefile
+@@ -31,13 +31,6 @@ BUILDDIR = ../..
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+-ifndef OPENJDK
+-  ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,)
+-  ifneq ("$(ORG_EXISTS)", "") 
+-    SCRIPT_SUBDIR = script
+-  endif
+-endif
+-
+ # jarsigner is part of JRE
+ SUBDIRS = java security net/ssl jarsigner
+ 
+@@ -45,7 +38,7 @@ SUBDIRS_management = jmx
+ SUBDIRS_desktop    = image
+ SUBDIRS_enterprise = crypto/provider jndi \
+                      org rowset net/httpserver
+-SUBDIRS_misc       = $(SCRIPT_SUBDIR) tracing servicetag nio demo
++SUBDIRS_misc       = script tracing servicetag nio demo
+ 
+ # Omit mirror since it's built with the apt tool.
+ SUBDIRS_tools      = tools
diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_script_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_script_Makefile
new file mode 100644
index 00000000000..6d19e1c3b7b
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_make_com_sun_script_Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_make_com_sun_script_Makefile,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/make/com/sun/script/Makefile.orig	2012-08-10 17:21:32.000000000 +0000
++++ jdk/make/com/sun/script/Makefile
+@@ -31,6 +31,8 @@ include $(BUILDDIR)/common/Defs.gmk
+ 
+ AUTO_FILES_JAVA_DIRS = com/sun/script
+ 
++OTHER_JAVACFLAGS = -classpath $(RHINO_JAR)
++
+ #
+ # Files that need to be copied
+ #
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java
new file mode 100644
index 00000000000..746266c7593
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java
+@@ -24,7 +24,7 @@
+  */
+ 
+ package com.sun.script.javascript;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import javax.script.*;
+ import java.util.*;
+ 
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java
new file mode 100644
index 00000000000..64c5c82fbac
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java
+@@ -25,7 +25,7 @@
+ 
+ package com.sun.script.javascript;
+ 
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import java.util.*;
+ 
+ /**
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java
new file mode 100644
index 00000000000..b18bba5bac9
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ 
+ import javax.script.Invocable;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * This class implements Rhino-like JavaAdapter to help implement a Java
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java
new file mode 100644
index 00000000000..b54c258d2d3
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ 
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * This class prevents script access to certain sensitive classes.
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java
new file mode 100644
index 00000000000..b23b4eeacd1
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
+@@ -25,7 +25,7 @@
+ 
+ package com.sun.script.javascript;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * Represents compiled JavaScript code.
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java
new file mode 100644
index 00000000000..e64bb5c67d8
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.orig	2013-05-29 03:57:57.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import com.sun.script.util.*;
+ import javax.script.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import java.lang.reflect.Method;
+ import java.io.*;
+ import java.security.*;
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java
new file mode 100644
index 00000000000..6859dc4e79c
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
+@@ -26,7 +26,7 @@
+ package com.sun.script.javascript;
+ import javax.script.*;
+ import java.util.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import com.sun.script.util.*;
+ 
+ /**
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java
new file mode 100644
index 00000000000..66797beb3b0
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
+@@ -25,7 +25,7 @@
+ 
+ package com.sun.script.javascript;
+ 
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ import javax.script.*;
+ import java.security.AccessControlContext;
+ 
diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java
new file mode 100644
index 00000000000..28beed02435
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.orig	2012-08-10 17:25:37.000000000 +0000
++++ jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
+@@ -27,7 +27,7 @@ package com.sun.script.javascript;
+ 
+ import java.lang.reflect.*;
+ import static sun.security.util.SecurityConstants.*;
+-import sun.org.mozilla.javascript.internal.*;
++import org.mozilla.javascript.*;
+ 
+ /**
+  * This wrap factory is used for security reasons. JSR 223 script
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java
new file mode 100644
index 00000000000..24f000e485c
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java
@@ -0,0 +1,25 @@
+$NetBSD: patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* From rhino.patch.
+
+--- jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.orig	2012-08-10 17:31:24.000000000 +0000
++++ jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java
+@@ -27,6 +27,7 @@ package sun.nio.fs;
+ 
+ import java.nio.file.*;
+ import java.nio.file.attribute.*;
++import java.nio.file.spi.FileSystemProvider;
+ import java.io.IOException;
+ 
+ /**
+@@ -38,6 +39,10 @@ public class BsdFileSystemProvider exten
+         super();
+     }
+ 
++    public BsdFileSystemProvider(FileSystemProvider f) {
++        super();
++    }
++
+     @Override
+     BsdFileSystem newFileSystem(String dir) {
+         return new BsdFileSystem(this, dir);
diff --git a/lang/openjdk7/patches/patch-langtools_make_build.xml b/lang/openjdk7/patches/patch-langtools_make_build.xml
new file mode 100644
index 00000000000..3ed56313113
--- /dev/null
+++ b/lang/openjdk7/patches/patch-langtools_make_build.xml
@@ -0,0 +1,24 @@
+$NetBSD: patch-langtools_make_build.xml,v 1.1 2013/06/02 06:12:28 ryoon Exp $
+
+* Avoid *.orig files.
+
+--- langtools/make/build.xml.orig	2012-08-10 17:39:19.000000000 +0000
++++ langtools/make/build.xml
+@@ -235,7 +235,8 @@
+         </chmod>
+         <mkdir dir="${dist.lib.dir}"/>
+         <jar file="${dist.lib.dir}/classes.jar" basedir="${build.classes.dir}"/>
+-        <zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}"/>
++        <zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}"
++             excludes="**/*.orig"/>
+     </target>
+ 
+     <target name="build-bootstrap-tools"
+@@ -804,6 +805,7 @@
+                 <copy todir="@{classes.dir}" includeemptydirs="false">
+                     <fileset dir="${src.classes.dir}" includes="@{includes}" excludes="@{excludes}">
+                         <exclude name="**/*.java"/>
++                        <exclude name="**/*.orig"/>
+                         <exclude name="**/*.properties"/>
+                         <exclude name="**/*-template"/>
+                         <exclude name="**/*.rej"/>