Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1C26B7A27D for ; Tue, 8 Nov 2016 08:19:39 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8B5A685598; Tue, 8 Nov 2016 08:19:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1B7CA85577 for ; Tue, 8 Nov 2016 08:19:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id yH_-2FKBbo9w for ; Tue, 8 Nov 2016 08:19:37 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A300C85574 for ; Tue, 8 Nov 2016 08:19:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 99CF3FBA6; Tue, 8 Nov 2016 08:19:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1478593177105090" MIME-Version: 1.0 Date: Tue, 8 Nov 2016 08:19:37 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/py-tortoisehg To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161108081937.99CF3FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1478593177105090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1478593177105090 Content-Disposition: inline Content-Length: 1679 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1478593177105090--