diff options
| author | rodent <rodent> | 2017-01-12 16:36:35 +0000 |
|---|---|---|
| committer | rodent <rodent> | 2017-01-12 16:36:35 +0000 |
| commit | df96efb1dccef18ff0a87e1f60fc2cb8cc9b4565 (patch) | |
| tree | 1b108ca744ae37db744162a31caa217d6726f9f2 /security | |
| parent | d4b3ae7d1235f97a2d4b3c076166bbbba4842b70 (diff) | |
| download | pkgsrc-df96efb1dccef18ff0a87e1f60fc2cb8cc9b4565.tar.gz | |
Revert last commit. According to wiz@ in private mail, CONFLICTS is needed
for configuration files only.
Diffstat (limited to 'security')
| -rw-r--r-- | security/py-crypto/Makefile | 3 | ||||
| -rwxr-xr-x | security/py-cryptodome/Makefile | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile index 5645db075ef..9fe529d6131 100644 --- a/security/py-crypto/Makefile +++ b/security/py-crypto/Makefile @@ -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 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 2dafc2c2f13..839c1308342 100755 --- a/security/py-cryptodome/Makefile +++ b/security/py-cryptodome/Makefile @@ -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 |