From nobody Thu Dec 15 17:26:30 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 4NXzft6Pldz4kwKR; Thu, 15 Dec 2022 17:26:30 +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 4NXzft5gsfz3s7h; Thu, 15 Dec 2022 17:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125190; 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=qOg4cDh/nleWoog4A3EAW/0gNYHAjBbyHK1YmYjejF4=; b=migNSG6oSMSVd3nJ2epgYe0kYsF7co46jw6Y77sWywsCB7+t5H8M80G+GHVKmx46/yCBGR heNYH6bEQQDwN2KLC/q1IUey7OWM0FPXbWwfxFuJwG8Zc9GS5B0vvaVoIUtR37qJDs+8YR y7f4jqX/gFIZoK3pbcCwsHEI4quu3i2aE8g3Boh3C/dtbRB1670cwNQkrZdxBvWhL/tKHO 8CiGjNXlGicTLsdgeI3wrvR5s3dkzE33LjymkfwgruryjxQHvKUoMKzPupE88ombF4xWW6 DKuZ6smxEwOxR+sd/STQAz4iS5+jLsMk08BOSQ415qMO7wTQw9yz+a7azFYjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671125190; 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=qOg4cDh/nleWoog4A3EAW/0gNYHAjBbyHK1YmYjejF4=; b=GeHP1XVPiQvkYotxdLDV8TDqDlXGCY2K+ByEhvKvoY5K5z9HuIMxPgfECgSr9MAGX+kLpP AQR2i3O8wVQVVSKeZbG/nUqYy/1pSvFAgNxS3UbwInzV0bBFh1ubKgXHKluLxlm5xgArzT MTG/MZwxlms5Hk+tAfS/2f3BoyAQTwkuGxpJ3HG7QZNgWznCDuEp9IM7qNNn+aQn65I6tg b/4fjU/K+pJ8RkdKRRbWr0r6O2gGozcL5YbY5RmEngP5PIQAbZQL8Jo2avE6YLpAULBpOP vroqD7V+OUfbsYmSovKYnp/jn+/BtV1yoGoG0RpeIqPeKnKgYauEXl9lPM2pEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671125190; a=rsa-sha256; cv=none; b=yW5HeeoWfH8MkOJGXEBd2dg0pFE4Uh3l/BEsNg0oZ1X56cIKfneQdLRtRpMwuW+iabMn2j yDoOO99d8gyg3DHPRhS8m03VwCVA3hv+gd6kQR6haacFgsnPTWWaypJCxN64ZjssZrIEYc FYIUwxt0y+T9+bGlBZcOITqPPiayNLQtX8mJ4OyEJ1Ody/pUs1U9Yt8Bx6FoHIVcv9UPV5 abC3HwbivHAU31mlX1n/eD2JS74HKNRKNUiqBYeMiFFa9vmB6s/vSJhx1MtRG1uzrDNapR gRuC5HLi9aMC3DEDGPJ6fgCumeYwUkZMgkdGVG04EIqN2DgqJcXykLjMvL+NRw== 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 4NXzft4j73zh7v; Thu, 15 Dec 2022 17:26:30 +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 2BFHQUcq098685; Thu, 15 Dec 2022 17:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BFHQUAd098684; Thu, 15 Dec 2022 17:26:30 GMT (envelope-from git) Date: Thu, 15 Dec 2022 17:26:30 GMT Message-Id: <202212151726.2BFHQUAd098684@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: 762a8c90b5a7 - main - devel/jetbrains-phpstorm: Add default JDK runtime 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 762a8c90b5a71ca649aa5c5195a21b470b42c098 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=762a8c90b5a71ca649aa5c5195a21b470b42c098 commit 762a8c90b5a71ca649aa5c5195a21b470b42c098 Author: Dmitry Wagin AuthorDate: 2022-12-15 07:38:03 +0000 Commit: Fernando Apesteguía CommitDate: 2022-12-15 17:22:28 +0000 devel/jetbrains-phpstorm: Add default JDK runtime PR: 268371 Reported by: dmitry.wagin@ya.ru (maintainer) --- devel/jetbrains-phpstorm/Makefile | 2 ++ devel/jetbrains-phpstorm/files/phpstorm.desktop.in | 2 +- devel/jetbrains-phpstorm/files/phpstorm.in | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/devel/jetbrains-phpstorm/Makefile b/devel/jetbrains-phpstorm/Makefile index a16b62d715fa..c95d1ffc741d 100644 --- a/devel/jetbrains-phpstorm/Makefile +++ b/devel/jetbrains-phpstorm/Makefile @@ -1,5 +1,6 @@ PORTNAME= phpstorm PORTVERSION= 2022.3 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://download-cdn.jetbrains.com/webide/ PKGNAMEPREFIX= jetbrains- @@ -32,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}/PhpStorm-223.7571.212 diff --git a/devel/jetbrains-phpstorm/files/phpstorm.desktop.in b/devel/jetbrains-phpstorm/files/phpstorm.desktop.in index a4c345aa1879..10712fce79a5 100644 --- a/devel/jetbrains-phpstorm/files/phpstorm.desktop.in +++ b/devel/jetbrains-phpstorm/files/phpstorm.desktop.in @@ -6,7 +6,7 @@ Name=PhpStorm GenericName=PhpStorm Comment=PhpStorm Integrated Development Environment Icon=%%DATADIR%%/bin/phpstorm.png -Exec=%%DATADIR%%/bin/phpstorm.sh +Exec=%%PREFIX%%/bin/phpstorm Terminal=false StartupNotify=true Categories=Application;Development; diff --git a/devel/jetbrains-phpstorm/files/phpstorm.in b/devel/jetbrains-phpstorm/files/phpstorm.in index 4184f8aab914..a685957065e5 100644 --- a/devel/jetbrains-phpstorm/files/phpstorm.in +++ b/devel/jetbrains-phpstorm/files/phpstorm.in @@ -1,3 +1,6 @@ #!/bin/sh +export PHPSTORM_JDK=${PHPSTORM_JDK:-"%%JAVA_HOME%%"} +export SHELL="/bin/sh" + exec "%%DATADIR%%/bin/phpstorm.sh" "$@"