Attachment #212611 for bug #244976




# $FreeBSD$

PORTNAME=	icedtea-web
PORTVERSION=	1.8.3
PORTREVISION=	5
CATEGORIES=	java www
MASTER_SITES=	https://github.com/AdoptOpenJDK/IcedTea-Web/archive/
		http://icedtea.classpath.org/download/source/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
WRKSRC=		${WRKDIR}/IcedTea-Web-icedtea-web-1.8.3

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


BUILD_DEPENDS=	zip:archivers/zip \
		bash:shells/bash \
		gsed:textproc/gsed \
		${HAMCREST_JAR}:java/hamcrest \
		${JUNIT_JAR}:java/junit
RUN_DEPENDS=	bash:shells/bash
TEST_DEPENDS=	${HAMCREST_JAR}:java/hamcrest \
		${JUNIT_JAR}:java/junit

GNU_CONFIGURE=	yes
USE_JAVA=	yes

JAVA_VENDOR=	openjdk
USE_PERL5=	build
USE_XORG=	x11
USES=		autoreconf desktop-file-utils gmake perl5 pkgconfig shebangfix xorg
SHEBANG_FILES=	jrunscript.in shell-launcher/launchers.sh.in

CONFIGURE_ARGS=		--with-hamcrest="${HAMCREST_JAR}"
CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"

CONFIGURE_ARGS+=	--with-junit="${JUNIT_JAR}"
CONFIGURE_ARGS+=	--with-rhino="${RHINO_JAR}"
CONFIGURE_ARGS+=	--with-tagsoup="${TAGSOUP_JAR}"
CONFIGURE_ARGS+=	--with-itw-libs="BUNDLED"
CONFIGURE_ARGS+=	--enable-shell-launchers
.for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera
CONFIGURE_ARGS+=	--without-${opt}
.endfor

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

post-patch:
	${REINPLACE_CMD} -e 's|^sed\([[:space:]]\)|gsed\1|' \
	    -e 's|\([[:space:]]\)sed\([[:space:]]\)|\1gsed\2|g' \
	    ${WRKSRC}/Makefile.am ${WRKSRC}/html-gen.sh
	${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
	    ${WRKSRC}/*.desktop.in


Lines 1-5 Link Here

(-)java/icedtea-web/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1529752635	1	TIMESTAMP = 1529752635
2	SHA256 (icedtea-web-1.6.2.tar.gz) = ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300	2	SHA256 (icedtea-web-1.8.3.tar.gz) = 41b6f09a7b44ad6b85d5086c289557f6f6340baa51be71bc4361aa26a844e7af
3	SIZE (icedtea-web-1.6.2.tar.gz) = 1824557	3	SIZE (icedtea-web-1.8.3.tar.gz) = 2358389
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	2019-08-02 14:08:17.000000000 +0200
+++ Makefile.am	2020-01-14 17:43:47.000000000 +0100
@@ -331,9 +331,9 @@
 #end of exported autoconf copies
 
 # binary names
-javaws:= $(shell echo javaws | sed '@program_transform_name@')
+javaws:= $(shell echo itweb-javaws | sed '@program_transform_name@')
 itweb_settings:= $(shell echo itweb-settings | sed '@program_transform_name@')
-policyeditor:= $(shell echo policyeditor | sed '@program_transform_name@')
+policyeditor:= $(shell echo itweb-policyeditor | sed '@program_transform_name@')
 
 if WINDOWS_OR_INCLUDE_BATS
 # convert Unix newlines (LF) to DOS format:
@@ -393,7 +393,7 @@
 endif
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
-	${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/
+	${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/itweb-javaws.png
 	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
 	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
 if ENABLE_NATIVE_LAUNCHERS
@@ -402,9 +402,9 @@
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
 endif
 if ENABLE_SHELL_LAUNCHERS
-	${INSTALL_PROGRAM} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
-	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
-	${INSTALL_PROGRAM} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
+	${INSTALL_SCRIPT} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
+	${INSTALL_SCRIPT} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
+	${INSTALL_SCRIPT} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
 if WINDOWS_OR_INCLUDE_BATS
 	${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
@@ -426,13 +426,15 @@
 	(cd ${TOP_BUILD_DIR}/docs/netx; \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
+	   mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
+	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
 	 done)
 if ENABLE_PLUGINJAR
 	(cd ${TOP_BUILD_DIR}/docs/plugin; \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
+	   mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
+	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
 	 done)
 endif
 endif
@@ -544,7 +546,7 @@
 # all generated manpages must be removed one by one
 # shell (only shell!) launchers must go away
 uninstall-linux-only:
-	KNOWN_MANS="icedtea-web.1  icedtea-web-plugin.1  itweb-settings.1  javaws.1  policyeditor.1" ; \
+	KNOWN_MANS="icedtea-web.1  icedtea-web-plugin.1  itweb-settings.1  itweb-javaws.1  itweb-policyeditor.1" ; \
 	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
 	for file in $$KNOWN_MANS ; do \
 	  for dir in $$KNOWN_DIRS ; do \
@@ -868,7 +870,7 @@
 	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 -` ; \
+	  ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \
 	  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" ; \
@@ -910,7 +912,8 @@
 	(cd $(NETX_RESOURCE_DIR); \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} \
+	   mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \
+	   ${INSTALL_DATA} $${files} \
 	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
 	 done)
 	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
@@ -940,9 +943,9 @@
 	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
 
 clean-desktop-files:
-	rm -f javaws.desktop
+	rm -f itweb-javaws.desktop
 	rm -f itweb-settings.desktop
-	rm -f policyeditor.desktop
+	rm -f itweb-policyeditor.desktop
 
 
 # launcher run args:
@@ -1123,7 +1126,7 @@
 	fi
 
 javaws.desktop: javaws.desktop.in
-	sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
+	sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
 
 itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
 	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \
@@ -1131,7 +1134,7 @@
 
 policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
 	sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \
-	< $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
+	< $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop
 
 # documentation
 
@@ -1271,7 +1274,7 @@
 	      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 \
-	        cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
+			tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
 	      fi ; \
 	      cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
 	      if [ -f $(META_MANIFEST) ]; \
@@ -1339,7 +1342,7 @@
 	      path="`dirname $$slashed_dir`" ; \
 	      file="`basename $$slashed_dir`.jar" ; \
 	      echo "copying $$dir.jar to $$path as $$file" ; \
-	      mkdir --parents $$path ; \
+	      mkdir -p $$path ; \
 	      cp $$dir".jar" "$$path"/"$$file" ; \
 	    fi ; \
 	  done ; \
@@ -1485,7 +1488,7 @@
 	whiteListed=$(RUN_WHITELIST_FILTER); \
 	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
 	class_names= ; \
-	for test in `find -type f` ; do \
+	for test in `find . -type f` ; do \
 	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
 	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
 	  INCLUDE="NO" ; \
@@ -1674,7 +1677,7 @@
 $(UNIT_CLASS_NAMES):
 	cd $(NETX_UNIT_TEST_DIR) ; \
 	class_names= ; \
-	for test in `find -type f` ; do \
+	for test in `find . -type f` ; do \
 	  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" ; \
@@ -1685,10 +1688,7 @@
  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
 	filename=" " ; \
 	cd $(NETX_UNIT_TEST_SRCDIR) ; \
-	for file in `find . -type f \! -iname "*.java"`; do\
-		filename=`echo $$file `; \
-		cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
-	done ; \
+	tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
 	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))" ; \
@@ -2012,9 +2012,7 @@
 	 $(PLUGIN_TEST_SRCS) ;
 	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
 	  plugin/tests/LiveConnect/*.class ;
-	cp -pPR $(SRC_DIR_LINK) $(TOP_SRC_DIR)/plugin/tests/LiveConnect/*.{js,html} \
-	  plugin/tests/LiveConnect ;
-	echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
+	@echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
 	mkdir -p stamps
 	touch stamps/plugin-tests.stamp
 endif




--- Makefile.in.orig	2016-02-03 13:49:10 UTC
+++ Makefile.in
@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C
 #end of exported autoconf copies
 
 # binary names
-javaws := $(shell echo javaws | sed '@program_transform_name@')
+javaws := $(shell echo itweb-javaws | sed '@program_transform_name@')
 itweb_settings := $(shell echo itweb-settings | sed '@program_transform_name@')
-policyeditor := $(shell echo policyeditor | sed '@program_transform_name@')
+policyeditor := $(shell echo itweb-policyeditor | sed '@program_transform_name@')
 
 # the launcher needs to know $(bindir) and $(datadir) which can be different at
 # make-time from configure-time
@@ -900,10 +900,10 @@ install-exec-local:
 @ENABLE_PLUGIN_TRUE@	${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
 	${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)
+	${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png
+	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
+	${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:
@@ -913,12 +913,14 @@ install-data-local:
 @ENABLE_DOCS_TRUE@	(cd ${abs_top_builddir}/docs/netx; \
 @ENABLE_DOCS_TRUE@	 for files in $$(find . -type f); \
 @ENABLE_DOCS_TRUE@	 do \
-@ENABLE_DOCS_TRUE@	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
+@ENABLE_DOCS_TRUE@	   mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
+@ENABLE_DOCS_TRUE@	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
 @ENABLE_DOCS_TRUE@	 done)
 @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	(cd ${abs_top_builddir}/docs/plugin; \
 @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 for files in $$(find . -type f); \
 @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 do \
-@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	   mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
 @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 done)
 
 # all generated manpages must be removed one by one
@@ -928,7 +930,7 @@ uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
 	rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
 	rm -r $(ICONS_DEST_DIR)/javaws.png
-	KNOWN_MANS="icedtea-web.1  icedtea-web-plugin.1  itweb-settings.1  javaws.1  policyeditor.1" ; \
+	KNOWN_MANS="icedtea-web.1  icedtea-web-plugin.1  itweb-settings.1  itweb-javaws.1  itweb-policyeditor.1" ; \
 	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
 	for file in $$KNOWN_MANS ; do \
 	  for dir in $$KNOWN_DIRS ; do \
@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx.
 	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 -` ; \
+	  ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \
 	  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" ; \
@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt
 	(cd $(NETX_RESOURCE_DIR); \
 	 for files in $$(find . -type f); \
 	 do \
-	   ${INSTALL_DATA} -D $${files} \
+	   mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \
+	   ${INSTALL_DATA} $${files} \
 	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
 	 done)
 	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
@@ -1233,7 +1236,7 @@ clean-netx:
 	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
 
 clean-desktop-files:
-	rm -f javaws.desktop
+	rm -f itweb-javaws.desktop
 	rm -f itweb-settings.desktop
 
 launcher.build/$(javaws): launcher/launchers.in
@@ -1266,7 +1269,7 @@ clean-launchers:
 	fi
 
 javaws.desktop: javaws.desktop.in
-	sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
+	sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
 
 itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
 	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb-
 
 policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
 	sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \
-	< $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
+	< $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop
 
 # documentation
 
@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce
 	      notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
 	      $(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
 	      if [ -n "$$notSrcFiles" ] ; then \
-	        cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
+	        tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
 	      fi ; \
 	      cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
 	      if [ -f $(META_MANIFEST) ]; \
@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp
 	      path="`dirname $$slashed_dir`" ; \
 	      file="`basename $$slashed_dir`.jar" ; \
 	      echo "copying $$dir.jar to $$path as $$file" ; \
-	      mkdir --parents $$path ; \
+	      mkdir -p $$path ; \
 	      cp $$dir".jar" "$$path"/"$$file" ; \
 	    fi ; \
 	  done ; \
@@ -1598,7 +1601,7 @@ $(REPRODUCERS_CLASS_NAMES):
 	whiteListed=$(RUN_WHITELIST_FILTER); \
 	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
 	class_names= ; \
-	for test in `find -type f` ; do \
+	for test in `find . -type f` ; do \
 	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
 	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
 	  INCLUDE="NO" ; \
@@ -1783,7 +1786,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
 $(UNIT_CLASS_NAMES):
 	cd $(NETX_UNIT_TEST_DIR) ; \
 	class_names= ; \
-	for test in `find -type f` ; do \
+	for test in `find . -type f` ; do \
 	  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" ; \
@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps
  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
 	filename=" " ; \
 	cd $(NETX_UNIT_TEST_SRCDIR) ; \
-	for file in `find . -type f \! -iname "*.java"`; do\
-		filename=`echo $$file `; \
-		cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
-	done ; \
+	tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
 	cd $(NETX_UNIT_TEST_DIR) ; \
 	class_names=`cat $(UNIT_CLASS_NAMES)` ; \
 	CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco:
 @ENABLE_PLUGIN_TRUE@	 $(PLUGIN_TEST_SRCS) ;
 @ENABLE_PLUGIN_TRUE@	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
 @ENABLE_PLUGIN_TRUE@	  plugin/tests/LiveConnect/*.class ;
-@ENABLE_PLUGIN_TRUE@	cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
-@ENABLE_PLUGIN_TRUE@	  plugin/tests/LiveConnect ;
-@ENABLE_PLUGIN_TRUE@	echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
+@ENABLE_PLUGIN_TRUE@	@echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
 @ENABLE_PLUGIN_TRUE@	mkdir -p stamps
 @ENABLE_PLUGIN_TRUE@	touch stamps/plugin-tests.stamp
 




--- configure.orig	2016-02-03 13:49:09 UTC
+++ configure
@@ -10114,14 +10114,10 @@ if test "${with_junit+set}" = set; then 
         JUNIT_JAR=no
         ;;
       *)
-        if test -f "${withval}"; then
-          JUNIT_JAR="${withval}"
-        elif test -z "${withval}"; then
+        if test -z "${withval}"; then
           JUNIT_JAR=yes
         else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-          as_fn_error $? "\"The junit jar ${withval} was not found.\"" "$LINENO" 5
+          JUNIT_JAR="${withval}"
         fi
         ;;
     esac
@@ -10186,14 +10182,10 @@ if test "${with_hamcrest+set}" = set; th
         HAMCREST_JAR=no
         ;;
       *)
-        if test -f "${withval}"; then
-          HAMCREST_JAR="${withval}"
-        elif test -z "${withval}"; then
+        if test -z "${withval}"; then
           HAMCREST_JAR=yes
         else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-          as_fn_error $? "\"The hamcrest jar ${withval} was not found.\"" "$LINENO" 5
+          HAMCREST_JAR="${withval}"
         fi
         ;;
     esac

Line 0 Link Here

(-)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*)




--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig	2019-05-21 12:20:44.000000000 +0200
+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java	2019-06-19 14:33:09.000000000 +0200
@@ -86,7 +86,7 @@
  */
 public class XDesktopEntry {
 
 public class XDesktopEntry implements GenericDesktopEntry {
  
-    public static final String JAVA_ICON_NAME = "javaws";
+    public static final String JAVA_ICON_NAME = "itweb-javaws";
 
     private JNLPFile file = null;
     private int iconSize = -1;
@@ -219,12 +219,12 @@
         if (exec != null) {
             return exec;
         }
-        String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")});
+        String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")});
         if (pathResult != null) {
             return pathResult;
         }
         
             return exec;
         }
-        return "javaws";
+        return "itweb-javaws";
     }




--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2019-08-02 14:08:17.000000000 +0200
+++ plugin/icedteanp/IcedTeaNPPlugin.cc	2020-03-22 00:41:29.958009000 +0100
@@ -1627,9 +1627,9 @@
     command_line.push_back("-classpath");
     command_line.push_back(get_plugin_jfx_jar());
     command_line.push_back("--patch-module");
-    command_line.push_back("java.desktop="PLUGIN_JAR":"NETX_JAR);
+    command_line.push_back("java.desktop=" PLUGIN_JAR":" NETX_JAR);
     command_line.push_back("--patch-module");
-    command_line.push_back("jdk.jsobject="JSOBJECT_JAR);
+    command_line.push_back("jdk.jsobject=" JSOBJECT_JAR);
     command_line.push_back("--add-reads");
     command_line.push_back("java.base=ALL-UNNAMED,java.desktop");
     command_line.push_back("--add-reads");

Lines 1-6 Link Here

(-)java/icedtea-web/pkg-plist (-4 / +4 lines)
1	bin/itweb-javaws	1	bin/itweb-javaws.sh
2	bin/itweb-policyeditor	2	bin/itweb-policyeditor.sh
3	bin/itweb-settings	3	bin/itweb-settings.sh
4	%%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so	4	%%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
5	man/cs/man1/icedtea-web-plugin.1.gz	5	man/cs/man1/icedtea-web-plugin.1.gz
6	man/cs/man1/icedtea-web.1.gz	6	man/cs/man1/icedtea-web.1.gz
Lines 26-31 Link Here
26	share/applications/itweb-policyeditor.desktop	26	share/applications/itweb-policyeditor.desktop
27	share/applications/itweb-settings.desktop	27	share/applications/itweb-settings.desktop
28	%%DATADIR%%/javaws_splash.png	28	%%DATADIR%%/javaws_splash.png
29	%%DATADIR%%/netx.jar	29	%%DATADIR%%/javaws.jar
30	%%PLUGIN%%%%DATADIR%%/plugin.jar	30	%%PLUGIN%%%%DATADIR%%/plugin.jar
31	share/pixmaps/itweb-javaws.png	31	share/pixmaps/itweb-javaws.png

Return to bug 244976

Lines 1-12 Link Here

(-)java/icedtea-web/Makefile (-11 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= icedtea-web	3	PORTNAME= icedtea-web
4	PORTVERSION= 1.6.2	4	PORTVERSION= 1.8.3
5	PORTREVISION= 5
6	CATEGORIES= java www	5	CATEGORIES= java www
7	MASTER_SITES= http://icedtea.wildebeest.org/download/source/ \	6	MASTER_SITES= https://github.com/AdoptOpenJDK/IcedTea-Web/archive/
8	http://icedtea.classpath.org/download/source/
9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	7	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
		8	WRKSRC= ${WRKDIR}/IcedTea-Web-icedtea-web-1.8.3
10		9
11	MAINTAINER= java@FreeBSD.org	10	MAINTAINER= java@FreeBSD.org
12	COMMENT= Free Java plug-in and Java Web Start for OpenJDK	11	COMMENT= Free Java plug-in and Java Web Start for OpenJDK
Lines 15-24 Link Here
15		14
16	BUILD_DEPENDS= zip:archivers/zip \	15	BUILD_DEPENDS= zip:archivers/zip \
17	bash:shells/bash \	16	bash:shells/bash \
18	gsed:textproc/gsed	17	gsed:textproc/gsed \
		18	${HAMCREST_JAR}:java/hamcrest \
		19	${JUNIT_JAR}:java/junit
19	RUN_DEPENDS= bash:shells/bash	20	RUN_DEPENDS= bash:shells/bash
20	TEST_DEPENDS= ${HAMCREST_JAR}:java/hamcrest \
21	${JUNIT_JAR}:java/junit
22		21
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	USE_JAVA= yes	23	USE_JAVA= yes
Lines 26-33 Link Here
26	JAVA_VENDOR= openjdk	25	JAVA_VENDOR= openjdk
27	USE_PERL5= build	26	USE_PERL5= build
28	USE_XORG= x11	27	USE_XORG= x11
29	USES= desktop-file-utils gmake perl5 pkgconfig shebangfix xorg	28	USES= autoreconf desktop-file-utils gmake perl5 pkgconfig shebangfix xorg
30	SHEBANG_FILES= jrunscript.in launcher/launchers.in	29	SHEBANG_FILES= jrunscript.in shell-launcher/launchers.sh.in
31		30
32	CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"	31	CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}"
33	CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"	32	CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}"
Lines 35-40 Link Here
35	CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"	34	CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}"
36	CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"	35	CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}"
37	CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"	36	CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}"
		37	CONFIGURE_ARGS+= --with-itw-libs="BUNDLED"
		38	CONFIGURE_ARGS+= --enable-shell-launchers
38	.for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera	39	.for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera
39	CONFIGURE_ARGS+= --without-${opt}	40	CONFIGURE_ARGS+= --without-${opt}
40	.endfor	41	.endfor
Lines 64-70 Link Here
64	TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"	65	TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
65	TAGSOUP_VARS_OFF= TAGSOUP_JAR=no	66	TAGSOUP_VARS_OFF= TAGSOUP_JAR=no
66		67
67	PLUGIN_CONFIGURE_ENABLE=plugin	68	PLUGIN_CONFIGURE_ENABLE=native-plugin
68	PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \	69	PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \
69	MOZILLA_LIBS=" " # needs to be set and non-empty!	70	MOZILLA_LIBS=" " # needs to be set and non-empty!
70	PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi	71	PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi
Lines 95-101 Link Here
95	post-patch:	96	post-patch:
96	${REINPLACE_CMD} -e 's\|^sed\([[:space:]]\)\|gsed\1\|' \	97	${REINPLACE_CMD} -e 's\|^sed\([[:space:]]\)\|gsed\1\|' \
97	-e 's\|\([[:space:]]\)sed\([[:space:]]\)\|\1gsed\2\|g' \	98	-e 's\|\([[:space:]]\)sed\([[:space:]]\)\|\1gsed\2\|g' \
98	${WRKSRC}/Makefile.in ${WRKSRC}/html-gen.sh	99	${WRKSRC}/Makefile.am ${WRKSRC}/html-gen.sh
99	${REINPLACE_CMD} -e 's\|^Icon=javaws\|Icon=itweb-javaws\|' \	100	${REINPLACE_CMD} -e 's\|^Icon=javaws\|Icon=itweb-javaws\|' \
100	${WRKSRC}/*.desktop.in	101	${WRKSRC}/*.desktop.in
101		102

Line 0 Link Here

(-)java/icedtea-web/files/patch-Makefile.am (+171 lines)
		1	--- Makefile.am.orig 2019-08-02 14:08:17.000000000 +0200
		2	+++ Makefile.am 2020-01-14 17:43:47.000000000 +0100
		3	@@ -331,9 +331,9 @@
		4	#end of exported autoconf copies
		5
		6	# binary names
		7	-javaws:= $(shell echo javaws \| sed '@program_transform_name@')
		8	+javaws:= $(shell echo itweb-javaws \| sed '@program_transform_name@')
		9	itweb_settings:= $(shell echo itweb-settings \| sed '@program_transform_name@')
		10	-policyeditor:= $(shell echo policyeditor \| sed '@program_transform_name@')
		11	+policyeditor:= $(shell echo itweb-policyeditor \| sed '@program_transform_name@')
		12
		13	if WINDOWS_OR_INCLUDE_BATS
		14	# convert Unix newlines (LF) to DOS format:
		15	@@ -393,7 +393,7 @@
		16	endif
		17	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
		18	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
		19	- ${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/
		20	+ ${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/itweb-javaws.png
		21	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
		22	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
		23	if ENABLE_NATIVE_LAUNCHERS
		24	@@ -402,9 +402,9 @@
		25	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
		26	endif
		27	if ENABLE_SHELL_LAUNCHERS
		28	- ${INSTALL_PROGRAM} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
		29	- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
		30	- ${INSTALL_PROGRAM} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
		31	+ ${INSTALL_SCRIPT} launcher.build/$(javaws).sh $(DESTDIR)$(bindir)
		32	+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir)
		33	+ ${INSTALL_SCRIPT} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir)
		34	if WINDOWS_OR_INCLUDE_BATS
		35	${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir)
		36	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
		37	@@ -426,13 +426,15 @@
		38	(cd ${TOP_BUILD_DIR}/docs/netx; \
		39	for files in $$(find . -type f); \
		40	do \
		41	- ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
		42	+ mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
		43	+ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
		44	done)
		45	if ENABLE_PLUGINJAR
		46	(cd ${TOP_BUILD_DIR}/docs/plugin; \
		47	for files in $$(find . -type f); \
		48	do \
		49	- ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
		50	+ mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
		51	+ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
		52	done)
		53	endif
		54	endif
		55	@@ -544,7 +546,7 @@
		56	# all generated manpages must be removed one by one
		57	# shell (only shell!) launchers must go away
		58	uninstall-linux-only:
		59	- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \
		60	+ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \
		61	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
		62	for file in $$KNOWN_MANS ; do \
		63	for dir in $$KNOWN_DIRS ; do \
		64	@@ -868,7 +870,7 @@
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 \
67	ID=`echo "$$LANG_ID" \| head -c 2` ; \
68	- ENCOD=`echo "$$LANG_ID" \| tail -c 6 -` ; \
69	+ ENCOD=`echo "$$LANG_ID" \| tail -c 6` ; \
70	export LANG=$$LANG_ID; \
71	mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
72	echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
73	@@ -910,7 +912,8 @@
74	(cd $(NETX_RESOURCE_DIR); \
75	for files in $$(find . -type f); \
76	do \
77	- ${INSTALL_DATA} -D $${files} \
78	+ mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \
79	+ ${INSTALL_DATA} $${files} \
80	$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
81	done)
82	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
83	@@ -940,9 +943,9 @@
84	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
85
86	clean-desktop-files:
87	- rm -f javaws.desktop
88	+ rm -f itweb-javaws.desktop
89	rm -f itweb-settings.desktop
90	- rm -f policyeditor.desktop
91	+ rm -f itweb-policyeditor.desktop
92
93
94	# launcher run args:
95	@@ -1123,7 +1126,7 @@
96	fi
97
98	javaws.desktop: javaws.desktop.in
99	- sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
100	+ sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
101
102	itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
103	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \
104	@@ -1131,7 +1134,7 @@
105
106	policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
107	sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \
108	- < $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
109	+ < $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop
110
111	# documentation
112
113	@@ -1271,7 +1274,7 @@
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 ; \
116	if [ -n "$$notSrcFiles" ] ; then \
117	- cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
118	+ tar -c -f - "$$notSrcFiles" \| tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
119	fi ; \
120	cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
121	if [ -f $(META_MANIFEST) ]; \
122	@@ -1339,7 +1342,7 @@
123	path="`dirname $$slashed_dir`" ; \
124	file="`basename $$slashed_dir`.jar" ; \
125	echo "copying $$dir.jar to $$path as $$file" ; \
126	- mkdir --parents $$path ; \
127	+ mkdir -p $$path ; \
128	cp $$dir".jar" "$$path"/"$$file" ; \
129	fi ; \
130	done ; \
131	@@ -1485,7 +1488,7 @@
132	whiteListed=$(RUN_WHITELIST_FILTER); \
133	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
134	class_names= ; \
135	- for test in `find -type f` ; do \
136	+ for test in `find . -type f` ; do \
137	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \
138	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \
139	INCLUDE="NO" ; \
140	@@ -1674,7 +1677,7 @@
141	$(UNIT_CLASS_NAMES):
142	cd $(NETX_UNIT_TEST_DIR) ; \
143	class_names= ; \
144	- for test in `find -type f` ; do \
145	+ for test in `find . -type f` ; do \
146	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \
147	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \
148	class_names="$$class_names $$class_name" ; \
149	@@ -1685,10 +1688,7 @@
150	$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
151	filename=" " ; \
152	cd $(NETX_UNIT_TEST_SRCDIR) ; \
153	- for file in `find . -type f \! -iname "*.java"`; do\
154	- filename=`echo $$file `; \
155	- cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
156	- done ; \
157	+ tar -c -f - `find . -type f \! -iname "*.java"` \| tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
158	cd $(NETX_UNIT_TEST_DIR) ; \
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))" ; \
161	@@ -2012,9 +2012,7 @@
162	$(PLUGIN_TEST_SRCS) ;
163	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
164	plugin/tests/LiveConnect/*.class ;
165	- cp -pPR $(SRC_DIR_LINK) $(TOP_SRC_DIR)/plugin/tests/LiveConnect/*.{js,html} \
166	- plugin/tests/LiveConnect ;
167	- echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
168	+ @echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
169	mkdir -p stamps
170	touch stamps/plugin-tests.stamp
171	endif

Lines 1-160 Link Here

(-)java/icedtea-web/files/patch-Makefile.in (-160 lines)
1	--- Makefile.in.orig 2016-02-03 13:49:10 UTC
2	+++ Makefile.in
3	@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C
4	#end of exported autoconf copies
5
6	# binary names
7	-javaws := $(shell echo javaws \| sed '@program_transform_name@')
8	+javaws := $(shell echo itweb-javaws \| sed '@program_transform_name@')
9	itweb_settings := $(shell echo itweb-settings \| sed '@program_transform_name@')
10	-policyeditor := $(shell echo policyeditor \| sed '@program_transform_name@')
11	+policyeditor := $(shell echo itweb-policyeditor \| sed '@program_transform_name@')
12
13	# the launcher needs to know $(bindir) and $(datadir) which can be different at
14	# make-time from configure-time
15	@@ -900,10 +900,10 @@ install-exec-local:
16	@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
17	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
18	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
19	- ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/
20	- ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
21	- ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
22	- ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
23	+ ${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png
24	+ ${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
25	+ ${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
26	+ ${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
27
28	# all generated manpages are installed in swarm
29	install-data-local:
30	@@ -913,12 +913,14 @@ install-data-local:
31	@ENABLE_DOCS_TRUE@ (cd ${abs_top_builddir}/docs/netx; \
32	@ENABLE_DOCS_TRUE@ for files in $$(find . -type f); \
33	@ENABLE_DOCS_TRUE@ do \
34	-@ENABLE_DOCS_TRUE@ ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
35	+@ENABLE_DOCS_TRUE@ mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
36	+@ENABLE_DOCS_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
37	@ENABLE_DOCS_TRUE@ done)
38	@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ (cd ${abs_top_builddir}/docs/plugin; \
39	@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ for files in $$(find . -type f); \
40	@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ do \
41	-@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
42	+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
43	+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
44	@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@ done)
45
46	# all generated manpages must be removed one by one
47	@@ -928,7 +930,7 @@ uninstall-local:
48	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
49	rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
50	rm -r $(ICONS_DEST_DIR)/javaws.png
51	- KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \
52	+ KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \
53	KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \
54	for file in $$KNOWN_MANS ; do \
55	for dir in $$KNOWN_DIRS ; do \
56	@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx.
57	echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
58	for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
59	ID=`echo "$$LANG_ID" \| head -c 2` ; \
60	- ENCOD=`echo "$$LANG_ID" \| tail -c 6 -` ; \
61	+ ENCOD=`echo "$$LANG_ID" \| tail -c 6` ; \
62	export LANG=$$LANG_ID; \
63	mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \
64	echo "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>" >> "$$HTML_DOCS_INDEX" ; \
65	@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt
66	(cd $(NETX_RESOURCE_DIR); \
67	for files in $$(find . -type f); \
68	do \
69	- ${INSTALL_DATA} -D $${files} \
70	+ mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \
71	+ ${INSTALL_DATA} $${files} \
72	$(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
73	done)
74	cp -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
75	@@ -1233,7 +1236,7 @@ clean-netx:
76	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
77
78	clean-desktop-files:
79	- rm -f javaws.desktop
80	+ rm -f itweb-javaws.desktop
81	rm -f itweb-settings.desktop
82
83	launcher.build/$(javaws): launcher/launchers.in
84	@@ -1266,7 +1269,7 @@ clean-launchers:
85	fi
86
87	javaws.desktop: javaws.desktop.in
88	- sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > javaws.desktop
89	+ sed "s#PATH_TO_JAVAWS#$(bindir)/$(javaws)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop
90
91	itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
92	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
93	@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb-
94
95	policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
96	sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \
97	- < $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
98	+ < $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop
99
100	# documentation
101
102	@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce
103	notSrcFiles=`find . -mindepth 1 -type f \! -name ".java" \| sed "s/.\///"` ; \
104	$(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
105	if [ -n "$$notSrcFiles" ] ; then \
106	- cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
107	+ tar -c -f - "$$notSrcFiles" \| tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
108	fi ; \
109	cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
110	if [ -f $(META_MANIFEST) ]; \
111	@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp
112	path="`dirname $$slashed_dir`" ; \
113	file="`basename $$slashed_dir`.jar" ; \
114	echo "copying $$dir.jar to $$path as $$file" ; \
115	- mkdir --parents $$path ; \
116	+ mkdir -p $$path ; \
117	cp $$dir".jar" "$$path"/"$$file" ; \
118	fi ; \
119	done ; \
120	@@ -1598,7 +1601,7 @@ $(REPRODUCERS_CLASS_NAMES):
121	whiteListed=$(RUN_WHITELIST_FILTER); \
122	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
123	class_names= ; \
124	- for test in `find -type f` ; do \
125	+ for test in `find . -type f` ; do \
126	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \
127	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \
128	INCLUDE="NO" ; \
129	@@ -1783,7 +1786,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
130	$(UNIT_CLASS_NAMES):
131	cd $(NETX_UNIT_TEST_DIR) ; \
132	class_names= ; \
133	- for test in `find -type f` ; do \
134	+ for test in `find . -type f` ; do \
135	class_name=`echo $$test \| sed -e 's\|\.class$$\|\|' -e 's\|^\./\|\|'` ; \
136	class_name=`echo $$class_name \| sed -e 's\|/\|.\|g' ` ; \
137	class_names="$$class_names $$class_name" ; \
138	@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps
139	$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES)
140	filename=" " ; \
141	cd $(NETX_UNIT_TEST_SRCDIR) ; \
142	- for file in `find . -type f \! -iname "*.java"`; do\
143	- filename=`echo $$file `; \
144	- cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
145	- done ; \
146	+ tar -c -f - `find . -type f \! -iname "*.java"` \| tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \
147	cd $(NETX_UNIT_TEST_DIR) ; \
148	class_names=`cat $(UNIT_CLASS_NAMES)` ; \
149	CLASSPATH=$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
150	@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco:
151	@ENABLE_PLUGIN_TRUE@ $(PLUGIN_TEST_SRCS) ;
152	@ENABLE_PLUGIN_TRUE@ $(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
153	@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect/*.class ;
154	-@ENABLE_PLUGIN_TRUE@ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
155	-@ENABLE_PLUGIN_TRUE@ plugin/tests/LiveConnect ;
156	-@ENABLE_PLUGIN_TRUE@ echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
157	+@ENABLE_PLUGIN_TRUE@ @echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
158	@ENABLE_PLUGIN_TRUE@ mkdir -p stamps
159	@ENABLE_PLUGIN_TRUE@ touch stamps/plugin-tests.stamp
160

Lines 1-36 Link Here

(-)java/icedtea-web/files/patch-configure (-36 lines)
1	--- configure.orig 2016-02-03 13:49:09 UTC
2	+++ configure
3	@@ -10114,14 +10114,10 @@ if test "${with_junit+set}" = set; then
4	JUNIT_JAR=no
5	;;
6	*)
7	- if test -f "${withval}"; then
8	- JUNIT_JAR="${withval}"
9	- elif test -z "${withval}"; then
10	+ if test -z "${withval}"; then
11	JUNIT_JAR=yes
12	else
13	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
14	-$as_echo "not found" >&6; }
15	- as_fn_error $? "\"The junit jar ${withval} was not found.\"" "$LINENO" 5
16	+ JUNIT_JAR="${withval}"
17	fi
18	;;
19	esac
20	@@ -10186,14 +10182,10 @@ if test "${with_hamcrest+set}" = set; th
21	HAMCREST_JAR=no
22	;;
23	*)
24	- if test -f "${withval}"; then
25	- HAMCREST_JAR="${withval}"
26	- elif test -z "${withval}"; then
27	+ if test -z "${withval}"; then
28	HAMCREST_JAR=yes
29	else
30	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
31	-$as_echo "not found" >&6; }
32	- as_fn_error $? "\"The hamcrest jar ${withval} was not found.\"" "$LINENO" 5
33	+ HAMCREST_JAR="${withval}"
34	fi
35	;;
36	esac

Lines 1-26 Link Here

(-)java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java (-12 / +10 lines)
1	--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2016-02-03 13:47:43 UTC	1	--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2019-05-21 12:20:44.000000000 +0200
2	+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java	2	+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java 2019-06-19 14:33:09.000000000 +0200
3	@@ -78,7 +78,7 @@ import net.sourceforge.jnlp.security.dia	3	@@ -86,7 +86,7 @@
4	*/
5	public class XDesktopEntry {
6		4
		5	public class XDesktopEntry implements GenericDesktopEntry {
		6
7	- public static final String JAVA_ICON_NAME = "javaws";	7	- public static final String JAVA_ICON_NAME = "javaws";
8	+ public static final String JAVA_ICON_NAME = "itweb-javaws";	8	+ public static final String JAVA_ICON_NAME = "itweb-javaws";
9		9
10	private JNLPFile file = null;	10	private JNLPFile file = null;
11	private int iconSize = -1;	11	private int iconSize = -1;
12	@@ -202,14 +202,14 @@ public class XDesktopEntry {	12	@@ -219,12 +219,12 @@
13	//Shortcut executes the jnlp as it was with system preferred java. It should work fine offline	13	if (exec != null) {
14	//absolute - works in case of self built	14	return exec;
15	String exec = System.getProperty("icedtea-web.bin.location");	15	}
16	- String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")});	16	- String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")});
17	+ String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")});	17	+ String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")});
18	if (pathResult != null) {	18	if (pathResult != null) {
19	return pathResult;	19	return pathResult;
20	}	20	}
21	if (exec != null) {	21
22	return exec;
23	}
24	- return "javaws";	22	- return "javaws";
25	+ return "itweb-javaws";	23	+ return "itweb-javaws";
26	}	24	}

Line 0 Link Here

(-)java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc (+14 lines)
	1	--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2019-08-02 14:08:17.000000000 +0200
	2	+++ plugin/icedteanp/IcedTeaNPPlugin.cc 2020-03-22 00:41:29.958009000 +0100
	3	@@ -1627,9 +1627,9 @@
	4	command_line.push_back("-classpath");
	5	command_line.push_back(get_plugin_jfx_jar());
	6	command_line.push_back("--patch-module");
	7	- command_line.push_back("java.desktop="PLUGIN_JAR":"NETX_JAR);
	8	+ command_line.push_back("java.desktop=" PLUGIN_JAR":" NETX_JAR);
	9	command_line.push_back("--patch-module");
	10	- command_line.push_back("jdk.jsobject="JSOBJECT_JAR);
	11	+ command_line.push_back("jdk.jsobject=" JSOBJECT_JAR);
	12	command_line.push_back("--add-reads");
	13	command_line.push_back("java.base=ALL-UNNAMED,java.desktop");
	14	command_line.push_back("--add-reads");