diff options
| -rw-r--r-- | devel/py-ZopeComponent/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-ZopeInterface/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-setuptools/Makefile | 4 | ||||
| -rw-r--r-- | devel/roundup/Makefile | 4 | ||||
| -rw-r--r-- | licenses/zpl-2.0 (renamed from licenses/zpl) | 0 | ||||
| -rw-r--r-- | licenses/zpl-2.1 | 46 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/license.c | 4 | ||||
| -rw-r--r-- | www/py-ClientForm/Makefile | 4 |
8 files changed, 58 insertions, 12 deletions
diff --git a/devel/py-ZopeComponent/Makefile b/devel/py-ZopeComponent/Makefile index 4dcdfa423ac..c033e7473e1 100644 --- a/devel/py-ZopeComponent/Makefile +++ b/devel/py-ZopeComponent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/01/16 19:32:25 bsiegert Exp $ +# $NetBSD: Makefile,v 1.2 2015/07/15 18:19:54 wiz Exp $ DISTNAME= zope.component-4.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.c/ZopeC/} @@ -8,7 +8,7 @@ MASTER_SITES= https://pypi.python.org/packages/source/z/zope.component/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://docs.zope.org/zopetoolkit/ COMMENT= Zope Component Architecture modules -LICENSE= zpl +LICENSE= zpl-2.0 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-ZopeInterface/Makefile b/devel/py-ZopeInterface/Makefile index a60d2244d51..6291f059771 100644 --- a/devel/py-ZopeInterface/Makefile +++ b/devel/py-ZopeInterface/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/01/13 12:54:25 bsiegert Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/15 18:19:54 wiz Exp $ DISTNAME= zope.interface-4.1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/zope.i/ZopeI/} @@ -8,7 +8,7 @@ MASTER_SITES= https://pypi.python.org/packages/source/z/zope.interface/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pypi.python.org/pypi/zope.interface COMMENT= The zope.interface package used in Zope 3 and Twisted -LICENSE= zpl +LICENSE= zpl-2.0 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index 3935c00d4fd..f7879a94aeb 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2015/07/01 09:29:21 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2015/07/15 18:19:54 wiz Exp $ EGG_VERSION= 18.0.1 DISTNAME= setuptools-${EGG_VERSION} @@ -9,7 +9,7 @@ MASTER_SITES= https://pypi.python.org/packages/source/s/setuptools/ MAINTAINER= joerg@NetBSD.org HOMEPAGE= https://pypi.python.org/pypi/setuptools COMMENT= New Python packaging system -LICENSE= python-software-foundation OR zpl +LICENSE= python-software-foundation OR zpl-2.0 DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile index f9ce8acd17f..e6d1865fe48 100644 --- a/devel/roundup/Makefile +++ b/devel/roundup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2014/05/09 07:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2015/07/15 18:19:54 wiz Exp $ DISTNAME= roundup-1.4.19 PKGREVISION= 2 @@ -8,7 +8,7 @@ MASTER_SITES= http://pypi.python.org/packages/source/r/roundup/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://roundup.sourceforge.net/ COMMENT= Issue tracking system with command-line, web and email clients -LICENSE= mit AND zpl +LICENSE= mit AND zpl-2.0 USE_LANGUAGES= # empty USE_TOOLS+= pax diff --git a/licenses/zpl b/licenses/zpl-2.0 index 44e0648b312..44e0648b312 100644 --- a/licenses/zpl +++ b/licenses/zpl-2.0 diff --git a/licenses/zpl-2.1 b/licenses/zpl-2.1 new file mode 100644 index 00000000000..cf68774e0d6 --- /dev/null +++ b/licenses/zpl-2.1 @@ -0,0 +1,46 @@ +ZPL 2.1 + +Zope Public License (ZPL) Version 2.1 + +A copyright notice accompanies this license document that identifies +the copyright holders. + +This license has been certified as open source. It has also been +designated as GPL compatible by the Free Software Foundation (FSF). + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions in source code must retain the accompanying + copyright notice, this list of conditions, and the following + disclaimer. +2. Redistributions in binary form must reproduce the accompanying + copyright notice, this list of conditions, and the following + disclaimer in the documentation and/or other materials provided + with the distribution. +3. Names of the copyright holders must not be used to endorse or + promote products derived from this software without prior written + permission from the copyright holders. +4. The right to distribute this software or to use it for any + purpose does not give you the right to use Servicemarks (sm) or + Trademarks (tm) of the copyright holders. Use of them is covered + by separate agreement with the copyright holders. +5. If any files are modified, you must cause the modified files to + carry prominent notices stating that you changed the files and the + date of any change. + +Disclaimer + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND +ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c index 5ca10fea9a8..40e43772765 100644 --- a/pkgtools/pkg_install/files/lib/license.c +++ b/pkgtools/pkg_install/files/lib/license.c @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.41 2015/05/08 10:37:32 wiz Exp $ */ +/* $NetBSD: license.c,v 1.42 2015/07/15 18:19:54 wiz Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -86,7 +86,7 @@ const char *default_acceptable_licenses = "w3c " "x11 " "zlib " - "zpl"; + "zpl-2.0 zpl-2.1"; #ifdef DEBUG static size_t hash_collisions; diff --git a/www/py-ClientForm/Makefile b/www/py-ClientForm/Makefile index 523a5043083..39c0e4ee219 100644 --- a/www/py-ClientForm/Makefile +++ b/www/py-ClientForm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/05/09 07:37:24 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/15 18:19:54 wiz Exp $ DISTNAME= ClientForm-0.2.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -8,7 +8,7 @@ MASTER_SITES= http://wwwsearch.sourceforge.net/ClientForm/src/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://wwwsearch.sourceforge.net/ClientForm/ COMMENT= Python module for handling HTML forms on the client side -LICENSE= modified-bsd OR zpl +LICENSE= modified-bsd OR zpl-2.0 USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.2.10 |