On Mon, Mar 23, 2020 at 01:13:44AM +0100, Klemens Nanni wrote:
> Step one in removing Python 2 from those KDE ports I happen to use:
> 
> Exactly one python script in this port gets installed, it is used as the
> comment in Makefile says.
> 
> cmake/build-tsfiles.cmake has this:
> 
>       69      list(APPEND commands
>       70          COMMAND ${PYTHON_EXECUTABLE}
>       71              -B
>       72              ${_ki18n_pmap_compile_script}
>       73              ${PO_DIR}/${pmap_file}
>       74              ${pmapc_file}
>       75      )
> 
> where _ki18n_pmap_compile_script is the absolute path to this script.
> 
> Feedback? OK?
Wrong diff, sorry.  While python is not used during build, cmake requires
it to detect the used version, so MODPY_BUILDDEP must be "Yes".


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/ki18n/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile    20 May 2019 22:15:05 -0000      1.11
+++ Makefile    23 Mar 2020 00:25:52 -0000
@@ -2,13 +2,14 @@
 
 COMMENT =      KDE Gettext-based UI text internationalization
 DISTNAME =     ki18n-${VERSION}
-REVISION =     0
+REVISION =     1
 
 SHARED_LIBS =  KF5I18n         4.3
 
 WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Qml intl m
 
 MODULES +=     lang/python
+MODPY_VERSION =        ${MODPY_DEFAULT_VERSION_3}
 
 BUILD_DEPENDS =        devel/gettext,-tools \
                x11/qt5/qtscript
@@ -20,6 +21,6 @@ LIB_DEPENDS = devel/gettext,-runtime \
 PORTHOME =     ${WRKDIR}
 
 # Calling compileall.py isn't needed, the ts-pmap-compile script
-# gets called with "${PYTHON} -B ...".
+# gets called with "${PYTHON} -B ..." in cmake/build-tsfiles.cmake.
 
 .include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kf5/ki18n/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   30 Mar 2019 09:13:52 -0000      1.6
+++ pkg/PLIST   22 Mar 2020 21:20:18 -0000
@@ -25,7 +25,7 @@ lib/cmake/KF5I18n/kf5i18nuic.cmake
 lib/cmake/KF5I18n/ts-pmap-compile.py
 @lib lib/libKF5I18n.so.${LIBKF5I18n_VERSION}
 lib/qt5/plugins/kf5/
-lib/qt5/plugins/kf5/ktranscript.so
+@so lib/qt5/plugins/kf5/ktranscript.so
 share/kf5/
 share/kf5/mkspecs/
 share/kf5/mkspecs/qt_KI18n.pri

Reply via email to