Tue Nov 29 14:49:19 2011 UTC ()
Add gnu-agpl-v3 to DEFAULT_ACCEPTABLE_LICENSES.
Sync with pkgsrc/pkgtools/pkg_install/files/lib/license.c.

XXX I follow documented policy in mk/license.mk.


(ryoon)
diff -r1.44 -r1.45 pkgsrc/mk/license.mk
cvs diff -r1.44 -r1.45 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2011/09/08 20:17:15 1.44
+++ pkgsrc/mk/license.mk 2011/11/29 14:49:19 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.44 2011/09/08 20:17:15 abs Exp $ 1# $NetBSD: license.mk,v 1.45 2011/11/29 14:49:19 ryoon 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#
@@ -109,27 +109,28 @@ DEFAULT_ACCEPTABLE_LICENSES= \ @@ -109,27 +109,28 @@ DEFAULT_ACCEPTABLE_LICENSES= \
109 artistic artistic-2.0 \ 109 artistic artistic-2.0 \
110 cddl-1.0 \ 110 cddl-1.0 \
111 cpl-1.0 \ 111 cpl-1.0 \
112 open-font-license \ 112 open-font-license \
113 mpl-1.0 mpl-1.1 \ 113 mpl-1.0 mpl-1.1 \
114 php png-license \ 114 php png-license \
115 postgresql-license \ 115 postgresql-license \
116 zpl \ 116 zpl \
117 python-software-foundation \ 117 python-software-foundation \
118 ipafont \ 118 ipafont \
119 isc \ 119 isc \
120 boost-license \ 120 boost-license \
121 mplusfont \ 121 mplusfont \
122 cc-by-sa-v3.0 122 cc-by-sa-v3.0 \
 123 gnu-agpl-v3
123 124
124# not approved by OSI, derived from BSD 125# not approved by OSI, derived from BSD
125DEFAULT_ACCEPTABLE_LICENSES+= info-zip 126DEFAULT_ACCEPTABLE_LICENSES+= info-zip
126 127
127##### Variant spellings 128##### Variant spellings
128 129
129.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES) 130.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
130ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} 131ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES}
131.endif 132.endif
132 133
133.if !defined(LICENSE) 134.if !defined(LICENSE)
134. if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" 135. if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
135WARNINGS+= "[license.mk] Every package should define a LICENSE." 136WARNINGS+= "[license.mk] Every package should define a LICENSE."