Module Name:    src
Committed By:   thorpej
Date:           Sat Apr  3 22:43:42 UTC 2021

Modified Files:
        src/distrib/sets/lists/base [thorpej-futex]: md.amiga md.evbarm mi
            shl.mi
        src/distrib/sets/lists/comp [thorpej-futex]: ad.mips mi stl.mi
        src/distrib/sets/lists/debug [thorpej-futex]: mi module.md.amd64
            module.md.i386 module.mi shl.mi
        src/distrib/sets/lists/etc [thorpej-futex]: mi
        src/distrib/sets/lists/man [thorpej-futex]: mi
        src/distrib/sets/lists/modules [thorpej-futex]: md.amd64 md.i386 mi
        src/distrib/sets/lists/tests [thorpej-futex]: mi
        src/distrib/sets/lists/xbase [thorpej-futex]: md.evbarm mi
        src/distrib/sets/lists/xcomp [thorpej-futex]: mi
        src/distrib/sets/lists/xdebug [thorpej-futex]: md.evbarm mi
        src/distrib/sets/lists/xetc [thorpej-futex]: mi
        src/distrib/sets/lists/xfont [thorpej-futex]: mi
        src/distrib/sets/lists/xserver [thorpej-futex]: mi
Added Files:
        src/distrib/sets/lists/xdebug [thorpej-futex]: md.evbppc
        src/distrib/sets/lists/xserver [thorpej-futex]: md.evbppc

Log Message:
Sync with HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.30.1 src/distrib/sets/lists/base/md.amiga
cvs rdiff -u -r1.19 -r1.19.2.1 src/distrib/sets/lists/base/md.evbarm
cvs rdiff -u -r1.1272.2.1 -r1.1272.2.2 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.910 -r1.910.2.1 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.86 -r1.86.2.1 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -u -r1.2367.2.1 -r1.2367.2.2 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.7 -r1.7.2.1 src/distrib/sets/lists/comp/stl.mi
cvs rdiff -u -r1.344.2.1 -r1.344.2.2 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.4 -r1.4.2.1 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.2 -r1.2.2.1 src/distrib/sets/lists/debug/module.md.i386
cvs rdiff -u -r1.7 -r1.7.2.1 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.269 -r1.269.2.1 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.263 -r1.263.2.1 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1711.2.1 -r1.1711.2.2 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.91 -r1.91.2.1 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.89 -r1.89.2.1 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.142 -r1.142.2.1 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.993.2.1 -r1.993.2.2 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.6 -r1.6.4.1 src/distrib/sets/lists/xbase/md.evbarm
cvs rdiff -u -r1.163.2.1 -r1.163.2.2 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.223 -r1.223.2.1 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.28 -r1.28.2.1 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r0 -r1.1.2.2 src/distrib/sets/lists/xdebug/md.evbppc
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.39 -r1.39.2.1 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.45 -r1.45.2.1 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r0 -r1.4.2.2 src/distrib/sets/lists/xserver/md.evbppc
cvs rdiff -u -r1.46 -r1.46.2.1 src/distrib/sets/lists/xserver/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/md.amiga
diff -u src/distrib/sets/lists/base/md.amiga:1.56 src/distrib/sets/lists/base/md.amiga:1.56.30.1
--- src/distrib/sets/lists/base/md.amiga:1.56	Wed Aug  6 12:15:01 2014
+++ src/distrib/sets/lists/base/md.amiga	Sat Apr  3 22:43:39 2021
@@ -1,8 +1,10 @@
-# $NetBSD: md.amiga,v 1.56 2014/08/06 12:15:01 martin Exp $
+# $NetBSD: md.amiga,v 1.56.30.1 2021/04/03 22:43:39 thorpej Exp $
 ./sbin/binpatch					base-sysutil-root
 ./usr/mdec/boot.amiga				base-sysutil-bin
 ./usr/mdec/bootxx_fd				base-sysutil-bin
-./usr/mdec/bootxx_ffs				base-sysutil-bin
+./usr/mdec/bootxx_ffs				base-sysutil-bin	obsolete
+./usr/mdec/bootxx_ffsv1				base-sysutil-bin
+./usr/mdec/bootxx_ffsv2				base-sysutil-bin
 ./usr/mdec/fdboot				base-obsolete		obsolete
 ./usr/mdec/installboot				base-obsolete		obsolete
 ./usr/mdec/xxboot				base-obsolete		obsolete

Index: src/distrib/sets/lists/base/md.evbarm
diff -u src/distrib/sets/lists/base/md.evbarm:1.19 src/distrib/sets/lists/base/md.evbarm:1.19.2.1
--- src/distrib/sets/lists/base/md.evbarm:1.19	Thu Aug 27 15:31:59 2020
+++ src/distrib/sets/lists/base/md.evbarm	Sat Apr  3 22:43:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.19 2020/08/27 15:31:59 riastradh Exp $
+# $NetBSD: md.evbarm,v 1.19.2.1 2021/04/03 22:43:39 thorpej Exp $
 ./libdata/firmware/if_bwfm/brcmfmac43143-sdio.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43241b0-sdio.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43241b4-sdio.bin	base-firmware-root	firmware
@@ -19,6 +19,7 @@
 ./libdata/firmware/if_bwfm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43430a0-sdio.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43455-sdio.bin	base-firmware-root	firmware
+./libdata/firmware/if_bwfm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43455-sdio.xunlong,orangepi-lite2.txt	base-firmware-root	firmware

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1272.2.1 src/distrib/sets/lists/base/mi:1.1272.2.2
--- src/distrib/sets/lists/base/mi:1.1272.2.1	Sun Jan  3 16:49:31 2021
+++ src/distrib/sets/lists/base/mi	Sat Apr  3 22:43:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1272.2.1 2021/01/03 16:49:31 thorpej Exp $
+# $NetBSD: mi,v 1.1272.2.2 2021/04/03 22:43:39 thorpej Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1560,6 +1560,7 @@
 ./usr/libdata/firmware/radeon/VERDE_smc.bin	base-obsolete	obsolete
 ./usr/libdata/ldscripts				base-c-usr
 ./usr/libdata/lint				base-c-usr
+./usr/libdata/lint/strict-bool			base-c-usr
 ./usr/libexec					base-sys-usr
 ./usr/libexec/atf-check				base-atf-bin		atf
 ./usr/libexec/atf-cleanup			base-obsolete		obsolete
@@ -1600,6 +1601,7 @@
 ./usr/libexec/mail.local			base-mail-bin
 ./usr/libexec/makekey				base-crypto-bin
 ./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
 ./usr/libexec/pfspamd				base-obsolete		obsolete

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.910 src/distrib/sets/lists/base/shl.mi:1.910.2.1
--- src/distrib/sets/lists/base/shl.mi:1.910	Fri Dec  4 18:43:47 2020
+++ src/distrib/sets/lists/base/shl.mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.910 2020/12/04 18:43:47 christos Exp $
+# $NetBSD: shl.mi,v 1.910.2.1 2021/04/03 22:43:40 thorpej Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -232,8 +232,8 @@
 ./usr/lib/libbfd.so.17				base-sys-shlib		compatfile,binutils=234
 ./usr/lib/libbfd.so.17.0			base-sys-shlib		compatfile,binutils=234
 ./usr/lib/libbind9.so				base-bind-shlib		compatfile
-./usr/lib/libbind9.so.15				base-bind-shlib		compatfile
-./usr/lib/libbind9.so.15.0			base-bind-shlib		compatfile
+./usr/lib/libbind9.so.16			base-bind-shlib		compatfile
+./usr/lib/libbind9.so.16.0			base-bind-shlib		compatfile
 ./usr/lib/libblacklist.so			base-obsolete		obsolete,compatfile
 ./usr/lib/libblacklist.so.0			base-obsolete		obsolete,compatfile
 ./usr/lib/libblacklist.so.0.0			base-obsolete		obsolete,compatfile
@@ -298,8 +298,8 @@
 ./usr/lib/libdm.so.0				base-sys-shlib		compatfile
 ./usr/lib/libdm.so.0.0				base-sys-shlib		compatfile
 ./usr/lib/libdns.so				base-bind-shlib		compatfile
-./usr/lib/libdns.so.15				base-bind-shlib		compatfile
-./usr/lib/libdns.so.15.0			base-bind-shlib		compatfile
+./usr/lib/libdns.so.16				base-bind-shlib		compatfile
+./usr/lib/libdns.so.16.0			base-bind-shlib		compatfile
 ./usr/lib/libdns_sd.so				base-mdns-shlib		compatfile,mdns
 ./usr/lib/libdns_sd.so.0			base-mdns-shlib		compatfile,mdns
 ./usr/lib/libdns_sd.so.0.0			base-mdns-shlib		compatfile,mdns
@@ -374,17 +374,17 @@
 ./usr/lib/libipsec.so.3				base-net-shlib		compatfile
 ./usr/lib/libipsec.so.3.0			base-net-shlib		compatfile
 ./usr/lib/libirs.so				base-bind-shlib		compatfile
-./usr/lib/libirs.so.15				base-bind-shlib		compatfile
-./usr/lib/libirs.so.15.0			base-bind-shlib		compatfile
+./usr/lib/libirs.so.16				base-bind-shlib		compatfile
+./usr/lib/libirs.so.16.0			base-bind-shlib		compatfile
 ./usr/lib/libisc.so				base-bind-shlib		compatfile
-./usr/lib/libisc.so.15				base-bind-shlib		compatfile
-./usr/lib/libisc.so.15.0			base-bind-shlib		compatfile
+./usr/lib/libisc.so.16				base-bind-shlib		compatfile
+./usr/lib/libisc.so.16.0			base-bind-shlib		compatfile
 ./usr/lib/libisccc.so				base-bind-shlib		compatfile
-./usr/lib/libisccc.so.15			base-bind-shlib		compatfile
-./usr/lib/libisccc.so.15.0			base-bind-shlib		compatfile
+./usr/lib/libisccc.so.16			base-bind-shlib		compatfile
+./usr/lib/libisccc.so.16.0			base-bind-shlib		compatfile
 ./usr/lib/libisccfg.so				base-bind-shlib		compatfile
-./usr/lib/libisccfg.so.15			base-bind-shlib		compatfile
-./usr/lib/libisccfg.so.15.0			base-bind-shlib		compatfile
+./usr/lib/libisccfg.so.16			base-bind-shlib		compatfile
+./usr/lib/libisccfg.so.16.0			base-bind-shlib		compatfile
 ./usr/lib/libiscsi.so				base-iscsi-shlib	iscsi,compatfile
 ./usr/lib/libiscsi.so.2				base-iscsi-shlib	iscsi,compatfile
 ./usr/lib/libiscsi.so.2.0			base-iscsi-shlib	iscsi,compatfile
@@ -469,8 +469,8 @@
 ./usr/lib/libnpf.so.0				base-npf-shlib		npf,compatfile
 ./usr/lib/libnpf.so.0.1				base-npf-shlib		npf,compatfile
 ./usr/lib/libns.so				base-bind-shlib		compatfile
-./usr/lib/libns.so.15				base-bind-shlib		compatfile
-./usr/lib/libns.so.15.0				base-bind-shlib		compatfile
+./usr/lib/libns.so.16				base-bind-shlib		compatfile
+./usr/lib/libns.so.16.0				base-bind-shlib		compatfile
 ./usr/lib/libnvmm.so				base-sys-shlib		nvmm,pic
 ./usr/lib/libnvmm.so.0				base-sys-shlib		nvmm,pic
 ./usr/lib/libnvmm.so.0.1			base-sys-shlib		nvmm,pic
@@ -876,8 +876,8 @@
 ./usr/lib/libsqlite3.so.1.4			base-sys-shlib		compatfile
 ./usr/lib/libss.so				base-obsolete		obsolete
 ./usr/lib/libssh.so				base-secsh-shlib	compatfile
-./usr/lib/libssh.so.38				base-secsh-shlib	compatfile
-./usr/lib/libssh.so.38.0			base-secsh-shlib	compatfile
+./usr/lib/libssh.so.39				base-secsh-shlib	compatfile
+./usr/lib/libssh.so.39.0			base-secsh-shlib	compatfile
 ./usr/lib/libssl.so				base-crypto-shlib	compatfile
 ./usr/lib/libssl.so.12				base-crypto-shlib	compatfile,openssl=10
 ./usr/lib/libssl.so.12.0			base-crypto-shlib	compatfile,openssl=10
@@ -926,8 +926,8 @@
 ./usr/lib/libumem.so.0				base-zfs-shlib		compatfile,zfs
 ./usr/lib/libumem.so.0.0			base-zfs-shlib		compatfile,zfs
 ./usr/lib/libunbound.so				base-sys-shlib		compatfile,unbound
-./usr/lib/libunbound.so.6			base-sys-shlib		compatfile,unbound
-./usr/lib/libunbound.so.6.2			base-sys-shlib		compatfile,unbound
+./usr/lib/libunbound.so.7			base-sys-shlib		compatfile,unbound
+./usr/lib/libunbound.so.7.0			base-sys-shlib		compatfile,unbound
 ./usr/lib/libusbhid.so				base-sys-shlib		compatfile
 ./usr/lib/libusbhid.so.1			base-sys-shlib		compatfile
 ./usr/lib/libusbhid.so.1.0			base-sys-shlib		compatfile
@@ -1002,3 +1002,4 @@
 ./usr/lib/security/pam_u2f.so.4			base-sys-shlib		compatfile,pam
 ./usr/lib/security/pam_unix.so.4		base-sys-shlib		compatfile,pam
 ./usr/libexec/ld.elf_so				base-sys-shlib		dynamicroot
+./usr/libexec/named/filter-aaaa.so		base-bind-bin

Index: src/distrib/sets/lists/comp/ad.mips
diff -u src/distrib/sets/lists/comp/ad.mips:1.86 src/distrib/sets/lists/comp/ad.mips:1.86.2.1
--- src/distrib/sets/lists/comp/ad.mips:1.86	Mon Sep  7 00:19:04 2020
+++ src/distrib/sets/lists/comp/ad.mips	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.86 2020/09/07 00:19:04 mrg Exp $
+# $NetBSD: ad.mips,v 1.86.2.1 2021/04/03 22:43:40 thorpej Exp $
 -./usr/lib/64/libgomp.a
 -./usr/lib/64/libgomp.so
 -./usr/lib/64/libgomp.so.1
@@ -55,6 +55,7 @@
 ./usr/include/mips/endian_machdep.h		comp-c-include
 ./usr/include/mips/fenv.h			comp-c-include
 ./usr/include/mips/float.h			comp-c-include
+./usr/include/mips/frame.h			comp-c-include
 ./usr/include/mips/ieee.h			comp-c-include
 ./usr/include/mips/ieeefp.h			comp-c-include
 ./usr/include/mips/int_const.h			comp-c-include

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2367.2.1 src/distrib/sets/lists/comp/mi:1.2367.2.2
--- src/distrib/sets/lists/comp/mi:1.2367.2.1	Sun Jan  3 16:49:31 2021
+++ src/distrib/sets/lists/comp/mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2367.2.1 2021/01/03 16:49:31 thorpej Exp $
+#	$NetBSD: mi,v 1.2367.2.2 2021/04/03 22:43:40 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -984,8 +984,6 @@
 ./usr/include/g++/bitdo1.h			comp-obsolete		obsolete
 ./usr/include/g++/bitdo2.h			comp-obsolete		obsolete
 ./usr/include/g++/bitprims.h			comp-obsolete		obsolete
-./usr/include/g++/bits/erase_if.h		comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/bits/unique_lock.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/bits/algorithmfwd.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/alloc_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/allocated_ptr.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1027,6 +1025,7 @@
 ./usr/include/g++/bits/cxxabi_tweaks.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/deque.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/enable_special_members.h	comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/erase_if.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/bits/error_constants.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/exception.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/exception_defines.h	comp-cxx-include	gcc,cxx,libstdcxx
@@ -1149,6 +1148,7 @@
 ./usr/include/g++/bits/time_members.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/type_traits.h		comp-obsolete		obsolete
 ./usr/include/g++/bits/uniform_int_dist.h	comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/unique_lock.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/bits/unique_ptr.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/unordered_map.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/unordered_set.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1825,27 +1825,27 @@
 ./usr/include/g++/profile/unordered_set		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/profile/vector		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/projectn.h			comp-obsolete		obsolete
-./usr/include/g++/pstl/algorithm_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/algorithm_fwd.h		comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/pstl/glue_algorithm_defs.h	comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/algorithm_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/execution_defs.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/execution_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/pstl/numeric_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_algorithm_defs.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/glue_algorithm_impl.h	comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/pstl/glue_memory_defs.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/glue_execution_defs.h	comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_memory_defs.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/glue_memory_impl.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/glue_numeric_defs.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/glue_numeric_impl.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/memory_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/numeric_fwd.h		comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/pstl/parallel_backend_utils.h	comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/pstl/parallel_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/numeric_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/parallel_backend.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/parallel_backend_tbb.h	comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend_utils.h	comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_impl.h		comp-cxx-include	gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/pstl_config.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/unseq_backend_simd.h	comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pstl/utils.h			comp-cxx-include	gcc=9,cxx,libstdcxx
-./usr/include/g++/pstl/pstl_config.h		comp-cxx-include	gcc=9,cxx,libstdcxx
 ./usr/include/g++/pthread_alloc			comp-obsolete		obsolete
 ./usr/include/g++/pthread_alloc.h		comp-obsolete		obsolete
 ./usr/include/g++/queue				comp-cxx-include	gcc,cxx,libstdcxx
@@ -2162,7 +2162,6 @@
 ./usr/include/gcc-7/sanitizer/lsan_interface.h		comp-gcc-include	obsolete
 ./usr/include/gcc-7/sanitizer/tsan_interface_atomic.h	comp-gcc-include	obsolete
 ./usr/include/gcc-7/stdatomic.h				comp-gcc-include	obsolete
-./usr/include/gcc-8/stdatomic.h				comp-gcc-include	gcc=8
 ./usr/include/gcc-8/omp.h				comp-gcc-include	gcc=8
 ./usr/include/gcc-8/openacc.h				comp-gcc-include	gcc=8
 ./usr/include/gcc-8/sanitizer/allocator_interface.h	comp-gcc-include	gcc=8
@@ -4136,6 +4135,7 @@
 ./usr/libdata/lint/llib-lwrap.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-ly.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lz.ln			comp-c-lintlib		lint
+./usr/libdata/lint/strict-bool/stdbool.h	comp-c-bin
 ./usr/libexec/cc1				comp-c-bin		gcccmds
 ./usr/libexec/cc1obj				comp-objc-bin		gcccmds
 ./usr/libexec/cc1plus				comp-cxx-bin		gcccmds
@@ -6022,6 +6022,8 @@
 ./usr/share/man/cat3/asprintf_l.0		comp-c-catman		.cat
 ./usr/share/man/cat3/assert.0			comp-c-catman		.cat
 ./usr/share/man/cat3/assume_default_colors.0	comp-c-catman		.cat
+./usr/share/man/cat3/asysctl.0			comp-c-catman		.cat
+./usr/share/man/cat3/asysctlbyname.0		comp-c-catman		.cat
 ./usr/share/man/cat3/at_quick_exit.0		comp-c-catman		.cat
 ./usr/share/man/cat3/atan.0			comp-c-catman		.cat
 ./usr/share/man/cat3/atan2.0			comp-c-catman		.cat
@@ -6661,6 +6663,7 @@
 ./usr/share/man/cat3/drand48.0			comp-c-catman		.cat
 ./usr/share/man/cat3/dsa.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/dup_field.0		comp-c-catman		.cat
+./usr/share/man/cat3/duplocale.0		comp-c-catman		.cat
 ./usr/share/man/cat3/dupwin.0			comp-c-catman		.cat
 ./usr/share/man/cat3/dwarf.0	comp-c-catman	.cat
 ./usr/share/man/cat3/dwarf_add_AT_comp_dir.0	comp-c-catman	.cat
@@ -6993,6 +6996,7 @@
 ./usr/share/man/cat3/endservent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endttyent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endusershell.0		comp-c-catman		.cat
+./usr/share/man/cat3/endutent.0			comp-c-catman		.cat
 ./usr/share/man/cat3/endutxent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endwin.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erand48.0			comp-c-catman		.cat
@@ -7172,29 +7176,29 @@
 ./usr/share/man/cat3/fgetwc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/fgetwln.0			comp-c-catman		.cat
 ./usr/share/man/cat3/fgetws.0			comp-c-catman		.cat
-./usr/share/man/cat3/fido_assert_allow_cred.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_assert_new.0			man-util-catman	.cat
-./usr/share/man/cat3/fido_assert_set_authdata.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_assert_verify.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_bio_dev_get_info.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_bio_enroll_new.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_bio_info_new.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_bio_template.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_cbor_info_new.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_cred_exclude.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_cred_new.0			man-util-catman	.cat
-./usr/share/man/cat3/fido_cred_set_authdata.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_cred_verify.0			man-util-catman	.cat
-./usr/share/man/cat3/fido_credman_metadata_new.0	man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_get_assert.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_get_touch_begin.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_info_manifest.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_make_cred.0		man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_open.0			man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_set_io_functions.0	man-util-catman	.cat
-./usr/share/man/cat3/fido_dev_set_pin.0			man-util-catman	.cat
-./usr/share/man/cat3/fido_init.0			man-util-catman	.cat
-./usr/share/man/cat3/fido_strerr.0			man-util-catman	.cat
+./usr/share/man/cat3/fido_assert_allow_cred.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_assert_new.0			comp-c-catman	.cat
+./usr/share/man/cat3/fido_assert_set_authdata.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_assert_verify.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_bio_dev_get_info.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_bio_enroll_new.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_bio_info_new.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_bio_template.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_cbor_info_new.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_cred_exclude.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_cred_new.0			comp-c-catman	.cat
+./usr/share/man/cat3/fido_cred_set_authdata.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_cred_verify.0			comp-c-catman	.cat
+./usr/share/man/cat3/fido_credman_metadata_new.0	comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_get_assert.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_get_touch_begin.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_info_manifest.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_make_cred.0		comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_open.0			comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_set_io_functions.0	comp-c-catman	.cat
+./usr/share/man/cat3/fido_dev_set_pin.0			comp-c-catman	.cat
+./usr/share/man/cat3/fido_init.0			comp-c-catman	.cat
+./usr/share/man/cat3/fido_strerr.0			comp-c-catman	.cat
 ./usr/share/man/cat3/field_arg.0		comp-c-catman		.cat
 ./usr/share/man/cat3/field_back.0		comp-c-catman		.cat
 ./usr/share/man/cat3/field_buffer.0		comp-c-catman		.cat
@@ -7302,6 +7306,7 @@
 ./usr/share/man/cat3/free_menu.0		comp-c-catman		.cat
 ./usr/share/man/cat3/freeaddrinfo.0		comp-c-catman		.cat
 ./usr/share/man/cat3/freeifaddrs.0		comp-c-catman		.cat
+./usr/share/man/cat3/freelocale.0		comp-c-catman		.cat
 ./usr/share/man/cat3/freemntopts.0		comp-c-catman		.cat
 ./usr/share/man/cat3/freopen.0			comp-c-catman		.cat
 ./usr/share/man/cat3/frexp.0			comp-c-catman		.cat
@@ -7512,6 +7517,8 @@
 ./usr/share/man/cat3/getusershell.0		comp-c-catman		.cat
 ./usr/share/man/cat3/getutmp.0			comp-c-catman		.cat
 ./usr/share/man/cat3/getutmpx.0			comp-c-catman		.cat
+./usr/share/man/cat3/getutent.0			comp-c-catman		.cat
+./usr/share/man/cat3/getutline.0		comp-c-catman		.cat
 ./usr/share/man/cat3/getutxent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/getutxid.0			comp-c-catman		.cat
 ./usr/share/man/cat3/getutxline.0		comp-c-catman		.cat
@@ -8788,6 +8795,7 @@
 ./usr/share/man/cat3/new_menu.0			comp-c-catman		.cat
 ./usr/share/man/cat3/new_page.0			comp-c-catman		.cat
 ./usr/share/man/cat3/new_panel.0		comp-c-catman		.cat
+./usr/share/man/cat3/newlocale.0		comp-c-catman		.cat
 ./usr/share/man/cat3/newpad.0			comp-c-catman		.cat
 ./usr/share/man/cat3/newterm.0			comp-c-catman		.cat
 ./usr/share/man/cat3/newwin.0			comp-c-catman		.cat
@@ -9531,6 +9539,7 @@
 ./usr/share/man/cat3/putenv.0			comp-c-catman		.cat
 ./usr/share/man/cat3/putp.0			comp-c-catman		.cat
 ./usr/share/man/cat3/puts.0			comp-c-catman		.cat
+./usr/share/man/cat3/pututline.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pututxline.0		comp-c-catman		.cat
 ./usr/share/man/cat3/putw.0			comp-c-catman		.cat
 ./usr/share/man/cat3/putwc.0			comp-c-catman		.cat
@@ -9940,6 +9949,7 @@
 ./usr/share/man/cat3/setupterm.0		comp-c-catman		.cat
 ./usr/share/man/cat3/setusercontext.0		comp-c-catman		.cat
 ./usr/share/man/cat3/setusershell.0		comp-c-catman		.cat
+./usr/share/man/cat3/setutent.0			comp-c-catman		.cat
 ./usr/share/man/cat3/setutxent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/setvbuf.0			comp-c-catman		.cat
 ./usr/share/man/cat3/sha.0			comp-obsolete		obsolete
@@ -11651,6 +11661,8 @@
 ./usr/share/man/cat9/kmem_intr_zalloc.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_strdupsize.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_strfree.0		comp-sys-catman		.cat
+./usr/share/man/cat9/kmem_tmpbuf_alloc.0	comp-sys-catman		.cat
+./usr/share/man/cat9/kmem_tmpbuf_free.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_zalloc.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/knote.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kpause.0			comp-sys-catman		.cat
@@ -12035,6 +12047,7 @@
 ./usr/share/man/cat9/preempt.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/printf.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/printf_nolog.0		comp-sys-catman		.cat
+./usr/share/man/cat9/printf_nostamp.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/proc_find.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/proc_trampoline.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/profhz.0			comp-sys-catman		.cat
@@ -12228,6 +12241,14 @@
 ./usr/share/man/cat9/sprintf.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/stathz.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/store.0			comp-obsolete		obsolete
+./usr/share/man/cat9/strlist.0			comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_append.0		comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_count.0		comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_index.0		comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_match.0		comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_next.0		comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_pmatch.0		comp-sys-catman		.cat
+./usr/share/man/cat9/strlist_string.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/subyte.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/suibyte.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/suiword.0			comp-obsolete		obsolete
@@ -14322,6 +14343,8 @@
 ./usr/share/man/html3/asprintf_l.html		comp-c-htmlman		html
 ./usr/share/man/html3/assert.html		comp-c-htmlman		html
 ./usr/share/man/html3/assume_default_colors.html	comp-c-htmlman		html
+./usr/share/man/html3/asysctl.html		comp-c-htmlman		html
+./usr/share/man/html3/asysctlbyname.html	comp-c-htmlman		html
 ./usr/share/man/html3/at_quick_exit.html		comp-c-htmlman		html
 ./usr/share/man/html3/atan.html			comp-c-htmlman		html
 ./usr/share/man/html3/atan2.html		comp-c-htmlman		html
@@ -14917,6 +14940,7 @@
 ./usr/share/man/html3/dprintf.html		comp-c-htmlman		html
 ./usr/share/man/html3/drand48.html		comp-c-htmlman		html
 ./usr/share/man/html3/dup_field.html		comp-c-htmlman		html
+./usr/share/man/html3/duplocale.html		comp-c-htmlman		html
 ./usr/share/man/html3/dupwin.html		comp-c-htmlman		html
 ./usr/share/man/html3/dwarf.html	comp-c-htmlman	html
 ./usr/share/man/html3/dwarf_add_AT_comp_dir.html	comp-c-htmlman	html
@@ -15249,6 +15273,7 @@
 ./usr/share/man/html3/endservent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endttyent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endusershell.html		comp-c-htmlman		html
+./usr/share/man/html3/endutent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endutxent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endwin.html		comp-c-htmlman		html
 ./usr/share/man/html3/erand48.html		comp-c-htmlman		html
@@ -15427,29 +15452,29 @@
 ./usr/share/man/html3/fgetwc.html		comp-c-htmlman		html
 ./usr/share/man/html3/fgetwln.html		comp-c-htmlman		html
 ./usr/share/man/html3/fgetws.html		comp-c-htmlman		html
-./usr/share/man/html3/fido_assert_allow_cred.html	man-util-htmlman	html
-./usr/share/man/html3/fido_assert_new.html		man-util-htmlman	html
-./usr/share/man/html3/fido_assert_set_authdata.html	man-util-htmlman	html
-./usr/share/man/html3/fido_assert_verify.html		man-util-htmlman	html
-./usr/share/man/html3/fido_bio_dev_get_info.html	man-util-htmlman	html
-./usr/share/man/html3/fido_bio_enroll_new.html		man-util-htmlman	html
-./usr/share/man/html3/fido_bio_info_new.html		man-util-htmlman	html
-./usr/share/man/html3/fido_bio_template.html		man-util-htmlman	html
-./usr/share/man/html3/fido_cbor_info_new.html		man-util-htmlman	html
-./usr/share/man/html3/fido_cred_exclude.html		man-util-htmlman	html
-./usr/share/man/html3/fido_cred_new.html		man-util-htmlman	html
-./usr/share/man/html3/fido_cred_set_authdata.html	man-util-htmlman	html
-./usr/share/man/html3/fido_cred_verify.html		man-util-htmlman	html
-./usr/share/man/html3/fido_credman_metadata_new.html	man-util-htmlman	html
-./usr/share/man/html3/fido_dev_get_assert.html		man-util-htmlman	html
-./usr/share/man/html3/fido_dev_get_touch_begin.html	man-util-htmlman	html
-./usr/share/man/html3/fido_dev_info_manifest.html	man-util-htmlman	html
-./usr/share/man/html3/fido_dev_make_cred.html		man-util-htmlman	html
-./usr/share/man/html3/fido_dev_open.html		man-util-htmlman	html
-./usr/share/man/html3/fido_dev_set_io_functions.html	man-util-htmlman	html
-./usr/share/man/html3/fido_dev_set_pin.html		man-util-htmlman	html
-./usr/share/man/html3/fido_init.html			man-util-htmlman	html
-./usr/share/man/html3/fido_strerr.html			man-util-htmlman	html
+./usr/share/man/html3/fido_assert_allow_cred.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_assert_new.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_assert_set_authdata.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_assert_verify.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_bio_dev_get_info.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_bio_enroll_new.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_bio_info_new.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_bio_template.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_cbor_info_new.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_cred_exclude.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_cred_new.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_cred_set_authdata.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_cred_verify.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_credman_metadata_new.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_get_assert.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_get_touch_begin.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_info_manifest.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_make_cred.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_open.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_set_io_functions.html	comp-c-htmlman	html
+./usr/share/man/html3/fido_dev_set_pin.html		comp-c-htmlman	html
+./usr/share/man/html3/fido_init.html			comp-c-htmlman	html
+./usr/share/man/html3/fido_strerr.html			comp-c-htmlman	html
 ./usr/share/man/html3/field_arg.html		comp-c-htmlman		html
 ./usr/share/man/html3/field_back.html		comp-c-htmlman		html
 ./usr/share/man/html3/field_buffer.html		comp-c-htmlman		html
@@ -15557,6 +15582,7 @@
 ./usr/share/man/html3/free_menu.html		comp-c-htmlman		html
 ./usr/share/man/html3/freeaddrinfo.html		comp-c-htmlman		html
 ./usr/share/man/html3/freeifaddrs.html		comp-c-htmlman		html
+./usr/share/man/html3/freelocale.html		comp-c-htmlman		html
 ./usr/share/man/html3/freemntopts.html		comp-c-htmlman		html
 ./usr/share/man/html3/freopen.html		comp-c-htmlman		html
 ./usr/share/man/html3/frexp.html		comp-c-htmlman		html
@@ -15765,6 +15791,8 @@
 ./usr/share/man/html3/getusershell.html		comp-c-htmlman		html
 ./usr/share/man/html3/getutmp.html		comp-c-htmlman		html
 ./usr/share/man/html3/getutmpx.html		comp-c-htmlman		html
+./usr/share/man/html3/getutent.html		comp-c-htmlman		html
+./usr/share/man/html3/getutline.html		comp-c-htmlman		html
 ./usr/share/man/html3/getutxent.html		comp-c-htmlman		html
 ./usr/share/man/html3/getutxid.html		comp-c-htmlman		html
 ./usr/share/man/html3/getutxline.html		comp-c-htmlman		html
@@ -17009,6 +17037,7 @@
 ./usr/share/man/html3/new_menu.html		comp-c-htmlman		html
 ./usr/share/man/html3/new_page.html		comp-c-htmlman		html
 ./usr/share/man/html3/new_panel.html		comp-c-htmlman		html
+./usr/share/man/html3/newlocale.html		comp-c-htmlman		html
 ./usr/share/man/html3/newpad.html		comp-c-htmlman		html
 ./usr/share/man/html3/newterm.html		comp-c-htmlman		html
 ./usr/share/man/html3/newwin.html		comp-c-htmlman		html
@@ -17769,6 +17798,7 @@
 ./usr/share/man/html3/putenv.html		comp-c-htmlman		html
 ./usr/share/man/html3/putp.html			comp-c-htmlman		html
 ./usr/share/man/html3/puts.html			comp-c-htmlman		html
+./usr/share/man/html3/pututline.html		comp-c-htmlman		html
 ./usr/share/man/html3/pututxline.html		comp-c-htmlman		html
 ./usr/share/man/html3/putw.html			comp-c-htmlman		html
 ./usr/share/man/html3/putwc.html		comp-c-htmlman		html
@@ -18169,6 +18199,7 @@
 ./usr/share/man/html3/setupterm.html		comp-c-htmlman		html
 ./usr/share/man/html3/setusercontext.html	comp-c-htmlman		html
 ./usr/share/man/html3/setusershell.html		comp-c-htmlman		html
+./usr/share/man/html3/setutent.html		comp-c-htmlman		html
 ./usr/share/man/html3/setutxent.html		comp-c-htmlman		html
 ./usr/share/man/html3/setvbuf.html		comp-c-htmlman		html
 ./usr/share/man/html3/sha1.html			comp-c-htmlman		html
@@ -19808,6 +19839,8 @@
 ./usr/share/man/html9/kmem_intr_zalloc.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_strdupsize.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_strfree.html		comp-sys-htmlman	html
+./usr/share/man/html9/kmem_tmpbuf_alloc.html	comp-sys-htmlman	html
+./usr/share/man/html9/kmem_tmpbuf_free.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_zalloc.html		comp-sys-htmlman	html
 ./usr/share/man/html9/knote.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kpause.html		comp-sys-htmlman	html
@@ -20187,6 +20220,7 @@
 ./usr/share/man/html9/preempt.html		comp-sys-htmlman	html
 ./usr/share/man/html9/printf.html		comp-sys-htmlman	html
 ./usr/share/man/html9/printf_nolog.html		comp-sys-htmlman	html
+./usr/share/man/html9/printf_nostamp.html	comp-sys-htmlman	html
 ./usr/share/man/html9/proc_find.html		comp-sys-htmlman	html
 ./usr/share/man/html9/proc_trampoline.html	comp-obsolete		obsolete
 ./usr/share/man/html9/profhz.html		comp-sys-htmlman	html
@@ -20362,6 +20396,14 @@
 ./usr/share/man/html9/sprintf.html		comp-obsolete		obsolete
 ./usr/share/man/html9/stathz.html		comp-sys-htmlman	html
 ./usr/share/man/html9/store.html		comp-obsolete		obsolete
+./usr/share/man/html9/strlist.html		comp-sys-htmlman	html
+./usr/share/man/html9/strlist_append.html	comp-sys-htmlman	html
+./usr/share/man/html9/strlist_count.html	comp-sys-htmlman	html
+./usr/share/man/html9/strlist_index.html	comp-sys-htmlman	html
+./usr/share/man/html9/strlist_match.html	comp-sys-htmlman	html
+./usr/share/man/html9/strlist_next.html		comp-sys-htmlman	html
+./usr/share/man/html9/strlist_pmatch.html	comp-sys-htmlman	html
+./usr/share/man/html9/strlist_string.html	comp-sys-htmlman	html
 ./usr/share/man/html9/subyte.html		comp-obsolete		obsolete
 ./usr/share/man/html9/suibyte.html		comp-obsolete		obsolete
 ./usr/share/man/html9/suiword.html		comp-obsolete		obsolete
@@ -22458,6 +22500,8 @@
 ./usr/share/man/man3/asprintf_l.3		comp-c-man		.man
 ./usr/share/man/man3/assert.3			comp-c-man		.man
 ./usr/share/man/man3/assume_default_colors.3	comp-c-man		.man
+./usr/share/man/man3/asysctl.3			comp-c-man		.man
+./usr/share/man/man3/asysctlbyname.3		comp-c-man		.man
 ./usr/share/man/man3/at_quick_exit.3		comp-c-man		.man
 ./usr/share/man/man3/atan.3			comp-c-man		.man
 ./usr/share/man/man3/atan2.3			comp-c-man		.man
@@ -23108,6 +23152,7 @@
 ./usr/share/man/man3/drand48.3			comp-c-man		.man
 ./usr/share/man/man3/dsa.3			comp-obsolete		obsolete
 ./usr/share/man/man3/dup_field.3		comp-c-man		.man
+./usr/share/man/man3/duplocale.3		comp-c-man		.man
 ./usr/share/man/man3/dupwin.3			comp-c-man		.man
 ./usr/share/man/man3/dwarf.3	comp-c-man	.man
 ./usr/share/man/man3/dwarf_add_AT_comp_dir.3	comp-c-man	.man
@@ -23440,6 +23485,7 @@
 ./usr/share/man/man3/endservent.3		comp-c-man		.man
 ./usr/share/man/man3/endttyent.3		comp-c-man		.man
 ./usr/share/man/man3/endusershell.3		comp-c-man		.man
+./usr/share/man/man3/endutent.3			comp-c-man		.man
 ./usr/share/man/man3/endutxent.3		comp-c-man		.man
 ./usr/share/man/man3/endwin.3			comp-c-man		.man
 ./usr/share/man/man3/erand48.3			comp-c-man		.man
@@ -23619,29 +23665,29 @@
 ./usr/share/man/man3/fgetwc.3			comp-c-man		.man
 ./usr/share/man/man3/fgetwln.3			comp-c-man		.man
 ./usr/share/man/man3/fgetws.3			comp-c-man		.man
-./usr/share/man/man3/fido_assert_allow_cred.3		man-util-man	.man
-./usr/share/man/man3/fido_assert_new.3			man-util-man	.man
-./usr/share/man/man3/fido_assert_set_authdata.3		man-util-man	.man
-./usr/share/man/man3/fido_assert_verify.3		man-util-man	.man
-./usr/share/man/man3/fido_bio_dev_get_info.3		man-util-man	.man
-./usr/share/man/man3/fido_bio_enroll_new.3		man-util-man	.man
-./usr/share/man/man3/fido_bio_info_new.3		man-util-man	.man
-./usr/share/man/man3/fido_bio_template.3		man-util-man	.man
-./usr/share/man/man3/fido_cbor_info_new.3		man-util-man	.man
-./usr/share/man/man3/fido_cred_exclude.3		man-util-man	.man
-./usr/share/man/man3/fido_cred_new.3			man-util-man	.man
-./usr/share/man/man3/fido_cred_set_authdata.3		man-util-man	.man
-./usr/share/man/man3/fido_cred_verify.3			man-util-man	.man
-./usr/share/man/man3/fido_credman_metadata_new.3	man-util-man	.man
-./usr/share/man/man3/fido_dev_get_assert.3		man-util-man	.man
-./usr/share/man/man3/fido_dev_get_touch_begin.3		man-util-man	.man
-./usr/share/man/man3/fido_dev_info_manifest.3		man-util-man	.man
-./usr/share/man/man3/fido_dev_make_cred.3		man-util-man	.man
-./usr/share/man/man3/fido_dev_open.3			man-util-man	.man
-./usr/share/man/man3/fido_dev_set_io_functions.3	man-util-man	.man
-./usr/share/man/man3/fido_dev_set_pin.3			man-util-man	.man
-./usr/share/man/man3/fido_init.3			man-util-man	.man
-./usr/share/man/man3/fido_strerr.3			man-util-man	.man
+./usr/share/man/man3/fido_assert_allow_cred.3		comp-c-man	.man
+./usr/share/man/man3/fido_assert_new.3			comp-c-man	.man
+./usr/share/man/man3/fido_assert_set_authdata.3		comp-c-man	.man
+./usr/share/man/man3/fido_assert_verify.3		comp-c-man	.man
+./usr/share/man/man3/fido_bio_dev_get_info.3		comp-c-man	.man
+./usr/share/man/man3/fido_bio_enroll_new.3		comp-c-man	.man
+./usr/share/man/man3/fido_bio_info_new.3		comp-c-man	.man
+./usr/share/man/man3/fido_bio_template.3		comp-c-man	.man
+./usr/share/man/man3/fido_cbor_info_new.3		comp-c-man	.man
+./usr/share/man/man3/fido_cred_exclude.3		comp-c-man	.man
+./usr/share/man/man3/fido_cred_new.3			comp-c-man	.man
+./usr/share/man/man3/fido_cred_set_authdata.3		comp-c-man	.man
+./usr/share/man/man3/fido_cred_verify.3			comp-c-man	.man
+./usr/share/man/man3/fido_credman_metadata_new.3	comp-c-man	.man
+./usr/share/man/man3/fido_dev_get_assert.3		comp-c-man	.man
+./usr/share/man/man3/fido_dev_get_touch_begin.3		comp-c-man	.man
+./usr/share/man/man3/fido_dev_info_manifest.3		comp-c-man	.man
+./usr/share/man/man3/fido_dev_make_cred.3		comp-c-man	.man
+./usr/share/man/man3/fido_dev_open.3			comp-c-man	.man
+./usr/share/man/man3/fido_dev_set_io_functions.3	comp-c-man	.man
+./usr/share/man/man3/fido_dev_set_pin.3			comp-c-man	.man
+./usr/share/man/man3/fido_init.3			comp-c-man	.man
+./usr/share/man/man3/fido_strerr.3			comp-c-man	.man
 ./usr/share/man/man3/field_arg.3		comp-c-man		.man
 ./usr/share/man/man3/field_back.3		comp-c-man		.man
 ./usr/share/man/man3/field_buffer.3		comp-c-man		.man
@@ -23749,6 +23795,7 @@
 ./usr/share/man/man3/free_menu.3		comp-c-man		.man
 ./usr/share/man/man3/freeaddrinfo.3		comp-c-man		.man
 ./usr/share/man/man3/freeifaddrs.3		comp-c-man		.man
+./usr/share/man/man3/freelocale.3		comp-c-man		.man
 ./usr/share/man/man3/freemntopts.3		comp-c-man		.man
 ./usr/share/man/man3/freopen.3			comp-c-man		.man
 ./usr/share/man/man3/frexp.3			comp-c-man		.man
@@ -23959,6 +24006,8 @@
 ./usr/share/man/man3/getusershell.3		comp-c-man		.man
 ./usr/share/man/man3/getutmp.3			comp-c-man		.man
 ./usr/share/man/man3/getutmpx.3			comp-c-man		.man
+./usr/share/man/man3/getutent.3			comp-c-man		.man
+./usr/share/man/man3/getutline.3		comp-c-man		.man
 ./usr/share/man/man3/getutxent.3		comp-c-man		.man
 ./usr/share/man/man3/getutxid.3			comp-c-man		.man
 ./usr/share/man/man3/getutxline.3		comp-c-man		.man
@@ -25236,6 +25285,7 @@
 ./usr/share/man/man3/new_menu.3			comp-c-man		.man
 ./usr/share/man/man3/new_page.3			comp-c-man		.man
 ./usr/share/man/man3/new_panel.3		comp-c-man		.man
+./usr/share/man/man3/newlocale.3		comp-c-man		.man
 ./usr/share/man/man3/newpad.3			comp-c-man		.man
 ./usr/share/man/man3/newterm.3			comp-c-man		.man
 ./usr/share/man/man3/newwin.3			comp-c-man		.man
@@ -26002,6 +26052,7 @@
 ./usr/share/man/man3/putenv.3			comp-c-man		.man
 ./usr/share/man/man3/putp.3			comp-c-man		.man
 ./usr/share/man/man3/puts.3			comp-c-man		.man
+./usr/share/man/man3/pututline.3		comp-c-man		.man
 ./usr/share/man/man3/pututxline.3		comp-c-man		.man
 ./usr/share/man/man3/putw.3			comp-c-man		.man
 ./usr/share/man/man3/putwc.3			comp-c-man		.man
@@ -26407,6 +26458,7 @@
 ./usr/share/man/man3/setupterm.3		comp-c-man		.man
 ./usr/share/man/man3/setusercontext.3		comp-c-man		.man
 ./usr/share/man/man3/setusershell.3		comp-c-man		.man
+./usr/share/man/man3/setutent.3			comp-c-man		.man
 ./usr/share/man/man3/setutxent.3		comp-c-man		.man
 ./usr/share/man/man3/setvbuf.3			comp-c-man		.man
 ./usr/share/man/man3/sha.3			comp-obsolete		obsolete
@@ -28117,6 +28169,8 @@
 ./usr/share/man/man9/kmem_intr_zalloc.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_strdupsize.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_strfree.9		comp-sys-man		.man
+./usr/share/man/man9/kmem_tmpbuf_alloc.9	comp-sys-man		.man
+./usr/share/man/man9/kmem_tmpbuf_free.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_zalloc.9		comp-sys-man		.man
 ./usr/share/man/man9/knote.9			comp-sys-man		.man
 ./usr/share/man/man9/kpause.9			comp-sys-man		.man
@@ -28501,6 +28555,7 @@
 ./usr/share/man/man9/preempt.9			comp-sys-man		.man
 ./usr/share/man/man9/printf.9			comp-sys-man		.man
 ./usr/share/man/man9/printf_nolog.9		comp-sys-man		.man
+./usr/share/man/man9/printf_nostamp.9		comp-sys-man		.man
 ./usr/share/man/man9/proc_find.9		comp-sys-man		.man
 ./usr/share/man/man9/proc_trampoline.9		comp-obsolete		obsolete
 ./usr/share/man/man9/profhz.9			comp-sys-man		.man
@@ -28694,6 +28749,14 @@
 ./usr/share/man/man9/sprintf.9			comp-obsolete		obsolete
 ./usr/share/man/man9/stathz.9			comp-sys-man		.man
 ./usr/share/man/man9/store.9			comp-obsolete		obsolete
+./usr/share/man/man9/strlist.9			comp-sys-man		.man
+./usr/share/man/man9/strlist_append.9		comp-sys-man		.man
+./usr/share/man/man9/strlist_count.9		comp-sys-man		.man
+./usr/share/man/man9/strlist_index.9		comp-sys-man		.man
+./usr/share/man/man9/strlist_match.9		comp-sys-man		.man
+./usr/share/man/man9/strlist_next.9		comp-sys-man		.man
+./usr/share/man/man9/strlist_pmatch.9		comp-sys-man		.man
+./usr/share/man/man9/strlist_string.9		comp-sys-man		.man
 ./usr/share/man/man9/subyte.9			comp-obsolete		obsolete
 ./usr/share/man/man9/suibyte.9			comp-obsolete		obsolete
 ./usr/share/man/man9/suiword.9			comp-obsolete		obsolete

Index: src/distrib/sets/lists/comp/stl.mi
diff -u src/distrib/sets/lists/comp/stl.mi:1.7 src/distrib/sets/lists/comp/stl.mi:1.7.2.1
--- src/distrib/sets/lists/comp/stl.mi:1.7	Thu Aug 27 15:32:00 2020
+++ src/distrib/sets/lists/comp/stl.mi	Sat Apr  3 22:43:40 2021
@@ -1,7 +1,7 @@
-# $NetBSD: stl.mi,v 1.7 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: stl.mi,v 1.7.2.1 2021/04/03 22:43:40 thorpej Exp $
 ./usr/lib/crtbegin.o				comp-c-lib	compatfile
 ./usr/lib/crtend.o				comp-c-lib	compatfile
 ./usr/lib/crti.o				comp-c-lib	compatfile
 ./usr/lib/crtn.o				comp-c-lib	compatfile
-./usr/lib/dtrace/drti.o				comp-c-lib	dtrace
+./usr/lib/dtrace/drti.o				comp-c-lib	dtrace,obsolete
 ./usr/lib/sysident.o				comp-c-lib	compatfile

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.344.2.1 src/distrib/sets/lists/debug/mi:1.344.2.2
--- src/distrib/sets/lists/debug/mi:1.344.2.1	Sun Jan  3 16:49:31 2021
+++ src/distrib/sets/lists/debug/mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.344.2.1 2021/01/03 16:49:31 thorpej Exp $
+# $NetBSD: mi,v 1.344.2.2 2021/04/03 22:43:40 thorpej 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
@@ -320,6 +320,7 @@
 ./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
+./usr/libdata/debug/netbsd			comp-sysutil-debug	debug,kernel_dir
 ./usr/libdata/debug/sbin/amrctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/apmlabel.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/atactl.debug		comp-sysutil-debug	debug

Index: src/distrib/sets/lists/debug/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.4 src/distrib/sets/lists/debug/module.md.amd64:1.4.2.1
--- src/distrib/sets/lists/debug/module.md.amd64:1.4	Sun Nov  1 18:51:34 2020
+++ src/distrib/sets/lists/debug/module.md.amd64	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.4 2020/11/01 18:51:34 pgoyette Exp $
+# $NetBSD: module.md.amd64,v 1.4.2.1 2021/04/03 22:43:40 thorpej Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacad				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibat				modules-base-kernel	kmod,debug
@@ -179,8 +179,6 @@
 ./usr/libdata/debug/@MODULEDIR@/nxt2k/nxt2k.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/odcm				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/odcm/odcm.kmod.debug			modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/pad				modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/powernow				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/powernow/powernow.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/pwdog				modules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/debug/module.md.i386
diff -u src/distrib/sets/lists/debug/module.md.i386:1.2 src/distrib/sets/lists/debug/module.md.i386:1.2.2.1
--- src/distrib/sets/lists/debug/module.md.i386:1.2	Tue Sep  8 14:57:32 2020
+++ src/distrib/sets/lists/debug/module.md.i386	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.i386,v 1.2 2020/09/08 14:57:32 martin Exp $
+# $NetBSD: module.md.i386,v 1.2.2.1 2021/04/03 22:43:40 thorpej Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacad				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibat				modules-base-kernel	kmod,debug
@@ -135,8 +135,6 @@
 ./usr/libdata/debug/@MODULEDIR@/nxt2k/nxt2k.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/odcm				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/odcm/odcm.kmod.debug			modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/pad				modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/padlock				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/padlock/padlock.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/powernow				modules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.7 src/distrib/sets/lists/debug/module.mi:1.7.2.1
--- src/distrib/sets/lists/debug/module.mi:1.7	Sun Oct 18 10:10:18 2020
+++ src/distrib/sets/lists/debug/module.mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.7 2020/10/18 10:10:18 rin Exp $
+# $NetBSD: module.mi,v 1.7.2.1 2021/04/03 22:43:40 thorpej Exp $
 ./usr/libdata/debug/@MODULEDIR@					modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug	modules-base-kernel	kmod,debug
@@ -286,6 +286,8 @@
 ./usr/libdata/debug/@MODULEDIR@/opencrypto/opencrypto.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/overlay				modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/overlay/overlay.kmod.debug		modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/pad				modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/pad/pad.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/pciverbose			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/pciverbose/pciverbose.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/pf				modules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.269 src/distrib/sets/lists/debug/shl.mi:1.269.2.1
--- src/distrib/sets/lists/debug/shl.mi:1.269	Fri Dec  4 18:43:47 2020
+++ src/distrib/sets/lists/debug/shl.mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.269 2020/12/04 18:43:47 christos Exp $
+# $NetBSD: shl.mi,v 1.269.2.1 2021/04/03 22:43:40 thorpej 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
@@ -77,7 +77,7 @@
 ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libbfd.so.16.0.debug		comp-sys-debug	debug,compatfile,binutils=231
 ./usr/libdata/debug/usr/lib/libbfd.so.17.0.debug		comp-sys-debug	debug,compatfile,binutils=234
-./usr/libdata/debug/usr/lib/libbind9.so.15.0.debug		comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libbind9.so.16.0.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug		comp-obsolete	obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libblocklist.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug		comp-sys-debug	debug,compatfile
@@ -104,7 +104,7 @@
 ./usr/libdata/debug/usr/lib/libdes.so.14.0.debug			comp-crypto-debug	debug,compatfile,openssl=11
 ./usr/libdata/debug/usr/lib/libdevmapper.so.1.0.debug		comp-lvm-debug	debug,compatfile,lvm
 ./usr/libdata/debug/usr/lib/libdm.so.0.0.debug 			comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libdns.so.15.0.debug 		comp-bind-debug debug,compatfile
+./usr/libdata/debug/usr/lib/libdns.so.16.0.debug 		comp-bind-debug debug,compatfile
 ./usr/libdata/debug/usr/lib/libdns_sd.so.0.0.debug		comp-mdns-debug	debug,compatfile,mdns
 ./usr/libdata/debug/usr/lib/libdtrace.so.3.0.debug		comp-sys-debug	debug,compatfile,dtrace
 ./usr/libdata/debug/usr/lib/libdwarf.so.2.0.debug		comp-sys-debug	debug,compatfile
@@ -136,10 +136,10 @@
 ./usr/libdata/debug/usr/lib/libhx509.so.6.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libintl.so.1.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libipsec.so.3.0.debug		comp-net-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libirs.so.15.0.debug		comp-bind-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libisc.so.15.0.debug		comp-bind-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libisccc.so.15.0.debug		comp-bind-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libisccfg.so.15.0.debug		comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libirs.so.16.0.debug		comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libisc.so.16.0.debug		comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libisccc.so.16.0.debug		comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libisccfg.so.16.0.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libiscsi.so.2.0.debug		comp-iscsi-debug	debug,compatfile,iscsi
 ./usr/libdata/debug/usr/lib/libisns.so.0.0.debug		comp-isns-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libjemalloc.so.0.0.debug		comp-sys-debug	debug,compatfile
@@ -174,7 +174,7 @@
 ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug		comp-crypto-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libnetpgpverify.so.5.0.debug	comp-crypto-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libnpf.so.0.1.debug			comp-npf-debug	debug,compatfile,npf
-./usr/libdata/debug/usr/lib/libns.so.15.0.debug			comp-bind-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libns.so.16.0.debug			comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libnvmm.so.0.1.debug	comp-sys-shlib		nvmm,pic,debug
 ./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libobjc.so.4.0.debug		comp-sys-debug	debug,compatfile,gcc
@@ -308,7 +308,7 @@
 ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug		comp-sys-debug	debug,compatfile,skey
 ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug			comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libssh.so.38.0.debug		comp-secsh-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libssh.so.39.0.debug		comp-secsh-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug		comp-crypto-debug	debug,compatfile,openssl=10
 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug		comp-crypto-debug	debug,compatfile,openssl=11
 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug		comp-sys-debug	debug,compatfile,gcc=7,cxx,libstdcxx
@@ -327,7 +327,7 @@
 ./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=9
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug		comp-sys-debug	debug,compatfile,rump
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
-./usr/libdata/debug/usr/lib/libunbound.so.6.2.debug 		comp-net-debug	debug,compatfile,unbound
+./usr/libdata/debug/usr/lib/libunbound.so.7.0.debug 		comp-net-debug	debug,compatfile,unbound
 ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libutil.so.7.23.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libutil.so.7.24.debug		comp-sys-debug	debug,compatfile

Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.263 src/distrib/sets/lists/etc/mi:1.263.2.1
--- src/distrib/sets/lists/etc/mi:1.263	Tue Sep  8 12:52:44 2020
+++ src/distrib/sets/lists/etc/mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.263 2020/09/08 12:52:44 martin Exp $
+# $NetBSD: mi,v 1.263.2.1 2021/04/03 22:43:40 thorpej Exp $
 #
 # Note: end-user configuration files that are moved to another location
 #	should not be marked "obsolete"; they should just be removed from
@@ -214,6 +214,7 @@
 ./etc/rc.d/dhcrelay				etc-dhcpd-rc
 ./etc/rc.d/dmesg				etc-sys-rc
 ./etc/rc.d/downinterfaces			etc-sys-rc
+./etc/rc.d/entropy				etc-sys-rc
 ./etc/rc.d/envsys				etc-sys-rc
 ./etc/rc.d/fixsb				etc-obsolete		obsolete
 ./etc/rc.d/fsck					etc-sys-rc
@@ -246,10 +247,11 @@
 ./etc/rc.d/lkm1					etc-obsolete		obsolete
 ./etc/rc.d/lkm2					etc-obsolete		obsolete
 ./etc/rc.d/lkm3					etc-obsolete		obsolete
-./etc/rc.d/llvmlockdir				etc-sys-rc
+./etc/rc.d/llvmlockdir				etc-obsolete		obsolete
 ./etc/rc.d/local				etc-sys-rc
 ./etc/rc.d/lpd					etc-lpr-rc
 ./etc/rc.d/lvm					etc-sys-rc
+./etc/rc.d/lvmlockdir				etc-sys-rc
 ./etc/rc.d/makemandb				etc-man-rc
 ./etc/rc.d/mdnsd				etc-mdns-rc
 ./etc/rc.d/mixerctl				etc-audio-rc

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1711.2.1 src/distrib/sets/lists/man/mi:1.1711.2.2
--- src/distrib/sets/lists/man/mi:1.1711.2.1	Sun Jan  3 16:49:32 2021
+++ src/distrib/sets/lists/man/mi	Sat Apr  3 22:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1711.2.1 2021/01/03 16:49:32 thorpej Exp $
+# $NetBSD: mi,v 1.1711.2.2 2021/04/03 22:43:40 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1107,6 +1107,8 @@
 ./usr/share/man/cat4/evbarm/iopaau.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbarm/iopwdog.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbarm/rktsadc.0		man-sys-catman		.cat
+./usr/share/man/cat4/evbarm/vcaudio.0		man-sys-catman		.cat
+./usr/share/man/cat4/evbarm/vchiq.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbmips/aupci.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbmips/intro.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbppc/cpc.0		man-sys-catman		.cat
@@ -1953,6 +1955,7 @@
 ./usr/share/man/cat4/vax/asc.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/autoconf.0		man-sys-catman		.cat
 ./usr/share/man/cat4/vax/cons.0			man-sys-catman		.cat
+./usr/share/man/cat4/vax/covid.0		man-sys-catman		.cat
 ./usr/share/man/cat4/vax/crl.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/css.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/ct.0			man-sys-catman		.cat
@@ -2340,6 +2343,7 @@
 ./usr/share/man/cat7/c99.0			man-reference-catman	.cat
 ./usr/share/man/cat7/des_modes.0		man-reference-catman	.cat
 ./usr/share/man/cat7/editline.0			man-sys-catman		.cat
+./usr/share/man/cat7/entropy.0			man-reference-catman	.cat
 ./usr/share/man/cat7/environ.0			man-reference-catman	.cat
 ./usr/share/man/cat7/glob.0			man-reference-catman	.cat
 ./usr/share/man/cat7/groups.0			man-reference-catman	.cat
@@ -2367,6 +2371,7 @@
 ./usr/share/man/cat7/pcap-linktype.0		man-netutil-catman	.cat
 ./usr/share/man/cat7/pcap-tstamp.0		man-netutil-catman	.cat
 ./usr/share/man/cat7/pkgsrc.0			man-reference-catman	.cat
+./usr/share/man/cat7/random.0			man-reference-catman	.cat
 ./usr/share/man/cat7/re_format.0		man-reference-catman	.cat
 ./usr/share/man/cat7/release.0			man-reference-catman	.cat
 ./usr/share/man/cat7/rfc6056.0			man-reference-catman	.cat
@@ -4331,6 +4336,8 @@
 ./usr/share/man/html4/evbarm/iopaau.html	man-sys-htmlman		html
 ./usr/share/man/html4/evbarm/iopwdog.html	man-sys-htmlman		html
 ./usr/share/man/html4/evbarm/rktsadc.html	man-sys-htmlman		html
+./usr/share/man/html4/evbarm/vcaudio.html	man-sys-htmlman		html
+./usr/share/man/html4/evbarm/vchiq.html		man-sys-htmlman		html
 ./usr/share/man/html4/evbmips/aupci.html	man-sys-htmlman		html
 ./usr/share/man/html4/evbmips/intro.html	man-sys-htmlman		html
 ./usr/share/man/html4/evbppc/cpc.html		man-sys-htmlman		html
@@ -4808,6 +4815,7 @@
 ./usr/share/man/html4/rcons.html		man-sys-htmlman		html
 ./usr/share/man/html4/rdcphy.html		man-sys-htmlman		html
 ./usr/share/man/html4/re.html			man-sys-htmlman		html
+./usr/share/man/html4/rge.html			man-sys-htmlman		html
 ./usr/share/man/html4/rgephy.html		man-sys-htmlman		html
 ./usr/share/man/html4/rlphy.html		man-sys-htmlman		html
 ./usr/share/man/html4/rmidi.html		man-sys-htmlman		html
@@ -5101,6 +5109,7 @@
 ./usr/share/man/html4/vax/asc.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/autoconf.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/cons.html		man-sys-htmlman		html
+./usr/share/man/html4/vax/covid.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/crl.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/css.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/ct.html		man-sys-htmlman		html
@@ -5465,6 +5474,7 @@
 ./usr/share/man/html7/c99.html			man-reference-htmlman	html
 ./usr/share/man/html7/des_modes.html		man-reference-htmlman	html
 ./usr/share/man/html7/editline.html		man-sys-htmlman		html
+./usr/share/man/html7/entropy.html		man-reference-htmlman	html
 ./usr/share/man/html7/environ.html		man-reference-htmlman	html
 ./usr/share/man/html7/glob.html			man-reference-htmlman	html
 ./usr/share/man/html7/groups.html		man-reference-htmlman	html
@@ -5488,6 +5498,7 @@
 ./usr/share/man/html7/pcap-linktype.html	man-netutil-htmlman	html
 ./usr/share/man/html7/pcap-tstamp.html		man-netutil-htmlman	html
 ./usr/share/man/html7/pkgsrc.html		man-reference-htmlman	html
+./usr/share/man/html7/random.html		man-reference-htmlman	html
 ./usr/share/man/html7/re_format.html		man-reference-htmlman	html
 ./usr/share/man/html7/release.html		man-reference-htmlman	html
 ./usr/share/man/html7/rfc6056.html		man-reference-htmlman	html
@@ -7327,6 +7338,8 @@
 ./usr/share/man/man4/evbarm/iopaau.4		man-sys-man		.man
 ./usr/share/man/man4/evbarm/iopwdog.4		man-sys-man		.man
 ./usr/share/man/man4/evbarm/rktsadc.4		man-sys-man		.man
+./usr/share/man/man4/evbarm/vcaudio.4		man-sys-man		.man
+./usr/share/man/man4/evbarm/vchiq.4		man-sys-man		.man
 ./usr/share/man/man4/evbmips/aupci.4		man-sys-man		.man
 ./usr/share/man/man4/evbmips/intro.4		man-sys-man		.man
 ./usr/share/man/man4/evbppc/cpc.4		man-sys-man		.man
@@ -7869,6 +7882,7 @@
 ./usr/share/man/man4/rcons.4			man-sys-man		.man
 ./usr/share/man/man4/rdcphy.4			man-sys-man		.man
 ./usr/share/man/man4/re.4			man-sys-man		.man
+./usr/share/man/man4/rge.4			man-sys-man		.man
 ./usr/share/man/man4/rgephy.4			man-sys-man		.man
 ./usr/share/man/man4/rl.4			man-obsolete		obsolete
 ./usr/share/man/man4/rlphy.4			man-sys-man		.man
@@ -8173,6 +8187,7 @@
 ./usr/share/man/man4/vax/asc.4			man-sys-man		.man
 ./usr/share/man/man4/vax/autoconf.4		man-sys-man		.man
 ./usr/share/man/man4/vax/cons.4			man-sys-man		.man
+./usr/share/man/man4/vax/covid.4		man-sys-man		.man
 ./usr/share/man/man4/vax/crl.4			man-sys-man		.man
 ./usr/share/man/man4/vax/css.4			man-sys-man		.man
 ./usr/share/man/man4/vax/ct.4			man-sys-man		.man
@@ -8560,6 +8575,7 @@
 ./usr/share/man/man7/c99.7			man-reference-man	.man
 ./usr/share/man/man7/des_modes.7		man-reference-man	.man
 ./usr/share/man/man7/editline.7			man-sys-man		.man
+./usr/share/man/man7/entropy.7			man-reference-man	.man
 ./usr/share/man/man7/environ.7			man-reference-man	.man
 ./usr/share/man/man7/glob.7			man-reference-man	.man
 ./usr/share/man/man7/groups.7			man-reference-man	.man
@@ -8586,6 +8602,7 @@
 ./usr/share/man/man7/pcap-linktype.7		man-netutil-man		.man
 ./usr/share/man/man7/pcap-tstamp.7		man-netutil-man		.man
 ./usr/share/man/man7/pkgsrc.7			man-reference-man	.man
+./usr/share/man/man7/random.7			man-reference-man	.man
 ./usr/share/man/man7/re_format.7		man-reference-man	.man
 ./usr/share/man/man7/release.7			man-reference-man	.man
 ./usr/share/man/man7/rfc6056.7			man-reference-man	.man

Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.91 src/distrib/sets/lists/modules/md.amd64:1.91.2.1
--- src/distrib/sets/lists/modules/md.amd64:1.91	Sun Nov  1 18:51:34 2020
+++ src/distrib/sets/lists/modules/md.amd64	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.91 2020/11/01 18:51:34 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.91.2.1 2021/04/03 22:43:41 thorpej Exp $
 #
 ./@MODULEDIR@/acpiacad				modules-base-kernel	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		modules-base-kernel	kmod
@@ -190,8 +190,6 @@
 ./@MODULEDIR@/nxt2k/nxt2k.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/odcm				modules-base-kernel	kmod
 ./@MODULEDIR@/odcm/odcm.kmod			modules-base-kernel	kmod
-./@MODULEDIR@/pad				modules-base-kernel	kmod
-./@MODULEDIR@/pad/pad.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/powernow				modules-base-kernel	kmod
 ./@MODULEDIR@/powernow/powernow.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/pwdog				modules-base-kernel	kmod

Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.89 src/distrib/sets/lists/modules/md.i386:1.89.2.1
--- src/distrib/sets/lists/modules/md.i386:1.89	Tue Sep  8 10:05:47 2020
+++ src/distrib/sets/lists/modules/md.i386	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.89 2020/09/08 10:05:47 yamaguchi Exp $
+# $NetBSD: md.i386,v 1.89.2.1 2021/04/03 22:43:41 thorpej Exp $
 #
 ./@MODULEDIR@/acpiacad				modules-base-kernel	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		modules-base-kernel	kmod
@@ -150,8 +150,6 @@
 ./@MODULEDIR@/nxt2k/nxt2k.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/odcm				modules-base-kernel	kmod
 ./@MODULEDIR@/odcm/odcm.kmod			modules-base-kernel	kmod
-./@MODULEDIR@/pad				modules-base-kernel	kmod
-./@MODULEDIR@/pad/pad.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/padlock				modules-base-kernel	kmod
 ./@MODULEDIR@/padlock/padlock.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/powernow				modules-base-kernel	kmod

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.142 src/distrib/sets/lists/modules/mi:1.142.2.1
--- src/distrib/sets/lists/modules/mi:1.142	Sat Sep 26 17:49:50 2020
+++ src/distrib/sets/lists/modules/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.142 2020/09/26 17:49:50 jmcneill Exp $
+# $NetBSD: mi,v 1.142.2.1 2021/04/03 22:43:41 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -345,6 +345,8 @@
 ./@MODULEDIR@/opencrypto/opencrypto.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/overlay				modules-base-kernel	kmod
 ./@MODULEDIR@/overlay/overlay.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/pad				modules-base-kernel	kmod
+./@MODULEDIR@/pad/pad.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/pciverbose			modules-base-kernel	kmod
 ./@MODULEDIR@/pciverbose/pciverbose.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/pf				modules-base-kernel	kmod

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.993.2.1 src/distrib/sets/lists/tests/mi:1.993.2.2
--- src/distrib/sets/lists/tests/mi:1.993.2.1	Sun Jan  3 16:49:32 2021
+++ src/distrib/sets/lists/tests/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.993.2.1 2021/01/03 16:49:32 thorpej Exp $
+# $NetBSD: mi,v 1.993.2.2 2021/04/03 22:43:41 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1296,6 +1296,7 @@
 ./usr/tests/bin/sh/t_expand				tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_fsplit				tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_here				tests-bin-tests		compattestfile,atf
+./usr/tests/bin/sh/t_input				tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_option				tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_patterns				tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_redir				tests-bin-tests		compattestfile,atf
@@ -3267,6 +3268,7 @@
 ./usr/tests/lib/libcurses/check_files/addchstr.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/addchstr2.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/addchstr3.chk		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libcurses/check_files/addnstr.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/addnwstr1.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/addnwstr2.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/addstr.chk		tests-lib-tests		compattestfile,atf
@@ -3477,6 +3479,7 @@
 ./usr/tests/lib/libcurses/check_files/waddchstr.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/waddnwstr1.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/waddnwstr2.chk		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libcurses/check_files/waddstr.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/waddwstr1.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/waddwstr2.chk		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/check_files/waddwstr3.chk		tests-lib-tests		compattestfile,atf
@@ -3523,6 +3526,7 @@
 ./usr/tests/lib/libcurses/terminfo.db			tests-obsolete		obsolete
 ./usr/tests/lib/libcurses/tests				tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/tests/add_wch			tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libcurses/tests/addbytes		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/tests/addch			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/tests/addchnstr		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libcurses/tests/addchstr		tests-lib-tests		compattestfile,atf
@@ -4702,53 +4706,388 @@
 ./usr/tests/usr.bin/id/t_id				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/id/t_whoami				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/indent				tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/Atffile			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/Kyuafile			tests-usr.bin-tests	compattestfile,atf,kyua
-./usr/tests/usr.bin/indent/binary.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/binary.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/comments.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/comments.0.pro		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/comments.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/cs.0				tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/cs.0.pro			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/cs.0.stdout			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/declarations.0		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/declarations.0.stdout	tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/elsecomment.0		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/elsecomment.0.pro		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/elsecomment.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/f_decls.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/f_decls.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/float.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/float.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/label.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/label.0.pro			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/label.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/list_head.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/list_head.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/ncs.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/ncs.0.pro			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/ncs.0.stdout			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/offsetof.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/offsetof.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/parens.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/parens.0.pro			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/parens.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/pcs.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/pcs.0.pro			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/pcs.0.stdout			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/struct.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/struct.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/surplusbad.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/surplusbad.0.pro		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/surplusbad.0.stdout		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/t_indent			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0.list	tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0.pro	tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0.stdout	tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/wchar.0			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/wchar.0.stdout		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/Atffile					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/Kyuafile					tests-usr.bin-tests	compattestfile,atf,kyua
+./usr/tests/usr.bin/indent/binary.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/binary.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/block.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/block.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/comment-line-end.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/comment-line-end.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/comments.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/comments.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/comments.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/cs.0						tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/cs.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/cs.0.stdout					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/declarations.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/declarations.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/elsecomment.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/elsecomment.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/elsecomment.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/f_decls.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/f_decls.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/float.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/float.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/indent_variables.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/indent_variables.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/indent_variables.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/label.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/label.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/label.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/lineno.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/lineno.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/lineno.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/list_head.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/list_head.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/ncs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/ncs.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/ncs.0.stdout					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/offsetof.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/offsetof.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt--version.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt--version.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt--version.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-P.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-P.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-P.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-T.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-T.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-T.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-U.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-U.0.list					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-U.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-U.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bacc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bacc.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bacc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bad.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bad.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bad.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-badp.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-badp.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-badp.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bap+sob.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bap+sob.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bap+sob.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bap.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bap.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bap.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bbb.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bbb.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bbb.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bc.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bl.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bl.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bl.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-br.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-br.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-br.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bs.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-bs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-c.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-c.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-c.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cd.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cd.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cd.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cdb.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cdb.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cdb.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ce.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ce.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ce.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ci.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ci.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ci.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cli.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cli.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cli.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cs.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-cs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-d.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-d.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-d.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-di.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-di.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-di.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-dj.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-dj.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-dj.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-eei.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-eei.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-eei.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ei.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ei.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ei.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fbs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fbs.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fbs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fc1.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fc1.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fc1.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fcb.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fcb.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-fcb.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-i.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-i.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-i.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ip.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ip.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ip.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-l.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-l.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-l.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lc.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ldi.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ldi.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ldi.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lp.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lp.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lp.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lpl.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lpl.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-lpl.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbacc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbacc.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbacc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbad.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbad.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbad.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbadp.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbadp.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbadp.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbap.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbap.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbap.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbbb.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbbb.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbbb.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbc.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbs.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nbs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ncdb.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ncdb.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ncdb.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nce.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nce.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nce.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ncs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ncs.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ncs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ndj.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ndj.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ndj.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-neei.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-neei.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-neei.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nei.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nei.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nei.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfbs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfbs.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfbs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfc1.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfc1.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfc1.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfcb.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfcb.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nfcb.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nip.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nip.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nip.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nlp.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nlp.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nlp.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nlpl.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nlpl.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nlpl.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npcs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npcs.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npcs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npro.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npro.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npro.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npsl.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npsl.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-npsl.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nsc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nsc.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nsc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nsob.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nsob.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nsob.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nut.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nut.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nut.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nv.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nv.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-nv.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-pcs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-pcs.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-pcs.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-psl.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-psl.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-psl.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-sc.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-sc.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-sc.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-sob.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-sob.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-sob.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ta.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ta.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ta.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ts.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ts.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ts.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ut.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ut.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-ut.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-v.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-v.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/opt-v.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/parens.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/parens.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/parens.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/pcs.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/pcs.0.pro					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/pcs.0.stdout					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/struct.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/struct.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/surplusbad.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/surplusbad.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/surplusbad.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/t_indent					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-binary_op.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-binary_op.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-binary_op.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-case_label.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-case_label.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-case_label.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-colon.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-colon.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-colon.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-comma.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-comma.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-comma.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-comment.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-comment.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-comment.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-decl.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-decl.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-decl.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-do_stmt.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-do_stmt.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-do_stmt.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-end_of_file.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-end_of_file.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-end_of_file.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-for_exprs.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-for_exprs.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-for_exprs.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-form_feed.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-form_feed.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-form_feed.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-funcname.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-funcname.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-funcname.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-ident.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-ident.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-ident.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0.pro		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0.stdout		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_do.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_do.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_do.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_do_else.0			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_do_else.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_do_else.0.stdout		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_else.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_else.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_else.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_for_if_while.0			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_for_if_while.0.pro		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_for_if_while.0.stdout		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0.pro	tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0.stdout	tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-lbrace.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-lbrace.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-lbrace.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-lparen.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-lparen.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-lparen.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-newline.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-newline.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-newline.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-period.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-period.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-period.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-postfix_op.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-postfix_op.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-postfix_op.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-preprocessing.0			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-preprocessing.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-preprocessing.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-question.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-question.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-question.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-rbrace.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-rbrace.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-rbrace.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-rparen.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-rparen.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-rparen.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-semicolon.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-semicolon.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-semicolon.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-stmt.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-stmt.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-stmt.0.stdout				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-stmt_list.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-stmt_list.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-stmt_list.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-storage_class.0			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-storage_class.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-storage_class.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-string_prefix.0			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-string_prefix.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-string_prefix.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-switch_expr.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-switch_expr.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-switch_expr.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-type_def.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-type_def.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-type_def.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-unary_op.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-unary_op.0.pro				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-unary_op.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-while_expr.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-while_expr.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/token-while_expr.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/types_from_file.0				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/types_from_file.0.list			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/types_from_file.0.pro			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/types_from_file.0.stdout			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/wchar.0					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/indent/wchar.0.stdout				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/infocmp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/infocmp/Atffile			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/infocmp/Kyuafile			tests-usr.bin-tests	compattestfile,atf,kyua
@@ -4828,6 +5167,8 @@
 ./usr/tests/usr.bin/make/unit-tests/cmd-errors.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmd-interrupt.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmd-interrupt.mk				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cmdline-redirect-stdin.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cmdline-redirect-stdin.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmdline-undefined.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmdline-undefined.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmdline.exp					tests-usr.bin-tests	compattestfile,atf
@@ -5148,6 +5489,8 @@
 ./usr/tests/usr.bin/make/unit-tests/job-flags.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/job-output-long-lines.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/job-output-long-lines.mk			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/jobs-empty-commands.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/jobs-empty-commands.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/jobs-error-indirect.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/jobs-error-indirect.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/jobs-error-nested-make.exp			tests-usr.bin-tests	compattestfile,atf
@@ -5258,6 +5601,8 @@
 ./usr/tests/usr.bin/make/unit-tests/opt-no-action-at-all.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/opt-no-action-runflags.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/opt-no-action-runflags.mk			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-no-action-touch.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/opt-no-action-touch.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/opt-no-action.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/opt-no-action.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/opt-query.exp				tests-usr.bin-tests	compattestfile,atf
@@ -5384,6 +5729,8 @@
 ./usr/tests/usr.bin/make/unit-tests/var-class-local.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-class.mk				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/var-eval-short.exp				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/var-eval-short.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-op-append.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-op-append.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/var-op-assign.exp				tests-usr.bin-tests	compattestfile,atf
@@ -5466,6 +5813,8 @@
 ./usr/tests/usr.bin/make/unit-tests/varmod-subst-regex.mk			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/varmod-subst.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/varmod-subst.mk				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/varmod-sun-shell.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/varmod-sun-shell.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/varmod-sysv.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/varmod-sysv.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/varmod-tail.exp				tests-usr.bin-tests	compattestfile,atf
@@ -5747,6 +6096,12 @@
 ./usr/tests/usr.bin/xlint/lint1/d_bltinoffsetof.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_anon_union.c		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_bool.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_bool.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_bool_strict.c		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_bool_strict.exp		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.c	tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_bool_strict_syshdr.exp	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_complex_num.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_complex_split.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_compound_literal_comma.c	tests-usr.bin-tests	compattestfile,atf
@@ -5756,6 +6111,8 @@
 ./usr/tests/usr.bin/xlint/lint1/d_c99_flex_array_packed.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_for_loops.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_func.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_init.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_init.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_struct_init.c		tests-usr.bin-tests	compattestfile,atf
@@ -5765,6 +6122,7 @@
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init2.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init3.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init4.c		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_union_init5.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c9x_array_init.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c9x_recursive_init.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c	tests-usr.bin-tests	compattestfile,atf
@@ -5795,13 +6153,19 @@
 ./usr/tests/usr.bin/xlint/lint1/d_gcc_variable_array_init.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_incorrect_array_size.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_incorrect_array_size.exp	tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_init_array_using_string.c	tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_init_array_using_string.exp	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_init_pop_member.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_init_pop_member.exp		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_lint_assert.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_lint_assert.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_long_double_int.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_long_double_int.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_nested_structs.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_nolimit_init.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_packed_structs.c		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_pr_22119.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_pr_22119.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_return_type.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_return_type.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_shift_to_narrower_type.c	tests-usr.bin-tests	compattestfile,atf
@@ -6170,7 +6534,7 @@
 ./usr/tests/usr.bin/xlint/lint1/msg_175.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_175.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_176.c			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/msg_176.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_176.exp			tests-obsolete		obsolete
 ./usr/tests/usr.bin/xlint/lint1/msg_177.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_177.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_178.c			tests-usr.bin-tests	compattestfile,atf
@@ -6477,6 +6841,30 @@
 ./usr/tests/usr.bin/xlint/lint1/msg_328.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_329.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_329.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_330.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_330.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_331.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_331.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_332.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_332.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_333.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_333.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_334.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_334.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_335.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_335.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_336.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_336.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_337.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_337.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_338.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_338.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_339.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_339.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_340.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_340.exp			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/op_colon.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/op_colon.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/t_integration			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/ztest				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/ztest/Atffile			tests-usr.bin-tests	compattestfile,atf

Index: src/distrib/sets/lists/xbase/md.evbarm
diff -u src/distrib/sets/lists/xbase/md.evbarm:1.6 src/distrib/sets/lists/xbase/md.evbarm:1.6.4.1
--- src/distrib/sets/lists/xbase/md.evbarm:1.6	Sun Jan 19 00:58:13 2020
+++ src/distrib/sets/lists/xbase/md.evbarm	Sat Apr  3 22:43:41 2021
@@ -1,10 +1,10 @@
-# $NetBSD: md.evbarm,v 1.6 2020/01/19 00:58:13 jmcneill Exp $
+# $NetBSD: md.evbarm,v 1.6.4.1 2021/04/03 22:43:41 thorpej Exp $
 ./usr/X11R7/lib/libdrm_amdgpu.so		xbase-libdrm_amdgpu-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_amdgpu.so.1		xbase-libdrm_amdgpu-lib		xorg,compatx11file
 ./usr/X11R7/lib/libdrm_amdgpu.so.1.0		xbase-libdrm_amdgpu-lib		xorg,compatx11file
-./usr/X11R7/lib/libdrm_nouveau.so		xbase-libdrm_nouveau-lib		xorg
-./usr/X11R7/lib/libdrm_nouveau.so.3		xbase-libdrm_nouveau-lib		xorg
-./usr/X11R7/lib/libdrm_nouveau.so.3.0		xbase-libdrm_nouveau-lib		xorg
+./usr/X11R7/lib/libdrm_nouveau.so		xbase-libdrm_nouveau-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.3		xbase-libdrm_nouveau-lib		xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau.so.3.0		xbase-libdrm_nouveau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so			xbase-libvdpau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so.1			xbase-libvdpau-lib		xorg,compatx11file
 ./usr/X11R7/lib/libvdpau.so.1.0			xbase-libvdpau-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.163.2.1 src/distrib/sets/lists/xbase/mi:1.163.2.2
--- src/distrib/sets/lists/xbase/mi:1.163.2.1	Sun Jan  3 16:49:32 2021
+++ src/distrib/sets/lists/xbase/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.163.2.1 2021/01/03 16:49:32 thorpej Exp $
+# $NetBSD: mi,v 1.163.2.2 2021/04/03 22:43:41 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1738,3 +1738,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions	base-sys-usr	xorg
 ./usr/libdata/debug/usr/X11R7/libexec			base-sys-usr	xorg
 ./var/db/obsolete/xbase					xbase-sys-root	xorg
+./var/db/obsolete/xcomp					xbase-sys-root	xorg
+./var/db/obsolete/xdebug				xbase-sys-root		xorg,debug
+./var/db/obsolete/xetc					xbase-sys-root	xorg
+./var/db/obsolete/xfont					xbase-sys-root	xorg
+./var/db/obsolete/xserver				xbase-sys-root	xorg

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.223 src/distrib/sets/lists/xcomp/mi:1.223.2.1
--- src/distrib/sets/lists/xcomp/mi:1.223	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xcomp/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.223 2020/11/10 21:47:41 kamil Exp $
+#	 $NetBSD: mi,v 1.223.2.1 2021/04/03 22:43:41 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4416,4 +4416,3 @@
 ./usr/libdata/lint/llib-lxkbfile.ln			xcomp-libxkbfile-lintlib	lint,xorg
 ./usr/libdata/lint/llib-lxkbui.ln			xcomp-libxkbui-lintlib	lint,xorg
 ./usr/libdata/lint/llib-lxshmfence.ln			xcomp-libxshmfence-lintlib	lint,xorg
-./var/db/obsolete/xcomp					xbase-sys-root	xorg

Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.28 src/distrib/sets/lists/xdebug/md.evbarm:1.28.2.1
--- src/distrib/sets/lists/xdebug/md.evbarm:1.28	Thu Aug 27 15:32:00 2020
+++ src/distrib/sets/lists/xdebug/md.evbarm	Sat Apr  3 22:43:41 2021
@@ -1,7 +1,7 @@
-# $NetBSD: md.evbarm,v 1.28 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: md.evbarm,v 1.28.2.1 2021/04/03 22:43:41 thorpej Exp $
 ./usr/X11R7/lib/libdrm_amdgpu_g.a			xdebug-libdrm_amdgpu-debuglib	xorg,debuglib,compatx11file
-./usr/X11R7/lib/libdrm_nouveau_g.a			xdebug-libdrm_nouveau-debuglib	xorg,debuglib
-./usr/X11R7/lib/libvdpau_g.a				xdebug-libvdpau-debuglib	xorg,debuglib
+./usr/X11R7/lib/libdrm_nouveau_g.a			xdebug-libdrm_nouveau-debuglib	xorg,debuglib,compatx11file
+./usr/X11R7/lib/libvdpau_g.a				xdebug-libvdpau-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -21,8 +21,8 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.0.debug	xdebug-libdrm_amdgpu-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug	xdebug-libdrm_nouveau-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug		xdebug-libvdpau-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug	xdebug-libdrm_nouveau-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug		xdebug-libvdpau-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0.debug	xdebug-dri-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	xdebug-xf86-video-nouveau-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/r200_dri.so.0.debug	xdebug-dri-debug		xorg,debug

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.39.2.1 src/distrib/sets/lists/xdebug/mi:1.39.2.2
--- src/distrib/sets/lists/xdebug/mi:1.39.2.1	Sun Jan  3 16:49:32 2021
+++ src/distrib/sets/lists/xdebug/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.39.2.1 2021/01/03 16:49:32 thorpej Exp $
+# $NetBSD: mi,v 1.39.2.2 2021/04/03 22:43:41 thorpej Exp $
 ./etc/mtree/set.xdebug					comp-sys-root
 ./usr/X11R7/lib						base-x11-root	xorg,debuglib,compatx11dir
 ./usr/X11R7/lib/libEGL_g.a				xdebug-libEGL-debuglib	xorg,debuglib,compatx11file,xorg_glamor
@@ -235,4 +235,3 @@
 ./usr/libdata/debug/usr/X11R7/bin/xwud.debug		xdebug-xwud-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	xdebug-gallium-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	xdebug-chooser-debug	xorg,debug
-./var/db/obsolete/xdebug				base-sys-root		xorg,debug

Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.39 src/distrib/sets/lists/xetc/mi:1.39.2.1
--- src/distrib/sets/lists/xetc/mi:1.39	Sat Oct 10 09:17:33 2020
+++ src/distrib/sets/lists/xetc/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.39 2020/10/10 09:17:33 nia Exp $
+# $NetBSD: mi,v 1.39.2.1 2021/04/03 22:43:41 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -88,4 +88,3 @@
 ./etc/rc.d/fccache					etc-x11-rc	xorg
 ./etc/rc.d/xdm						etc-x11-rc	xorg
 ./etc/rc.d/xfs						etc-x11-rc	xorg
-./var/db/obsolete/xetc					xbase-sys-root	xorg

Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.45 src/distrib/sets/lists/xfont/mi:1.45.2.1
--- src/distrib/sets/lists/xfont/mi:1.45	Thu Nov 12 22:28:02 2020
+++ src/distrib/sets/lists/xfont/mi	Sat Apr  3 22:43:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.45 2020/11/12 22:28:02 maya Exp $
+# $NetBSD: mi,v 1.45.2.1 2021/04/03 22:43:41 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4361,4 +4361,3 @@
 ./usr/X11R7/lib/X11/fonts/util/map-ISO8859-9		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/util/map-JISX0201.1976-0	xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/util/map-KOI8-R		xfont	share,xorg,x11fonts
-./var/db/obsolete/xfont					xbase-sys-root	xorg

Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.46 src/distrib/sets/lists/xserver/mi:1.46.2.1
--- src/distrib/sets/lists/xserver/mi:1.46	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/mi	Sat Apr  3 22:43:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.46 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: mi,v 1.46.2.1 2021/04/03 22:43:42 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -38,4 +38,3 @@
 ./usr/X11R7/man/man1/Xserver.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/Xvfb.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man5/SecurityPolicy.5			xserver-obsolete	obsolete
-./var/db/obsolete/xserver				xbase-sys-root	xorg

Added files:

Index: src/distrib/sets/lists/xdebug/md.evbppc
diff -u /dev/null src/distrib/sets/lists/xdebug/md.evbppc:1.1.2.2
--- /dev/null	Sat Apr  3 22:43:42 2021
+++ src/distrib/sets/lists/xdebug/md.evbppc	Sat Apr  3 22:43:41 2021
@@ -0,0 +1,24 @@
+# $NetBSD: md.evbppc,v 1.1.2.2 2021/04/03 22:43:41 thorpej Exp $
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug		xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug	-unknown-	xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug	xdebug-dri-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug	xdebug-dri2-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug	-unknown-	xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug	xdebug-glx-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug	-unknown-	xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug	xdebug-shadow-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug	xdebug-exa-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug	xdebug-dixmods-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug	xdebug-shadowfb-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug	xdebug-vbe-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug	xdebug-vgahw-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug	-unknown-	xorg,debug,xorg_server_ver=110

Index: src/distrib/sets/lists/xserver/md.evbppc
diff -u /dev/null src/distrib/sets/lists/xserver/md.evbppc:1.4.2.2
--- /dev/null	Sat Apr  3 22:43:42 2021
+++ src/distrib/sets/lists/xserver/md.evbppc	Sat Apr  3 22:43:42 2021
@@ -0,0 +1,71 @@
+#	$NetBSD: md.evbppc,v 1.4.2.2 2021/04/03 22:43:42 thorpej Exp $
+./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
+./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
+./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
+./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
+./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1		xserver-xf86-input-ws-drivers	xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so		xserver-xf86-video-wsfb-drivers	xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0		xserver-xf86-video-wsfb-drivers	xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libdbe.so.0		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libdri.a		xserver-dri-modules	xorg
+./usr/X11R7/lib/modules/extensions/libdri.so		xserver-dri-modules	xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0		xserver-dri-modules	xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a		xserver-dri2-modules	xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so		xserver-dri2-modules	xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0		xserver-dri2-modules	xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libextmod.so.0	-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libglx.so		xserver-glx-modules	xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0		xserver-glx-modules	xorg
+./usr/X11R7/lib/modules/extensions/librecord.so		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/librecord.so.0	-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libshadow.so		xserver-shadow-modules	xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0	xserver-shadow-modules	xorg
+./usr/X11R7/lib/modules/libexa.so			xserver-exa-modules	xorg
+./usr/X11R7/lib/modules/libexa.so.0			xserver-exa-modules	xorg
+./usr/X11R7/lib/modules/libfb.a				xserver-dixmods-modules	xorg
+./usr/X11R7/lib/modules/libfb.so			xserver-dixmods-modules	xorg
+./usr/X11R7/lib/modules/libfb.so.0			xserver-dixmods-modules	xorg
+./usr/X11R7/lib/modules/libshadowfb.so			xserver-shadowfb-modules	xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0		xserver-shadowfb-modules	xorg
+./usr/X11R7/lib/modules/libvbe.so			xserver-vbe-modules	xorg
+./usr/X11R7/lib/modules/libvbe.so.0			xserver-vbe-modules	xorg
+./usr/X11R7/lib/modules/libvgahw.so			xserver-vgahw-modules	xorg
+./usr/X11R7/lib/modules/libvgahw.so.0			xserver-vgahw-modules	xorg
+./usr/X11R7/lib/modules/libxaa.so			-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libxaa.so.0			-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
+./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
+./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
+./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
+./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0				xserver-xf86-input-mouse-catman	.cat,xorg
+./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
+./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
+./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
+./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
+./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
+./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
+./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
+./usr/X11R7/man/html4/mousedrv.html			xserver-xf86-input-mouse-htmlman	html,xorg
+./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
+./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
+./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
+./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
+./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg
+./usr/X11R7/man/man4/mousedrv.4				xserver-xf86-input-mouse-man	.man,xorg
+./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
+./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Reply via email to