From nobody Fri Jul 8 10:42:54 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E744017D17B0; Fri, 8 Jul 2022 10:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LfVH26HBnz3Dr4; Fri, 8 Jul 2022 10:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657276974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M90tZIki2PVH/14MZ3Jb9pcEmoX8NBLGHY+VwePX3aQ=; b=Ip9Y/9jvcX2dUhA2hRximDrP8LOXb8dLmtZPqFsUacD8qaJ/Avm0pj4rF2XdncKk3WfIxV kpRmK+03U6/Poj/PSXibpg66NIMHmJ05qwIYCdS78VzXWfdDt1FgHwFntcaUwN4Jm3s9Yd Q14+7d1EcLLe8MtGJ8pS4VJu6HBcebfTSbRNIJwnqHO6IY5+te51sIggaeYC3EWEd4Yvly 2EF8mq00CUv6n4URrvM+gzztoD93PkTvYDwkr10QgwP91O/rlLE4Y59k5UNAjvKdKDEE7N aiyQ+rWi55RnezXetIDtM8CqLLL3ocBNTIHCPab+5MSjixsklXbXmGLVyf5EBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LfVH25NyGz1J2t; Fri, 8 Jul 2022 10:42:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268AgsPc094278; Fri, 8 Jul 2022 10:42:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Agsd6094277; Fri, 8 Jul 2022 10:42:54 GMT (envelope-from git) Date: Fri, 8 Jul 2022 10:42:54 GMT Message-Id: <202207081042.268Agsd6094277@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: a7d3136dfc45 - main - java/icedtea-web: allow to disable new launchers written in Rust List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7d3136dfc458f587807a99d93b877a3613e26b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657276974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M90tZIki2PVH/14MZ3Jb9pcEmoX8NBLGHY+VwePX3aQ=; b=QwB2h24Po+jeQrC9Iv4tLT7wsg2qf2tfoLFSj0fjct6UxMmDj625+d3XVVHtYdktND6yuF aX3h+rQgGKbF64prV8g282edx1g7GUqPEfCLv7ugAON0OdsajuKh1FGK8KneEPQ9z+YCmd UeoguC4fwx5YYMvgK33y6n/rm4du2wmMb9wNUd3o0JsXB37aIinxkRIqSP5MYF+F7Wvaji Ums4bEoXd2DwrzXXM5vuLXtXxgKxnVajiuyK11Vr3rKghB3/+WF5UJBE0NrBDACNmLwrCb VORlSCHhIxOyXjT9PFeDPMEYYRU2I+hQTxJmJ+y9XlSOm7iQ3ThW+0SdokzLDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657276974; a=rsa-sha256; cv=none; b=ENN3PGliZcAXsUFLbBj3R2dJGFKIz1K8wiOFOgvxXt6yGKM55rT4BZjX/HM88jkP02053i /UFVHTTA9q4YYCASMZ5HW3X2iP2/IfMmL2jliJy67QQSJAvHLr3syanBmQLOxfh+VEqIJv 5Ptv3WnjICqAzQYIJp0LxKUSY4ErgLymQu6pbNV1iFtyJKexI4GtE4SWFY9SPzz9cLYOB0 2TcA/Y5sjp5gOm/l6wJUcPE8UczzBgCXqlW4onOs/az6UzcPihRNaJlf2jYo5OdSScIf9S JbrgNk7+zbbcu6ZVNdXVppgPIdIwWmIhY95r5ciIyKz6iVa/GCqL3f9dx64CEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7d3136dfc458f587807a99d93b877a3613e26b9 commit a7d3136dfc458f587807a99d93b877a3613e26b9 Author: Alexey Dokuchaev AuthorDate: 2022-07-08 10:42:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-07-08 10:42:04 +0000 java/icedtea-web: allow to disable new launchers written in Rust Even it's a build-time dependency, it's quite heavy nonetheless. Since those new launchers are optional (traditional shell-based versions are still provided), allow users to turn them off. Reported by: Vyacheslav Olkhovchenkov --- java/icedtea-web/Makefile | 8 +++++--- java/icedtea-web/pkg-plist | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index ee9872f9cdbd..6e3f54bbca34 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -11,7 +11,6 @@ COMMENT= Free Java plug-in and Java Web Start for OpenJDK LICENSE= GPLv2 BUILD_DEPENDS= zip:archivers/zip \ - rustc:lang/${RUST_DEFAULT} \ bash:shells/bash \ gsed:textproc/gsed \ ${HAMCREST_JAR}:java/hamcrest \ @@ -53,12 +52,13 @@ 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 TAGSOUP -OPTIONS_DEFAULT=PLUGIN +OPTIONS_DEFINE= DOCS PLUGIN RHINO RUST TAGSOUP +OPTIONS_DEFAULT=PLUGIN RUST OPTIONS_SUB= yes PLUGIN_DESC= Enable the browser plug-in 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 DOCS_CONFIGURE_ENABLE= docs @@ -69,6 +69,8 @@ RHINO_RUN_DEPENDS= ${RHINO_BUILD_DEPENDS} RHINO_VARS= RHINO_JAR="${JAVASHAREDIR}/rhino/rhino.jar" RHINO_VARS_OFF= RHINO_JAR=no +RUST_BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} + TAGSOUP_BUILD_DEPENDS= ${JAVALIBDIR}/tagsoup.jar:textproc/tagsoup TAGSOUP_RUN_DEPENDS= ${TAGSOUP_BUILD_DEPENDS} TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar" diff --git a/java/icedtea-web/pkg-plist b/java/icedtea-web/pkg-plist index 8c7f915aa9d0..d54b05276b79 100644 --- a/java/icedtea-web/pkg-plist +++ b/java/icedtea-web/pkg-plist @@ -1,9 +1,9 @@ bin/itw-modularjdk.args -bin/itweb-javaws +%%RUST%%bin/itweb-javaws bin/itweb-javaws.sh -bin/itweb-policyeditor +%%RUST%%bin/itweb-policyeditor bin/itweb-policyeditor.sh -bin/itweb-settings +%%RUST%%bin/itweb-settings bin/itweb-settings.sh %%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so etc/bash_completion.d/itweb-settings.bash