Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Jun 2024 17:20:01 GMT
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 17482529d3be - main - devel/pycharm-pro: sync with pycharm-ce
Message-ID:  <202406231720.45NHK1TL011404@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=17482529d3bec87a868c36446096f080f3a8810b

commit 17482529d3bec87a868c36446096f080f3a8810b
Author:     Ruslan Makhmatkhanov <rm@FreeBSD.org>
AuthorDate: 2024-06-23 17:19:33 +0000
Commit:     Ruslan Makhmatkhanov <rm@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406231720.45NHK1TL011404>