CVS commit: pkgsrc/textproc/py-xapian

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Aug 24 18:10:50 UTC 2019

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

Log Message:
Try to fix bulk-build PLIST problems I can't reproduce.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-xapian/Makefile
cvs rdiff -u -r1.3 -r1.4 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.2 pkgsrc/textproc/py-xapian/Makefile:1.3
--- pkgsrc/textproc/py-xapian/Makefile:1.2      Fri Jul 14 12:55:45 2017
+++ pkgsrc/textproc/py-xapian/Makefile  Sat Aug 24 18:10:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/07/14 12:55:45 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/08/24 18:10:50 schmonz Exp $
 
 PKGNAME=               ${PYPKGPREFIX}-${PKGNAME_MODULE}
 COMMENT=               Python bindings for Xapian search engine
@@ -10,19 +10,19 @@ DEPENDS+=           ${PYPKGPREFIX}-sphinx-[0-9]*:
 
 .if (${PYPKGPREFIX} == py27)
 CONFIGURE_ARGS+=       --with-python
-PYTHON_3_OR_EMPTY=     # empty
+PYTHON_3_OR_PYTHON=    python
 .else
 CONFIGURE_ARGS+=       --with-python3 PYTHON3=${PYTHONBIN}
-PYTHON_3_OR_EMPTY=     3
+PYTHON_3_OR_PYTHON=    python3
 .endif
 
-PLIST_SUBST+=          PYTHON_3_OR_EMPTY=${PYTHON_3_OR_EMPTY:Q}
+PLIST_SUBST+=          PYTHON_3_OR_PYTHON=${PYTHON_3_OR_PYTHON:Q}
 PY_PATCHPLIST=         yes
 
 REPLACE_PYTHON=                python/docs/examples/*.py
 
 post-install:
-       ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/examples/*.py
+       ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/*.py
 .if (${PYPKGPREFIX} != py27)
        ${MKDIR} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__
        ${MV} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/*.cpython* ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__/

Index: pkgsrc/textproc/py-xapian/PLIST
diff -u pkgsrc/textproc/py-xapian/PLIST:1.3 pkgsrc/textproc/py-xapian/PLIST:1.4
--- pkgsrc/textproc/py-xapian/PLIST:1.3 Fri Aug  2 21:28:53 2019
+++ pkgsrc/textproc/py-xapian/PLIST     Sat Aug 24 18:10:50 2019
@@ -1,51 +1,51 @@
-@comment $NetBSD: PLIST,v 1.3 2019/08/02 21:28:53 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/24 18:10:50 schmonz 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${PYTHON_3_OR_EMPTY}/examples/simpleexpand.py
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/examples/simpleindex.py
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/examples/simplematchdecider.py
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/examples/simplesearch.py
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/.buildinfo
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_modules/index.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_modules/xapian.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_sources/examples.rst.txt
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_sources/index.rst.txt
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_sources/introduction.rst.txt
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_sources/xapian.rst.txt
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/ajax-loader.gif
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/basic.css
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/classic.css
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/comment-bright.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/comment-close.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/comment.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/default.css
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/doctools.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/documentation_options.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/down-pressed.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/down.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/file.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/jquery-3.2.1.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/jquery.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/language_data.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/minus.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/plus.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/pygments.css
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/searchtools.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/sidebar.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/underscore-1.3.1.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/underscore.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/up-pressed.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/up.png
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/_static/websupport.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/examples.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/genindex.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/index.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/introduction.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/objects.inv
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/py-modindex.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/search.html
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/searchindex.js
-share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/html/xapian.html
+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
+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
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/comment-bright.png
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/comment-close.png
+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
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/down-pressed.png
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/down.png
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/file.png
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/jquery-3.2.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.3.1.js
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/underscore.js
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/up-pressed.png
+share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/up.png
+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