Date: Thu, 15 Dec 2022 17:27:12 GMT From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c7805aea91de - main - devel/jetbrains-goland: Add default JDK runtime Message-ID: <202212151727.2BFHRCsM098924@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7805aea91de54d4aba30d24153244585ee5b9eb commit c7805aea91de54d4aba30d24153244585ee5b9eb Author: Dmitry Wagin <dmitry.wagin@ya.ru> AuthorDate: 2022-12-15 07:39:09 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2022-12-15 17:23:13 +0000 devel/jetbrains-goland: Add default JDK runtime PR: 268370 Reported by: dmitry.wagin@ya.ru (maintainer) --- devel/jetbrains-goland/Makefile | 4 +++- devel/jetbrains-goland/files/goland.desktop.in | 2 +- devel/jetbrains-goland/files/goland.in | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/devel/jetbrains-goland/Makefile b/devel/jetbrains-goland/Makefile index d10a4de1acc5..1c7b685ae37d 100644 --- a/devel/jetbrains-goland/Makefile +++ b/devel/jetbrains-goland/Makefile @@ -1,5 +1,6 @@ PORTNAME= goland PORTVERSION= 2022.3 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://download-cdn.jetbrains.com/go/ PKGNAMEPREFIX= jetbrains- @@ -20,8 +21,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+ @@ -31,6 +32,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}/GoLand-${PORTVERSION} diff --git a/devel/jetbrains-goland/files/goland.desktop.in b/devel/jetbrains-goland/files/goland.desktop.in index b1b8a717e013..c14c2bb26d82 100644 --- a/devel/jetbrains-goland/files/goland.desktop.in +++ b/devel/jetbrains-goland/files/goland.desktop.in @@ -6,7 +6,7 @@ Name=GoLand GenericName=GoLand Comment=GoLand Integrated Development Environment Icon=%%DATADIR%%/bin/goland.png -Exec=%%DATADIR%%/bin/goland.sh +Exec=%%PREFIX%%/bin/goland Terminal=false StartupNotify=true Categories=Application;Development; diff --git a/devel/jetbrains-goland/files/goland.in b/devel/jetbrains-goland/files/goland.in index dc0f7656cce3..4c889308a1be 100644 --- a/devel/jetbrains-goland/files/goland.in +++ b/devel/jetbrains-goland/files/goland.in @@ -1,3 +1,6 @@ #!/bin/sh +export GOLAND_JDK=${GOLAND_JDK:-"%%JAVA_HOME%%"} +export SHELL="/bin/sh" + exec "%%DATADIR%%/bin/goland.sh" "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212151727.2BFHRCsM098924>