From nobody Wed Dec 07 05:07:33 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 4NRldx6QYZz4jmrR; Wed, 7 Dec 2022 05:07:33 +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 4NRldx5yZKz47Ym; Wed, 7 Dec 2022 05:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670389653; 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=p3cXMBpLwaPv1ntHCpI+Bq83vkHBYrvJ1O+8UXj6nP8=; b=QNCCtWA2d7GAl0P4FUltQqAK7zP6MIhdWL1HG8kXW1j/jVr+UXDO+OyfXzwK4xniVTTk2q gqvb1VEe2BvoOytfQtgxje25BE8KOkMs7NwYYjas3kEFIsUKHBBeO6zUcHjzohqNt7v00N l5JabGHjZlMIQk8XYirdBoUDITFWcagnMDWzjHLYqPGdfQU09NkfUTZWXmMDQTWCt/1W0v KAG5WXQ6lbVHPTTicIrS73Da/C+J8ParnbMX8A8ZHltC9NVzAxiX5Y+QFiZmRBUhTdRdFN o/rzbYycowgz7TytSKERsJJ8/yK7pM9/TILJsJiLFN9HYX+bkima24hC9M4Qsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670389653; 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=p3cXMBpLwaPv1ntHCpI+Bq83vkHBYrvJ1O+8UXj6nP8=; b=eWEw2kKI1yspueRmInkUxSrGVAWoa+s7mU8JdJM9oQ0KNbHQon/2JwOKbf6Yn+ELVcN9qu YEdyf5ubvz3c9H+R2GfUKuAy4vZS96K7eFyy98jonswuPsvv2vtfunKGxL1IyRIQReJine R4dr3fVjFM1sitog7+EFqSDKL+6FtBiNuj4igqx2p8CxTlH4eefQ+Iwsi4iPWDVPpYbHSy QLI8FQ9jiOdr8VwO+yypNPQYWe+OtnDIeP4T+OOFWmMnpRtwh1ZYnyv1uuYSF7bO3BI3wf idIsTv1K9Lw9+wUE7T+agbgg1K8hgf7f9Y5L5OH0xFBb6Q1VOwFvv2XibCHzKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670389653; a=rsa-sha256; cv=none; b=ejfFDT0VuxBbko8j6q7qZMGB5w+OFxCcTqyc+3kAasMiSYnjWYhAoLVPRTk0bHl6LGF31G E1MTFaAnbqKlsqUXWG7GJkesyhqru6npiGBjleJRW+ATncamZ88omde1JbKlzCHRGFDmoE K+38Pqk9T8Xq47tPlarAdSJChjrP+S8WXFgxbdy5KKtFxBgcxgiVbzH8Ys11IGkV3pvA3X a6obM6bifCoRLmr0wQ7Jumh5AyjOIOTJIaVWI7A12UsJ2/JwUuu779/v8pEzfuQubnqCtP psbLDKfnlVl8pi//p6V8umi/evTsJJ5r6sreIIiBAfTW32Lai9p+kUv882ONvw== 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 4NRldx53FHz14hn; Wed, 7 Dec 2022 05:07:33 +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 2B757XE5059567; Wed, 7 Dec 2022 05:07:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B757Xv5059566; Wed, 7 Dec 2022 05:07:33 GMT (envelope-from git) Date: Wed, 7 Dec 2022 05:07:33 GMT Message-Id: <202212070507.2B757Xv5059566@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: 54d9137d0845 - main - devel/jetbrains-webstorm: Fixed pseudo terminal support 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: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54d9137d084527decc6767e1c5971ad21d07dca2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=54d9137d084527decc6767e1c5971ad21d07dca2 commit 54d9137d084527decc6767e1c5971ad21d07dca2 Author: Dmitry Wagin AuthorDate: 2022-12-07 05:07:17 +0000 Commit: Guangyuan Yang CommitDate: 2022-12-07 05:07:17 +0000 devel/jetbrains-webstorm: Fixed pseudo terminal support PR: 268155 --- devel/jetbrains-webstorm/Makefile | 16 ++++++++++++++-- devel/jetbrains-webstorm/pkg-plist | 10 ++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/devel/jetbrains-webstorm/Makefile b/devel/jetbrains-webstorm/Makefile index 5d91f997ab7b..66a25ce8d797 100644 --- a/devel/jetbrains-webstorm/Makefile +++ b/devel/jetbrains-webstorm/Makefile @@ -1,5 +1,6 @@ PORTNAME= webstorm PORTVERSION= 2022.3 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://download-cdn.jetbrains.com/webstorm/ PKGNAMEPREFIX= jetbrains- @@ -15,7 +16,9 @@ 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= cpe python:run shebangfix @@ -27,6 +30,7 @@ JAVA_VERSION= 17+ SHEBANG_FILES= bin/restart.py NO_ARCH= yes +NO_ARCH_IGNORE= libjnidispatch.so NO_BUILD= yes SUB_FILES= ${PORTNAME} ${PORTNAME}.desktop pkg-message @@ -42,19 +46,27 @@ do-install: ${WRKSRC}/bin/repair \ ${WRKSRC}/jbr \ ${WRKSRC}/jre64 \ - ${WRKSRC}/lib/pty4j-native \ + ${WRKSRC}/lib/pty4j \ ${WRKSRC}/plugins/cwm-plugin \ + ${WRKSRC}/plugins/gateway-plugin/lib/remote-dev-workers \ ${WRKSRC}/plugins/performanceTesting \ ${WRKSRC}/plugins/remote-dev-server \ ${WRKSRC}/plugins/webp/lib/libwebp ${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \ - "! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh") + "! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh ! -name *\.exe") @(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 +# 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/devel/jetbrains-webstorm/pkg-plist b/devel/jetbrains-webstorm/pkg-plist index 32c9077dffae..e9f2726fe707 100644 --- a/devel/jetbrains-webstorm/pkg-plist +++ b/devel/jetbrains-webstorm/pkg-plist @@ -43,11 +43,13 @@ share/applications/webstorm.desktop %%DATADIR%%/lib/intellij-coverage-agent-1.0.682.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 %%DATADIR%%/lib/rd.jar %%DATADIR%%/lib/stats.jar %%DATADIR%%/lib/util.jar @@ -100,12 +102,6 @@ share/applications/webstorm.desktop %%DATADIR%%/plugins/gateway-plugin/lib/gateway-plugin.jar %%DATADIR%%/plugins/gateway-plugin/lib/gateway-standalone/gateway.core.jar %%DATADIR%%/plugins/gateway-plugin/lib/gateway-standalone/gateway.jar -%%DATADIR%%/plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-darwin-amd64 -%%DATADIR%%/plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-darwin-arm64 -%%DATADIR%%/plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-amd64 -%%DATADIR%%/plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-linux-arm64 -%%DATADIR%%/plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-windows-amd64.exe -%%DATADIR%%/plugins/gateway-plugin/lib/remote-dev-workers/remote-dev-worker-windows-arm64.exe %%DATADIR%%/plugins/gateway-plugin/resources/gateway.vmoptions %%DATADIR%%/plugins/gateway-terminal/lib/gateway-terminal.jar %%DATADIR%%/plugins/gherkin/lib/gherkin.jar @@ -810,5 +806,3 @@ share/applications/webstorm.desktop %%DATADIR%%/plugins/xml-refactoring/lib/xml-refactoring.jar %%DATADIR%%/plugins/yaml/lib/yaml.jar %%DATADIR%%/product-info.json -@dir %%DATADIR%%/lib/jna/amd64 -@dir %%DATADIR%%/lib/pty4j/linux/x86-64