Received: by mail.netbsd.org (Postfix, from userid 605) id 3108284D91; Tue, 16 Jun 2020 11:34:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B005584D82 for ; Tue, 16 Jun 2020 11:34:41 +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 5TmphgHSbgul for ; Tue, 16 Jun 2020 11:34:41 +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 0F2A684D3F for ; Tue, 16 Jun 2020 11:34:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 094A6FB28; Tue, 16 Jun 2020 11:34:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592307281197920" MIME-Version: 1.0 Date: Tue, 16 Jun 2020 11:34:41 +0000 From: "Nikita" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nikita@netbsd.org X-Mailer: log_accum Message-Id: <20200616113441.094A6FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1592307281197920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nikita Date: Tue Jun 16 11:34:40 UTC 2020 Modified Files: pkgsrc/devel/py-pyutil: Makefile pkgsrc/security/passphrase: Makefile Log Message: py-pyutil, passphrase: Add CONFLICTS entry. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-pyutil/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/passphrase/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1592307281197920 Content-Disposition: inline Content-Length: 1383 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-pyutil/Makefile diff -u pkgsrc/devel/py-pyutil/Makefile:1.22 pkgsrc/devel/py-pyutil/Makefile:1.23 --- pkgsrc/devel/py-pyutil/Makefile:1.22 Mon Aug 26 13:47:24 2019 +++ pkgsrc/devel/py-pyutil/Makefile Tue Jun 16 11:34:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/26 13:47:24 adam Exp $ +# $NetBSD: Makefile,v 1.23 2020/06/16 11:34:40 nikita Exp $ DISTNAME= pyutil-3.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,6 +16,8 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-twisted>=1 USE_LANGUAGES= # none +CONFLICTS+= passphrase-[0-9]* + post-extract: ${FIND} ${WRKSRC} -name __pycache__ -or -name '*.pyc' -exec ${RM} -R {} + Index: pkgsrc/security/passphrase/Makefile diff -u pkgsrc/security/passphrase/Makefile:1.2 pkgsrc/security/passphrase/Makefile:1.3 --- pkgsrc/security/passphrase/Makefile:1.2 Tue Jun 16 11:02:44 2020 +++ pkgsrc/security/passphrase/Makefile Tue Jun 16 11:34:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/06/16 11:02:44 nikita Exp $ +# $NetBSD: Makefile,v 1.3 2020/06/16 11:34:40 nikita Exp $ DISTNAME= 1.0.0 PKGNAME= passphrase-1.0.0 @@ -13,6 +13,9 @@ LICENSE= mit WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +.include "../../lang/python/egg.mk" +CONFLICTS+= ${PYPKGPREFIX}-pyutil-[0-9]* + SUBST_CLASSES+= mandir SUBST_STAGE.mandir= pre-build SUBST_MESSAGE.mandir= replacing mandir location --_----------=_1592307281197920--