Pull up following revision(s) (requested by snj in ticket #1263): distrib/sets/lists/base/mi: revision 1.1035 distrib/sets/lists/text/mi: revision 1.43 Move mandoc and makemandb to base set as discussed on tech-userlevel: http://mail-index.netbsd.org/tech-userlevel/2013/06/25/msg007845.htmldiff -r1.984.2.15.2.3 -r1.984.2.15.2.4 src/distrib/sets/lists/base/mi
(riz)
--- src/distrib/sets/lists/base/mi 2014/12/02 22:18:44 1.984.2.15.2.3
+++ src/distrib/sets/lists/base/mi 2015/03/05 22:25:58 1.984.2.15.2.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: mi,v 1.984.2.15.2.3 2014/12/02 22:18:44 snj Exp $ | 1 | # $NetBSD: mi,v 1.984.2.15.2.4 2015/03/05 22:25:58 riz Exp $ | |
2 | # | 2 | # | |
3 | # Note: Don't delete entries from here - mark them as "obsolete" instead, | 3 | # Note: Don't delete entries from here - mark them as "obsolete" instead, | |
4 | # unless otherwise stated below. | 4 | # unless otherwise stated below. | |
5 | # | 5 | # | |
6 | # Note: Do not mark "old" major and major.minor shared libraries as | 6 | # Note: Do not mark "old" major and major.minor shared libraries as | |
7 | # "obsolete"; just remove the entry, as third-party applications | 7 | # "obsolete"; just remove the entry, as third-party applications | |
8 | # may be linked against the old major shared library, and | 8 | # may be linked against the old major shared library, and | |
9 | # that is a symlink to the old major.minor shared library. | 9 | # that is a symlink to the old major.minor shared library. | |
10 | # e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" | 10 | # e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" | |
11 | # Exceptions to this rule may include shared libraries that | 11 | # Exceptions to this rule may include shared libraries that | |
12 | # are dlopen()ed at run-time, such as extra locales, etc. | 12 | # are dlopen()ed at run-time, such as extra locales, etc. | |
13 | # | 13 | # | |
14 | # /usr/bin/ident is in `base-util-bin', not `base-rcs-bin' as it is used by pkgsrc | 14 | # /usr/bin/ident is in `base-util-bin', not `base-rcs-bin' as it is used by pkgsrc | |
@@ -542,26 +542,27 @@ | @@ -542,26 +542,27 @@ | |||
542 | ./usr/bin/lprm base-lpr-bin | 542 | ./usr/bin/lprm base-lpr-bin | |
543 | ./usr/bin/lsextattr base-util-bin | 543 | ./usr/bin/lsextattr base-util-bin | |
544 | ./usr/bin/lua base-util-bin | 544 | ./usr/bin/lua base-util-bin | |
545 | ./usr/bin/lzcat base-util-bin | 545 | ./usr/bin/lzcat base-util-bin | |
546 | ./usr/bin/lzma base-util-bin | 546 | ./usr/bin/lzma base-util-bin | |
547 | ./usr/bin/lzmainfo base-util-bin | 547 | ./usr/bin/lzmainfo base-util-bin | |
548 | ./usr/bin/m4 base-util-bin | 548 | ./usr/bin/m4 base-util-bin | |
549 | ./usr/bin/machine base-util-bin | 549 | ./usr/bin/machine base-util-bin | |
550 | ./usr/bin/mail base-mail-bin | 550 | ./usr/bin/mail base-mail-bin | |
551 | ./usr/bin/mailq base-mailwrapper-bin | 551 | ./usr/bin/mailq base-mailwrapper-bin | |
552 | ./usr/bin/mailx base-mail-bin | 552 | ./usr/bin/mailx base-mail-bin | |
553 | ./usr/bin/make base-util-bin | 553 | ./usr/bin/make base-util-bin | |
554 | ./usr/bin/man base-man-bin | 554 | ./usr/bin/man base-man-bin | |
555 | ./usr/bin/mandoc base-man-bin | |||
555 | ./usr/bin/md2 base-util-bin | 556 | ./usr/bin/md2 base-util-bin | |
556 | ./usr/bin/md4 base-util-bin | 557 | ./usr/bin/md4 base-util-bin | |
557 | ./usr/bin/md5 base-util-bin | 558 | ./usr/bin/md5 base-util-bin | |
558 | ./usr/bin/merge base-util-bin | 559 | ./usr/bin/merge base-util-bin | |
559 | ./usr/bin/mesg base-util-bin | 560 | ./usr/bin/mesg base-util-bin | |
560 | ./usr/bin/midiplay base-audio-bin | 561 | ./usr/bin/midiplay base-audio-bin | |
561 | ./usr/bin/mixerctl base-audio-bin | 562 | ./usr/bin/mixerctl base-audio-bin | |
562 | ./usr/bin/mk_cmds base-obsolete obsolete | 563 | ./usr/bin/mk_cmds base-obsolete obsolete | |
563 | ./usr/bin/mkcsmapper base-util-bin | 564 | ./usr/bin/mkcsmapper base-util-bin | |
564 | ./usr/bin/mkdep base-c-bin | 565 | ./usr/bin/mkdep base-c-bin | |
565 | ./usr/bin/mkesdb base-util-bin | 566 | ./usr/bin/mkesdb base-util-bin | |
566 | ./usr/bin/mkfifo base-util-bin | 567 | ./usr/bin/mkfifo base-util-bin | |
567 | ./usr/bin/mklocale base-locale-bin | 568 | ./usr/bin/mklocale base-locale-bin | |
@@ -1291,26 +1292,27 @@ | @@ -1291,26 +1292,27 @@ | |||
1291 | ./usr/sbin/link base-sysutil-bin | 1292 | ./usr/sbin/link base-sysutil-bin | |
1292 | ./usr/sbin/linkfarm base-obsolete obsolete | 1293 | ./usr/sbin/linkfarm base-obsolete obsolete | |
1293 | ./usr/sbin/lmcconfig base-netutil-bin | 1294 | ./usr/sbin/lmcconfig base-netutil-bin | |
1294 | ./usr/sbin/lmtp base-obsolete obsolete | 1295 | ./usr/sbin/lmtp base-obsolete obsolete | |
1295 | ./usr/sbin/lockstat base-sysutil-bin | 1296 | ./usr/sbin/lockstat base-sysutil-bin | |
1296 | ./usr/sbin/lpc base-lpr-bin | 1297 | ./usr/sbin/lpc base-lpr-bin | |
1297 | ./usr/sbin/lpd base-lpr-bin | 1298 | ./usr/sbin/lpd base-lpr-bin | |
1298 | ./usr/sbin/lptest base-lpr-bin | 1299 | ./usr/sbin/lptest base-lpr-bin | |
1299 | ./usr/sbin/lwresd base-bind-bin | 1300 | ./usr/sbin/lwresd base-bind-bin | |
1300 | ./usr/sbin/mailstats base-obsolete obsolete | 1301 | ./usr/sbin/mailstats base-obsolete obsolete | |
1301 | ./usr/sbin/mailwrapper base-mailwrapper-bin | 1302 | ./usr/sbin/mailwrapper base-mailwrapper-bin | |
1302 | ./usr/sbin/makedbm base-nis-bin yp | 1303 | ./usr/sbin/makedbm base-nis-bin yp | |
1303 | ./usr/sbin/makefs base-sysutil-bin | 1304 | ./usr/sbin/makefs base-sysutil-bin | |
1305 | ./usr/sbin/makemandb base-man-bin makemandb | |||
1304 | ./usr/sbin/makemap base-obsolete obsolete | 1306 | ./usr/sbin/makemap base-obsolete obsolete | |
1305 | ./usr/sbin/map-mbone base-netutil-bin | 1307 | ./usr/sbin/map-mbone base-netutil-bin | |
1306 | ./usr/sbin/mbrlabel base-obsolete obsolete | 1308 | ./usr/sbin/mbrlabel base-obsolete obsolete | |
1307 | ./usr/sbin/mdconfig base-sysutil-bin | 1309 | ./usr/sbin/mdconfig base-sysutil-bin | |
1308 | ./usr/sbin/mdnsd base-mdns-bin mdns | 1310 | ./usr/sbin/mdnsd base-mdns-bin mdns | |
1309 | ./usr/sbin/mdsetimage base-sysutil-bin binutils | 1311 | ./usr/sbin/mdsetimage base-sysutil-bin binutils | |
1310 | ./usr/sbin/mk-amd-map base-amd-bin | 1312 | ./usr/sbin/mk-amd-map base-amd-bin | |
1311 | ./usr/sbin/mkalias base-nis-bin yp | 1313 | ./usr/sbin/mkalias base-nis-bin yp | |
1312 | ./usr/sbin/mknetid base-nis-bin yp | 1314 | ./usr/sbin/mknetid base-nis-bin yp | |
1313 | ./usr/sbin/mld6query base-netutil-bin use_inet6 | 1315 | ./usr/sbin/mld6query base-netutil-bin use_inet6 | |
1314 | ./usr/sbin/mlxctl base-sysutil-bin | 1316 | ./usr/sbin/mlxctl base-sysutil-bin | |
1315 | ./usr/sbin/mmcformat base-sysutil-bin | 1317 | ./usr/sbin/mmcformat base-sysutil-bin | |
1316 | ./usr/sbin/mopa.out base-obsolete obsolete | 1318 | ./usr/sbin/mopa.out base-obsolete obsolete |
--- src/distrib/sets/lists/text/mi 2012/02/07 19:13:29 1.42
+++ src/distrib/sets/lists/text/mi 2015/03/05 22:25:58 1.42.16.1
@@ -1,56 +1,54 @@ | @@ -1,56 +1,54 @@ | |||
1 | # $NetBSD: mi,v 1.42 2012/02/07 19:13:29 joerg Exp $ | 1 | # $NetBSD: mi,v 1.42.16.1 2015/03/05 22:25:58 riz Exp $ | |
2 | # | 2 | # | |
3 | # Note: don't delete entries from here - mark them as "obsolete" instead. | 3 | # Note: don't delete entries from here - mark them as "obsolete" instead. | |
4 | # | 4 | # | |
5 | ./etc/mtree/set.text text-sys-root | 5 | ./etc/mtree/set.text text-sys-root | |
6 | ./usr/bin/addftinfo text-groff-bin groff | 6 | ./usr/bin/addftinfo text-groff-bin groff | |
7 | ./usr/bin/checknr text-groff-bin | 7 | ./usr/bin/checknr text-groff-bin | |
8 | ./usr/bin/eqn text-groff-bin groff | 8 | ./usr/bin/eqn text-groff-bin groff | |
9 | ./usr/bin/gdiffmk text-groff-bin groff | 9 | ./usr/bin/gdiffmk text-groff-bin groff | |
10 | ./usr/bin/grn text-groff-bin groff | 10 | ./usr/bin/grn text-groff-bin groff | |
11 | ./usr/bin/grodvi text-groff-bin groff | 11 | ./usr/bin/grodvi text-groff-bin groff | |
12 | ./usr/bin/groff text-groff-bin groff | 12 | ./usr/bin/groff text-groff-bin groff | |
13 | ./usr/bin/grog text-groff-bin groff | 13 | ./usr/bin/grog text-groff-bin groff | |
14 | ./usr/bin/grohtml text-obsolete obsolete | 14 | ./usr/bin/grohtml text-obsolete obsolete | |
15 | ./usr/bin/grolbp text-groff-bin groff | 15 | ./usr/bin/grolbp text-groff-bin groff | |
16 | ./usr/bin/grolj4 text-groff-bin groff | 16 | ./usr/bin/grolj4 text-groff-bin groff | |
17 | ./usr/bin/grops text-groff-bin groff | 17 | ./usr/bin/grops text-groff-bin groff | |
18 | ./usr/bin/grotty text-groff-bin groff | 18 | ./usr/bin/grotty text-groff-bin groff | |
19 | ./usr/bin/hpftodit text-groff-bin groff | 19 | ./usr/bin/hpftodit text-groff-bin groff | |
20 | ./usr/bin/indxbib text-groff-bin groff | 20 | ./usr/bin/indxbib text-groff-bin groff | |
21 | ./usr/bin/infokey text-texinfo-bin | 21 | ./usr/bin/infokey text-texinfo-bin | |
22 | ./usr/bin/lkbib text-groff-bin groff | 22 | ./usr/bin/lkbib text-groff-bin groff | |
23 | ./usr/bin/lookbib text-groff-bin groff | 23 | ./usr/bin/lookbib text-groff-bin groff | |
24 | ./usr/bin/makeinfo text-texinfo-bin | 24 | ./usr/bin/makeinfo text-texinfo-bin | |
25 | ./usr/bin/mandoc text-mdocml-bin | |||
26 | ./usr/bin/neqn text-groff-bin groff | 25 | ./usr/bin/neqn text-groff-bin groff | |
27 | ./usr/bin/nroff text-groff-bin groff | 26 | ./usr/bin/nroff text-groff-bin groff | |
28 | ./usr/bin/pfbtops text-groff-bin groff | 27 | ./usr/bin/pfbtops text-groff-bin groff | |
29 | ./usr/bin/pic text-groff-bin groff | 28 | ./usr/bin/pic text-groff-bin groff | |
30 | ./usr/bin/post-grohtml text-groff-bin groff | 29 | ./usr/bin/post-grohtml text-groff-bin groff | |
31 | ./usr/bin/pre-grohtml text-groff-bin groff | 30 | ./usr/bin/pre-grohtml text-groff-bin groff | |
32 | ./usr/bin/psbb text-obsolete obsolete | 31 | ./usr/bin/psbb text-obsolete obsolete | |
33 | ./usr/bin/psroff text-obsolete obsolete | 32 | ./usr/bin/psroff text-obsolete obsolete | |
34 | ./usr/bin/refer text-groff-bin groff | 33 | ./usr/bin/refer text-groff-bin groff | |
35 | ./usr/bin/soelim text-groff-bin | 34 | ./usr/bin/soelim text-groff-bin | |
36 | ./usr/bin/tbl text-groff-bin groff | 35 | ./usr/bin/tbl text-groff-bin groff | |
37 | ./usr/bin/texi2dvi text-texinfo-bin | 36 | ./usr/bin/texi2dvi text-texinfo-bin | |
38 | ./usr/bin/texindex text-texinfo-bin | 37 | ./usr/bin/texindex text-texinfo-bin | |
39 | ./usr/bin/tfmtodit text-groff-bin groff | 38 | ./usr/bin/tfmtodit text-groff-bin groff | |
40 | ./usr/bin/troff text-groff-bin groff | 39 | ./usr/bin/troff text-groff-bin groff | |
41 | ./usr/bin/vgrind text-groff-bin | 40 | ./usr/bin/vgrind text-groff-bin | |
42 | ./usr/libexec/vfontedpr text-groff-bin | 41 | ./usr/libexec/vfontedpr text-groff-bin | |
43 | ./usr/sbin/makemandb base-man-bin makemandb | |||
44 | ./usr/share/doc/groff text-groff-doc | 42 | ./usr/share/doc/groff text-groff-doc | |
45 | ./usr/share/doc/groff/mom text-groff-doc | 43 | ./usr/share/doc/groff/mom text-groff-doc | |
46 | ./usr/share/doc/groff/mom/README.txt text-groff-doc share,groff | 44 | ./usr/share/doc/groff/mom/README.txt text-groff-doc share,groff | |
47 | ./usr/share/doc/groff/mom/elvis_syntax text-groff-doc share,groff | 45 | ./usr/share/doc/groff/mom/elvis_syntax text-groff-doc share,groff | |
48 | ./usr/share/doc/groff/mom/elvis_syntax.new text-groff-doc share,groff | 46 | ./usr/share/doc/groff/mom/elvis_syntax.new text-groff-doc share,groff | |
49 | ./usr/share/doc/groff/mom/letter.mom text-groff-doc share,groff | 47 | ./usr/share/doc/groff/mom/letter.mom text-groff-doc share,groff | |
50 | ./usr/share/doc/groff/mom/letter.ps text-obsolete obsolete | 48 | ./usr/share/doc/groff/mom/letter.ps text-obsolete obsolete | |
51 | ./usr/share/doc/groff/mom/penguin.ps text-groff-doc share,groff | 49 | ./usr/share/doc/groff/mom/penguin.ps text-groff-doc share,groff | |
52 | ./usr/share/doc/groff/mom/sample_docs.mom text-groff-doc share,groff | 50 | ./usr/share/doc/groff/mom/sample_docs.mom text-groff-doc share,groff | |
53 | ./usr/share/doc/groff/mom/sample_docs.ps text-obsolete obsolete | 51 | ./usr/share/doc/groff/mom/sample_docs.ps text-obsolete obsolete | |
54 | ./usr/share/doc/groff/mom/typesetting.mom text-groff-doc share,groff | 52 | ./usr/share/doc/groff/mom/typesetting.mom text-groff-doc share,groff | |
55 | ./usr/share/doc/groff/mom/typesetting.ps text-obsolete obsolete | 53 | ./usr/share/doc/groff/mom/typesetting.ps text-obsolete obsolete | |
56 | ./usr/share/doc/html/groff text-groff-doc | 54 | ./usr/share/doc/html/groff text-groff-doc |