devel/pycharm-pro: update to 2023.2.1

Update pycharm-pro to latest version. This is mainly Makefile sync with other jetbrains ports and pycharm-ce. Release notes: https://www.jetbrains.com/pycharm/whatsnew/2023-2/ PR: 273225 Approved by: Guido Kollerie <guido@kollerie.com>
freebsd · Sep 4, 2023 · 4ddc86a · 4ddc86a
1 parent d3f53b9
commit 4ddc86a
Show file tree

Hide file tree

Showing 6 changed files with 874 additions and 649 deletions.
diff --git a/devel/pycharm-pro/Makefile b/devel/pycharm-pro/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pycharm-pro
-PORTVERSION=	2022.2.2
-PORTREVISION=	2
+DISTVERSION=	2023.2.1
 CATEGORIES=	devel java python
 MASTER_SITES=	https://download.jetbrains.com/python/ \
 		http://download.jetbrains.com/python/
@@ -15,16 +14,18 @@ LICENSE_NAME=	Subscription license agreement for business and organizations
 LICENSE_TEXT=	See: https://www.jetbrains.com/store/license.html
 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 \
-		intellij-pty4j>=0.11.4:java/intellij-pty4j \
-		openjfx14>=0:java/openjfx14
+		jetbrains-pty4j>=0.12.13:devel/jetbrains-pty4j \
+		jetbrains-sqlite>=232.8660.185:devel/jetbrains-sqlite
 
-USES=		python:run shebangfix
-
-SHEBANG_FILES=	bin/restart.py
+USES=		cpe python:run shebangfix
 
+CPE_VENDOR=	jetbrains
 USE_JAVA=	yes
-JAVA_VERSION=	11+
+JAVA_VERSION=	17+
+
+SHEBANG_FILES=	bin/restart.py
 
 WRKSRC=		${WRKDIR}/pycharm-${PORTVERSION}
 
@@ -36,23 +37,40 @@ NO_BUILD=	yes
 SUB_FILES+=	pkg-message pycharm ${PORTNAME}.desktop
 SUB_LIST+=	IDEA_HOME=${IDEA_HOME}
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${TAR} -czf - -C ${WRKSRC} . | ${TAR} xzf - -C ${STAGEDIR}${DATADIR}
-# Linux/Windows/OS X only so remove them
-	@${RM} ${STAGEDIR}${DATADIR}/bin/*fsnotifier* ${STAGEDIR}${DATADIR}/bin/*.so
+# Remove non-native binaries
+post-extract:
+	@${RM} ${WRKSRC}/bin/*fsnotifier* ${WRKSRC}/bin/*.so ${WRKSRC}/bin/repair
+	@${FIND} ${WRKSRC}/lib ${WRKSRC}/plugins -name '*.so' -delete
+	@${FIND} ${WRKSRC}/lib ${WRKSRC}/plugins -type d -empty -delete
+	@${RM} -r ${WRKSRC}/plugins/cwm-plugin/quiche-native
+	@${RM} -r ${WRKSRC}/plugins/python/helpers/pydev/pydevd_attach_to_process
 # Remove the bundled native Pty4J support libraries, they are replaced
-# by java/intellij-pty4j
-	@${RM} -r ${STAGEDIR}${DATADIR}/lib/pty4j-native
+# by devel/jetbrains-pty4j
+	@${RM} -r ${WRKSRC}/lib/pty4j
 # Remove bundled linux-only JRE
-	@${RM} -r ${STAGEDIR}${DATADIR}/jbr
-	@${RM} -r ${STAGEDIR}${DATADIR}/helpers/pydev/pydevd_attach_to_process
-	${INSTALL_SCRIPT} ${WRKDIR}/pycharm ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
-# Use pty4j replacement provided by java/intellij-pty4j
-	${LN} -sf ${IDEA_HOME}/lib/libpty ${STAGEDIR}${DATADIR}/lib/pty4j-native
+	@${RM} -r ${WRKSRC}/jbr
+# TODO: Remove and enable fsnotifier when devel/libinotify is fixed
+# Disable filewatcher warning message on IDEA startup
+	${ECHO} "idea.filewatcher.disabled=true" >> ${WRKSRC}/bin/idea.properties
 # Use fsnotifier replacement provided by java/intellij-fsnotifier
-	${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
+	${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${WRKSRC}/bin/idea.properties
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/pycharm ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+# 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
+	${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 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
 # Fix "Typeahead timeout is exceeded" error
 	${ECHO} "action.aware.typeAhead=false" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
 # Fix slow render

diff --git a/devel/pycharm-pro/distinfo b/devel/pycharm-pro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663923901
-SHA256 (pycharm-professional-2022.2.2.tar.gz) = b7bfb86026fba669bb22429ab0840afba5047680202762070cfbb1f181d53d0e
-SIZE (pycharm-professional-2022.2.2.tar.gz) = 697011515
+TIMESTAMP = 1692955579
+SHA256 (pycharm-professional-2023.2.1.tar.gz) = 8f7c0aca8f2a832164426393e55d543b3b56867f2497d8844547fb03e217f160
+SIZE (pycharm-professional-2023.2.1.tar.gz) = 758623797
diff --git a/devel/pycharm-pro/files/pkg-message.in b/devel/pycharm-pro/files/pkg-message.in
@@ -2,11 +2,13 @@
 { type: install
   message: <<EOM
 There is experimental native (faster) file watching support which is
-enabled by default. Currently there are problems with watching large
-trees (>600 files). To disable it, edit 
-%%DATADIR%%/bin/idea.properties and append:
+disabled by default.  Currently there are problems with watching large
+trees.  To enable edit %%DATADIR%%/bin/idea.properties and append
 
-  idea.filewatcher.disabled=true
+      idea.filewatcher.disabled=false
+      idea.filewatcher.executable.path=%%IDEA_HOME%%/bin/fsnotifier
+
+Only enable fsnotifier if your projects have < 600 files.
 EOM
 }
 ]
diff --git a/devel/pycharm-pro/files/pycharm-pro.desktop.in b/devel/pycharm-pro/files/pycharm-pro.desktop.in
@@ -5,7 +5,7 @@ Type=Application
 Name=JetBrains PyCharm Professional Edition IDE
 GenericName=JetBrains PyCharm Professional Edition IDE
 Icon=%%DATADIR%%/bin/pycharm.svg
-Exec=%%DATADIR%%/bin/pycharm.sh
+Exec=%%PREFIX%%/bin/pycharm-pro
 Comment=Develop with pleasure!
 Terminal=false
 StartupNotify=true

diff --git a/devel/pycharm-pro/files/pycharm.in b/devel/pycharm-pro/files/pycharm.in
@@ -1,7 +1,6 @@
 #!/bin/sh
-
-if [ -z "${JAVA_VERSION}" ]; then
-	export JAVA_VERSION=11
-fi
-
+#
+# Wrapper to enforce usable Java versions
+#
+export JAVA_VERSION=%%JAVA_VERSION%%
 exec "%%DATADIR%%/bin/pycharm.sh" "$@"