From nobody Tue Jun 13 21:44:15 2023 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 4QghsD035Nz4cw6S; Tue, 13 Jun 2023 21:44:16 +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 4QghsC6JtVz44Wr; Tue, 13 Jun 2023 21:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686692655; 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=wm/OCIzOUj0RbPHWS8qyajOE3ateSBwdfBRut0eSAUM=; b=b4P3e+R/0/f257DWjgPzxDbrlpPx7R/VTzBgE6BV+Ob/MvsveCaZpqCWOMHpEGpvpKI6e5 nhRO5ZDqxeZnQplXsdwWJZMdRedhzgFmV9ZDhy6gfezC6F7FFGdoKZbEFHeTmQriZ5jeis 9TDJdigmIBck3E5OiJoTmWJkOtJw3DRisZWf01QjlhL0gRD04BQUoElsEZxyY54YqqNQae 24kt1wYJlY8upXd5S7Nq9TulIZAIG+4QYFOVBB2nukX2waSgro+6DI/ED2CDiv0GPrIRvL Ufpzbi66BV6dBa03e0RRS4Q/xyEtHSkhb2/VNPQSn6dGqNAzpoK7sL2mmQqR7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686692655; 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=wm/OCIzOUj0RbPHWS8qyajOE3ateSBwdfBRut0eSAUM=; b=fUlkLJSCJNags0byCM9G3qDHwPVs0/ZzxuQ7GqbsPWBo+v7VtN9FrIyU6f3nVngA5RPKzO i8ARMZlFGt4ln4ZnpUPaCxGmichmxqZSa/Rt8JziWn8leXIwrKRQZ+r0VBbG4MM60ug2s9 MSvHL417yrOF/RuYGhwLx57dk4GqsLuehuWR1cmLLcbKpB/SLXLdcQXSZPCgC7719MduIh 13hVWPPe5gGr1N1XgjagZQbMRykjmbwnwfEssJicMSyNOwUMP9PKOYYbeoRkJVxiC1POs7 l05BVusA2np9qL0r2qxGaHlGZ4nNioDt0S4ovN2ycN8cEOBErAzLyXsrEGGlgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686692655; a=rsa-sha256; cv=none; b=sZUOhwfwa9SZ+hUNqf8Xp9ukrfP5Oufr+cB9AetznQZQbqSu5omqr/FpMftRTXAFkh4ZJa 8pvNI3K3C1qHiloljS0qXA6bi/qWQ3TI0s0kxTf8E1afuMd4Nkkx2uFRX/tU3sX1lwxCEj SS2E9pGld32KziZlI/GYj5+saGh6NUBUa/xr7CQVBLlgCiIIOeE9XZUJB1ybPOigtTia4P eKfxt4PxTLl4ldayVF31PwlxoqODmLZAO3xHWg9yhGWbHWb9QoFyBOiNGi0QmrhCEZtcCd vbBRGKTWHXCn+mxyesC58Sb/F1LWAKb6fqgcvNQxXAxI8k2+fBfz+Ty5mJ64xA== 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 4QghsC57JczdvL; Tue, 13 Jun 2023 21:44:15 +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 35DLiFcl050825; Tue, 13 Jun 2023 21:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35DLiFC8050824; Tue, 13 Jun 2023 21:44:15 GMT (envelope-from git) Date: Tue, 13 Jun 2023 21:44:15 GMT Message-Id: <202306132144.35DLiFC8050824@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: d6b5ecaad75d - main - databases/jetbrains-datagrip: update to 2023.1.2 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: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6b5ecaad75d5e4ca291f5b3b47a08362ecbc79d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6b5ecaad75d5e4ca291f5b3b47a08362ecbc79d commit d6b5ecaad75d5e4ca291f5b3b47a08362ecbc79d Author: Dave Cottlehuber AuthorDate: 2023-06-13 21:20:14 +0000 Commit: Dave Cottlehuber CommitDate: 2023-06-13 21:42:53 +0000 databases/jetbrains-datagrip: update to 2023.1.2 Inject ports-defined custom JAVA_HOME if not overridden by user. PR: 270097 Tested by: jbo --- databases/jetbrains-datagrip/Makefile | 38 ++++++++++++++------ databases/jetbrains-datagrip/distinfo | 6 ++-- .../jetbrains-datagrip/files/datagrip.desktop.in | 2 +- databases/jetbrains-datagrip/files/datagrip.in | 4 ++- databases/jetbrains-datagrip/pkg-plist | 40 ++++++++++++---------- 5 files changed, 56 insertions(+), 34 deletions(-) diff --git a/databases/jetbrains-datagrip/Makefile b/databases/jetbrains-datagrip/Makefile index 109ac4784e7b..7ececa1a5666 100644 --- a/databases/jetbrains-datagrip/Makefile +++ b/databases/jetbrains-datagrip/Makefile @@ -1,5 +1,5 @@ PORTNAME= datagrip -DISTVERSION= 2022.3.3 +DISTVERSION= 2023.1.2 CATEGORIES= databases java MASTER_SITES= https://download-cf.jetbrains.com/datagrip/ PKGNAMEPREFIX= jetbrains- @@ -14,21 +14,25 @@ LICENSE_NAME= Subscription license agreement for business and organizations LICENSE_TEXT= See: https://www.jetbrains.com/store/license.html LICENSE_PERMS= dist-mirror pkg-mirror auto-accept +BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ + jetbrains-pty4j>=0.12.10:devel/jetbrains-pty4j \ lsof:sysutils/lsof -USES= python:run shebangfix +USES= desktop-file-utils python:run shebangfix ssl USE_JAVA= yes -JAVA_VERSION= 11+ +JAVA_VERSION= 17+ USE_LDCONFIG= yes SHEBANG_FILES= bin/restart.py 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}/DataGrip-${PORTVERSION} @@ -48,13 +52,27 @@ do-install: ${WRKSRC}/plugins/cwm-plugin/quiche-native \ ${WRKSRC}/plugins/performanceTesting/bin ${MKDIR} ${STAGEDIR}${DATADIR} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ - "! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh") - @(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh") - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @(cd ${WRKSRC} && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh") + @(cd ${WRKSRC} && \ + ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh") + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/ # Use fsnotifier replacement provided by java/intellij-fsnotifier - ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties + ${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" \ + >> ${STAGEDIR}${DATADIR}/bin/idea.properties +# Install FreeBSD native lib provided by devel/jna + @${MKDIR} ${WRKDIR}/jna + @(cd ${WRKDIR}/jna && \ + ${JAR} xf ${JAVAJARDIR}/jna.jar com/sun/jna/freebsd-x86-64/libjnidispatch.so) + ${MKDIR} ${STAGEDIR}${DATADIR}/lib/jna/amd64 + ${INSTALL_LIB} ${WRKDIR}/jna/com/sun/jna/freebsd-x86-64/libjnidispatch.so \ + ${STAGEDIR}${DATADIR}/lib/jna/amd64/ +# Use pty4j replacement provided by devel/jetbrains-pty4j + ${LN} -sf ../../../lib/pty4j ${STAGEDIR}${DATADIR}/lib/pty4j .include diff --git a/databases/jetbrains-datagrip/distinfo b/databases/jetbrains-datagrip/distinfo index 0d12d4220235..633483abd8d5 100644 --- a/databases/jetbrains-datagrip/distinfo +++ b/databases/jetbrains-datagrip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674318335 -SHA256 (jetbrains/datagrip-2022.3.3.tar.gz) = a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b -SIZE (jetbrains/datagrip-2022.3.3.tar.gz) = 569259324 +TIMESTAMP = 1686547442 +SHA256 (jetbrains/datagrip-2023.1.2.tar.gz) = 57e8a79d69d9f34957fe7fa1307296396ab7c2b84bacffb6d86616cbcd596edd +SIZE (jetbrains/datagrip-2023.1.2.tar.gz) = 568353216 diff --git a/databases/jetbrains-datagrip/files/datagrip.desktop.in b/databases/jetbrains-datagrip/files/datagrip.desktop.in index 8befcc74e2fb..82b6e8c33030 100644 --- a/databases/jetbrains-datagrip/files/datagrip.desktop.in +++ b/databases/jetbrains-datagrip/files/datagrip.desktop.in @@ -6,7 +6,7 @@ Name=DataGrip GenericName=DataGrip Comment=DataGrip Integrated Development Environment Icon=%%DATADIR%%/bin/datagrip.png -Exec=%%DATADIR%%/bin/datagrip.sh +Exec=%%PREFIX%%/bin/datagrip Terminal=false StartupNotify=true Categories=Application;Development; diff --git a/databases/jetbrains-datagrip/files/datagrip.in b/databases/jetbrains-datagrip/files/datagrip.in index 227adaf3e9bb..5ec79e7d38d6 100644 --- a/databases/jetbrains-datagrip/files/datagrip.in +++ b/databases/jetbrains-datagrip/files/datagrip.in @@ -1,3 +1,5 @@ #!/bin/sh -export JAVA_HOME="${JAVA_HOME:=/usr/local/openjdk11}" +export JAVA_HOME="${JAVA_HOME:-"%%JAVA_HOME%%"}" +export SHELL="/bin/sh" + exec "%%DATADIR%%/bin/datagrip.sh" "$@" diff --git a/databases/jetbrains-datagrip/pkg-plist b/databases/jetbrains-datagrip/pkg-plist index fbc84263f00a..cdcff388abca 100644 --- a/databases/jetbrains-datagrip/pkg-plist +++ b/databases/jetbrains-datagrip/pkg-plist @@ -1,21 +1,23 @@ @dir %%DATADIR%%/lib/jna/amd64 +@dir %%DATADIR%%/lib/native/linux-x86_64 @dir %%DATADIR%%/lib/pty4j/linux/x86-64 +@dir %%DATADIR%%/plugins/performanceTesting-yourkit/bin %%DATADIR%%/bin/brokenPlugins.db %%DATADIR%%/bin/datagrip.png %%DATADIR%%/bin/datagrip.sh %%DATADIR%%/bin/datagrip.svg %%DATADIR%%/bin/datagrip64.vmoptions %%DATADIR%%/bin/format.sh -%%DATADIR%%/bin/icons/icons-v2-1.0-d.db -%%DATADIR%%/bin/icons/icons-v2-1.0.db -%%DATADIR%%/bin/icons/icons-v2-1.25-d.db -%%DATADIR%%/bin/icons/icons-v2-1.25.db -%%DATADIR%%/bin/icons/icons-v2-1.5-d.db -%%DATADIR%%/bin/icons/icons-v2-1.5.db -%%DATADIR%%/bin/icons/icons-v2-2.0-d.db -%%DATADIR%%/bin/icons/icons-v2-2.0.db -%%DATADIR%%/bin/icons/icons-v2-2.5-d.db -%%DATADIR%%/bin/icons/icons-v2-2.5.db +%%DATADIR%%/bin/icons/icon-v4-1.0-d.db +%%DATADIR%%/bin/icons/icon-v4-1.0.db +%%DATADIR%%/bin/icons/icon-v4-1.25-d.db +%%DATADIR%%/bin/icons/icon-v4-1.25.db +%%DATADIR%%/bin/icons/icon-v4-1.5-d.db +%%DATADIR%%/bin/icons/icon-v4-1.5.db +%%DATADIR%%/bin/icons/icon-v4-2.0-d.db +%%DATADIR%%/bin/icons/icon-v4-2.0.db +%%DATADIR%%/bin/icons/icon-v4-2.5-d.db +%%DATADIR%%/bin/icons/icon-v4-2.5.db %%DATADIR%%/bin/idea.properties %%DATADIR%%/bin/inspect.sh %%DATADIR%%/bin/ltedit.sh @@ -24,13 +26,12 @@ %%DATADIR%%/bin/restart.py %%DATADIR%%/build.txt %%DATADIR%%/Install-Linux-tar.txt -%%DATADIR%%/lib/3rd-party-native.jar %%DATADIR%%/lib/3rd-party-rt.jar %%DATADIR%%/lib/annotations-java5.jar %%DATADIR%%/lib/app.jar %%DATADIR%%/lib/async-profiler-windows.jar %%DATADIR%%/lib/async-profiler.jar -%%DATADIR%%/lib/build-marker-DB-223.8617.3 +%%DATADIR%%/lib/build-marker-DB-231.9011.35 %%DATADIR%%/lib/byte-buddy-agent.jar %%DATADIR%%/lib/cds/classesLogAgent.jar %%DATADIR%%/lib/error-prone-annotations.jar @@ -38,17 +39,18 @@ %%DATADIR%%/lib/externalProcess-rt.jar %%DATADIR%%/lib/forms_rt.jar %%DATADIR%%/lib/groovy.jar -%%DATADIR%%/lib/intellij-coverage-agent-1.0.682.jar +%%DATADIR%%/lib/intellij-coverage-agent-1.0.706.jar %%DATADIR%%/lib/intellij-test-discovery.jar %%DATADIR%%/lib/jetbrains-annotations.jar +%%DATADIR%%/lib/jna/amd64/libjnidispatch.so %%DATADIR%%/lib/jps-model.jar %%DATADIR%%/lib/jsch-agent.jar -%%DATADIR%%/lib/platform-objectSerializer-annotations.jar -%%DATADIR%%/lib/platform-statistics-devkit.jar %%DATADIR%%/lib/protobuf.jar +%%DATADIR%%/lib/pty4j/pty4j %%DATADIR%%/lib/rd.jar %%DATADIR%%/lib/stats.jar %%DATADIR%%/lib/util_rt.jar +%%DATADIR%%/lib/util-8.jar %%DATADIR%%/lib/util.jar %%DATADIR%%/license/javahelp_license.txt %%DATADIR%%/license/javolution_license.txt @@ -73,15 +75,15 @@ %%DATADIR%%/plugins/grid-core-impl/lib/grid-core.jar %%DATADIR%%/plugins/grid-core-impl/lib/jdbc-console-types.jar %%DATADIR%%/plugins/grid-impl/lib/grid.jar +%%DATADIR%%/plugins/performanceTesting-async/lib/performanceTesting-async.jar +%%DATADIR%%/plugins/performanceTesting-yourkit/lib/performanceTesting-yourkit.jar +%%DATADIR%%/plugins/performanceTesting-yourkit/lib/yjp-controller-api-redist.jar %%DATADIR%%/plugins/performanceTesting/lib/performanceTesting.jar -%%DATADIR%%/plugins/performanceTesting/lib/yjp-controller-api-redist.jar %%DATADIR%%/plugins/platform-images/lib/platform-images.jar %%DATADIR%%/plugins/platform-langInjection/lib/IntelliLang.jar %%DATADIR%%/plugins/platform-langInjection/lib/java-langInjection-jps.jar %%DATADIR%%/plugins/platform-langInjection/lib/platform-langInjection.jar %%DATADIR%%/plugins/remote-dev-server/bin/launcher.sh -%%DATADIR%%/plugins/remote-dev-server/bin/xplat-launcher-third-party-licenses-x86_64-linux.html -%%DATADIR%%/plugins/remote-dev-server/bin/xplat-launcher-x86_64-linux %%DATADIR%%/plugins/remote-dev-server/lib/remote-dev-server.jar %%DATADIR%%/plugins/remote-dev-server/selfcontained/bin/xkbcomp %%DATADIR%%/plugins/remote-dev-server/selfcontained/bin/Xvfb @@ -567,6 +569,7 @@ %%DATADIR%%/plugins/textmate/lib/bundles/html/language-configuration.json %%DATADIR%%/plugins/textmate/lib/bundles/html/package.json %%DATADIR%%/plugins/textmate/lib/bundles/html/package.nls.json +%%DATADIR%%/plugins/textmate/lib/bundles/html/snippets/html.code-snippets %%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html-derivative.tmLanguage.json %%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html.tmLanguage.json %%DATADIR%%/plugins/textmate/lib/bundles/ini/.vscodeignore @@ -613,7 +616,6 @@ %%DATADIR%%/plugins/textmate/lib/bundles/julia/package.nls.json %%DATADIR%%/plugins/textmate/lib/bundles/julia/syntaxes/julia.tmLanguage.json %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/info.plist -%%DATADIR%%/plugins/textmate/lib/bundles/kotlin/package.json %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/snippets/class.tmSnippet %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/snippets/println.tmSnippet %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/syntaxes/Kotlin.tmLanguage