From nobody Thu Dec 15 17:27:12 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 4NXzgj06Gcz4kwdp; Thu, 15 Dec 2022 17:27:13 +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 4NXzgh6cB9z3sC9; Thu, 15 Dec 2022 17:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125232; 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=NpaZXE2UUQZy7vffpSSykmRgcN1kPPjTkH2/pTEuE+0=; b=vZG44rZ7KogL4+YFkbLnG2SoHKkkjY/VRfDibW4DOsOavUoIofZ10VKVt3obbp3pzCXyDi b8uqAy1watuJ5BWIBzOrf4/aM45tRfYnwbnJzSR/o5ybeFJ2U8k/Z+sbqrxrPR5pMiiGDq uAzt/LBvbZewRzO1kOmEcEpmKEexw2vvdVr1WHL+nJHXQB1broEc7wY51rw4v990kaIrOp M6dxSJTibB70DUBjmRvxz4yh/lslYPkqfYe7ly0T73+jN24laBpDz+DS1Cy/kbxlMRaGmD LAF/MDjCrlw8zH9ao8says9wFoJP6FIUtArIvcVr1LcLNxwkeYgBaYsCcsLT9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125232; 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=NpaZXE2UUQZy7vffpSSykmRgcN1kPPjTkH2/pTEuE+0=; b=wANWlSQ9cAugTp+smF1RzKNOKr6RiTQ8VRog/mkkJGcGJ8JB7ipI+yoCGh3201mNeKHf+8 h+aENZn9wkSC+1sTbUaU45hqi1oucgRiJe9aD7ZGBEsigIjhELH5Y9n6dmYVzZ+HRfArs8 R1PiqL5yIp/uOFFg+7MZBnt8Pt80Ou8xbCz1MikkIJCbEqNulqQ5dEWFGARPRhYvs7Yhue ZXjT6dcfs4UOJEyj7gZ0eXlXJAvOQc2sWD7jc8AfUdqUwpwZk0tHoJHQJx7z4wo9edgp4A mxKNk28xZlDYb81MfM3w5RQypSpITFMBMdFn5isvZgfGjQuU+8wmhggKzl2Xnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671125232; a=rsa-sha256; cv=none; b=nmQxPQEY6wD1ZZjbn+0jWxe3iNVdxVewTITEfZXB4zGxzAFJQLiG+66z5c9xKsK7pbzm04 vAXsrPRK8RbU+RWxQXQk6NntY2F5j5zyozLoZYe4ZWHcvhThfi/Foc0wUjndY8U9xKR1ku JzBp9EQwjWn5CDgtSGwMVeDlqb8Xy138ywSUdcaZbd+QwXFf9Ng6I6OTE2Aajm+lZiNyuE WQPiFTf/YTdNz4cFZpS32pv47ge2qdvIAfaFoWUkqE5QfZjZ4GasrtVJcvsVlt1VFB7EYb 9wpprAvhQlonepVVIq9sQ0Wv2a0eQ/x1cshRTw09G3kZNYyAQRTkSqvr1SdnYg== 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 4NXzgh4YblzhKR; Thu, 15 Dec 2022 17:27:12 +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 2BFHRCcq098925; Thu, 15 Dec 2022 17:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BFHRCsM098924; Thu, 15 Dec 2022 17:27:12 GMT (envelope-from git) Date: Thu, 15 Dec 2022 17:27:12 GMT Message-Id: <202212151727.2BFHRCsM098924@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: c7805aea91de - main - devel/jetbrains-goland: 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: c7805aea91de54d4aba30d24153244585ee5b9eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7805aea91de54d4aba30d24153244585ee5b9eb commit c7805aea91de54d4aba30d24153244585ee5b9eb Author: Dmitry Wagin AuthorDate: 2022-12-15 07:39:09 +0000 Commit: Fernando Apesteguía 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" "$@"