[pkgsrc/trunk]: pkgsrc py-pyutil, passphrase: Add CONFLICTS entry.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/50f3f788bc56
branches:  trunk
changeset: 434424:50f3f788bc56
user:      nikita <nikita%pkgsrc.org@localhost>
date:      Tue Jun 16 11:34:40 2020 +0000

description:
py-pyutil, passphrase: Add CONFLICTS entry.

diffstat:

 devel/py-pyutil/Makefile     |  4 +++-
 security/passphrase/Makefile |  5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r f4b4c2148d73 -r 50f3f788bc56 devel/py-pyutil/Makefile
--- a/devel/py-pyutil/Makefile  Tue Jun 16 11:11:40 2020 +0000
+++ b/devel/py-pyutil/Makefile  Tue Jun 16 11:34:40 2020 +0000
@@ -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 @@
 
 USE_LANGUAGES= # none
 
+CONFLICTS+=    passphrase-[0-9]*
+
 post-extract:
        ${FIND} ${WRKSRC} -name __pycache__ -or -name '*.pyc' -exec ${RM} -R {} +
 
diff -r f4b4c2148d73 -r 50f3f788bc56 security/passphrase/Makefile
--- a/security/passphrase/Makefile      Tue Jun 16 11:11:40 2020 +0000
+++ b/security/passphrase/Makefile      Tue Jun 16 11:34:40 2020 +0000
@@ -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 @@
 
 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