Sat Sep 17 19:16:53 2022 UTC ()
Update py-tortoisehg to version 6.2.2

Update py-tortoisehg to version 6.2.2 .
Update to match version of py-mercurial
since py-tortoisehg developers has
tested this version with py-mercurial
6.2.2 .


(nros)
diff -r1.85 -r1.86 pkgsrc/devel/py-tortoisehg/Makefile
diff -r1.54 -r1.55 pkgsrc/devel/py-tortoisehg/distinfo
cvs diff -r1.85 -r1.86 pkgsrc/devel/py-tortoisehg/Makefile (switch to unified diff)

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

--- pkgsrc/devel/py-tortoisehg/distinfo 2022/04/23 12:01:23 1.54
+++ pkgsrc/devel/py-tortoisehg/distinfo 2022/09/17 19:16:53 1.55
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.54 2022/04/23 12:01:23 nros Exp $ 1$NetBSD: distinfo,v 1.55 2022/09/17 19:16:53 nros Exp $
2 2
3BLAKE2s (tortoisehg-6.1.1.tar.gz) = 849527ad8992fbbabab769bf4b45e28228119c187d84c5078cf120a3628e8384 3BLAKE2s (tortoisehg-6.2.2.tar.gz) = fa3dde22a5d99520fb1f2481d1d7018750f8e8f0c4a75b33c961f8a7b34661ec
4SHA512 (tortoisehg-6.1.1.tar.gz) = 145353f123b79f9216aa8986b199720525447881c7e16fdf8eff18b29ca28a018e077c25b13cc6c51bced03823d958e71d63ee7a15d330e3785cd8970ffdeb87 4SHA512 (tortoisehg-6.2.2.tar.gz) = f8f39797af8859b0c9413cbb525a9047ebb2dd894db6ec6c12341b990b1d003945d1da6eac23d8a65609e635189dbc808bf9cbf4f3ab235dbb04f393ed4a5667
5Size (tortoisehg-6.1.1.tar.gz) = 8923276 bytes 5Size (tortoisehg-6.2.2.tar.gz) = 8928012 bytes