[pkgsrc/trunk]: pkgsrc/devel/py-tortoisehg Do not install same files that mer...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3eb953b066f1
branches:  trunk
changeset: 354752:3eb953b066f1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 08 08:19:37 2016 +0000

description:
Do not install same files that mercurial itself installs.

Bump PKGREVISION.

diffstat:

 devel/py-tortoisehg/Makefile |  6 +++++-
 devel/py-tortoisehg/PLIST    |  5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 5b3a48071038 -r 3eb953b066f1 devel/py-tortoisehg/Makefile
--- a/devel/py-tortoisehg/Makefile      Tue Nov 08 08:08:52 2016 +0000
+++ b/devel/py-tortoisehg/Makefile      Tue Nov 08 08:19:37 2016 +0000
@@ -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 @@
 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 -r 5b3a48071038 -r 3eb953b066f1 devel/py-tortoisehg/PLIST
--- a/devel/py-tortoisehg/PLIST Tue Nov 08 08:08:52 2016 +0000
+++ b/devel/py-tortoisehg/PLIST Tue Nov 08 08:19:37 2016 +0000
@@ -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