Sat Apr 3 15:30:39 2021 UTC ()
license.mk: Minor changes in comments

Capitalize Free and Open Source more consistently.

Use "approved" rather than "accepted" when discussing Debian, to
avoid confusion between their rules and processes and ours.

(This is not a substantive change.)


(gdt)
diff -r1.108 -r1.109 pkgsrc/mk/license.mk

cvs diff -r1.108 -r1.109 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2021/03/06 04:36:21 1.108
+++ pkgsrc/mk/license.mk 2021/04/03 15:30:39 1.109
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.108 2021/03/06 04:36:21 ryoon Exp $ 1# $NetBSD: license.mk,v 1.109 2021/04/03 15:30:39 gdt 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#
@@ -38,54 +38,54 @@ @@ -38,54 +38,54 @@
38# can be used: 38# can be used:
39# LICENSE= license1 AND license2 39# LICENSE= license1 AND license2
40# 40#
41# Expressions can be nested if necessary: 41# Expressions can be nested if necessary:
42# LICENSE= (license1 AND license2) OR license3 42# LICENSE= (license1 AND license2) OR license3
43# Parenthesis are required when mixing AND and OR. 43# Parenthesis are required when mixing AND and OR.
44# 44#
45# Every package should specify its license. 45# Every package should specify its license.
46# 46#
47# Licenses are collected in the licenses/ subdirectory of 47# Licenses are collected in the licenses/ subdirectory of
48# pkgsrc. For open source license, we generally use the same 48# pkgsrc. For open source license, we generally use the same
49# names as either the Open Source Initiative or the Free 49# names as either the Open Source Initiative or the Free
50# Software Foundation, choosing a name to reduce confusion. 50# Software Foundation, choosing a name to reduce confusion.
51# Open source and free licenses do not have a -license suffix, 51# Open Source and Free licenses do not have a -license suffix,
52# and non-free licenses do. 52# and non-Free licenses do.
53# 53#
54# http://opensource.org/licenses/category 54# http://opensource.org/licenses/category
55# http://www.gnu.org/licenses/license-list.html 55# http://www.gnu.org/licenses/license-list.html
56# 56#
57# === Predefined variables === 57# === Predefined variables ===
58# 58#
59# DEFAULT_ACCEPTABLE_LICENSES 59# DEFAULT_ACCEPTABLE_LICENSES
60# The list of licenses that will be the default value of 60# The list of licenses that will be the default value of
61# ACCEPTABLE_LICENSES. Adapting the longstanding policy of Open 61# ACCEPTABLE_LICENSES. Adapting the longstanding policy of Open
62# Source or Free licenses not requiring tags, it should contain 62# Source or Free licenses not requiring tags, it should contain
63# all licenses that are definitively Free or Open Source -- 63# all licenses that are definitively Free or Open Source --
64# except those specifically excluded by the TNF board -- so as 64# except those specifically excluded by the TNF board -- so as
65# to provide the most expansive default that almost all people 65# to provide the most expansive default that almost all people
66# find acceptable. (Many people will want to add more licenses 66# find acceptable. (Many people will want to add more licenses
67# to ACCEPTABLE_LICENSES; the point is to have a default that 67# to ACCEPTABLE_LICENSES; the point is to have a default that
68# very few people want to shrink.) 68# very few people want to shrink.)
69# 69#
70# Licenses approved by FSF as Free and by OSI as Open Source 70# Licenses approved by FSF as Free and by OSI as Open Source
71# will be added by default, without annotation, as these 71# will be added by default, without annotation, as these
72# organizations publish lists of approved licenses. 72# organizations publish lists of approved licenses.
73# 73#
74# Licenses approved by Debian as meeting the Debian Free 74# Licenses approved by Debian as meeting the Debian Free
75# Software Guidelines will also be added by default. They 75# Software Guidelines will also be added by default. They
76# should be in a second section with a comment about each one, 76# should be in a second section with a comment about each one,
77# because Debian does not publish an accepted license list and 77# because Debian does not publish an approved license list and
78# acceptability must be inferred from inclusion in main. 78# approval must be inferred from inclusion in main.
79# 79#
80# The board of The NetBSD Foundation is the final arbiter of 80# The board of The NetBSD Foundation is the final arbiter of
81# which licenses may be in DEFAULT_ACCEPTABLE_LICENSES. As an 81# which licenses may be in DEFAULT_ACCEPTABLE_LICENSES. As an
82# exception to the above policy on treating Free, Open Source, 82# exception to the above policy on treating Free, Open Source,
83# and DFSG licenses as acceptable, the board has decided that 83# and DFSG licenses as acceptable, the board has decided that
84# licenses that trigger obligations from use (rather than 84# licenses that trigger obligations from use (rather than
85# redistribution), such as the Affero GPL, should not be in 85# redistribution), such as the Affero GPL, should not be in
86# DEFAULT_ACCEPTABLE_LICENSES. 86# DEFAULT_ACCEPTABLE_LICENSES.
87# 87#
88# Licenses not formally approved as Free or Open Source may be 88# Licenses not formally approved as Free or Open Source may be
89# added if they have terms that would 1) obviously be approved 89# added if they have terms that would 1) obviously be approved
90# by FSF or OSI if the effort were made and 2) obviously not 90# by FSF or OSI if the effort were made and 2) obviously not
91# trigger the above issue with AGPL-type licenses. Such license 91# trigger the above issue with AGPL-type licenses. Such license