Update to 1.5pre

* Works with openjdk7-1.7.21.
* Tested on NetBSD/amd64 current, and DragonFly/i386 3.2.2.

5 files changed, 115 insertions, 36 deletions

diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index add5c07cd64..cc392c55023 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2013/05/25 11:13:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2013/06/02 06:15:44 ryoon Exp $
 #
 
-DISTNAME=	61e08e67b176
-PKGNAME=	icedtea-web-1.2pre
-PKGREVISION=	15
+DISTNAME=	icedtea-web-9e1f7dc48c20
+PKGNAME=	icedtea-web-1.5pre
 CATEGORIES=	www
-MASTER_SITES=	http://icedtea.classpath.org/hg/icedtea-web/archive/
+MASTER_SITES=	-http://icedtea.classpath.org/hg/icedtea-web/archive/9e1f7dc48c20.tar.bz2
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -15,22 +14,26 @@ COMMENT=	Java browser plugin and Web Start launcher
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES+=		c c++
-USE_TOOLS+=		autoconf automake gmake pkg-config zip
-WRKSRC=			${WRKDIR}/icedtea-web-${DISTNAME}
+USE_TOOLS+=		autoconf automake gmake gsed perl pkg-config zip
 
-CONFIGURE_ARGS+=	 --with-jdk-home=${PREFIX}/java/openjdk7
+REPLACE_PERL=		javac.in
+
+CONFIGURE_ARGS+=	--with-jdk-home=${PREFIX}/java/openjdk7
+CONFIGURE_ARGS+=	--with-rhino=${PREFIX}/java/openjdk7/jre/lib/rhino.jar
+CONFIGURE_ARGS+=	--disable-docs
+
+MAKE_ENV+=		BOOT_DIR=${PREFIX}/java/openjdk7
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -if
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${WRKSRC}/plugin/icedteanp/IcedTeaPlugin.so launcher.build/javaws
 
-INSTALLATION_DIRS+=		bin lib/netscape/plugins
+INSTALLATION_DIRS+=		lib/netscape/plugins
 
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/plugin/icedteanp/IcedTeaPlugin.so ${DESTDIR}${PREFIX}/lib/netscape/plugins
-	${INSTALL_SCRIPT} ${WRKSRC}/launcher.build/javaws ${DESTDIR}${PREFIX}/bin
+post-install:
+	cd ${DESTDIR}/${PREFIX}/lib/netscape/plugins && \
+		${LN} -s ../../IcedTeaPlugin.so IcedTeaPlugin.so
+	${RM} -r ${DESTDIR}/${PREFIX}/bin ${DESTDIR}/${PREFIX}/man
 
 BUILDLINK_API_DEPENDS.xulrunner17+=       xulrunner17>=17.0.6nb1
 .include "../../devel/xulrunner17/buildlink3.mk"
diff --git a/www/icedtea-web/PLIST b/www/icedtea-web/PLIST
index 956c6690daa..baeca3ffac2 100644
--- a/www/icedtea-web/PLIST
+++ b/www/icedtea-web/PLIST
@@ -1,3 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/08/21 23:01:22 tnn Exp $
-bin/javaws
+@comment $NetBSD: PLIST,v 1.2 2013/06/02 06:15:44 ryoon 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 58ea91b3f84..b72c54b4b2d 100644
--- a/www/icedtea-web/distinfo
+++ b/www/icedtea-web/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/12/21 13:09:31 wiz Exp $
+$NetBSD: distinfo,v 1.4 2013/06/02 06:15:44 ryoon Exp $
 
-SHA1 (61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478
-RMD160 (61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f
-Size (61e08e67b176.tar.bz2) = 609340 bytes
-SHA1 (patch-plugin_icedteanp_IcedTeaNPPlugin.cc) = 8d87811957d664e905586b2aca3413218bf2a8ed
+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
diff --git a/www/icedtea-web/patches/patch-Makefile.am b/www/icedtea-web/patches/patch-Makefile.am
new file mode 100644
index 00000000000..7cbbdfbd103
--- /dev/null
+++ b/www/icedtea-web/patches/patch-Makefile.am
@@ -0,0 +1,86 @@
+$NetBSD: patch-Makefile.am,v 1.1 2013/06/02 06:15:44 ryoon 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
+@@ -240,9 +240,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_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/$(itweb_settings) $(DESTDIR)$(bindir)
+ 
+ install-data-local:
+ 	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
+@@ -251,15 +251,15 @@ install-data-local:
+ if ENABLE_DOCS
+ 	${mkinstalldirs} $(DESTDIR)$(htmldir)
+ 	(cd ${abs_top_builddir}/docs/netx; \
+-	 for files in $$(find . -type f); \
++	 for files in *; \
+ 	 do \
+-	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
++	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/; \
+ 	 done)
+ if ENABLE_PLUGIN
+ 	(cd ${abs_top_builddir}/docs/plugin; \
+-	 for files in $$(find . -type f); \
++	 for files in *; \
+ 	 do \
+-	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
++	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/; \
+ 	 done)
+ endif
+ endif
+@@ -454,21 +454,21 @@ if !HAVE_JAVA7
+ endif
+ 
+ stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.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) \
+ 	    @netx-source-files.txt
+ 	(cd $(NETX_RESOURCE_DIR); \
+-	 for files in $$(find . -type f); \
++	 for files in *; \
+ 	 do \
+-	   ${INSTALL_DATA} -D $${files} \
+-	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
++	   ${INSTALL_DATA} $${files} \
++	   $(NETX_DIR)/net/sourceforge/jnlp/resources/; \
+ 	 done)
+-	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
++	cp -RpP $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
+ 	  $(NETX_DIR)/net/sourceforge/jnlp/runtime
+-	cp -a build.properties $(NETX_DIR)/net/sourceforge/jnlp/
++	cp -RpP build.properties $(NETX_DIR)/net/sourceforge/jnlp/
+ 	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 $@
diff --git a/www/icedtea-web/patches/patch-plugin_icedteanp_IcedTeaNPPlugin.cc b/www/icedtea-web/patches/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
deleted file mode 100644
index 7860a96f4f6..00000000000
--- a/www/icedtea-web/patches/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugin_icedteanp_IcedTeaNPPlugin.cc,v 1.2 2011/12/21 13:09:31 wiz Exp $
-
-Fix build with gcc-4.5.
-
---- plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2011-08-17 16:01:19.000000000 +0000
-+++ plugin/icedteanp/IcedTeaNPPlugin.cc
-@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
- 
- // Returns a string describing the MIME type that this plugin
- // handles.
--char*
-+const char*
- NP_GetMIMEDescription ()
- {
-   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");