Module Name: src
Committed By: joerg
Date: Fri Feb 3 22:18:06 UTC 2012
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
Log Message:
Fix support for negative keywords: the keyword is prefixed directly with
! without space, so that the splitting works as expected. Adjust entries
for bsdgrep.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/distrib/sets/sets.subr
cvs rdiff -u -r1.978 -r1.979 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1374 -r1.1375 src/distrib/sets/lists/man/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.133 src/distrib/sets/sets.subr:1.134
--- src/distrib/sets/sets.subr:1.133 Sat Oct 22 00:05:17 2011
+++ src/distrib/sets/sets.subr Fri Feb 3 22:18:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.133 2011/10/22 00:05:17 jmcneill Exp $
+# $NetBSD: sets.subr,v 1.134 2012/02/03 22:18:04 joerg Exp $
#
#
@@ -176,7 +176,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.133 2011/10/22 00:05:17 jmcneill Exp $
+# # $NetBSD: sets.subr,v 1.134 2012/02/03 22:18:04 joerg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -323,9 +323,8 @@ list_set_files()
if (("manz" in wanted) &&
(kw == ".cat" || kw == ".man"))
$1 = $1 ".gz"
- negated = match(kw, "! *")
- if (negated > 0) {
- kw = substr(kw, RSTART + RLENGTH)
+ if (substr(kw, 1, 1) == "!") {
+ kw = substr(kw, 2)
if (kw in wanted)
show = 0
} else {
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.978 src/distrib/sets/lists/base/mi:1.979
--- src/distrib/sets/lists/base/mi:1.978 Sat Jan 28 15:10:24 2012
+++ src/distrib/sets/lists/base/mi Fri Feb 3 22:18:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.978 2012/01/28 15:10:24 pgoyette Exp $
+# $NetBSD: mi,v 1.979 2012/02/03 22:18:04 joerg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -2544,7 +2544,7 @@
./usr/share/locale/ca_ES.ISO8859-15/LC_TIME base-locale-ca nls
./usr/share/locale/cs base-locale-cs
./usr/share/locale/cs/LC_MESSAGES base-locale-cs
-./usr/share/locale/cs/LC_MESSAGES/grep.mo base-util_locale-cs nls,! bsdgrep
+./usr/share/locale/cs/LC_MESSAGES/grep.mo base-util_locale-cs nls,!bsdgrep
./usr/share/locale/cs/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/cs/LC_MESSAGES/texinfo.mo base-texinfo_locale-cs nls
./usr/share/locale/cs/LC_MESSAGES/xz.mo base-util_locale-cs nls
@@ -2575,7 +2575,7 @@
./usr/share/locale/da_DK.ISO8859-15/LC_TIME base-locale-da nls
./usr/share/locale/de base-locale-de
./usr/share/locale/de/LC_MESSAGES base-locale-de
-./usr/share/locale/de/LC_MESSAGES/grep.mo base-util_locale-de nls,! bsdgrep
+./usr/share/locale/de/LC_MESSAGES/grep.mo base-util_locale-de nls,!bsdgrep
./usr/share/locale/de/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/de/LC_MESSAGES/texinfo.mo base-texinfo_locale-de nls
./usr/share/locale/de/LC_MESSAGES/xz.mo base-util_locale-de nls
@@ -2626,7 +2626,7 @@
./usr/share/locale/de_DE.ISO8859-15/LC_TIME base-locale-de nls
./usr/share/locale/el base-locale-el
./usr/share/locale/el/LC_MESSAGES base-locale-el
-./usr/share/locale/el/LC_MESSAGES/grep.mo base-util_locale-el nls,! bsdgrep
+./usr/share/locale/el/LC_MESSAGES/grep.mo base-util_locale-el nls,!bsdgrep
./usr/share/locale/el_GR.ISO8859-7 base-locale-el
./usr/share/locale/el_GR.ISO8859-7/LC_CTYPE base-locale-el nls
./usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES base-locale-el
@@ -2726,11 +2726,11 @@
./usr/share/locale/en_US.UTF-8/LC_TIME base-locale-en nls
./usr/share/locale/eo base-locale-eo
./usr/share/locale/eo/LC_MESSAGES base-locale-eo
-./usr/share/locale/eo/LC_MESSAGES/grep.mo base-util_locale-eo nls,! bsdgrep
+./usr/share/locale/eo/LC_MESSAGES/grep.mo base-util_locale-eo nls,!bsdgrep
./usr/share/locale/eo/LC_MESSAGES/texinfo.mo base-texinfo_locale-eo nls
./usr/share/locale/es base-locale-es
./usr/share/locale/es/LC_MESSAGES base-locale-es
-./usr/share/locale/es/LC_MESSAGES/grep.mo base-util_locale-es nls,! bsdgrep
+./usr/share/locale/es/LC_MESSAGES/grep.mo base-util_locale-es nls,!bsdgrep
./usr/share/locale/es/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/es_ES.ISO8859-1 base-locale-es
./usr/share/locale/es_ES.ISO8859-1/LC_CTYPE base-locale-es nls
@@ -2748,7 +2748,7 @@
./usr/share/locale/es_ES.ISO8859-15/LC_TIME base-locale-es nls
./usr/share/locale/et base-locale-et
./usr/share/locale/et/LC_MESSAGES base-locale-et
-./usr/share/locale/et/LC_MESSAGES/grep.mo base-util_locale-et nls,! bsdgrep
+./usr/share/locale/et/LC_MESSAGES/grep.mo base-util_locale-et nls,!bsdgrep
./usr/share/locale/et/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/et_EE.ISO8859-15 base-locale-et
./usr/share/locale/et_EE.ISO8859-15/LC_CTYPE base-locale-et nls
@@ -2789,7 +2789,7 @@
./usr/share/locale/fi_FI.ISO8859-15/LC_TIME base-locale-fi nls
./usr/share/locale/fr base-locale-fr
./usr/share/locale/fr/LC_MESSAGES base-locale-fr
-./usr/share/locale/fr/LC_MESSAGES/grep.mo base-util_locale-fr nls,! bsdgrep
+./usr/share/locale/fr/LC_MESSAGES/grep.mo base-util_locale-fr nls,!bsdgrep
./usr/share/locale/fr/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/fr/LC_MESSAGES/texinfo.mo base-texinfo_locale-fr nls
./usr/share/locale/fr_BE.ISO8859-1 base-locale-fr
@@ -2878,13 +2878,13 @@
./usr/share/locale/fr_FR.UTF-8/LC_TIME base-locale-fr nls
./usr/share/locale/gl base-locale-gl
./usr/share/locale/gl/LC_MESSAGES base-locale-gl
-./usr/share/locale/gl/LC_MESSAGES/grep.mo base-util_locale-gl nls,! bsdgrep
+./usr/share/locale/gl/LC_MESSAGES/grep.mo base-util_locale-gl nls,!bsdgrep
./usr/share/locale/he base-locale-he
./usr/share/locale/he/LC_MESSAGES base-locale-he
./usr/share/locale/he/LC_MESSAGES/texinfo.mo base-texinfo_locale-he nls
./usr/share/locale/hr base-locale-hr
./usr/share/locale/hr/LC_MESSAGES base-locale-hr
-./usr/share/locale/hr/LC_MESSAGES/grep.mo base-util_locale-hr nls,! bsdgrep
+./usr/share/locale/hr/LC_MESSAGES/grep.mo base-util_locale-hr nls,!bsdgrep
./usr/share/locale/hr/LC_MESSAGES/texinfo.mo base-texinfo_locale-hr nls
./usr/share/locale/hr_HR.ISO8859-2 base-locale-hr
./usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE base-locale-hr nls
@@ -2909,7 +2909,7 @@
./usr/share/locale/hy_AM.ARMSCII-8/LC_TIME base-locale-hy nls
./usr/share/locale/id base-locale-id
./usr/share/locale/id/LC_MESSAGES base-locale-id
-./usr/share/locale/id/LC_MESSAGES/grep.mo base-util_locale-id nls,! bsdgrep
+./usr/share/locale/id/LC_MESSAGES/grep.mo base-util_locale-id nls,!bsdgrep
./usr/share/locale/id/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/is_IS.ISO8859-1 base-locale-is
./usr/share/locale/is_IS.ISO8859-1/LC_CTYPE base-locale-is nls
@@ -2927,7 +2927,7 @@
./usr/share/locale/is_IS.ISO8859-15/LC_TIME base-locale-is nls
./usr/share/locale/it base-locale-it
./usr/share/locale/it/LC_MESSAGES base-locale-it
-./usr/share/locale/it/LC_MESSAGES/grep.mo base-util_locale-it nls,! bsdgrep
+./usr/share/locale/it/LC_MESSAGES/grep.mo base-util_locale-it nls,!bsdgrep
./usr/share/locale/it/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/it/LC_MESSAGES/xz.mo base-util_locale-it nls
./usr/share/locale/it_CH.ISO8859-1 base-locale-it
@@ -2960,7 +2960,7 @@
./usr/share/locale/it_IT.ISO8859-15/LC_TIME base-locale-it nls
./usr/share/locale/ja base-locale-ja
./usr/share/locale/ja/LC_MESSAGES base-locale-ja
-./usr/share/locale/ja/LC_MESSAGES/grep.mo base-util_locale-ja nls,! bsdgrep
+./usr/share/locale/ja/LC_MESSAGES/grep.mo base-util_locale-ja nls,!bsdgrep
./usr/share/locale/ja/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/ja/LC_MESSAGES/texinfo.mo base-texinfo_locale-ja nls
./usr/share/locale/ja_JP.ISO-2022-JP base-locale-ja
@@ -3011,7 +3011,7 @@
./usr/share/locale/kk_KZ.PT154/LC_TIME base-locale-kk nls
./usr/share/locale/ko base-locale-ko
./usr/share/locale/ko/LC_MESSAGES base-locale-ko
-./usr/share/locale/ko/LC_MESSAGES/grep.mo base-locale-ko nls,! bsdgrep
+./usr/share/locale/ko/LC_MESSAGES/grep.mo base-locale-ko nls,!bsdgrep
./usr/share/locale/ko/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/ko_KR.UTF-8 base-obsolete obsolete
./usr/share/locale/ko_KR.UTF-8/LC_CTYPE base-obsolete obsolete
@@ -3042,7 +3042,7 @@
./usr/share/locale/nb/LC_MESSAGES/texinfo.mo base-texinfo_locale-nb nls
./usr/share/locale/nl base-locale-nl
./usr/share/locale/nl/LC_MESSAGES base-locale-nl
-./usr/share/locale/nl/LC_MESSAGES/grep.mo base-locale-nl nls,! bsdgrep
+./usr/share/locale/nl/LC_MESSAGES/grep.mo base-locale-nl nls,!bsdgrep
./usr/share/locale/nl/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/nl/LC_MESSAGES/texinfo.mo base-texinfo_locale-nl nls
./usr/share/locale/nl_BE.ISO8859-1 base-locale-nl
@@ -3091,7 +3091,7 @@
./usr/share/locale/nn_NO.ISO8859-15/LC_TIME base-locale-nn nls
./usr/share/locale/no base-locale-no
./usr/share/locale/no/LC_MESSAGES base-locale-no
-./usr/share/locale/no/LC_MESSAGES/grep.mo base-locale-no nls,! bsdgrep
+./usr/share/locale/no/LC_MESSAGES/grep.mo base-locale-no nls,!bsdgrep
./usr/share/locale/no/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/no/LC_MESSAGES/texinfo.mo base-texinfo_locale-no nls
./usr/share/locale/no@nynorsk base-locale-no
@@ -3112,7 +3112,7 @@
./usr/share/locale/no_NO.ISO8859-15/LC_TIME base-locale-no nls
./usr/share/locale/pl base-locale-pl
./usr/share/locale/pl/LC_MESSAGES base-locale-pl
-./usr/share/locale/pl/LC_MESSAGES/grep.mo base-locale-pl nls,! bsdgrep
+./usr/share/locale/pl/LC_MESSAGES/grep.mo base-locale-pl nls,!bsdgrep
./usr/share/locale/pl/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/pl/LC_MESSAGES/texinfo.mo base-texinfo_locale-pl nls
./usr/share/locale/pl_PL.ISO8859-2 base-locale-pl
@@ -3134,7 +3134,7 @@
./usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC base-locale-pt nls
./usr/share/locale/pt_BR.ISO8859-1/LC_TIME base-locale-pt nls
./usr/share/locale/pt_BR/LC_MESSAGES base-locale-pt
-./usr/share/locale/pt_BR/LC_MESSAGES/grep.mo base-locale-pt nls,! bsdgrep
+./usr/share/locale/pt_BR/LC_MESSAGES/grep.mo base-locale-pt nls,!bsdgrep
./usr/share/locale/pt_BR/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/pt_PT.ISO8859-1 base-locale-pt
./usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE base-locale-pt nls
@@ -3162,7 +3162,7 @@
./usr/share/locale/ro_RO.ISO8859-2/LC_TIME base-locale-ro nls
./usr/share/locale/ru base-locale-ru
./usr/share/locale/ru/LC_MESSAGES base-locale-ru
-./usr/share/locale/ru/LC_MESSAGES/grep.mo base-locale-ru nls,! bsdgrep
+./usr/share/locale/ru/LC_MESSAGES/grep.mo base-locale-ru nls,!bsdgrep
./usr/share/locale/ru/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/ru/LC_MESSAGES/texinfo.mo base-texinfo_locale-ru nls
./usr/share/locale/ru_BY.CP1251 base-locale-ru
@@ -3217,7 +3217,7 @@
./usr/share/locale/sk_SK.ISO8859-2/LC_TIME base-locale-sk nls
./usr/share/locale/sl base-locale-sl
./usr/share/locale/sl/LC_MESSAGES base-locale-sl
-./usr/share/locale/sl/LC_MESSAGES/grep.mo base-locale-sl nls,! bsdgrep
+./usr/share/locale/sl/LC_MESSAGES/grep.mo base-locale-sl nls,!bsdgrep
./usr/share/locale/sl/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/sl_SI.ISO8859-2 base-locale-sl
./usr/share/locale/sl_SI.ISO8859-2/LC_CTYPE base-locale-sl nls
@@ -3262,7 +3262,7 @@
./usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE base-obsolete obsolete
./usr/share/locale/sv base-locale-sv
./usr/share/locale/sv/LC_MESSAGES base-locale-sv
-./usr/share/locale/sv/LC_MESSAGES/grep.mo base-util_locale-sv nls,! bsdgrep
+./usr/share/locale/sv/LC_MESSAGES/grep.mo base-util_locale-sv nls,!bsdgrep
./usr/share/locale/sv/LC_MESSAGES/tar.mo base-obsolete obsolete
./usr/share/locale/sv/LC_MESSAGES/texinfo.mo base-texinfo_locale-sv nls
./usr/share/locale/sv_SE.ISO8859-1 base-locale-sv
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1374 src/distrib/sets/lists/man/mi:1.1375
--- src/distrib/sets/lists/man/mi:1.1374 Tue Jan 31 12:23:32 2012
+++ src/distrib/sets/lists/man/mi Fri Feb 3 22:18:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1374 2012/01/31 12:23:32 nisimura Exp $
+# $NetBSD: mi,v 1.1375 2012/02/03 22:18:05 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -24,7 +24,7 @@
./usr/share/info/gdbint.info man-debug-info gdb,info
./usr/share/info/gettext.info man-sys-info info
./usr/share/info/gprof.info man-debug-info binutils,info
-./usr/share/info/grep.info man-util-info info,! bsdgrep
+./usr/share/info/grep.info man-util-info info,!bsdgrep
./usr/share/info/groff.info man-groff-info info,groff
./usr/share/info/gzip.info man-obsolete obsolete
./usr/share/info/heimdal.info man-krb5-info kerberos,info
