CVS commit: pkgsrc/security

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Dec 30 22:50:15 UTC 2016

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

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

Pointed out by leot - thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/py-crypto/Makefile
cvs rdiff -u -r1.1 -r1.2 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.36 pkgsrc/security/py-crypto/Makefile:1.37
--- pkgsrc/security/py-crypto/Makefile:1.36     Sat Mar  5 11:29:25 2016
+++ pkgsrc/security/py-crypto/Makefile  Fri Dec 30 22:50:15 2016
@@ -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 @@ MASTER_SITES=   http://ftp.dlitz.net/pub/d
 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]*

Index: pkgsrc/security/py-cryptodome/Makefile
diff -u pkgsrc/security/py-cryptodome/Makefile:1.1 pkgsrc/security/py-cryptodome/Makefile:1.2
--- pkgsrc/security/py-cryptodome/Makefile:1.1  Fri Dec 30 22:32:54 2016
+++ pkgsrc/security/py-cryptodome/Makefile      Fri Dec 30 22:50:15 2016
@@ -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 @@ MASTER_SITES=   ${MASTER_SITE_PYPI:=p/pycr
 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