CVS commit: pkgsrc/devel/py-tortoisehg

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec  9 12:20:01 UTC 2020

Modified Files:
        pkgsrc/devel/py-tortoisehg: Makefile PLIST

Log Message:
py-tortoisehg: fix PLIST for py-sphinx1

This builds with all python versions, but mark it as self-conflicting.

Update a bug report URL while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/py-tortoisehg/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/py-tortoisehg/PLIST

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

Modified files:

Index: pkgsrc/devel/py-tortoisehg/Makefile
diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.68 pkgsrc/devel/py-tortoisehg/Makefile:1.69
--- pkgsrc/devel/py-tortoisehg/Makefile:1.68    Wed Dec  9 09:49:35 2020
+++ pkgsrc/devel/py-tortoisehg/Makefile Wed Dec  9 12:20:01 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2020/12/09 09:49:35 nia Exp $
+# $NetBSD: Makefile,v 1.69 2020/12/09 12:20:01 wiz Exp $
 
 DISTNAME=              tortoisehg-5.6
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            devel python
 MASTER_SITES=          https://www.mercurial-scm.org/release/tortoisehg/targz/
 
@@ -12,7 +13,7 @@ LICENSE=              gnu-gpl-v2
 
 REPLACE_PYTHON+=       thg
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx1
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.3.4nb1<2:../../textproc/py-sphinx1
 DEPENDS+=      ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
 DEPENDS+=      ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
@@ -27,13 +28,13 @@ SUBST_SED.df=               -e 's:thg_logo:${PREFIX}$
 INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/doc/tortoisehg
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_SELF_CONFLICT=  yes
 
 pre-build:
        ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
        ${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo
        # conflicts with mercurial
-       # https://bitbucket.org/tortoisehg/thg/issues/4629/tortoisehg-file-name-conflict-with
+       # https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4629
        ${RM} ${WRKSRC}/hgext3rd/__init__.py
 
 post-install:

Index: pkgsrc/devel/py-tortoisehg/PLIST
diff -u pkgsrc/devel/py-tortoisehg/PLIST:1.17 pkgsrc/devel/py-tortoisehg/PLIST:1.18
--- pkgsrc/devel/py-tortoisehg/PLIST:1.17       Sat Nov  7 16:32:13 2020
+++ pkgsrc/devel/py-tortoisehg/PLIST    Wed Dec  9 12:20:01 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2020/11/07 16:32:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/12/09 12:20:01 wiz Exp $
 bin/thg
 ${PYSITELIB}/hgext3rd/thg.py
 ${PYSITELIB}/hgext3rd/thg.pyc
@@ -464,13 +464,19 @@ share/doc/tortoisehg/html/_sources/shelv
 share/doc/tortoisehg/html/_sources/sync.txt
 share/doc/tortoisehg/html/_sources/whatsnew.txt
 share/doc/tortoisehg/html/_sources/workbench.txt
+share/doc/tortoisehg/html/_static/ajax-loader.gif
 share/doc/tortoisehg/html/_static/alabaster.css
 share/doc/tortoisehg/html/_static/basic.css
+share/doc/tortoisehg/html/_static/comment-bright.png
+share/doc/tortoisehg/html/_static/comment-close.png
+share/doc/tortoisehg/html/_static/comment.png
 share/doc/tortoisehg/html/_static/custom.css
 share/doc/tortoisehg/html/_static/doctools.js
 share/doc/tortoisehg/html/_static/documentation_options.js
+share/doc/tortoisehg/html/_static/down-pressed.png
+share/doc/tortoisehg/html/_static/down.png
 share/doc/tortoisehg/html/_static/file.png
-share/doc/tortoisehg/html/_static/jquery-3.4.1.js
+share/doc/tortoisehg/html/_static/jquery-3.2.1.js
 share/doc/tortoisehg/html/_static/jquery.js
 share/doc/tortoisehg/html/_static/language_data.js
 share/doc/tortoisehg/html/_static/minus.png
@@ -481,6 +487,9 @@ share/doc/tortoisehg/html/_static/thg_lo
 share/doc/tortoisehg/html/_static/tortoisehg.css
 share/doc/tortoisehg/html/_static/underscore-1.3.1.js
 share/doc/tortoisehg/html/_static/underscore.js
+share/doc/tortoisehg/html/_static/up-pressed.png
+share/doc/tortoisehg/html/_static/up.png
+share/doc/tortoisehg/html/_static/websupport.js
 share/doc/tortoisehg/html/archive.html
 share/doc/tortoisehg/html/clone.html
 share/doc/tortoisehg/html/commit.html