Wed Dec 9 12:20:01 2020 UTC ()
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.


(wiz)
diff -r1.68 -r1.69 pkgsrc/devel/py-tortoisehg/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/py-tortoisehg/PLIST
cvs diff -r1.68 -r1.69 pkgsrc/devel/py-tortoisehg/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-tortoisehg/Makefile 2020/12/09 09:49:35 1.68
+++ pkgsrc/devel/py-tortoisehg/Makefile 2020/12/09 12:20:01 1.69
@@ -1,48 +1,49 @@ @@ -1,48 +1,49 @@
1# $NetBSD: Makefile,v 1.68 2020/12/09 09:49:35 nia Exp $ 1# $NetBSD: Makefile,v 1.69 2020/12/09 12:20:01 wiz Exp $
2 2
3DISTNAME= tortoisehg-5.6 3DISTNAME= tortoisehg-5.6
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= devel python 6CATEGORIES= devel python
6MASTER_SITES= https://www.mercurial-scm.org/release/tortoisehg/targz/ 7MASTER_SITES= https://www.mercurial-scm.org/release/tortoisehg/targz/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://tortoisehg.bitbucket.io/ 10HOMEPAGE= https://tortoisehg.bitbucket.io/
10COMMENT= GUI for Mercurial 11COMMENT= GUI for Mercurial
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13REPLACE_PYTHON+= thg 14REPLACE_PYTHON+= thg
14 15
15BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx1 16BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1<2:../../textproc/py-sphinx1
16DEPENDS+= ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse 17DEPENDS+= ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
17DEPENDS+= ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments 18DEPENDS+= ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
18DEPENDS+= ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial 19DEPENDS+= ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial
19 20
20thg_icon= /share/pixmaps/tortoisehg/icons/thg_logo.ico 21thg_icon= /share/pixmaps/tortoisehg/icons/thg_logo.ico
21SUBST_CLASSES+= df 22SUBST_CLASSES+= df
22SUBST_STAGE.df= post-configure 23SUBST_STAGE.df= post-configure
23SUBST_MESSAGE.df= Fixing icon reference in desktop file 24SUBST_MESSAGE.df= Fixing icon reference in desktop file
24SUBST_FILES.df= contrib/thg.desktop 25SUBST_FILES.df= contrib/thg.desktop
25SUBST_SED.df= -e 's:thg_logo:${PREFIX}${thg_icon}:1' 26SUBST_SED.df= -e 's:thg_logo:${PREFIX}${thg_icon}:1'
26 27
27INSTALLATION_DIRS+= share/applications 28INSTALLATION_DIRS+= share/applications
28INSTALLATION_DIRS+= share/doc/tortoisehg 29INSTALLATION_DIRS+= share/doc/tortoisehg
29 30
30PYTHON_VERSIONS_INCOMPATIBLE= 27 31PYTHON_SELF_CONFLICT= yes
31 32
32pre-build: 33pre-build:
33 ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html 34 ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
34 ${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo 35 ${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo
35 # conflicts with mercurial 36 # conflicts with mercurial
36 # https://bitbucket.org/tortoisehg/thg/issues/4629/tortoisehg-file-name-conflict-with 37 # https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/4629
37 ${RM} ${WRKSRC}/hgext3rd/__init__.py 38 ${RM} ${WRKSRC}/hgext3rd/__init__.py
38 39
39post-install: 40post-install:
40 ${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${DESTDIR}${PREFIX}/share/applications/thg.desktop 41 ${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${DESTDIR}${PREFIX}/share/applications/thg.desktop
41 ${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${DESTDIR}${PREFIX}/share/doc/tortoisehg 42 ${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${DESTDIR}${PREFIX}/share/doc/tortoisehg
42 cd ${WRKSRC}/doc/build && pax -pp -rw html ${DESTDIR}${PREFIX}/share/doc/tortoisehg 43 cd ${WRKSRC}/doc/build && pax -pp -rw html ${DESTDIR}${PREFIX}/share/doc/tortoisehg
43 44
44.include "../../lang/python/application.mk" 45.include "../../lang/python/application.mk"
45.include "../../lang/python/distutils.mk" 46.include "../../lang/python/distutils.mk"
46.include "../../sysutils/desktop-file-utils/desktopdb.mk" 47.include "../../sysutils/desktop-file-utils/desktopdb.mk"
47.include "../../x11/py-qt5-qscintilla/buildlink3.mk" 48.include "../../x11/py-qt5-qscintilla/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/devel/py-tortoisehg/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-tortoisehg/PLIST 2020/11/07 16:32:13 1.17
+++ pkgsrc/devel/py-tortoisehg/PLIST 2020/12/09 12:20:01 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.17 2020/11/07 16:32:13 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.18 2020/12/09 12:20:01 wiz Exp $
2bin/thg 2bin/thg
3${PYSITELIB}/hgext3rd/thg.py 3${PYSITELIB}/hgext3rd/thg.py
4${PYSITELIB}/hgext3rd/thg.pyc 4${PYSITELIB}/hgext3rd/thg.pyc
5${PYSITELIB}/hgext3rd/thg.pyo 5${PYSITELIB}/hgext3rd/thg.pyo
6${PYSITELIB}/${EGG_FILE} 6${PYSITELIB}/${EGG_FILE}
7${PYSITELIB}/tortoisehg/__init__.py 7${PYSITELIB}/tortoisehg/__init__.py
8${PYSITELIB}/tortoisehg/__init__.pyc 8${PYSITELIB}/tortoisehg/__init__.pyc
9${PYSITELIB}/tortoisehg/__init__.pyo 9${PYSITELIB}/tortoisehg/__init__.pyo
10${PYSITELIB}/tortoisehg/hgqt/__init__.py 10${PYSITELIB}/tortoisehg/hgqt/__init__.py
11${PYSITELIB}/tortoisehg/hgqt/__init__.pyc 11${PYSITELIB}/tortoisehg/hgqt/__init__.pyc
12${PYSITELIB}/tortoisehg/hgqt/__init__.pyo 12${PYSITELIB}/tortoisehg/hgqt/__init__.pyo
13${PYSITELIB}/tortoisehg/hgqt/about.py 13${PYSITELIB}/tortoisehg/hgqt/about.py
14${PYSITELIB}/tortoisehg/hgqt/about.pyc 14${PYSITELIB}/tortoisehg/hgqt/about.pyc
@@ -454,43 +454,52 @@ share/doc/tortoisehg/html/_sources/index @@ -454,43 +454,52 @@ share/doc/tortoisehg/html/_sources/index
454share/doc/tortoisehg/html/_sources/init.txt 454share/doc/tortoisehg/html/_sources/init.txt
455share/doc/tortoisehg/html/_sources/intro.txt 455share/doc/tortoisehg/html/_sources/intro.txt
456share/doc/tortoisehg/html/_sources/nautilus.txt 456share/doc/tortoisehg/html/_sources/nautilus.txt
457share/doc/tortoisehg/html/_sources/nonhg.txt 457share/doc/tortoisehg/html/_sources/nonhg.txt
458share/doc/tortoisehg/html/_sources/patches.txt 458share/doc/tortoisehg/html/_sources/patches.txt
459share/doc/tortoisehg/html/_sources/preface.txt 459share/doc/tortoisehg/html/_sources/preface.txt
460share/doc/tortoisehg/html/_sources/quick.txt 460share/doc/tortoisehg/html/_sources/quick.txt
461share/doc/tortoisehg/html/_sources/serve.txt 461share/doc/tortoisehg/html/_sources/serve.txt
462share/doc/tortoisehg/html/_sources/settings.txt 462share/doc/tortoisehg/html/_sources/settings.txt
463share/doc/tortoisehg/html/_sources/shelve.txt 463share/doc/tortoisehg/html/_sources/shelve.txt
464share/doc/tortoisehg/html/_sources/sync.txt 464share/doc/tortoisehg/html/_sources/sync.txt
465share/doc/tortoisehg/html/_sources/whatsnew.txt 465share/doc/tortoisehg/html/_sources/whatsnew.txt
466share/doc/tortoisehg/html/_sources/workbench.txt 466share/doc/tortoisehg/html/_sources/workbench.txt
 467share/doc/tortoisehg/html/_static/ajax-loader.gif
467share/doc/tortoisehg/html/_static/alabaster.css 468share/doc/tortoisehg/html/_static/alabaster.css
468share/doc/tortoisehg/html/_static/basic.css 469share/doc/tortoisehg/html/_static/basic.css
 470share/doc/tortoisehg/html/_static/comment-bright.png
 471share/doc/tortoisehg/html/_static/comment-close.png
 472share/doc/tortoisehg/html/_static/comment.png
469share/doc/tortoisehg/html/_static/custom.css 473share/doc/tortoisehg/html/_static/custom.css
470share/doc/tortoisehg/html/_static/doctools.js 474share/doc/tortoisehg/html/_static/doctools.js
471share/doc/tortoisehg/html/_static/documentation_options.js 475share/doc/tortoisehg/html/_static/documentation_options.js
 476share/doc/tortoisehg/html/_static/down-pressed.png
 477share/doc/tortoisehg/html/_static/down.png
472share/doc/tortoisehg/html/_static/file.png 478share/doc/tortoisehg/html/_static/file.png
473share/doc/tortoisehg/html/_static/jquery-3.4.1.js 479share/doc/tortoisehg/html/_static/jquery-3.2.1.js
474share/doc/tortoisehg/html/_static/jquery.js 480share/doc/tortoisehg/html/_static/jquery.js
475share/doc/tortoisehg/html/_static/language_data.js 481share/doc/tortoisehg/html/_static/language_data.js
476share/doc/tortoisehg/html/_static/minus.png 482share/doc/tortoisehg/html/_static/minus.png
477share/doc/tortoisehg/html/_static/plus.png 483share/doc/tortoisehg/html/_static/plus.png
478share/doc/tortoisehg/html/_static/pygments.css 484share/doc/tortoisehg/html/_static/pygments.css
479share/doc/tortoisehg/html/_static/searchtools.js 485share/doc/tortoisehg/html/_static/searchtools.js
480share/doc/tortoisehg/html/_static/thg_logo_92x50.png 486share/doc/tortoisehg/html/_static/thg_logo_92x50.png
481share/doc/tortoisehg/html/_static/tortoisehg.css 487share/doc/tortoisehg/html/_static/tortoisehg.css
482share/doc/tortoisehg/html/_static/underscore-1.3.1.js 488share/doc/tortoisehg/html/_static/underscore-1.3.1.js
483share/doc/tortoisehg/html/_static/underscore.js 489share/doc/tortoisehg/html/_static/underscore.js
 490share/doc/tortoisehg/html/_static/up-pressed.png
 491share/doc/tortoisehg/html/_static/up.png
 492share/doc/tortoisehg/html/_static/websupport.js
484share/doc/tortoisehg/html/archive.html 493share/doc/tortoisehg/html/archive.html
485share/doc/tortoisehg/html/clone.html 494share/doc/tortoisehg/html/clone.html
486share/doc/tortoisehg/html/commit.html 495share/doc/tortoisehg/html/commit.html
487share/doc/tortoisehg/html/common.html 496share/doc/tortoisehg/html/common.html
488share/doc/tortoisehg/html/daily.html 497share/doc/tortoisehg/html/daily.html
489share/doc/tortoisehg/html/debugging.html 498share/doc/tortoisehg/html/debugging.html
490share/doc/tortoisehg/html/explorer.html 499share/doc/tortoisehg/html/explorer.html
491share/doc/tortoisehg/html/extensions.html 500share/doc/tortoisehg/html/extensions.html
492share/doc/tortoisehg/html/faq.html 501share/doc/tortoisehg/html/faq.html
493share/doc/tortoisehg/html/genindex.html 502share/doc/tortoisehg/html/genindex.html
494share/doc/tortoisehg/html/guess.html 503share/doc/tortoisehg/html/guess.html
495share/doc/tortoisehg/html/ignore.html 504share/doc/tortoisehg/html/ignore.html
496share/doc/tortoisehg/html/index.html 505share/doc/tortoisehg/html/index.html