Update to 1.5.1

* Use devel/xulrunner31
* Sync with lang/openjdk7

Changelog:
New in release 1.5.1 (2014-08-13):
* Massively improved offline abilities.
* Improved to be able to run with any JDK
* JDK 8 support added (URLPermission granted if applicable)
* Added DE and PL localizations
* Added KEY_ENABLE_MANIFEST_ATTRIBUTES_CHECK deployment property to control scan of Manifest file
* Control Panel
  - Problem1856: ControlPanel UI improvement for lower resolutions (800*600)
* NetX
  - Problem1858: Java Console accepts multi-byte encodings
  - Problem1859: Java Console UI improvement for lower resolutions (800*600)
  - RH1091563: [abrt] icedtea-web-1.5-2.fc20: Uncaught exception java.lang.ClassCastException in method sun.applet.PluginAppletViewer$8.run()
* Plugin
  - Problem1743 - Intermittant deadlock in PluginRequestProcessor
  - RH1121549: coverity defects
* PolicyEditor
  - codebases without permissions assigned save to file anyway (and re-appear on next open)
  - Problem1776: NullPointer on save-and-exit
  - Custom permissions are properly formatted

New in release 1.5 (2014-04-02):
* IcedTea-Web now using tagsoup as default (tagsoup dependence) sanitizer for input
* JDK older then 1.5 no longer supported
* IcedTea-Web is now following XDG .config and .cache specification(RH947647)
* A console for debugging plugin and javaws
* Dialogs center on screen before becoming visible
* Support for u45 and u51 new manifest attributes (Application-Name, Codebase, Permissions, Trusted-only)
* Custom applet permission policies panel in itweb-settings control panel
* javaws -version flag
* New PolicyEditor for easily adding/removing permissions to individual applets
* Cache Viewer
  - Can be closed by ESC key
  - Enabling and disabling of operational buttons is handled properly
  - Time consuming operations are indicated by a mouse busy cursor
  - "Size" and "Last Modified" columns display localized data
* NetX
  - Problem1465 - java.io.FileNotFoundException while trying to download a JAR file
  - Netx can now parse malformed jnlp files using tagsoup
  - Problem1026 - Apps fail to run because of the nanoxml parser's strict XML validation
  - Problem1473 - javaws should not depend on name of local file
  - Redesigned About dialogue layout and contents
  - Console made aware of plugin messages
* Plugin
  - Problem854: Resizing an applet several times causes 100% CPU load
  - Problem1271: icedtea-web does not handle 'javascript:'-protocol URLs
  - RH976833: Multiple applets on one page cause deadlock
  - Pipes moved into XDG_RUNTIME_DIR
  - Added debug to file
  - RH1010958: insecure temporary file use flaw in LiveConnect implementation
* Common
  - Problem1474: Can't get javaws to use SOCKS proxy
  - Man page for itweb-settings
* Security Updates
  - CVE-2012-4540, RH869040: Heap-based buffer overflow after triggering event attached to applet

3 files changed, 31 insertions, 18 deletions

diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index a8ea3831a49..191084f5f72 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.35 2014/05/29 23:37:57 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/11/03 12:31:01 ryoon Exp $
 
 # Keep icedtea-web distfile in sync with lang/openjdk7/icedtea-extras.mk
-DISTNAME=	icedtea-web-81dfc0552a1c
-PKGNAME=	icedtea-web-1.5pre
-PKGREVISION=	12
+DISTNAME=	icedtea-web-1.5.1
 CATEGORIES=	www
-MASTER_SITES=	-http://icedtea.classpath.org/hg/icedtea-web/archive/81dfc0552a1c.tar.bz2
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://icedtea.wildebeest.org/download/source/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://icedtea.classpath.org/
 COMMENT=	Java browser plugin and Web Start launcher
 #LICENSE=	# GPL2 + Classpath exception
 
+EXTRACT_USING=	bsdtar
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf automake bash gmake gsed perl pkg-config zip
@@ -20,6 +19,8 @@ LICENSE=		gnu-gpl-v2
 
 REPLACE_PERL=		javac.in
 
+CONFIGURE_ENV+=		ac_cv_path_BIN_BASH=${BASH:Q}
+
 CONFIGURE_ARGS+=	--with-jdk-home=${PREFIX}/java/openjdk7
 CONFIGURE_ARGS+=	--with-rhino=${PREFIX}/java/openjdk7/jre/lib/rhino.jar
 CONFIGURE_ARGS+=	--disable-docs
@@ -37,7 +38,7 @@ post-install:
 		${LN} -s ../../IcedTeaPlugin.so IcedTeaPlugin.so
 	${RM} -r ${DESTDIR}/${PREFIX}/bin ${DESTDIR}/${PREFIX}/man
 
-.include "../../devel/xulrunner24/buildlink3.mk"
+.include "../../devel/xulrunner31/buildlink3.mk"
 BUILDLINK_API_DEPENDS.openjdk7+=openjdk7>=1.7.25nb4
 .include "../../lang/openjdk7/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/icedtea-web/distinfo b/www/icedtea-web/distinfo
index 2ff37ce3852..ebeab9c4c37 100644
--- a/www/icedtea-web/distinfo
+++ b/www/icedtea-web/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2013/12/31 17:09:02 abs Exp $
+$NetBSD: distinfo,v 1.6 2014/11/03 12:31:01 ryoon Exp $
 
-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
+SHA1 (icedtea-web-1.5.1.tar.gz) = 5daedcc1e962eb952e5ea4b5c9698bb9d6ef700e
+RMD160 (icedtea-web-1.5.1.tar.gz) = a2d0ad55919a8ff5d786b56ed26c8a34ed4b259e
+Size (icedtea-web-1.5.1.tar.gz) = 1616344 bytes
+SHA1 (patch-Makefile.am) = f77f3cfe401f184d3214197df87a36c0179101f3
diff --git a/www/icedtea-web/patches/patch-Makefile.am b/www/icedtea-web/patches/patch-Makefile.am
index 833ff62e0e7..d5243f1e634 100644
--- a/www/icedtea-web/patches/patch-Makefile.am
+++ b/www/icedtea-web/patches/patch-Makefile.am
@@ -1,21 +1,24 @@
-$NetBSD: patch-Makefile.am,v 1.2 2013/12/31 17:09:02 abs Exp $
+$NetBSD: patch-Makefile.am,v 1.3 2014/11/03 12:31:01 ryoon Exp $
 
 * cp -a is not portable, DragonFly 3.2.2 has not -a option of cp at least.
+* fix statement with "continue", should be '||' not '|' (pipe).
 
---- Makefile.am.orig	2013-12-27 14:49:23.000000000 +0000
+--- Makefile.am.orig	2014-08-14 10:15:46.945832128 +0000
 +++ Makefile.am
-@@ -247,8 +247,8 @@ if ENABLE_PLUGIN
+@@ -250,9 +250,9 @@ 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_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+-	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
 +	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
 +	${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
++	${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
  
  install-data-local:
  	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
-@@ -256,15 +256,15 @@ install-data-local:
+@@ -262,15 +262,15 @@ install-data-local:
  if ENABLE_DOCS
  	${mkinstalldirs} $(DESTDIR)$(htmldir)
  	(cd ${abs_top_builddir}/docs/netx; \
@@ -35,7 +38,7 @@ $NetBSD: patch-Makefile.am,v 1.2 2013/12/31 17:09:02 abs Exp $
  	 done)
  endif
  endif
-@@ -474,7 +474,7 @@ stamps/netx-html-gen.stamp:
+@@ -483,7 +483,7 @@ stamps/netx-html-gen.stamp:
  	touch $@
  
  stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp
@@ -44,7 +47,7 @@ $NetBSD: patch-Makefile.am,v 1.2 2013/12/31 17:09:02 abs Exp $
  	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
  	    -d $(NETX_DIR) \
  	    -sourcepath $(NETX_SRCDIR) \
-@@ -482,14 +482,14 @@ stamps/netx.stamp: netx-source-files.txt
+@@ -491,14 +491,14 @@ stamps/netx.stamp: netx-source-files.txt
  	    $(NETX_CLASSPATH_ARG) \
  	    @netx-source-files.txt
  	(cd $(NETX_RESOURCE_DIR); \
@@ -64,3 +67,12 @@ $NetBSD: patch-Makefile.am,v 1.2 2013/12/31 17:09:02 abs Exp $
  	mkdir -p stamps
  	touch $@
  
+@@ -1655,7 +1655,7 @@ stamps/bootstrap-directory.stamp: stamps
+ 	fi;
+ 	mkdir -p $(BOOT_DIR)/include && \
+ 	for i in $(SYSTEM_JDK_DIR)/include/*; do \
+-	  test -r $$i | continue; \
++	  test -r $$i || continue; \
+ 	  i=`basename $$i`; \
+ 	  rm -f $(BOOT_DIR)/include/$$i; \
+ 	  ln -s $(SYSTEM_JDK_DIR)/include/$$i $(BOOT_DIR)/include/$$i; \