Update to OpenJDK7, Update 80.

This is a maintenance release that fixes ~100 bugs in the following subsystems:

client-libs: 2d, java.awt, javax.swing
core-libs: Support, java.lang, java.lang.class_loading, java.lang:reflect
           java.net, java.nio, java.nio.charsets, java.util.jar, java.util:i18n
core-svc: javax.management
deploy: deployment_toolkit, plugin, webstart
globalization: locale-data, translation
hotspot: compiler, gc, jvmti, runtime, svc
security-libs: java.security, javax.crypto, javax.crypto:pkcs11, javax.net.ssl,
               org.ietf.jgss:krb5
tools: javac
xml: jaxp

5 files changed, 15 insertions, 39 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 50798a5d941..7d971add3d9 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.99 2015/05/05 16:20:08 abs Exp $
+# $NetBSD: Makefile,v 1.100 2015/06/09 15:03:43 tnn Exp $
 
-DISTNAME=	openjdk-1.7.76-20150127
-PKGNAME=	openjdk7-1.7.76
-PKGREVISION=	4
+DISTNAME=	openjdk-1.7.80-20150609
+PKGNAME=	openjdk7-1.7.80
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjdk.java.net/
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index da080bcbeac..3b9ab02c440 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2015/05/05 17:07:39 abs Exp $
+@comment $NetBSD: PLIST,v 1.23 2015/06/09 15:03:43 tnn Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -611,7 +611,6 @@ java/openjdk7/jre/lib/zi/Antarctica/Rothera
 java/openjdk7/jre/lib/zi/Antarctica/Syowa
 java/openjdk7/jre/lib/zi/Antarctica/Troll
 java/openjdk7/jre/lib/zi/Antarctica/Vostok
-java/openjdk7/jre/lib/zi/Asia/Aden
 java/openjdk7/jre/lib/zi/Asia/Almaty
 java/openjdk7/jre/lib/zi/Asia/Amman
 java/openjdk7/jre/lib/zi/Asia/Anadyr
@@ -619,7 +618,6 @@ java/openjdk7/jre/lib/zi/Asia/Aqtau
 java/openjdk7/jre/lib/zi/Asia/Aqtobe
 java/openjdk7/jre/lib/zi/Asia/Ashgabat
 java/openjdk7/jre/lib/zi/Asia/Baghdad
-java/openjdk7/jre/lib/zi/Asia/Bahrain
 java/openjdk7/jre/lib/zi/Asia/Baku
 java/openjdk7/jre/lib/zi/Asia/Bangkok
 java/openjdk7/jre/lib/zi/Asia/Beirut
@@ -651,12 +649,10 @@ java/openjdk7/jre/lib/zi/Asia/Kolkata
 java/openjdk7/jre/lib/zi/Asia/Krasnoyarsk
 java/openjdk7/jre/lib/zi/Asia/Kuala_Lumpur
 java/openjdk7/jre/lib/zi/Asia/Kuching
-java/openjdk7/jre/lib/zi/Asia/Kuwait
 java/openjdk7/jre/lib/zi/Asia/Macau
 java/openjdk7/jre/lib/zi/Asia/Magadan
 java/openjdk7/jre/lib/zi/Asia/Makassar
 java/openjdk7/jre/lib/zi/Asia/Manila
-java/openjdk7/jre/lib/zi/Asia/Muscat
 java/openjdk7/jre/lib/zi/Asia/Nicosia
 java/openjdk7/jre/lib/zi/Asia/Novokuznetsk
 java/openjdk7/jre/lib/zi/Asia/Novosibirsk
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 31d6638427d..855d3922c25 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2015/04/27 19:24:17 jperkin Exp $
+$NetBSD: distinfo,v 1.84 2015/06/09 15:03:43 tnn Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -36,9 +36,9 @@ 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.7.76-20150127.tar.bz2) = 3210d939b5ac92f2a13c43f3616788c114958451
-RMD160 (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 683ce69d0cf0854c3ff38dd058338066e448bd62
-Size (openjdk7/openjdk-1.7.76-20150127.tar.bz2) = 52843102 bytes
+SHA1 (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 90f79a0436d539f58fb5ac70dda1ab9e9fc96ae0
+RMD160 (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 175e665bca448534195e0d9bd77f3d8dc66fcb07
+Size (openjdk7/openjdk-1.7.80-20150609.tar.xz) = 40534324 bytes
 SHA1 (openjdk7/rhino1_7R5.zip) = 39ada4cca8c7f651a68eda3f307ff9b68808f0ce
 RMD160 (openjdk7/rhino1_7R5.zip) = 04d47e3b108cfb62d8252c358b6f785c8268fc45
 Size (openjdk7/rhino1_7R5.zip) = 10227088 bytes
@@ -98,7 +98,6 @@ SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
 SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec122162b71f21d204e5489555738
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
-SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 797e0382e5d67180757070ae5b76577809f7ad15
 SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 1935e8225e08870fd912737de6dee3d599d260ab
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
@@ -139,7 +138,7 @@ SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da30
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb
 SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4
 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716
-SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 41edb9389d4900cd35e52bb29df96d474617a372
+SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 9f0b2ab0789367a2d46cbd4581144beec9e36680
 SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 265d9f401eff6a39d607c8c8a14ecb56c089ed44
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 02e51e702868e1cea4a2628eccbcaa81f231efce
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp
deleted file mode 100644
index f102f6bd44f..00000000000
--- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_arguments.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_runtime_arguments.cpp,v 1.1 2015/02/12 06:18:17 tnn Exp $
-
-Fix problem with ZERO build.
-
-arguments.cpp:2089:9: error: 'is_sun4v' is not a member of 'VM_Version'
-
---- hotspot/src/share/vm/runtime/arguments.cpp.orig	2015-01-26 15:21:48.000000000 +0000
-+++ hotspot/src/share/vm/runtime/arguments.cpp
-@@ -2086,7 +2086,7 @@ bool Arguments::check_vm_args_consistenc
-     // Issue a stern warning if the user has explicitly set
-     // UseMemSetInBOT (it is known to cause issues), but allow
-     // use for experimentation and debugging.
--    if (VM_Version::is_sun4v() && UseMemSetInBOT) {
-+    if (UseMemSetInBOT) {
-       assert(!FLAG_IS_DEFAULT(UseMemSetInBOT), "Error");
-       warning("Experimental flag -XX:+UseMemSetInBOT is known to cause instability"
-           " on sun4v; please understand that you are using at your own risk!");
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd
index 715cb11f478..9dde94039e2 100644
--- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd
@@ -1,10 +1,9 @@
-$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.1 2014/07/21 00:15:41 ryoon Exp $
+$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.2 2015/06/09 15:03:43 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	2014-06-14 20:38:31.000000000 +0000
 +++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd
-@@ -102,14 +102,28 @@ final class UNIXProcess extends Process 
+@@ -103,14 +103,28 @@ final class UNIXProcess extends Process 
                      helperpath = toCString(javahome + "/lib/jspawnhelper");
                  }
  
@@ -12,7 +11,7 @@ $NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.1 2014
 -                    "jdk.lang.Process.launchMechanism", "posix_spawn");
 -
 -                try {
--                    return LaunchMechanism.valueOf(s.toUpperCase());
+-                    return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH));
 -                } catch (IllegalArgumentException e) {
 -                    throw new Error(s + " is not a supported " +
 -                        "process launch mechanism on this platform.");
@@ -23,7 +22,7 @@ $NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.1 2014
 +                        "jdk.lang.Process.launchMechanism", "fork");
 +
 +                    try {
-+                        return LaunchMechanism.valueOf(s.toUpperCase());
++                        return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH));
 +                    } catch (IllegalArgumentException e) {
 +                        throw new Error(s + " is not a supported " +
 +                            "process launch mechanism on this platform.");
@@ -33,7 +32,7 @@ $NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.1 2014
 +                        "jdk.lang.Process.launchMechanism", "posix_spawn");
 +
 +                    try {
-+                        return LaunchMechanism.valueOf(s.toUpperCase());
++                        return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH));
 +                    } catch (IllegalArgumentException e) {
 +                        throw new Error(s + " is not a supported " +
 +                            "process launch mechanism on this platform.");