Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5565E1A923D for ; Sat, 29 Jan 2022 07:24:01 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A0F9C84D84; Sat, 29 Jan 2022 07:24:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DCB0384D21 for ; Sat, 29 Jan 2022 07:23:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 2vkOjFt2StIo for ; Sat, 29 Jan 2022 07:23:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3EF8E84D04 for ; Sat, 29 Jan 2022 07:23:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 36C0DFB24; Sat, 29 Jan 2022 07:23:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1643441039122620" MIME-Version: 1.0 Date: Sat, 29 Jan 2022 07:23:59 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/py-mercurial To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220129072359.36C0DFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1643441039122620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 29 07:23:59 UTC 2022 Modified Files: pkgsrc/devel/py-mercurial: Makefile Log Message: py-mercurial: mark as conflicting with other versions of this package due to bin/hg and some documentation files To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 pkgsrc/devel/py-mercurial/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1643441039122620 Content-Disposition: inline Content-Length: 712 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-mercurial/Makefile diff -u pkgsrc/devel/py-mercurial/Makefile:1.65 pkgsrc/devel/py-mercurial/Makefile:1.66 --- pkgsrc/devel/py-mercurial/Makefile:1.65 Sun Jan 16 23:51:14 2022 +++ pkgsrc/devel/py-mercurial/Makefile Sat Jan 29 07:23:59 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2022/01/16 23:51:14 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2022/01/29 07:23:59 wiz Exp $ # # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew @@ -23,6 +23,8 @@ USE_TOOLS+= gmake msgfmt INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 INSTALLATION_DIRS+= share/doc/mercurial +PYTHON_SELF_CONFLICT= yes + .include "version.mk" .include "options.mk" --_----------=_1643441039122620--