diff options
| author | rodent <rodent@pkgsrc.org> | 2017-01-12 11:53:16 +0000 |
|---|---|---|
| committer | rodent <rodent@pkgsrc.org> | 2017-01-12 11:53:16 +0000 |
| commit | fb815184f873d9ee6cf5e2c96daadae2d351b9ad (patch) | |
| tree | d0555ae30a6cf4599efb53d62d002cccf114e4d6 /security | |
| parent | 693ea0ad8ee7ebbb9d8dd1475e666c9345ee2620 (diff) | |
| download | pkgsrc-fb815184f873d9ee6cf5e2c96daadae2d351b9ad.tar.gz | |
py-crypto and py-cryptodome CONFLICT with:
${PYSITELIB}/Crypto/Cipher/AES.py
Diffstat (limited to 'security')
| -rw-r--r-- | security/py-crypto/Makefile | 3 | ||||
| -rwxr-xr-x | security/py-cryptodome/Makefile | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile index 299f56191d9..5645db075ef 100644 --- a/security/py-crypto/Makefile +++ b/security/py-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2016/12/30 22:50:15 maya Exp $ +# $NetBSD: Makefile,v 1.38 2017/01/12 11:53:16 rodent Exp $ DISTNAME= pycrypto-2.6.1 PKGNAME= ${DISTNAME:S/^py/${PYPKGPREFIX}-/} @@ -12,6 +12,7 @@ COMMENT= Cryptographic and hash functions for Python 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 --git a/security/py-cryptodome/Makefile b/security/py-cryptodome/Makefile index 11c1fa35a31..2dafc2c2f13 100755 --- a/security/py-cryptodome/Makefile +++ b/security/py-cryptodome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/12/30 22:50:15 maya Exp $ +# $NetBSD: Makefile,v 1.3 2017/01/12 11:53:16 rodent Exp $ DISTNAME= pycryptodome-3.4.3 PKGNAME= ${DISTNAME:S/^py/${PYPKGPREFIX}-/} @@ -10,6 +10,8 @@ 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 |