- Update to icedtea-web-1.5.2.

- Install web start launcher and manpages again.
- Allow building with openjdk8.

New in release 1.5.2 (2014-11-26):
* NetX
  - RH1095311, PR574 -  References class sun.misc.Ref removed in OpenJDK 9 - fixed, and so buildable on JDK9
  - RH1154177 - decoded file needed from cache
  - fixed NPE  in https dialog

4 files changed, 42 insertions, 13 deletions

diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index be139067267..00cc40c4f57 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2014/11/20 09:43:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2015/02/23 13:36:46 tnn Exp $
 
 # Keep icedtea-web distfile in sync with lang/openjdk7/icedtea-extras.mk
-DISTNAME=	icedtea-web-1.5.1
+DISTNAME=	icedtea-web-1.5.2
 CATEGORIES=	www
 MASTER_SITES=	http://icedtea.wildebeest.org/download/source/
 
@@ -14,19 +14,32 @@ EXTRACT_USING=	gtar
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		autoconf automake bash gmake gsed perl pkg-config zip
+USE_TOOLS+=		autoconf automake bash:run gmake gsed perl pkg-config zip
 LICENSE=		gnu-gpl-v2
 
 REPLACE_PERL=		javac.in
+REPLACE_BASH=		launcher/launchers.in
 
 CONFIGURE_ENV+=		ac_cv_path_BIN_BASH=${BASH:Q}
 
+.include "../../mk/java-vm.mk"
+
+.if !empty(PKG_JVM:Mopenjdk8)
+MAKE_ENV+=		BOOT_DIR=${PREFIX}/java/openjdk8
+CONFIGURE_ARGS+=	--with-jdk-home=${PREFIX}/java/openjdk8
+# XXX openjdk8 has nashorn instead of rhino. Do we need to ship a local copy of rhino here?
+#CONFIGURE_ARGS+=	--with-rhino=${PREFIX}/java/openjdk8/jre/lib/rhino.jar
+BUILDLINK_API_DEPENDS.openjdk8+=	openjdk8-[0-9]*
+.include "../../lang/openjdk8/buildlink3.mk"
+.else
+MAKE_ENV+=		BOOT_DIR=${PREFIX}/java/openjdk7
 CONFIGURE_ARGS+=	--with-jdk-home=${PREFIX}/java/openjdk7
 CONFIGURE_ARGS+=	--with-rhino=${PREFIX}/java/openjdk7/jre/lib/rhino.jar
+BUILDLINK_API_DEPENDS.openjdk7+=openjdk7>=1.7.76nb3
+.include "../../lang/openjdk7/buildlink3.mk"
+.endif
 CONFIGURE_ARGS+=	--disable-docs
 
-MAKE_ENV+=		BOOT_DIR=${PREFIX}/java/openjdk7
-
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -if
 
@@ -36,10 +49,7 @@ INSTALLATION_DIRS+=		lib/netscape/plugins
 post-install:
 	cd ${DESTDIR}/${PREFIX}/lib/netscape/plugins && \
 		${LN} -s ../../IcedTeaPlugin.so IcedTeaPlugin.so
-	${RM} -r ${DESTDIR}/${PREFIX}/bin ${DESTDIR}/${PREFIX}/man
 
 .include "../../devel/xulrunner31/buildlink3.mk"
-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 3afd6cb6a80..ebdca175fa8 100644
--- a/www/icedtea-web/PLIST
+++ b/www/icedtea-web/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/31 17:09:02 abs Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/02/23 13:36:46 tnn Exp $
+bin/itweb-settings
+bin/javaws
+bin/policyeditor
 lib/IcedTeaPlugin.so
 lib/netscape/plugins/IcedTeaPlugin.so
+man/man1/itweb-settings.1
+man/man1/javaws.1
+man/man1/policyeditor.1
 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 ebeab9c4c37..f6dbad94b77 100644
--- a/www/icedtea-web/distinfo
+++ b/www/icedtea-web/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2014/11/03 12:31:01 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2015/02/23 13:36:46 tnn Exp $
 
-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 (icedtea-web-1.5.2.tar.gz) = 45eb9ef057cc5239cd85d7fdfc6394de86ee7e6b
+RMD160 (icedtea-web-1.5.2.tar.gz) = fdead511719f4a0103e60229c1285cd7562d06e2
+Size (icedtea-web-1.5.2.tar.gz) = 1583105 bytes
 SHA1 (patch-Makefile.am) = f77f3cfe401f184d3214197df87a36c0179101f3
+SHA1 (patch-launcher_launchers.in) = ddf840102af4fcf53d379ca3fa068f7ed847e15d
diff --git a/www/icedtea-web/patches/patch-launcher_launchers.in b/www/icedtea-web/patches/patch-launcher_launchers.in
new file mode 100644
index 00000000000..a0bc5fa6507
--- /dev/null
+++ b/www/icedtea-web/patches/patch-launcher_launchers.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-launcher_launchers.in,v 1.1 2015/02/23 13:36:46 tnn Exp $
+
+--- launcher/launchers.in.orig	2014-11-26 16:39:23.000000000 +0000
++++ launcher/launchers.in
+@@ -95,6 +95,6 @@ while [ "$j" -lt "${#ARGS[@]}" ]; do
+   k=$((k+1))
+ done
+ 
+-exec -a "$PROGRAM_NAME" "${COMMAND[@]}"
++exec "${COMMAND[@]}"
+ 
+ exit $?