summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnoebe <schnoebe@pkgsrc.org>2011-02-06 18:54:49 +0000
committerschnoebe <schnoebe@pkgsrc.org>2011-02-06 18:54:49 +0000
commitd529d8d53f943b06511e0a7472ac5e31d82cce27 (patch)
tree9c920f660083c4ae9ea2b2e10e86222f2b8b04c7
parent7a92be0426436b69d62d8e1af4daa7d7b9638562 (diff)
downloadpkgsrc-d529d8d53f943b06511e0a7472ac5e31d82cce27.tar.gz
Bring in boost-license, 1.0. Certified by OSI as an Open Source
license.
-rw-r--r--devel/poco/Makefile.common4
-rw-r--r--mk/license.mk5
-rw-r--r--pkgtools/pkg_install/files/lib/license.c5
3 files changed, 8 insertions, 6 deletions
diff --git a/devel/poco/Makefile.common b/devel/poco/Makefile.common
index 7309c86b576..42a03569936 100644
--- a/devel/poco/Makefile.common
+++ b/devel/poco/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2011/02/06 06:08:07 schnoebe Exp $
+# $NetBSD: Makefile.common,v 1.3 2011/02/06 18:54:50 schnoebe Exp $
#
# used by devel/poco/Makefile
# used by databases/poco-data/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pocoproject.org/
PKG_DESTDIR_SUPPORT= user-destdir
-LICENSE= boost
+LICENSE= boost-license
PATCHDIR= ${.CURDIR}/../../devel/poco/patches
DISTINFO_FILE= ${.CURDIR}/../../devel/poco/distinfo
diff --git a/mk/license.mk b/mk/license.mk
index dc5dcc42e3f..2856f2ec6f1 100644
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.37 2011/01/16 13:13:14 wiz Exp $
+# $NetBSD: license.mk,v 1.38 2011/02/06 18:54:49 schnoebe Exp $
#
# This file handles everything about the LICENSE variable. It is
# included automatically by bsd.pkg.mk.
@@ -114,7 +114,8 @@ DEFAULT_ACCEPTABLE_LICENSES= \
zpl \
python-software-foundation \
ipafont \
- isc
+ isc \
+ boost-license
# not approved by OSI, derived from BSD
DEFAULT_ACCEPTABLE_LICENSES+= info-zip
diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c
index 6fe7ecce129..710a7556857 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.15 2011/01/13 13:25:56 wiz Exp $ */
+/* $NetBSD: license.c,v 1.16 2011/02/06 18:54:50 schnoebe Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -63,7 +63,8 @@ const char *default_acceptable_licenses =
"python-software-foundation "
"ipafont "
"isc "
- "info-zip";
+ "info-zip "
+ "boost-license";
#ifdef DEBUG
static size_t hash_collisions;