From ce20b3d82406b1aca8b0237d0927b0197a7467d4 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Thu, 5 May 2022 15:06:53 +0300 Subject: [PATCH] devel/pycharm-ce: fix plist - Fix packaging for non-default Python - Avoid installing non-native binaries PR: 263428 Submitted by: Jonathan Chen (maintainer) --- devel/pycharm-ce/Makefile | 3 +++ devel/pycharm-ce/pkg-plist | 20 -------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/devel/pycharm-ce/Makefile b/devel/pycharm-ce/Makefile index 6a75434b315a3..d595d2bd3a668 100644 --- a/devel/pycharm-ce/Makefile +++ b/devel/pycharm-ce/Makefile @@ -2,6 +2,7 @@ PORTNAME= pycharm-ce PORTVERSION= 2022.1 +PORTREVISION= 1 CATEGORIES= devel java python MASTER_SITES= https://download.jetbrains.com/python/ \ http://download.jetbrains.com/python/ @@ -34,6 +35,8 @@ do-install: @${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 ${STAGEDIR}${DATADIR}/bin/repair + @${FIND} ${STAGEDIR}${DATADIR}/plugins -name '*.so' -delete + @${RM} -r ${STAGEDIR}${DATADIR}/plugins/cwm-plugin/quiche-native # Remove the bundled native Pty4J support libraries, they are replaced # by java/intellij-pty4j @${RM} -r ${STAGEDIR}${DATADIR}/lib/pty4j-native diff --git a/devel/pycharm-ce/pkg-plist b/devel/pycharm-ce/pkg-plist index a62003c761d78..1331f14b8a889 100644 --- a/devel/pycharm-ce/pkg-plist +++ b/devel/pycharm-ce/pkg-plist @@ -138,10 +138,6 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/plugins/cwm-plugin/lib/quiche-jna-stubs.jar %%DATADIR%%/plugins/cwm-plugin/lib/rd-text.jar %%DATADIR%%/plugins/cwm-plugin/lib/tls-channel.jar -%%DATADIR%%/plugins/cwm-plugin/quiche-native/darwin-aarch64/libquiche.dylib -%%DATADIR%%/plugins/cwm-plugin/quiche-native/darwin-x86-64/libquiche.dylib -%%DATADIR%%/plugins/cwm-plugin/quiche-native/linux-x86-64/libquiche.so -%%DATADIR%%/plugins/cwm-plugin/quiche-native/win32-x86-64/quiche.dll %%DATADIR%%/plugins/editorconfig/lib/editorconfig.jar %%DATADIR%%/plugins/emojipicker/lib/emojipicker.jar %%DATADIR%%/plugins/featuresTrainer/lib/featuresTrainer.jar @@ -919,12 +915,6 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.c %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.pxd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_310_64.cpython-310-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_37_64.cpython-37m-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_38_64%%PYTHON_EXT_SUFFIX%%-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_39_64.cpython-39-darwin.so %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_64.pyd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_310_32.cp310-win32.pyd @@ -987,18 +977,8 @@ share/applications/pycharm-ce.desktop %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp38-win_amd64.pyd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp39-win32.pyd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cp39-win_amd64.pyd -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-310-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-36m-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-37m-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common%%PYTHON_EXT_SUFFIX%%-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.cpython-39-darwin.so %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pxd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_common.pyx -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_310_64.cpython-310-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_37_64.cpython-37m-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_38_64%%PYTHON_EXT_SUFFIX%%-darwin.so -%%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_39_64.cpython-39-darwin.so %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39_and_above.c %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39_and_above.pxd %%DATADIR%%/plugins/python-ce/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_py39_and_above.pyx