CVS commit: pkgsrc/textproc/py-xapian

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 10 19:08:30 UTC 2022

Modified Files:
        pkgsrc/textproc/py-xapian: Makefile PLIST

Log Message:
py-xapian: restrict to python3


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/py-xapian/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/py-xapian/PLIST

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

Modified files:

Index: pkgsrc/textproc/py-xapian/Makefile
diff -u pkgsrc/textproc/py-xapian/Makefile:1.8 pkgsrc/textproc/py-xapian/Makefile:1.9
--- pkgsrc/textproc/py-xapian/Makefile:1.8      Sun Jan  2 09:31:59 2022
+++ pkgsrc/textproc/py-xapian/Makefile  Sun Jul 10 19:08:30 2022
@@ -1,37 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2022/01/02 09:31:59 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2022/07/10 19:08:30 wiz Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-${PKGNAME_MODULE}
 COMMENT=       Python bindings for Xapian search engine
 HOMEPAGE=      https://xapian.org/docs/bindings/python/
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx
+DEPENDS+=      ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-CONFIGURE_ARGS+=       --with-python
-PYTHON_3_OR_PYTHON=    python
-.else
 CONFIGURE_ARGS+=       --with-python3 PYTHON3=${PYTHONBIN}
-PYTHON_3_OR_PYTHON=    python3
-.endif
 
-PLIST_SUBST+=          PYTHON_3_OR_PYTHON=${PYTHON_3_OR_PYTHON:Q}
+PLIST_SUBST+=          PYTHON_3_OR_PYTHON=python3
 PY_PATCHPLIST=         yes
 PYTHON_SELF_CONFLICT=  yes
 
 REPLACE_PYTHON=                python/docs/examples/*.py
 
 post-install:
-       ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/*.py
-.if ${_PYTHON_VERSION} != 27
+       ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/python3/examples/*.py
        ${MKDIR} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__
        ${MV} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/*.cpython* ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__/
-.endif
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../textproc/xapian/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-xapian/PLIST
diff -u pkgsrc/textproc/py-xapian/PLIST:1.7 pkgsrc/textproc/py-xapian/PLIST:1.8
--- pkgsrc/textproc/py-xapian/PLIST:1.7 Thu Nov 18 13:55:39 2021
+++ pkgsrc/textproc/py-xapian/PLIST     Sun Jul 10 19:08:30 2022
@@ -1,52 +1,42 @@
-@comment $NetBSD: PLIST,v 1.7 2021/11/18 13:55:39 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/07/10 19:08:30 wiz Exp $
 ${PYSITELIB}/xapian/__init__.py
 ${PYSITELIB}/xapian/__init__.pyc
 ${PYSITELIB}/xapian/__init__.pyo
 ${PYSITELIB}/xapian/_xapian.a
 ${PYSITELIB}/xapian/_xapian.so
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/simpleexpand.py
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/simpleindex.py
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/simplematchdecider.py
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/simplesearch.py
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/.buildinfo
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_modules/index.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_modules/xapian.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_sources/examples.rst.txt
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_sources/index.rst.txt
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_sources/introduction.rst.txt
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_sources/xapian.rst.txt
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/ajax-loader.gif
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/basic.css
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/classic.css
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/comment-bright.png
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/comment-close.png
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/comment.png
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/default.css
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/doctools.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/documentation_options.js
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/down-pressed.png
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/down.png
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/file.png
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/jquery-3.2.1.js
-${PLIST.py3x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/jquery-3.5.1.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/jquery.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/language_data.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/minus.png
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/plus.png
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/pygments.css
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/searchtools.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/sidebar.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/underscore-1.13.1.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/underscore.js
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/up-pressed.png
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/up.png
-${PLIST.py2x}share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/websupport.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/examples.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/genindex.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/index.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/introduction.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/objects.inv
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/py-modindex.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/search.html
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/searchindex.js
-share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/xapian.html
+share/doc/xapian-bindings/python3/examples/simpleexpand.py
+share/doc/xapian-bindings/python3/examples/simpleindex.py
+share/doc/xapian-bindings/python3/examples/simplematchdecider.py
+share/doc/xapian-bindings/python3/examples/simplesearch.py
+share/doc/xapian-bindings/python3/html/.buildinfo
+share/doc/xapian-bindings/python3/html/_modules/index.html
+share/doc/xapian-bindings/python3/html/_modules/xapian.html
+share/doc/xapian-bindings/python3/html/_sources/examples.rst.txt
+share/doc/xapian-bindings/python3/html/_sources/index.rst.txt
+share/doc/xapian-bindings/python3/html/_sources/introduction.rst.txt
+share/doc/xapian-bindings/python3/html/_sources/xapian.rst.txt
+share/doc/xapian-bindings/python3/html/_static/basic.css
+share/doc/xapian-bindings/python3/html/_static/classic.css
+share/doc/xapian-bindings/python3/html/_static/default.css
+share/doc/xapian-bindings/python3/html/_static/doctools.js
+share/doc/xapian-bindings/python3/html/_static/documentation_options.js
+share/doc/xapian-bindings/python3/html/_static/file.png
+share/doc/xapian-bindings/python3/html/_static/jquery-3.5.1.js
+share/doc/xapian-bindings/python3/html/_static/jquery.js
+share/doc/xapian-bindings/python3/html/_static/language_data.js
+share/doc/xapian-bindings/python3/html/_static/minus.png
+share/doc/xapian-bindings/python3/html/_static/plus.png
+share/doc/xapian-bindings/python3/html/_static/pygments.css
+share/doc/xapian-bindings/python3/html/_static/searchtools.js
+share/doc/xapian-bindings/python3/html/_static/sidebar.js
+share/doc/xapian-bindings/python3/html/_static/underscore-1.13.1.js
+share/doc/xapian-bindings/python3/html/_static/underscore.js
+share/doc/xapian-bindings/python3/html/examples.html
+share/doc/xapian-bindings/python3/html/genindex.html
+share/doc/xapian-bindings/python3/html/index.html
+share/doc/xapian-bindings/python3/html/introduction.html
+share/doc/xapian-bindings/python3/html/objects.inv
+share/doc/xapian-bindings/python3/html/py-modindex.html
+share/doc/xapian-bindings/python3/html/search.html
+share/doc/xapian-bindings/python3/html/searchindex.js
+share/doc/xapian-bindings/python3/html/xapian.html