From nobody Thu Dec 15 17:25:38 2022 X-Original-To: dev-commits-ports-main@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 4NXzdt4YX6z4kwS6; Thu, 15 Dec 2022 17:25:38 +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 4NXzdt3mrcz3sJl; Thu, 15 Dec 2022 17:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125138; 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=+63Qsw2Y9euHtp/e3+64gsMsMAE5KMy6o6NLRinYPAQ=; b=PTKkxCS7wBL2sv+VdgiCbgSQf2f1L96gotmKGc954OLwd27QNlLTAG915n6skuZABz9jfa K56jm0ygT7n5EyVtSjN76S8fvy9IAlmMfMprIFsOdNu6WFuK56h2kUUgKQnzwm6MLQLL/4 N+SBJflRpg9qLKyQy/3EiiVb8IeGQ9sJ647pLwdYk3Mb7qZ6315LYJAQFpGU/ilH62a7tw 50C1GLyp1Wz7D6Xkesm4N8m3woXudzLIL5XUSmnn//JjJTlGx+foBrmuQeo5mLyhpaRgRx rthJa3w+iHXAhLhGMypNtlvpHlL0fioy4JHdmus5tcZM0+GBnsV/yP92Wwq8Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125138; 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=+63Qsw2Y9euHtp/e3+64gsMsMAE5KMy6o6NLRinYPAQ=; b=xb8qRARq2I8TquUzSHy+tPyG9BqyjQiBrMqaxR5JiKS8K/WegREgjy4Yb3EvLGeTXWE/YV uGvbK+Es9/Ktes/pjsY0PCm28yrIZSRs6swmOA+qKI8XKAQmvEz6wOWgY6PweXGCaDenAp l/tIlFXFzd2jHlzzhtLQ2Dp2PcetTJu8WYTchp8x5cBaU+6sqk/mfEnwkdbNd6nvbGApHS KoVa0PIGpnR7naAyI9z3JMltEliggOJ7451Y5bGL7Hfu58FFT7ZuWPhEAxLhZ4kBSPwv1O 0h4rihDy83U36KVqwahqzgc6M7C6Skxh19JQnTLxiLxI/L06+wKNmGf/CAd3dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671125138; a=rsa-sha256; cv=none; b=i2Ycochy43xuRFVIukI7S53FqRdZqDkFS0+7cj+F/IyfdFsveRYkp2XahR50wwxhMU/qPo f86Q7EU2mzyNec8hhTNB801GdBFp1vTbevsjw7VzhZnXw+dSIlzdXsffA3PHWjRfSQ5/3W eyDj8QcdD88k5ye6tVvsr3eLRmkzm71ErV1hq4HySMxkwDtiVujh4exgywweP+6Z2ybYPw CJIjWQKAnwhSjQXUNgdF3eMPaQEfckbDNvowsvlcmX4x8I1TubyATGYUBZj5zV9+f7uDys z+Ph+60vQvn3BhEoni4nFxHB++H0KnoMkA/8b/5S9A/N9CuXAjp+365DSgYTDg== 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 4NXzdt2rLnzhPm; Thu, 15 Dec 2022 17:25:38 +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 2BFHPcsg098439; Thu, 15 Dec 2022 17:25:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BFHPcxF098438; Thu, 15 Dec 2022 17:25:38 GMT (envelope-from git) Date: Thu, 15 Dec 2022 17:25:38 GMT Message-Id: <202212151725.2BFHPcxF098438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 3bca93127d15 - main - devel/jetbrains-webstorm: Add default JDK runtime List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bca93127d150cd16e7887487256ce5e6dd5fdef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bca93127d150cd16e7887487256ce5e6dd5fdef commit 3bca93127d150cd16e7887487256ce5e6dd5fdef Author: Dmitry Wagin AuthorDate: 2022-12-15 07:36:47 +0000 Commit: Fernando Apesteguía CommitDate: 2022-12-15 17:21:35 +0000 devel/jetbrains-webstorm: Add default JDK runtime PR: 268372 Reported by: dmitry.wagin@ya.ru (maintainer) --- devel/jetbrains-webstorm/Makefile | 5 +++-- devel/jetbrains-webstorm/files/webstorm.desktop.in | 2 +- devel/jetbrains-webstorm/files/webstorm.in | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devel/jetbrains-webstorm/Makefile b/devel/jetbrains-webstorm/Makefile index 66a25ce8d797..6e9373e5c5ed 100644 --- a/devel/jetbrains-webstorm/Makefile +++ b/devel/jetbrains-webstorm/Makefile @@ -1,6 +1,6 @@ PORTNAME= webstorm PORTVERSION= 2022.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= https://download-cdn.jetbrains.com/webstorm/ PKGNAMEPREFIX= jetbrains- @@ -22,8 +22,8 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ lsof:sysutils/lsof USES= cpe python:run shebangfix -CPE_VENDOR= jetbrains +CPE_VENDOR= jetbrains USE_JAVA= yes JAVA_VERSION= 17+ @@ -33,6 +33,7 @@ NO_ARCH= yes NO_ARCH_IGNORE= libjnidispatch.so NO_BUILD= yes SUB_FILES= ${PORTNAME} ${PORTNAME}.desktop pkg-message +SUB_LIST= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/WebStorm-223.7571.168 diff --git a/devel/jetbrains-webstorm/files/webstorm.desktop.in b/devel/jetbrains-webstorm/files/webstorm.desktop.in index 5b2dc88eb3f3..4e0c4c81e6d1 100644 --- a/devel/jetbrains-webstorm/files/webstorm.desktop.in +++ b/devel/jetbrains-webstorm/files/webstorm.desktop.in @@ -6,7 +6,7 @@ Name=WebStorm GenericName=webStorm Comment=WebStorm Integrated Development Environment Icon=%%DATADIR%%/bin/webstorm.png -Exec=%%DATADIR%%/bin/webstorm.sh +Exec=%%PREFIX%%/bin/webstorm Terminal=false StartupNotify=true Categories=Application;Development; diff --git a/devel/jetbrains-webstorm/files/webstorm.in b/devel/jetbrains-webstorm/files/webstorm.in index 9d58e3181703..1e3539713b16 100644 --- a/devel/jetbrains-webstorm/files/webstorm.in +++ b/devel/jetbrains-webstorm/files/webstorm.in @@ -1,3 +1,6 @@ #!/bin/sh +export WEBIDE_JDK=${WEBIDE_JDK:-"%%JAVA_HOME%%"} +export SHELL="/bin/sh" + exec "%%DATADIR%%/bin/webstorm.sh" "$@"