Attachment #237630 for bug #259466




PORTNAME=	icedtea-web
PORTVERSION=	1.8.8
DISTVERSIONPREFIX=	icedtea-web-
PORTREVISION=	22
CATEGORIES=	java www
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	java@FreeBSD.org
COMMENT=	Free Java plug-in and Java Web Start for OpenJDK

		${JUNIT_JAR}:java/junit
RUN_DEPENDS=	bash:shells/bash

MAKE_JOBS_UNSAFE=yes

GNU_CONFIGURE=	yes
USES=		autoreconf compiler:c++11-lang desktop-file-utils gmake \
		pkgconfig shebangfix xorg
USE_JAVA=	yes
JAVA_VERSION=	8
JAVA_OS=	native
JAVA_VENDOR=	openjdk
USE_PERL5=	build
USE_XORG=	x11
USES=		autoreconf compiler:c++11-lang desktop-file-utils gmake perl5 \
		pkgconfig shebangfix xorg
USE_GITHUB=	yes
GH_ACCOUNT=	AdoptOpenJDK
GH_PROJECT=	IcedTea-Web

# Upstream archive contains files with UTF-8 names
EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar

OPTIONS_DEFINE=	DOCS PLUGIN PLUGINJAR RHINO RUST TAGSOUP
OPTIONS_DEFAULT=PLUGINJAR RUST
OPTIONS_SUB=	yes

PLUGIN_DESC=	Enable the browser plug-in
PLUGINJAR_DESC=	Enable plugin.jar for itweb-javaws -html
RHINO_DESC=	Add support for Proxy Auto Config files
RUST_DESC=	Build modern launchers written in Rust
TAGSOUP_DESC=	Enable cleaning up of malformed JNLP files

TAGSOUP_VARS=		TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
TAGSOUP_VARS_OFF=	TAGSOUP_JAR=no

PLUGIN_CONFIGURE_ENABLE=native-plugin
PLUGIN_CONFIGURE_ENV=	MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \
			MOZILLA_LIBS=" " # needs to be set and non-empty!
PLUGIN_DISTFILES=	libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi
PLUGIN_MASTER_SITES=	LOCAL/tobik:npapi
PLUGIN_PORTDOCS=	plugin
PLUGIN_TEST_TARGET=	plugin-tests
PLUGIN_USE=		GNOME=glib20
PLUGIN_USES=		webplugin:native gnome
PLUGIN_VARS=		WEBPLUGIN_DIR=${PREFIX}/lib \
			WEBPLUGIN_FILES=IcedTeaPlugin.so
PLUGIN_IMPLIES=	PLUGINJAR

PLUGINJAR_CONFIGURE_ENABLE=	pluginjar
PLUGINJAR_PORTDOCS=		plugin

HAMCREST_JAR=	${JAVALIBDIR}/hamcrest.jar
JUNIT_JAR=	${JAVALIBDIR}/junit.jar

.include <bsd.port.pre.mk>

.if ${JAVA_PORT_VERSION:M*6*}
pre-extract:
	@${ECHO_MSG}
	@${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option"
	@${ECHO_MSG} "for ${JAVA_PORT} (default).  Otherwise, it will neither build nor work."
	@${ECHO_MSG}
.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
	@sleep 5
.  endif
.endif

post-patch:
	${REINPLACE_CMD} -e 's|^sed\([[:space:]]\)|gsed\1|' \
	    -e 's|\([[:space:]]\)sed\([[:space:]]\)|\1gsed\2|g' \

Lines 1-5 Link Here

(-)b/java/icedtea-web/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1529752635	1	TIMESTAMP = 1639151286
2	SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = a0c12cd2d7793f05428a02e49159c7f3f70694f48e23787ffdb6588b0db7c862	2	SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = f4203a605a3c9c50acdcc6eef4a366b9fdd36d95edcd76bcbfede01107cb5fe6
3	SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = 2358591	3	SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = 2365638
4	SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8	4	SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8
5	SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637	5	SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637




--- Makefile.am.orig	2021-05-17 09:24:37 UTC
+++ Makefile.am
@@ -336,9 +336,9 @@ export EXPORTED_PACK200=$(SYSTEM_JDK_DIR)/bin/pack200
 #end of exported autoconf copies
 
 # binary names

 
 if WINDOWS_OR_INCLUDE_BATS
 # convert Unix newlines (LF) to DOS format:
@@ -398,7 +398,7 @@ if ENABLE_PLUGINJAR
 endif
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)

 	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
 	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
 if ENABLE_NATIVE_LAUNCHERS
@@ -407,9 +407,9 @@ if ENABLE_NATIVE_LAUNCHERS
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
 endif
 if ENABLE_SHELL_LAUNCHERS

 if WINDOWS_OR_INCLUDE_BATS
 	${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
@@ -431,13 +431,15 @@ if ENABLE_DOCS
 	(cd ${TOP_BUILD_DIR}/docs/netx; \
 	 for files in $$(find . -type f); \
 	 do \

 	 done)
 endif
 endif
@@ -571,7 +573,7 @@ remove-empty-linux-only-dirs:
 # all generated manpages must be removed one by one
 # shell (only shell!) launchers must go away
 uninstall-linux-only:

 	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
 	for file in $$KNOWN_MANS ; do \
 	  for dir in $$KNOWN_DIRS ; do \
@@ -901,7 +903,7 @@ stamps/generate-docs.stamp: stamps/netx.stamp
 	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` ; \

 	  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" ; \
@@ -943,7 +945,8 @@ stamps/netx.stamp: netx-source-files.txt stamps/netx-h
 	(cd $(NETX_RESOURCE_DIR); \
 	 for files in $$(find . -type f); \
 	 do \

 	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
 	 done)
 	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
@@ -973,9 +976,9 @@ clean-netx:
 	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
 
 clean-desktop-files:

 
 
 # launcher run args:
@@ -1156,7 +1159,7 @@ endif
 	fi
 
 javaws.desktop: javaws.desktop.in

 
 itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
 	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \
@@ -1164,7 +1167,7 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.deskt
 
 policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
 	sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \

 
 # documentation
 
@@ -1304,7 +1307,7 @@ stamps/netx-dist-tests-prepare-reproducers.stamp: stam
 	      notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
 	      $(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar\$(CLASSPATH_SEPARATOR)$(TOP_BUILD_DIR)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
 	      if [ -n "$$notSrcFiles" ] ; then \

 	      fi ; \
 	      cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
 	      if [ -f $(META_MANIFEST) ]; \
@@ -1372,7 +1375,7 @@ stamps/change-dots-to-paths.stamp: stamps/netx-dist-te
 	      path="`dirname $$slashed_dir`" ; \
 	      file="`basename $$slashed_dir`.jar" ; \
 	      echo "copying $$dir.jar to $$path as $$file" ; \

 	      cp $$dir".jar" "$$path"/"$$file" ; \
 	    fi ; \
 	  done ; \
@@ -1518,7 +1521,7 @@ $(REPRODUCERS_CLASS_NAMES):
 	whiteListed=$(RUN_WHITELIST_FILTER); \
 	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
 	class_names= ; \

 	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
 	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
 	  INCLUDE="NO" ; \
@@ -1707,7 +1710,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
 $(UNIT_CLASS_NAMES):
 	cd $(NETX_UNIT_TEST_DIR) ; \
 	class_names= ; \

 	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
 	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
 	  class_names="$$class_names $$class_name" ; \
@@ -1718,10 +1721,7 @@ stamps/run-netx-unit-tests.stamp: stamps/netx-unit-tes
  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
 	filename=" " ; \
 	cd $(NETX_UNIT_TEST_SRCDIR) ; \

 	cd $(NETX_UNIT_TEST_DIR) ; \
 	class_names=`cat $(UNIT_CLASS_NAMES)` ; \
 	CLASSPATH="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(MSLINKS_JAR) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \
@@ -2045,9 +2045,7 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/
 	 $(PLUGIN_TEST_SRCS) ;
 	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
 	  plugin/tests/LiveConnect/*.class ;

Lines 1-6 Link Here

(-)b/java/icedtea-web/files/patch-completion_javaws.bash.in (-3 / +3 lines)
1	--- completion/javaws.bash.in.orig 2020-06-04 13:08:14.000000000 +0200	1	--- completion/javaws.bash.in.orig 2021-05-17 09:24:37 UTC
2	+++ completion/javaws.bash.in 2020-07-31 20:16:56.895261000 +0200	2	+++ completion/javaws.bash.in
3	@@ -28,4 +28,4 @@	3	@@ -28,4 +28,4 @@ _javaws()
4	return 0	4	return 0
5	fi	5	fi
6	}	6	}

Lines 1-6 Link Here

(-)b/java/icedtea-web/files/patch-completion_policyeditor.bash.in (-3 / +3 lines)
1	--- completion/policyeditor.bash.in.orig 2020-06-04 13:08:14.000000000 +0200	1	--- completion/policyeditor.bash.in.orig 2021-05-17 09:24:37 UTC
2	+++ completion/policyeditor.bash.in 2020-07-31 20:02:45.694743000 +0200	2	+++ completion/policyeditor.bash.in
3	@@ -10,4 +10,4 @@	3	@@ -10,4 +10,4 @@ _policyeditor()
4	COMPREPLY=($(compgen -W "${opts}" -- ${cur}))	4	COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
5	return 0	5	return 0
6	}	6	}

Removed Link Here

(-)a/java/icedtea-web/files/patch-configure.ac (-11 lines)
1	--- configure.ac.orig 2019-08-02 14:08:17.000000000 +0200
2	+++ configure.ac 2020-01-14 16:32:04.000000000 +0100
3	@@ -71,7 +71,7 @@
4	build_linux=no
5	build_windows=no
6	case "${host_os}" in
7	- linux*)
8	+ freebsd*)
9	build_linux=yes
10	;;
11	cygwin*)

Lines 1-4 Link Here

(-)b/java/icedtea-web/files/patch-html-gen.sh (-2 / +2 lines)
1	--- html-gen.sh.orig 2016-02-03 13:47:43 UTC	1	--- html-gen.sh.orig 2021-05-17 09:24:37 UTC
2	+++ html-gen.sh	2	+++ html-gen.sh
3	@@ -74,7 +74,7 @@ else	3	@@ -74,7 +74,7 @@ else
4	unset REPO_URL	4	unset REPO_URL
Lines 9-15 Link Here
9		9
10	if [ ! -e html-gen ]; then	10	if [ ! -e html-gen ]; then
11	echo "No html-gen directory, exiting. See Makefile.am for usage"	11	echo "No html-gen directory, exiting. See Makefile.am for usage"
12	@@ -168,7 +168,7 @@ done	12	@@ -170,7 +170,7 @@ done
13		13
14	sed -i -r 's\|(\\ .):\|<u>\1</u>:\|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:"	14	sed -i -r 's\|(\\ .):\|<u>\1</u>:\|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:"
15		15

Lines 1-6 Link Here

(-)b/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java (-4 / +4 lines)
1	--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2019-05-21 12:20:44.000000000 +0200	1	--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2021-05-17 09:24:37 UTC
2	+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java 2019-06-19 14:33:09.000000000 +0200	2	+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java
3	@@ -86,7 +86,7 @@	3	@@ -86,7 +86,7 @@ import net.sourceforge.jnlp.security.dialogresults.Acc
4		4
5	public class XDesktopEntry implements GenericDesktopEntry {	5	public class XDesktopEntry implements GenericDesktopEntry {
6		6
Lines 9-15 Link Here
9		9
10	private JNLPFile file = null;	10	private JNLPFile file = null;
11	private int iconSize = -1;	11	private int iconSize = -1;
12	@@ -219,12 +219,12 @@	12	@@ -219,12 +219,12 @@ public class XDesktopEntry implements GenericDesktopEn
13	if (exec != null) {	13	if (exec != null) {
14	return exec;	14	return exec;
15	}	15	}

Lines 1-6 Link Here

(-)b/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc (-3 / +3 lines)
1	--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2019-08-02 14:08:17.000000000 +0200	1	--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2021-05-17 09:24:37 UTC
2	+++ plugin/icedteanp/IcedTeaNPPlugin.cc 2020-03-22 00:41:29.958009000 +0100	2	+++ plugin/icedteanp/IcedTeaNPPlugin.cc
3	@@ -1627,9 +1627,9 @@	3	@@ -1627,9 +1627,9 @@ plugin_start_appletviewer (ITNPPluginData* data)
4	command_line.push_back("-classpath");	4	command_line.push_back("-classpath");
5	command_line.push_back(get_plugin_jfx_jar());	5	command_line.push_back(get_plugin_jfx_jar());
6	command_line.push_back("--patch-module");	6	command_line.push_back("--patch-module");

Lines 1-5 Link Here

(-)b/java/icedtea-web/files/patch-rust-launcher_Cargo.toml (-2 / +2 lines)
1	--- rust-launcher/Cargo.toml.orig 2020-06-04 13:08:14.000000000 +0200	1	--- rust-launcher/Cargo.toml.orig 2021-05-17 09:24:37 UTC
2	+++ rust-launcher/Cargo.toml 2020-06-15 09:34:55.000000000 +0200	2	+++ rust-launcher/Cargo.toml
3	@@ -2,7 +2,3 @@	3	@@ -2,7 +2,3 @@
4	name = "launcher"	4	name = "launcher"
5	version = "1.8.0"	5	version = "1.8.0"

Lines 34-39 share/applications/itweb-policyeditor.desktop Link Here

(-)b/java/icedtea-web/pkg-plist (-2 / +2 lines)
34	share/applications/itweb-settings.desktop	34	share/applications/itweb-settings.desktop
35	%%DATADIR%%/javaws.jar	35	%%DATADIR%%/javaws.jar
36	%%DATADIR%%/javaws_splash.png	36	%%DATADIR%%/javaws_splash.png
37	%%PLUGIN%%%%DATADIR%%/jsobject.jar	37	%%PLUGINJAR%%%%DATADIR%%/jsobject.jar
38	%%PLUGIN%%%%DATADIR%%/plugin.jar	38	%%PLUGINJAR%%%%DATADIR%%/plugin.jar
39	share/pixmaps/itweb-javaws.png	39	share/pixmaps/itweb-javaws.png

Return to bug 259466

Lines 1-9 Link Here

(-)b/java/icedtea-web/Makefile (-23 / +11 lines)
1	PORTNAME= icedtea-web	1	PORTNAME= icedtea-web
2	PORTVERSION= 1.8.4	2	PORTVERSION= 1.8.8
3	DISTVERSIONPREFIX= icedtea-web-	3	DISTVERSIONPREFIX= icedtea-web-
4	PORTREVISION= 22
5	CATEGORIES= java www	4	CATEGORIES= java www
6	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
7		5
8	MAINTAINER= java@FreeBSD.org	6	MAINTAINER= java@FreeBSD.org
9	COMMENT= Free Java plug-in and Java Web Start for OpenJDK	7	COMMENT= Free Java plug-in and Java Web Start for OpenJDK
Lines 18-34 BUILD_DEPENDS= zip:archivers/zip \ Link Here
18	${JUNIT_JAR}:java/junit	16	${JUNIT_JAR}:java/junit
19	RUN_DEPENDS= bash:shells/bash	17	RUN_DEPENDS= bash:shells/bash
20		18
21	MAKE_JOBS_UNSAFE=yes
22
23	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	USES= autoreconf compiler:c++11-lang desktop-file-utils gmake \
		21	pkgconfig shebangfix xorg
24	USE_JAVA= yes	22	USE_JAVA= yes
25	JAVA_VERSION= 8	23	JAVA_VERSION= 8
26	JAVA_OS= native	24	JAVA_OS= native
27	JAVA_VENDOR= openjdk	25	JAVA_VENDOR= openjdk
28	USE_PERL5= build
29	USE_XORG= x11	26	USE_XORG= x11
30	USES= autoreconf compiler:c++11-lang desktop-file-utils gmake perl5 \
31	pkgconfig shebangfix xorg
32	USE_GITHUB= yes	27	USE_GITHUB= yes
33	GH_ACCOUNT= AdoptOpenJDK	28	GH_ACCOUNT= AdoptOpenJDK
34	GH_PROJECT= IcedTea-Web	29	GH_PROJECT= IcedTea-Web
Lines 53-63 TEST_TARGET= check Link Here
53	# Upstream archive contains files with UTF-8 names	48	# Upstream archive contains files with UTF-8 names
54	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar	49	EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
55		50
56	OPTIONS_DEFINE= DOCS PLUGIN RHINO RUST TAGSOUP	51	OPTIONS_DEFINE= DOCS PLUGIN PLUGINJAR RHINO RUST TAGSOUP
57	OPTIONS_DEFAULT=PLUGIN RUST	52	OPTIONS_DEFAULT=PLUGINJAR RUST
58	OPTIONS_SUB= yes	53	OPTIONS_SUB= yes
59		54
60	PLUGIN_DESC= Enable the browser plug-in	55	PLUGIN_DESC= Enable the browser plug-in
		56	PLUGINJAR_DESC= Enable plugin.jar for itweb-javaws -html
61	RHINO_DESC= Add support for Proxy Auto Config files	57	RHINO_DESC= Add support for Proxy Auto Config files
62	RUST_DESC= Build modern launchers written in Rust	58	RUST_DESC= Build modern launchers written in Rust
63	TAGSOUP_DESC= Enable cleaning up of malformed JNLP files	59	TAGSOUP_DESC= Enable cleaning up of malformed JNLP files
Lines 77-110 TAGSOUP_RUN_DEPENDS= ${TAGSOUP_BUILD_DEPENDS} Link Here
77	TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"	73	TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
78	TAGSOUP_VARS_OFF= TAGSOUP_JAR=no	74	TAGSOUP_VARS_OFF= TAGSOUP_JAR=no
79		75
80	PLUGIN_CONFIGURE_ENABLE=native-plugin pluginjar	76	PLUGIN_CONFIGURE_ENABLE=native-plugin
81	PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \	77	PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \
82	MOZILLA_LIBS=" " # needs to be set and non-empty!	78	MOZILLA_LIBS=" " # needs to be set and non-empty!
83	PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi	79	PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi
84	PLUGIN_MASTER_SITES= LOCAL/tobik:npapi	80	PLUGIN_MASTER_SITES= LOCAL/tobik:npapi
85	PLUGIN_PORTDOCS= plugin
86	PLUGIN_TEST_TARGET= plugin-tests	81	PLUGIN_TEST_TARGET= plugin-tests
87	PLUGIN_USE= GNOME=glib20	82	PLUGIN_USE= GNOME=glib20
88	PLUGIN_USES= webplugin:native gnome	83	PLUGIN_USES= webplugin:native gnome
89	PLUGIN_VARS= WEBPLUGIN_DIR=${PREFIX}/lib \	84	PLUGIN_VARS= WEBPLUGIN_DIR=${PREFIX}/lib \
90	WEBPLUGIN_FILES=IcedTeaPlugin.so	85	WEBPLUGIN_FILES=IcedTeaPlugin.so
		86	PLUGIN_IMPLIES= PLUGINJAR
		87
		88	PLUGINJAR_CONFIGURE_ENABLE= pluginjar
		89	PLUGINJAR_PORTDOCS= plugin
91		90
92	HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar	91	HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar
93	JUNIT_JAR= ${JAVALIBDIR}/junit.jar	92	JUNIT_JAR= ${JAVALIBDIR}/junit.jar
94		93
95	.include <bsd.port.pre.mk>	94	.include <bsd.port.pre.mk>
96		95
97	.if ${JAVA_PORT_VERSION:M6}
98	pre-extract:
99	@${ECHO_MSG}
100	@${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option"
101	@${ECHO_MSG} "for ${JAVA_PORT} (default). Otherwise, it will neither build nor work."
102	@${ECHO_MSG}
103	. if !(defined(PACKAGE_BUILDING) \|\| defined(BATCH))
104	@sleep 5
105	. endif
106	.endif
107
108	post-patch:	96	post-patch:
109	${REINPLACE_CMD} -e 's\|^sed\([[:space:]]\)\|gsed\1\|' \	97	${REINPLACE_CMD} -e 's\|^sed\([[:space:]]\)\|gsed\1\|' \
110	-e 's\|\([[:space:]]\)sed\([[:space:]]\)\|\1gsed\2\|g' \	98	-e 's\|\([[:space:]]\)sed\([[:space:]]\)\|\1gsed\2\|g' \

Lines 1-6 Link Here

(-)b/java/icedtea-web/files/patch-Makefile.am (-18 / +18 lines)
1	--- Makefile.am.orig 2019-08-02 14:08:17.000000000 +0200	1	--- Makefile.am.orig 2021-05-17 09:24:37 UTC
2	+++ Makefile.am 2020-01-14 17:43:47.000000000 +0100	2	+++ Makefile.am
3	@@ -331,9 +331,9 @@	3	@@ -336,9 +336,9 @@ export EXPORTED_PACK200=$(SYSTEM_JDK_DIR)/bin/pack200
4	#end of exported autoconf copies	4	#end of exported autoconf copies
5		5
6	# binary names	6	# binary names
Lines 12-18 Link Here
12		12
13	if WINDOWS_OR_INCLUDE_BATS	13	if WINDOWS_OR_INCLUDE_BATS
14	# convert Unix newlines (LF) to DOS format:	14	# convert Unix newlines (LF) to DOS format:
15	@@ -393,7 +393,7 @@	15	@@ -398,7 +398,7 @@ if ENABLE_PLUGINJAR
16	endif	16	endif
17	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)	17	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
18	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)	18	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
Lines 21-27 Link Here
21	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)	21	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
22	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)	22	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
23	if ENABLE_NATIVE_LAUNCHERS	23	if ENABLE_NATIVE_LAUNCHERS
24	@@ -402,9 +402,9 @@	24	@@ -407,9 +407,9 @@ if ENABLE_NATIVE_LAUNCHERS
25	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)	25	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
26	endif	26	endif
27	if ENABLE_SHELL_LAUNCHERS	27	if ENABLE_SHELL_LAUNCHERS
Lines 34-40 Link Here
34	if WINDOWS_OR_INCLUDE_BATS	34	if WINDOWS_OR_INCLUDE_BATS
35	${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)	35	${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)
36	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)	36	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
37	@@ -426,13 +426,15 @@	37	@@ -431,13 +431,15 @@ if ENABLE_DOCS
38	(cd ${TOP_BUILD_DIR}/docs/netx; \	38	(cd ${TOP_BUILD_DIR}/docs/netx; \
39	for files in $$(find . -type f); \	39	for files in $$(find . -type f); \
40	do \	40	do \
Lines 52-58 Link Here
52	done)	52	done)
53	endif	53	endif
54	endif	54	endif
55	@@ -544,7 +546,7 @@	55	@@ -571,7 +573,7 @@ remove-empty-linux-only-dirs:
56	# all generated manpages must be removed one by one	56	# all generated manpages must be removed one by one
57	# shell (only shell!) launchers must go away	57	# shell (only shell!) launchers must go away
58	uninstall-linux-only:	58	uninstall-linux-only:
Lines 61-67 Link Here
61	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \	61	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
62	for file in $$KNOWN_MANS ; do \	62	for file in $$KNOWN_MANS ; do \
63	for dir in $$KNOWN_DIRS ; do \	63	for dir in $$KNOWN_DIRS ; do \
64	@@ -868,7 +870,7 @@	64	@@ -901,7 +903,7 @@ stamps/generate-docs.stamp: stamps/netx.stamp
65	echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \	65	echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
66	for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \	66	for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
67	ID=`echo "$$LANG_ID" \| head -c 2` ; \	67	ID=`echo "$$LANG_ID" \| head -c 2` ; \
Lines 70-76 Link Here
70	export LANG=$$LANG_ID; \	70	export LANG=$$LANG_ID; \
71	mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \	71	mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
72	echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \	72	echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
73	@@ -910,7 +912,8 @@	73	@@ -943,7 +945,8 @@ stamps/netx.stamp: netx-source-files.txt stamps/netx-h
74	(cd $(NETX_RESOURCE_DIR); \	74	(cd $(NETX_RESOURCE_DIR); \
75	for files in $$(find . -type f); \	75	for files in $$(find . -type f); \
76	do \	76	do \
Lines 80-86 Link Here
80	$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \	80	$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
81	done)	81	done)
82	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \	82	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
83	@@ -940,9 +943,9 @@	83	@@ -973,9 +976,9 @@ clean-netx:
84	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html	84	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
85		85
86	clean-desktop-files:	86	clean-desktop-files:
Lines 92-98 Link Here
92		92
93		93
94	# launcher run args:	94	# launcher run args:
95	@@ -1123,7 +1126,7 @@	95	@@ -1156,7 +1159,7 @@ endif
96	fi	96	fi
97		97
98	javaws.desktop: javaws.desktop.in	98	javaws.desktop: javaws.desktop.in
Lines 101-107 Link Here
101		101
102	itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in	102	itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
103	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \	103	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \
104	@@ -1131,7 +1134,7 @@	104	@@ -1164,7 +1167,7 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.deskt
105		105
106	policyeditor.desktop: $(srcdir)/policyeditor.desktop.in	106	policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
107	sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \	107	sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \
Lines 110-116 Link Here
110		110
111	# documentation	111	# documentation
112		112
113	@@ -1271,7 +1274,7 @@	113	@@ -1304,7 +1307,7 @@ stamps/netx-dist-tests-prepare-reproducers.stamp: stam
114	notSrcFiles=`find . -mindepth 1 -type f \! -name ".java" \| sed "s/.\///"` ; \	114	notSrcFiles=`find . -mindepth 1 -type f \! -name ".java" \| sed "s/.\///"` ; \
115	$(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar\$(CLASSPATH_SEPARATOR)$(TOP_BUILD_DIR)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \	115	$(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar\$(CLASSPATH_SEPARATOR)$(TOP_BUILD_DIR)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
116	if [ -n "$$notSrcFiles" ] ; then \	116	if [ -n "$$notSrcFiles" ] ; then \
Lines 119-125 Link Here
119	fi ; \	119	fi ; \
120	cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \	120	cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
121	if [ -f $(META_MANIFEST) ]; \	121	if [ -f $(META_MANIFEST) ]; \
122	@@ -1339,7 +1342,7 @@	122	@@ -1372,7 +1375,7 @@ stamps/change-dots-to-paths.stamp: stamps/netx-dist-te
123	path="`dirname $$slashed_dir`" ; \	123	path="`dirname $$slashed_dir`" ; \
124	file="`basename $$slashed_dir`.jar" ; \	124	file="`basename $$slashed_dir`.jar" ; \
125	echo "copying $$dir.jar to $$path as $$file" ; \	125	echo "copying $$dir.jar to $$path as $$file" ; \
Lines 128-134 Link Here
128	cp $$dir".jar" "$$path"/"$$file" ; \	128	cp $$dir".jar" "$$path"/"$$file" ; \
129	fi ; \	129	fi ; \
130	done ; \	130	done ; \
131	@@ -1485,7 +1488,7 @@	131	@@ -1518,7 +1521,7 @@ $(REPRODUCERS_CLASS_NAMES):
132	whiteListed=$(RUN_WHITELIST_FILTER); \	132	whiteListed=$(RUN_WHITELIST_FILTER); \
133	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \	133	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
134	class_names= ; \	134	class_names= ; \
Lines 137-143 Link Here
137	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \	137	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \
138	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \	138	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \
139	INCLUDE="NO" ; \	139	INCLUDE="NO" ; \
140	@@ -1674,7 +1677,7 @@	140	@@ -1707,7 +1710,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
141	$(UNIT_CLASS_NAMES):	141	$(UNIT_CLASS_NAMES):
142	cd $(NETX_UNIT_TEST_DIR) ; \	142	cd $(NETX_UNIT_TEST_DIR) ; \
143	class_names= ; \	143	class_names= ; \
Lines 146-152 Link Here
146	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \	146	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \
147	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \	147	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \
148	class_names="$$class_names $$class_name" ; \	148	class_names="$$class_names $$class_name" ; \
149	@@ -1685,10 +1688,7 @@	149	@@ -1718,10 +1721,7 @@ stamps/run-netx-unit-tests.stamp: stamps/netx-unit-tes
150	$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)	150	$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
151	filename=" " ; \	151	filename=" " ; \
152	cd $(NETX_UNIT_TEST_SRCDIR) ; \	152	cd $(NETX_UNIT_TEST_SRCDIR) ; \
Lines 158-164 Link Here
158	cd $(NETX_UNIT_TEST_DIR) ; \	158	cd $(NETX_UNIT_TEST_DIR) ; \
159	class_names=`cat $(UNIT_CLASS_NAMES)` ; \	159	class_names=`cat $(UNIT_CLASS_NAMES)` ; \
160	CLASSPATH="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(MSLINKS_JAR) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \	160	CLASSPATH="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(MSLINKS_JAR) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \
161	@@ -2012,9 +2012,7 @@	161	@@ -2045,9 +2045,7 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/
162	$(PLUGIN_TEST_SRCS) ;	162	$(PLUGIN_TEST_SRCS) ;
163	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \	163	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
164	plugin/tests/LiveConnect/*.class ;	164	plugin/tests/LiveConnect/*.class ;