Received: by mail.netbsd.org (Postfix, from userid 605) id 56D4684D85; Wed, 25 Dec 2019 12:21:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D492784D4E for ; Wed, 25 Dec 2019 12:21:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VA_FxY-zECxW for ; Wed, 25 Dec 2019 12:21:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 177B384CEF for ; Wed, 25 Dec 2019 12:21:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 09669FA97; Wed, 25 Dec 2019 12:21:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1577276491187820" MIME-Version: 1.0 Date: Wed, 25 Dec 2019 12:21:31 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/textproc/py-xapian To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20191225122131.09669FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1577276491187820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Wed Dec 25 12:21:30 UTC 2019 Modified Files: pkgsrc/textproc/py-xapian: Makefile PLIST Log Message: py-xapian: fix PLIST for Pythin 3.x/Sphinx 2; mark as self-conflicting To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-xapian/Makefile \ pkgsrc/textproc/py-xapian/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1577276491187820 Content-Disposition: inline Content-Length: 4411 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/py-xapian/Makefile diff -u pkgsrc/textproc/py-xapian/Makefile:1.4 pkgsrc/textproc/py-xapian/Makefile:1.5 --- pkgsrc/textproc/py-xapian/Makefile:1.4 Mon Oct 21 22:11:33 2019 +++ pkgsrc/textproc/py-xapian/Makefile Wed Dec 25 12:21:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/10/21 22:11:33 adam Exp $ +# $NetBSD: Makefile,v 1.5 2019/12/25 12:21:30 adam Exp $ PKGNAME= ${PYPKGPREFIX}-${PKGNAME_MODULE} COMMENT= Python bindings for Xapian search engine @@ -17,6 +17,7 @@ PYTHON_3_OR_PYTHON= python3 PLIST_SUBST+= PYTHON_3_OR_PYTHON=${PYTHON_3_OR_PYTHON:Q} PY_PATCHPLIST= yes +PYTHON_SELF_CONFLICT= yes REPLACE_PYTHON= python/docs/examples/*.py Index: pkgsrc/textproc/py-xapian/PLIST diff -u pkgsrc/textproc/py-xapian/PLIST:1.4 pkgsrc/textproc/py-xapian/PLIST:1.5 --- pkgsrc/textproc/py-xapian/PLIST:1.4 Sat Aug 24 18:10:50 2019 +++ pkgsrc/textproc/py-xapian/PLIST Wed Dec 25 12:21:30 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2019/08/24 18:10:50 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.5 2019/12/25 12:21:30 adam Exp $ ${PYSITELIB}/xapian/__init__.py ${PYSITELIB}/xapian/__init__.pyc ${PYSITELIB}/xapian/__init__.pyo @@ -15,19 +15,20 @@ share/doc/xapian-bindings/${PYTHON_3_OR_ 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 +${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 -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 +${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 -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 +${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 -share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/html/_static/jquery-3.2.1.js +${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.4.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 @@ -37,9 +38,9 @@ share/doc/xapian-bindings/${PYTHON_3_OR_ 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 +${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 --_----------=_1577276491187820--