diff options
| author | wiz <wiz> | 2012-01-28 10:46:08 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2012-01-28 10:46:08 +0000 |
| commit | e164d36e956318afb0a2592bc573dda6954f15e0 (patch) | |
| tree | 5a6be500357662625eac105e203c3003a7691ec6 | |
| parent | 70a3833210cafdd72166dc7e4f19732a4fe64993 (diff) | |
| download | pkgsrc-e164d36e956318afb0a2592bc573dda6954f15e0.tar.gz | |
Add zlib license.
| -rw-r--r-- | licenses/zlib | 20 | ||||
| -rw-r--r-- | mk/license.mk | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/license.c | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/licenses/zlib b/licenses/zlib new file mode 100644 index 00000000000..c541fcaf516 --- /dev/null +++ b/licenses/zlib @@ -0,0 +1,20 @@ +(C) 1995-2004 Jean-loup Gailly and Mark Adler + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +Jean-loup Gailly Mark Adler +jloup@gzip.org madler@alumni.caltech.edu diff --git a/mk/license.mk b/mk/license.mk index 0850715a93f..d2a7e2e7adb 100644 --- a/mk/license.mk +++ b/mk/license.mk @@ -1,4 +1,4 @@ -# $NetBSD: license.mk,v 1.49 2012/01/04 11:53:38 wiz Exp $ +# $NetBSD: license.mk,v 1.50 2012/01/28 10:46:08 wiz Exp $ # # This file handles everything about the LICENSE variable. It is # included automatically by bsd.pkg.mk. @@ -119,6 +119,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \ mpl-1.0 mpl-1.1 mpl-2.0 \ php png-license \ postgresql-license \ + zlib \ zpl \ python-software-foundation \ ipafont \ diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c index 17c4b13fc02..0245412f173 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.26 2012/01/04 11:53:38 wiz Exp $ */ +/* $NetBSD: license.c,v 1.27 2012/01/28 10:46:08 wiz Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -61,6 +61,7 @@ const char *default_acceptable_licenses = "mpl-1.0 mpl-1.1 mpl-2.0 " "php png-license " "postgresql-license " + "zlib " "zpl " "python-software-foundation " "ipafont " |