Module Name: src
Committed By: nia
Date: Mon Jun 6 10:56:30 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/tests: mi
src/etc: Makefile
src/etc/mtree: Makefile NetBSD.dist.base NetBSD.dist.dhcpd special
src/etc/rc.d: Makefile
src/external/bsd: Makefile
src/external/mpl: Makefile
src/libexec: Makefile
src/sbin: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/sys/rump/fs: Makefile.rumpfscomp
src/tests/fs: Makefile
src/tests/fs/vfs: Makefile
src/usr.bin: Makefile
src/usr.sbin: Makefile
src/usr.sbin/puffs: Makefile
Log Message:
build system: Revert all the recent additions of MK[...] knobs that
allow conditionally disabling the building of certain user space
programs in the 'base' set.
There is not enough consensus that this is the right way and a few
people had strong objections, see source-changes-d@.
To generate a diff of this commit:
cvs rdiff -u -r1.1306 -r1.1307 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.936 -r1.937 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2415 -r1.2416 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.386 -r1.387 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.293 -r1.294 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1747 -r1.1748 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.222 -r1.223 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.1209 -r1.1210 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.464 -r1.465 src/etc/Makefile
cvs rdiff -u -r1.46 -r1.47 src/etc/mtree/Makefile
cvs rdiff -u -r1.244 -r1.245 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.dhcpd
cvs rdiff -u -r1.174 -r1.175 src/etc/mtree/special
cvs rdiff -u -r1.115 -r1.116 src/etc/rc.d/Makefile
cvs rdiff -u -r1.74 -r1.75 src/external/bsd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/Makefile
cvs rdiff -u -r1.63 -r1.64 src/libexec/Makefile
cvs rdiff -u -r1.137 -r1.138 src/sbin/Makefile
cvs rdiff -u -r1.95 -r1.96 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.438 -r1.439 src/share/mk/bsd.README
cvs rdiff -u -r1.1284 -r1.1285 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/fs/Makefile.rumpfscomp
cvs rdiff -u -r1.24 -r1.25 src/tests/fs/Makefile
cvs rdiff -u -r1.29 -r1.30 src/tests/fs/vfs/Makefile
cvs rdiff -u -r1.237 -r1.238 src/usr.bin/Makefile
cvs rdiff -u -r1.290 -r1.291 src/usr.sbin/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/puffs/Makefile
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/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1306 src/distrib/sets/lists/base/mi:1.1307
--- src/distrib/sets/lists/base/mi:1.1306 Sun May 29 15:23:20 2022
+++ src/distrib/sets/lists/base/mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1306 2022/05/29 15:23:20 nia Exp $
+# $NetBSD: mi,v 1.1307 2022/06/06 10:56:27 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -327,7 +327,7 @@
./libexec/dhcpcd-hooks/30-hostname base-dhcpcd-root
./libexec/dhcpcd-hooks/50-ntp.conf base-dhcpcd-root
./libexec/dhcpcd-run-hooks base-dhcpcd-root
-./libexec/lfs_cleanerd base-sysutil-bin lfs
+./libexec/lfs_cleanerd base-sysutil-bin
./libexec/resolvconf base-resolvconf-root
./libexec/resolvconf/dnsmasq base-resolvconf-root
./libexec/resolvconf/libc base-resolvconf-root
@@ -371,7 +371,7 @@
./sbin/dmsetup base-lvm-root lvm
./sbin/drvctl base-sysutil-root
./sbin/dump base-sysutil-root
-./sbin/dump_lfs base-sysutil-root lfs
+./sbin/dump_lfs base-sysutil-root
./sbin/dumpfs base-obsolete obsolete
./sbin/dumplfs base-obsolete obsolete
./sbin/fastboot base-sysutil-root
@@ -381,10 +381,10 @@
./sbin/fsck base-sysutil-root
./sbin/fsck_ext2fs base-ext2fs-root
./sbin/fsck_ffs base-sysutil-root
-./sbin/fsck_lfs base-sysutil-root lfs
+./sbin/fsck_lfs base-sysutil-root
./sbin/fsck_msdos base-sysutil-root
./sbin/fsck_udf base-sysutil-root
-./sbin/fsck_v7fs base-sysutil-root
+./sbin/fsck_v7fs base-sysutil-root v7fs
./sbin/fsdb base-sysutil-root
./sbin/fsirand base-sysutil-root
./sbin/gpt base-sysutil-root
@@ -405,23 +405,23 @@
./sbin/modstat base-sysutil-root
./sbin/modunload base-sysutil-root
./sbin/mount base-sysutil-root
-./sbin/mount_ados base-adosfs-root
+./sbin/mount_ados base-adosfs-root ados
./sbin/mount_autofs base-sysutil-root
./sbin/mount_cd9660 base-sysutil-root
-./sbin/mount_chfs base-sysutil-root
-./sbin/mount_efs base-efs-root
+./sbin/mount_chfs base-sysutil-root chfs
+./sbin/mount_efs base-efs-root efs
./sbin/mount_ext2fs base-ext2fs-root
./sbin/mount_fdesc base-miscfs-root
./sbin/mount_ffs base-sysutil-root
-./sbin/mount_filecore base-filecorefs-root
-./sbin/mount_hfs base-hfs-root
+./sbin/mount_filecore base-filecorefs-root filecore
+./sbin/mount_hfs base-hfs-root hfs
./sbin/mount_hfsp base-obsolete obsolete
./sbin/mount_kernfs base-sysutil-root
-./sbin/mount_lfs base-sysutil-root lfs
+./sbin/mount_lfs base-sysutil-root
./sbin/mount_mfs base-sysutil-root
./sbin/mount_msdos base-sysutil-root
./sbin/mount_nfs base-nfsclient-root
-./sbin/mount_nilfs base-sysutil-root
+./sbin/mount_nilfs base-sysutil-root nilfs
./sbin/mount_ntfs base-ntfs-root
./sbin/mount_null base-miscfs-root
./sbin/mount_overlay base-miscfs-root
@@ -431,23 +431,23 @@
./sbin/mount_puffs base-sysutil-root
./sbin/mount_qemufwcfg base-sysutil-root
./sbin/mount_smbfs base-obsolete obsolete
-./sbin/mount_sysvbfs base-sysutil-root
+./sbin/mount_sysvbfs base-sysutil-root sysvbfs
./sbin/mount_tmpfs base-miscfs-root
./sbin/mount_udf base-sysutil-root
./sbin/mount_ufs base-sysutil-root
./sbin/mount_umap base-miscfs-root
./sbin/mount_union base-miscfs-root
-./sbin/mount_v7fs base-sysutil-root
+./sbin/mount_v7fs base-sysutil-root v7fs
./sbin/mount_zfs base-zfs-root zfs
./sbin/mountd base-obsolete obsolete
./sbin/newbtconf base-sysutil-root
./sbin/newfs base-sysutil-root
./sbin/newfs_ext2fs base-sysutil-root
-./sbin/newfs_lfs base-sysutil-root lfs
+./sbin/newfs_lfs base-sysutil-root
./sbin/newfs_msdos base-sysutil-root
-./sbin/newfs_sysvbfs base-sysutil-root
+./sbin/newfs_sysvbfs base-sysutil-root sysvbfs
./sbin/newfs_udf base-sysutil-root
-./sbin/newfs_v7fs base-sysutil-root
+./sbin/newfs_v7fs base-sysutil-root v7fs
./sbin/newlfs base-obsolete obsolete
./sbin/nfsd base-obsolete obsolete
./sbin/nfsiod base-obsolete obsolete
@@ -466,10 +466,10 @@
./sbin/raidctl base-sysutil-root
./sbin/rcorder base-sysutil-root
./sbin/rdump base-sysutil-root
-./sbin/rdump_lfs base-sysutil-root lfs
+./sbin/rdump_lfs base-sysutil-root
./sbin/reboot base-sysutil-root
./sbin/resize_ffs base-sysutil-root
-./sbin/resize_lfs base-sysutil-root lfs
+./sbin/resize_lfs base-sysutil-root
./sbin/resolvconf base-resolvconf-root
./sbin/restore base-sysutil-root
./sbin/rndctl base-sysutil-root
@@ -608,7 +608,7 @@
./usr/bin/file base-util-bin
./usr/bin/fincore base-util-bin
./usr/bin/find base-util-bin
-./usr/bin/finger base-util-bin finger
+./usr/bin/finger base-util-bin
./usr/bin/flock base-util-bin
./usr/bin/fmt base-util-bin
./usr/bin/fold base-util-bin
@@ -861,7 +861,7 @@
./usr/bin/tabs base-util-bin
./usr/bin/tac base-util-bin
./usr/bin/tail base-util-bin
-./usr/bin/talk base-netutil-bin talk
+./usr/bin/talk base-netutil-bin
./usr/bin/tar base-util-bin
./usr/bin/tcopy base-util-bin
./usr/bin/tee base-util-bin
@@ -1281,7 +1281,7 @@
./usr/libexec/cpp0 base-obsolete obsolete
./usr/libexec/digest-service base-krb5-bin kerberos
./usr/libexec/dnskeygen base-obsolete obsolete
-./usr/libexec/fingerd base-netutil-bin finger
+./usr/libexec/fingerd base-netutil-bin
./usr/libexec/ftp-proxy base-obsolete obsolete
./usr/libexec/ftpd base-netutil-bin
./usr/libexec/getNAME base-man-bin !makemandb
@@ -1310,7 +1310,7 @@
./usr/libexec/makewhatis base-man-bin !makemandb
./usr/libexec/named base-bind-bin
./usr/libexec/named-xfer base-obsolete obsolete
-./usr/libexec/ntalkd base-netutil-bin talk
+./usr/libexec/ntalkd base-netutil-bin
./usr/libexec/pfspamd base-obsolete obsolete
./usr/libexec/pfspamd-setup base-obsolete obsolete
./usr/libexec/pfspamlogd base-obsolete obsolete
@@ -1445,7 +1445,7 @@
./usr/sbin/btpand base-sysutil-bin
./usr/sbin/btuartd base-obsolete obsolete
./usr/sbin/catman base-man-bin
-./usr/sbin/chat base-ppp-bin ppp
+./usr/sbin/chat base-ppp-bin
./usr/sbin/chown base-sysutil-bin
./usr/sbin/chroot base-sysutil-bin
./usr/sbin/chrtbl base-obsolete obsolete
@@ -1457,8 +1457,8 @@
./usr/sbin/dbsym base-sysutil-bin binutils
./usr/sbin/ddns-confgen base-bind-bin
./usr/sbin/dev_mkdb base-sysutil-bin
-./usr/sbin/dhcpd base-dhcpd-bin dhcpd
-./usr/sbin/dhcrelay base-dhcpd-bin dhcpd
+./usr/sbin/dhcpd base-dhcpd-bin
+./usr/sbin/dhcrelay base-dhcpd-bin
./usr/sbin/dig base-obsolete obsolete
./usr/sbin/diskpart base-sysutil-bin
./usr/sbin/dnsquery base-obsolete obsolete
@@ -1477,7 +1477,7 @@
./usr/sbin/dtrace base-debug-bin dtrace
./usr/sbin/dtruss base-debug-bin dtrace
./usr/sbin/dumpfs base-sysutil-bin
-./usr/sbin/dumplfs base-sysutil-bin lfs
+./usr/sbin/dumplfs base-sysutil-bin
./usr/sbin/eaytest base-obsolete obsolete
./usr/sbin/editmap base-obsolete obsolete
./usr/sbin/edquota base-sysutil-bin
@@ -1570,7 +1570,7 @@
./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 mrouting
+./usr/sbin/map-mbone base-netutil-bin
./usr/sbin/mbrlabel base-obsolete obsolete
./usr/sbin/mdconfig base-sysutil-bin
./usr/sbin/mdnsd base-mdns-bin mdns
@@ -1592,11 +1592,11 @@
./usr/sbin/mount_puffsportal base-obsolete obsolete
./usr/sbin/mount_sysctlfs base-puffs-bin
./usr/sbin/mountd base-nfsserver-bin
-./usr/sbin/moused base-sysutil-bin moused
-./usr/sbin/mrinfo base-router-bin mrouting
-./usr/sbin/mrouted base-router-bin mrouting
+./usr/sbin/moused base-sysutil-bin
+./usr/sbin/mrinfo base-router-bin
+./usr/sbin/mrouted base-router-bin
./usr/sbin/mscdlabel base-sysutil-bin
-./usr/sbin/mtrace base-netutil-bin mrouting
+./usr/sbin/mtrace base-netutil-bin
./usr/sbin/mtrace6 base-obsolete obsolete
./usr/sbin/mtree base-sysutil-bin
./usr/sbin/named base-bind-bin
@@ -1626,16 +1626,16 @@
./usr/sbin/nslookup base-obsolete obsolete
./usr/sbin/nsquery base-obsolete obsolete
./usr/sbin/nstest base-obsolete obsolete
-./usr/sbin/ntp-keygen base-ntp-bin ntp
-./usr/sbin/ntpd base-ntp-bin ntp
-./usr/sbin/ntpdate base-ntp-bin ntp
-./usr/sbin/ntpdc base-ntp-bin ntp
-./usr/sbin/ntpq base-ntp-bin ntp
-./usr/sbin/ntptime base-ntp-bin ntp
+./usr/sbin/ntp-keygen base-ntp-bin
+./usr/sbin/ntpd base-ntp-bin
+./usr/sbin/ntpdate base-ntp-bin
+./usr/sbin/ntpdc base-ntp-bin
+./usr/sbin/ntpq base-ntp-bin
+./usr/sbin/ntptime base-ntp-bin
./usr/sbin/ntptimeset base-obsolete obsolete
-./usr/sbin/ntptrace base-ntp-bin ntp
+./usr/sbin/ntptrace base-ntp-bin
./usr/sbin/nvmmctl base-sysutil-bin nvmm
-./usr/sbin/omshell base-dhcpd-bin dhcpd
+./usr/sbin/omshell base-dhcpd-bin
./usr/sbin/opensnoop base-debug-bin dtrace
./usr/sbin/pac base-sysutil-bin
./usr/sbin/paxctl base-sysutil-bin
@@ -1668,10 +1668,10 @@
./usr/sbin/postsuper base-postfix-bin postfix
./usr/sbin/posttls-finger base-postfix-bin postfix
./usr/sbin/powerd base-sysutil-bin
-./usr/sbin/pppd base-ppp-bin ppp
-./usr/sbin/pppdump base-ppp-bin ppp
+./usr/sbin/pppd base-ppp-bin
+./usr/sbin/pppdump base-ppp-bin
./usr/sbin/pppoectl base-obsolete obsolete
-./usr/sbin/pppstats base-ppp-bin ppp
+./usr/sbin/pppstats base-ppp-bin
./usr/sbin/praliases base-obsolete obsolete
./usr/sbin/procsystime base-debug-bin dtrace
./usr/sbin/psrset base-sysutil-bin
@@ -1721,7 +1721,7 @@
./usr/sbin/rump_ext2fs base-puffs-bin rump
./usr/sbin/rump_ffs base-puffs-bin rump
./usr/sbin/rump_hfs base-puffs-bin rump
-./usr/sbin/rump_lfs base-puffs-bin rump,lfs
+./usr/sbin/rump_lfs base-puffs-bin rump
./usr/sbin/rump_msdos base-puffs-bin rump
./usr/sbin/rump_nfs base-puffs-bin rump
./usr/sbin/rump_ntfs base-puffs-bin rump
@@ -1745,9 +1745,9 @@
./usr/sbin/setkey base-obsolete obsolete
./usr/sbin/setobjstat base-sysutil-bin
./usr/sbin/sliplogin base-slip-bin
-./usr/sbin/slstats base-slip-bin ppp
+./usr/sbin/slstats base-slip-bin
./usr/sbin/smrsh base-obsolete obsolete
-./usr/sbin/sntp base-ntp-bin ntp
+./usr/sbin/sntp base-ntp-bin
./usr/sbin/spamdb base-obsolete obsolete
./usr/sbin/spawn base-obsolete obsolete
./usr/sbin/spray base-rpcutil-bin
@@ -1770,10 +1770,10 @@
./usr/sbin/tcpdchk base-netutil-bin
./usr/sbin/tcpdmatch base-netutil-bin
./usr/sbin/tcpdrop base-netutil-bin
-./usr/sbin/tcpdump base-netutil-bin tcpdump
+./usr/sbin/tcpdump base-netutil-bin
./usr/sbin/tcsd base-tpm-bin tpm
-./usr/sbin/timed base-timed-bin timed
-./usr/sbin/timedc base-timed-bin timed
+./usr/sbin/timed base-timed-bin
+./usr/sbin/timedc base-timed-bin
./usr/sbin/tpm_changeownerauth base-tpm-bin tpm
./usr/sbin/tpm_clear base-tpm-bin tpm
./usr/sbin/tpm_createek base-tpm-bin tpm
@@ -1867,8 +1867,8 @@
./usr/share/calendar/calendar.music base-calendar-share share
./usr/share/calendar/calendar.netbsd base-calendar-share share
./usr/share/calendar/calendar.usholiday base-calendar-share share
-./usr/share/dhcpd base-dhcpd-bin dhcpd
-./usr/share/dhcpd/pxe.defs base-dhcpd-bin dhcpd,share
+./usr/share/dhcpd base-dhcpd-bin
+./usr/share/dhcpd/pxe.defs base-dhcpd-bin share
./usr/share/dict base-reference-share
./usr/share/dict/papers base-reference-share
./usr/share/dict/special base-reference-share
@@ -2015,7 +2015,7 @@
./usr/share/examples/blocklist base-sys-examples
./usr/share/examples/blocklist/blocklistd.conf base-sys-examples
./usr/share/examples/blocklist/npf.conf base-sys-examples
-./usr/share/examples/dhcp base-dhcpd-examples dhcpd
+./usr/share/examples/dhcp base-dhcpd-examples
./usr/share/examples/dhcpcd base-dhcpcd-examples
./usr/share/examples/dhcpcd/hooks base-dhcpcd-examples
./usr/share/examples/disktab base-sys-examples
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.936 src/distrib/sets/lists/base/shl.mi:1.937
--- src/distrib/sets/lists/base/shl.mi:1.936 Fri May 27 07:28:21 2022
+++ src/distrib/sets/lists/base/shl.mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.936 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: shl.mi,v 1.937 2022/06/06 10:56:27 nia Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -666,9 +666,9 @@
./usr/lib/librumpfs_kernfs.so base-rump-shlib rump
./usr/lib/librumpfs_kernfs.so.0 base-rump-shlib rump
./usr/lib/librumpfs_kernfs.so.0.0 base-rump-shlib rump
-./usr/lib/librumpfs_lfs.so base-rump-shlib rump,lfs
-./usr/lib/librumpfs_lfs.so.0 base-rump-shlib rump,lfs
-./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib rump,lfs
+./usr/lib/librumpfs_lfs.so base-rump-shlib rump
+./usr/lib/librumpfs_lfs.so.0 base-rump-shlib rump
+./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib rump
./usr/lib/librumpfs_mfs.so base-rump-shlib rump
./usr/lib/librumpfs_mfs.so.0 base-rump-shlib rump
./usr/lib/librumpfs_mfs.so.0.0 base-rump-shlib rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2415 src/distrib/sets/lists/comp/mi:1.2416
--- src/distrib/sets/lists/comp/mi:1.2415 Tue May 31 13:42:58 2022
+++ src/distrib/sets/lists/comp/mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2415 2022/05/31 13:42:58 riastradh Exp $
+# $NetBSD: mi,v 1.2416 2022/06/06 10:56:27 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -4037,8 +4037,8 @@
./usr/lib/librumpfs_hfs_p.a comp-c-proflib rump,profile
./usr/lib/librumpfs_kernfs.a comp-c-lib rump
./usr/lib/librumpfs_kernfs_p.a comp-c-proflib rump,profile
-./usr/lib/librumpfs_lfs.a comp-c-lib rump,lfs
-./usr/lib/librumpfs_lfs_p.a comp-c-proflib rump,profile,lfs
+./usr/lib/librumpfs_lfs.a comp-c-lib rump
+./usr/lib/librumpfs_lfs_p.a comp-c-proflib rump,profile
./usr/lib/librumpfs_mfs.a comp-c-lib rump
./usr/lib/librumpfs_mfs_p.a comp-c-proflib rump,profile
./usr/lib/librumpfs_msdos.a comp-c-lib rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.386 src/distrib/sets/lists/debug/mi:1.387
--- src/distrib/sets/lists/debug/mi:1.386 Tue May 31 13:42:59 2022
+++ src/distrib/sets/lists/debug/mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.386 2022/05/31 13:42:59 riastradh Exp $
+# $NetBSD: mi,v 1.387 2022/06/06 10:56:27 nia Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -323,7 +323,7 @@
./usr/libdata/debug/bin/systrace.debug comp-obsolete obsolete
./usr/libdata/debug/bin/tar.debug comp-util-debug debug,bsdtar
./usr/libdata/debug/bin/test.debug comp-util-debug debug
-./usr/libdata/debug/libexec/lfs_cleanerd.debug comp-sysutil-debug debug,lfs
+./usr/libdata/debug/libexec/lfs_cleanerd.debug comp-sysutil-debug debug
./usr/libdata/debug/netbsd comp-sysutil-debug debug,kernel_dir
./usr/libdata/debug/netbsd-@[email protected] comp-sysutil-debug debug
./usr/libdata/debug/sbin/amrctl.debug comp-sysutil-debug debug
@@ -353,12 +353,12 @@
./usr/libdata/debug/sbin/dmsetup.debug comp-sysutil-debug lvm,debug
./usr/libdata/debug/sbin/drvctl.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/dump.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/dump_lfs.debug comp-sysutil-debug lfs,debug
+./usr/libdata/debug/sbin/dump_lfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fdisk.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck_ext2fs.debug comp-ext2fs-debug debug
./usr/libdata/debug/sbin/fsck_ffs.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/fsck_lfs.debug comp-sysutil-debug lfs,debug
+./usr/libdata/debug/sbin/fsck_lfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck_msdos.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck_udf.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck_v7fs.debug comp-sysutil-debug debug
@@ -389,7 +389,7 @@
./usr/libdata/debug/sbin/mount_filecore.debug comp-filecorefs-debug debug
./usr/libdata/debug/sbin/mount_hfs.debug comp-hfs-debug debug
./usr/libdata/debug/sbin/mount_kernfs.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/mount_lfs.debug comp-sysutil-debug lfs,debug
+./usr/libdata/debug/sbin/mount_lfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/mount_msdos.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/mount_nfs.debug comp-nfsclient-debug debug
./usr/libdata/debug/sbin/mount_nilfs.debug comp-sysutil-debug debug
@@ -410,7 +410,7 @@
./usr/libdata/debug/sbin/mount_v7fs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs_ext2fs.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/newfs_lfs.debug comp-sysutil-debug lfs,debug
+./usr/libdata/debug/sbin/newfs_lfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs_msdos.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs_sysvbfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs_udf.debug comp-sysutil-debug debug
@@ -428,7 +428,7 @@
./usr/libdata/debug/sbin/rcorder.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/reboot.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/resize_ffs.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/resize_lfs.debug comp-sysutil-debug lfs,debug
+./usr/libdata/debug/sbin/resize_lfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/restore.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/rndctl.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/route.debug comp-netutil-debug debug
@@ -561,7 +561,7 @@
./usr/libdata/debug/usr/bin/file.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/fincore.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/find.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/finger.debug comp-util-debug finger,debug
+./usr/libdata/debug/usr/bin/finger.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/flock.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/fmt.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/fold.debug comp-util-debug debug
@@ -826,7 +826,7 @@
./usr/libdata/debug/usr/bin/systat.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tabs.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tail.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/talk.debug comp-netutil-debug talk,debug
+./usr/libdata/debug/usr/bin/talk.debug comp-netutil-debug debug
./usr/libdata/debug/usr/bin/tbl.debug comp-groff-debug groff,debug
./usr/libdata/debug/usr/bin/tcopy.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/tee.debug comp-util-debug debug
@@ -975,7 +975,7 @@
./usr/libdata/debug/usr/libexec/cxxcom.debug comp-cxx-debug pcc,debug
./usr/libdata/debug/usr/libexec/digest-service.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete obsolete
-./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug finger,debug
+./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug debug
./usr/libdata/debug/usr/libexec/ftp-proxy.debug comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ftpd.debug comp-netutil-debug debug
./usr/libdata/debug/usr/libexec/getNAME.debug comp-man-debug !makemandb,debug
@@ -1000,7 +1000,7 @@
./usr/libdata/debug/usr/libexec/mail.local.debug comp-mail-debug debug
./usr/libdata/debug/usr/libexec/makekey.debug comp-crypto-debug debug
./usr/libdata/debug/usr/libexec/makewhatis.debug comp-man-debug !makemandb,debug
-./usr/libdata/debug/usr/libexec/ntalkd.debug comp-netutil-debug talk,debug
+./usr/libdata/debug/usr/libexec/ntalkd.debug comp-netutil-debug debug
./usr/libdata/debug/usr/libexec/pcpp.debug comp-c-debug pcc,debug
./usr/libdata/debug/usr/libexec/postfix/anvil.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/libexec/postfix/bounce.debug comp-postfix-debug postfix,debug
@@ -1076,7 +1076,7 @@
./usr/libdata/debug/usr/sbin/btpand.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/btuartd.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/catman.debug comp-man-debug debug
-./usr/libdata/debug/usr/sbin/chat.debug comp-ppp-debug ppp,debug
+./usr/libdata/debug/usr/sbin/chat.debug comp-ppp-debug debug
./usr/libdata/debug/usr/sbin/chown.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/chroot.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/chrtbl.debug comp-obsolete obsolete
@@ -1088,8 +1088,8 @@
./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
./usr/libdata/debug/usr/sbin/ddns-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug dhcpd,debug
-./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug dhcpd,debug
+./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug
+./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/diskpart.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/dnssec-dsfromkey.debug comp-bind-debug debug
./usr/libdata/debug/usr/sbin/dnssec-importkey.debug comp-bind-debug debug
@@ -1102,7 +1102,7 @@
./usr/libdata/debug/usr/sbin/dtmfdecode.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/dtrace.debug comp-util-debug dtrace,debug
./usr/libdata/debug/usr/sbin/dumpfs.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/dumplfs.debug comp-sysutil-debug lfs,debug
+./usr/libdata/debug/usr/sbin/dumplfs.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/edquota.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/envstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/eshconfig.debug comp-obsolete obsolete
@@ -1173,7 +1173,7 @@
./usr/libdata/debug/usr/sbin/makedbm.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/makefs.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/makemandb.debug comp-makemandb-debug makemandb,debug
-./usr/libdata/debug/usr/sbin/map-mbone.debug comp-netutil-debug mrouting,debug
+./usr/libdata/debug/usr/sbin/map-mbone.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/mdconfig.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/mdnsd.debug comp-mdns-debug mdns,debug
./usr/libdata/debug/usr/sbin/mdsetimage.debug comp-sysutil-debug binutils,debug
@@ -1193,11 +1193,11 @@
./usr/libdata/debug/usr/sbin/mount_puffsportal.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/mount_sysctlfs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/mountd.debug comp-nfsserver-debug debug
-./usr/libdata/debug/usr/sbin/moused.debug comp-sysutil-debug moused,debug
-./usr/libdata/debug/usr/sbin/mrinfo.debug comp-router-debug mrouting,debug
-./usr/libdata/debug/usr/sbin/mrouted.debug comp-router-debug mrouting,debug
+./usr/libdata/debug/usr/sbin/moused.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/mrinfo.debug comp-router-debug debug
+./usr/libdata/debug/usr/sbin/mrouted.debug comp-router-debug debug
./usr/libdata/debug/usr/sbin/mscdlabel.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/mtrace.debug comp-netutil-debug mrouting,debug
+./usr/libdata/debug/usr/sbin/mtrace.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/mtree.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/named-checkconf.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/named-checkzone.debug comp-bind-bin debug
@@ -1216,14 +1216,14 @@
./usr/libdata/debug/usr/sbin/nsd-control.debug comp-nsd-debug nsd
./usr/libdata/debug/usr/sbin/nsd.debug comp-nsd-debug nsd
./usr/libdata/debug/usr/sbin/nsec3hash.debug comp-bind-debug debug
-./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug ntp,debug
-./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug ntp,debug
-./usr/libdata/debug/usr/sbin/ntpdate.debug comp-ntp-debug ntp,debug
-./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug ntp,debug
-./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug ntp,debug
-./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/ntpdate.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug
+./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug
./usr/libdata/debug/usr/sbin/nvmmctl.debug comp-sysutil-debug debug,nvmm
-./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug,dhcpd
+./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug
@@ -1248,9 +1248,9 @@
./usr/libdata/debug/usr/sbin/postsuper.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/posttls-finger.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/powerd.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/pppd.debug comp-ppp-debug ppp,debug
-./usr/libdata/debug/usr/sbin/pppdump.debug comp-ppp-debug ppp,debug
-./usr/libdata/debug/usr/sbin/pppstats.debug comp-ppp-debug ppp,debug
+./usr/libdata/debug/usr/sbin/pppd.debug comp-ppp-debug debug
+./usr/libdata/debug/usr/sbin/pppdump.debug comp-ppp-debug debug
+./usr/libdata/debug/usr/sbin/pppstats.debug comp-ppp-debug debug
./usr/libdata/debug/usr/sbin/psrset.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pvcsif.debug comp-obsolete obsolete
@@ -1295,7 +1295,7 @@
./usr/libdata/debug/usr/sbin/rump_ext2fs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_ffs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_hfs.debug comp-puffs-debug debug,rump
-./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-puffs-debug debug,rump,lfs
+./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_nfs.debug comp-puffs-debug debug,rump
./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-puffs-debug debug,rump
@@ -1315,7 +1315,7 @@
./usr/libdata/debug/usr/sbin/setencstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/setobjstat.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/sliplogin.debug comp-slip-debug debug
-./usr/libdata/debug/usr/sbin/sntp.debug comp-ntp-debug ntp,debug
+./usr/libdata/debug/usr/sbin/sntp.debug comp-ntp-debug debug
./usr/libdata/debug/usr/sbin/spray.debug comp-rpcutil-debug debug
./usr/libdata/debug/usr/sbin/srtconfig.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/sshd.debug comp-secsh-debug debug
@@ -1331,10 +1331,10 @@
./usr/libdata/debug/usr/sbin/tcpdchk.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/tcpdmatch.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/tcpdrop.debug comp-netutil-debug debug
-./usr/libdata/debug/usr/sbin/tcpdump.debug comp-netutil-debug tcpdump,debug
+./usr/libdata/debug/usr/sbin/tcpdump.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/tcsd.debug comp-tpm-debug tpm,debug
-./usr/libdata/debug/usr/sbin/timed.debug comp-timed-debug timed,debug
-./usr/libdata/debug/usr/sbin/timedc.debug comp-timed-debug timed,debug
+./usr/libdata/debug/usr/sbin/timed.debug comp-timed-debug debug
+./usr/libdata/debug/usr/sbin/timedc.debug comp-timed-debug debug
./usr/libdata/debug/usr/sbin/tpm_changeownerauth.debug comp-tpm-debug tpm,debug
./usr/libdata/debug/usr/sbin/tpm_clear.debug comp-tpm-debug tpm,debug
./usr/libdata/debug/usr/sbin/tpm_createek.debug comp-tpm-debug tpm,debug
@@ -1692,8 +1692,8 @@
./usr/libdata/debug/usr/tests/fs/fifofs/t_fifo.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/hfs/t_pathconvert.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/kernfs/t_basic.debug tests-fs-debug debug,atf,rump
-./usr/libdata/debug/usr/tests/fs/lfs/t_pr.debug tests-fs-debug debug,atf,rump,lfs
-./usr/libdata/debug/usr/tests/fs/lfs/t_rfw.debug tests-fs-debug debug,atf,rump,lfs
+./usr/libdata/debug/usr/tests/fs/lfs/t_pr.debug tests-fs-debug debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/lfs/t_rfw.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/msdosfs/t_snapshot.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/nfs/nfsservice/rumpnfsd.debug tests-fs-debug debug,atf,rump
./usr/libdata/debug/usr/tests/fs/nfs/t_mountd.debug tests-fs-debug debug,atf,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.293 src/distrib/sets/lists/debug/shl.mi:1.294
--- src/distrib/sets/lists/debug/shl.mi:1.293 Fri May 27 07:28:22 2022
+++ src/distrib/sets/lists/debug/shl.mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.293 2022/05/27 07:28:22 nia Exp $
+# $NetBSD: shl.mi,v 1.294 2022/06/06 10:56:27 nia Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
@@ -240,7 +240,7 @@
./usr/libdata/debug/usr/lib/librumpfs_ffs.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpfs_hfs.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpfs_kernfs.so.0.0.debug comp-rump-debug debug,rump
-./usr/libdata/debug/usr/lib/librumpfs_lfs.so.0.0.debug comp-rump-debug debug,rump,lfs
+./usr/libdata/debug/usr/lib/librumpfs_lfs.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpfs_mfs.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpfs_msdos.so.0.0.debug comp-rump-debug debug,rump
./usr/libdata/debug/usr/lib/librumpfs_nfs.so.0.0.debug comp-rump-debug debug,rump
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.269 src/distrib/sets/lists/etc/mi:1.270
--- src/distrib/sets/lists/etc/mi:1.269 Sun May 29 08:09:59 2022
+++ src/distrib/sets/lists/etc/mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.269 2022/05/29 08:09:59 nia Exp $
+# $NetBSD: mi,v 1.270 2022/06/06 10:56:27 nia Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -97,7 +97,7 @@
./etc/monthly etc-sys-etc
./etc/monthly.conf etc-sys-etc
./etc/motd etc-sys-etc
-./etc/mrouted.conf etc-router-etc mrouting
+./etc/mrouted.conf etc-router-etc
./etc/mtree/NetBSD.dist etc-sys-etc
./etc/mtree/set.etc etc-sys-etc
./etc/mtree/special etc-sys-etc
@@ -111,7 +111,7 @@
./etc/networks etc-net-etc
./etc/newsyslog.conf etc-sysutil-etc
./etc/nsswitch.conf etc-net-etc
-./etc/ntp.conf etc-ntp-etc ntp
+./etc/ntp.conf etc-ntp-etc
./etc/obsolete/base etc-obsolete obsolete
./etc/obsolete/comp etc-obsolete obsolete
./etc/obsolete/etc etc-obsolete obsolete
@@ -263,7 +263,7 @@
./etc/rc.d/mountcritremote etc-sys-rc
./etc/rc.d/mountd etc-nfsserver-rc
./etc/rc.d/moused etc-sysutil-rc
-./etc/rc.d/mrouted etc-router-rc mrouting
+./etc/rc.d/mrouted etc-router-rc
./etc/rc.d/named etc-bind-rc
./etc/rc.d/ndbootd etc-bootserver-rc
./etc/rc.d/network etc-net-rc
@@ -274,8 +274,8 @@
./etc/rc.d/npf_boot etc-npf-rc
./etc/rc.d/npfd etc-npf-rc
./etc/rc.d/nsd etc-nsd-rc nsd
-./etc/rc.d/ntpd etc-ntp-rc ntp
-./etc/rc.d/ntpdate etc-ntp-rc ntp
+./etc/rc.d/ntpd etc-ntp-rc
+./etc/rc.d/ntpdate etc-ntp-rc
./etc/rc.d/perusertmp etc-sys-rc
./etc/rc.d/pf etc-net-rc
./etc/rc.d/pf_boot etc-net-rc
@@ -283,7 +283,7 @@
./etc/rc.d/poffd etc-obsolete obsolete
./etc/rc.d/postfix etc-postfix-rc
./etc/rc.d/powerd etc-sysutil-rc
-./etc/rc.d/ppp etc-ppp-rc ppp
+./etc/rc.d/ppp etc-ppp-rc
./etc/rc.d/pwcheck etc-sys-rc
./etc/rc.d/quota etc-sys-rc
./etc/rc.d/racoon etc-net-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1747 src/distrib/sets/lists/man/mi:1.1748
--- src/distrib/sets/lists/man/mi:1.1747 Sun May 29 15:23:20 2022
+++ src/distrib/sets/lists/man/mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1747 2022/05/29 15:23:20 nia Exp $
+# $NetBSD: mi,v 1.1748 2022/06/06 10:56:27 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -172,7 +172,7 @@
./usr/share/man/cat1/file.0 man-util-catman .cat
./usr/share/man/cat1/fincore.0 man-util-catman .cat
./usr/share/man/cat1/find.0 man-util-catman .cat
-./usr/share/man/cat1/finger.0 man-util-catman finger,.cat
+./usr/share/man/cat1/finger.0 man-util-catman .cat
./usr/share/man/cat1/flock.0 man-util-catman .cat
./usr/share/man/cat1/fmt.0 man-util-catman .cat
./usr/share/man/cat1/fold.0 man-util-catman .cat
@@ -374,7 +374,7 @@
./usr/share/man/cat1/nvi.0 man-obsolete obsolete
./usr/share/man/cat1/nview.0 man-obsolete obsolete
./usr/share/man/cat1/od.0 man-util-catman .cat
-./usr/share/man/cat1/omshell.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat1/omshell.0 man-dhcpd-catman .cat
./usr/share/man/cat1/openpgp.0 man-obsolete obsolete
./usr/share/man/cat1/openssl.0 man-crypto-catman .cat
./usr/share/man/cat1/openssl_CA.pl.0 man-crypto-catman .cat
@@ -543,7 +543,7 @@
./usr/share/man/cat1/sleep.0 man-util-catman .cat
./usr/share/man/cat1/slogin.0 man-secsh-catman .cat
./usr/share/man/cat1/smbutil.0 man-obsolete obsolete
-./usr/share/man/cat1/sntp.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat1/sntp.0 man-ntp-catman .cat
./usr/share/man/cat1/sockstat.0 man-util-catman .cat
./usr/share/man/cat1/sort.0 man-util-catman .cat
./usr/share/man/cat1/sortinfo.0 man-texinfo-catman .cat
@@ -572,7 +572,7 @@
./usr/share/man/cat1/tabs.0 man-util-catman .cat
./usr/share/man/cat1/tac.0 man-util-catman .cat
./usr/share/man/cat1/tail.0 man-util-catman .cat
-./usr/share/man/cat1/talk.0 man-netutil-catman talk,.cat
+./usr/share/man/cat1/talk.0 man-netutil-catman .cat
./usr/share/man/cat1/tar.0 man-util-catman .cat
./usr/share/man/cat1/tcopy.0 man-util-catman .cat
./usr/share/man/cat1/tee.0 man-util-catman .cat
@@ -2173,11 +2173,11 @@
./usr/share/man/cat5/daily.conf.0 man-sys-catman .cat
./usr/share/man/cat5/dhclient.conf.0 man-obsolete obsolete
./usr/share/man/cat5/dhclient.leases.0 man-obsolete obsolete
-./usr/share/man/cat5/dhcp-eval.0 man-dhcpd-catman dhcpd,.cat
-./usr/share/man/cat5/dhcp-options.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat5/dhcp-eval.0 man-dhcpd-catman .cat
+./usr/share/man/cat5/dhcp-options.0 man-dhcpd-catman .cat
./usr/share/man/cat5/dhcpcd.conf.0 man-dhcpcd-catman .cat
-./usr/share/man/cat5/dhcpd.conf.0 man-dhcpd-catman dhcpd,.cat
-./usr/share/man/cat5/dhcpd.leases.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat5/dhcpd.conf.0 man-dhcpd-catman .cat
+./usr/share/man/cat5/dhcpd.leases.0 man-dhcpd-catman .cat
./usr/share/man/cat5/dir.0 man-obsolete obsolete
./usr/share/man/cat5/dirent.0 man-obsolete obsolete
./usr/share/man/cat5/disklabel.0 man-sys-catman .cat
@@ -2277,8 +2277,8 @@
./usr/share/man/cat5/npf.conf.0 man-npf-catman .cat,npf
./usr/share/man/cat5/nsd.conf.0 man-nsd-catman .cat,nsd
./usr/share/man/cat5/nsswitch.conf.0 man-net-catman .cat
-./usr/share/man/cat5/ntp.conf.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat5/ntp.keys.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat5/ntp.conf.0 man-ntp-catman .cat
+./usr/share/man/cat5/ntp.keys.0 man-ntp-catman .cat
./usr/share/man/cat5/openssl.cnf.0 man-crypto-catman .cat
./usr/share/man/cat5/pam.conf.0 man-sys-catman pam,.cat
./usr/share/man/cat5/passwd.0 man-sys-catman .cat
@@ -2514,7 +2514,7 @@
./usr/share/man/cat8/cesfic/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/cesfic/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/cgdconfig.0 man-sysutil-catman .cat
-./usr/share/man/cat8/chat.0 man-ppp-catman ppp,.cat
+./usr/share/man/cat8/chat.0 man-ppp-catman .cat
./usr/share/man/cat8/chown.0 man-sysutil-catman .cat
./usr/share/man/cat8/chroot.0 man-sysutil-catman .cat
./usr/share/man/cat8/chrtbl.0 man-obsolete obsolete
@@ -2556,8 +2556,8 @@
./usr/share/man/cat8/dhclient.0 man-obsolete obsolete
./usr/share/man/cat8/dhcpcd-run-hooks.0 man-dhcpcd-catman .cat
./usr/share/man/cat8/dhcpcd.0 man-dhcpcd-catman .cat
-./usr/share/man/cat8/dhcpd.0 man-dhcpd-catman dhcpd,.cat
-./usr/share/man/cat8/dhcrelay.0 man-dhcpd-catman dhcpd,.cat
+./usr/share/man/cat8/dhcpd.0 man-dhcpd-catman .cat
+./usr/share/man/cat8/dhcrelay.0 man-dhcpd-catman .cat
./usr/share/man/cat8/discard.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/disklabel.0 man-sysutil-catman .cat
./usr/share/man/cat8/diskless.0 man-sysutil-catman .cat
@@ -2583,9 +2583,9 @@
./usr/share/man/cat8/dreamcast/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/drvctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/dump.0 man-sysutil-catman .cat
-./usr/share/man/cat8/dump_lfs.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/dump_lfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/dumpfs.0 man-sysutil-catman .cat
-./usr/share/man/cat8/dumplfs.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/dumplfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/editmap.0 man-obsolete obsolete
./usr/share/man/cat8/edquota.0 man-sysutil-catman .cat
./usr/share/man/cat8/eeprom.0 man-sysutil-catman .cat
@@ -2617,17 +2617,17 @@
./usr/share/man/cat8/fasthalt.0 man-sysutil-catman .cat
./usr/share/man/cat8/fdiscard.0 man-sysutil-catman .cat
./usr/share/man/cat8/fdisk.0 man-sysutil-catman .cat
-./usr/share/man/cat8/fingerd.0 man-sysutil-catman finger,.cat
+./usr/share/man/cat8/fingerd.0 man-sysutil-catman .cat
./usr/share/man/cat8/fixmount.0 man-sysutil-catman .cat
./usr/share/man/cat8/flashctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/flush.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/fsck.0 man-sysutil-catman .cat
./usr/share/man/cat8/fsck_ext2fs.0 man-ext2fs-catman .cat
./usr/share/man/cat8/fsck_ffs.0 man-sysutil-catman .cat
-./usr/share/man/cat8/fsck_lfs.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/fsck_lfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/fsck_msdos.0 man-sysutil-catman .cat
./usr/share/man/cat8/fsck_udf.0 man-sysutil-catman .cat
-./usr/share/man/cat8/fsck_v7fs.0 man-sysutil-catman .cat
+./usr/share/man/cat8/fsck_v7fs.0 man-sysutil-catman v7fs,.cat
./usr/share/man/cat8/fsdb.0 man-sysutil-catman .cat
./usr/share/man/cat8/fsinfo.0 man-sysutil-catman .cat
./usr/share/man/cat8/fsirand.0 man-sysutil-catman .cat
@@ -2761,7 +2761,7 @@
./usr/share/man/cat8/lastlogin.0 man-sysutil-catman .cat
./usr/share/man/cat8/ldconfig.0 man-sysutil-catman .cat
./usr/share/man/cat8/ldpd.0 man-router-catman .cat
-./usr/share/man/cat8/lfs_cleanerd.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/lfs_cleanerd.0 man-sysutil-catman .cat
./usr/share/man/cat8/link.0 man-sysutil-catman .cat
./usr/share/man/cat8/lmcconfig.0 man-obsolete obsolete
./usr/share/man/cat8/lmcctl.0 man-obsolete obsolete
@@ -2811,7 +2811,7 @@
./usr/share/man/cat8/makemandb.0 man-man-catman makemandb,.cat
./usr/share/man/cat8/makemap.0 man-obsolete obsolete
./usr/share/man/cat8/makewhatis.0 man-man-catman !makemandb,.cat
-./usr/share/man/cat8/map-mbone.0 man-netutil-catman mrouting,.cat
+./usr/share/man/cat8/map-mbone.0 man-netutil-catman .cat
./usr/share/man/cat8/master.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/mbr.0 man-obsolete obsolete
./usr/share/man/cat8/mbrlabel.0 man-sysutil-catman .cat
@@ -2848,7 +2848,7 @@
./usr/share/man/cat8/mount_hfs.0 man-hfs-catman .cat
./usr/share/man/cat8/mount_hfsp.0 man-obsolete obsolete
./usr/share/man/cat8/mount_kernfs.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mount_lfs.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/mount_lfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_mfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_msdos.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_nfs.0 man-nfsclient-catman .cat
@@ -2873,11 +2873,11 @@
./usr/share/man/cat8/mount_v7fs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_zfs.0 man-sysutil-catman zfs,.cat
./usr/share/man/cat8/mountd.0 man-nfsserver-catman .cat
-./usr/share/man/cat8/moused.0 man-sysutil-catman moused,.cat
-./usr/share/man/cat8/mrinfo.0 man-netutil-catman mrouting,.cat
-./usr/share/man/cat8/mrouted.0 man-router-catman mrouting,.cat
+./usr/share/man/cat8/moused.0 man-sysutil-catman .cat
+./usr/share/man/cat8/mrinfo.0 man-netutil-catman .cat
+./usr/share/man/cat8/mrouted.0 man-router-catman .cat
./usr/share/man/cat8/mscdlabel.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mtrace.0 man-netutil-catman mrouting,.cat
+./usr/share/man/cat8/mtrace.0 man-netutil-catman .cat
./usr/share/man/cat8/mtrace6.0 man-obsolete obsolete
./usr/share/man/cat8/mtree.0 man-sysutil-catman .cat
./usr/share/man/cat8/mvme68k/MAKEDEV.0 man-obsolete obsolete
@@ -2907,11 +2907,11 @@
./usr/share/man/cat8/newbtconf.0 man-sysutil-catman .cat
./usr/share/man/cat8/newfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/newfs_ext2fs.0 man-sysutil-catman .cat
-./usr/share/man/cat8/newfs_lfs.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/newfs_lfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/newfs_msdos.0 man-sysutil-catman .cat
-./usr/share/man/cat8/newfs_sysvbfs.0 man-sysutil-catman .cat
+./usr/share/man/cat8/newfs_sysvbfs.0 man-sysutil-catman sysvbfs,.cat
./usr/share/man/cat8/newfs_udf.0 man-sysutil-catman .cat
-./usr/share/man/cat8/newfs_v7fs.0 man-sysutil-catman .cat
+./usr/share/man/cat8/newfs_v7fs.0 man-sysutil-catman v7fs,.cat
./usr/share/man/cat8/newlfs.0 man-obsolete obsolete
./usr/share/man/cat8/news68k/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/news68k/makedev.0 man-obsolete obsolete
@@ -2936,14 +2936,14 @@
./usr/share/man/cat8/nsec3hash.0 man-bind-catman .cat
./usr/share/man/cat8/nslookup.0 man-netutil-catman .cat
./usr/share/man/cat8/nsupdate.0 man-obsolete obsolete
-./usr/share/man/cat8/ntalkd.0 man-netutil-catman talk,.cat
-./usr/share/man/cat8/ntp-keygen.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat8/ntpd.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat8/ntpdate.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat8/ntpdc.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat8/ntpq.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat8/ntptime.0 man-ntp-catman ntp,.cat
-./usr/share/man/cat8/ntptrace.0 man-ntp-catman ntp,.cat
+./usr/share/man/cat8/ntalkd.0 man-netutil-catman .cat
+./usr/share/man/cat8/ntp-keygen.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntpd.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntpdate.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntpdc.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntpq.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntptime.0 man-ntp-catman .cat
+./usr/share/man/cat8/ntptrace.0 man-ntp-catman .cat
./usr/share/man/cat8/nvmectl.0 man-sysutil-catman .cat
./usr/share/man/cat8/nvmmctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/ofctl.0 man-sysutil-catman .cat
@@ -3012,11 +3012,11 @@
./usr/share/man/cat8/postscreen.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/powerd.0 man-sysutil-catman .cat
./usr/share/man/cat8/poweroff.0 man-sysutil-catman .cat
-./usr/share/man/cat8/pppd.0 man-ppp-catman ppp,.cat
+./usr/share/man/cat8/pppd.0 man-ppp-catman .cat
./usr/share/man/cat8/pppd.cbcp.0 man-obsolete obsolete
-./usr/share/man/cat8/pppdump.0 man-ppp-catman ppp,.cat
+./usr/share/man/cat8/pppdump.0 man-ppp-catman .cat
./usr/share/man/cat8/pppoectl.0 man-sysutil-catman .cat
-./usr/share/man/cat8/pppstats.0 man-ppp-catman ppp,.cat
+./usr/share/man/cat8/pppstats.0 man-ppp-catman .cat
./usr/share/man/cat8/praliases.0 man-obsolete obsolete
./usr/share/man/cat8/prep/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/prep/boot.0 man-sys-catman .cat
@@ -3061,13 +3061,13 @@
./usr/share/man/cat8/rdconfig.0 man-obsolete obsolete
./usr/share/man/cat8/rdisc.0 man-netutil-catman .cat
./usr/share/man/cat8/rdump.0 man-netutil-catman .cat
-./usr/share/man/cat8/rdump_lfs.0 man-netutil-catman lfs,.cat
+./usr/share/man/cat8/rdump_lfs.0 man-netutil-catman .cat
./usr/share/man/cat8/reboot.0 man-sysutil-catman .cat
./usr/share/man/cat8/renice.0 man-sysutil-catman .cat
./usr/share/man/cat8/repquota.0 man-sysutil-catman .cat
./usr/share/man/cat8/rescue.0 man-sysutil-catman .cat
./usr/share/man/cat8/resize_ffs.0 man-sysutil-catman .cat
-./usr/share/man/cat8/resize_lfs.0 man-sysutil-catman lfs,.cat
+./usr/share/man/cat8/resize_lfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/resolvconf.0 man-resolvconf-catman .cat
./usr/share/man/cat8/restore.0 man-sysutil-catman .cat
./usr/share/man/cat8/revnetgroup.0 man-nis-catman yp,.cat
@@ -3109,7 +3109,7 @@
./usr/share/man/cat8/rump_ext2fs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_ffs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_hfs.0 man-puffs-catman .cat,rump
-./usr/share/man/cat8/rump_lfs.0 man-puffs-catman lfs,.cat,rump
+./usr/share/man/cat8/rump_lfs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_msdos.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_nfs.0 man-puffs-catman .cat,rump
./usr/share/man/cat8/rump_ntfs.0 man-puffs-catman .cat,rump
@@ -3156,7 +3156,7 @@
./usr/share/man/cat8/slattach.0 man-slip-catman .cat
./usr/share/man/cat8/slip.0 man-obsolete obsolete
./usr/share/man/cat8/sliplogin.0 man-slip-catman .cat
-./usr/share/man/cat8/slstats.0 man-slip-catman ppp,.cat
+./usr/share/man/cat8/slstats.0 man-slip-catman .cat
./usr/share/man/cat8/smrsh.0 man-obsolete obsolete
./usr/share/man/cat8/smtp.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/smtpd.0 man-postfix-catman postfix,.cat
@@ -3211,17 +3211,17 @@
./usr/share/man/cat8/sysctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/sysinst.0 man-sysutil-man .cat
./usr/share/man/cat8/syslogd.0 man-sysutil-catman .cat
-./usr/share/man/cat8/talkd.0 man-netutil-catman talk,.cat
+./usr/share/man/cat8/talkd.0 man-netutil-catman .cat
./usr/share/man/cat8/tbrconfig.0 man-router-catman .cat
./usr/share/man/cat8/tcpdchk.0 man-netutil-catman .cat
./usr/share/man/cat8/tcpdmatch.0 man-netutil-catman .cat
./usr/share/man/cat8/tcpdrop.0 man-netutil-catman .cat
-./usr/share/man/cat8/tcpdump.0 man-netutil-catman tcpdump,.cat
+./usr/share/man/cat8/tcpdump.0 man-netutil-catman .cat
./usr/share/man/cat8/telnetd.0 man-netutil-catman .cat
./usr/share/man/cat8/tftp-proxy.0 man-pf-catman pf,.cat
./usr/share/man/cat8/tftpd.0 man-netutil-catman .cat
-./usr/share/man/cat8/timed.0 man-timed-catman timed,.cat
-./usr/share/man/cat8/timedc.0 man-timed-catman timed,.cat
+./usr/share/man/cat8/timed.0 man-timed-catman .cat
+./usr/share/man/cat8/timedc.0 man-timed-catman .cat
./usr/share/man/cat8/tlsmgr.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/tlsproxy.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/tpctl.0 man-sysutil-catman .cat
@@ -3508,7 +3508,7 @@
./usr/share/man/html1/file.html man-util-htmlman html
./usr/share/man/html1/fincore.html man-util-htmlman html
./usr/share/man/html1/find.html man-util-htmlman html
-./usr/share/man/html1/finger.html man-util-htmlman finger,html
+./usr/share/man/html1/finger.html man-util-htmlman html
./usr/share/man/html1/flock.html man-util-htmlman html
./usr/share/man/html1/fmt.html man-util-htmlman html
./usr/share/man/html1/fold.html man-util-htmlman html
@@ -3696,7 +3696,7 @@
./usr/share/man/html1/nvi.html man-obsolete obsolete
./usr/share/man/html1/nview.html man-obsolete obsolete
./usr/share/man/html1/od.html man-util-htmlman html
-./usr/share/man/html1/omshell.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html1/omshell.html man-dhcpd-htmlman html
./usr/share/man/html1/openpgp.html man-obsolete obsolete
./usr/share/man/html1/openssl.html man-crypto-htmlman html
./usr/share/man/html1/openssl_CA.pl.html man-crypto-htmlman html
@@ -3860,7 +3860,7 @@
./usr/share/man/html1/sleep.html man-util-htmlman html
./usr/share/man/html1/slogin.html man-secsh-htmlman html
./usr/share/man/html1/smbutil.html man-obsolete obsolete
-./usr/share/man/html1/sntp.html man-ntp-htmlman ntp,html
+./usr/share/man/html1/sntp.html man-ntp-htmlman html
./usr/share/man/html1/sockstat.html man-util-htmlman html
./usr/share/man/html1/sort.html man-util-htmlman html
./usr/share/man/html1/sortinfo.html man-texinfo-htmlman html
@@ -3888,7 +3888,7 @@
./usr/share/man/html1/tabs.html man-util-htmlman html
./usr/share/man/html1/tac.html man-util-htmlman html
./usr/share/man/html1/tail.html man-util-htmlman html
-./usr/share/man/html1/talk.html man-netutil-htmlman talk,html
+./usr/share/man/html1/talk.html man-netutil-htmlman html
./usr/share/man/html1/tar.html man-util-htmlman html
./usr/share/man/html1/tcopy.html man-util-htmlman html
./usr/share/man/html1/tee.html man-util-htmlman html
@@ -5349,11 +5349,11 @@
./usr/share/man/html5/daily.html man-sys-htmlman html
./usr/share/man/html5/dhclient.conf.html man-obsolete obsolete
./usr/share/man/html5/dhclient.leases.html man-obsolete obsolete
-./usr/share/man/html5/dhcp-eval.html man-dhcpd-htmlman dhcpd,html
-./usr/share/man/html5/dhcp-options.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html5/dhcp-eval.html man-dhcpd-htmlman html
+./usr/share/man/html5/dhcp-options.html man-dhcpd-htmlman html
./usr/share/man/html5/dhcpcd.conf.html man-dhcpcd-htmlman html
-./usr/share/man/html5/dhcpd.conf.html man-dhcpd-htmlman dhcpd,html
-./usr/share/man/html5/dhcpd.leases.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html5/dhcpd.conf.html man-dhcpd-htmlman html
+./usr/share/man/html5/dhcpd.leases.html man-dhcpd-htmlman html
./usr/share/man/html5/dir.html man-obsolete obsolete
./usr/share/man/html5/dirent.html man-obsolete obsolete
./usr/share/man/html5/disklabel.html man-sys-htmlman html
@@ -5446,8 +5446,8 @@
./usr/share/man/html5/npf.conf.html man-npf-htmlman html,npf
./usr/share/man/html5/nsd.conf.html man-nsd-htmlman html,nsd
./usr/share/man/html5/nsswitch.conf.html man-net-htmlman html
-./usr/share/man/html5/ntp.conf.html man-ntp-htmlman ntp,html
-./usr/share/man/html5/ntp.keys.html man-ntp-htmlman ntp,html
+./usr/share/man/html5/ntp.conf.html man-ntp-htmlman html
+./usr/share/man/html5/ntp.keys.html man-ntp-htmlman html
./usr/share/man/html5/openssl.cnf.html man-crypto-htmlman html
./usr/share/man/html5/pam.conf.html man-sys-htmlman pam,html
./usr/share/man/html5/passwd.conf.html man-sys-htmlman html
@@ -5633,7 +5633,7 @@
./usr/share/man/html8/catman.html man-man-htmlman html
./usr/share/man/html8/ccdconfig.html man-sysutil-htmlman html
./usr/share/man/html8/cgdconfig.html man-sysutil-htmlman html
-./usr/share/man/html8/chat.html man-ppp-htmlman ppp,html
+./usr/share/man/html8/chat.html man-ppp-htmlman html
./usr/share/man/html8/chown.html man-sysutil-htmlman html
./usr/share/man/html8/chroot.html man-sysutil-htmlman html
./usr/share/man/html8/chrtbl.html man-obsolete obsolete
@@ -5672,8 +5672,8 @@
./usr/share/man/html8/dhclient.html man-obsolete obsolete
./usr/share/man/html8/dhcpcd-run-hooks.html man-dhcpcd-htmlman html
./usr/share/man/html8/dhcpcd.html man-dhcpcd-htmlman html
-./usr/share/man/html8/dhcpd.html man-dhcpd-htmlman dhcpd,html
-./usr/share/man/html8/dhcrelay.html man-dhcpd-htmlman dhcpd,html
+./usr/share/man/html8/dhcpd.html man-dhcpd-htmlman html
+./usr/share/man/html8/dhcrelay.html man-dhcpd-htmlman html
./usr/share/man/html8/discard.html man-postfix-htmlman postfix,html
./usr/share/man/html8/disklabel.html man-sysutil-htmlman html
./usr/share/man/html8/diskless.html man-sysutil-htmlman html
@@ -5695,9 +5695,9 @@
./usr/share/man/html8/dreamcast/boot.html man-sysutil-htmlman html
./usr/share/man/html8/drvctl.html man-sysutil-htmlman html
./usr/share/man/html8/dump.html man-sysutil-htmlman html
-./usr/share/man/html8/dump_lfs.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/dump_lfs.html man-sysutil-htmlman html
./usr/share/man/html8/dumpfs.html man-sysutil-htmlman html
-./usr/share/man/html8/dumplfs.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/dumplfs.html man-sysutil-htmlman html
./usr/share/man/html8/edquota.html man-sysutil-htmlman html
./usr/share/man/html8/eeprom.html man-sysutil-htmlman html
./usr/share/man/html8/emips/boot.html man-sys-htmlman html
@@ -5715,14 +5715,14 @@
./usr/share/man/html8/fasthalt.html man-sysutil-htmlman html
./usr/share/man/html8/fdiscard.html man-sysutil-htmlman html
./usr/share/man/html8/fdisk.html man-sysutil-htmlman html
-./usr/share/man/html8/fingerd.html man-sysutil-htmlman finger,html
+./usr/share/man/html8/fingerd.html man-sysutil-htmlman html
./usr/share/man/html8/fixmount.html man-sysutil-htmlman html
./usr/share/man/html8/flashctl.html man-sysutil-htmlman html
./usr/share/man/html8/flush.html man-postfix-htmlman postfix,html
./usr/share/man/html8/fsck.html man-sysutil-htmlman html
./usr/share/man/html8/fsck_ext2fs.html man-ext2fs-htmlman html
./usr/share/man/html8/fsck_ffs.html man-sysutil-htmlman html
-./usr/share/man/html8/fsck_lfs.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/fsck_lfs.html man-sysutil-htmlman html
./usr/share/man/html8/fsck_msdos.html man-sysutil-htmlman html
./usr/share/man/html8/fsck_udf.html man-sysutil-htmlman html
./usr/share/man/html8/fsck_v7fs.html man-sysutil-htmlman html
@@ -5828,7 +5828,7 @@
./usr/share/man/html8/lastlogin.html man-sysutil-htmlman html
./usr/share/man/html8/ldconfig.html man-sysutil-htmlman html
./usr/share/man/html8/ldpd.html man-router-htmlman html
-./usr/share/man/html8/lfs_cleanerd.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/lfs_cleanerd.html man-sysutil-htmlman html
./usr/share/man/html8/link.html man-sysutil-htmlman html
./usr/share/man/html8/lmcconfig.html man-obsolete obsolete
./usr/share/man/html8/lmtp.html man-postfix-htmlman postfix,html
@@ -5869,7 +5869,7 @@
./usr/share/man/html8/makekey.html man-crypto-htmlman html
./usr/share/man/html8/makemandb.html man-man-htmlman makemandb,html
./usr/share/man/html8/makewhatis.html man-man-htmlman !makemandb,html
-./usr/share/man/html8/map-mbone.html man-netutil-htmlman mrouting,html
+./usr/share/man/html8/map-mbone.html man-netutil-htmlman html
./usr/share/man/html8/master.html man-postfix-htmlman postfix,html
./usr/share/man/html8/mbrlabel.html man-sysutil-htmlman html
./usr/share/man/html8/mdconfig.html man-sysutil-htmlman html
@@ -5900,7 +5900,7 @@
./usr/share/man/html8/mount_filecore.html man-filecorefs-htmlman html
./usr/share/man/html8/mount_hfs.html man-hfs-htmlman html
./usr/share/man/html8/mount_kernfs.html man-sysutil-htmlman html
-./usr/share/man/html8/mount_lfs.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/mount_lfs.html man-sysutil-htmlman html
./usr/share/man/html8/mount_mfs.html man-sysutil-htmlman html
./usr/share/man/html8/mount_msdos.html man-sysutil-htmlman html
./usr/share/man/html8/mount_nfs.html man-nfsclient-htmlman html
@@ -5925,11 +5925,11 @@
./usr/share/man/html8/mount_v7fs.html man-sysutil-htmlman html
./usr/share/man/html8/mount_zfs.html man-sysutil-htmlman zfs,html
./usr/share/man/html8/mountd.html man-nfsserver-htmlman html
-./usr/share/man/html8/moused.html man-sysutil-htmlman moused,html
-./usr/share/man/html8/mrinfo.html man-netutil-htmlman mrouting,html
-./usr/share/man/html8/mrouted.html man-router-htmlman mrouting,html
+./usr/share/man/html8/moused.html man-sysutil-htmlman html
+./usr/share/man/html8/mrinfo.html man-netutil-htmlman html
+./usr/share/man/html8/mrouted.html man-router-htmlman html
./usr/share/man/html8/mscdlabel.html man-sysutil-htmlman html
-./usr/share/man/html8/mtrace.html man-netutil-htmlman mrouting,html
+./usr/share/man/html8/mtrace.html man-netutil-htmlman html
./usr/share/man/html8/mtree.html man-sysutil-htmlman html
./usr/share/man/html8/mvme68k/boot.html man-sys-htmlman html
./usr/share/man/html8/mvme68k/installboot.html man-sysutil-htmlman html
@@ -5947,7 +5947,7 @@
./usr/share/man/html8/newbtconf.html man-sysutil-htmlman html
./usr/share/man/html8/newfs.html man-sysutil-htmlman html
./usr/share/man/html8/newfs_ext2fs.html man-sysutil-htmlman html
-./usr/share/man/html8/newfs_lfs.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/newfs_lfs.html man-sysutil-htmlman html
./usr/share/man/html8/newfs_msdos.html man-sysutil-htmlman html
./usr/share/man/html8/newfs_sysvbfs.html man-sysutil-htmlman html
./usr/share/man/html8/newfs_udf.html man-sysutil-htmlman html
@@ -5967,14 +5967,14 @@
./usr/share/man/html8/nsec3hash.html man-bind-htmlman html
./usr/share/man/html8/nslookup.html man-netutil-htmlman html
./usr/share/man/html8/nsupdate.html man-obsolete obsolete
-./usr/share/man/html8/ntalkd.html man-netutil-htmlman talk,html
-./usr/share/man/html8/ntp-keygen.html man-ntp-htmlman ntp,html
-./usr/share/man/html8/ntpd.html man-ntp-htmlman ntp,html
-./usr/share/man/html8/ntpdate.html man-ntp-htmlman ntp,html
-./usr/share/man/html8/ntpdc.html man-ntp-htmlman ntp,html
-./usr/share/man/html8/ntpq.html man-ntp-htmlman ntp,html
-./usr/share/man/html8/ntptime.html man-ntp-htmlman ntp,html
-./usr/share/man/html8/ntptrace.html man-ntp-htmlman ntp,html
+./usr/share/man/html8/ntalkd.html man-netutil-htmlman html
+./usr/share/man/html8/ntp-keygen.html man-ntp-htmlman html
+./usr/share/man/html8/ntpd.html man-ntp-htmlman html
+./usr/share/man/html8/ntpdate.html man-ntp-htmlman html
+./usr/share/man/html8/ntpdc.html man-ntp-htmlman html
+./usr/share/man/html8/ntpq.html man-ntp-htmlman html
+./usr/share/man/html8/ntptime.html man-ntp-htmlman html
+./usr/share/man/html8/ntptrace.html man-ntp-htmlman html
./usr/share/man/html8/nvmectl.html man-sysutil-htmlman html
./usr/share/man/html8/nvmmctl.html man-sysutil-htmlman html
./usr/share/man/html8/ofctl.html man-sysutil-htmlman html
@@ -6023,10 +6023,10 @@
./usr/share/man/html8/postscreen.html man-postfix-htmlman postfix,html
./usr/share/man/html8/powerd.html man-sysutil-htmlman html
./usr/share/man/html8/poweroff.html man-sysutil-htmlman html
-./usr/share/man/html8/pppd.html man-ppp-htmlman ppp,html
-./usr/share/man/html8/pppdump.html man-ppp-htmlman ppp,html
+./usr/share/man/html8/pppd.html man-ppp-htmlman html
+./usr/share/man/html8/pppdump.html man-ppp-htmlman html
./usr/share/man/html8/pppoectl.html man-sysutil-htmlman html
-./usr/share/man/html8/pppstats.html man-ppp-htmlman ppp,html
+./usr/share/man/html8/pppstats.html man-ppp-htmlman html
./usr/share/man/html8/prep/boot.html man-sys-htmlman html
./usr/share/man/html8/prep/mkbootimage.html man-sys-htmlman html
./usr/share/man/html8/proxymap.html man-postfix-htmlman postfix,html
@@ -6066,13 +6066,13 @@
./usr/share/man/html8/rdate.html man-netutil-htmlman html
./usr/share/man/html8/rdisc.html man-netutil-htmlman html
./usr/share/man/html8/rdump.html man-netutil-htmlman html
-./usr/share/man/html8/rdump_lfs.html man-netutil-htmlman lfs,html
+./usr/share/man/html8/rdump_lfs.html man-netutil-htmlman html
./usr/share/man/html8/reboot.html man-sysutil-htmlman html
./usr/share/man/html8/renice.html man-sysutil-htmlman html
./usr/share/man/html8/repquota.html man-sysutil-htmlman html
./usr/share/man/html8/rescue.html man-sysutil-htmlman html
./usr/share/man/html8/resize_ffs.html man-sysutil-htmlman html
-./usr/share/man/html8/resize_lfs.html man-sysutil-htmlman lfs,html
+./usr/share/man/html8/resize_lfs.html man-sysutil-htmlman html
./usr/share/man/html8/resolvconf.html man-resolvconf-htmlman html
./usr/share/man/html8/restore.html man-sysutil-htmlman html
./usr/share/man/html8/revnetgroup.html man-nis-htmlman yp,html
@@ -6113,7 +6113,7 @@
./usr/share/man/html8/rump_ext2fs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_ffs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_hfs.html man-puffs-htmlman html,rump
-./usr/share/man/html8/rump_lfs.html man-puffs-htmlman lfs,html,rump
+./usr/share/man/html8/rump_lfs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_msdos.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_nfs.html man-puffs-htmlman html,rump
./usr/share/man/html8/rump_ntfs.html man-puffs-htmlman html,rump
@@ -6150,7 +6150,7 @@
./usr/share/man/html8/shutdown.html man-sysutil-htmlman html
./usr/share/man/html8/slattach.html man-slip-htmlman html
./usr/share/man/html8/sliplogin.html man-slip-htmlman html
-./usr/share/man/html8/slstats.html man-slip-htmlman ppp,html
+./usr/share/man/html8/slstats.html man-slip-htmlman html
./usr/share/man/html8/smtp.html man-postfix-htmlman postfix,html
./usr/share/man/html8/smtpd.html man-postfix-htmlman postfix,html
./usr/share/man/html8/sparc/binstall.html man-sysutil-htmlman html
@@ -6183,17 +6183,17 @@
./usr/share/man/html8/sysctl.html man-sysutil-htmlman html
./usr/share/man/html8/sysinst.html man-sysutil-man html
./usr/share/man/html8/syslogd.html man-sysutil-htmlman html
-./usr/share/man/html8/talkd.html man-netutil-htmlman talk,html
+./usr/share/man/html8/talkd.html man-netutil-htmlman html
./usr/share/man/html8/tbrconfig.html man-router-htmlman html
./usr/share/man/html8/tcpdchk.html man-netutil-htmlman html
./usr/share/man/html8/tcpdmatch.html man-netutil-htmlman html
./usr/share/man/html8/tcpdrop.html man-netutil-htmlman html
-./usr/share/man/html8/tcpdump.html man-netutil-htmlman tcpdump,html
+./usr/share/man/html8/tcpdump.html man-netutil-htmlman html
./usr/share/man/html8/telnetd.html man-netutil-htmlman html
./usr/share/man/html8/tftp-proxy.html man-pf-htmlman pf,html
./usr/share/man/html8/tftpd.html man-netutil-htmlman html
-./usr/share/man/html8/timed.html man-timed-htmlman timed,html
-./usr/share/man/html8/timedc.html man-timed-htmlman timed,html
+./usr/share/man/html8/timed.html man-timed-htmlman html
+./usr/share/man/html8/timedc.html man-timed-htmlman html
./usr/share/man/html8/tlsmgr.html man-postfix-htmlman postfix,html
./usr/share/man/html8/tlsproxy.html man-postfix-htmlman postfix,html
./usr/share/man/html8/tpctl.html man-sysutil-htmlman html
@@ -6458,7 +6458,7 @@
./usr/share/man/man1/file.1 man-util-man .man
./usr/share/man/man1/fincore.1 man-util-man .man
./usr/share/man/man1/find.1 man-util-man .man
-./usr/share/man/man1/finger.1 man-util-man finger,.man
+./usr/share/man/man1/finger.1 man-util-man .man
./usr/share/man/man1/flock.1 man-util-man .man
./usr/share/man/man1/fmt.1 man-util-man .man
./usr/share/man/man1/fold.1 man-util-man .man
@@ -6660,7 +6660,7 @@
./usr/share/man/man1/nvi.1 man-obsolete obsolete
./usr/share/man/man1/nview.1 man-obsolete obsolete
./usr/share/man/man1/od.1 man-util-man .man
-./usr/share/man/man1/omshell.1 man-dhcpd-man dhcpd,.man
+./usr/share/man/man1/omshell.1 man-dhcpd-man .man
./usr/share/man/man1/openpgp.1 man-obsolete obsolete
./usr/share/man/man1/openssl.1 man-crypto-man .man
./usr/share/man/man1/openssl_CA.pl.1 man-crypto-man .man
@@ -6829,7 +6829,7 @@
./usr/share/man/man1/sleep.1 man-util-man .man
./usr/share/man/man1/slogin.1 man-secsh-man .man
./usr/share/man/man1/smbutil.1 man-obsolete obsolete
-./usr/share/man/man1/sntp.1 man-ntp-man ntp,.man
+./usr/share/man/man1/sntp.1 man-ntp-man .man
./usr/share/man/man1/sockstat.1 man-util-man .man
./usr/share/man/man1/sort.1 man-util-man .man
./usr/share/man/man1/sortinfo.1 man-texinfo-man .man
@@ -6858,7 +6858,7 @@
./usr/share/man/man1/tabs.1 man-util-man .man
./usr/share/man/man1/tac.1 man-util-man .man
./usr/share/man/man1/tail.1 man-util-man .man
-./usr/share/man/man1/talk.1 man-netutil-man talk,.man
+./usr/share/man/man1/talk.1 man-netutil-man .man
./usr/share/man/man1/tar.1 man-util-man .man
./usr/share/man/man1/tcopy.1 man-util-man .man
./usr/share/man/man1/tee.1 man-util-man .man
@@ -8459,11 +8459,11 @@
./usr/share/man/man5/daily.conf.5 man-sys-man .man
./usr/share/man/man5/dhclient.conf.5 man-obsolete obsolete
./usr/share/man/man5/dhclient.leases.5 man-obsolete obsolete
-./usr/share/man/man5/dhcp-eval.5 man-dhcpd-man dhcpd,.man
-./usr/share/man/man5/dhcp-options.5 man-dhcpd-man dhcpd,.man
+./usr/share/man/man5/dhcp-eval.5 man-dhcpd-man .man
+./usr/share/man/man5/dhcp-options.5 man-dhcpd-man .man
./usr/share/man/man5/dhcpcd.conf.5 man-dhcpcd-man .man
-./usr/share/man/man5/dhcpd.conf.5 man-dhcpd-man dhcpd,.man
-./usr/share/man/man5/dhcpd.leases.5 man-dhcpd-man dhcpd,.man
+./usr/share/man/man5/dhcpd.conf.5 man-dhcpd-man .man
+./usr/share/man/man5/dhcpd.leases.5 man-dhcpd-man .man
./usr/share/man/man5/dir.5 man-obsolete obsolete
./usr/share/man/man5/dirent.5 man-obsolete obsolete
./usr/share/man/man5/disklabel.5 man-sys-man .man
@@ -8563,8 +8563,8 @@
./usr/share/man/man5/npf.conf.5 man-npf-man .man,npf
./usr/share/man/man5/nsd.conf.5 man-nsd-man .man,nsd
./usr/share/man/man5/nsswitch.conf.5 man-net-man .man
-./usr/share/man/man5/ntp.conf.5 man-ntp-man ntp,.man
-./usr/share/man/man5/ntp.keys.5 man-ntp-man ntp,.man
+./usr/share/man/man5/ntp.conf.5 man-ntp-man .man
+./usr/share/man/man5/ntp.keys.5 man-ntp-man .man
./usr/share/man/man5/openssl.cnf.5 man-crypto-man .man
./usr/share/man/man5/pam.conf.5 man-sys-man pam,.man
./usr/share/man/man5/passwd.5 man-sys-man .man
@@ -8799,7 +8799,7 @@
./usr/share/man/man8/cesfic/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/cesfic/makedev.8 man-obsolete obsolete
./usr/share/man/man8/cgdconfig.8 man-sysutil-man .man
-./usr/share/man/man8/chat.8 man-ppp-man ppp,.man
+./usr/share/man/man8/chat.8 man-ppp-man .man
./usr/share/man/man8/chown.8 man-sysutil-man .man
./usr/share/man/man8/chroot.8 man-sysutil-man .man
./usr/share/man/man8/chrtbl.8 man-obsolete obsolete
@@ -8841,8 +8841,8 @@
./usr/share/man/man8/dhclient.8 man-obsolete obsolete
./usr/share/man/man8/dhcpcd-run-hooks.8 man-dhcpcd-man .man
./usr/share/man/man8/dhcpcd.8 man-dhcpcd-man .man
-./usr/share/man/man8/dhcpd.8 man-dhcpd-man dhcpd,.man
-./usr/share/man/man8/dhcrelay.8 man-dhcpd-man dhcpd,.man
+./usr/share/man/man8/dhcpd.8 man-dhcpd-man .man
+./usr/share/man/man8/dhcrelay.8 man-dhcpd-man .man
./usr/share/man/man8/discard.8 man-postfix-man postfix,.man
./usr/share/man/man8/disklabel.8 man-sysutil-man .man
./usr/share/man/man8/diskless.8 man-sysutil-man .man
@@ -8868,9 +8868,9 @@
./usr/share/man/man8/dreamcast/makedev.8 man-obsolete obsolete
./usr/share/man/man8/drvctl.8 man-sysutil-man .man
./usr/share/man/man8/dump.8 man-sysutil-man .man
-./usr/share/man/man8/dump_lfs.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/dump_lfs.8 man-sysutil-man .man
./usr/share/man/man8/dumpfs.8 man-sysutil-man .man
-./usr/share/man/man8/dumplfs.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/dumplfs.8 man-sysutil-man .man
./usr/share/man/man8/editmap.8 man-obsolete obsolete
./usr/share/man/man8/edquota.8 man-sysutil-man .man
./usr/share/man/man8/eeprom.8 man-sysutil-man .man
@@ -8902,14 +8902,14 @@
./usr/share/man/man8/fasthalt.8 man-sysutil-man .man
./usr/share/man/man8/fdiscard.8 man-sysutil-man .man
./usr/share/man/man8/fdisk.8 man-sysutil-man .man
-./usr/share/man/man8/fingerd.8 man-sysutil-man finger,.man
+./usr/share/man/man8/fingerd.8 man-sysutil-man .man
./usr/share/man/man8/fixmount.8 man-sysutil-man .man
./usr/share/man/man8/flashctl.8 man-sysutil-man .man
./usr/share/man/man8/flush.8 man-postfix-man postfix,.man
./usr/share/man/man8/fsck.8 man-sysutil-man .man
./usr/share/man/man8/fsck_ext2fs.8 man-ext2fs-man .man
./usr/share/man/man8/fsck_ffs.8 man-sysutil-man .man
-./usr/share/man/man8/fsck_lfs.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/fsck_lfs.8 man-sysutil-man .man
./usr/share/man/man8/fsck_msdos.8 man-sysutil-man .man
./usr/share/man/man8/fsck_udf.8 man-sysutil-man .man
./usr/share/man/man8/fsck_v7fs.8 man-sysutil-man .man
@@ -9047,7 +9047,7 @@
./usr/share/man/man8/lastlogin.8 man-sysutil-man .man
./usr/share/man/man8/ldconfig.8 man-sysutil-man .man
./usr/share/man/man8/ldpd.8 man-router-man .man
-./usr/share/man/man8/lfs_cleanerd.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/lfs_cleanerd.8 man-sysutil-man .man
./usr/share/man/man8/link.8 man-sysutil-man .man
./usr/share/man/man8/lmcconfig.8 man-obsolete obsolete
./usr/share/man/man8/lmcctl.8 man-obsolete obsolete
@@ -9097,7 +9097,7 @@
./usr/share/man/man8/makemandb.8 man-man-man makemandb,.man
./usr/share/man/man8/makemap.8 man-obsolete obsolete
./usr/share/man/man8/makewhatis.8 man-man-man !makemandb,.man
-./usr/share/man/man8/map-mbone.8 man-netutil-man mrouting,.man
+./usr/share/man/man8/map-mbone.8 man-netutil-man .man
./usr/share/man/man8/master.8 man-postfix-man postfix,.man
./usr/share/man/man8/mbr.8 man-obsolete obsolete
./usr/share/man/man8/mbrlabel.8 man-sysutil-man .man
@@ -9134,7 +9134,7 @@
./usr/share/man/man8/mount_hfs.8 man-hfs-man .man
./usr/share/man/man8/mount_hfsp.8 man-obsolete obsolete
./usr/share/man/man8/mount_kernfs.8 man-sysutil-man .man
-./usr/share/man/man8/mount_lfs.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/mount_lfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_mfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_msdos.8 man-sysutil-man .man
./usr/share/man/man8/mount_nfs.8 man-nfsclient-man .man
@@ -9159,11 +9159,11 @@
./usr/share/man/man8/mount_v7fs.8 man-sysutil-man .man
./usr/share/man/man8/mount_zfs.8 man-sysutil-man zfs,.man
./usr/share/man/man8/mountd.8 man-nfsserver-man .man
-./usr/share/man/man8/moused.8 man-sysutil-man moused,.man
-./usr/share/man/man8/mrinfo.8 man-netutil-man mrouting,.man
-./usr/share/man/man8/mrouted.8 man-router-man mrouting,.man
+./usr/share/man/man8/moused.8 man-sysutil-man .man
+./usr/share/man/man8/mrinfo.8 man-netutil-man .man
+./usr/share/man/man8/mrouted.8 man-router-man .man
./usr/share/man/man8/mscdlabel.8 man-sysutil-man .man
-./usr/share/man/man8/mtrace.8 man-netutil-man mrouting,.man
+./usr/share/man/man8/mtrace.8 man-netutil-man .man
./usr/share/man/man8/mtrace6.8 man-obsolete obsolete
./usr/share/man/man8/mtree.8 man-sysutil-man .man
./usr/share/man/man8/mvme68k/MAKEDEV.8 man-obsolete obsolete
@@ -9193,7 +9193,7 @@
./usr/share/man/man8/newbtconf.8 man-sysutil-man .man
./usr/share/man/man8/newfs.8 man-sysutil-man .man
./usr/share/man/man8/newfs_ext2fs.8 man-sysutil-man .man
-./usr/share/man/man8/newfs_lfs.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/newfs_lfs.8 man-sysutil-man .man
./usr/share/man/man8/newfs_msdos.8 man-sysutil-man .man
./usr/share/man/man8/newfs_sysvbfs.8 man-sysutil-man .man
./usr/share/man/man8/newfs_udf.8 man-sysutil-man .man
@@ -9222,14 +9222,14 @@
./usr/share/man/man8/nsec3hash.8 man-bind-man .man
./usr/share/man/man8/nslookup.8 man-netutil-man .man
./usr/share/man/man8/nsupdate.8 man-obsolete obsolete
-./usr/share/man/man8/ntalkd.8 man-netutil-man talk,.man
-./usr/share/man/man8/ntp-keygen.8 man-ntp-man ntp,.man
-./usr/share/man/man8/ntpd.8 man-ntp-man ntp,.man
-./usr/share/man/man8/ntpdate.8 man-ntp-man ntp,.man
-./usr/share/man/man8/ntpdc.8 man-ntp-man ntp,.man
-./usr/share/man/man8/ntpq.8 man-ntp-man ntp,.man
-./usr/share/man/man8/ntptime.8 man-ntp-man ntp,.man
-./usr/share/man/man8/ntptrace.8 man-ntp-man ntp,.man
+./usr/share/man/man8/ntalkd.8 man-netutil-man .man
+./usr/share/man/man8/ntp-keygen.8 man-ntp-man .man
+./usr/share/man/man8/ntpd.8 man-ntp-man .man
+./usr/share/man/man8/ntpdate.8 man-ntp-man .man
+./usr/share/man/man8/ntpdc.8 man-ntp-man .man
+./usr/share/man/man8/ntpq.8 man-ntp-man .man
+./usr/share/man/man8/ntptime.8 man-ntp-man .man
+./usr/share/man/man8/ntptrace.8 man-ntp-man .man
./usr/share/man/man8/nvmectl.8 man-sysutil-man .man
./usr/share/man/man8/nvmmctl.8 man-sysutil-man .man
./usr/share/man/man8/ofctl.8 man-sysutil-man .man
@@ -9298,11 +9298,11 @@
./usr/share/man/man8/postscreen.8 man-postfix-man postfix,.man
./usr/share/man/man8/powerd.8 man-sysutil-man .man
./usr/share/man/man8/poweroff.8 man-sysutil-man .man
-./usr/share/man/man8/pppd.8 man-ppp-man ppp,.man
+./usr/share/man/man8/pppd.8 man-ppp-man .man
./usr/share/man/man8/pppd.cbcp.8 man-obsolete obsolete
-./usr/share/man/man8/pppdump.8 man-ppp-man ppp,.man
+./usr/share/man/man8/pppdump.8 man-ppp-man .man
./usr/share/man/man8/pppoectl.8 man-sysutil-man .man
-./usr/share/man/man8/pppstats.8 man-ppp-man ppp,.man
+./usr/share/man/man8/pppstats.8 man-ppp-man .man
./usr/share/man/man8/praliases.8 man-obsolete obsolete
./usr/share/man/man8/prep/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/prep/boot.8 man-sys-man .man
@@ -9347,13 +9347,13 @@
./usr/share/man/man8/rdconfig.8 man-obsolete obsolete
./usr/share/man/man8/rdisc.8 man-netutil-man .man
./usr/share/man/man8/rdump.8 man-netutil-man .man
-./usr/share/man/man8/rdump_lfs.8 man-netutil-man lfs,.man
+./usr/share/man/man8/rdump_lfs.8 man-netutil-man .man
./usr/share/man/man8/reboot.8 man-sysutil-man .man
./usr/share/man/man8/renice.8 man-sysutil-man .man
./usr/share/man/man8/repquota.8 man-sysutil-man .man
./usr/share/man/man8/rescue.8 man-sysutil-man .man
./usr/share/man/man8/resize_ffs.8 man-sysutil-man .man
-./usr/share/man/man8/resize_lfs.8 man-sysutil-man lfs,.man
+./usr/share/man/man8/resize_lfs.8 man-sysutil-man .man
./usr/share/man/man8/resolvconf.8 man-resolvconf-man .man
./usr/share/man/man8/restore.8 man-sysutil-man .man
./usr/share/man/man8/revnetgroup.8 man-nis-man yp,.man
@@ -9395,7 +9395,7 @@
./usr/share/man/man8/rump_ext2fs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_ffs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_hfs.8 man-puffs-man .man,rump
-./usr/share/man/man8/rump_lfs.8 man-puffs-man lfs,.man,rump
+./usr/share/man/man8/rump_lfs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_msdos.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_nfs.8 man-puffs-man .man,rump
./usr/share/man/man8/rump_ntfs.8 man-puffs-man .man,rump
@@ -9442,7 +9442,7 @@
./usr/share/man/man8/slattach.8 man-slip-man .man
./usr/share/man/man8/slip.8 man-obsolete obsolete
./usr/share/man/man8/sliplogin.8 man-slip-man .man
-./usr/share/man/man8/slstats.8 man-slip-man ppp,.man
+./usr/share/man/man8/slstats.8 man-slip-man .man
./usr/share/man/man8/smrsh.8 man-obsolete obsolete
./usr/share/man/man8/smtp.8 man-postfix-man postfix,.man
./usr/share/man/man8/smtpd.8 man-postfix-man postfix,.man
@@ -9497,17 +9497,17 @@
./usr/share/man/man8/sysctl.8 man-sysutil-man .man
./usr/share/man/man8/sysinst.8 man-sysutil-man .man
./usr/share/man/man8/syslogd.8 man-sysutil-man .man
-./usr/share/man/man8/talkd.8 man-netutil-man talk,.man
+./usr/share/man/man8/talkd.8 man-netutil-man .man
./usr/share/man/man8/tbrconfig.8 man-router-man .man
./usr/share/man/man8/tcpdchk.8 man-netutil-man .man
./usr/share/man/man8/tcpdmatch.8 man-netutil-man .man
./usr/share/man/man8/tcpdrop.8 man-netutil-man .man
-./usr/share/man/man8/tcpdump.8 man-netutil-man tcpdump,.man
+./usr/share/man/man8/tcpdump.8 man-netutil-man .man
./usr/share/man/man8/telnetd.8 man-netutil-man .man
./usr/share/man/man8/tftp-proxy.8 man-pf-man pf,.man
./usr/share/man/man8/tftpd.8 man-netutil-man .man
-./usr/share/man/man8/timed.8 man-timed-man timed,.man
-./usr/share/man/man8/timedc.8 man-timed-man timed,.man
+./usr/share/man/man8/timed.8 man-timed-man .man
+./usr/share/man/man8/timedc.8 man-timed-man .man
./usr/share/man/man8/tlsmgr.8 man-postfix-man postfix,.man
./usr/share/man/man8/tlsproxy.8 man-postfix-man postfix,.man
./usr/share/man/man8/tpctl.8 man-sysutil-man .man
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.222 src/distrib/sets/lists/misc/mi:1.223
--- src/distrib/sets/lists/misc/mi:1.222 Sun May 29 15:23:20 2022
+++ src/distrib/sets/lists/misc/mi Mon Jun 6 10:56:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.222 2022/05/29 15:23:20 nia Exp $
+# $NetBSD: mi,v 1.223 2022/06/06 10:56:27 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -749,33 +749,33 @@
./usr/share/doc/reference/ref3/sysman/sysman7.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref3/sysman/sysman8.png misc-psd-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref3/sysman/sysman9.png misc-psd-doc doc,html,groffhtmldoc
-./usr/share/doc/reference/ref5/timed/timed.html misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed.ps.gz misc-smm-doc doc,groff,timed
-./usr/share/doc/reference/ref5/timed/timed.txt misc-smm-doc doc,groff,timed
-./usr/share/doc/reference/ref5/timed/timed1.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed10.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed11.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed12.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed13.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed14.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed15.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed16.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed17.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed18.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed19.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed2.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed20.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed21.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed22.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed23.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed24.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed3.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed4.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed5.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed6.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed7.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed8.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref5/timed/timed9.png misc-smm-doc doc,html,groffhtmldoc,timed
+./usr/share/doc/reference/ref5/timed/timed.html misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref5/timed/timed.txt misc-smm-doc doc,groff
+./usr/share/doc/reference/ref5/timed/timed1.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed10.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed11.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed12.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed13.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed14.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed15.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed16.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed17.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed18.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed19.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed2.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed20.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed21.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed22.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed23.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed24.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed3.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed4.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed5.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed6.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed7.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed8.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref5/timed/timed9.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref7/quotas/quotas.html misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref7/quotas/quotas.ps.gz misc-smm-doc doc,groff
./usr/share/doc/reference/ref7/quotas/quotas.txt misc-smm-doc doc,groff
@@ -796,109 +796,109 @@
./usr/share/doc/reference/ref8/lpd/lpd2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/lpd/lpd3.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref8/ntp misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/accopt.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/assoc.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/audio.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/authopt.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/bugs.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/build.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/clockopt.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/comdex.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/config.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/confopt.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/copyright.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/debug.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/decode.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/accopt.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/assoc.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/audio.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/authopt.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/bugs.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/build.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/clockopt.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/comdex.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/config.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/confopt.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/copyright.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/debug.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/decode.html misc-ntp-htmldoc doc
./usr/share/doc/reference/ref8/ntp/drivers misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/drivers/driver1.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver10.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver11.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver12.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver16.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver18.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver19.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver20.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver22.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver26.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver27.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver28.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver29.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver3.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver30.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver31.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver32.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver33.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver34.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver35.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver36.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver37.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver38.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver39.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver4.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver40.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver42.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver43.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver44.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver5.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver6.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver7.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver8.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/driver9.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/mx4200data.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/oncore-shmem.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/driver1.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver10.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver11.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver12.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver16.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver18.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver19.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver20.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver22.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver26.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver27.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver28.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver29.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver3.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver30.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver31.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver32.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver33.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver34.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver35.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver36.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver37.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver38.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver39.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver4.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver40.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver42.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver43.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver44.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver5.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver6.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver7.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver8.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/driver9.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/mx4200data.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/oncore-shmem.html misc-ntp-htmldoc doc
./usr/share/doc/reference/ref8/ntp/drivers/scripts misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/drivers/scripts/footer.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/scripts/style.css misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/drivers/tf582_4.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/extern.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/hints.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/howto.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/index.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/kern.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/kernpps.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/keygen.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/miscopt.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/monopt.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/msyslog.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntp_conf.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntpd.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntpdate.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntpdc.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntpdsim.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntpdsim_new.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntpq.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntptime.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/ntptrace.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/parsedata.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/parsenew.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/pps.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/prefer.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/quick.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/rate.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/rdebug.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/refclock.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/release.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/drivers/scripts/footer.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/scripts/style.css misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/drivers/tf582_4.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/extern.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/hints.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/howto.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/index.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/kern.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/kernpps.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/keygen.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/miscopt.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/monopt.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/msyslog.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntp_conf.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntpd.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntpdate.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntpdc.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntpdsim.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntpdsim_new.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntpq.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntptime.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/ntptrace.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/parsedata.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/parsenew.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/pps.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/prefer.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/quick.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/rate.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/rdebug.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/refclock.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/release.html misc-ntp-htmldoc doc
./usr/share/doc/reference/ref8/ntp/scripts misc-ntp-htmldoc
-./usr/share/doc/reference/ref8/ntp/scripts/accopt.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/audio.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/authopt.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/clockopt.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/command.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/config.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/confopt.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/external.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/footer.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/install.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/manual.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/misc.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/miscopt.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/monopt.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/refclock.txt misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/scripts/style.css misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/sitemap.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/sntp.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/tickadj.html misc-ntp-htmldoc doc,ntp
-./usr/share/doc/reference/ref8/ntp/xleave.html misc-ntp-htmldoc doc,ntp
+./usr/share/doc/reference/ref8/ntp/scripts/accopt.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/audio.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/authopt.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/clockopt.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/command.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/config.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/confopt.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/external.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/footer.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/install.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/manual.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/misc.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/miscopt.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/monopt.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/refclock.txt misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/scripts/style.css misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/sitemap.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/sntp.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/tickadj.html misc-ntp-htmldoc doc
+./usr/share/doc/reference/ref8/ntp/xleave.html misc-ntp-htmldoc doc
./usr/share/doc/reference/ref8/postfix/ADDRESS_CLASS_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/ADDRESS_REWRITING_README.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/ADDRESS_VERIFICATION_README.html misc-postfix-htmldoc postfix,doc
@@ -1017,11 +1017,11 @@
./usr/share/doc/reference/ref8/postfix/verify.8.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/virtual.5.html misc-postfix-htmldoc postfix,doc
./usr/share/doc/reference/ref8/postfix/virtual.8.html misc-postfix-htmldoc postfix,doc
-./usr/share/doc/reference/ref8/timed/timed.html misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref8/timed/timed.ps.gz misc-smm-doc doc,groff,timed
-./usr/share/doc/reference/ref8/timed/timed.txt misc-smm-doc doc,groff,timed
-./usr/share/doc/reference/ref8/timed/timed1.png misc-smm-doc doc,html,groffhtmldoc,timed
-./usr/share/doc/reference/ref8/timed/timed2.png misc-smm-doc doc,html,groffhtmldoc,timed
+./usr/share/doc/reference/ref8/timed/timed.html misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref8/timed/timed.ps.gz misc-smm-doc doc,groff
+./usr/share/doc/reference/ref8/timed/timed.txt misc-smm-doc doc,groff
+./usr/share/doc/reference/ref8/timed/timed1.png misc-smm-doc doc,html,groffhtmldoc
+./usr/share/doc/reference/ref8/timed/timed2.png misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/net/net.html misc-smm-doc doc,html,groffhtmldoc
./usr/share/doc/reference/ref9/net/net.ps.gz misc-smm-doc doc,groff
./usr/share/doc/reference/ref9/net/net.txt misc-smm-doc doc,groff
@@ -1362,7 +1362,7 @@
./usr/share/examples/atf/atf-run.hooks misc-obsolete share,kyua,obsolete
./usr/share/examples/atf/tests-results.css misc-atf-examples share,atf,!kyua
./usr/share/examples/atf/tests-results.css misc-obsolete share,kyua,obsolete
-./usr/share/examples/dhcp/dhcpd.conf misc-dhcpd-examples share,dhcpd
+./usr/share/examples/dhcp/dhcpd.conf misc-dhcpd-examples share
./usr/share/examples/dhcpcd/hooks/10-wpa_supplicant misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/15-timezone misc-dhcpcd-examples share
./usr/share/examples/dhcpcd/hooks/29-lookup-hostname misc-dhcpcd-examples share
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1209 src/distrib/sets/lists/tests/mi:1.1210
--- src/distrib/sets/lists/tests/mi:1.1209 Tue May 31 13:42:59 2022
+++ src/distrib/sets/lists/tests/mi Mon Jun 6 10:56:28 2022
@@ -1,4 +1,5 @@
-# $NetBSD: mi,v 1.1209 2022/05/31 13:42:59 riastradh Exp $
+=======
+# $NetBSD: mi,v 1.1210 2022/06/06 10:56:28 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1507,10 +1508,10 @@
./usr/tests/fs/kernfs/Kyuafile tests-fs-tests atf,rump,kyua
./usr/tests/fs/kernfs/t_basic tests-fs-tests atf,rump
./usr/tests/fs/lfs tests-fs-tests compattestfile,atf
-./usr/tests/fs/lfs/Atffile tests-fs-tests atf,rump,lfs
-./usr/tests/fs/lfs/Kyuafile tests-fs-tests atf,rump,kyua,lfs
-./usr/tests/fs/lfs/t_pr tests-fs-tests atf,rump,lfs
-./usr/tests/fs/lfs/t_rfw tests-fs-tests atf,rump,lfs
+./usr/tests/fs/lfs/Atffile tests-fs-tests atf,rump
+./usr/tests/fs/lfs/Kyuafile tests-fs-tests atf,rump,kyua
+./usr/tests/fs/lfs/t_pr tests-fs-tests atf,rump
+./usr/tests/fs/lfs/t_rfw tests-fs-tests atf,rump
./usr/tests/fs/msdosfs tests-fs-tests compattestfile,atf
./usr/tests/fs/msdosfs/Atffile tests-fs-tests atf,rump
./usr/tests/fs/msdosfs/Kyuafile tests-fs-tests atf,rump,kyua
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.464 src/etc/Makefile:1.465
--- src/etc/Makefile:1.464 Mon May 30 15:06:55 2022
+++ src/etc/Makefile Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.464 2022/05/30 15:06:55 rin Exp $
+# $NetBSD: Makefile,v 1.465 2022/06/06 10:56:28 nia Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -105,20 +105,12 @@ BIN1+= auto_master bootptab changelist c
csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
ftpusers gettytab gpio.conf group hosts hosts.lpd inetd.conf \
locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
- named.conf netconfig networks newsyslog.conf \
- nsswitch.conf passwd.conf pkgpath.conf phones printcap \
+ mrouted.conf named.conf netconfig networks newsyslog.conf \
+ nsswitch.conf ntp.conf passwd.conf pkgpath.conf phones printcap \
profile protocols rbootd.conf rc rc.conf rc.local rc.subr \
rc.shutdown remote rpc security security.conf services shells \
shrc sysctl.conf syslog.conf weekly weekly.conf wscons.conf
-.if ${MKMROUTING} != "no"
-BIN1+= mrouted.conf
-.endif
-
-.if ${MKNTP} != "no"
-BIN1+= ntp.conf
-.endif
-
# Use machine-specific disktab if it exists, or the MI one otherwise
.if exists(etc.${MACHINE}/disktab)
BIN1+= etc.${MACHINE}/disktab
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.46 src/etc/mtree/Makefile:1.47
--- src/etc/mtree/Makefile:1.46 Wed May 25 20:44:01 2022
+++ src/etc/mtree/Makefile Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: Makefile,v 1.47 2022/06/06 10:56:28 nia Exp $
.include <bsd.own.mk>
@@ -57,10 +57,6 @@ EXTRA_DIST_FILES+= NetBSD.dist.tests.com
.endif
.endif
-.if ${MKDHCPD} != "no"
-EXTRA_DIST_FILES+= NetBSD.dist.dhcpd
-.endif
-
.if ${MKDTB} != "no"
EXTRA_DIST_FILES+= NetBSD.dist.dtb
.endif
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.244 src/etc/mtree/NetBSD.dist.base:1.245
--- src/etc/mtree/NetBSD.dist.base:1.244 Wed May 25 20:44:01 2022
+++ src/etc/mtree/NetBSD.dist.base Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.244 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: NetBSD.dist.base,v 1.245 2022/06/06 10:56:28 nia Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -395,6 +395,7 @@
./usr/share
./usr/share/atf
./usr/share/calendar
+./usr/share/dhcpd
./usr/share/dict
./usr/share/dict/papers
./usr/share/dict/special
@@ -468,6 +469,7 @@
./usr/share/examples/asm/hello
./usr/share/examples/atf
./usr/share/examples/blocklist
+./usr/share/examples/dhcp
./usr/share/examples/dhcpcd
./usr/share/examples/dhcpcd/hooks
./usr/share/examples/disktab
Index: src/etc/mtree/NetBSD.dist.dhcpd
diff -u src/etc/mtree/NetBSD.dist.dhcpd:1.1 src/etc/mtree/NetBSD.dist.dhcpd:1.2
--- src/etc/mtree/NetBSD.dist.dhcpd:1.1 Wed May 25 20:44:01 2022
+++ src/etc/mtree/NetBSD.dist.dhcpd Mon Jun 6 10:56:28 2022
@@ -1,3 +0,0 @@
-# $NetBSD: NetBSD.dist.dhcpd,v 1.1 2022/05/25 20:44:01 nia Exp $
-./usr/share/dhcpd
-./usr/share/examples/dhcp
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.174 src/etc/mtree/special:1.175
--- src/etc/mtree/special:1.174 Wed May 25 20:44:01 2022
+++ src/etc/mtree/special Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.174 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: special,v 1.175 2022/06/06 10:56:28 nia Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -116,7 +116,7 @@
./etc/monthly type=file mode=0644
./etc/monthly.conf type=file mode=0644
./etc/monthly.local type=file mode=0644 optional
-./etc/mrouted.conf type=file mode=0644 optional
+./etc/mrouted.conf type=file mode=0644
./etc/mtree type=dir mode=0755
./etc/mtree/special type=file mode=0444
./etc/mtree/special.local type=file mode=0644 optional
@@ -207,8 +207,8 @@
./etc/rc.d/cron type=file mode=0555
./etc/rc.d/devpubd type=file mode=0555
./etc/rc.d/dhcpcd type=file mode=0555
-./etc/rc.d/dhcpd type=file mode=0555 optional
-./etc/rc.d/dhcpd6 type=file mode=0555 optional
+./etc/rc.d/dhcpd type=file mode=0555
+./etc/rc.d/dhcpd6 type=file mode=0555
./etc/rc.d/dhcrelay type=file mode=0555
./etc/rc.d/dmesg type=file mode=0555
./etc/rc.d/downinterfaces type=file mode=0555
@@ -249,7 +249,7 @@
./etc/rc.d/mountcritremote type=file mode=0555
./etc/rc.d/mountd type=file mode=0555
./etc/rc.d/moused type=file mode=0555
-./etc/rc.d/mrouted type=file mode=0555 optional
+./etc/rc.d/mrouted type=file mode=0555
./etc/rc.d/named type=file mode=0555
./etc/rc.d/ndbootd type=file mode=0555
./etc/rc.d/network type=file mode=0555
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.115 src/etc/rc.d/Makefile:1.116
--- src/etc/rc.d/Makefile:1.115 Sun May 29 08:10:00 2022
+++ src/etc/rc.d/Makefile Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2022/05/29 08:10:00 nia Exp $
+# $NetBSD: Makefile,v 1.116 2022/06/06 10:56:28 nia Exp $
.include <bsd.own.mk>
@@ -29,10 +29,10 @@ CONFIGFILES=\
kdc \
ldconfig ldpd lvmlockdir local lpd lvm \
makemandb mdnsd mixerctl modules mopd motd mountall \
- mountcritlocal mountcritremote mountd moused \
+ mountcritlocal mountcritremote mountd moused mrouted \
named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
- npfd \
- perusertmp pf pf_boot pflogd postfix powerd pwcheck \
+ npfd ntpd ntpdate \
+ perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
quota \
racoon rpcbind raidframe raidframeparity random_seed rarpd \
rbootd resize_root rndctl root route6d routed rtadvd \
@@ -44,18 +44,6 @@ CONFIGFILES=\
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
-.if ${MKMROUTING} != "no"
-CONFIGFILES+= mrouted
-.endif
-
-.if ${MKNTP} != "no"
-CONFIGFILES+= ntpd ntpdate
-.endif
-
-.if ${MKPPP} != "no"
-CONFIGFILES+= ppp
-.endif
-
.if ${MKYP} != "no"
CONFIGFILES+= ypbind yppasswdd ypserv
.endif
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.74 src/external/bsd/Makefile:1.75
--- src/external/bsd/Makefile:1.74 Sun May 29 08:10:00 2022
+++ src/external/bsd/Makefile Mon Jun 6 10:56:28 2022
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.74 2022/05/29 08:10:00 nia Exp $
+# $NetBSD: Makefile,v 1.75 2022/06/06 10:56:28 nia Exp $
.include <bsd.own.mk>
SUBDIR= acpica am-utils bc byacc cron dhcpcd elftoolchain/common \
ekermit elftosb fetch file flex jemalloc less \
libarchive libevent libfido2 liblzf libpcap mdocml \
- openresolv tmux top tre wpa
+ ntp openresolv tcpdump tmux top tre wpa
.if (${MKATF} != "no")
SUBDIR+= atf
@@ -30,29 +30,20 @@ SUBDIR+= libc++
.if (${MKNSD} != "no")
SUBDIR+= nsd
.endif
-.if (${MKNTP} != "no")
-SUBDIR+= ntp
-.endif
.if ${MKPAM} != "no"
SUBDIR+= pam-u2f
.endif
.if (${MKPCC} != "no")
SUBDIR+= pcc
.endif
-.if (${MKPPP} != "no")
-SUBDIR+= ppp
-.endif
.if (${MKDTRACE} != "no")
SUBDIR+= libproc
SUBDIR+= librtld_db
.endif
-.if ${MKTCPDUMP} != "no"
-SUBDIR+= tcpdump
-.endif
.if ${MKUNBOUND} != "no"
SUBDIR+= unbound
.endif
-SUBDIR+= blocklist pdisk nvi libnv
+SUBDIR+= blocklist pdisk nvi ppp libnv
.include <bsd.subdir.mk>
Index: src/external/mpl/Makefile
diff -u src/external/mpl/Makefile:1.3 src/external/mpl/Makefile:1.4
--- src/external/mpl/Makefile:1.3 Wed May 25 20:44:01 2022
+++ src/external/mpl/Makefile Mon Jun 6 10:56:28 2022
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2022/05/25 20:44:01 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/06/06 10:56:28 nia Exp $
.include <bsd.own.mk>
-SUBDIR= bind
-
-.if ${MKDHCPD} != "no"
-SUBDIR+= dhcp
-.endif
+SUBDIR= bind dhcp
.include <bsd.subdir.mk>
Index: src/libexec/Makefile
diff -u src/libexec/Makefile:1.63 src/libexec/Makefile:1.64
--- src/libexec/Makefile:1.63 Sat May 28 14:31:11 2022
+++ src/libexec/Makefile Mon Jun 6 10:56:28 2022
@@ -1,28 +1,16 @@
-# $NetBSD: Makefile,v 1.63 2022/05/28 14:31:11 nia Exp $
+# $NetBSD: Makefile,v 1.64 2022/06/06 10:56:28 nia Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk>
SUBDIR= atrun \
- comsat ftpd getty httpd identd ld.aout_so \
- ld.elf_so mail.local makekey rexecd \
+ comsat fingerd ftpd getty httpd identd ld.aout_so \
+ ld.elf_so lfs_cleanerd mail.local makekey rexecd \
rlogind rshd rpc.rquotad rpc.rstatd rpc.rusersd rpc.rwalld \
- rpc.sprayd telnetd tftpd utmp_update
-
-.if ${MKFINGER} != "no"
-SUBDIR+= fingerd
-.endif
-
-.if ${MKLFS} != "no"
-SUBDIR+= lfs_cleanerd
-.endif
+ rpc.sprayd talkd telnetd tftpd utmp_update
.if ${MKMAKEMANDB} == "no"
SUBDIR+= getNAME makewhatis
.endif
-.if ${MKTALK} != "no"
-SUBDIR+= talkd
-.endif
-
.include <bsd.subdir.mk>
Index: src/sbin/Makefile
diff -u src/sbin/Makefile:1.137 src/sbin/Makefile:1.138
--- src/sbin/Makefile:1.137 Fri May 27 07:28:20 2022
+++ src/sbin/Makefile Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2022/05/27 07:28:20 nia Exp $
+# $NetBSD: Makefile,v 1.138 2022/06/06 10:56:28 nia Exp $
# @(#)Makefile 8.5 (Berkeley) 3/31/94
# Not ported: XNSrouted enpload scsiformat startslip
@@ -19,25 +19,19 @@ SUBDIR= amrctl apmlabel atactl badsect b
# support for various file systems
SUBDIR+= newfs_ext2fs fsck_ext2fs
SUBDIR+= newfs fsck_ffs fsdb dump restore clri tunefs resize_ffs
+SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs
SUBDIR+= newfs_msdos fsck_msdos
-SUBDIR+= newfs_sysvbfs
SUBDIR+= newfs_udf fsck_udf
-SUBDIR+= newfs_v7fs fsck_v7fs
-SUBDIR+= mount_ados
SUBDIR+= mount_autofs
SUBDIR+= mount_cd9660
-SUBDIR+= mount_chfs
-SUBDIR+= mount_efs
SUBDIR+= mount_ext2fs
SUBDIR+= mount_fdesc
-SUBDIR+= mount_filecore
SUBDIR+= mount_ffs
-SUBDIR+= mount_hfs
SUBDIR+= mount_kernfs
+SUBDIR+= mount_lfs
SUBDIR+= mount_msdos
SUBDIR+= mount_udf
SUBDIR+= mount_nfs
-SUBDIR+= mount_nilfs
SUBDIR+= mount_ntfs
SUBDIR+= mount_null
SUBDIR+= mount_overlay
@@ -46,11 +40,9 @@ SUBDIR+= mount_procfs
SUBDIR+= mount_ptyfs
SUBDIR+= mount_puffs
SUBDIR+= mount_qemufwcfg
-SUBDIR+= mount_sysvbfs
SUBDIR+= mount_tmpfs
SUBDIR+= mount_umap
SUBDIR+= mount_union
-SUBDIR+= mount_v7fs
.if (${USE_INET6} != "no")
SUBDIR+= ping6
@@ -60,11 +52,45 @@ SUBDIR+= ping6
SUBDIR+= iscsictl iscsid
.endif
+.if (${MKADOS} != "no")
+SUBDIR+= mount_ados
+.endif
+
+.if (${MKCHFS} != "no")
+SUBDIR+= mount_chfs
+.endif
+
+.if (${MKEFS} != "no")
+SUBDIR+= mount_efs
+.endif
+
+.if (${MKFILECORE} != "no")
+SUBDIR+= mount_filecore
+.endif
+
+.if (${MKHFS} != "no")
+SUBDIR+= mount_hfs
+.endif
+
.if (${MKLFS} != "no")
SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs
SUBDIR+= mount_lfs
.endif
+.if (${MKNILFS} != "no")
+SUBDIR+= mount_nilfs
+.endif
+
+.if (${MKSYSVBFS} != "no")
+SUBDIR+= newfs_sysvbfs
+SUBDIR+= mount_sysvbfs
+.endif
+
+.if (${MKV7FS} != "no")
+SUBDIR+= newfs_v7fs fsck_v7fs
+SUBDIR+= mount_v7fs
+.endif
+
# IPsec
SUBDIR+= setkey
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.95 src/share/man/man5/mk.conf.5:1.96
--- src/share/man/man5/mk.conf.5:1.95 Sun May 29 15:23:20 2022
+++ src/share/man/man5/mk.conf.5 Mon Jun 6 10:56:28 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.95 2022/05/29 15:23:20 nia Exp $
+.\" $NetBSD: mk.conf.5,v 1.96 2022/06/06 10:56:28 nia Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 29, 2022
+.Dd December 20, 2021
.Dt MK.CONF 5
.Os
.\" turn off hyphenation
@@ -404,13 +404,6 @@ Indicates whether debug information
will be included in the build toolchain.
.DFLTn
.
-.It Sy MKDHCPD
-.YorN
-Indicates whether
-.Xr dhcpd 8
-will be built and installed.
-.DFLTy
-.
.It Sy MKDOC
.YorN
Indicates whether system documentation destined for
@@ -445,15 +438,6 @@ and
statically.
.DFLTy
.
-.It Sy MKFINGER
-.YorN
-Indicates whether
-.Xr finger 1
-and
-.Xr fingerd 8
-are to be built and installed.
-.DFLTy
-.
.It Sy MKGCC
.YorN
Indicates whether
@@ -582,17 +566,6 @@ infrastructure
(libraries and support programs) is built and installed.
.DFLTy
.
-.It Sy MKLFS
-.YorN
-Indicates whether the log-structured file system (LFS) programs
-are built and installed, i.e.
-.Xr newfs_lfs 8 ,
-.Xr mount_lfs 8 ,
-.Xr dumplfs 8 ,
-etc.
-.DFLTy
-.
-.
.It Sy MKLINKLIB
.YorN
Indicates whether all of the shared library infrastructure is built.
@@ -660,27 +633,6 @@ Indicates whether the mDNS (Multicast DN
(libraries and support programs) is built and installed.
.DFLTy
.
-.It Sy MKMOUSED
-.YorN
-Indicates whether
-.Xr moused 8 ,
-the serial mouse support daemon is built and installed.
-.DFLTy
-.
-.It Sy MKMROUITNG
-.YorN
-Indicates whether multicast routing applications will be built and
-installed, i.e.
-.Xr map-mbone 8 ,
-.Xr mrinfo 8 ,
-.Xr mrouted 8 ,
-and
-.Xr mtrace 8 .
-These require the
-.Dv MROUTING
-kernel option to be enabled.
-.DFLTy
-.
.It Sy MKNLS
.YorN
Indicates whether Native Language System (NLS) locale zone files will be
@@ -700,15 +652,6 @@ Platform dependent.
Indicates whether the NPF packet filter is to be built and installed.
.DFLTy
.
-.It Sy MKNTP
-.YorN
-Indicates whether
-.Xr ntpd 8
-and
-.Xr ntpdate 8
-are to be built and installed.
-.DFLTy
-.
.It Sy MKOBJ
.YorN
Indicates whether object directories will be created when running
@@ -813,20 +756,6 @@ utility is not installed as
Indicates whether Postfix is built.
.DFLTy
.
-.It Sy MKPPP
-.YorN
-Indicates whether the Point-to-Point Protocol daemon
-.Xr pppd 8 ,
-as well as related utilities
-.Xr chat 8 ,
-.Xr pppdump 8 ,
-and
-.Xr pppstats 8
-will be built and installed.
-This option has no effect on PPPoE (Point-to-Point over Ethernet) support,
-but rather only affects serial links.
-.DFLTy
-.
.It Sy MKPROFILE
.YorN
Indicates whether profiled libraries
@@ -934,31 +863,6 @@ userland libraries and getting a backtra
loading shared libraries.
.DFLTy
.
-.It Sy MKTALK
-.YorN
-Indicates whether
-.Xr talk 1
-and
-.Xr ntalkd 8
-are to be built and installed.
-.DFLTy
-.
-.It Sy MKTCPDUMP
-.YorN
-Indicates whether
-.Xr tcpdump 8
-is to be built and installed.
-.DFLTy
-.
-.It Sy MKTIMED
-.YorN
-Indicates whether
-.Xr timed 8 ,
-the Time Synchronization Protocol daemon, not to be confused with
-.Xr ntpd 8 ,
-is to be built and installed.
-.DFLTy
-.
.It Sy MKUNPRIVED
.YorN
Indicates whether an unprivileged install will occur.
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.438 src/share/mk/bsd.README:1.439
--- src/share/mk/bsd.README:1.438 Sun May 29 15:23:20 2022
+++ src/share/mk/bsd.README Mon Jun 6 10:56:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.438 2022/05/29 15:23:20 nia Exp $
+# $NetBSD: bsd.README,v 1.439 2022/06/06 10:56:29 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -201,9 +201,6 @@ MKDEPINCLUDES If "yes" issue .include st
it is possibly slower.
Default "no"
-MKDHCPD If "no", don't build or install dhcpd(8).
- Default: yes
-
MKDOC If "no", don't build or install the documentation.
Default: yes
@@ -225,9 +222,6 @@ MKEXTSRC If not "no", 'make build
users, and automatically enables creation of those sets.
Default: no
-MKFINGER If "no", don't build finger(1) or fingerd(8).
- Default: yes
-
MKFIRMWARE If not "no", install the /libdata/firmware directory,
which is necessary for several drivers: athn(4), bwfm(4),
ipw(4), iwi(4), iwm(4), iwn(4), otus(4), rtwn(4), urtwn(4),
@@ -306,11 +300,6 @@ MKLDAP If "no", disables building of LD
(libraries and support programs).
Default: yes
-MKLFS If "no", disables building and installation of programs for
- the log-structured file system - mount_lfs(8), newfs_lfs(8),
- dumplfs(8), etc.
- Default: yes
-
MKLIBCSANITIZER If "yes", use the selected sanitizer inside libc to compile
userland programs and libraries as defined in
USE_LIBCSANITIZER, which defaults to "undefined".
@@ -384,15 +373,6 @@ MKMDNS If "no", disables building of mD
(libraries and support programs).
Default: yes
-MKMOUSED If "no", don't build moused(8) (serial mouse support
- daemon, not to be confused with wsmoused(8)).
- Default: yes
-
-MKMROUTING If "no", don't build or install the multicast routing
- applications - map-mbone(8), mrinfo(8), mrouted(8), or
- mtrace(8).
- Default: yes
-
MKNLS If "no", don't build or install the NLS files and locale
definition files.
Default: yes
@@ -408,9 +388,6 @@ MKNSD If "no", don't build or install t
server.
Default: no
-MKNTP If "no", don't build or install ntpd(8) or ntpdate(8).
- Default: yes
-
MKOBJ If "no", don't enable the rule which creates objdirs,
and also acts as "MKOBJDIRS=no".
Default: yes
@@ -455,13 +432,6 @@ MKPIGZGZIP If "no", only install pigz as
MKPOSTFIX If "no", don't build or install postfix(1).
Default: yes
-MKPPP If "no", disables building the Point-to-Point Protocol
- daemon pppd(8), as well as related utilities chat(8),
- pppdump(8), and pppstats(8).
- This option has no effect on PPPoE (Point-to-Point over
- Ethernet) support, but rather only affects serial links.
- Default: yes
-
MKPROFILE If "no", don't build or install the profiling (*_p.a) libraries.
Default: yes
@@ -538,16 +508,6 @@ MKSTRIPSYM If "yes", strip all local sym
loading shared libraries.
Default: yes
-MKTIMED If "no", don't build timed(8) (original Time Synchronization
- Protocol server, not to be confused with ntpd(8)).
- Default: yes
-
-MKTOUCH If "no", don't build talk(1) or ntalkd(8).
- Default: yes
-
-MKTCPDUMP If "no" then don't build tcpdump(8).
- Default: yes
-
MKTEGRAFIRMWARE If "no", install the /libdata/firmware/nvidia directory,
which is necessary for the NVIDIA Tegra XHCI driver.
Default: yes on evbarm, no elsewhere.
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1284 src/share/mk/bsd.own.mk:1.1285
--- src/share/mk/bsd.own.mk:1.1284 Sun May 29 15:23:20 2022
+++ src/share/mk/bsd.own.mk Mon Jun 6 10:56:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1284 2022/05/29 15:23:20 nia Exp $
+# $NetBSD: bsd.own.mk,v 1.1285 2022/06/06 10:56:29 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1150,34 +1150,24 @@ _MKVARS.yes= \
MKBINUTILS \
MKBSDTAR \
MKCOMPLEX MKCVS MKCXX \
- MKDHCPD \
MKDOC MKDTC \
MKDYNAMICROOT \
- MKFINGER \
MKGCC MKGDB MKGROFF \
MKHESIOD MKHTML \
MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
MKKERBEROS \
MKKMOD \
- MKLFS \
MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \
MKMAN MKMANDOC \
- MKMOUSED \
- MKMROUTING \
MKMDNS \
MKMAKEMANDB \
MKNLS \
MKNPF \
- MKNTP \
MKOBJ \
MKPAM MKPERFUSE \
MKPF MKPIC MKPICLIB MKPOSTFIX MKPROFILE \
- MKPPP \
MKRUMP \
MKSHARE MKSKEY MKSTATICLIB \
- MKTALK \
- MKTCPDUMP \
- MKTIMED \
MKUNBOUND \
MKX11FONTS \
MKYP
Index: src/sys/rump/fs/Makefile.rumpfscomp
diff -u src/sys/rump/fs/Makefile.rumpfscomp:1.9 src/sys/rump/fs/Makefile.rumpfscomp:1.10
--- src/sys/rump/fs/Makefile.rumpfscomp:1.9 Fri May 27 09:25:39 2022
+++ src/sys/rump/fs/Makefile.rumpfscomp Mon Jun 6 10:56:29 2022
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile.rumpfscomp,v 1.9 2022/05/27 09:25:39 nia Exp $
+# $NetBSD: Makefile.rumpfscomp,v 1.10 2022/06/06 10:56:29 nia Exp $
#
.include <bsd.own.mk>
-RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs mfs msdos \
+RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
nfs nilfs ntfs null ptyfs syspuffs sysvbfs \
tmpfs udf umap union v7fs
-.if ${MKLFS} != "no" || make(rumpdescribe)
-RUMPFSCOMP+= lfs
-.endif
-
.if ${MKZFS} != "no" || make(rumpdescribe)
RUMPFSCOMP+= zfs
.endif
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.24 src/tests/fs/Makefile:1.25
--- src/tests/fs/Makefile:1.24 Fri May 27 07:28:21 2022
+++ src/tests/fs/Makefile Mon Jun 6 10:56:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: Makefile,v 1.25 2022/06/06 10:56:29 nia Exp $
.include <bsd.own.mk>
@@ -6,14 +6,10 @@ TESTSDIR= ${TESTSBASE}/fs
SUBDIR+= common .WAIT
-TESTS_SUBDIRS+= ffs fifofs hfs kernfs msdosfs nfs nullfs psshfs ptyfs puffs
+TESTS_SUBDIRS+= ffs fifofs hfs kernfs lfs msdosfs nfs nullfs psshfs ptyfs puffs
TESTS_SUBDIRS+= tmpfs umapfs union
TESTS_SUBDIRS+= vfs cd9660
-.if ${MKLFS} != "no"
-TESTS_SUBDIRS+= lfs
-.endif
-
.if ${MKZFS} != "no"
TESTS_SUBDIRS+= zfs
.endif
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.29 src/tests/fs/vfs/Makefile:1.30
--- src/tests/fs/vfs/Makefile:1.29 Fri May 27 07:28:21 2022
+++ src/tests/fs/vfs/Makefile Mon Jun 6 10:56:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: Makefile,v 1.30 2022/06/06 10:56:29 nia Exp $
#
.include <bsd.own.mk>
@@ -30,6 +30,7 @@ LDADD+=-lrumpnet_shmif -lrumpnet -lrumpn
LDADD+=-lrumpfs_nfs # NFS
LDADD+=-lrumpfs_ext2fs # ext2fs
LDADD+=-lrumpfs_ffs # ffs
+LDADD+=-lrumpfs_lfs # lfs
LDADD+=-lrumpfs_msdos # msdos
LDADD+=-lrumpfs_syspuffs # puffs
LDADD+=-lrumpdev_putter -lrumpdev # \ putter
@@ -50,10 +51,6 @@ LDADD+=-lrumpnet # static linking
LDADD+=-lutil
-.if (${MKLFS} != "no")
-LDADD+=-lrumpfs_lfs
-.endif
-
.if (${MKZFS} != "no")
LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd -lrumpkern_sysproxy
CPPFLAGS+=-DWANT_ZFS_TESTS
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.237 src/usr.bin/Makefile:1.238
--- src/usr.bin/Makefile:1.237 Sat May 28 14:31:11 2022
+++ src/usr.bin/Makefile Mon Jun 6 10:56:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.237 2022/05/28 14:31:11 nia Exp $
+# $NetBSD: Makefile,v 1.238 2022/06/06 10:56:29 nia Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk>
@@ -10,7 +10,7 @@ SUBDIR= aiomixer apply asa at audio audi
column comm compress config crunch csplit ctags cut cvslatest \
dc deroff db dirname du \
eject elf2aout elf2ecoff env error expand extattr \
- false fdformat fgen fincore find flock fmt fold fpr from \
+ false fdformat fgen fincore find finger flock fmt fold fpr from \
fsplit fstat ftp gcore genassym gencat getaddrinfo getconf getent \
getopt gettext gprof \
head hexdump iconv id indent infocmp innetgr ipcrm ipcs join jot \
@@ -27,7 +27,7 @@ SUBDIR= aiomixer apply asa at audio audi
script sdiff sdpquery sed seq shar shlock \
showmount shuffle sockstat sort sortinfo \
spell split stat su sys_info systat \
- tabs tail tcopy tee telnet tftp tic time timeout tip touch \
+ tabs tail talk tcopy tee telnet tftp tic time timeout tip touch \
tput \
tr true tset tsort tty ul uname unexpand unifdef \
uniq units unvis unzip usbhidaction usbhidctl users utoppya \
@@ -42,10 +42,6 @@ SUBDIR+= ../external/zlib/pigz/bin/pigz
SUBDIR+= soelim
.endif
-.if (${MKFINGER} != "no")
-SUBDIR+= finger
-.endif
-
.if (${MKMAKEMANDB} == "no")
SUBDIR+= apropos whatis
.endif
@@ -73,10 +69,6 @@ SUBDIR+= hesinfo
SUBDIR+= skey skeyinfo skeyinit
.endif
-.if (${MKTALK} != "no")
-SUBDIR+= talk
-.endif
-
.if (${MKYP} != "no")
SUBDIR+= ypcat ypmatch ypwhich
.endif
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.290 src/usr.sbin/Makefile:1.291
--- src/usr.sbin/Makefile:1.290 Sun May 29 15:23:20 2022
+++ src/usr.sbin/Makefile Mon Jun 6 10:56:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.290 2022/05/29 15:23:20 nia Exp $
+# $NetBSD: Makefile,v 1.291 2022/06/06 10:56:29 nia Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
SUBDIR= ac accton acpitools altq apm apmd arp autofs \
bad144 bootp bta2dpd btattach btconfig btdevctl bthcid btpand catman \
chroot cnwctl cpuctl crash \
- dev_mkdb diskpart dumpfs \
+ dev_mkdb diskpart dumpfs dumplfs \
edquota eeprom envstat etcupdate extattrctl \
flashctl fssconfig fstyp fusermount fwctl \
gpioctl grfconfig gspa \
@@ -15,8 +15,8 @@ SUBDIR= ac accton acpitools altq apm apm
isibootd iteconfig iwictl \
kgmon \
lastlogin ldpd link lockstat lpr \
- mailwrapper makefs mdconfig memswitch mlxctl mmcformat \
- mopd mountd mscdlabel mtree \
+ mailwrapper makefs map-mbone mdconfig memswitch mlxctl mmcformat \
+ mopd mountd moused mrinfo mrouted mscdlabel mtrace mtree \
ndbootd netgroup_mkdb nfsd \
ofctl \
paxctl pcictl perfused psrset pstat pwd_mkdb postinstall \
@@ -27,33 +27,17 @@ SUBDIR= ac accton acpitools altq apm apm
sa screenblank sdpd service services_mkdb sesd schedctl \
sliplogin spray \
srtconfig sti sunlabel sysinst syslogd \
- tadpolectl tcpdchk tcpdmatch tcpdrop tpctl tprof traceroute trpt \
+ tadpolectl tcpdchk tcpdmatch tcpdrop timed tpctl tprof traceroute trpt \
unlink usbdevs user \
videomode vipw veriexecgen vnconfig \
wakeonlan wg-keygen wg-userspace wgconfig wiconfig wlanctl \
wsconscfg wsfontload wsmoused wsmuxctl \
zdump zic
-.if ${MKLFS} != "no"
-SUBDIR+= dumplfs
-.endif
-
.if ${MKMAKEMANDB} != "no"
SUBDIR+= makemandb
.endif
-.if ${MKMROUTING} != "no"
-SUBDIR+= map-mbone mrinfo mrouted mtrace
-.endif
-
-.if ${MKMOUSED} != "no"
-SUBDIR+= moused
-.endif
-
-.if ${MKTIMED} != "no"
-SUBDIR+= timed
-.endif
-
.if (${MKYP} != "no")
SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset
.endif
Index: src/usr.sbin/puffs/Makefile
diff -u src/usr.sbin/puffs/Makefile:1.20 src/usr.sbin/puffs/Makefile:1.21
--- src/usr.sbin/puffs/Makefile:1.20 Fri May 27 07:28:21 2022
+++ src/usr.sbin/puffs/Makefile Mon Jun 6 10:56:29 2022
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2022/05/27 07:28:21 nia Exp $
+# $NetBSD: Makefile,v 1.21 2022/06/06 10:56:29 nia Exp $
.include <bsd.own.mk>
SUBDIR= mount_9p mount_psshfs mount_sysctlfs
.if (${MKRUMP} != "no")
-SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs
+SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs rump_lfs
SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_syspuffs rump_sysvbfs
SUBDIR+=rump_tmpfs rump_udf rump_v7fs
-. if ${MKLFS} != "no"
-SUBDIR+=rump_lfs
-. endif
-
#
# The following are not built by default
#
