Remove icedtea-web stuff from the base runtime.

It seems to not be needed by www/icedtea-web any longer.
Bump PKGREVISION.

5 files changed, 11 insertions, 150 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index dcfc248eab7..cae8b3c6d88 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.94 2015/02/21 10:44:14 tnn Exp $
+# $NetBSD: Makefile,v 1.95 2015/02/23 13:34:56 tnn Exp $
 
 DISTNAME=	openjdk-1.7.76-20150127
 PKGNAME=	openjdk7-1.7.76
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,8 @@ LICENSE=	gnu-gpl-v2
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+DIST_SUBDIR=	openjdk7
+
 JAVA_NAME=	openjdk7
 JAVA_HOME=	${PREFIX}/java/${JAVA_NAME}
 JAVA_WRAPPERS=	jar java javac javadoc javah javap keytool orbd \
@@ -172,11 +174,6 @@ PLIST.alsa=	yes
 
 post-extract:
 	chmod +x ${ANT_BIN}/ant
-	cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \
-	  ${WRKSRC}/jdk/src/share/classes
-	cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \
-	  ${WRKSRC}/jdk/src/share/classes
-#	cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch
 .if ${OPSYS} == "SunOS"
 	${MKDIR} ${ALT_BOOTDIR}/bin
 	${LN} -s ${JDK_BOOTDIR}/include ${ALT_BOOTDIR}/include
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 394ccef85f3..26309ca535f 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2015/02/22 14:46:40 tnn Exp $
+$NetBSD: distinfo,v 1.78 2015/02/23 13:34:56 tnn Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -33,18 +33,12 @@ Size (openjdk7/bootstrap-jdk7u71-bin-freebsd-10-x86_64-20150101.tar.bz2) = 37448
 SHA1 (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = b467ca8d14f1a8098cd90e3bb7ae664c1713cb8a
 RMD160 (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = 152c801aca81f4db5427fe2f19f4efcb2fb6355e
 Size (openjdk7/bootstrap-jdk7u76-bin-netbsd-7-sparc64-20150212.tar.xz) = 22914116 bytes
-SHA1 (openjdk7/icedtea-2.5.3.tar.xz) = c509018b108ec6d8e5c8380c9b42d5fba426c632
-RMD160 (openjdk7/icedtea-2.5.3.tar.xz) = c386237bc07fa535b1cfd0cf95fc0bc50ab067c3
-Size (openjdk7/icedtea-2.5.3.tar.xz) = 2021560 bytes
-SHA1 (openjdk7/icedtea-web-1.5.1.tar.gz) = 5daedcc1e962eb952e5ea4b5c9698bb9d6ef700e
-RMD160 (openjdk7/icedtea-web-1.5.1.tar.gz) = a2d0ad55919a8ff5d786b56ed26c8a34ed4b259e
-Size (openjdk7/icedtea-web-1.5.1.tar.gz) = 1616344 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/rhino1_7R4.zip) = 483e097cb575c724c745edd80c9512f073bd510a
-RMD160 (openjdk7/rhino1_7R4.zip) = fba5ce71edd396a241991fb7b3ce43628b891035
-Size (openjdk7/rhino1_7R4.zip) = 6481918 bytes
+SHA1 (openjdk7/rhino1_7R5.zip) = 39ada4cca8c7f651a68eda3f307ff9b68808f0ce
+RMD160 (openjdk7/rhino1_7R5.zip) = 04d47e3b108cfb62d8252c358b6f785c8268fc45
+Size (openjdk7/rhino1_7R5.zip) = 10227088 bytes
 SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
 SHA1 (patch-aa) = cd883463de83f64baf24fdb236b7ca87f9132ec3
 SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
@@ -59,8 +53,6 @@ SHA1 (patch-ao) = 5eba16fc16c9a54a855951a153dc9138956dcf08
 SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476
 SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d
 SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec
-SHA1 (patch-as) = 0cef122fb4e8606a9f4923d44079156b89dca0c2
-SHA1 (patch-at) = fdba3bdfccab8de333de08bcc0c9c52d3469d9a3
 SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf
 SHA1 (patch-bd) = b192cab222f76b5c05935946c6229117dd905423
 SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273
diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk
index aeb98b58435..d7f9fcaf9c4 100644
--- a/lang/openjdk7/icedtea-extras.mk
+++ b/lang/openjdk7/icedtea-extras.mk
@@ -1,26 +1,8 @@
-# $NetBSD: icedtea-extras.mk,v 1.15 2014/11/06 16:13:56 ryoon Exp $
+# $NetBSD: icedtea-extras.mk,v 1.16 2015/02/23 13:34:56 tnn Exp $
 
-# Needed to extract icedtea
-EXTRACT_USING=			gtar
-
-DIST_SUBDIR=			openjdk7
-
-ICEDTEA=			icedtea-2.5.3
-ICEDTEA_TGZ=			${ICEDTEA}.tar.xz
-SITES.${ICEDTEA_TGZ}=		http://icedtea.wildebeest.org/download/source/
-DISTFILES+=			${ICEDTEA_TGZ}
-EXTRACT_ONLY+=			${ICEDTEA_TGZ}
-
-# Keep icedtea-web distfile in sync with www/icedtea-web/Makefile
-ICEDTEA_WEB=			icedtea-web-1.5.1
-ICEDTEA_WEB_TGZ=		icedtea-web-1.5.1.tar.gz
-SITES.${ICEDTEA_WEB_TGZ}=	http://icedtea.wildebeest.org/download/source/
-DISTFILES+=			${ICEDTEA_WEB_TGZ}
-EXTRACT_ONLY+=			${ICEDTEA_WEB_TGZ}
-
-RHINO=				rhino1_7R4
+RHINO=				rhino1_7R5
 RHINO_TGZ=			${RHINO}.zip
-SITES.${RHINO_TGZ}=		https://github.com/downloads/mozilla/rhino/
+SITES.${RHINO_TGZ}=		https://github.com/mozilla/rhino/releases/download/Rhino1_7R5_RELEASE/
 DISTFILES+=			${RHINO_TGZ}
 EXTRACT_ONLY+=			${RHINO_TGZ}
 
diff --git a/lang/openjdk7/patches/patch-as b/lang/openjdk7/patches/patch-as
deleted file mode 100644
index e8cefdd6d3a..00000000000
--- a/lang/openjdk7/patches/patch-as
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-as,v 1.2 2013/06/02 06:12:28 ryoon Exp $
-
---- 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.*;
-  *
-  * @author      Arthur van Hoff
-  */
--class AppletViewerPanel extends AppletPanel {
-+public class AppletViewerPanel extends AppletPanel {
- 
-     /* Are we debugging? */
--    static boolean debug = false;
-+    protected static boolean debug = false;
- 
-     /**
-      * The document url.
-      */
--    URL documentURL;
-+    protected URL documentURL;
- 
-     /**
-      * The base url.
-      */
--    URL baseURL;
-+    protected URL baseURL;
- 
-     /**
-      * The attributes of the applet.
-      */
--    Hashtable atts;
-+    protected Hashtable<String,String> atts;
- 
-     /*
-      * JDK 1.1 serialVersionUID
-@@ -70,7 +70,7 @@ class AppletViewerPanel extends AppletPa
-     /**
-      * Construct an applet viewer and start the applet.
-      */
--    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();
-     }
- 
--    static void debug(String s) {
-+    protected static void debug(String s) {
-         if(debug)
-             System.err.println("AppletViewerPanel:::" + s);
-     }
- 
--    static void debug(String s, Throwable t) {
-+    protected static void debug(String s, Throwable t) {
-         if(debug) {
-             t.printStackTrace();
-             debug(s);
diff --git a/lang/openjdk7/patches/patch-at b/lang/openjdk7/patches/patch-at
deleted file mode 100644
index f57a039560e..00000000000
--- a/lang/openjdk7/patches/patch-at
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-at,v 1.2 2013/06/02 06:12:28 ryoon Exp $
-
---- 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
-@@ -68,7 +68,7 @@ abstract class AppletPanel extends Panel
-     /**
-      * The applet (if loaded).
-      */
--    Applet applet;
-+    protected Applet applet;
- 
-     /**
-      * 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;