summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrodent <rodent>2015-04-19 00:50:02 +0000
committerrodent <rodent>2015-04-19 00:50:02 +0000
commit4d9566d19655784d796c55880b4d00454a3e9c2a (patch)
treea937b0949ec34d73b7a9c7d91601cd357333bb18
parent3c0972eaff9a254ca9cc362508e622f4ae767602 (diff)
downloadpkgsrc-4d9566d19655784d796c55880b4d00454a3e9c2a.tar.gz
CONFLICT with py-py-bcrypt. They install some files in the same place.
-rw-r--r--security/py-bcrypt/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index bfdb7167f47..872cd0f9781 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -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}-cffi-[0-9]*:../../devel/py-cffi
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"