Module Name:    src
Committed By:   riastradh
Date:           Thu Aug 27 15:32:01 UTC 2020

Modified Files:
        src/distrib/sets/lists/base: md.evbarm mi shl.mi
        src/distrib/sets/lists/comp: ad.aarch64 ad.powerpc md.amd64 md.i386
            shl.mi stl.mi
        src/distrib/sets/lists/debug: ad.mips mi shl.mi
        src/distrib/sets/lists/etc: mi
        src/distrib/sets/lists/games: mi
        src/distrib/sets/lists/modules: ad.aarch64 ad.arm ad.mips md.amd64
            md.i386 md.sparc64 mi
        src/distrib/sets/lists/tests: md.amd64 mi
        src/distrib/sets/lists/xbase: shl.mi
        src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.cats md.evbarm
            md.i386 md.sgimips shl.mi
        src/distrib/sets/lists/xetc: mi
        src/distrib/sets/lists/xserver: md.amd64 md.evbarm mi

Log Message:
Sort and deduplicate set lists.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/base/md.evbarm
cvs rdiff -u -r1.1257 -r1.1258 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.898 -r1.899 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.279 -r1.280 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.197 -r1.198 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.338 -r1.339 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/stl.mi
cvs rdiff -u -r1.75 -r1.76 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.330 -r1.331 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.259 -r1.260 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.261 -r1.262 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/games/mi
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/modules/ad.aarch64
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/modules/ad.arm
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/modules/ad.mips
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/modules/md.amd64 \
    src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/modules/md.sparc64
cvs rdiff -u -r1.138 -r1.139 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/tests/md.amd64
cvs rdiff -u -r1.907 -r1.908 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xdebug/md.alpha
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xdebug/md.sgimips
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xserver/md.evbarm
cvs rdiff -u -r1.43 -r1.44 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.evbarm
diff -u src/distrib/sets/lists/base/md.evbarm:1.18 src/distrib/sets/lists/base/md.evbarm:1.19
--- src/distrib/sets/lists/base/md.evbarm:1.18	Fri Mar 27 04:31:18 2020
+++ src/distrib/sets/lists/base/md.evbarm	Thu Aug 27 15:31:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.18 2020/03/27 04:31:18 thorpej Exp $
+# $NetBSD: md.evbarm,v 1.19 2020/08/27 15:31:59 riastradh 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
@@ -12,8 +12,8 @@
 ./libdata/firmware/if_bwfm/brcmfmac43362-sdio.cubietech,cubietruck.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43362-sdio.lemaker,bananapro.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4339-sdio.bin	base-firmware-root	firmware
-./libdata/firmware/if_bwfm/brcmfmac43430-sdio.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43430-sdio.AP6212.txt	base-firmware-root	firmware
+./libdata/firmware/if_bwfm/brcmfmac43430-sdio.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt	base-firmware-root	firmware

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1257 src/distrib/sets/lists/base/mi:1.1258
--- src/distrib/sets/lists/base/mi:1.1257	Thu Aug 20 21:28:00 2020
+++ src/distrib/sets/lists/base/mi	Thu Aug 27 15:31:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1257 2020/08/20 21:28:00 riastradh Exp $
+# $NetBSD: mi,v 1.1258 2020/08/27 15:31:59 riastradh Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -150,13 +150,13 @@
 ./libdata/firmware/if_bwfm/brcmfmac43236b.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43242a.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4350-pcie.bin	base-firmware-root	firmware
-./libdata/firmware/if_bwfm/brcmfmac4356-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4350c2-pcie.bin	base-firmware-root	firmware
+./libdata/firmware/if_bwfm/brcmfmac4356-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43569.bin	base-firmware-root	firmware
-./libdata/firmware/if_bwfm/brcmfmac43602-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43570-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4358-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac43602-pcie.ap.bin	base-firmware-root	firmware
+./libdata/firmware/if_bwfm/brcmfmac43602-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4366b-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4366c-pcie.bin	base-firmware-root	firmware
 ./libdata/firmware/if_bwfm/brcmfmac4371-pcie.bin	base-firmware-root	firmware
@@ -500,6 +500,7 @@
 ./libexec/resolvconf/pdnsd			base-resolvconf-root
 ./libexec/resolvconf/unbound			base-resolvconf-root
 ./mnt						base-sys-root
+./netbsd					base-sys-root		kernel_dir
 ./rescue					base-sys-root
 ./root						base-sys-root
 ./sbin						base-sys-root
@@ -509,8 +510,8 @@
 ./sbin/badsect					base-sysutil-root
 ./sbin/bioctl					base-sysutil-root
 ./sbin/blacklistctl				base-obsolete		obsolete
-./sbin/blocklistctl				base-sysutil-root
 ./sbin/blacklistd				base-obsolete		obsolete
+./sbin/blocklistctl				base-sysutil-root
 ./sbin/blocklistd				base-sysutil-root
 ./sbin/brconfig					base-netutil-root
 ./sbin/canconfig				base-netutil-root
@@ -668,7 +669,6 @@
 ./sbin/zfs					base-zfs-bin            zfs
 ./sbin/zpool					base-zfs-bin            zfs
 ./stand						base-sys-root
-./netbsd					base-sys-root		kernel_dir
 ./tmp						base-sys-root
 ./usr						base-sys-root
 ./usr/bin					base-sys-usr
@@ -1308,8 +1308,8 @@
 ./usr/include/ufs/lfs				base-c-usr
 ./usr/include/ufs/mfs				base-c-usr
 ./usr/include/ufs/ufs				base-c-usr
-./usr/include/uvm				base-c-usr
 ./usr/include/uv				base-obsolete		obsolete
+./usr/include/uvm				base-c-usr
 ./usr/include/vm				base-obsolete		obsolete
 ./usr/lib					base-sys-usr		compatdir
 ./usr/lib/clang					base-sys-usr
@@ -5695,7 +5695,6 @@
 ./usr/share/zoneinfo/Asia/Riyadh87		base-obsolete		obsolete
 ./usr/share/zoneinfo/Asia/Riyadh88		base-obsolete		obsolete
 ./usr/share/zoneinfo/Asia/Riyadh89		base-obsolete		obsolete
-./usr/share/zoneinfo/Asia/Qostanay		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Saigon		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Sakhalin		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Samarkand		base-sys-share		share
@@ -6071,9 +6070,9 @@
 ./var/chroot/dhcpcd				base-dhcpcd-root
 ./var/chroot/dhcpcd/etc				base-obsolete		obsolete
 ./var/chroot/dhcpcd/var				base-obsolete		obsolete
-./var/chroot/dhcpcd/var/run			base-obsolete		obsolete
 ./var/chroot/dhcpcd/var/db			base-obsolete		obsolete
 ./var/chroot/dhcpcd/var/db/dhcpcd		base-obsolete		obsolete
+./var/chroot/dhcpcd/var/run			base-obsolete		obsolete
 ./var/chroot/ftp-proxy				base-sys-root
 ./var/chroot/named				base-bind-root
 ./var/chroot/named/dev				base-bind-root
@@ -6123,8 +6122,8 @@
 ./var/cron					base-cron-root
 ./var/cron/tabs					base-cron-root
 ./var/db					base-sys-root
-./var/db/ns					base-sys-root
 ./var/db/dhcpcd					base-dhcpcd-root
+./var/db/ns					base-sys-root
 ./var/db/obsolete				base-sys-root
 ./var/db/obsolete/base				base-sys-root
 ./var/db/postfix				base-postfix-root

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.898 src/distrib/sets/lists/base/shl.mi:1.899
--- src/distrib/sets/lists/base/shl.mi:1.898	Thu Aug 27 15:28:53 2020
+++ src/distrib/sets/lists/base/shl.mi	Thu Aug 27 15:31:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.898 2020/08/27 15:28:53 riastradh Exp $
+# $NetBSD: shl.mi,v 1.899 2020/08/27 15:31:59 riastradh Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -347,11 +347,11 @@
 ./usr/lib/libgomp.so.1				base-sys-shlib		compatfile,obsolete
 ./usr/lib/libgomp.so.1.3			base-sys-shlib		obsolete
 ./usr/lib/libgomp.so.2				base-sys-shlib		compatfile,gcc=7
+./usr/lib/libgomp.so.2				base-sys-shlib		compatfile,gcc=8
 ./usr/lib/libgomp.so.2.0			base-sys-shlib		compatfile,gcc=7,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/lib/libgomp.so.2.0			base-sys-shlib		compatfile,gcc=8,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/lib/libgomp.so.2.0			base-sys-shlib		gcc=7,machine_arch=mips64eb
 ./usr/lib/libgomp.so.2.0			base-sys-shlib		gcc=7,machine_arch=mips64el
-./usr/lib/libgomp.so.2				base-sys-shlib		compatfile,gcc=8
-./usr/lib/libgomp.so.2.0			base-sys-shlib		compatfile,gcc=8,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/lib/libgomp.so.2.0			base-sys-shlib		gcc=8,machine_arch=mips64eb
 ./usr/lib/libgomp.so.2.0			base-sys-shlib		gcc=8,machine_arch=mips64el
 ./usr/lib/libgssapi.so				base-krb5-shlib		compatfile,kerberos
@@ -431,8 +431,8 @@
 ./usr/lib/liblsan.so.1				base-sys-shlib		compatfile,obsolete
 ./usr/lib/liblsan.so.1.0			base-sys-shlib		compatfile,obsolete
 ./usr/lib/liblsan.so.2				base-sys-shlib		compatfile,cxx,gcc=7
-./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,gcc=7
 ./usr/lib/liblsan.so.2				base-sys-shlib		compatfile,cxx,gcc=8
+./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,gcc=7
 ./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,gcc=8
 ./usr/lib/liblua.so				base-sys-shlib		compatfile
 ./usr/lib/liblua.so.5				base-sys-shlib		compatfile
@@ -883,8 +883,8 @@
 ./usr/lib/libssl.so.14.0			base-crypto-shlib	compatfile,openssl=11
 ./usr/lib/libstdc++.so				base-sys-shlib		compatfile,gcc,cxx,libstdcxx
 ./usr/lib/libstdc++.so.9			base-sys-shlib		compatfile,gcc=7,cxx,libstdcxx
-./usr/lib/libstdc++.so.9.0			base-sys-shlib		compatfile,gcc=7,cxx,libstdcxx
 ./usr/lib/libstdc++.so.9			base-sys-shlib		compatfile,gcc=8,cxx,libstdcxx
+./usr/lib/libstdc++.so.9.0			base-sys-shlib		compatfile,gcc=7,cxx,libstdcxx
 ./usr/lib/libstdc++.so.9.0			base-sys-shlib		compatfile,gcc=8,cxx,libstdcxx
 ./usr/lib/libtelnet.so				base-obsolete		obsolete
 ./usr/lib/libtermcap.so				base-sys-shlib		compatfile

Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.41 src/distrib/sets/lists/comp/ad.aarch64:1.42
--- src/distrib/sets/lists/comp/ad.aarch64:1.41	Wed May 13 06:09:25 2020
+++ src/distrib/sets/lists/comp/ad.aarch64	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.41 2020/05/13 06:09:25 ryo Exp $
+# $NetBSD: ad.aarch64,v 1.42 2020/08/27 15:32:00 riastradh Exp $
 ./usr/include/aarch64				comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -142,13 +142,13 @@
 ./usr/include/gcc-6/arm_neon.h			comp-c-include		obsolete
 ./usr/include/gcc-6/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-7/arm_acle.h			comp-c-include		gcc=7
+./usr/include/gcc-7/arm_fp16.h			comp-c-include		gcc=7
 ./usr/include/gcc-7/arm_neon.h			comp-c-include		gcc=7
 ./usr/include/gcc-7/tgmath.h			comp-c-include		gcc=7
-./usr/include/gcc-7/arm_fp16.h			comp-c-include		gcc=7
 ./usr/include/gcc-8/arm_acle.h			comp-c-include		gcc=8
+./usr/include/gcc-8/arm_fp16.h			comp-c-include		gcc=8
 ./usr/include/gcc-8/arm_neon.h			comp-c-include		gcc=8
 ./usr/include/gcc-8/tgmath.h			comp-c-include		gcc=8
-./usr/include/gcc-8/arm_fp16.h			comp-c-include		gcc=8
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/lib/eabi/libarm.a				comp-c-lib		compat,llvm
 ./usr/lib/eabi/libarm.so			base-sys-shlib		compat,pic,llvm

Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.97 src/distrib/sets/lists/comp/ad.powerpc:1.98
--- src/distrib/sets/lists/comp/ad.powerpc:1.97	Mon Nov 11 22:44:56 2019
+++ src/distrib/sets/lists/comp/ad.powerpc	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.97 2019/11/11 22:44:56 joerg Exp $
+# $NetBSD: ad.powerpc,v 1.98 2020/08/27 15:32:00 riastradh Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
@@ -78,8 +78,8 @@
 ./usr/include/gcc-7/spu2vmx.h			comp-c-include		gcc=7
 ./usr/include/gcc-7/tgmath.h			comp-c-include		gcc=7
 ./usr/include/gcc-7/vec_types.h			comp-c-include		gcc=7
-./usr/include/gcc-8/amo.h			comp-c-include		gcc=8
 ./usr/include/gcc-8/altivec.h			comp-c-include		gcc=8
+./usr/include/gcc-8/amo.h			comp-c-include		gcc=8
 ./usr/include/gcc-8/bmi2intrin.h		comp-c-include		gcc=8
 ./usr/include/gcc-8/bmiintrin.h			comp-c-include		gcc=8
 ./usr/include/gcc-8/emmintrin.h			comp-c-include		gcc=8

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.279 src/distrib/sets/lists/comp/md.amd64:1.280
--- src/distrib/sets/lists/comp/md.amd64:1.279	Fri Jul 24 06:12:21 2020
+++ src/distrib/sets/lists/comp/md.amd64	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.279 2020/07/24 06:12:21 jdolecek Exp $
+# $NetBSD: md.amd64,v 1.280 2020/08/27 15:32:00 riastradh Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -411,6 +411,8 @@
 ./usr/include/clang-7.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-9.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-c-include		llvm
 ./usr/include/clang-9.0/adxintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/ammintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/avx2intrin.h		comp-c-include		llvm
@@ -462,8 +464,8 @@
 ./usr/include/clang-9.0/lwpintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/lzcntintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/mm3dnow.h		comp-c-include		llvm
-./usr/include/clang-9.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-9.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/movdirintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/mwaitxintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/nmmintrin.h		comp-c-include		llvm
@@ -484,9 +486,7 @@
 ./usr/include/clang-9.0/vpclmulqdqintrin.h	comp-c-include		llvm
 ./usr/include/clang-9.0/waitpkgintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/wbnoinvdintrin.h	comp-c-include		llvm
-./usr/include/clang-9.0/__wmmintrin_aes.h	comp-c-include		llvm
 ./usr/include/clang-9.0/wmmintrin.h		comp-c-include		llvm
-./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-c-include		llvm
 ./usr/include/clang-9.0/x86intrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/xmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/xopintrin.h		comp-c-include		llvm

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.197 src/distrib/sets/lists/comp/md.i386:1.198
--- src/distrib/sets/lists/comp/md.i386:1.197	Fri Jul 24 06:12:21 2020
+++ src/distrib/sets/lists/comp/md.i386	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.197 2020/07/24 06:12:21 jdolecek Exp $
+# $NetBSD: md.i386,v 1.198 2020/08/27 15:32:00 riastradh Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -100,8 +100,8 @@
 ./usr/include/clang-3.6/xopintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.8/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.8/__wmmintrin_pclmul.h	comp-obsolete		obsolete
-./usr/include/clang-3.8/ammintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.8/adxintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.8/ammintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.8/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.8/avx512bwintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-3.8/avx512cdintrin.h	comp-obsolete		obsolete
@@ -261,6 +261,8 @@
 ./usr/include/clang-5.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-5.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-5.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/__wmmintrin_aes.h	comp-obsolete		obsolete
+./usr/include/clang-7.0/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/adxintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/ammintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/avx2intrin.h		comp-obsolete		obsolete
@@ -307,8 +309,8 @@
 ./usr/include/clang-7.0/lwpintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/lzcntintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/mm3dnow.h		comp-obsolete		obsolete
-./usr/include/clang-7.0/mmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/clang-7.0/mmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/movdirintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/mwaitxintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/nmmintrin.h		comp-obsolete		obsolete
@@ -329,9 +331,7 @@
 ./usr/include/clang-7.0/vpclmulqdqintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/waitpkgintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/wbnoinvdintrin.h	comp-obsolete		obsolete
-./usr/include/clang-7.0/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/wmmintrin.h		comp-obsolete		obsolete
-./usr/include/clang-7.0/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/x86intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/xmmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/xopintrin.h		comp-obsolete		obsolete
@@ -340,6 +340,8 @@
 ./usr/include/clang-7.0/xsaveoptintrin.h	comp-obsolete		obsolete
 ./usr/include/clang-7.0/xsavesintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-7.0/xtestintrin.h		comp-obsolete		obsolete
+./usr/include/clang-9.0/__wmmintrin_aes.h	comp-c-include		llvm
+./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-c-include		llvm
 ./usr/include/clang-9.0/adxintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/ammintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/avx2intrin.h		comp-c-include		llvm
@@ -391,8 +393,8 @@
 ./usr/include/clang-9.0/lwpintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/lzcntintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/mm3dnow.h		comp-c-include		llvm
-./usr/include/clang-9.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/mm_malloc.h		comp-c-include		llvm
+./usr/include/clang-9.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/movdirintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/mwaitxintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/nmmintrin.h		comp-c-include		llvm
@@ -413,9 +415,7 @@
 ./usr/include/clang-9.0/vpclmulqdqintrin.h	comp-c-include		llvm
 ./usr/include/clang-9.0/waitpkgintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/wbnoinvdintrin.h	comp-c-include		llvm
-./usr/include/clang-9.0/__wmmintrin_aes.h	comp-c-include		llvm
 ./usr/include/clang-9.0/wmmintrin.h		comp-c-include		llvm
-./usr/include/clang-9.0/__wmmintrin_pclmul.h	comp-c-include		llvm
 ./usr/include/clang-9.0/x86intrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/xmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-9.0/xopintrin.h		comp-c-include		llvm

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.338 src/distrib/sets/lists/comp/shl.mi:1.339
--- src/distrib/sets/lists/comp/shl.mi:1.338	Wed Aug 26 16:03:40 2020
+++ src/distrib/sets/lists/comp/shl.mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.338 2020/08/26 16:03:40 riastradh Exp $
+# $NetBSD: shl.mi,v 1.339 2020/08/27 15:32:00 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -122,10 +122,10 @@
 ./usr/lib/libntp_pic.a				comp-obsolete		obsolete
 ./usr/lib/libnvpair_pic.a			comp-zfs-piclib		compatfile,picinstall,zfs
 ./usr/lib/libobjc_pic.a				comp-objc-piclib	compatfile,picinstall,gcccmds
-./usr/lib/libopcodes.so.9			comp-c-shlib		compatfile,binutils=231
-./usr/lib/libopcodes.so.9.0			comp-c-shlib		compatfile,binutils=231
 ./usr/lib/libopcodes.so.10			comp-c-shlib		compatfile,binutils=234
 ./usr/lib/libopcodes.so.10.0			comp-c-shlib		compatfile,binutils=234
+./usr/lib/libopcodes.so.9			comp-c-shlib		compatfile,binutils=231
+./usr/lib/libopcodes.so.9.0			comp-c-shlib		compatfile,binutils=231
 ./usr/lib/libopenpgpsdk_pic.a			comp-obsolete		obsolete
 ./usr/lib/libossaudio_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libp2k_pic.a				comp-puffs-piclib	compatfile,picinstall,rump
@@ -282,8 +282,8 @@
 ./usr/lib/libusb_pic.a				comp-obsolete		obsolete
 ./usr/lib/libusbhid_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libutil_pic.a				comp-c-piclib		compatfile,picinstall
-./usr/lib/libuv_pic.a				comp-obsolete		obsolete
 ./usr/lib/libuutil_pic.a			comp-zfs-piclib		compatfile,picinstall,zfs
+./usr/lib/libuv_pic.a				comp-obsolete		obsolete
 ./usr/lib/libwind_pic.a				comp-c-piclib		compatfile,picinstall,kerberos
 ./usr/lib/libwrap_pic.a				comp-c-piclib		compatfile,picinstall
 ./usr/lib/libz_pic.a				comp-c-piclib		compatfile,picinstall

Index: src/distrib/sets/lists/comp/stl.mi
diff -u src/distrib/sets/lists/comp/stl.mi:1.6 src/distrib/sets/lists/comp/stl.mi:1.7
--- src/distrib/sets/lists/comp/stl.mi:1.6	Wed Dec 14 12:59:51 2016
+++ src/distrib/sets/lists/comp/stl.mi	Thu Aug 27 15:32:00 2020
@@ -1,5 +1,4 @@
-# $NetBSD: stl.mi,v 1.6 2016/12/14 12:59:51 kre Exp $
-
+# $NetBSD: stl.mi,v 1.7 2020/08/27 15:32:00 riastradh 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

Index: src/distrib/sets/lists/debug/ad.mips
diff -u src/distrib/sets/lists/debug/ad.mips:1.75 src/distrib/sets/lists/debug/ad.mips:1.76
--- src/distrib/sets/lists/debug/ad.mips:1.75	Thu Aug 27 15:30:04 2020
+++ src/distrib/sets/lists/debug/ad.mips	Thu Aug 27 15:32:00 2020
@@ -1,7 +1,4 @@
-# $NetBSD: ad.mips,v 1.75 2020/08/27 15:30:04 riastradh Exp $
-./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug	comp-c-debug		obsolete
-./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug	comp-c-debug		debug,compatfile,gcc=7
-./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug	comp-c-debug		debug,compatfile,gcc=8
+# $NetBSD: ad.mips,v 1.76 2020/08/27 15:32:00 riastradh Exp $
 ./usr/lib/64/libc_fp_g.a				comp-c-debuglib		debuglib,softfloat,compat,arch64
 ./usr/lib/64/libgomp_g.a				comp-c-debuglib		debuglib,compat,arch64
 ./usr/lib/libc_fp_g.a					comp-c-debuglib		debuglib,softfloat,arch64
@@ -12,6 +9,9 @@
 ./usr/libdata/debug/usr/bin/elf2aout.debug		comp-obsolete		obsolete
 ./usr/libdata/debug/usr/bin/elf2ecoff.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/lib/64/libc_fp.so.0.0.debug	comp-c-debug		debug,softfloat,compat,arch64
+./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug	comp-c-debug		obsolete
+./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug	comp-c-debug		debug,compatfile,gcc=7
+./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug	comp-c-debug		debug,compatfile,gcc=8
 ./usr/libdata/debug/usr/lib/libc_fp.so.0.0.debug	comp-c-debug		debug,softfloat,arch64
 ./usr/libdata/debug/usr/lib/o32/libc_fp.so.0.0.debug	comp-c-debug		debug,softfloat,compat,arch64
 ./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug	comp-sys-debug		debug,compat,arch64

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.330 src/distrib/sets/lists/debug/mi:1.331
--- src/distrib/sets/lists/debug/mi:1.330	Wed Aug 26 16:03:41 2020
+++ src/distrib/sets/lists/debug/mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.330 2020/08/26 16:03:41 riastradh Exp $
+# $NetBSD: mi,v 1.331 2020/08/27 15:32:00 riastradh 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
@@ -268,8 +268,8 @@
 ./usr/lib/libunbound_g.a			comp-c-debuglib		debuglib,compatfile,unbound
 ./usr/lib/libusbhid_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libutil_g.a				comp-c-debuglib		debuglib,compatfile
-./usr/lib/libuv_g.a				comp-obsolete		obsolete,compatfile
 ./usr/lib/libuutil_g.a				comp-c-debuglib		debuglib,compatfile,zfs
+./usr/lib/libuv_g.a				comp-obsolete		obsolete,compatfile
 ./usr/lib/libvers_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libwind_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libwrap_g.a				comp-c-debuglib		debuglib,compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.259 src/distrib/sets/lists/debug/shl.mi:1.260
--- src/distrib/sets/lists/debug/shl.mi:1.259	Wed Aug 26 16:03:41 2020
+++ src/distrib/sets/lists/debug/shl.mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.259 2020/08/26 16:03:41 riastradh Exp $
+# $NetBSD: shl.mi,v 1.260 2020/08/27 15:32:00 riastradh 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
@@ -174,8 +174,8 @@
 ./usr/libdata/debug/usr/lib/libns.so.15.0.debug			comp-bind-debug	debug,compatfile
 ./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
-./usr/libdata/debug/usr/lib/libopcodes.so.9.0.debug		comp-c-debug	debug,compatfile,binutils=231
 ./usr/libdata/debug/usr/lib/libopcodes.so.10.0.debug		comp-c-debug	debug,compatfile,binutils=234
+./usr/libdata/debug/usr/lib/libopcodes.so.9.0.debug		comp-c-debug	debug,compatfile,binutils=231
 ./usr/libdata/debug/usr/lib/libossaudio.so.1.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libp2k.so.2.0.debug			comp-puffs-debug	debug,compatfile,rump
 ./usr/libdata/debug/usr/lib/libpam.so.4.1.debug			comp-sys-debug	debug,compatfile,pam
@@ -323,8 +323,8 @@
 ./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
-./usr/libdata/debug/usr/lib/libuv.so.1.0.debug			comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libuutil.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
+./usr/libdata/debug/usr/lib/libuv.so.1.0.debug			comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libwind.so.1.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libwrap.so.1.0.debug		comp-net-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libz.so.1.0.debug			comp-sys-debug	debug,compatfile

Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.261 src/distrib/sets/lists/etc/mi:1.262
--- src/distrib/sets/lists/etc/mi:1.261	Wed Jul 22 16:50:41 2020
+++ src/distrib/sets/lists/etc/mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.261 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: mi,v 1.262 2020/08/27 15:32:00 riastradh Exp $
 #
 # Note: end-user configuration files that are moved to another location
 #	should not be marked "obsolete"; they should just be removed from
@@ -178,6 +178,7 @@
 ./etc/rc.d/DAEMON				etc-sys-rc
 ./etc/rc.d/DISKS				etc-sys-rc
 ./etc/rc.d/LOGIN				etc-sys-rc
+./etc/rc.d/MOUNTCRITLOCAL			etc-sys-rc
 ./etc/rc.d/NETWORK				etc-obsolete		obsolete
 ./etc/rc.d/NETWORKING				etc-sys-rc
 ./etc/rc.d/SERVERS				etc-sys-rc
@@ -256,7 +257,6 @@
 ./etc/rc.d/motd					etc-sys-rc
 ./etc/rc.d/mountall				etc-sys-rc
 ./etc/rc.d/mountcritlocal			etc-sys-rc
-./etc/rc.d/MOUNTCRITLOCAL			etc-sys-rc
 ./etc/rc.d/mountcritremote			etc-sys-rc
 ./etc/rc.d/mountd				etc-nfsserver-rc
 ./etc/rc.d/moused				etc-sysutil-rc

Index: src/distrib/sets/lists/games/mi
diff -u src/distrib/sets/lists/games/mi:1.55 src/distrib/sets/lists/games/mi:1.56
--- src/distrib/sets/lists/games/mi:1.55	Sun Jun 10 17:17:46 2018
+++ src/distrib/sets/lists/games/mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.55 2018/06/10 17:17:46 kamil Exp $
+# $NetBSD: mi,v 1.56 2020/08/27 15:32:00 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -105,7 +105,6 @@
 ./usr/share/doc/usd/30.rogue/rogue.me		games-obsolete		obsolete
 ./usr/share/doc/usd/31.trek/Makefile		games-obsolete		obsolete
 ./usr/share/doc/usd/31.trek/trek.me		games-obsolete		obsolete
-./usr/share/doc/usd/31.trek/trek.me		games-obsolete		obsolete
 ./usr/share/games/atc/ATC_scores		games-obsolete		obsolete
 ./usr/share/games/atc/Atlantis			games-games-share	share
 ./usr/share/games/atc/Game_List			games-games-share	share

Index: src/distrib/sets/lists/modules/ad.aarch64
diff -u src/distrib/sets/lists/modules/ad.aarch64:1.6 src/distrib/sets/lists/modules/ad.aarch64:1.7
--- src/distrib/sets/lists/modules/ad.aarch64:1.6	Thu Mar 12 15:04:13 2020
+++ src/distrib/sets/lists/modules/ad.aarch64	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2020/03/12 15:04:13 pgoyette Exp $
+# $NetBSD: ad.aarch64,v 1.7 2020/08/27 15:32:00 riastradh Exp $
 ./@MODULEDIR@/bpfjit				modules-base-kernel	kmod,sljit
 ./@MODULEDIR@/bpfjit/bpfjit.kmod		modules-base-kernel	kmod,sljit
 ./@MODULEDIR@/compat_netbsd32			modules-base-kernel	kmod
@@ -31,20 +31,18 @@
 ./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod modules-base-kernel	kmod
-#./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
-#./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota/compat_netbsd32_quota.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50/compat_netbsd32_quota_50.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc_10	modules-base-kernel	kmod
@@ -59,4 +57,3 @@
 ./@MODULEDIR@/exec_elf64/exec_elf64.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/sljit				modules-base-kernel	kmod,sljit
 ./@MODULEDIR@/sljit/sljit.kmod			modules-base-kernel	kmod,sljit
-

Index: src/distrib/sets/lists/modules/ad.arm
diff -u src/distrib/sets/lists/modules/ad.arm:1.16 src/distrib/sets/lists/modules/ad.arm:1.17
--- src/distrib/sets/lists/modules/ad.arm:1.16	Thu Mar 12 15:04:13 2020
+++ src/distrib/sets/lists/modules/ad.arm	Thu Aug 27 15:32:00 2020
@@ -1,5 +1,4 @@
-# $NetBSD: ad.arm,v 1.16 2020/03/12 15:04:13 pgoyette Exp $
-
+# $NetBSD: ad.arm,v 1.17 2020/08/27 15:32:00 riastradh Exp $
 ./@MODULEDIR@/compat_netbsd32			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_09		modules-base-kernel	kmod
@@ -20,6 +19,8 @@
 ./@MODULEDIR@/compat_netbsd32_30/compat_netbsd32_30.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_40		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_40/compat_netbsd32_40.kmod modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_50/compat_netbsd32_50.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_60		modules-base-kernel	kmod
@@ -28,20 +29,18 @@
 ./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota/compat_netbsd32_quota.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50/compat_netbsd32_quota_50.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc_10	modules-base-kernel	kmod

Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.15 src/distrib/sets/lists/modules/ad.mips:1.16
--- src/distrib/sets/lists/modules/ad.mips:1.15	Thu Mar 12 15:04:13 2020
+++ src/distrib/sets/lists/modules/ad.mips	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.15 2020/03/12 15:04:13 pgoyette Exp $
+# $NetBSD: ad.mips,v 1.16 2020/08/27 15:32:00 riastradh Exp $
 ./@MODULEDIR@/compat_netbsd32			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_09		modules-base-kernel	kmod,arch64,nocompatmodules
@@ -19,6 +19,8 @@
 ./@MODULEDIR@/compat_netbsd32_30/compat_netbsd32_30.kmod modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_40		modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_40/compat_netbsd32_40.kmod modules-base-kernel	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_50		modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_50/compat_netbsd32_50.kmod modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_60		modules-base-kernel	kmod,arch64,nocompatmodules
@@ -27,20 +29,18 @@
 ./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod modules-base-kernel	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_mqueue			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_nfssrv			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_ptrace			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_raid			modules-base-kernel	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_quota			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_quota/compat_netbsd32_quota.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_quota_50			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_quota_50/compat_netbsd32_quota_50.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_raid			modules-base-kernel	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc			modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	modules-base-kernel	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc_10		modules-base-kernel	kmod,arch64,nocompatmodules

Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.87 src/distrib/sets/lists/modules/md.amd64:1.88
--- src/distrib/sets/lists/modules/md.amd64:1.87	Sat Jul  4 21:02:16 2020
+++ src/distrib/sets/lists/modules/md.amd64	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.87 2020/07/04 21:02:16 chs Exp $
+# $NetBSD: md.amd64,v 1.88 2020/08/27 15:32:00 riastradh Exp $
 #
 ./@MODULEDIR@/acpiacad				modules-base-kernel	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		modules-base-kernel	kmod
@@ -70,6 +70,8 @@
 ./@MODULEDIR@/compat_netbsd32_30/compat_netbsd32_30.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_40		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_40/compat_netbsd32_40.kmod modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_50/compat_netbsd32_50.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_60		modules-base-kernel	kmod
@@ -78,20 +80,18 @@
 ./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota/compat_netbsd32_quota.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50/compat_netbsd32_quota_50.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc_10	modules-base-kernel	kmod
@@ -112,10 +112,10 @@
 ./@MODULEDIR@/drm/drm.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms				modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms/drmkms.kmod		modules-base-kernel	kmod
-./@MODULEDIR@/drmkms_linux			modules-base-kernel	kmod
-./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_agp			modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/drmkms_linux			modules-base-kernel	kmod
+./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_pci			modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/dtrace_syscall_linux		modules-base-kernel	kmod,dtrace
@@ -150,6 +150,12 @@
 ./@MODULEDIR@/hpacel/hpacel.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/hpet				modules-base-kernel	kmod
 ./@MODULEDIR@/hpet/hpet.kmod			modules-base-kernel	kmod
+./@MODULEDIR@/hpqlb				modules-base-kernel	kmod
+./@MODULEDIR@/hpqlb/hpqlb.kmod			modules-base-kernel	kmod
+./@MODULEDIR@/i915drm				modules-base-kernel	kmod
+./@MODULEDIR@/i915drm/i915drm.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/i915drmkms			modules-base-kernel	kmod
+./@MODULEDIR@/i915drmkms/i915drmkms.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/ichsmb				modules-base-kernel	kmod
 ./@MODULEDIR@/ichsmb/ichsmb.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/if_ixl				modules-base-kernel	kmod
@@ -158,12 +164,6 @@
 ./@MODULEDIR@/imc/imc.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/imcsmb				modules-base-kernel	kmod
 ./@MODULEDIR@/imcsmb/imcsmb.kmod		modules-base-kernel	kmod
-./@MODULEDIR@/hpqlb				modules-base-kernel	kmod
-./@MODULEDIR@/hpqlb/hpqlb.kmod			modules-base-kernel	kmod
-./@MODULEDIR@/i915drm				modules-base-kernel	kmod
-./@MODULEDIR@/i915drm/i915drm.kmod		modules-base-kernel	kmod
-./@MODULEDIR@/i915drmkms			modules-base-kernel	kmod
-./@MODULEDIR@/i915drmkms/i915drmkms.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/itesio				modules-base-kernel	kmod
 ./@MODULEDIR@/itesio/itesio.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/ld_nvme				base-obsolete		obsolete
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.87 src/distrib/sets/lists/modules/md.i386:1.88
--- src/distrib/sets/lists/modules/md.i386:1.87	Sat Jul  4 21:02:16 2020
+++ src/distrib/sets/lists/modules/md.i386	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.87 2020/07/04 21:02:16 chs Exp $
+# $NetBSD: md.i386,v 1.88 2020/08/27 15:32:00 riastradh Exp $
 #
 ./@MODULEDIR@/acpiacad				modules-base-kernel	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		modules-base-kernel	kmod
@@ -70,10 +70,10 @@
 ./@MODULEDIR@/drm/drm.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms				modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms/drmkms.kmod		modules-base-kernel	kmod
-./@MODULEDIR@/drmkms_linux			modules-base-kernel	kmod
-./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_agp			modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_agp/drmkms_agp.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/drmkms_linux			modules-base-kernel	kmod
+./@MODULEDIR@/drmkms_linux/drmkms_linux.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_pci			modules-base-kernel	kmod
 ./@MODULEDIR@/drmkms_pci/drmkms_pci.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/dtrace_syscall_linux		modules-base-kernel	kmod,dtrace
@@ -106,6 +106,10 @@
 ./@MODULEDIR@/hpet/hpet.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/hpqlb				modules-base-kernel	kmod
 ./@MODULEDIR@/hpqlb/hpqlb.kmod			modules-base-kernel	kmod
+./@MODULEDIR@/i915drm				modules-base-kernel	kmod
+./@MODULEDIR@/i915drm/i915drm.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/i915drmkms			modules-base-kernel	kmod
+./@MODULEDIR@/i915drmkms/i915drmkms.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/ichsmb				modules-base-kernel     kmod
 ./@MODULEDIR@/ichsmb/ichsmb.kmod		modules-base-kernel     kmod
 ./@MODULEDIR@/if_ixl				modules-base-kernel	kmod
@@ -114,10 +118,6 @@
 ./@MODULEDIR@/imc/imc.kmod			modules-base-kernel     kmod
 ./@MODULEDIR@/imcsmb				modules-base-kernel     kmod
 ./@MODULEDIR@/imcsmb/imcsmb.kmod		modules-base-kernel     kmod
-./@MODULEDIR@/i915drm				modules-base-kernel	kmod
-./@MODULEDIR@/i915drm/i915drm.kmod		modules-base-kernel	kmod
-./@MODULEDIR@/i915drmkms			modules-base-kernel	kmod
-./@MODULEDIR@/i915drmkms/i915drmkms.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/itesio				modules-base-kernel	kmod
 ./@MODULEDIR@/itesio/itesio.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/ld_nvme				base-obsolete		obsolete

Index: src/distrib/sets/lists/modules/md.sparc64
diff -u src/distrib/sets/lists/modules/md.sparc64:1.10 src/distrib/sets/lists/modules/md.sparc64:1.11
--- src/distrib/sets/lists/modules/md.sparc64:1.10	Thu Mar 12 15:04:13 2020
+++ src/distrib/sets/lists/modules/md.sparc64	Thu Aug 27 15:32:00 2020
@@ -1,5 +1,4 @@
-# $NetBSD: md.sparc64,v 1.10 2020/03/12 15:04:13 pgoyette Exp $
-
+# $NetBSD: md.sparc64,v 1.11 2020/08/27 15:32:00 riastradh Exp $
 ./@MODULEDIR@/compat_netbsd32			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_09		modules-base-kernel	kmod
@@ -20,6 +19,8 @@
 ./@MODULEDIR@/compat_netbsd32_30/compat_netbsd32_30.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_40		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_40/compat_netbsd32_40.kmod modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_50/compat_netbsd32_50.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_60		modules-base-kernel	kmod
@@ -28,20 +29,18 @@
 ./@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_43		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_43/compat_netbsd32_43.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
-./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota/compat_netbsd32_quota.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_quota_50/compat_netbsd32_quota_50.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid		modules-base-kernel	kmod
+./@MODULEDIR@/compat_netbsd32_raid/compat_netbsd32_raid.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc_10	modules-base-kernel	kmod

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.138 src/distrib/sets/lists/modules/mi:1.139
--- src/distrib/sets/lists/modules/mi:1.138	Sat Jun 27 05:39:07 2020
+++ src/distrib/sets/lists/modules/mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.138 2020/06/27 05:39:07 rin Exp $
+# $NetBSD: mi,v 1.139 2020/08/27 15:32:00 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -61,10 +61,6 @@
 ./@MODULEDIR@/coda5/coda5.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/compat				base-obsolete		obsolete
 ./@MODULEDIR@/compat/compat.kmod		base-obsolete		obsolete
-./@MODULEDIR@/compat_util			modules-base-kernel	kmod
-./@MODULEDIR@/compat_util/compat_util.kmod	modules-base-kernel	kmod
-./@MODULEDIR@/compat_sysctl_09_43		modules-base-kernel	kmod
-./@MODULEDIR@/compat_sysctl_09_43/compat_sysctl_09_43.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/compat_09				modules-base-kernel	kmod
 ./@MODULEDIR@/compat_09/compat_09.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_10				modules-base-kernel	kmod
@@ -97,22 +93,26 @@
 ./@MODULEDIR@/compat_80/compat_80.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/compat_90				modules-base-kernel	kmod
 ./@MODULEDIR@/compat_90/compat_90.kmod		modules-base-kernel	kmod
-./@MODULEDIR@/compat_ossaudio			modules-base-kernel	kmod
-./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_crypto_50			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_crypto_50/compat_crypto_50.kmod modules-base-kernel kmod
+./@MODULEDIR@/compat_ossaudio			modules-base-kernel	kmod
+./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_raid_50			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_raid_50/compat_raid_50.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_raid_80			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_raid_80/compat_raid_80.kmod modules-base-kernel	kmod
+./@MODULEDIR@/compat_sysctl_09_43		modules-base-kernel	kmod
+./@MODULEDIR@/compat_sysctl_09_43/compat_sysctl_09_43.kmod	modules-base-kernel	kmod
+./@MODULEDIR@/compat_sysv			base-obsolete		obsolete
+./@MODULEDIR@/compat_sysv/compat_sysv.kmod	base-obsolete		obsolete
 ./@MODULEDIR@/compat_sysv_10			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_sysv_10/compat_sysv_10.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_sysv_14			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_sysv_14/compat_sysv_14.kmod modules-base-kernel	kmod
 ./@MODULEDIR@/compat_sysv_50			modules-base-kernel	kmod
 ./@MODULEDIR@/compat_sysv_50/compat_sysv_50.kmod modules-base-kernel	kmod
-./@MODULEDIR@/compat_sysv			base-obsolete		obsolete
-./@MODULEDIR@/compat_sysv/compat_sysv.kmod	base-obsolete		obsolete
+./@MODULEDIR@/compat_util			modules-base-kernel	kmod
+./@MODULEDIR@/compat_util/compat_util.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/coredump				modules-base-kernel	kmod
 ./@MODULEDIR@/coredump/coredump.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/crypto				modules-base-kernel	kmod
@@ -427,12 +427,12 @@
 ./@MODULEDIR@/sysv_ipc/sysv_ipc.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/sysvbfs				modules-base-kernel	kmod
 ./@MODULEDIR@/sysvbfs/sysvbfs.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/tap				modules-base-kernel	kmod
+./@MODULEDIR@/tap/tap.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/tmpfs				modules-base-kernel	kmod
 ./@MODULEDIR@/tmpfs/tmpfs.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/tprof				modules-base-kernel	kmod
 ./@MODULEDIR@/tprof/tprof.kmod			modules-base-kernel	kmod
-./@MODULEDIR@/tap				modules-base-kernel	kmod
-./@MODULEDIR@/tap/tap.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/tun				modules-base-kernel	kmod
 ./@MODULEDIR@/tun/tun.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/twa				base-obsolete		obsolete
@@ -474,6 +474,6 @@
 ./@MODULEDIR@/zlib				modules-base-kernel     kmod
 ./@MODULEDIR@/zlib/zlib.kmod			modules-base-kernel     kmod
 ./etc/mtree/set.modules				modules-sys-root	kmod
+./netbsd					-unknown-		kmod,kernel_dir
 ./stand/@MACHINE@				modules-base-kernel	kmod,!kernel_dir
 ./stand/@MACHINE@/@OSRELEASE@			modules-base-kernel	kmod,!kernel_dir
-./netbsd					-unknown-		kmod,kernel_dir

Index: src/distrib/sets/lists/tests/md.amd64
diff -u src/distrib/sets/lists/tests/md.amd64:1.12 src/distrib/sets/lists/tests/md.amd64:1.13
--- src/distrib/sets/lists/tests/md.amd64:1.12	Sun May 17 15:28:27 2020
+++ src/distrib/sets/lists/tests/md.amd64	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.12 2020/05/17 15:28:27 martin Exp $
+# $NetBSD: md.amd64,v 1.13 2020/08/27 15:32:00 riastradh Exp $
 ./usr/tests/kernel/arch/x86/Atffile		tests-obsolete	obsolete
 ./usr/tests/kernel/arch/x86/Kyuafile		tests-obsolete	obsolete
 ./usr/tests/kernel/arch/x86/t_ptrace_wait	tests-obsolete	obsolete
@@ -9,8 +9,8 @@
 ./usr/tests/kernel/arch/x86/t_ptrace_waitpid	tests-obsolete	obsolete
 ./usr/tests/lib/libi386/t_user_ldt		tests-lib-tests	compattestfile,atf,compat
 ./usr/tests/lib/libnvmm/h_io_assist		tests-lib-tests	compattestfile,atf
-./usr/tests/lib/libnvmm/t_io_assist		tests-lib-tests	compattestfile,atf
 ./usr/tests/lib/libnvmm/h_mem_assist		tests-lib-tests	compattestfile,atf
+./usr/tests/lib/libnvmm/t_io_assist		tests-lib-tests	compattestfile,atf
 ./usr/tests/lib/libnvmm/t_mem_assist		tests-lib-tests	compattestfile,atf
 ./usr/tests/modules/t_x86_pte			tests-sys-tests	atf,kmod,rump
 ./usr/tests/modules/x86_pte_tester		tests-sys-tests	atf,kmod,rump

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.907 src/distrib/sets/lists/tests/mi:1.908
--- src/distrib/sets/lists/tests/mi:1.907	Wed Aug 26 16:03:41 2020
+++ src/distrib/sets/lists/tests/mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.907 2020/08/26 16:03:41 riastradh Exp $
+# $NetBSD: mi,v 1.908 2020/08/27 15:32:00 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -125,8 +125,8 @@
 ./usr/libdata/debug/usr/tests/lib/libdes				tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libevent				tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libexecinfo				tests-lib-debug		compattestfile,atf
-./usr/libdata/debug/usr/tests/lib/liblutok				tests-lutok-debug	compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libi386				tests-lib-debug		compattestfile,atf
+./usr/libdata/debug/usr/tests/lib/liblutok				tests-lutok-debug	compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libm					tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libnvmm				tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libobjc				tests-lib-debug		compattestfile,atf
@@ -2207,8 +2207,8 @@
 ./usr/tests/kernel/t_lock			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_lockf			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_lwpctl			tests-obsolete		obsolete
-./usr/tests/kernel/t_mkdir			tests-obsolete		obsolete
 ./usr/tests/kernel/t_magic_symlinks		tests-kernel-tests	compattestfile,atf
+./usr/tests/kernel/t_mkdir			tests-obsolete		obsolete
 ./usr/tests/kernel/t_mqueue			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_nointerpreter		tests-kernel-tests	atf
 ./usr/tests/kernel/t_origin			tests-kernel-tests	compattestfile,atf
@@ -3868,18 +3868,13 @@
 ./usr/tests/net/if_vlan/t_vlan			tests-net-tests		atf,rump
 ./usr/tests/net/if_wg				tests-net-tests		compattestfile,atf
 ./usr/tests/net/if_wg/Atffile			tests-net-tests		atf,rump
+./usr/tests/net/if_wg/Atffile			tests-net-tests		compattestfile,atf
 ./usr/tests/net/if_wg/Kyuafile			tests-net-tests		atf,rump,kyua
+./usr/tests/net/if_wg/Kyuafile			tests-net-tests		compattestfile,atf,kyua
 ./usr/tests/net/if_wg/t_basic			tests-net-tests		atf,rump
 ./usr/tests/net/if_wg/t_interoperability	tests-net-tests		atf,rump
 ./usr/tests/net/if_wg/t_misc			tests-net-tests		atf,rump
 ./usr/tests/net/if_wg/t_tunnel			tests-net-tests		atf,rump
-./usr/tests/net/wireguard			tests-obsolete		obsolete
-./usr/tests/net/wireguard/Atffile		tests-obsolete		obsolete
-./usr/tests/net/wireguard/Kyuafile		tests-obsolete		obsolete
-./usr/tests/net/wireguard/t_basic		tests-obsolete		obsolete
-./usr/tests/net/wireguard/t_interoperability	tests-obsolete		obsolete
-./usr/tests/net/wireguard/t_misc		tests-obsolete		obsolete
-./usr/tests/net/wireguard/t_tunnel		tests-obsolete		obsolete
 ./usr/tests/net/in_cksum			tests-net-tests		compattestfile,atf
 ./usr/tests/net/in_cksum/Atffile		tests-net-tests		compattestfile,atf
 ./usr/tests/net/in_cksum/Kyuafile		tests-net-tests		compattestfile,atf,kyua
@@ -3960,14 +3955,13 @@
 ./usr/tests/net/sys/t_listen			tests-obsolete		obsolete
 ./usr/tests/net/sys/t_rfc6056			tests-net-tests		compattestfile,atf
 ./usr/tests/net/sys/t_socketpair		tests-obsolete		obsolete
-./usr/tests/net/if_wg				tests-net-tests		compattestfile,atf
-./usr/tests/net/if_wg/Atffile			tests-net-tests		compattestfile,atf
-./usr/tests/net/if_wg/Kyuafile			tests-net-tests		compattestfile,atf,kyua
-./usr/tests/net/if_wg/t_basic			tests-net-tests		atf,rump
 ./usr/tests/net/wireguard			tests-obsolete		obsolete
 ./usr/tests/net/wireguard/Atffile		tests-obsolete		obsolete
 ./usr/tests/net/wireguard/Kyuafile		tests-obsolete		obsolete
 ./usr/tests/net/wireguard/t_basic		tests-obsolete		obsolete
+./usr/tests/net/wireguard/t_interoperability	tests-obsolete		obsolete
+./usr/tests/net/wireguard/t_misc		tests-obsolete		obsolete
+./usr/tests/net/wireguard/t_tunnel		tests-obsolete		obsolete
 ./usr/tests/opencrypto				tests-obsolete		obsolete
 ./usr/tests/rump				tests-rump-tests	compattestfile,atf
 ./usr/tests/rump/Atffile			tests-rump-tests	atf,rump

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.88 src/distrib/sets/lists/xbase/shl.mi:1.89
--- src/distrib/sets/lists/xbase/shl.mi:1.88	Mon Aug 12 03:51:23 2019
+++ src/distrib/sets/lists/xbase/shl.mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.88 2019/08/12 03:51:23 uki Exp $
+# $NetBSD: shl.mi,v 1.89 2020/08/27 15:32:00 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -92,12 +92,12 @@
 ./usr/X11R7/lib/libXfixes.so			xbase-libXfixes-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXfixes.so.4			xbase-libXfixes-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXfixes.so.4.0		xbase-libXfixes-lib		xorg,compatx11file
-./usr/X11R7/lib/libXfont2.so			xbase-libXfont2-lib		xorg,compatx11file
-./usr/X11R7/lib/libXfont2.so.2			xbase-libXfont2-lib		xorg,compatx11file
-./usr/X11R7/lib/libXfont2.so.2.0		xbase-libXfont2-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so			xbase-libXfont-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3			xbase-libXfont-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3.0			xbase-libXfont-lib		xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so			xbase-libXfont2-lib		xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so.2			xbase-libXfont2-lib		xorg,compatx11file
+./usr/X11R7/lib/libXfont2.so.2.0		xbase-libXfont2-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXft.so			xbase-libXft-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXft.so.3			xbase-libXft-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXft.so.3.0			xbase-libXft-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/md.alpha
diff -u src/distrib/sets/lists/xdebug/md.alpha:1.14 src/distrib/sets/lists/xdebug/md.alpha:1.15
--- src/distrib/sets/lists/xdebug/md.alpha:1.14	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.alpha	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.14 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.alpha,v 1.15 2020/08/27 15:32:00 riastradh Exp $
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./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
@@ -6,18 +6,18 @@
 ./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/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug	xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug	xdebug-xf86-video-ast-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-xf86-video-ati-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	xdebug-xf86-video-chips-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	xdebug-xf86-video-cirrus_alpine-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	xdebug-xf86-video-cirrus_laguna-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.51 src/distrib/sets/lists/xdebug/md.amd64:1.52
--- src/distrib/sets/lists/xdebug/md.amd64:1.51	Fri Jan 31 20:56:03 2020
+++ src/distrib/sets/lists/xdebug/md.amd64	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.51 2020/01/31 20:56:03 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.52 2020/08/27 15:32:00 riastradh Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a				xdebug-libI810XvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib,compatx11file
@@ -78,10 +78,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19.debug	xdebug-xf86-video-amdgpu-debug		xorg,debug,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug		xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug	xdebug-xf86-video-ast-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
@@ -92,13 +92,13 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	xdebug-xf86-video-cirrus_alpine-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	xdebug-xf86-video-cirrus_laguna-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug	xdebug-xf86-video-intel-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-xf86-video-intel-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-xf86-video-intel-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
@@ -155,8 +155,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug	xdebug-xf86-video-nv-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug	xdebug-xf86-video-openchrome-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug	xdebug-xf86-video-r128-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.19.debug	xdebug-xf86-video-radeon-kms-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug	xdebug-xf86-video-radeon-kms-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug		xorg,debug
@@ -180,8 +180,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug	xdebug-obsolete		xorg,obsolete
 ./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/drivers/xgi_drv.so.1.debug	xdebug-xf86-video-xgi-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug	xdebug-xf86-video-xgi-debug		xorg,debug,xorg_server_ver=110
 ./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

Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.13 src/distrib/sets/lists/xdebug/md.cats:1.14
--- src/distrib/sets/lists/xdebug/md.cats:1.13	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.cats	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.13 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.cats,v 1.14 2020/08/27 15:32:00 riastradh Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -32,18 +32,18 @@
 ./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/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug		xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug	xdebug-xf86-video-ast-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	xdebug-xf86-video-chips-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	xdebug-xf86-video-cirrus_alpine-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	xdebug-xf86-video-cirrus_laguna-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug

Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.27 src/distrib/sets/lists/xdebug/md.evbarm:1.28
--- src/distrib/sets/lists/xdebug/md.evbarm:1.27	Fri Jan 31 20:56:03 2020
+++ src/distrib/sets/lists/xdebug/md.evbarm	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.27 2020/01/31 20:56:03 jmcneill Exp $
+# $NetBSD: md.evbarm,v 1.28 2020/08/27 15:32:00 riastradh 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
@@ -31,8 +31,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug	xdebug-xf86-video-radeon-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeonsi_dri.so.0.debug	xdebug-xf86-video-radeon-debug		xorg,debug,llvmrt
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-xf86-video-ati-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./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/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.47 src/distrib/sets/lists/xdebug/md.i386:1.48
--- src/distrib/sets/lists/xdebug/md.i386:1.47	Fri Jan 31 20:56:03 2020
+++ src/distrib/sets/lists/xdebug/md.i386	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.47 2020/01/31 20:56:03 jmcneill Exp $
+# $NetBSD: md.i386,v 1.48 2020/08/27 15:32:00 riastradh Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a				xdebug-libI810XvMC-debuglib	xorg,debuglib
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib
@@ -88,10 +88,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/trident_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19.debug	xdebug-xf86-video-amdgpu-debug		xorg,debug,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug		xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-xf86-video-ark-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug	xdebug-xf86-video-ast-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
@@ -104,13 +104,13 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug	xdebug-xf86-video-cirrus_laguna-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/elographics_drv.so.1.debug	xdegub-xf86-input-elographics-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/geode_drv.so.2.debug	xdebug-xf86-video-geode-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug	xdebug-xf86-video-intel-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-xf86-video-intel-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-xf86-video-intel-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
@@ -193,8 +193,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/void_drv.so.1.debug	xdebug-obsolete		xorg,obsolete
 ./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/drivers/xgi_drv.so.1.debug	xdebug-xf86-video-xgi-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/xgi_drv.so.1.debug	xdebug-xf86-video-xgi-debug		xorg,debug,xorg_server_ver=110
 ./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/libdbe.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug	xdebug-dri-debug		xorg,debug

Index: src/distrib/sets/lists/xdebug/md.sgimips
diff -u src/distrib/sets/lists/xdebug/md.sgimips:1.12 src/distrib/sets/lists/xdebug/md.sgimips:1.13
--- src/distrib/sets/lists/xdebug/md.sgimips:1.12	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.sgimips	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.12 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.sgimips,v 1.13 2020/08/27 15:32:00 riastradh Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -39,8 +39,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
 ./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/libcrime_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.54 src/distrib/sets/lists/xdebug/shl.mi:1.55
--- src/distrib/sets/lists/xdebug/shl.mi:1.54	Tue Dec 31 05:01:49 2019
+++ src/distrib/sets/lists/xdebug/shl.mi	Thu Aug 27 15:32:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.54 2019/12/31 05:01:49 uki Exp $
+# $NetBSD: shl.mi,v 1.55 2020/08/27 15:32:00 riastradh Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	xorg,obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	xorg,obsolete		xorg,obsolete
@@ -35,8 +35,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug	xdebug-libXevie-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug	xdebug-libXext-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug	xdebug-libXfixes-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libXfont2.so.2.0.debug	xdebug-libXfont2-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug	xdebug-libXfont-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfont2.so.2.0.debug	xdebug-libXfont2-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug	xdebug-obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug	xdebug-libXft-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug	xdebug-libXi-debug		xorg,debug,compatx11file
@@ -105,15 +105,15 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug	xdebug-libxkbfile-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug		xdebug-libxkbui-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug	xdebug-libxshmfence-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/modules/libglamoregl.so.0.debug	xdebug-xorg-server-debug		xorg,debug,xorg_glamor
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	xdebug-gallium-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	xdebug-MesaLib-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xdebug-MesaLib-debug	xorg,debug,machine=amd64,mesa_ver=10
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xdebug-MesaLib-debug	xorg,debug,machine=i386,mesa_ver=10
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xdebug-obsolete	xorg,obsolete,machine=amd64,mesa_ver=18
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xdebug-obsolete	xorg,obsolete,machine=i386,mesa_ver=18
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xorg,obsolete	obsolete,!machine=i386,!machine=amd64
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xdebug-MesaLib-debug	xorg,debug,machine=amd64,mesa_ver=10
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	xdebug-MesaLib-debug	xorg,debug,machine=i386,mesa_ver=10
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	xorg,obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	xdebug-xf86-video-nouveau-debug	xorg,debug,machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	xdebug-xf86-video-nouveau-debug	xorg,debug,machine=i386
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	xdebug-MesaLib-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libglamoregl.so.0.debug	xdebug-xorg-server-debug		xorg,debug,xorg_glamor

Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.37 src/distrib/sets/lists/xetc/mi:1.38
--- src/distrib/sets/lists/xetc/mi:1.37	Tue Oct 22 06:28:18 2019
+++ src/distrib/sets/lists/xetc/mi	Thu Aug 27 15:32:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.37 2019/10/22 06:28:18 uki Exp $
+# $NetBSD: mi,v 1.38 2020/08/27 15:32:01 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -61,8 +61,8 @@
 ./etc/fonts/conf.avail/70-yes-bitmaps.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/80-delicious.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.avail/90-synthetic.conf		xetc-fontconfig-etc	xorg
-./etc/fonts/conf.d/10-scale-bitmap-fonts.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.d/10-hinting-slight.conf		xetc-fontconfig-etc	xorg
+./etc/fonts/conf.d/10-scale-bitmap-fonts.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.d/20-fix-globaladvance.conf		xetc-obsolete	obsolete
 ./etc/fonts/conf.d/20-unhint-small-vera.conf		xetc-fontconfig-etc	xorg
 ./etc/fonts/conf.d/30-metric-aliases.conf		xetc-fontconfig-etc	xorg

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.112 src/distrib/sets/lists/xserver/md.amd64:1.113
--- src/distrib/sets/lists/xserver/md.amd64:1.112	Fri Jan 31 20:56:03 2020
+++ src/distrib/sets/lists/xserver/md.amd64	Thu Aug 27 15:32:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.112 2020/01/31 20:56:03 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.113 2020/08/27 15:32:01 riastradh 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
@@ -51,14 +51,14 @@
 ./usr/X11R7/lib/modules/dri/unichrome_dri.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/amdgpu_drv.so		xserver-xf86-video-amdgpu-drivers	xorg,xorg_server_ver=120
 ./usr/X11R7/lib/modules/drivers/amdgpu_drv.so.19	xserver-xf86-video-amdgpu-drivers	xorg,xorg_server_ver=120
-./usr/X11R7/lib/modules/drivers/apm_drv.so		xserver-xf86-video-apm-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/apm_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/apm_drv.so.1		xserver-xf86-video-apm-drivers	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/apm_drv.so		xserver-xf86-video-apm-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/apm_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so		xserver-xf86-video-ark-drivers	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/apm_drv.so.1		xserver-xf86-video-apm-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ark_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0		xserver-xf86-video-ark-drivers	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/ark_drv.so		xserver-xf86-video-ark-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ark_drv.so.0		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0		xserver-xf86-video-ark-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ast_drv.so		xserver-xf86-video-ast-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ast_drv.so.1		xserver-xf86-video-ast-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ati_drv.so		xserver-xf86-video-ati-drivers	xorg
@@ -85,10 +85,10 @@
 ./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1	xdebug-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1		xserver-obsolete	obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-xf86-video-glint-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-xf86-video-glint-drivers	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-xf86-video-glint-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-xf86-video-glint-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/i128_drv.so		xserver-xf86-video-i128-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/i128_drv.so.1		xserver-xf86-video-i128-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/i740_drv.so		xserver-xf86-video-i740-drivers	xorg
@@ -97,10 +97,10 @@
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/intel_drv.so		xserver-xf86-video-intel-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/intel_drv.so.2		xserver-xf86-video-intel-drivers	xorg
-./usr/X11R7/lib/modules/drivers/intel_drv_old.so	xserver-xf86-video-intel-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/intel_drv_old.so	xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2	xserver-xf86-video-intel-drivers	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so	xserver-xf86-video-intel-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2	xserver-obsolete	xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2	xserver-xf86-video-intel-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so.2		-unknown-	xorg,xorg_server_ver=110
@@ -179,10 +179,10 @@
 ./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/drivers/xgi_drv.so		xserver-xf86-video-xgi-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/xgi_drv.so		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/xgi_drv.so.1		xserver-xf86-video-xgi-drivers	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/xgi_drv.so		xserver-xf86-video-xgi-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/xgi_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/xgi_drv.so.1		xserver-xf86-video-xgi-drivers	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/extensions/libGLcore.a		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/extensions/libGLcore.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/extensions/libGLcore.so.0	xserver-obsolete	obsolete
@@ -310,21 +310,21 @@
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/xorgconfig.0			xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/amdgpu.0				xserver-xf86-video-amdgpu-catman	.cat,xorg,xorg_server_ver=120
-./usr/X11R7/man/cat4/apm.0				xserver-xf86-video-apm-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/apm.0				xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/cat4/apm.0				xserver-xf86-video-apm-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/ati.0				xserver-xf86-video-ati-catman	.cat,xorg
 ./usr/X11R7/man/cat4/chips.0				xserver-xf86-video-chips-catman	.cat,xorg
 ./usr/X11R7/man/cat4/cirrus.0				xserver-xf86-video-cirrus-catman	.cat,xorg
 ./usr/X11R7/man/cat4/cyrix.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
-./usr/X11R7/man/cat4/glint.0				xserver-xf86-video-glint-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/glint.0				xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/cat4/glint.0				xserver-xf86-video-glint-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/i128.0				xserver-xf86-video-i128-catman	.cat,xorg
 ./usr/X11R7/man/cat4/i740.0				xserver-xf86-video-i740-catman	.cat,xorg
 ./usr/X11R7/man/cat4/imstt.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/intel.0				xserver-xf86-video-intel-catman	.cat,xorg
-./usr/X11R7/man/cat4/intel_old.0			xserver-xf86-video-intel-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/intel_old.0			xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/cat4/intel_old.0			xserver-xf86-video-intel-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
 ./usr/X11R7/man/cat4/mga.0				xserver-xf86-video-mga-catman	.cat,xorg
 ./usr/X11R7/man/cat4/modesetting.0			xserver-modesetting-catman	.cat,xorg
@@ -355,8 +355,8 @@
 ./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/cat4/x86/radeon.0			xserver-xf86-video-radeon-catman	.cat,xorg
-./usr/X11R7/man/cat4/xgi.0				xserver-xf86-video-xgi-catman	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/xgi.0				xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/cat4/xgi.0				xserver-xf86-video-xgi-catman	.cat,xorg,xorg_server_ver=110
 ./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
@@ -365,21 +365,21 @@
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/xorgconfig.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/amdgpu.html			xserver-xf86-video-amdgpu-htmlman	html,xorg,xorg_server_ver=120
-./usr/X11R7/man/html4/apm.html				xserver-xf86-video-apm-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/apm.html				xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/html4/apm.html				xserver-xf86-video-apm-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/ati.html				xserver-xf86-video-ati-htmlman	html,xorg
 ./usr/X11R7/man/html4/chips.html			xserver-xf86-video-chips-htmlman	html,xorg
 ./usr/X11R7/man/html4/cirrus.html			xserver-xf86-video-cirrus-htmlman	html,xorg
 ./usr/X11R7/man/html4/cyrix.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
-./usr/X11R7/man/html4/glint.html			xserver-xf86-video-glint-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/glint.html			xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/html4/glint.html			xserver-xf86-video-glint-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/i128.html				xserver-xf86-video-i128-htmlman	html,xorg
 ./usr/X11R7/man/html4/i740.html				xserver-xf86-video-i740-htmlman	html,xorg
 ./usr/X11R7/man/html4/imstt.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/intel.html			xserver-xf86-video-intel-htmlman	html,xorg
-./usr/X11R7/man/html4/intel_old.html			xserver-xf86-video-intel-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/intel_old.html			xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/html4/intel_old.html			xserver-xf86-video-intel-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
 ./usr/X11R7/man/html4/mga.html				xserver-xf86-video-mga-htmlman	html,xorg
 ./usr/X11R7/man/html4/modesetting.html			xserver-modesetting-htmlman	html,xorg
@@ -410,8 +410,8 @@
 ./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/html4/x86/radeon.html			xserver-xf86-video-radeon-htmlman	html,xorg
-./usr/X11R7/man/html4/xgi.html				xserver-xf86-video-xgi-htmlman	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/xgi.html				xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/html4/xgi.html				xserver-xf86-video-xgi-htmlman	html,xorg,xorg_server_ver=110
 ./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
@@ -420,15 +420,15 @@
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/xorgconfig.1			xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/amdgpu.4				xserver-xf86-video-amdgpu-man	.man,xorg,xorg_server_ver=120
-./usr/X11R7/man/man4/apm.4				xserver-xf86-video-apm-man	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/apm.4				xserver-obsolete	.man,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/man4/apm.4				xserver-xf86-video-apm-man	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/ati.4				xserver-xf86-video-ati-man	.man,xorg
 ./usr/X11R7/man/man4/chips.4				xserver-xf86-video-chips-man	.man,xorg
 ./usr/X11R7/man/man4/cirrus.4				xserver-xf86-video-cirrus-man	.man,xorg
 ./usr/X11R7/man/man4/cyrix.4				xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
-./usr/X11R7/man/man4/glint.4				xserver-xf86-video-glint-man	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/glint.4				xserver-obsolete	.man,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/man4/glint.4				xserver-xf86-video-glint-man	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/i128.4				xserver-xf86-video-i128-man	.man,xorg
 ./usr/X11R7/man/man4/i740.4				xserver-xf86-video-i740-man	.man,xorg
 ./usr/X11R7/man/man4/imstt.4				xserver-obsolete	obsolete
@@ -464,7 +464,7 @@
 ./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/man4/x86/radeon.4			xserver-xf86-video-radeon-man	.man,xorg
-./usr/X11R7/man/man4/xgi.4				xserver-xf86-video-xgi-man	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/xgi.4				xserver-obsolete	.man,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/man4/xgi.4				xserver-xf86-video-xgi-man	.man,xorg,xorg_server_ver=110
 ./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

Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.20 src/distrib/sets/lists/xserver/md.evbarm:1.21
--- src/distrib/sets/lists/xserver/md.evbarm:1.20	Fri Jan 31 20:56:03 2020
+++ src/distrib/sets/lists/xserver/md.evbarm	Thu Aug 27 15:32:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.20 2020/01/31 20:56:03 jmcneill Exp $
+# $NetBSD: md.evbarm,v 1.21 2020/08/27 15:32:01 riastradh 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
@@ -124,8 +124,8 @@
 ./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/ati.html				xserver-xf86-video-ati-htmlman	html,xorg
-./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/evbarm/radeon.html		xserver-xf86-video-radeon-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/modesetting.html			xserver-modesetting-htmlman	html,xorg
 ./usr/X11R7/man/html4/mousedrv.html			xserver-xf86-input-mouse-htmlman	html,xorg
@@ -139,6 +139,7 @@
 ./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/ati.4				xserver-xf86-video-ati-man	.man,xorg
+./usr/X11R7/man/man4/evbarm/radeon.4			xserver-xf86-video-radeon-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/modesetting.4			xserver-modesetting-man	.man,xorg
@@ -148,6 +149,5 @@
 ./usr/X11R7/man/man4/void.4				xserver-obsolete	obsolete
 ./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/man4/evbarm/radeon.4			xserver-xf86-video-radeon-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

Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.43 src/distrib/sets/lists/xserver/mi:1.44
--- src/distrib/sets/lists/xserver/mi:1.43	Sat Oct 26 07:31:39 2019
+++ src/distrib/sets/lists/xserver/mi	Thu Aug 27 15:32:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.43 2019/10/26 07:31:39 uki Exp $
+# $NetBSD: mi,v 1.44 2020/08/27 15:32:01 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -9,16 +9,16 @@
 ./usr/X11R7/lib/modules/dri/gallium_dri.so.0		xserver-gallium-drivers	xorg
 ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so		xserver-MesaLib-drivers	xorg
 ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0		xserver-MesaLib-drivers	xorg
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-MesaLib-drivers	xorg,machine=amd64,mesa_ver=10
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-MesaLib-drivers	xorg,machine=i386,mesa_ver=10
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-obsolete	obsolete,!machine=amd64,!machine=i386
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-obsolete	obsolete,machine=amd64,mesa_ver=18
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-obsolete	obsolete,machine=i386,mesa_ver=18
-./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-MesaLib-drivers	xorg,machine=amd64,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so		xserver-MesaLib-drivers	xorg,machine=i386,mesa_ver=10
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-MesaLib-drivers	xorg,machine=amd64,mesa_ver=10
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-MesaLib-drivers	xorg,machine=i386,mesa_ver=10
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-obsolete	obsolete,!machine=amd64,!machine=i386
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-obsolete	obsolete,machine=amd64,mesa_ver=18
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-obsolete	obsolete,machine=i386,mesa_ver=18
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-MesaLib-drivers	xorg,machine=amd64,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		xserver-MesaLib-drivers	xorg,machine=i386,mesa_ver=10
 ./usr/X11R7/lib/modules/dri/swrast_dri.so		xserver-MesaLib-drivers	xorg
 ./usr/X11R7/lib/modules/dri/swrast_dri.so.0		xserver-MesaLib-drivers	xorg
 ./usr/X11R7/lib/modules/libglamoregl.so			xserver-xorg-server-drivers	xorg,xorg_glamor

Reply via email to