pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Add zlib license.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1aede5cf02df
branches:  trunk
changeset: 598640:1aede5cf02df
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 28 10:46:08 2012 +0000

description:
Add zlib license.

diffstat:

 licenses/zlib                            |  20 ++++++++++++++++++++
 mk/license.mk                            |   3 ++-
 pkgtools/pkg_install/files/lib/license.c |   3 ++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r 5c2fd11a26a2 -r 1aede5cf02df licenses/zlib
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/licenses/zlib     Sat Jan 28 10:46:08 2012 +0000
@@ -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@localhost          madler%alumni.caltech.edu@localhost
diff -r 5c2fd11a26a2 -r 1aede5cf02df mk/license.mk
--- a/mk/license.mk     Sat Jan 28 10:43:00 2012 +0000
+++ b/mk/license.mk     Sat Jan 28 10:46:08 2012 +0000
@@ -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 @@
        mpl-1.0 mpl-1.1 mpl-2.0 \
        php png-license \
        postgresql-license \
+       zlib \
        zpl \
        python-software-foundation \
        ipafont \
diff -r 5c2fd11a26a2 -r 1aede5cf02df pkgtools/pkg_install/files/lib/license.c
--- a/pkgtools/pkg_install/files/lib/license.c  Sat Jan 28 10:43:00 2012 +0000
+++ b/pkgtools/pkg_install/files/lib/license.c  Sat Jan 28 10:46:08 2012 +0000
@@ -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@localhost>.
@@ -61,6 +61,7 @@
     "mpl-1.0 mpl-1.1 mpl-2.0 "
     "php png-license "
     "postgresql-license "
+    "zlib "
     "zpl "
     "python-software-foundation "
     "ipafont "



Home | Main Index | Thread Index | Old Index