[pkgsrc/trunk]: pkgsrc/security/py-bcrypt CONFLICT with py-py-bcrypt. They in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/abfd53807555
branches:  trunk
changeset: 650153:abfd53807555
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sun Apr 19 00:50:02 2015 +0000

description:
CONFLICT with py-py-bcrypt. They install some files in the same place.

diffstat:

 security/py-bcrypt/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 8e46e0418575 -r abfd53807555 security/py-bcrypt/Makefile
--- a/security/py-bcrypt/Makefile       Sun Apr 19 00:48:47 2015 +0000
+++ b/security/py-bcrypt/Makefile       Sun Apr 19 00:50:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/06 13:09:53 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/19 00:50:02 rodent Exp $
 
 DISTNAME=      bcrypt-1.1.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,6 +14,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+CONFLICTS+=    ${PYPKGPREFIX}-py-bcrypt-[0-9]*:../../security/py-py-bcrypt
+
 .include "options.mk"
 
 .include "../../lang/python/egg.mk"