summaryrefslogtreecommitdiff
path: root/devel/py-tortoisehg
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-11-08 08:19:37 +0000
committerwiz <wiz@pkgsrc.org>2016-11-08 08:19:37 +0000
commit2a723472b0ff39d70c76d3ec8e69f3107ac0080d (patch)
tree5c184e98b03d9c1b64f2b8152701ef2061877a8a /devel/py-tortoisehg
parent2032746a1d9dabfe64097300ea6e25bdb9b6035a (diff)
downloadpkgsrc-2a723472b0ff39d70c76d3ec8e69f3107ac0080d.tar.gz
Do not install same files that mercurial itself installs.
Bump PKGREVISION.
Diffstat (limited to 'devel/py-tortoisehg')
-rw-r--r--devel/py-tortoisehg/Makefile6
-rw-r--r--devel/py-tortoisehg/PLIST5
2 files changed, 6 insertions, 5 deletions
diff --git a/devel/py-tortoisehg/Makefile b/devel/py-tortoisehg/Makefile
index 136f8c0de52..d3b13270a34 100644
--- a/devel/py-tortoisehg/Makefile
+++ b/devel/py-tortoisehg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2016/11/07 11:27:13 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2016/11/08 08:19:37 wiz Exp $
DISTNAME= tortoisehg-4.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://bitbucket.org/tortoisehg/targz/downloads/
@@ -29,6 +30,9 @@ SUBST_SED.df= -e 's:thg_logo:${PREFIX}${thg_icon}:1'
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
+ ${RM} ${WRKSRC}/hgext3rd/__init__.py
.include "../../lang/python/application.mk"
.include "../../lang/python/distutils.mk"
diff --git a/devel/py-tortoisehg/PLIST b/devel/py-tortoisehg/PLIST
index bfbd5b62e21..92ac9e0d0c0 100644
--- a/devel/py-tortoisehg/PLIST
+++ b/devel/py-tortoisehg/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2016/11/07 11:27:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/11/08 08:19:37 wiz Exp $
bin/thg
${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/hgext3rd/__init__.py
-${PYSITELIB}/hgext3rd/__init__.pyc
-${PYSITELIB}/hgext3rd/__init__.pyo
${PYSITELIB}/hgext3rd/thg.py
${PYSITELIB}/hgext3rd/thg.pyc
${PYSITELIB}/hgext3rd/thg.pyo