[pkgsrc/trunk]: pkgsrc/security Use public-domain AND python-software-foundat...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d47592786ec4
branches:  trunk
changeset: 356422:d47592786ec4
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri Dec 30 22:50:15 2016 +0000

description:
Use public-domain AND python-software-foundation as a license.

Pointed out by leot - thanks!

diffstat:

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

diffs (38 lines):

diff -r b3453688dcd0 -r d47592786ec4 security/py-crypto/Makefile
--- a/security/py-crypto/Makefile       Fri Dec 30 22:42:33 2016 +0000
+++ b/security/py-crypto/Makefile       Fri Dec 30 22:50:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/03/05 11:29:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2016/12/30 22:50:15 maya Exp $
 
 DISTNAME=      pycrypto-2.6.1
 PKGNAME=       ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
@@ -9,8 +9,7 @@
 MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      http://www.dlitz.net/software/pycrypto/
 COMMENT=       Cryptographic and hash functions for Python
-# mostly public domain, but a few bits are:
-LICENSE=       python-software-foundation
+LICENSE=       public-domain AND python-software-foundation
 
 CONFLICTS+=    ${PYPKGPREFIX}-amkCrypto-[0-9]*
 SUPERSEDES+=   ${PYPKGPREFIX}-amkCrypto-[0-9]*
diff -r b3453688dcd0 -r d47592786ec4 security/py-cryptodome/Makefile
--- a/security/py-cryptodome/Makefile   Fri Dec 30 22:42:33 2016 +0000
+++ b/security/py-cryptodome/Makefile   Fri Dec 30 22:50:15 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/30 22:32:54 maya Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/30 22:50:15 maya Exp $
 
 DISTNAME=      pycryptodome-3.4.3
 PKGNAME=       ${DISTNAME:S/^py/${PYPKGPREFIX}-/}
@@ -8,8 +8,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.pycryptodome.org/
 COMMENT=       Cryptographic and hash functions for Python
-# mostly public domain, but a few bits are:
-LICENSE=       python-software-foundation
+LICENSE=       public-domain AND python-software-foundation
 
 do-test:
        ${RUN}cd ${WRKSRC};${SETENV} ${TEST_ENV} ${PYTHONBIN} ${PYSETUP} test