[pkgsrc/trunk]: pkgsrc/mk Fixed typos from the last commit. Clarified how ACC...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a6b91a4529e
branches:  trunk
changeset: 530702:1a6b91a4529e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jul 06 01:22:40 2007 +0000

description:
Fixed typos from the last commit. Clarified how ACCEPTABLE_LICENSES can
be set in mk.conf.

diffstat:

 mk/license.mk |  17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diffs (54 lines):

diff -r 7ef26fa7c00f -r 1a6b91a4529e mk/license.mk
--- a/mk/license.mk     Thu Jul 05 23:20:49 2007 +0000
+++ b/mk/license.mk     Fri Jul 06 01:22:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.2 2007/07/05 18:16:47 gdt Exp $
+# $NetBSD: license.mk,v 1.3 2007/07/06 01:22:40 rillig Exp $
 #
 # Note: This file is in draft state and not yet actively used.
 #
@@ -23,6 +23,11 @@
 #      are not in ACCEPTABLE_LICENSES or some per-user variable.
 #      This is surely controversial and requires discussion.
 #
+#      To include the default licenses, you can use the += operator
+#      in mk.conf. To override it, use the plain = operator.
+#
+#      Default value: ${DEFAULT_ACCEPTABLE_LICENSES}
+#
 # === Package-settable variables ===
 #
 # LICENSE
@@ -33,12 +38,11 @@
 #      AND-combination. Currently, pkgsrc can only handle a single
 #      license per package. For now, add a description of the licensing
 #      to ../doc/TODO, section "Licenses of packages".  Note that in
-#      such casesone can place the text of both licenses in
+#      such cases, one can place the text of both licenses in
 #      licenses/foo-license and reference it.
 #
 #      Every package should specify its license.  (Prior to July 2007,
 #      Open Source and Free software did not have license tags.)
-#      source or free software.
 #
 #      The common licenses are collected in the licenses/ subdirectory
 #      of pkgsrc. Additionally, the following licenses are valid:
@@ -56,17 +60,12 @@
 # === Predefined variables ===
 #
 # DEFAULT_ACCEPTABLE_LICENSES
-#      This variable contains a list of licenses that before July,
+#      The list of licenses that before July,
 #      2007 did not require tagging because they were Open Source or
 #      Free.  The intent is to make it contain licenses that are Open
 #      Source or Free and not controversial, so as to provide a
 #      default that is pleasing to a large number of people.
 #
-#      XXX: Explain whether ACCEPTABLE_LICENSES takes on
-#      DEFAULT_ACCEPTABLE_LICENSES at the start of /etc/mk.conf.
-#      Arguably the new tagging rules should not result in a behavior
-#      change.
-#
 # === See also ===
 #
 #      ../doc/TODO, section "Licenses of packages"