summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2011-01-18 12:06:57 +0000
committerdrochner <drochner@pkgsrc.org>2011-01-18 12:06:57 +0000
commitb14427059e48b928fa5a62e7dc7d66afa35a97bb (patch)
tree56269c061f34ad9fc57b7fc507b0d2bb313203e2 /security
parent8d2081a06db3232b1b83ef0e7467da590d425a1d (diff)
downloadpkgsrc-b14427059e48b928fa5a62e7dc7d66afa35a97bb.tar.gz
add/fix mutual CONFLICT
Diffstat (limited to 'security')
-rw-r--r--security/py-amkCrypto/Makefile4
-rw-r--r--security/py-crypto/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/security/py-amkCrypto/Makefile b/security/py-amkCrypto/Makefile
index 56d152a99d3..5fbd321f247 100644
--- a/security/py-amkCrypto/Makefile
+++ b/security/py-amkCrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/01/17 12:02:43 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2011/01/18 12:06:57 drochner Exp $
#
DISTNAME= pycrypto-2.0.1
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.amk.ca/python/code/crypto.html
COMMENT= Cryptographic and hash functions for Python
+CONFLICTS+= ${PYPKGPREFIX}-crypto-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
PYDISTUTILSPKG= yes
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 0f7e99ace39..0fe56adb181 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/12/05 17:13:09 gls Exp $
+# $NetBSD: Makefile,v 1.21 2011/01/18 12:06:57 drochner Exp $
#
DISTNAME= pycrypto-2.3
@@ -12,7 +12,7 @@ COMMENT= Cryptographic and hash functions for Python
# mostly public domain, but a few bits are:
LICENSE= python-software-foundation
-CONFLICTS+= py-amkCrypto-[0-9]*
+CONFLICTS+= ${PYPKGPREFIX}-amkCrypto-[0-9]*
PKG_DESTDIR_SUPPORT= user-destdir