Update openjdk8 to latest version from the bsd-port hg tree. (u45-b13)

No full changelog available but at least fixes the security issues noted
in the April 2015 Critical Patch Update from Oracle.

12 files changed, 70 insertions, 183 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index 711c9dc0277..dac859aa382 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/05/05 16:20:08 abs Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/10 11:38:51 tnn Exp $
 
-DISTNAME=	openjdk-1.8.31-20150207
-PKGNAME=	openjdk8-1.8.31
-PKGREVISION=	5
+DISTNAME=	openjdk-1.8.45-20150610
+PKGNAME=	openjdk8-1.8.45
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 1e07ef2c212..635a46a39e6 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2015/03/24 14:24:38 joerg Exp $
+$NetBSD: distinfo,v 1.17 2015/06/10 11:38:51 tnn Exp $
 
 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
@@ -33,10 +33,10 @@ Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 379
 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/openjdk-1.8.31-20150207.tar.xz) = f29db4779b126c829d8385208a570c96553b88c8
-RMD160 (openjdk7/openjdk-1.8.31-20150207.tar.xz) = 09434e80bac77f6d367dbe0fe5ee051f1f12c7fe
-Size (openjdk7/openjdk-1.8.31-20150207.tar.xz) = 51853460 bytes
-SHA1 (patch-aa) = 8b8d8bb80bba647eaed242f0f90b98c5001d8164
+SHA1 (openjdk7/openjdk-1.8.45-20150610.tar.xz) = 8484ef7273b6a1a1e54c060808bf476b53083652
+RMD160 (openjdk7/openjdk-1.8.45-20150610.tar.xz) = 272f554ed8af27d6473786515794553217854bb6
+Size (openjdk7/openjdk-1.8.45-20150610.tar.xz) = 52304136 bytes
+SHA1 (patch-aa) = fd07ea984cb0127b56a9b591c21c8d4f236fd9fc
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
 SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
@@ -46,7 +46,7 @@ SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
 SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
-SHA1 (patch-common_autoconf_generated-configure.sh) = abfec0410c3d239a42e44d7f2619cceb02622769
+SHA1 (patch-common_autoconf_generated-configure.sh) = f754ad280fc9bb235ddf515d84ddb4db0e0bf096
 SHA1 (patch-common_autoconf_spec.gmk.in) = e39f543e7e16bd63ee33696192221a99c7e06505
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81
@@ -55,29 +55,25 @@ SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2
-SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = c34887b4bf0873c70a44adaaa9be38614603e1d4
-SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = f38d3ea8002bc8c58d1cf05e70424858dabd2991
+SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = 69a4ff639488bec525cb5bbccaca10dae0d7dc4d
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = cab48bc272fc67f3326e663dc6feb94fe56ec79f
 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = 7f3374554fa889ca2820f91f9dc1d34f2f39df0b
-SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 2498a90e948d9c9329230ab22ac447f06d2f2741
-SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 27c33019f28d38efc0ae2c019b3e6e44863e8253
+SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 1da8abd48754289f24aaeb610f05e58ad829123b
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e
-SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 08270f0a9e0eacf6416a09e300429ccdc1bcdad8
+SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
 SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
-SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 6037c862d219a73617f0d04e844c109f03466691
 SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
 SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
 SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
 SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 6c6648c2716508209f07512327afe3ec1179f64c
-SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = ea06dc34b1c6dc08b7d1537ae129a3a2e3636f81
+SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 3409e21ec151e407053fd510760c8b082f1beda5
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c404a3520f82b8cc5eb906725aa2bc7f27cad801
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
-SHA1 (patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c) = 6eb1f6b3cd62cb35a7b72cae7cb25bc5dc45fd9b
 SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7
 SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8
diff --git a/lang/openjdk8/patches/patch-aa b/lang/openjdk8/patches/patch-aa
index 197d442467b..d0006e912d8 100644
--- a/lang/openjdk8/patches/patch-aa
+++ b/lang/openjdk8/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2015/03/02 04:26:40 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2015/06/10 11:38:51 tnn Exp $
 
 DragonFly support.
 Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2015-02-02 15:32:37.000000000 +0000
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2015-06-09 13:49:54.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -112,8 +112,11 @@
+@@ -113,8 +113,11 @@
  # include <vm/vm_param.h>
  #endif
  
@@ -17,8 +17,8 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
 +#endif
  #endif
  
- #ifdef __APPLE__
-@@ -282,6 +285,7 @@ void os::Bsd::initialize_system_info() {
+ #ifdef __NetBSD__
+@@ -287,6 +290,7 @@ void os::Bsd::initialize_system_info() {
    size_t len;
    int cpu_val;
    julong mem_val;
@@ -26,7 +26,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  
    /* get processors count via hw.ncpus sysctl */
    mib[0] = CTL_HW;
-@@ -302,6 +306,8 @@ void os::Bsd::initialize_system_info() {
+@@ -307,6 +311,8 @@ void os::Bsd::initialize_system_info() {
  
  #if defined (HW_MEMSIZE) // Apple
    mib[1] = HW_MEMSIZE;
@@ -35,7 +35,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  #elif defined(HW_PHYSMEM) // Most of BSD
    mib[1] = HW_PHYSMEM;
  #elif defined(HW_REALMEM) // Old FreeBSD
-@@ -318,14 +324,11 @@ void os::Bsd::initialize_system_info() {
+@@ -323,14 +329,11 @@ void os::Bsd::initialize_system_info() {
         _physical_memory = 256*1024*1024;       // fallback (XXXBSD?)
    }
  
@@ -55,7 +55,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  #endif
  }
  
-@@ -377,7 +380,7 @@ void os::init_system_properties_values()
+@@ -382,7 +385,7 @@ void os::init_system_properties_values()
  //        ...
  //        7: The default directories, normally /lib and /usr/lib.
  #ifndef DEFAULT_LIBPATH
@@ -64,28 +64,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  #endif
  
  // Base path of extensions installed on the system.
-@@ -1236,7 +1239,7 @@ pid_t os::Bsd::gettid() {
-   guarantee(retval != 0, "just checking");
-   return retval;
- 
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__)
- #if __FreeBSD_version > 900030
-   return ::pthread_getthreadid_np();
- #else
-@@ -1244,9 +1247,9 @@ pid_t os::Bsd::gettid() {
-   thr_self(&tid);
-   return (pid_t)tid;
- #endif
--#elif __OpenBSD__
-+#elif defined(__OpenBSD__)
-   retval = syscall(SYS_getthrid);
--#elif __NetBSD__
-+#elif defined(__NetBSD__)
-   retval = (pid_t) syscall(SYS__lwp_self);
- #endif
- 
-@@ -1561,7 +1564,9 @@ void * os::dll_load(const char *filename
+@@ -1566,7 +1569,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"},
@@ -95,7 +74,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
      {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"},
-@@ -2092,6 +2097,33 @@ bool Semaphore::timedwait(unsigned int s
+@@ -2097,6 +2102,33 @@ bool Semaphore::timedwait(unsigned int s
  
  #else
  
@@ -129,7 +108,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  bool Semaphore::trywait() {
    return sem_trywait(&_semaphore) == 0;
  }
-@@ -2242,7 +2274,7 @@ static void warn_fail_commit_memory(char
+@@ -2247,7 +2279,7 @@ static void warn_fail_commit_memory(char
  //       problem.
  bool os::pd_commit_memory(char* addr, size_t size, bool exec) {
    int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
@@ -138,7 +117,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
    // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
    if (::mprotect(addr, size, prot) == 0) {
      return true;
-@@ -2843,7 +2875,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -2850,7 +2882,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -147,7 +126,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
    return (ret == 0) ? OS_OK : OS_ERR;
  #elif defined(__APPLE__) || defined(__NetBSD__)
-@@ -2872,7 +2904,7 @@ OSReturn os::get_native_priority(const T
+@@ -2879,7 +2911,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
index 2910f6576c6..d2cd46258b1 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00 tnn Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.4 2015/06/10 11:38:51 tnn Exp $
 
---- common/autoconf/generated-configure.sh.orig	2015-02-02 15:31:06.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig	2015-06-09 13:44:54.000000000 +0000
 +++ common/autoconf/generated-configure.sh
-@@ -6859,7 +6859,7 @@ test -n "$target_alias" &&
+@@ -6883,7 +6883,7 @@ test -n "$target_alias" &&
        VAR_CPU_BITS=32
        VAR_CPU_ENDIAN=big
        ;;
@@ -11,7 +11,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
        VAR_CPU=sparcv9
        VAR_CPU_ARCH=sparc
        VAR_CPU_BITS=64
-@@ -6990,7 +6990,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
+@@ -7030,7 +7030,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
        VAR_CPU_BITS=32
        VAR_CPU_ENDIAN=big
        ;;
@@ -20,7 +20,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
        VAR_CPU=sparcv9
        VAR_CPU_ARCH=sparc
        VAR_CPU_BITS=64
-@@ -8379,9 +8379,9 @@ done
+@@ -8421,9 +8421,9 @@ done
    # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
    if test "x$MAKE" != x; then
      # User has supplied a make, test it.
@@ -33,7 +33,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
  
    MAKE_CANDIDATE=""$MAKE""
    DESCRIPTION="user supplied MAKE=$MAKE"
-@@ -12483,7 +12483,7 @@ fi
+@@ -12543,7 +12543,7 @@ fi
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -42,7 +42,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -19643,7 +19643,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -19774,7 +19774,7 @@ $as_echo_n "checking resolved symbolic l
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -51,7 +51,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -20081,7 +20081,7 @@ $as_echo_n "checking for resolved symbol
+@@ -20212,7 +20212,7 @@ $as_echo_n "checking for resolved symbol
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -60,7 +60,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -21244,7 +21244,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -21375,7 +21375,7 @@ $as_echo_n "checking resolved symbolic l
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -69,7 +69,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -21682,7 +21682,7 @@ $as_echo_n "checking for resolved symbol
+@@ -21813,7 +21813,7 @@ $as_echo_n "checking for resolved symbol
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@@ -78,7 +78,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -29731,7 +29731,7 @@ fi
+@@ -29862,7 +29862,7 @@ fi
    #
    case $COMPILER_NAME in
      gcc )
@@ -87,16 +87,17 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
        -pipe \
        -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
        case $OPENJDK_TARGET_CPU_ARCH in
-@@ -30345,6 +30345,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -30475,7 +30475,8 @@ $as_echo "alsa pulse x11" >&6; }
+   if test "x$OPENJDK_TARGET_OS" = xbsd; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
  $as_echo_n "checking what is not needed on BSD?... " >&6; }
-     PULSE_NOT_NEEDED=yes
-+# disable sound for now. XXX revisit this.
-+    ALSA_NOT_NEEDED=yes
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: pulse" >&5
- $as_echo "pulse" >&6; }
-   fi
-@@ -31555,7 +31557,11 @@ $as_echo "$as_me: WARNING: freetype not 
+-    if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then
++    if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd; then
++# XXX revisit this
+       ALSA_NOT_NEEDED=yes
+       PULSE_NOT_NEEDED=yes
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
+@@ -31701,7 +31702,11 @@ $as_echo "$as_me: WARNING: freetype not 
  
        # Allow --with-freetype-lib and --with-freetype-include to override
        if test "x$with_freetype_include" != x; then
@@ -109,7 +110,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -34373,7 +34379,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -34519,7 +34524,7 @@ $as_echo "$as_me: The path of FREETYPE_I
      FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
    fi
  
@@ -118,7 +119,7 @@ $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
        else
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -34506,7 +34512,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -34652,7 +34657,7 @@ $as_echo "$as_me: The path of FREETYPE_L
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
          FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
        else
diff --git a/lang/openjdk8/patches/patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp b/lang/openjdk8/patches/patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp
deleted file mode 100644
index bad53b9bcdd..00000000000
--- a/lang/openjdk8/patches/patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
---- hotspot/src/os/bsd/vm/osThread_bsd.cpp.orig	2015-02-02 15:32:37.000000000 +0000
-+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp
-@@ -30,7 +30,7 @@
- 
- void OSThread::pd_initialize() {
-   assert(this != NULL, "check");
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(_ALLBSD_SOURCE)
-   _thread_id        = 0;
- #else
-   _thread_id        = NULL;
diff --git a/lang/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp b/lang/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp
index a0dccfdee44..2d2f4ffd86f 100644
--- a/lang/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.2 2015/06/10 11:38:51 tnn Exp $
 
 rlim_t fixes.
 
---- hotspot/src/os/posix/vm/os_posix.cpp.orig	2015-02-02 15:32:37.000000000 +0000
+--- hotspot/src/os/posix/vm/os_posix.cpp.orig	2015-06-09 13:49:55.000000000 +0000
 +++ hotspot/src/os/posix/vm/os_posix.cpp
-@@ -160,12 +160,12 @@ void os::Posix::print_rlimit_info(output
+@@ -180,12 +180,12 @@ void os::Posix::print_rlimit_info(output
  
    st->print(" STACK ");
    getrlimit(RLIMIT_STACK, &rlim);
@@ -19,7 +19,7 @@ rlim_t fixes.
    else st->print("%uk", rlim.rlim_cur >> 10);
  
    // Isn't there on solaris
-@@ -178,12 +178,12 @@ void os::Posix::print_rlimit_info(output
+@@ -198,7 +198,7 @@ void os::Posix::print_rlimit_info(output
  
    st->print(", NOFILE ");
    getrlimit(RLIMIT_NOFILE, &rlim);
@@ -27,8 +27,11 @@ rlim_t fixes.
 +  if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity");
    else st->print("%d", rlim.rlim_cur);
  
+ #ifdef __OpenBSD__
+@@ -208,7 +208,7 @@ void os::Posix::print_rlimit_info(output
    st->print(", AS ");
    getrlimit(RLIMIT_AS, &rlim);
+ #endif
 -  if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
 +  if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity");
    else st->print("%uk", rlim.rlim_cur >> 10);
diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
deleted file mode 100644
index d7a979ef7f4..00000000000
--- a/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-jdk_make_lib_NioLibraries.gmk,v 1.1 2015/03/02 14:27:38 tnn Exp $
-
---- jdk/make/lib/NioLibraries.gmk.orig	2015-02-02 15:37:11.000000000 +0000
-+++ jdk/make/lib/NioLibraries.gmk
-@@ -185,9 +185,12 @@ $(BUILD_LIBNIO): $(BUILD_LIBNET)
- 
- ##########################################################################################
- 
-+ifeq (, $(OS_VENDOR))
-+OS_VENDOR:=	$(shell uname -s)
-+endif
- ifeq ($(OPENJDK_TARGET_OS_API), posix)
- 
--  ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix))
-+  ifeq (, $(filter $(OS_VENDOR), AIX Darwin NetBSD DragonFly))
- 
-     # Suppress unused parameters required by exported JNI functions.
-     SCTP_WERROR := -Werror -Wno-error=unused-parameter
diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_SoundLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_SoundLibraries.gmk
index 132c800c4e9..3c4bf88cfc1 100644
--- a/lang/openjdk8/patches/patch-jdk_make_lib_SoundLibraries.gmk
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_SoundLibraries.gmk
@@ -1,13 +1,13 @@
-$NetBSD: patch-jdk_make_lib_SoundLibraries.gmk,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-jdk_make_lib_SoundLibraries.gmk,v 1.2 2015/06/10 11:38:51 tnn Exp $
 
---- jdk/make/lib/SoundLibraries.gmk.orig	2015-02-02 15:37:11.000000000 +0000
+--- jdk/make/lib/SoundLibraries.gmk.orig	2015-06-09 13:56:39.000000000 +0000
 +++ jdk/make/lib/SoundLibraries.gmk
 @@ -76,7 +76,7 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
  endif # OPENJDK_TARGET_OS aix
  
  ifeq ($(OPENJDK_TARGET_OS), bsd)
--  EXTRA_SOUND_JNI_LIBS += jsoundalsa
-+#  EXTRA_SOUND_JNI_LIBS += jsoundalsa
+-  ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
++  ifeq (, $(filter $(OPENJDK_TARGET_OS_VENDOR), netbsd openbsd))
+     EXTRA_SOUND_JNI_LIBS += jsoundalsa
+   endif # OPENJDK_TARGET_OS_VENDOR openbsd
    LIBJSOUND_CFLAGS += -DX_PLATFORM=X_BSD
- endif # OPENJDK_TARGET_OS bsd
- 
diff --git a/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c
index d3347769d04..db940d2d596 100644
--- a/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c
+++ b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c,v 1.2 2015/06/10 11:38:51 tnn Exp $
 
 Ensure we use the bundled jpeg.
 
---- jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.orig	2015-02-02 15:37:11.000000000 +0000
+--- jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.orig	2015-06-09 13:56:33.000000000 +0000
 +++ jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c
 @@ -44,7 +44,7 @@
  /* undo "system_boolean" hack and undef FAR since we don't use it anyway */
@@ -12,4 +12,4 @@ Ensure we use the bundled jpeg.
 +#include "jpeglib.h"
  #include "jerror.h"
  
- /* The method IDs we cache. Note that the last two belongs to the
+ #ifdef __APPLE__
diff --git a/lang/openjdk8/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd b/lang/openjdk8/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd
deleted file mode 100644
index 3fc2460550d..00000000000
--- a/lang/openjdk8/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
-* Under NetBSD 5, use fork instead of posix_spawn. NetBSD 5 has no posix_spawn.
-
---- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd.orig	2015-02-02 15:37:12.000000000 +0000
-+++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd
-@@ -95,16 +95,31 @@ final class UNIXProcess extends Process 
-             public LaunchMechanism run() {
-                 String javahome = System.getProperty("java.home");
-                 String osArch = System.getProperty("os.arch");
-+                String osname = System.getProperty("os.name");
- 
-                 helperpath = toCString(javahome + "/lib/" + osArch + "/jspawnhelper");
--                String s = System.getProperty(
--                    "jdk.lang.Process.launchMechanism", "posix_spawn");
--
--                try {
--                    return LaunchMechanism.valueOf(s.toUpperCase());
--                } catch (IllegalArgumentException e) {
--                    throw new Error(s + " is not a supported " +
--                        "process launch mechanism on this platform.");
-+/* NetBSD 5 does not have posix_spawn. Use fork instead. */
-+                String osversion = System.getProperty("os.version");
-+                if (osname.startsWith("NetBSD") && osversion.startsWith("5")) {
-+                    String s = System.getProperty(
-+                        "jdk.lang.Process.launchMechanism", "fork");
-+
-+                    try {
-+                        return LaunchMechanism.valueOf(s.toUpperCase());
-+                    } catch (IllegalArgumentException e) {
-+                        throw new Error(s + " is not a supported " +
-+                            "process launch mechanism on this platform.");
-+                    }
-+                } else {
-+                    String s = System.getProperty(
-+                        "jdk.lang.Process.launchMechanism", "posix_spawn");
-+
-+                    try {
-+                        return LaunchMechanism.valueOf(s.toUpperCase());
-+                    } catch (IllegalArgumentException e) {
-+                        throw new Error(s + " is not a supported " +
-+                            "process launch mechanism on this platform.");
-+                    }
-                 }
-             }
-         });
diff --git a/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c b/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
index fd9e41be5e8..ec95a8e72ed 100644
--- a/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
+++ b/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.2 2015/06/10 11:38:51 tnn Exp $
 
 Zones support.
 
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2015-02-02 15:37:12.000000000 +0000
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2015-06-09 13:56:55.000000000 +0000
 +++ jdk/src/solaris/native/java/net/NetworkInterface.c
 @@ -43,6 +43,7 @@
  #include <fcntl.h>
@@ -12,7 +12,7 @@ Zones support.
  #endif
  
  #ifdef __linux__
-@@ -67,13 +68,11 @@
+@@ -67,14 +68,12 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
  #include <sys/sockio.h>
@@ -23,12 +23,13 @@ Zones support.
 -#elif defined(__OpenBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__)
  #include <netinet/if_ether.h>
+ #include <netinet6/in6_var.h>
 -#elif defined(__NetBSD__)
 -#include <net/if_ether.h>
  #endif
  #include <net/if_dl.h>
  #include <netinet/in_var.h>
-@@ -1748,7 +1747,8 @@ static short getSubnet(JNIEnv *env, int 
+@@ -1749,7 +1748,8 @@ static short getSubnet(JNIEnv *env, int 
  
  
  
@@ -38,7 +39,7 @@ Zones support.
  
  /**
   * Solaris specific DLPI code to get hardware address from a device.
-@@ -1765,11 +1765,18 @@ static int getMacFromDevice(JNIEnv *env,
+@@ -1766,11 +1766,18 @@ static int getMacFromDevice(JNIEnv *env,
      int flags = 0;
  
     /**
diff --git a/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c b/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c
deleted file mode 100644
index c0fe4bd68e9..00000000000
--- a/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
-
-No RTLD_NOLOAD on NetBSD < 6, use RTLD_LAZY instead.
-
---- jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c.orig	2015-02-02 15:37:12.000000000 +0000
-+++ jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
-@@ -54,7 +54,7 @@ JNIEXPORT jlong JNICALL Java_sun_securit
-     }
- 
-     // look up existing handle only, do not load
--#if defined(AIX)
-+#if defined(AIX) || !defined(RTLD_NOLOAD)
-     void *hModule = dlopen(libName, RTLD_LAZY);
- #else
-     void *hModule = dlopen(libName, RTLD_NOLOAD);