Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Jul 2020 23:53:31 +0000 (UTC)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r543385 - head/java/icedtea-web
Message-ID:  <202007242353.06ONrVQV034664@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glewis
Date: Fri Jul 24 23:53:31 2020
New Revision: 543385
URL: https://svnweb.freebsd.org/changeset/ports/543385

Log:
  * Add missing build depends
  * Restrict Java versions
  * Fix packing list
  
  PR:		244976
  Submitted by:	Lars Herschke <lhersch@dssgmbh.de>

Modified:
  head/java/icedtea-web/Makefile
  head/java/icedtea-web/pkg-plist

Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile	Fri Jul 24 22:43:44 2020	(r543384)
+++ head/java/icedtea-web/Makefile	Fri Jul 24 23:53:31 2020	(r543385)
@@ -2,6 +2,7 @@
 
 PORTNAME=	icedtea-web
 PORTVERSION=	1.8.4
+PORTREVISION=   1
 CATEGORIES=	java www
 MASTER_SITES=	https://github.com/AdoptOpenJDK/IcedTea-Web/archive/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -13,6 +14,7 @@ COMMENT=	Free Java plug-in and Java Web Start for Open
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	zip:archivers/zip \
+		rustc:lang/rust \
 		bash:shells/bash \
 		gsed:textproc/gsed \
 		${HAMCREST_JAR}:java/hamcrest \
@@ -23,6 +25,7 @@ MAKE_JOBS_UNSAFE=yes
 
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
+JAVA_VERSION=	7 8
 JAVA_OS=	native
 JAVA_VENDOR=	openjdk
 USE_PERL5=	build
@@ -32,7 +35,6 @@ SHEBANG_FILES=	jrunscript.in shell-launcher/launchers.
 
 CONFIGURE_ARGS=		--with-hamcrest="${HAMCREST_JAR}"
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
-CONFIGURE_ARGS+=	--with-jre-home="${JAVA_HOME}/jre"
 CONFIGURE_ARGS+=	--with-junit="${JUNIT_JAR}"
 CONFIGURE_ARGS+=	--with-rhino="${RHINO_JAR}"
 CONFIGURE_ARGS+=	--with-tagsoup="${TAGSOUP_JAR}"
@@ -67,7 +69,7 @@ TAGSOUP_RUN_DEPENDS=	${TAGSOUP_BUILD_DEPENDS}
 TAGSOUP_VARS=		TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
 TAGSOUP_VARS_OFF=	TAGSOUP_JAR=no
 
-PLUGIN_CONFIGURE_ENABLE=native-plugin
+PLUGIN_CONFIGURE_ENABLE=native-plugin pluginjar
 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

Modified: head/java/icedtea-web/pkg-plist
==============================================================================
--- head/java/icedtea-web/pkg-plist	Fri Jul 24 22:43:44 2020	(r543384)
+++ head/java/icedtea-web/pkg-plist	Fri Jul 24 23:53:31 2020	(r543385)
@@ -1,5 +1,9 @@
+bin/itw-modularjdk.args
+bin/itweb-javaws
 bin/itweb-javaws.sh
+bin/itweb-policyeditor
 bin/itweb-policyeditor.sh
+bin/itweb-settings
 bin/itweb-settings.sh
 %%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
 man/cs/man1/icedtea-web-plugin.1.gz
@@ -25,7 +29,11 @@ man/pl/man1/itweb-settings.1.gz
 share/applications/itweb-javaws.desktop
 share/applications/itweb-policyeditor.desktop
 share/applications/itweb-settings.desktop
-%%DATADIR%%/javaws_splash.png
+share/bash-completion/completions/itweb-settings.bash
+share/bash-completion/completions/javaws.bash
+share/bash-completion/completions/policyeditor.bash
 %%DATADIR%%/javaws.jar
+%%DATADIR%%/javaws_splash.png
+%%PLUGIN%%%%DATADIR%%/jsobject.jar
 %%PLUGIN%%%%DATADIR%%/plugin.jar
 share/pixmaps/itweb-javaws.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007242353.06ONrVQV034664>