Thu May 21 19:05:01 2009 UTC ()
Remove bogus gnu-gpl-v2.1.


(wiz)
diff -r1.20 -r1.21 pkgsrc/mk/license.mk
cvs diff -r1.20 -r1.21 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2009/05/21 18:54:39 1.20
+++ pkgsrc/mk/license.mk 2009/05/21 19:05:01 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.20 2009/05/21 18:54:39 sno Exp $ 1# $NetBSD: license.mk,v 1.21 2009/05/21 19:05:01 wiz 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#
@@ -84,27 +84,27 @@ @@ -84,27 +84,27 @@
84# 84#
85 85
86# This list is not complete. Free and Open Source licenses should be 86# This list is not complete. Free and Open Source licenses should be
87# added to the list as they are added to pkgsrc. 87# added to the list as they are added to pkgsrc.
88 88
89# The convention is that Free or Open Source licenses do not have a 89# The convention is that Free or Open Source licenses do not have a
90# -license suffix, and nonfree licenses end in -license. 90# -license suffix, and nonfree licenses end in -license.
91 91
92# XXX open-font-license should perhaps be changed to open-font 92# XXX open-font-license should perhaps be changed to open-font
93 93
94DEFAULT_ACCEPTABLE_LICENSES= \ 94DEFAULT_ACCEPTABLE_LICENSES= \
95 public-domain \ 95 public-domain \
96 gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \ 96 gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
97 gnu-gpl-v2 gnu-gpl-v2.1 gnu-lgpl-v2 gnu-lgpl-v2.1 \ 97 gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
98 gnu-gpl-v3 gnu-lgpl-v3 \ 98 gnu-gpl-v3 gnu-lgpl-v3 \
99 original-bsd modified-bsd \ 99 original-bsd modified-bsd \
100 x11 \ 100 x11 \
101 apache-1.1 apache-2.0 \ 101 apache-1.1 apache-2.0 \
102 artistic artistic-2.0 \ 102 artistic artistic-2.0 \
103 cddl-1.0 \ 103 cddl-1.0 \
104 cpl-1.0 \ 104 cpl-1.0 \
105 open-font-license 105 open-font-license
106 106
107##### Variant spellings 107##### Variant spellings
108 108
109.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES) 109.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
110ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES} 110ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES}