Thu Jan 13 13:25:57 2011 UTC ()
Add png-license and add it to the default-allowed licenses.
(very similar to mit or modified-bsd, but different)


(wiz)
diff -r0 -r1.1 pkgsrc/licenses/png-license
diff -r1.35 -r1.36 pkgsrc/mk/license.mk
diff -r1.14 -r1.15 pkgsrc/pkgtools/pkg_install/files/lib/license.c

File Added: pkgsrc/licenses/Attic/png-license

This copy of the libpng notices is provided for your convenience.  In case of
any discrepancy between this copy and the notices in the file png.h that is
included in the libpng distribution, the latter shall prevail.

COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:

If you modify libpng you may insert additional notices immediately following
this sentence.

This code is released under the libpng license.

libpng versions 1.2.6, August 15, 2004, through 1.4.6beta02, December 31, 2010, are
Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors

   Cosmin Truta

libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.0.6
with the following individuals added to the list of Contributing Authors

   Simon-Pierre Cadieux
   Eric S. Raymond
   Gilles Vollant

and with the following additions to the disclaimer:

   There is no warranty against interference with your enjoyment of the
   library or against infringement.  There is no warranty that our
   efforts or the library will fulfill any of your particular purposes
   or needs.  This library is provided with all faults, and the entire
   risk of satisfactory quality, performance, accuracy, and effort is with
   the user.

libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-0.96,
with the following individuals added to the list of Contributing Authors:

   Tom Lane
   Glenn Randers-Pehrson
   Willem van Schaik

libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996, 1997 Andreas Dilger
Distributed according to the same disclaimer and license as libpng-0.88,
with the following individuals added to the list of Contributing Authors:

   John Bowler
   Kevin Bracey
   Sam Bushell
   Magnus Holmgren
   Greg Roelofs
   Tom Tanner

libpng versions 0.5, May 1995, through 0.88, January 1996, are
Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.

For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals:

   Andreas Dilger
   Dave Martindale
   Guy Eric Schalnat
   Paul Schmidt
   Tim Wegner

The PNG Reference Library is supplied "AS IS".  The Contributing Authors
and Group 42, Inc. disclaim all warranties, expressed or implied,
including, without limitation, the warranties of merchantability and of
fitness for any purpose.  The Contributing Authors and Group 42, Inc.
assume no liability for direct, indirect, incidental, special, exemplary,
or consequential damages, which may result from the use of the PNG
Reference Library, even if advised of the possibility of such damage.

Permission is hereby granted to use, copy, modify, and distribute this
source code, or portions hereof, for any purpose, without fee, subject
to the following restrictions:

1. The origin of this source code must not be misrepresented.

2. Altered versions must be plainly marked as such and must not
   be misrepresented as being the original source.

3. This Copyright notice may not be removed or altered from any
   source or altered source distribution.

The Contributing Authors and Group 42, Inc. specifically permit, without
fee, and encourage the use of this source code as a component to
supporting the PNG file format in commercial products.  If you use this
source code in a product, acknowledgment is not required but would be
appreciated.


A "png_get_copyright" function is available, for convenient use in "about"
boxes and the like:

   printf("%s",png_get_copyright(NULL));

Also, the PNG logo (in PNG format, of course) is supplied in the
files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).

Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
certification mark of the Open Source Initiative.

Glenn Randers-Pehrson
glennrp at users.sourceforge.net
December 31, 2010

cvs diff -r1.35 -r1.36 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2010/08/24 19:08:29 1.35
+++ pkgsrc/mk/license.mk 2011/01/13 13:25:56 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.35 2010/08/24 19:08:29 bad Exp $ 1# $NetBSD: license.mk,v 1.36 2011/01/13 13:25:56 wiz Exp $
2# 2#
3# This file handles everything about the LICENSE variable. It is 3# This file handles everything about the LICENSE variable. It is
4# included automatically by bsd.pkg.mk. 4# included automatically by bsd.pkg.mk.
5# 5#
6# XXX There should be one place to set the default list and for users 6# XXX There should be one place to set the default list and for users
7# to set the ACCEPTABLE_LICENSES list, used by both source builds and 7# to set the ACCEPTABLE_LICENSES list, used by both source builds and
8# binary installs# 8# binary installs#
9# 9#
10# XXX: Some of this content arguably belongs in the pkgsrc guide 10# XXX: Some of this content arguably belongs in the pkgsrc guide
11# instead. 11# instead.
12# 12#
13# === User-settable variables === 13# === User-settable variables ===
14# 14#
@@ -100,26 +100,27 @@ @@ -100,26 +100,27 @@
100DEFAULT_ACCEPTABLE_LICENSES= \ 100DEFAULT_ACCEPTABLE_LICENSES= \
101 public-domain \ 101 public-domain \
102 gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \ 102 gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
103 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \ 103 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
104 gnu-gpl-v3 gnu-lgpl-v3 \ 104 gnu-gpl-v3 gnu-lgpl-v3 \
105 original-bsd modified-bsd 2-clause-bsd \ 105 original-bsd modified-bsd 2-clause-bsd \
106 x11 mit miros \ 106 x11 mit miros \
107 apache-1.1 apache-2.0 \ 107 apache-1.1 apache-2.0 \
108 artistic artistic-2.0 \ 108 artistic artistic-2.0 \
109 cddl-1.0 \ 109 cddl-1.0 \
110 cpl-1.0 \ 110 cpl-1.0 \
111 open-font-license \ 111 open-font-license \
112 mpl-1.0 mpl-1.1 \ 112 mpl-1.0 mpl-1.1 \
 113 png-license \
113 zpl \ 114 zpl \
114 python-software-foundation \ 115 python-software-foundation \
115 ipafont \ 116 ipafont \
116 isc 117 isc
117 118
118# not approved by OSI, derived from BSD 119# not approved by OSI, derived from BSD
119DEFAULT_ACCEPTABLE_LICENSES+= info-zip 120DEFAULT_ACCEPTABLE_LICENSES+= info-zip
120 121
121##### Variant spellings 122##### Variant spellings
122 123
123.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES) 124.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
124ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} 125ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES}
125.endif 126.endif

cvs diff -r1.14 -r1.15 pkgsrc/pkgtools/pkg_install/files/lib/license.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/license.c 2010/05/06 13:16:59 1.14
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c 2011/01/13 13:25:56 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: license.c,v 1.14 2010/05/06 13:16:59 obache Exp $ */ 1/* $NetBSD: license.c,v 1.15 2011/01/13 13:25:56 wiz Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. 4 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in 14 * notice, this list of conditions and the following disclaimer in
@@ -48,26 +48,27 @@ @@ -48,26 +48,27 @@
48const char *default_acceptable_licenses = 48const char *default_acceptable_licenses =
49 "public-domain " 49 "public-domain "
50 "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 " 50 "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
51 "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 " 51 "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
52 "gnu-gpl-v3 gnu-lgpl-v3 " 52 "gnu-gpl-v3 gnu-lgpl-v3 "
53 "original-bsd modified-bsd 2-clause-bsd " 53 "original-bsd modified-bsd 2-clause-bsd "
54 "x11 mit miros " 54 "x11 mit miros "
55 "apache-1.1 apache-2.0 " 55 "apache-1.1 apache-2.0 "
56 "artistic artistic-2.0 " 56 "artistic artistic-2.0 "
57 "cddl-1.0 " 57 "cddl-1.0 "
58 "cpl-1.0 " 58 "cpl-1.0 "
59 "open-font-license " 59 "open-font-license "
60 "mpl-1.0 mpl-1.1 " 60 "mpl-1.0 mpl-1.1 "
 61 "png-license "
61 "zpl " 62 "zpl "
62 "python-software-foundation " 63 "python-software-foundation "
63 "ipafont " 64 "ipafont "
64 "isc " 65 "isc "
65 "info-zip"; 66 "info-zip";
66 67
67#ifdef DEBUG 68#ifdef DEBUG
68static size_t hash_collisions; 69static size_t hash_collisions;
69#endif 70#endif
70 71
71static char **license_hash[HASH_SIZE]; 72static char **license_hash[HASH_SIZE];
72static const char license_spaces[] = " \t\n"; 73static const char license_spaces[] = " \t\n";
73static const char license_chars[] = 74static const char license_chars[] =