Hi, an updae for icedtea-web to 1.6.2. I added tagsoup as deps as it is recommended by upstream to solve issue wth bad jnlp files. I also added *.desktop files to make it work nicely with xdg-open.
Oh yeah, it's horrible bashism and gnuism. tagsoup based on textproc/stringtemplate. icedtea-web works fine with iDRAC7 java mgmt console. j. Index: Makefile =================================================================== RCS file: /cvs/ports/www/icedtea-web/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 17 Jul 2015 21:46:11 -0000 1.17 +++ Makefile 9 Mar 2016 18:22:35 -0000 @@ -1,9 +1,9 @@ # $OpenBSD: Makefile,v 1.17 2015/07/17 21:46:11 jasper Exp $ +# new releases are reported via http://mail.openjdk.java.net/pipermail/distro-pkg-dev/ SHARED_ONLY = Yes COMMENT = Java web browser plugin -DISTNAME = icedtea-web-1.5.2 -REVISION = 0 +DISTNAME = icedtea-web-1.6.2 CATEGORIES = www MAINTAINER = Landry Breuil <lan...@openbsd.org> @@ -26,16 +26,29 @@ MODULES = java \ MODJAVA_VER= 1.7+ #build system does horrible things with bash -RUN_DEPENDS = shells/bash +RUN_DEPENDS = shells/bash \ + textproc/tagsoup BUILD_DEPENDS = ${RUN_DEPENDS} \ archivers/zip \ - devel/xulrunner/24,-devel + devel/xulrunner/24,-devel \ + textproc/gsed \ + textproc/tagsoup USE_GMAKE = Yes LIB_DEPENDS = devel/glib2 WANTLIB += glib-2.0 m stdc++ +CONFIGURE_ENV += CONFIG_SHELL="${LOCALBASE}/bin/bash" + +# bashism and gnu date format for nanoseconds post-patch: ${SUBST_CMD} ${WRKSRC}/launcher/launchers.in + perl -i -pe 's/\bsed\b/gsed/g;' ${WRKSRC}/html-gen.sh \ + ${WRKSRC}/Makefile.in + perl -i -pe 's/%N//;' ${WRKSRC}/html-gen.sh + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/*.desktop ${PREFIX}/share/applications/ .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/www/icedtea-web/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 24 Mar 2015 20:29:10 -0000 1.8 +++ distinfo 9 Mar 2016 18:22:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (icedtea-web-1.5.2.tar.gz) = sp6P8lM8xlIaZQmgAgAfTJfICgBEYAYxVtADiY2hO/M= -SIZE (icedtea-web-1.5.2.tar.gz) = 1583105 +SHA256 (icedtea-web-1.6.2.tar.gz) = zmcDQJbWuWDits+1xBp71rMOsux/E78+zbR3/2zmkwA= +SIZE (icedtea-web-1.6.2.tar.gz) = 1824557 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/www/icedtea-web/patches/patch-Makefile_in,v retrieving revision 1.8 diff -u -p -r1.8 patch-Makefile_in --- patches/patch-Makefile_in 17 Jul 2015 21:46:11 -0000 1.8 +++ patches/patch-Makefile_in 9 Mar 2016 18:22:35 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-Makefile_in,v 1.8 2015/07/17 21:46:11 jasper Exp $ javaws/itweb-settings/policyeditor are scripts not programs.. ---- Makefile.in.orig Wed Nov 26 17:39:55 2014 -+++ Makefile.in Tue Mar 24 21:16:40 2015 -@@ -859,9 +859,9 @@ install-exec-local: - @ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar +--- Makefile.in.orig Wed Feb 3 14:49:10 2016 ++++ Makefile.in Wed Mar 9 18:51:31 2016 +@@ -901,14 +901,14 @@ install-exec-local: ${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_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/ - ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) - ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) - ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir) @@ -13,10 +13,27 @@ javaws/itweb-settings/policyeditor are s + ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir) + ${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir) + # all generated manpages are installed in swarm install-data-local: - ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 -@@ -1075,14 +1075,15 @@ stamps/netx.stamp: netx-source-files.txt stamps/bootst - $(NETX_CLASSPATH_ARG) \ + ${mkinstalldirs} -d $(DESTDIR)$(mandir) +- cp -r "$(DOCS_DIR)/man/"* $(DESTDIR)$(mandir)/ ++ cp -r "$(DOCS_DIR)/man/"man1 $(DESTDIR)$(mandir)/ + @ENABLE_DOCS_TRUE@ ${mkinstalldirs} $(DESTDIR)$(htmldir) + @ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \ + @ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \ +@@ -1160,8 +1160,8 @@ stamps/generate-docs.stamp: stamps/netx.stamp + echo "<html><head><title>$(PLUGIN_VERSION)</title></head>" > "$$HTML_DOCS_INDEX" ; \ + echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \ + for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \ +- ID=`echo "$$LANG_ID" | head -c 2` ; \ +- ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \ ++ ID=`echo "$$LANG_ID" | cut -c -2` ; \ ++ ENCOD=`echo "$$LANG_ID" | cut -c 7-` ; \ + export LANG=$$LANG_ID; \ + mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \ + echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \ +@@ -1201,14 +1201,15 @@ stamps/netx.stamp: netx-source-files.txt stamps/netx-h + $(call composeclasspath, $(TAGSOUP_JAR) $(RHINO_JAR)) \ @netx-source-files.txt (cd $(NETX_RESOURCE_DIR); \ + install -d $(NETX_DIR)/net/sourceforge/jnlp/resources/ ; \ Index: patches/patch-launcher_launchers_in =================================================================== RCS file: /cvs/ports/www/icedtea-web/patches/patch-launcher_launchers_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-launcher_launchers_in --- patches/patch-launcher_launchers_in 24 Mar 2015 20:29:10 -0000 1.1 +++ patches/patch-launcher_launchers_in 9 Mar 2016 18:22:35 -0000 @@ -2,11 +2,11 @@ $OpenBSD: patch-launcher_launchers_in,v 2nd chunk needed for: Error: could not find libjava.so Error: Could not find Java SE Runtime Environment. ---- launcher/launchers.in.orig Wed Nov 26 17:39:23 2014 -+++ launcher/launchers.in Tue Mar 24 21:15:51 2015 +--- launcher/launchers.in.orig Wed Feb 3 14:47:43 2016 ++++ launcher/launchers.in Wed Mar 9 17:35:04 2016 @@ -1,4 +1,4 @@ -#!/bin/bash -+#!${TRUEPREFIX}/bin/bash ++#!/usr/local/bin/bash JAVA=@JAVA@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ Index: patches/patch-plugin_icedteanp_IcedTeaNPPlugin_cc =================================================================== RCS file: /cvs/ports/www/icedtea-web/patches/patch-plugin_icedteanp_IcedTeaNPPlugin_cc,v retrieving revision 1.3 diff -u -p -r1.3 patch-plugin_icedteanp_IcedTeaNPPlugin_cc --- patches/patch-plugin_icedteanp_IcedTeaNPPlugin_cc 24 Mar 2015 20:29:10 -0000 1.3 +++ patches/patch-plugin_icedteanp_IcedTeaNPPlugin_cc 9 Mar 2016 18:22:35 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-plugin_icedteanp_IcedTeaNPPlugin_cc,v 1.3 2015/03/24 20:29:10 landry Exp $ ---- plugin/icedteanp/IcedTeaNPPlugin.cc.orig Thu Mar 19 22:35:56 2015 -+++ plugin/icedteanp/IcedTeaNPPlugin.cc Thu Mar 19 22:36:20 2015 -@@ -1434,7 +1434,7 @@ plugin_test_appletviewer () +--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig Wed Feb 3 14:47:43 2016 ++++ plugin/icedteanp/IcedTeaNPPlugin.cc Wed Mar 9 16:49:02 2016 +@@ -1455,7 +1455,7 @@ plugin_test_appletviewer () command_line[1] = g_strdup("-version"); command_line[2] = NULL; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/icedtea-web/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 24 Mar 2015 20:29:10 -0000 1.3 +++ pkg/PLIST 9 Mar 2016 18:22:35 -0000 @@ -1,14 +1,24 @@ -@comment $OpenBSD: PLIST,v 1.3 2015/03/24 20:29:10 landry Exp $ +@comment $OpenBSD$ bin/itweb-settings bin/javaws bin/policyeditor lib/mozilla/ lib/mozilla/plugins/ lib/mozilla/plugins/IcedTeaPlugin.so +@man man/man1/icedtea-web-plugin.1 +@man man/man1/icedtea-web.1 @man man/man1/itweb-settings.1 @man man/man1/javaws.1 @man man/man1/policyeditor.1 +share/applications/ +share/applications/itweb-settings.desktop +share/applications/javaws.desktop +share/applications/policyeditor.desktop share/icedtea-web/ share/icedtea-web/javaws_splash.png share/icedtea-web/netx.jar share/icedtea-web/plugin.jar +share/pixmaps/ +share/pixmaps/javaws.png +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database
tagsoup.tar.gz
Description: application/tar-gz
