Wed Apr 29 23:50:07 2009 UTC ()
Add apache-1.1 to DEFAULT_ACCEPTABLE_LICENSES.
Remove comment that this file has draft status - it's live now.


(gdt)
diff -r1.15 -r1.16 pkgsrc/mk/license.mk
cvs diff -r1.15 -r1.16 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2009/04/25 13:15:43 1.15
+++ pkgsrc/mk/license.mk 2009/04/29 23:50:07 1.16
@@ -1,17 +1,14 @@ @@ -1,17 +1,14 @@
1# $NetBSD: license.mk,v 1.15 2009/04/25 13:15:43 gdt Exp $ 1# $NetBSD: license.mk,v 1.16 2009/04/29 23:50:07 gdt Exp $
2# 
3# Note: This file is in draft state and not yet included in default 
4# pkgsrc operations. 
5# 2#
6# This file handles everything about the LICENSE variable. It is 3# This file handles everything about the LICENSE variable. It is
7# included automatically by bsd.pkg.mk. 4# included automatically by bsd.pkg.mk.
8# 5#
9# XXX: Some of this content arguably belongs in the pkgsrc guide 6# XXX: Some of this content arguably belongs in the pkgsrc guide
10# instead. 7# instead.
11# 8#
12# === User-settable variables === 9# === User-settable variables ===
13# 10#
14# ACCEPTABLE_LICENSES 11# ACCEPTABLE_LICENSES
15# If a package declares a license and that license is not a 12# If a package declares a license and that license is not a
16# member of the list defined by this variable, pkgsrc will 13# member of the list defined by this variable, pkgsrc will
17# refuse to build the package. 14# refuse to build the package.
@@ -80,27 +77,27 @@ @@ -80,27 +77,27 @@
80# added to the list as they are added to pkgsrc. 77# added to the list as they are added to pkgsrc.
81 78
82# The convention is that Free or Open Source licenses do not have a 79# The convention is that Free or Open Source licenses do not have a
83# -license suffix, and nonfree licenses end in -license. 80# -license suffix, and nonfree licenses end in -license.
84 81
85# XXX open-font-license should perhaps be changed to open-font 82# XXX open-font-license should perhaps be changed to open-font
86 83
87DEFAULT_ACCEPTABLE_LICENSES= \ 84DEFAULT_ACCEPTABLE_LICENSES= \
88 public-domain \ 85 public-domain \
89 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \ 86 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
90 gnu-gpl-v3 gnu-lgpl-v3 \ 87 gnu-gpl-v3 gnu-lgpl-v3 \
91 original-bsd modified-bsd \ 88 original-bsd modified-bsd \
92 x11 \ 89 x11 \
93 apache-2.0 \ 90 apache-1.1 apache-2.0 \
94 artistic artistic-2.0 \ 91 artistic artistic-2.0 \
95 cddl-1.0 \ 92 cddl-1.0 \
96 open-font-license 93 open-font-license
97 94
98##### Variant spellings 95##### Variant spellings
99 96
100.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES) 97.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
101ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} 98ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES}
102.endif 99.endif
103 100
104.if !defined(LICENSE) 101.if !defined(LICENSE)
105. if defined(PKG_DEVELOPER) 102. if defined(PKG_DEVELOPER)
106WARNINGS+= "[license.mk] Every package should define a LICENSE." 103WARNINGS+= "[license.mk] Every package should define a LICENSE."