Update to b75 + bsd-port 20091106 snapshot.

Around 200 bugs were fixed since b72.

7 files changed, 47 insertions, 65 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 5880f06d5fa..522e3f38056 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/10/24 13:11:01 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2009/11/07 14:48:49 tnn Exp $
 
-DISTNAME=	openjdk-7-ea-src-b72-17_sep_2009
-PKGNAME=	openjdk7-1.7.0.72.20090924
-PKGREVISION=	1
+DISTNAME=	openjdk-7-ea-src-b75-30_oct_2009
+PKGNAME=	openjdk7-1.7.0.75.20091106
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 # diff between distfile and bsd-port branch. To check out, use:
 # "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/"
-PATCHFILES+=	jdk-7-bsd-port-72.20090924.diff.bz2
+PATCHFILES+=	jdk-7-bsd-port-75.20091106.diff.bz2
 PATCH_SITES+=	${MASTER_SITE_LOCAL:=openjdk7/}
 
 CACERTS=	cacerts-20091013.tar.bz2
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index cb9f475e91d..b88ec676834 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/11/07 14:48:49 tnn Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -365,7 +365,7 @@ java/openjdk7/jre/lib/${ARCH}/libnpt.so
 java/openjdk7/jre/lib/${ARCH}/librmi.so
 java/openjdk7/jre/lib/${ARCH}/libsaproc.so
 java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
-java/openjdk7/jre/lib/${ARCH}/libsunecc.so
+java/openjdk7/jre/lib/${ARCH}/libsunec.so
 java/openjdk7/jre/lib/${ARCH}/libunpack.so
 java/openjdk7/jre/lib/${ARCH}/libverify.so
 java/openjdk7/jre/lib/${ARCH}/libzip.so
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 376025f57a1..4a11c9ac047 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2009/10/21 10:35:09 ghen Exp $
+$NetBSD: distinfo,v 1.5 2009/11/07 14:48:49 tnn Exp $
 
-SHA1 (openjdk7/175529fae103.tar.bz2) = 297f474423a18d727a87b922b1665ea4e5d54732
-RMD160 (openjdk7/175529fae103.tar.bz2) = 37bb512ccce29eb764a6bf9649c13715bf3eb2d6
-Size (openjdk7/175529fae103.tar.bz2) = 4599216 bytes
+SHA1 (openjdk7/9eb43c172d5b.tar.bz2) = 148136f77c5f565c27cfb2b1346363469becc5ab
+RMD160 (openjdk7/9eb43c172d5b.tar.bz2) = 7c79d15754eae87c543a131a36e26b52fb30e7e7
+Size (openjdk7/9eb43c172d5b.tar.bz2) = 4599645 bytes
 SHA1 (openjdk7/apache-ant-1.7.1-bin.zip) = a7e8fa7bc2102a8d8df99c64db73c2eae3d8b483
 RMD160 (openjdk7/apache-ant-1.7.1-bin.zip) = a4e2c992ac7c81949b391d146baf9c411dbb2c2d
 Size (openjdk7/apache-ant-1.7.1-bin.zip) = 11657986 bytes
@@ -27,19 +27,19 @@ Size (openjdk7/bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2) = 24168404 by
 SHA1 (openjdk7/cacerts-20091013.tar.bz2) = 905e88e6e2ccdbfe1f36c1dace7cc687fba78890
 RMD160 (openjdk7/cacerts-20091013.tar.bz2) = 0f4e14197016201ff65272a944eafecc6f2d5770
 Size (openjdk7/cacerts-20091013.tar.bz2) = 55894 bytes
-SHA1 (openjdk7/jdk-7-bsd-port-72.20090924.diff.bz2) = 9af2b0070b0a3367017c8cddeb48bae770cffbe7
-RMD160 (openjdk7/jdk-7-bsd-port-72.20090924.diff.bz2) = 52053be9e0430fa318ef14fbd3b3085d609307b6
-Size (openjdk7/jdk-7-bsd-port-72.20090924.diff.bz2) = 547293 bytes
-SHA1 (openjdk7/openjdk-7-ea-src-b72-17_sep_2009.tar.bz2) = 5183eae9fb4b1f601736a00bdaa02ed28df1219a
-RMD160 (openjdk7/openjdk-7-ea-src-b72-17_sep_2009.tar.bz2) = 8bee2fa131c5d7acbf1a55d974ab76065596dc49
-Size (openjdk7/openjdk-7-ea-src-b72-17_sep_2009.tar.bz2) = 46645162 bytes
+SHA1 (openjdk7/jdk-7-bsd-port-75.20091106.diff.bz2) = 98a6a5f2c71d34e34260f451aa6ee7d586034ff3
+RMD160 (openjdk7/jdk-7-bsd-port-75.20091106.diff.bz2) = 5d8d0c8b90d3c117f0aa9b8534f163c6c5f13afd
+Size (openjdk7/jdk-7-bsd-port-75.20091106.diff.bz2) = 554491 bytes
+SHA1 (openjdk7/openjdk-7-ea-src-b75-30_oct_2009.tar.bz2) = e8f21410fb046ef5a865c5dfa2253b2199d5dd74
+RMD160 (openjdk7/openjdk-7-ea-src-b75-30_oct_2009.tar.bz2) = e8e6dbd6274c4f37a3603befd88824861ebd50d7
+Size (openjdk7/openjdk-7-ea-src-b75-30_oct_2009.tar.bz2) = 61502241 bytes
 SHA1 (openjdk7/rhino1_7R2.zip) = 3bb380cfb7f6febb87a64b2dee7fa308042f37e4
 RMD160 (openjdk7/rhino1_7R2.zip) = 58ae321829ac701e442bfbfed3d6f87b2bb6ba4c
 Size (openjdk7/rhino1_7R2.zip) = 2996867 bytes
 SHA1 (openjdk7/xalan-j_2_7_1-bin.zip) = 681f04e180de88264bd3df68946001efb0bc2ff1
 RMD160 (openjdk7/xalan-j_2_7_1-bin.zip) = d7174fcc9dd8b3876b5a9c8cde021953475b57f8
 Size (openjdk7/xalan-j_2_7_1-bin.zip) = 17336979 bytes
-SHA1 (patch-aa) = 6cc7d152038414b6bfe6b809e569669836af1587
+SHA1 (patch-aa) = c11951d2957f24352ddedada9ef4edc72e7b7382
 SHA1 (patch-ab) = 001f676c0232f76ff49ac3ec248f696af1e2397b
 SHA1 (patch-ac) = 7e6c0fcfe0b9eaa756eba361d8f9b35d08d17111
 SHA1 (patch-ad) = 88950e3d6792a18dd2e2349fee2b7b4c0d822ea4
@@ -53,14 +53,13 @@ SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
 SHA1 (patch-ap) = 4219c2eb348603ee7ebcfad0b3e6dca81b942c91
-SHA1 (patch-aq) = 4cd70c3451eef29d21d1d562cb5f29fbf639631c
+SHA1 (patch-aq) = 17be1ad20f0930ad53e0de197fd01f10284cbb5d
 SHA1 (patch-ar) = 19abc4c858c730fb337d68d1d524db82c73ffa36
 SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f
 SHA1 (patch-at) = 3b6c2268747c62f0008f67e8f3d5478e1905c551
 SHA1 (patch-au) = ba3414e924ffd82ca75ae1f8df507753141f2491
 SHA1 (patch-av) = be5bb72a3dd251f2a2822f7a1bea3b461b38d016
 SHA1 (patch-ba) = 2c56f89ea6297689fec7a7620f64ced752ed34c6
-SHA1 (patch-bb) = cd6b792bd42644da36c7fe1c4abc79f94e2295fc
 SHA1 (patch-bc) = 301ba93a42ff228254ecb3c9748aa2555dfd601d
 SHA1 (patch-bd) = 8dc567964e0e47e091043936af540fad6e067583
 SHA1 (patch-be) = e89f8420a9cf97c416ef6d1343d837c16623e02f
diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk
index df9b95b3ceb..fb10d026d35 100644
--- a/lang/openjdk7/icedtea-extras.mk
+++ b/lang/openjdk7/icedtea-extras.mk
@@ -1,12 +1,12 @@
-# $NetBSD: icedtea-extras.mk,v 1.2 2009/10/14 16:50:29 tnn Exp $
+# $NetBSD: icedtea-extras.mk,v 1.3 2009/11/07 14:48:49 tnn Exp $
 
 # Needed to extract icedtea
 EXTRACT_USING=			gtar
 
 DIST_SUBDIR=			openjdk7
 
-ICEDTEA=			icedtea-175529fae103
-ICEDTEA_TGZ=			175529fae103.tar.bz2
+ICEDTEA=			icedtea-9eb43c172d5b
+ICEDTEA_TGZ=			9eb43c172d5b.tar.bz2
 SITES.${ICEDTEA_TGZ}=		http://icedtea.classpath.org/hg/icedtea/archive/
 DISTFILES+=			${ICEDTEA_TGZ}
 EXTRACT_ONLY+=			${ICEDTEA_TGZ}
@@ -44,6 +44,7 @@ CONFIGURE_ARGS+=	--with-jdk-home=${PREFIX}/java/openjdk7
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=	gawk pkg-config autoconf automake
+BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 CONFIGURE_ENV+=	ac_cv_path_MD5SUM=/usr/bin/true
 CONFIGURE_ENV+=	ac_cv_path_WGET=/usr/bin/true
 
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index 2fa3a0951c1..950c3b7e1ce 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $
+$NetBSD: patch-aa,v 1.3 2009/11/07 14:48:50 tnn Exp $
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2009-10-17 16:49:37.000000000 +0200
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2009-11-07 14:25:33.000000000 +0100
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
 @@ -63,7 +63,7 @@
  # include <link.h>
@@ -11,17 +11,17 @@ $NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $
  # include <elf.h>
  #endif
  
-@@ -2013,6 +2013,9 @@ bool _print_ascii_file(const char* filen
-   return true;
- }
- 
-+#if defined(__NetBSD__) && defined(RTLD_DI_LINKMAP)
-+typedef struct link_map Link_map;
+@@ -1921,7 +1921,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"},
++#if 0
+     {EM_S390,        EM_S390,    ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
 +#endif
- void os::print_dll_info(outputStream *st) {
-    st->print_cr("Dynamic libraries:");
- #ifdef _ALLBSD_SOURCE
-@@ -3251,7 +3254,7 @@ OSReturn os::set_native_priority(Thread*
+     {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"},
+@@ -3278,7 +3280,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
  #elif defined(__APPLE__) || defined(__NetBSD__)
    struct sched_param sp;
-@@ -3279,7 +3282,7 @@ OSReturn os::get_native_priority(const T
+@@ -3306,7 +3308,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
diff --git a/lang/openjdk7/patches/patch-aq b/lang/openjdk7/patches/patch-aq
index 5c9a9a7b840..a9638cd76ca 100644
--- a/lang/openjdk7/patches/patch-aq
+++ b/lang/openjdk7/patches/patch-aq
@@ -1,17 +1,13 @@
-$NetBSD: patch-aq,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-aq,v 1.2 2009/11/07 14:48:50 tnn Exp $
 
---- jdk/src/share/classes/sun/font/FontManager.java.orig	2008-12-19 09:45:40.000000000 +0100
-+++ jdk/src/share/classes/sun/font/FontManager.java
-@@ -3410,6 +3410,12 @@ public final class FontManager {
-             info[1] = info[1] + File.separator + "arial.ttf";
-         } else {
-             initFontConfigFonts(false);
-+            if (fontConfigFonts == null) {
-+                     info[0] = "nonexistent";
-+                     info[1] = "/nonexistent.ttf";
-+                     defaultPlatformFont = info;
-+                     return defaultPlatformFont;
-+            }
-             for (int i=0; i<fontConfigFonts.length; i++) {
-                 if ("sans".equals(fontConfigFonts[i].fcFamily) &&
-                     0 == fontConfigFonts[i].style) {
+--- jdk/make/tools/src/build/tools/fontchecker/FontChecker.java.orig	2009-10-30 08:48:07.000000000 +0100
++++ jdk/make/tools/src/build/tools/fontchecker/FontChecker.java
+@@ -336,7 +336,7 @@ public class FontChecker implements Acti
+          * to trigger a more normal initialisation.
+          */
+         java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment();
+-        String fontPath = FontManager.getFontPath(true);
++        String fontPath = ""; // FontManager.getFontPath(true);
+         StringTokenizer st =
+             new StringTokenizer(fontPath,
+                                 System.getProperty("path.separator"));
diff --git a/lang/openjdk7/patches/patch-bb b/lang/openjdk7/patches/patch-bb
deleted file mode 100644
index b6f13cc204e..00000000000
--- a/lang/openjdk7/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2009/10/18 10:21:01 tnn Exp $
-
---- langtools/src/share/classes/com/sun/tools/javah/Util.java.orig	2009-10-17 16:49:37.000000000 +0200
-+++ langtools/src/share/classes/com/sun/tools/javah/Util.java
-@@ -186,6 +186,8 @@ public class Util {
- 	    os = "Darwin";
- 	} else if (os.indexOf("NetBSD") >= 0) {
- 	    os = "NetBSD";
-+	} else if (os.indexOf("DragonFly") >= 0) {
-+	    os = "DragonFly";
- 	} else if (os.indexOf("OpenBSD") >= 0) {
- 	    os = "OpenBSD";
-         }