Update to later snapshot - many many changes - key item is:

- Made it work with OpenJDK build 25
Otherwise 1600 lines of changelog without any clear way to filter
Bump PKGREVISION

4 files changed, 24 insertions, 45 deletions

diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index 74b9f407a30..c144f4828c3 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2013/12/15 14:13:37 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.30 2013/12/31 17:09:02 abs Exp $
 
-DISTNAME=	icedtea-web-9e1f7dc48c20
+# Keep icedtea-web distfile in sync with lang/openjdk7/icedtea-extras.mk
+DISTNAME=	icedtea-web-81dfc0552a1c
 PKGNAME=	icedtea-web-1.5pre
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
-MASTER_SITES=	-http://icedtea.classpath.org/hg/icedtea-web/archive/9e1f7dc48c20.tar.bz2
+MASTER_SITES=	-http://icedtea.classpath.org/hg/icedtea-web/archive/81dfc0552a1c.tar.bz2
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -14,8 +14,9 @@ COMMENT=	Java browser plugin and Web Start launcher
 #LICENSE=	# GPL2 + Classpath exception
 
 GNU_CONFIGURE=		yes
-USE_LANGUAGES+=		c c++
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf automake gmake gsed perl pkg-config zip
+LICENSE=		gnu-gpl-v2
 
 REPLACE_PERL=		javac.in
 
@@ -37,7 +38,7 @@ post-install:
 	${RM} -r ${DESTDIR}/${PREFIX}/bin ${DESTDIR}/${PREFIX}/man
 
 .include "../../devel/xulrunner24/buildlink3.mk"
-BUILDLINK_API_DEPENDS.openjdk7+=       openjdk7>=1.7.0.147
+BUILDLINK_API_DEPENDS.openjdk7+=openjdk7>=1.7.25nb4
 .include "../../lang/openjdk7/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/icedtea-web/PLIST b/www/icedtea-web/PLIST
index baeca3ffac2..3afd6cb6a80 100644
--- a/www/icedtea-web/PLIST
+++ b/www/icedtea-web/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/02 06:15:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/12/31 17:09:02 abs Exp $
 lib/IcedTeaPlugin.so
 lib/netscape/plugins/IcedTeaPlugin.so
-share/icedtea-web/about.jar
-share/icedtea-web/about.jnlp
 share/icedtea-web/javaws_splash.png
 share/icedtea-web/netx.jar
 share/icedtea-web/plugin.jar
diff --git a/www/icedtea-web/distinfo b/www/icedtea-web/distinfo
index b72c54b4b2d..2ff37ce3852 100644
--- a/www/icedtea-web/distinfo
+++ b/www/icedtea-web/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/06/02 06:15:44 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2013/12/31 17:09:02 abs Exp $
 
-SHA1 (icedtea-web-9e1f7dc48c20.tar.bz2) = e213b628eef92ddd2fe11267e6159e0d7409e548
-RMD160 (icedtea-web-9e1f7dc48c20.tar.bz2) = c5d36a058072ec485903804dfe2928a12ecca909
-Size (icedtea-web-9e1f7dc48c20.tar.bz2) = 978193 bytes
-SHA1 (patch-Makefile.am) = f7554d80efe54e362f8ababc4614700f47a67b3b
+SHA1 (icedtea-web-81dfc0552a1c.tar.bz2) = e3a00a6a4a18b7c1044e8116f1b86e737c6504de
+RMD160 (icedtea-web-81dfc0552a1c.tar.bz2) = 0c3af827f9c63ba3a7c3f98bb708afd7da8b4b68
+Size (icedtea-web-81dfc0552a1c.tar.bz2) = 1051891 bytes
+SHA1 (patch-Makefile.am) = 2a8f09db2ac317169faaa104a7f982085f550943
diff --git a/www/icedtea-web/patches/patch-Makefile.am b/www/icedtea-web/patches/patch-Makefile.am
index 7cbbdfbd103..833ff62e0e7 100644
--- a/www/icedtea-web/patches/patch-Makefile.am
+++ b/www/icedtea-web/patches/patch-Makefile.am
@@ -1,22 +1,21 @@
-$NetBSD: patch-Makefile.am,v 1.1 2013/06/02 06:15:44 ryoon Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2013/12/31 17:09:02 abs Exp $
 
 * cp -a is not portable, DragonFly 3.2.2 has not -a option of cp at least.
 
---- Makefile.am.orig	2013-05-20 14:22:44.000000000 +0000
+--- Makefile.am.orig	2013-12-27 14:49:23.000000000 +0000
 +++ Makefile.am
-@@ -240,9 +240,9 @@ if ENABLE_PLUGIN
+@@ -247,8 +247,8 @@ if ENABLE_PLUGIN
  endif
  	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
  	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
 -	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
-+	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
- 	${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
 -	${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
++	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
 +	${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
  
  install-data-local:
  	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
-@@ -251,15 +251,15 @@ install-data-local:
+@@ -256,15 +256,15 @@ install-data-local:
  if ENABLE_DOCS
  	${mkinstalldirs} $(DESTDIR)$(htmldir)
  	(cd ${abs_top_builddir}/docs/netx; \
@@ -36,16 +35,17 @@ $NetBSD: patch-Makefile.am,v 1.1 2013/06/02 06:15:44 ryoon Exp $
  	 done)
  endif
  endif
-@@ -454,21 +454,21 @@ if !HAVE_JAVA7
- endif
+@@ -474,7 +474,7 @@ stamps/netx-html-gen.stamp:
+ 	touch $@
  
- stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
+ stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp
 -	mkdir -p $(NETX_DIR)
 +	mkdir -p $(NETX_DIR)/net/sourceforge/jnlp/resources
  	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
  	    -d $(NETX_DIR) \
  	    -sourcepath $(NETX_SRCDIR) \
- 	    -bootclasspath $(RUNTIME) \
+@@ -482,14 +482,14 @@ stamps/netx.stamp: netx-source-files.txt
+ 	    $(NETX_CLASSPATH_ARG) \
  	    @netx-source-files.txt
  	(cd $(NETX_RESOURCE_DIR); \
 -	 for files in $$(find . -type f); \
@@ -64,23 +64,3 @@ $NetBSD: patch-Makefile.am,v 1.1 2013/06/02 06:15:44 ryoon Exp $
  	mkdir -p stamps
  	touch $@
  
-@@ -499,15 +499,15 @@ extra-source-files.txt:
- 	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
- 
- stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
--	mkdir -p extra-lib
-+	mkdir -p ${NETX_EXTRA_DIST_DIR}
- 	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
-           -sourcepath $(abs_top_srcdir)/extra -cp netx.build \
-           -bootclasspath $(RUNTIME) @extra-source-files.txt
- 	(cd $(NETX_EXTRA_DIR); \
--	 for files in $$(find . -type f); \
-+	 for files in *; \
- 	 do \
--	   ${INSTALL_DATA} -D $${files} \
--	   $(NETX_EXTRA_DIST_DIR)/$${files}; \
-+	   ${INSTALL_DATA} $${files} \
-+	   $(NETX_EXTRA_DIST_DIR)/; \
- 	 done)
- 	mkdir -p stamps
- 	touch $@