summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-10-25 16:12:04 +0000
committerrillig <rillig@pkgsrc.org>2007-10-25 16:12:04 +0000
commit488acb7bba5ea1c38a5697cf550dd5bfdd6c4175 (patch)
treef43526f3fa8d09de7b1c018c5c4b3cb83c1e6780
parent0fd5c8dfafe77eddf97c6dbb876d7bedecc748ff (diff)
downloadpkgsrc-488acb7bba5ea1c38a5697cf550dd5bfdd6c4175.tar.gz
Reverted the deprecation of LICENCE and ACCEPTABLE_LICENCES, since there
is no consensus among the pkgsrc developers about them. Some want to keep them (proper British spelling), others want to eliminate them (redundancy).
-rw-r--r--pkgtools/pkglint/files/deprecated.map8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 11581e7363e..56f887bbe24 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.54 2007/10/17 10:50:59 rillig Exp $
+# $NetBSD: deprecated.map,v 1.55 2007/10/25 16:12:04 rillig Exp $
#
# This file contains names of Makefile variables and a short explanation
@@ -137,5 +137,7 @@ NO_DEPENDS You can just remove it.
# October 2007
_PKG_SILENT Use RUN instead.
_PKG_DEBUG Use RUN instead.
-LICENCE Use LICENSE instead.
-ACCEPTABLE_LICENCES Use ACCEPTABLE_LICENSES instead.
+# The following two variables are not yet deprecated, as there has been
+# a large disagreement on the proper spelling.
+#LICENCE Use LICENSE instead.
+#ACCEPTABLE_LICENCES Use ACCEPTABLE_LICENSES instead.