Update to openjdk7 b78 snapshot.

(b79 is released but not yet merged on the bsd-port branch)

9 files changed, 16 insertions, 97 deletions

diff --git a/www/openjdk7-icedtea-plugin/Makefile b/www/openjdk7-icedtea-plugin/Makefile
index 6d069a2c641..8beda7cf03b 100644
--- a/www/openjdk7-icedtea-plugin/Makefile
+++ b/www/openjdk7-icedtea-plugin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/11/07 14:49:33 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/15 19:18:42 tnn Exp $
 #
 
 DISTNAME=	# from icedtea-extras.mk
-PKGNAME=	openjdk7-icedtea-plugin-1.11.0.20091106
+PKGNAME=	openjdk7-icedtea-plugin-1.11.0.20100111
 CATEGORIES=	www
 MASTER_SITES=	# from icedtea-extras.mk
 
diff --git a/www/openjdk7-icedtea-plugin/distinfo b/www/openjdk7-icedtea-plugin/distinfo
index f326b87a94a..dc5f7a108cc 100644
--- a/www/openjdk7-icedtea-plugin/distinfo
+++ b/www/openjdk7-icedtea-plugin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/11/07 14:49:33 tnn Exp $
+$NetBSD: distinfo,v 1.4 2010/01/15 19:18:42 tnn Exp $
 
-SHA1 (openjdk7/9eb43c172d5b.tar.bz2) = 148136f77c5f565c27cfb2b1346363469becc5ab
-RMD160 (openjdk7/9eb43c172d5b.tar.bz2) = 7c79d15754eae87c543a131a36e26b52fb30e7e7
-Size (openjdk7/9eb43c172d5b.tar.bz2) = 4599645 bytes
+SHA1 (openjdk7/aaf3cf416fb4.tar.bz2) = 0699222ac14be906c2dbdc2db3aff3eeffcd7ac5
+RMD160 (openjdk7/aaf3cf416fb4.tar.bz2) = a88ae483d665163cf3dd302bd4f02c3ce551ab1c
+Size (openjdk7/aaf3cf416fb4.tar.bz2) = 4589271 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
@@ -13,11 +13,5 @@ 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) = f7720f1730611a8331856da0a9593d8456b6c104
-SHA1 (patch-ab) = d8e8a3d6b2251f0d0f1857f7578405269efa94da
-SHA1 (patch-ac) = 3fd60671e05767eaa2d682f6cbd7b028f4f68f6e
+SHA1 (patch-ab) = 2084c98cefb4875717ddf1617edcdb40b1726b78
 SHA1 (patch-ad) = 19a423e2a6414ddb16866fe24f628ecd573ee4ab
-SHA1 (patch-ae) = cf073e70408d371ff436ea4b89efece2d27cf5bd
-SHA1 (patch-af) = 5bfeeaf535335a2728af46c8ef5f5e1b4c2a5a52
-SHA1 (patch-ag) = 2c0bf60a99e4160bed29434cf0f36f751f721cb9
-SHA1 (patch-ah) = 3b7094127fe66c0b0940765930d45cf220355b31
-SHA1 (patch-ai) = 5b04e8227dc32c3746b7940ebc260bfa55ee3480
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ab b/www/openjdk7-icedtea-plugin/patches/patch-ab
index 511f3174d8c..1bd111962b6 100644
--- a/www/openjdk7-icedtea-plugin/patches/patch-ab
+++ b/www/openjdk7-icedtea-plugin/patches/patch-ab
@@ -1,13 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
+$NetBSD: patch-ab,v 1.2 2010/01/15 19:18:42 tnn Exp $
 
---- configure.ac.orig	2009-10-07 10:48:00.000000000 +0200
+--- configure.ac.orig	2010-01-09 00:01:09.000000000 +0000
 +++ configure.ac
-@@ -421,7 +421,7 @@ dnl FIXME: use unstable
+@@ -400,11 +400,11 @@ then
+ fi
+ 
+ dnl Check for plugin support headers and libraries.
+-dnl FIXME: use unstable
++dnl FIXME: use nstable
  if test "x${enable_plugin}" = "xyes"
  then
    PKG_CHECK_MODULES(XULRUNNER, \
 -    nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
-+    mozilla-nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
++    mozilla-nspr mozilla-js mozilla-plugin libxul >= 1.9)
    PKG_CHECK_MODULES(GTK, gtk+-2.0)
    IT_XULRUNNER_VERSION
  fi
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ac b/www/openjdk7-icedtea-plugin/patches/patch-ac
deleted file mode 100644
index 2cdd701b7ad..00000000000
--- a/www/openjdk7-icedtea-plugin/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
-
-XXX tnn investigate this.
-
---- plugin/icedteanp/IcedTeaJavaRequestProcessor.cc.orig	2009-10-07 10:48:00.000000000 +0200
-+++ plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
-@@ -817,7 +817,7 @@ JavaRequestProcessor::createJavaObjectFr
-     	stringArg += NPVARIANT_TO_STRING(variant).UTF8Characters;
- #endif
-     }
--    else if (browser_functions.getproperty())
-+    else if (0 /* browser_functions.getproperty() */)
-     {
- 
-     }
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ae b/www/openjdk7-icedtea-plugin/patches/patch-ae
deleted file mode 100644
index 4514de3b306..00000000000
--- a/www/openjdk7-icedtea-plugin/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
-
---- plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2009-10-07 10:48:00.000000000 +0200
-+++ plugin/icedteanp/IcedTeaNPPlugin.cc
-@@ -1916,7 +1920,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
-   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-   pluginTable->size = sizeof (NPPluginFuncs);
- 
--#if MOZILLA_VERSION_COLLAPSED < 1090200
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
-   pluginTable->newp = NewNPP_NewProc (GCJ_New);
-   pluginTable->destroy = NewNPP_DestroyProc (GCJ_Destroy);
-   pluginTable->setwindow = NewNPP_SetWindowProc (GCJ_SetWindow);
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-af b/www/openjdk7-icedtea-plugin/patches/patch-af
deleted file mode 100644
index ce8ccfbba11..00000000000
--- a/www/openjdk7-icedtea-plugin/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
-
---- plugin/icedteanp/IcedTeaNPPlugin.h.orig	2009-10-07 10:48:00.000000000 +0200
-+++ plugin/icedteanp/IcedTeaNPPlugin.h
-@@ -43,7 +43,7 @@ exception statement from your version. *
- #include <npapi.h>
- #include <nsThreadUtils.h>
- 
--#if MOZILLA_VERSION_COLLAPSED < 1090200
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
- #include <npupp.h>
- #else
- #include <npapi.h>
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ag b/www/openjdk7-icedtea-plugin/patches/patch-ag
deleted file mode 100644
index 5244ec81048..00000000000
--- a/www/openjdk7-icedtea-plugin/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
-
---- plugin/icedteanp/IcedTeaPluginRequestProcessor.h.orig	2009-10-07 10:48:00.000000000 +0200
-+++ plugin/icedteanp/IcedTeaPluginRequestProcessor.h
-@@ -47,7 +47,7 @@ exception statement from your version. *
- 
- #include <npapi.h>
- 
--#if MOZILLA_VERSION_COLLAPSED < 1090200
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
- #include <npupp.h>
- #else
- #include <npapi.h>
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ah b/www/openjdk7-icedtea-plugin/patches/patch-ah
deleted file mode 100644
index 10bfb0ecd29..00000000000
--- a/www/openjdk7-icedtea-plugin/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
-
---- plugin/icedteanp/IcedTeaPluginUtils.h.orig	2009-10-07 10:48:00.000000000 +0200
-+++ plugin/icedteanp/IcedTeaPluginUtils.h
-@@ -57,7 +57,7 @@ exception statement from your version. *
- 
- #include <npapi.h>
- 
--#if MOZILLA_VERSION_COLLAPSED < 1090200
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
- #include <npupp.h>
- #else
- #include <npapi.h>
diff --git a/www/openjdk7-icedtea-plugin/patches/patch-ai b/www/openjdk7-icedtea-plugin/patches/patch-ai
deleted file mode 100644
index 6415288d419..00000000000
--- a/www/openjdk7-icedtea-plugin/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/10/14 11:39:25 tnn Exp $
-
---- plugin/icedteanp/IcedTeaScriptablePluginObject.h.orig	2009-10-07 10:48:00.000000000 +0200
-+++ plugin/icedteanp/IcedTeaScriptablePluginObject.h
-@@ -39,7 +39,7 @@ exception statement from your version. *
- #ifndef __ICEDTEASCRIPTABLEPLUGINOBJECT_H_
- #define __ICEDTEASCRIPTABLEPLUGINOBJECT_H_
- 
--#if MOZILLA_VERSION_COLLAPSED < 1090200
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
- #include "npupp.h"
- #else
- #include <npapi.h>