java/icedtea-web: Update to 1.8.8

PR:		259466

11 files changed, 51 insertions, 74 deletions

diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile
index e8409157275c..70940d6db122 100644
--- a/java/icedtea-web/Makefile
+++ b/java/icedtea-web/Makefile
@@ -1,9 +1,7 @@
 PORTNAME=	icedtea-web
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.8
 DISTVERSIONPREFIX=	icedtea-web-
-PORTREVISION=	23
 CATEGORIES=	java www
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Free Java plug-in and Java Web Start for OpenJDK
@@ -18,17 +16,14 @@ BUILD_DEPENDS=	zip:archivers/zip \
 		${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
@@ -53,11 +48,12 @@ TEST_TARGET=	check
 # Upstream archive contains files with UTF-8 names
 EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
 
-OPTIONS_DEFINE=	DOCS PLUGIN RHINO RUST TAGSOUP
-OPTIONS_DEFAULT=PLUGIN RUST
+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
@@ -77,34 +73,26 @@ TAGSOUP_RUN_DEPENDS=	${TAGSOUP_BUILD_DEPENDS}
 TAGSOUP_VARS=		TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
 TAGSOUP_VARS_OFF=	TAGSOUP_JAR=no
 
-PLUGIN_CONFIGURE_ENABLE=native-plugin pluginjar
+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' \
diff --git a/java/icedtea-web/distinfo b/java/icedtea-web/distinfo
index bc9bc6e702fa..88e903ea646a 100644
--- a/java/icedtea-web/distinfo
+++ b/java/icedtea-web/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1529752635
-SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = a0c12cd2d7793f05428a02e49159c7f3f70694f48e23787ffdb6588b0db7c862
-SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = 2358591
+TIMESTAMP = 1639151286
+SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = f4203a605a3c9c50acdcc6eef4a366b9fdd36d95edcd76bcbfede01107cb5fe6
+SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = 2365638
 SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8
 SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637
diff --git a/java/icedtea-web/files/patch-Makefile.am b/java/icedtea-web/files/patch-Makefile.am
index eef8eea2ce83..198663d63e93 100644
--- a/java/icedtea-web/files/patch-Makefile.am
+++ b/java/icedtea-web/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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
@@ -12,7 +12,7 @@
  
  if WINDOWS_OR_INCLUDE_BATS
  # convert Unix newlines (LF) to DOS format:
-@@ -393,7 +393,7 @@
+@@ -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)
@@ -21,7 +21,7 @@
  	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
  	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
  if ENABLE_NATIVE_LAUNCHERS
-@@ -402,9 +402,9 @@
+@@ -407,9 +407,9 @@ if ENABLE_NATIVE_LAUNCHERS
  	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
  endif
  if ENABLE_SHELL_LAUNCHERS
@@ -34,7 +34,7 @@
  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 @@
+@@ -431,13 +431,15 @@ if ENABLE_DOCS
  	(cd ${TOP_BUILD_DIR}/docs/netx; \
  	 for files in $$(find . -type f); \
  	 do \
@@ -52,7 +52,7 @@
  	 done)
  endif
  endif
-@@ -544,7 +546,7 @@
+@@ -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:
@@ -61,7 +61,7 @@
  	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 @@
+@@ -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` ; \
@@ -70,7 +70,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" ; \
-@@ -910,7 +912,8 @@
+@@ -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 \
@@ -80,7 +80,7 @@
  	   $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \
  	 done)
  	cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
-@@ -940,9 +943,9 @@
+@@ -973,9 +976,9 @@ clean-netx:
  	rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
  
  clean-desktop-files:
@@ -92,7 +92,7 @@
  
  
  # launcher run args:
-@@ -1123,7 +1126,7 @@
+@@ -1156,7 +1159,7 @@ endif
  	fi
  
  javaws.desktop: javaws.desktop.in
@@ -101,7 +101,7 @@
  
  itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in
  	sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \
-@@ -1131,7 +1134,7 @@
+@@ -1164,7 +1167,7 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.deskt
  
  policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
  	sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \
@@ -110,7 +110,7 @@
  
  # documentation
  
-@@ -1271,7 +1274,7 @@
+@@ -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 \
@@ -119,7 +119,7 @@
  	      fi ; \
  	      cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
  	      if [ -f $(META_MANIFEST) ]; \
-@@ -1339,7 +1342,7 @@
+@@ -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" ; \
@@ -128,7 +128,7 @@
  	      cp $$dir".jar" "$$path"/"$$file" ; \
  	    fi ; \
  	  done ; \
-@@ -1485,7 +1488,7 @@
+@@ -1518,7 +1521,7 @@ $(REPRODUCERS_CLASS_NAMES):
  	whiteListed=$(RUN_WHITELIST_FILTER); \
  	cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
  	class_names= ; \
@@ -137,7 +137,7 @@
  	  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 @@
+@@ -1707,7 +1710,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
  $(UNIT_CLASS_NAMES):
  	cd $(NETX_UNIT_TEST_DIR) ; \
  	class_names= ; \
@@ -146,7 +146,7 @@
  	  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 @@
+@@ -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) ; \
@@ -158,7 +158,7 @@
  	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 @@
+@@ -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 ;
diff --git a/java/icedtea-web/files/patch-completion_javaws.bash.in b/java/icedtea-web/files/patch-completion_javaws.bash.in
index 18d04499dcbb..c8496d4a25dc 100644
--- a/java/icedtea-web/files/patch-completion_javaws.bash.in
+++ b/java/icedtea-web/files/patch-completion_javaws.bash.in
@@ -1,6 +1,6 @@
---- completion/javaws.bash.in.orig	2020-06-04 13:08:14.000000000 +0200
-+++ completion/javaws.bash.in	2020-07-31 20:16:56.895261000 +0200
-@@ -28,4 +28,4 @@
+--- completion/javaws.bash.in.orig	2021-05-17 09:24:37 UTC
++++ completion/javaws.bash.in
+@@ -28,4 +28,4 @@ _javaws()
        return 0
      fi
  }
diff --git a/java/icedtea-web/files/patch-completion_policyeditor.bash.in b/java/icedtea-web/files/patch-completion_policyeditor.bash.in
index 99014843ed42..4741a8480ad4 100644
--- a/java/icedtea-web/files/patch-completion_policyeditor.bash.in
+++ b/java/icedtea-web/files/patch-completion_policyeditor.bash.in
@@ -1,6 +1,6 @@
---- completion/policyeditor.bash.in.orig	2020-06-04 13:08:14.000000000 +0200
-+++ completion/policyeditor.bash.in	2020-07-31 20:02:45.694743000 +0200
-@@ -10,4 +10,4 @@
+--- completion/policyeditor.bash.in.orig	2021-05-17 09:24:37 UTC
++++ completion/policyeditor.bash.in
+@@ -10,4 +10,4 @@ _policyeditor()
      COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
      return 0
  }
diff --git a/java/icedtea-web/files/patch-configure.ac b/java/icedtea-web/files/patch-configure.ac
deleted file mode 100644
index fdb19287ceec..000000000000
--- a/java/icedtea-web/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2019-08-02 14:08:17.000000000 +0200
-+++ configure.ac	2020-01-14 16:32:04.000000000 +0100
-@@ -71,7 +71,7 @@
- build_linux=no
- build_windows=no
- case "${host_os}" in
--    linux*)
-+    freebsd*)
-         build_linux=yes
-         ;;
-     cygwin*)
diff --git a/java/icedtea-web/files/patch-html-gen.sh b/java/icedtea-web/files/patch-html-gen.sh
index 01c7329fbbba..8db03d8150d0 100644
--- a/java/icedtea-web/files/patch-html-gen.sh
+++ b/java/icedtea-web/files/patch-html-gen.sh
@@ -1,4 +1,4 @@
---- html-gen.sh.orig	2016-02-03 13:47:43 UTC
+--- html-gen.sh.orig	2021-05-17 09:24:37 UTC
 +++ html-gen.sh
 @@ -74,7 +74,7 @@ else
      unset REPO_URL
@@ -9,7 +9,7 @@
  
  if [ ! -e html-gen ]; then
  	echo "No html-gen directory, exiting. See Makefile.am for usage"
-@@ -168,7 +168,7 @@ done
+@@ -170,7 +170,7 @@ done
  
  sed -i -r 's|(\*\ .*):|<u>\1</u>:|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:"
  
diff --git a/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java b/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java
index a712407510d6..09d85eb19fdf 100644
--- a/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java
+++ b/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java
@@ -1,6 +1,6 @@
---- 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 @@
+--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig	2021-05-17 09:24:37 UTC
++++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java
+@@ -86,7 +86,7 @@ import net.sourceforge.jnlp.security.dialogresults.Acc
  
  public class XDesktopEntry implements GenericDesktopEntry {
   
@@ -9,7 +9,7 @@
  
      private JNLPFile file = null;
      private int iconSize = -1;
-@@ -219,12 +219,12 @@
+@@ -219,12 +219,12 @@ public class XDesktopEntry implements GenericDesktopEn
          if (exec != null) {
              return exec;
          }
diff --git a/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc b/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
index c0ee8a2cdc39..698262d8e838 100644
--- a/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
+++ b/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
@@ -1,6 +1,6 @@
---- 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 @@
+--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig	2021-05-17 09:24:37 UTC
++++ plugin/icedteanp/IcedTeaNPPlugin.cc
+@@ -1627,9 +1627,9 @@ plugin_start_appletviewer (ITNPPluginData* data)
      command_line.push_back("-classpath");
      command_line.push_back(get_plugin_jfx_jar());
      command_line.push_back("--patch-module");
diff --git a/java/icedtea-web/files/patch-rust-launcher_Cargo.toml b/java/icedtea-web/files/patch-rust-launcher_Cargo.toml
index 510f97e3503d..b3f2ddbea801 100644
--- a/java/icedtea-web/files/patch-rust-launcher_Cargo.toml
+++ b/java/icedtea-web/files/patch-rust-launcher_Cargo.toml
@@ -1,5 +1,5 @@
---- rust-launcher/Cargo.toml.orig	2020-06-04 13:08:14.000000000 +0200
-+++ rust-launcher/Cargo.toml	2020-06-15 09:34:55.000000000 +0200
+--- rust-launcher/Cargo.toml.orig	2021-05-17 09:24:37 UTC
++++ rust-launcher/Cargo.toml
 @@ -2,7 +2,3 @@
  name = "launcher"
  version = "1.8.0"
diff --git a/java/icedtea-web/pkg-plist b/java/icedtea-web/pkg-plist
index d54b05276b79..b8bbd2979ad1 100644
--- a/java/icedtea-web/pkg-plist
+++ b/java/icedtea-web/pkg-plist
@@ -34,6 +34,6 @@ share/applications/itweb-policyeditor.desktop
 share/applications/itweb-settings.desktop
 %%DATADIR%%/javaws.jar
 %%DATADIR%%/javaws_splash.png
-%%PLUGIN%%%%DATADIR%%/jsobject.jar
-%%PLUGIN%%%%DATADIR%%/plugin.jar
+%%PLUGINJAR%%%%DATADIR%%/jsobject.jar
+%%PLUGINJAR%%%%DATADIR%%/plugin.jar
 share/pixmaps/itweb-javaws.png