Sun Feb 6 18:54:50 2011 UTC ()
Bring in boost-license, 1.0.  Certified by OSI as an Open Source
license.


(schnoebe)
diff -r1.2 -r1.3 pkgsrc/devel/poco/Makefile.common
diff -r1.37 -r1.38 pkgsrc/mk/license.mk
diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_install/files/lib/license.c
cvs diff -r1.2 -r1.3 pkgsrc/devel/poco/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/poco/Makefile.common 2011/02/06 06:08:07 1.2
+++ pkgsrc/devel/poco/Makefile.common 2011/02/06 18:54:50 1.3
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile.common,v 1.2 2011/02/06 06:08:07 schnoebe Exp $ 1# $NetBSD: Makefile.common,v 1.3 2011/02/06 18:54:50 schnoebe Exp $
2# 2#
3# used by devel/poco/Makefile 3# used by devel/poco/Makefile
4# used by databases/poco-data/Makefile 4# used by databases/poco-data/Makefile
5# used by databases/poco-data-sqlite/Makefile 5# used by databases/poco-data-sqlite/Makefile
6# used by databases/poco-data-mysql/Makefile 6# used by databases/poco-data-mysql/Makefile
7# used by databases/poco-data-odbc/Makefile 7# used by databases/poco-data-odbc/Makefile
8 8
9POCO_VERSION=1.4.0 9POCO_VERSION=1.4.0
10 10
11DISTNAME= poco-${POCO_VERSION}-all 11DISTNAME= poco-${POCO_VERSION}-all
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poco/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poco/}
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://www.pocoproject.org/ 15HOMEPAGE= http://www.pocoproject.org/
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18LICENSE= boost 18LICENSE= boost-license
19 19
20PATCHDIR= ${.CURDIR}/../../devel/poco/patches 20PATCHDIR= ${.CURDIR}/../../devel/poco/patches
21DISTINFO_FILE= ${.CURDIR}/../../devel/poco/distinfo 21DISTINFO_FILE= ${.CURDIR}/../../devel/poco/distinfo
22 22
23HAS_CONFIGURE= yes 23HAS_CONFIGURE= yes
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_TOOLS+= gmake 25USE_TOOLS+= gmake
26 26
27CONFIGURE_ARGS+= --prefix=${PREFIX} --omit=Data 27CONFIGURE_ARGS+= --prefix=${PREFIX} --omit=Data
28# don't use the bundled versions of SQLite, zlib, etc.. 28# don't use the bundled versions of SQLite, zlib, etc..
29CONFIGURE_ARGS+= --unbundled 29CONFIGURE_ARGS+= --unbundled
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
cvs diff -r1.37 -r1.38 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2011/01/16 13:13:14 1.37
+++ pkgsrc/mk/license.mk 2011/02/06 18:54:49 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.37 2011/01/16 13:13:14 wiz Exp $ 1# $NetBSD: license.mk,v 1.38 2011/02/06 18:54:49 schnoebe 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#
@@ -104,27 +104,28 @@ DEFAULT_ACCEPTABLE_LICENSES= \ @@ -104,27 +104,28 @@ DEFAULT_ACCEPTABLE_LICENSES= \
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 png-license \
114 zpl \ 114 zpl \
115 python-software-foundation \ 115 python-software-foundation \
116 ipafont \ 116 ipafont \
117 isc 117 isc \
 118 boost-license
118 119
119# not approved by OSI, derived from BSD 120# not approved by OSI, derived from BSD
120DEFAULT_ACCEPTABLE_LICENSES+= info-zip 121DEFAULT_ACCEPTABLE_LICENSES+= info-zip
121 122
122##### Variant spellings 123##### Variant spellings
123 124
124.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES) 125.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
125ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} 126ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES}
126.endif 127.endif
127 128
128.if !defined(LICENSE) 129.if !defined(LICENSE)
129. if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" 130. if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
130WARNINGS+= "[license.mk] Every package should define a LICENSE." 131WARNINGS+= "[license.mk] Every package should define a LICENSE."
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_install/files/lib/license.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/license.c 2011/01/13 13:25:56 1.15
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c 2011/02/06 18:54:50 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: license.c,v 1.15 2011/01/13 13:25:56 wiz Exp $ */ 1/* $NetBSD: license.c,v 1.16 2011/02/06 18:54:50 schnoebe 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
@@ -53,27 +53,28 @@ const char *default_acceptable_licenses  @@ -53,27 +53,28 @@ const char *default_acceptable_licenses
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 "png-license "
62 "zpl " 62 "zpl "
63 "python-software-foundation " 63 "python-software-foundation "
64 "ipafont " 64 "ipafont "
65 "isc " 65 "isc "
66 "info-zip"; 66 "info-zip "
 67 "boost-license";
67 68
68#ifdef DEBUG 69#ifdef DEBUG
69static size_t hash_collisions; 70static size_t hash_collisions;
70#endif 71#endif
71 72
72static char **license_hash[HASH_SIZE]; 73static char **license_hash[HASH_SIZE];
73static const char license_spaces[] = " \t\n"; 74static const char license_spaces[] = " \t\n";
74static const char license_chars[] = 75static const char license_chars[] =
75 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-."; 76 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-.";
76 77
77static size_t 78static size_t
78hash_license(const char *license, size_t len) 79hash_license(const char *license, size_t len)
79{ 80{