Sunday, March 29, 2020

python tweaks in devel/kf5

- use python3 py-sphinx to generate docs
- extra-cmake-modules: compileall.py
- kdelibs4support: compileall.py

OK?

Index: extra-cmake-modules/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- extra-cmake-modules/Makefile 23 Mar 2020 18:01:04 -0000 1.7
+++ extra-cmake-modules/Makefile 29 Mar 2020 07:58:42 -0000
@@ -3,10 +3,15 @@
COMMENT = CMake modules required by KDE5
DISTNAME = extra-cmake-modules-${VERSION}
HOMEPAGE = https://projects.kde.org/projects/kdesupport/extra-cmake-modules
+REVISION = 0

WANTLIB- =

-BUILD_DEPENDS = textproc/py-sphinx
+MODULES = lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP = No
+
+BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}

CONFIGURE_ARGS += -DBUILD_QTHELP_DOCS=ON \
-DQCollectionGenerator_EXECUTABLE=${MODQT_LIBDIR}/bin/qcollectiongenerator
@@ -15,5 +20,9 @@ PKG_ARCH = *

# use depleted
CONFIGURE_ARGS += -DMAN_INSTALL_DIR=${PREFIX}/man
+
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/share/ECM/find-modules/

.include <bsd.port.mk>
Index: extra-cmake-modules/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kf5/extra-cmake-modules/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- extra-cmake-modules/pkg/PLIST 23 Mar 2020 18:01:04 -0000 1.11
+++ extra-cmake-modules/pkg/PLIST 29 Mar 2020 07:58:42 -0000
@@ -39,6 +39,11 @@ share/ECM/find-modules/FindX11_XCB.cmake
share/ECM/find-modules/FindXCB.cmake
share/ECM/find-modules/GeneratePythonBindingUmbrellaModule.cmake
share/ECM/find-modules/Qt5Ruleset.py
+${MODPY_COMMENT}share/ECM/find-modules/${MODPY_PYCACHE}/
+share/ECM/find-modules/${MODPY_PYCACHE}Qt5Ruleset.${MODPY_PYC_MAGIC_TAG}pyc
+share/ECM/find-modules/${MODPY_PYCACHE}rules_engine.${MODPY_PYC_MAGIC_TAG}pyc
+share/ECM/find-modules/${MODPY_PYCACHE}run-sip.${MODPY_PYC_MAGIC_TAG}pyc
+share/ECM/find-modules/${MODPY_PYCACHE}sip_generator.${MODPY_PYC_MAGIC_TAG}pyc
share/ECM/find-modules/rules_engine.py
share/ECM/find-modules/run-sip.py
share/ECM/find-modules/sip_generator.py
Index: kdelibs4support/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/kdelibs4support/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- kdelibs4support/Makefile 23 Mar 2020 18:01:06 -0000 1.15
+++ kdelibs4support/Makefile 29 Mar 2020 07:58:43 -0000
@@ -2,6 +2,7 @@

COMMENT = legacy support for kdelibs-4.x compatibility
DISTNAME = kdelibs4support-${VERSION}
+REVISION = 0

SHARED_LIBS = KF5KDELibs4Support 7.0

@@ -16,6 +17,10 @@ WANTLIB += KF5XmlGui Qt5Concurrent Qt5Co
WANTLIB += Qt5Gui Qt5Network Qt5PrintSupport Qt5Svg Qt5Test Qt5Widgets
WANTLIB += Qt5X11Extras Qt5Xml SM X11 Xext c m xcb

+MODULES = lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP = No
+
BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kded>=${MODKF5_VERSION} \
devel/kf5/kdesignerplugin>=${MODKF5_VERSION} \
@@ -60,5 +65,9 @@ CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PA
# sucks
TEST_IS_INTERACTIVE = X11
PORTHOME = ${WRKDIR}
+
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/lib/cmake/KF5KDELibs4Support

.include <bsd.port.mk>
Index: kdelibs4support/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kf5/kdelibs4support/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- kdelibs4support/pkg/PLIST 23 Mar 2020 18:01:06 -0000 1.6
+++ kdelibs4support/pkg/PLIST 29 Mar 2020 07:58:43 -0000
@@ -1014,6 +1014,10 @@ lib/cmake/KF5KDELibs4Support/PythonCompi
lib/cmake/KF5KDELibs4Support/PythonMacros.cmake
lib/cmake/KF5KDELibs4Support/SIPMacros.cmake
lib/cmake/KF5KDELibs4Support/Win32Macros.cmake
+${MODPY_COMMENT}lib/cmake/KF5KDELibs4Support/${MODPY_PYCACHE}/
+lib/cmake/KF5KDELibs4Support/${MODPY_PYCACHE}FindLibPython.${MODPY_PYC_MAGIC_TAG}pyc
+lib/cmake/KF5KDELibs4Support/${MODPY_PYCACHE}FindSIP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/cmake/KF5KDELibs4Support/${MODPY_PYCACHE}PythonCompile.${MODPY_PYC_MAGIC_TAG}pyc
lib/cmake/KF5KDELibs4Support/check_installed_exports_file.cmake
lib/cmake/KF5KDELibs4Support/cmake-modules-styleguide.txt
lib/cmake/KF5KDELibs4Support/config-alsa.h.cmake

No comments:

Post a Comment