CVS commit: pkgsrc/security

["Blue Rats" <rodent%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rodent
Date:           Thu Jan 12 16:36:36 UTC 2017

Modified Files:
        pkgsrc/security/py-crypto: Makefile
        pkgsrc/security/py-cryptodome: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/py-crypto/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-cryptodome/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/py-crypto/Makefile
diff -u pkgsrc/security/py-crypto/Makefile:1.38 pkgsrc/security/py-crypto/Makefile:1.39
--- pkgsrc/security/py-crypto/Makefile:1.38     Thu Jan 12 11:53:16 2017
+++ pkgsrc/security/py-crypto/Makefile  Thu Jan 12 16:36:35 2017
@@ -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 @@ COMMENT=      Cryptographic and hash function
 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

Index: pkgsrc/security/py-cryptodome/Makefile
diff -u pkgsrc/security/py-cryptodome/Makefile:1.3 pkgsrc/security/py-cryptodome/Makefile:1.4
--- pkgsrc/security/py-cryptodome/Makefile:1.3  Thu Jan 12 11:53:16 2017
+++ pkgsrc/security/py-cryptodome/Makefile      Thu Jan 12 16:36:36 2017
@@ -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 @@ HOMEPAGE=     https://www.pycryptodome.org/
 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