[src/netbsd-6]: src/distrib/sets/lists Pull up following revision(s) (request...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71982404094d
branches:  netbsd-6
changeset: 776916:71982404094d
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Mar 05 22:27:04 2015 +0000

description:
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.html

diffstat:

 distrib/sets/lists/base/mi |  15 +++++++++++----
 distrib/sets/lists/text/mi |   4 +---
 2 files changed, 12 insertions(+), 7 deletions(-)

diffs (105 lines):

diff -r c48c50784340 -r 71982404094d distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Thu Mar 05 22:21:02 2015 +0000
+++ b/distrib/sets/lists/base/mi        Thu Mar 05 22:27:04 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.20 2014/12/02 22:18:08 snj Exp $
+# $NetBSD: mi,v 1.984.2.21 2015/03/05 22:27:04 riz Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -126,6 +126,7 @@
 ./lib                                          base-sys-root
 ./lib/libdes.so                                        base-obsolete           obsolete
 ./lib/libssp.so                                        base-obsolete           obsolete
+./lib/npf                                      base-sys-usr
 ./libdata                                      base-sys-root
 ./libdata/firmware                             base-firmware-root
 ./libdata/firmware/if_ipw                      base-firmware-root
@@ -552,6 +553,7 @@
 ./usr/bin/mailx                                        base-mail-bin
 ./usr/bin/make                                 base-util-bin
 ./usr/bin/man                                  base-man-bin
+./usr/bin/mandoc                               base-man-bin
 ./usr/bin/md2                                  base-util-bin
 ./usr/bin/md4                                  base-util-bin
 ./usr/bin/md5                                  base-util-bin
@@ -935,7 +937,7 @@
 ./usr/lib/runemodule/libEUC.so.3               base-obsolete           obsolete
 ./usr/lib/runemodule/libEUC.so.3.0             base-obsolete           obsolete
 ./usr/lib/runemodule/libEUCTW.a                        base-obsolete           obsolete
-./usr/lib/npf                                  base-sys-usr
+./usr/lib/npf                                  base-sys-usr    obsolete
 ./usr/lib/runemodule/libEUCTW.so               base-obsolete           obsolete
 ./usr/lib/runemodule/libEUCTW.so.3             base-obsolete           obsolete
 ./usr/lib/runemodule/libEUCTW.so.3.0           base-obsolete           obsolete
@@ -959,6 +961,8 @@
 ./usr/libdata                                  base-sys-usr
 ./usr/libdata/debug                            base-sys-usr
 ./usr/libdata/debug/bin                                base-sys-usr
+./usr/libdata/debug/lib                                base-sys-usr
+./usr/libdata/debug/lib/npf                    base-sys-usr
 ./usr/libdata/debug/libexec                    base-sys-usr
 ./usr/libdata/debug/sbin                       base-sys-usr
 ./usr/libdata/debug/usr                                base-sys-usr
@@ -979,7 +983,7 @@
 ./usr/libdata/firmware/radeon/CEDAR_pfp.bin    base-firmware-usr
 ./usr/libdata/firmware/radeon/CEDAR_rlc.bin    base-firmware-usr
 ./usr/libdata/firmware/radeon/CYPRESS_me.bin   base-firmware-usr
-./usr/libdata/debug/usr/lib/npf                        base-sys-usr
+./usr/libdata/debug/usr/lib/npf                        base-sys-usr    obsolete
 ./usr/libdata/firmware/radeon/CYPRESS_pfp.bin  base-firmware-usr
 ./usr/libdata/firmware/radeon/CYPRESS_rlc.bin  base-firmware-usr
 ./usr/libdata/firmware/radeon/JUNIPER_me.bin   base-firmware-usr
@@ -1302,6 +1306,7 @@
 ./usr/sbin/mailwrapper                         base-mailwrapper-bin
 ./usr/sbin/makedbm                             base-nis-bin            yp
 ./usr/sbin/makefs                              base-sysutil-bin
+./usr/sbin/makemandb                           base-man-bin            makemandb
 ./usr/sbin/makemap                             base-obsolete           obsolete
 ./usr/sbin/map-mbone                           base-netutil-bin
 ./usr/sbin/mbrlabel                            base-obsolete           obsolete
@@ -1348,6 +1353,7 @@
 ./usr/sbin/nfsd                                        base-nfsserver-bin
 ./usr/sbin/nfsiod                              base-obsolete           obsolete
 ./usr/sbin/npfctl                              base-obsolete           obsolete
+./usr/sbin/npftest                             base-npf-bin            npf
 ./usr/sbin/nsec3hash                           base-bind-bin
 ./usr/sbin/nslookup                            base-obsolete           obsolete
 ./usr/sbin/nsquery                             base-obsolete           obsolete
@@ -1666,9 +1672,10 @@
 ./usr/share/examples/mount_portal              base-miscfs-examples
 ./usr/share/examples/named                     base-obsolete   obsolete
 ./usr/share/examples/npf                       base-netutil-examples
+./usr/share/examples/npf/hashtablefile         base-netutil-examples
 ./usr/share/examples/npf/host-npf.conf         base-netutil-examples
+./usr/share/examples/npf/l2tp_gw-npf.conf      base-netutil-examples
 ./usr/share/examples/npf/soho_gw-npf.conf      base-netutil-examples
-./usr/share/examples/npf/hashtablefile         base-netutil-examples
 ./usr/share/examples/npf/treetablefile         base-netutil-examples
 ./usr/share/examples/openssl                   base-crypto-examples
 ./usr/share/examples/pf                                base-netutil-examples
diff -r c48c50784340 -r 71982404094d distrib/sets/lists/text/mi
--- a/distrib/sets/lists/text/mi        Thu Mar 05 22:21:02 2015 +0000
+++ b/distrib/sets/lists/text/mi        Thu Mar 05 22:27:04 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.42 2012/02/07 19:13:29 joerg Exp $
+# $NetBSD: mi,v 1.42.2.1 2015/03/05 22:27:05 riz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -22,7 +22,6 @@
 ./usr/bin/lkbib                                        text-groff-bin          groff
 ./usr/bin/lookbib                              text-groff-bin          groff
 ./usr/bin/makeinfo                             text-texinfo-bin
-./usr/bin/mandoc                               text-mdocml-bin
 ./usr/bin/neqn                                 text-groff-bin          groff
 ./usr/bin/nroff                                        text-groff-bin          groff
 ./usr/bin/pfbtops                              text-groff-bin          groff
@@ -40,7 +39,6 @@
 ./usr/bin/troff                                        text-groff-bin          groff
 ./usr/bin/vgrind                               text-groff-bin
 ./usr/libexec/vfontedpr                                text-groff-bin
-./usr/sbin/makemandb                           base-man-bin            makemandb
 ./usr/share/doc/groff                          text-groff-doc
 ./usr/share/doc/groff/mom                      text-groff-doc
 ./usr/share/doc/groff/mom/README.txt           text-groff-doc          share,groff