git: 3bca93127d15 - main - devel/jetbrains-webstorm: Add default JDK runtime

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3bca93127d150cd16e7887487256ce5e6dd5fdef

commit 3bca93127d150cd16e7887487256ce5e6dd5fdef
Author:     Dmitry Wagin <dmitry.wagin@ya.ru>
AuthorDate: 2022-12-15 07:36:47 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
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" "$@"