From nobody Tue Dec 13 15:33:49 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 4NWjFn2yTKz4k57M; Tue, 13 Dec 2022 15:33:49 +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 4NWjFn2RB7z3t8L; Tue, 13 Dec 2022 15:33:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670945629; 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=t8v1KG5ZtCL1s3DBBK5bA9YoaFcbIxRyCarLiwZ6MV8=; b=E0inyQxijGQL1HAdJpZObLLXgyx6ukBHkOTP2WHGij0iuZwbuPkmhMqWpVDuAUEaFJYUFO yVni2cvANaA39IxQN+QMdbZkAorbcqdlHzT5+0LBl6NlRdUpjqycznZ3h350X/1Nc2s4om MY9AqGUXqCB8x0dvB4PR9DmHjNfHLFgzB/zLbFBt4w2yUcG21hOVlAhr1i5dV7dBo4Mw1K KpwLRrBeB0FUI6FmftbVNztVarG6xGD5Rdl7VgsTVPVPG5fOLixE5tTb2dp0zSaMpalhyn Os365HF5kaPC9XJIRFnhecZ6D2+Iag9zGsQw62DhQLTu272ElutXsy1R58fbmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670945629; 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=t8v1KG5ZtCL1s3DBBK5bA9YoaFcbIxRyCarLiwZ6MV8=; b=yRaq35X3qwtr7SFuheqb+DrisTKEoX6a9tslEHZ+2tfkcCMsLA9wtySVdIoeHSPdIfnLVV 1R1lgiw1Lx0CqZjrjIZqwqh/b0dAiNZ44kXKUIa4xkGCId2T2YNfOIovfgRiQQhl5pPMDH 3JTlOMi/qv3RmagcAqKCcBNAxRhixNejnkUM01FSihldX15vlHmcJLRNeoiKZrEMBXgHRZ HL/ZF/Ab4+57ZmvcNxvnSmhwiF2VDtPF/5m/fICDhH8qZNfq2+X/tj6ynPMsOOjGY6TweY iqSKJnA2KcxUnpM34thlRVJ+ABJgufqPExzAd7fUdM9yyINVwocSZ9L+k93niw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670945629; a=rsa-sha256; cv=none; b=Scj1BmoEEL13BGMNPfbzzZ0KwvogbEifadiOLJYK0Hm1NnGbzRN4aKfMs05iw9qWLD0/59 uSkm7EG+ykdxxg8P4zqT96aTSyNpmJkrlNeatBkzHycOeXz2y+W9f1jlcIovcooZ7CfEnc pbYrWRsW8361ITxeJ+pA/ZtXaDgb6B0NpKz0/vxSTQbErKcfdZqdNtRXtAqgnYQ6NH0qK9 pRnqpPpuWsLRwD0CN4k3sGsEJMCUKprx4aRVX+z/j6vkafzMU3nPx8Rh6pXuGuhaCp6mNR ijLjMB7bONchw2Aw+JZlOXLXOlCz1AgZeIUvq5TflUWPEt+a9KNbQMAud63UEQ== 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 4NWjFn179czJyh; Tue, 13 Dec 2022 15:33:49 +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 2BDFXnKv019489; Tue, 13 Dec 2022 15:33:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDFXnWY019488; Tue, 13 Dec 2022 15:33:49 GMT (envelope-from git) Date: Tue, 13 Dec 2022 15:33:49 GMT Message-Id: <202212131533.2BDFXnWY019488@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 4fecb3275970 - main - devel/jetbrains-clion: define default JAVA_HOME 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fecb327597025f0cd4d809c128279f12dacd5b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4fecb327597025f0cd4d809c128279f12dacd5b7 commit 4fecb327597025f0cd4d809c128279f12dacd5b7 Author: Dmitry Wagin AuthorDate: 2022-12-13 15:32:03 +0000 Commit: Tobias C. Berner CommitDate: 2022-12-13 15:32:03 +0000 devel/jetbrains-clion: define default JAVA_HOME bin/clion tries to figure out the proper JAVA_HOME, while giving the user the ability to override it. This can lead to it picking up a too old Java version: > clion java.lang.UnsupportedClassVersionError: com/intellij/util/lang/PathClassLoader has been compiled by a more recent version of the Java Runtime (class file version 61.0), this version of the Java Runtime only recognizes class file versions up to 52.0 To fix this, make the ports tree fill in its JAVA_HOME into bin/clion. Users can still override it to something specific by overriding CLION_JDK: > env CLION_JDK=/some/other/jdk/installation clion PR: 268358 --- devel/jetbrains-clion/Makefile | 5 +++-- devel/jetbrains-clion/files/clion.desktop.in | 2 +- devel/jetbrains-clion/files/clion.in | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devel/jetbrains-clion/Makefile b/devel/jetbrains-clion/Makefile index a1b37213d77d..96254501be41 100644 --- a/devel/jetbrains-clion/Makefile +++ b/devel/jetbrains-clion/Makefile @@ -1,5 +1,6 @@ PORTNAME= clion PORTVERSION= 2022.3 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://download-cdn.jetbrains.com/cpp/ PKGNAMEPREFIX= jetbrains- @@ -22,11 +23,10 @@ RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ USES= cpe python:run shebangfix +CPE_VENDOR= jetbrains USE_JAVA= yes JAVA_VERSION= 17+ -CPE_VENDOR= jetbrains - SHEBANG_FILES= bin/restart.py \ plugins/python-ce/helpers/typeshed/scripts/generate_proto_stubs.sh @@ -34,6 +34,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}/clion-${PORTVERSION} diff --git a/devel/jetbrains-clion/files/clion.desktop.in b/devel/jetbrains-clion/files/clion.desktop.in index d160a98109e1..13342d422f55 100644 --- a/devel/jetbrains-clion/files/clion.desktop.in +++ b/devel/jetbrains-clion/files/clion.desktop.in @@ -6,7 +6,7 @@ Name=CLion GenericName=CLion Comment=CLion Integrated Development Environment Icon=%%DATADIR%%/bin/clion.png -Exec=%%DATADIR%%/bin/clion.sh +Exec=%%PREFIX%%/bin/clion Terminal=false StartupNotify=true Categories=Application;Development; diff --git a/devel/jetbrains-clion/files/clion.in b/devel/jetbrains-clion/files/clion.in index ad009afcadec..99e504d2c269 100644 --- a/devel/jetbrains-clion/files/clion.in +++ b/devel/jetbrains-clion/files/clion.in @@ -1,3 +1,6 @@ #!/bin/sh +export CLION_JDK=${CLION_JDK:-"%%JAVA_HOME%%"} +export SHELL="/bin/sh" + exec "%%DATADIR%%/bin/clion.sh" "$@"