[pkgsrc/trunk]: pkgsrc/security Revert last commit. According to wiz@ in priv...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0c4608ed326
branches:  trunk
changeset: 357098:b0c4608ed326
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Thu Jan 12 16:36:35 2017 +0000

description:
Revert last commit. According to wiz@ in private mail, CONFLICTS is needed
for configuration files only.

diffstat:

 security/py-crypto/Makefile     |  3 +--
 security/py-cryptodome/Makefile |  4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r b02aafa6e5c2 -r b0c4608ed326 security/py-crypto/Makefile
--- a/security/py-crypto/Makefile       Thu Jan 12 16:03:05 2017 +0000
+++ b/security/py-crypto/Makefile       Thu Jan 12 16:36:35 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/01/12 11:53:16 rodent Exp $
+# $NetBSD: Makefile,v 1.39 2017/01/12 16:36:35 rodent Exp $
 
 DISTNAME=      pycrypto-2.6.1
 PKGNAME=       ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
@@ -12,7 +12,6 @@
 LICENSE=       public-domain AND python-software-foundation
 
 CONFLICTS+=    ${PYPKGPREFIX}-amkCrypto-[0-9]*
-CONFLICTS+=    ${PYPKGPREFIX}-cryptodome-[0-9]*
 SUPERSEDES+=   ${PYPKGPREFIX}-amkCrypto-[0-9]*
 
 GNU_CONFIGURE= yes
diff -r b02aafa6e5c2 -r b0c4608ed326 security/py-cryptodome/Makefile
--- a/security/py-cryptodome/Makefile   Thu Jan 12 16:03:05 2017 +0000
+++ b/security/py-cryptodome/Makefile   Thu Jan 12 16:36:35 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/12 11:53:16 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/12 16:36:36 rodent Exp $
 
 DISTNAME=      pycryptodome-3.4.3
 PKGNAME=       ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
@@ -10,8 +10,6 @@
 COMMENT=       Cryptographic and hash functions for Python
 LICENSE=       public-domain AND python-software-foundation
 
-CONFLICTS+=    ${PYPKGPREFIX}-crypto-[0-9]*
-
 do-test:
        ${RUN}cd ${WRKSRC};${SETENV} ${TEST_ENV} ${PYTHONBIN} ${PYSETUP} test