Mon Apr 8 02:24:14 2013 UTC ()
Removed comment regarding the changing of open-font-license to open-font.
Added ofl-v1.0 ofl-v1.1 and removed open-font-license.


(rodent)
diff -r1.55 -r1.56 pkgsrc/mk/license.mk
cvs diff -r1.55 -r1.56 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2013/03/14 16:19:30 1.55
+++ pkgsrc/mk/license.mk 2013/04/08 02:24:14 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.55 2013/03/14 16:19:30 wiz Exp $ 1# $NetBSD: license.mk,v 1.56 2013/04/08 02:24:14 rodent 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#
@@ -91,50 +91,48 @@ @@ -91,50 +91,48 @@
91# === See also === 91# === See also ===
92# 92#
93# ../doc/TODO, section "Licenses of packages" 93# ../doc/TODO, section "Licenses of packages"
94# 94#
95# Keywords: licence license 95# Keywords: licence license
96# 96#
97 97
98# This list is not complete. Free and Open Source licenses should be 98# This list is not complete. Free and Open Source licenses should be
99# added to the list as they are added to pkgsrc. 99# added to the list as they are added to pkgsrc.
100 100
101# The convention is that Free or Open Source licenses do not have a 101# The convention is that Free or Open Source licenses do not have a
102# -license suffix, and nonfree licenses end in -license. 102# -license suffix, and nonfree licenses end in -license.
103 103
104# XXX open-font-license should perhaps be changed to open-font 
105 
106DEFAULT_ACCEPTABLE_LICENSES= \ 104DEFAULT_ACCEPTABLE_LICENSES= \
107 apache-1.1 apache-2.0 \ 105 apache-1.1 apache-2.0 \
108 artistic artistic-2.0 \ 106 artistic artistic-2.0 \
109 boost-license \ 107 boost-license \
110 cc-by-sa-v3.0 \ 108 cc-by-sa-v3.0 \
111 cddl-1.0 \ 109 cddl-1.0 \
112 cpl-1.0 \ 110 cpl-1.0 \
113 epl-v1.0 \ 111 epl-v1.0 \
114 gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \ 112 gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
115 gnu-gpl-v1 \ 113 gnu-gpl-v1 \
116 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \ 114 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
117 gnu-gpl-v3 gnu-lgpl-v3 \ 115 gnu-gpl-v3 gnu-lgpl-v3 \
118 ibm-public-license-1.0 \ 116 ibm-public-license-1.0 \
119 ipafont \ 117 ipafont \
120 isc \ 118 isc \
121 lppl-1.3c \ 119 lppl-1.3c \
122 lucent \ 120 lucent \
123 miros \ 121 miros \
124 mit \ 122 mit \
125 mpl-1.0 mpl-1.1 mpl-2.0 \ 123 mpl-1.0 mpl-1.1 mpl-2.0 \
126 mplusfont \ 124 mplusfont \
127 open-font-license \ 125 ofl-v1.0 ofl-v1.1 \
128 original-bsd modified-bsd 2-clause-bsd \ 126 original-bsd modified-bsd 2-clause-bsd \
129 php \ 127 php \
130 png-license \ 128 png-license \
131 postgresql-license \ 129 postgresql-license \
132 public-domain \ 130 public-domain \
133 python-software-foundation \ 131 python-software-foundation \
134 qpl-v1.0 \ 132 qpl-v1.0 \
135 sleepycat-public \ 133 sleepycat-public \
136 unlicense \ 134 unlicense \
137 x11 \ 135 x11 \
138 zlib \ 136 zlib \
139 zpl 137 zpl
140 138