cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to icedtea-web 1.6.2.

Browse Source 
Jirib submitted a similar diff a while ago
Drop maintainership as i never really used this, and java on the web is dead.
This commit is contained in:
landry 2016-05-15 13:20:43 +00:00
parent 3dab59cb09
commit a5c3921dcf
6 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/icedtea-web/Makefile
View File

@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2016/03/18 23:12:20 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2016/05/15 13:20:43 landry Exp $
COMMENT = Java web browser plugin
DISTNAME = icedtea-web-1.5.2
REVISION = 0
DISTNAME = icedtea-web-1.6.2
CATEGORIES = www
MAINTAINER = Landry Breuil <landry@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@ -37,4 +34,8 @@ WANTLIB += glib-2.0 m stdc++
post-patch:
${SUBST_CMD} ${WRKSRC}/launcher/launchers.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/*.desktop ${PREFIX}/share/applications/
.include <bsd.port.mk>

4
www/icedtea-web/distinfo
View File

@ -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

29
www/icedtea-web/patches/patch-Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.8 2015/07/17 21:46:11 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.9 2016/05/15 13:20:43 landry 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 Sun May 15 14:39:50 2016
@@ -901,9 +901,9 @@ 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,23 @@ javaws/itweb-settings/policyeditor are scripts not programs..
+ ${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) \
@@ -1159,9 +1159,9 @@ stamps/generate-docs.stamp: stamps/netx.stamp
LANG_BACKUP=$$LANG ; \
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 -` ; \
+ for LANG_ID in en_US.UTF-8 ; do \
+ ID=en ; \
+ ENCOD=UTF-8 ; \
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/ ; \

6
www/icedtea-web/patches/patch-launcher_launchers_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-launcher_launchers_in,v 1.1 2015/03/24 20:29:10 landry Exp $
$OpenBSD: patch-launcher_launchers_in,v 1.2 2016/05/15 13:20:43 landry Exp $
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

8
www/icedtea-web/patches/patch-plugin_icedteanp_IcedTeaNPPlugin_cc
View File

@ -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 ()
$OpenBSD: patch-plugin_icedteanp_IcedTeaNPPlugin_cc,v 1.4 2016/05/15 13:20:43 landry Exp $
--- 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;

12
www/icedtea-web/pkg/PLIST
View File

@ -1,14 +1,24 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/24 20:29:10 landry Exp $
@comment $OpenBSD: PLIST,v 1.4 2016/05/15 13:20:43 landry Exp $
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