From nobody Sun Jun 23 17:20:01 2024 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 4W6dBn5shkz5Nddr; Sun, 23 Jun 2024 17:20:01 +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 4W6dBn51hWz43jc; Sun, 23 Jun 2024 17:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719163201; 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=CPVDIvnagsojkFRjrwXpRZ1hLkeAglCYiC/FOwtEnMg=; b=XsO08MAmLfaai046PWjk77sEkjqKSmh2XajheM0Q0TRaM5NEowCLt211qSGGtvYMlhmQxx jgnCJ1SkKBUwd21VJ3jSKAVmTCT7IZxkSI+p7D5tQVdhPOhNVvPMJzQvi3Ty+//BOxMx3I 0L/8necoJm49hZPlWVGvx8U6qMB8GslrxqVqAs6Rte8fk/BRvrL+OkZVy7asIJmTkG8FBU 27KesbHeocPVXFlY7wax2NVPUu6B8yIhniZPS/ihM6AKHAG7S6Nc6A21pENnI0W36bB4NS 1LhumVsukbov0wCGByIeX8PigAJjdX/ZU/bU5PPmldf8pP0yqnfkIsxj+p1q8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719163201; a=rsa-sha256; cv=none; b=ptI9Cu/m5rhL8glDxd6u7qTsHWKskOjl5fq55mxAf48uAh3y6ZFUDzUMbN15nRFqKnyHIl DY4k7oH+AGFlsAp7U4vvN/vuKfi1xYdslDGLmidxc5gqT0pHys+JvIMyRRdsWMPHjG7Gz1 ZTv0bzhEBGZ5XU7xjuP6yHRWHfXop8f1xuebFS85tUsWSirIlluV0cX92pPSPUvsPZGuHJ bIqGqfzO41PwQrWAQmQTe7Ut/yhTeQtlegjgR+3jp0NljSkNWggBKgD4FhrxJECOkO/+Fs AtX56z5V4bGSi/qXTewohQ5N2b5AZkUXtHZwLmRFAUxEdPVaesOrZ93OyeUnfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719163201; 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=CPVDIvnagsojkFRjrwXpRZ1hLkeAglCYiC/FOwtEnMg=; b=abNFK9iFNi0PBEAL8MZjCuYVoHumfBx4wR75DhXvHyaxyKtHvGSZ4+D9QG16vfDijp4GMC y1OP2t4ymXPTlMImeT04vbjfMMGA5h2N/Z4zxLkot/zQFhE+fsG2QesVijGCockoSdSpOw ct1qKbmrf3WR4W7OabSwvNAmxyBcqYIrpH8HWbYRSP4CbGZ3w5a4euU6f/9H9s/QGZbibI ++hU9upO98DQT1MVqC/tMbdn1QnFVjZQMuLNgQvXj2Bc17i52KSAehOkFzmTNoe97ws5XX FVFiQLDlk1zRheZ3cFNRSKsVTvgJ6WxRvRJO/5vFSU0w3EH9BSNFp0fZGB9+eg== 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 4W6dBn4W8szkGp; Sun, 23 Jun 2024 17:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45NHK1TU011409; Sun, 23 Jun 2024 17:20:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45NHK1TL011404; Sun, 23 Jun 2024 17:20:01 GMT (envelope-from git) Date: Sun, 23 Jun 2024 17:20:01 GMT Message-Id: <202406231720.45NHK1TL011404@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ruslan Makhmatkhanov Subject: git: 17482529d3be - main - devel/pycharm-pro: sync with pycharm-ce 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17482529d3bec87a868c36446096f080f3a8810b Auto-Submitted: auto-generated The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=17482529d3bec87a868c36446096f080f3a8810b commit 17482529d3bec87a868c36446096f080f3a8810b Author: Ruslan Makhmatkhanov AuthorDate: 2024-06-23 17:19:33 +0000 Commit: Ruslan Makhmatkhanov CommitDate: 2024-06-23 17:19:33 +0000 devel/pycharm-pro: sync with pycharm-ce cherry-pick some improvements from devel/pycharm-ce: - add dependency upon devel/jetbrains-restarter - fix shebangs in some packaged files - utilize DISTNAME on extract stage instead of hardcoded filename - bump PORTREVISION --- devel/pycharm-pro/Makefile | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/devel/pycharm-pro/Makefile b/devel/pycharm-pro/Makefile index a9e4cd45a5a6..55b9deca9786 100644 --- a/devel/pycharm-pro/Makefile +++ b/devel/pycharm-pro/Makefile @@ -1,5 +1,6 @@ PORTNAME= pycharm-pro DISTVERSION= 2024.1.3 +PORTREVISION= 1 CATEGORIES= devel java python MASTER_SITES= https://download.jetbrains.com/python/ DISTNAME= pycharm-professional-${PORTVERSION} @@ -16,26 +17,30 @@ LICENSE_PERMS= no-dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= intellij-fsnotifier>0:java/intellij-fsnotifier \ jetbrains-pty4j>=0.12.13:devel/jetbrains-pty4j \ + jetbrains-restarter>=233.11799.241:devel/jetbrains-restarter \ jetbrains-sqlite>=232.8660.185:devel/jetbrains-sqlite -USES= cpe python:run shebangfix +USES= cpe desktop-file-utils python:run shebangfix CPE_VENDOR= jetbrains USE_JAVA= yes JAVA_VERSION= 17+ +SHEBANG_FILES= plugins/python/helpers/pycodestyle-2.10.0.py \ + plugins/python/helpers/pycodestyle.py \ + plugins/python/helpers/typeshed/scripts/sync_tensorflow_protobuf_stubs.sh # Remove the bundled native Pty4J support libraries, they are replaced # by devel/jetbrains-pty4j # Remove bundled linux-only JRE -EXTRACT_AFTER_ARGS= --exclude pycharm-${PORTVERSION}/bin/*fsnotifier* \ - --exclude pycharm-${PORTVERSION}/bin/*.so \ - --exclude pycharm-${PORTVERSION}/bin/repair \ - --exclude pycharm-${PORTVERSION}/lib/*.so \ - --exclude pycharm-${PORTVERSION}/plugins/*.so \ - --exclude pycharm-${PORTVERSION}/plugins/cwm-plugin/quiche-native \ - --exclude pycharm-${PORTVERSION}/plugins/python/helpers/pydev/pydevd_attach_to_process \ - --exclude pycharm-${PORTVERSION}/lib/pty4j \ - --exclude pycharm-${PORTVERSION}/jbr \ +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/*fsnotifier* \ + --exclude ${DISTNAME}/bin/*.so \ + --exclude ${DISTNAME}/bin/repair \ + --exclude ${DISTNAME}/lib/*.so \ + --exclude ${DISTNAME}/plugins/*.so \ + --exclude ${DISTNAME}/plugins/cwm-plugin/quiche-native \ + --exclude ${DISTNAME}/plugins/python/helpers/pydev/pydevd_attach_to_process \ + --exclude ${DISTNAME}/lib/pty4j \ + --exclude ${DISTNAME}/jbr \ --no-same-owner --no-same-permissions WRKSRC= ${WRKDIR}/pycharm-${PORTVERSION} @@ -70,6 +75,8 @@ do-install: # Use pty4j replacement provided by devel/jetbrains-pty4j ${MKDIR} ${STAGEDIR}${DATADIR}/lib/pty4j/freebsd/x86-64 ${LN} -sf ../../../../../jetbrains/pty4j/amd64/libpty.so ${STAGEDIR}${DATADIR}/lib/pty4j/freebsd/x86-64/libpty.so +# Use restarter provided by devel/jetbrains-restarter + ${LN} -sf ../../jetbrains/restarter/restarter ${STAGEDIR}${DATADIR}/bin/restarter # Use sqlite replacement provided by devel/jetbrains-sqlite ${MKDIR} ${STAGEDIR}${DATADIR}/lib/native/linux-x86_64 ${LN} -sf ../../../../jetbrains/sqlite/amd64/libsqliteij.so ${STAGEDIR}${DATADIR}/lib/native/linux-x86_64/libsqliteij.so