CVS commit: pkgsrc/devel/py-tortoisehg

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov  8 08:19:37 UTC 2016

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

Log Message:
Do not install same files that mercurial itself installs.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/py-tortoisehg/Makefile
cvs rdiff -u -r1.12 -r1.13 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.39 pkgsrc/devel/py-tortoisehg/Makefile:1.40
--- pkgsrc/devel/py-tortoisehg/Makefile:1.39    Mon Nov  7 11:27:13 2016
+++ pkgsrc/devel/py-tortoisehg/Makefile Tue Nov  8 08:19:37 2016
@@ -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}$
 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"

Index: pkgsrc/devel/py-tortoisehg/PLIST
diff -u pkgsrc/devel/py-tortoisehg/PLIST:1.12 pkgsrc/devel/py-tortoisehg/PLIST:1.13
--- pkgsrc/devel/py-tortoisehg/PLIST:1.12       Mon Nov  7 11:27:13 2016
+++ pkgsrc/devel/py-tortoisehg/PLIST    Tue Nov  8 08:19:37 2016
@@ -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