pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

recoll: use python/extension.mk for better Python support



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sun Oct 1 13:58:02 2023 +0200
Changeset:	144ce9b6f2a7678d794ef763174fcf852128bc89

Modified Files:
	recoll/Makefile
	recoll/PLIST

Log Message:
recoll: use python/extension.mk for better Python support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=144ce9b6f2a7678d794ef763174fcf852128bc89

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 recoll/Makefile |  4 ++--
 recoll/PLIST    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs:
diff --git a/recoll/Makefile b/recoll/Makefile
index ef50b828ab..24ab5e13f3 100644
--- a/recoll/Makefile
+++ b/recoll/Makefile
@@ -36,8 +36,7 @@ CONFIGURE_ARGS+=	--with-file-command=${BUILDLINK_PREFIX.file}/bin/file
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/recoll
 
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
+PY_PATCHPLIST=		yes
 REPLACE_PYTHON+=	*.py */*.py */*/*.py */*/*/*.py
 REPLACE_PERL+=		filters/rclimg
 
@@ -68,6 +67,7 @@ pre-configure:
 .include "../../devel/chmlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../lang/python/tool.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 # not found by configure even when enabled
diff --git a/recoll/PLIST b/recoll/PLIST
index be4e4e0be5..46727c16d0 100644
--- a/recoll/PLIST
+++ b/recoll/PLIST
@@ -6,16 +6,16 @@ ${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
 ${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
 ${PYSITELIB}/Recoll-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/recoll/__init__.py
-${PYSITELIB}/recoll/__pycache__/__init__.cpython-311.pyc
-${PYSITELIB}/recoll/__pycache__/conftree.cpython-311.pyc
-${PYSITELIB}/recoll/__pycache__/rclconfig.cpython-311.pyc
-${PYSITELIB}/recoll/__pycache__/rclextract.cpython-311.pyc
-${PYSITELIB}/recoll/__pycache__/recoll.cpython-311.pyc
+${PYSITELIB}/recoll/__init__.pyc
 ${PYSITELIB}/recoll/_recoll.so
 ${PYSITELIB}/recoll/conftree.py
+${PYSITELIB}/recoll/conftree.pyc
 ${PYSITELIB}/recoll/rclconfig.py
+${PYSITELIB}/recoll/rclconfig.pyc
 ${PYSITELIB}/recoll/rclextract.py
+${PYSITELIB}/recoll/rclextract.pyc
 ${PYSITELIB}/recoll/recoll.py
+${PYSITELIB}/recoll/recoll.pyc
 ${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/PKG-INFO
 ${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
 ${PYSITELIB}/recoll_aspell_python_py3-1.15-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
@@ -26,12 +26,12 @@ ${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
 ${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
 ${PYSITELIB}/recollchm-0.8.4.1+git-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/recollchm/__init__.py
-${PYSITELIB}/recollchm/__pycache__/__init__.cpython-311.pyc
-${PYSITELIB}/recollchm/__pycache__/chm.cpython-311.pyc
-${PYSITELIB}/recollchm/__pycache__/chmlib.cpython-311.pyc
+${PYSITELIB}/recollchm/__init__.pyc
 ${PYSITELIB}/recollchm/_chmlib.so
 ${PYSITELIB}/recollchm/chm.py
+${PYSITELIB}/recollchm/chm.pyc
 ${PYSITELIB}/recollchm/chmlib.py
+${PYSITELIB}/recollchm/chmlib.pyc
 ${PYSITELIB}/recollchm/extra.so
 lib/recoll/librecoll.la
 man/man1/recoll.1


Home | Main Index | Thread Index | Old Index