Module Name:    src
Committed By:   kre
Date:           Thu Dec 15 12:56:52 UTC 2016

Modified Files:
        src/distrib/sets/lists/modules: ad.arm ad.mips md.amd64 md.hppa md.i386
            md.ia64 mi
        src/distrib/sets/lists/tests: mi
        src/distrib/sets/lists/xbase: mi shl.mi
        src/distrib/sets/lists/xcomp: mi shl.mi
        src/distrib/sets/lists/xdebug: md.amd64 md.mac68k mi shl.mi
        src/distrib/sets/lists/xetc: mi
        src/distrib/sets/lists/xserver: md.sgimips md.sparc mi

Log Message:
More sets list sorting (maybe this time they're really all done)


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/modules/ad.arm \
    src/distrib/sets/lists/modules/ad.mips
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/modules/md.hppa
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/modules/md.ia64
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.708 -r1.709 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.138 -r1.139 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xdebug/md.mac68k
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.37 -r1.38 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/modules/ad.arm
diff -u src/distrib/sets/lists/modules/ad.arm:1.9 src/distrib/sets/lists/modules/ad.arm:1.10
--- src/distrib/sets/lists/modules/ad.arm:1.9	Wed Oct 19 09:44:00 2016
+++ src/distrib/sets/lists/modules/ad.arm	Thu Dec 15 12:56:52 2016
@@ -1,13 +1,13 @@
-# $NetBSD: ad.arm,v 1.9 2016/10/19 09:44:00 skrll Exp $
+# $NetBSD: ad.arm,v 1.10 2016/12/15 12:56:52 kre Exp $
 
 ./@MODULEDIR@/compat_netbsd32			base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	base-kernel-modules	kmod
-./@MODULEDIR@/compat_netbsd32_ptrace		base-kernel-modules	kmod
-./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	base-kernel-modules	kmod
+./@MODULEDIR@/compat_netbsd32_ptrace		base-kernel-modules	kmod
+./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/exec_elf32			base-kernel-modules	kmod
Index: src/distrib/sets/lists/modules/ad.mips
diff -u src/distrib/sets/lists/modules/ad.mips:1.9 src/distrib/sets/lists/modules/ad.mips:1.10
--- src/distrib/sets/lists/modules/ad.mips:1.9	Wed Oct 19 09:44:00 2016
+++ src/distrib/sets/lists/modules/ad.mips	Thu Dec 15 12:56:52 2016
@@ -1,12 +1,12 @@
-# $NetBSD: ad.mips,v 1.9 2016/10/19 09:44:00 skrll Exp $
+# $NetBSD: ad.mips,v 1.10 2016/12/15 12:56:52 kre Exp $
 ./@MODULEDIR@/compat_netbsd32			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_mqueue			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_ptrace			base-kernel-modules	kmod,arch64,nocompatmodules
-./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_nfssrv			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_ptrace			base-kernel-modules	kmod,arch64,nocompatmodules
+./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc			base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	base-kernel-modules	kmod,arch64,nocompatmodules
 ./@MODULEDIR@/exec_elf32			base-kernel-modules	kmod

Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.71 src/distrib/sets/lists/modules/md.amd64:1.72
--- src/distrib/sets/lists/modules/md.amd64:1.71	Thu Dec 15 06:50:37 2016
+++ src/distrib/sets/lists/modules/md.amd64	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.71 2016/12/15 06:50:37 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.72 2016/12/15 12:56:52 kre Exp $
 #
 # NOTE that there are two sets of files here:
 # @MODULEDIR@ and amd64-xen
@@ -53,10 +53,10 @@
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod	base-kernel-modules	kmod
-./@MODULEDIR@/compat_netbsd32_ptrace		base-kernel-modules	kmod
-./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_nfssrv/compat_netbsd32_nfssrv.kmod	base-kernel-modules	kmod
+./@MODULEDIR@/compat_netbsd32_ptrace		base-kernel-modules	kmod
+./@MODULEDIR@/compat_netbsd32_ptrace/compat_netbsd32_ptrace.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32_sysvipc/compat_netbsd32_sysvipc.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/coram				base-kernel-modules	kmod

Index: src/distrib/sets/lists/modules/md.hppa
diff -u src/distrib/sets/lists/modules/md.hppa:1.5 src/distrib/sets/lists/modules/md.hppa:1.6
--- src/distrib/sets/lists/modules/md.hppa:1.5	Tue Sep 27 20:52:43 2016
+++ src/distrib/sets/lists/modules/md.hppa	Thu Dec 15 12:56:52 2016
@@ -1,8 +1,8 @@
-# $NetBSD: md.hppa,v 1.5 2016/09/27 20:52:43 pgoyette Exp $
+# $NetBSD: md.hppa,v 1.6 2016/12/15 12:56:52 kre Exp $
+
 ./@MODULEDIR@/cac_eisa				base-obsolete		obsolete
 ./@MODULEDIR@/cac_eisa/cac_eisa.kmod		base-obsolete		obsolete
 ./@MODULEDIR@/exec_elf32			base-kernel-modules	kmod
 ./@MODULEDIR@/exec_elf32/exec_elf32.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/mlx_eisa				base-obsolete		obsolete
 ./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod		base-obsolete		obsolete
-

Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.72 src/distrib/sets/lists/modules/md.i386:1.73
--- src/distrib/sets/lists/modules/md.i386:1.72	Thu Dec 15 06:50:37 2016
+++ src/distrib/sets/lists/modules/md.i386	Thu Dec 15 12:56:52 2016
@@ -1,8 +1,9 @@
-# $NetBSD: md.i386,v 1.72 2016/12/15 06:50:37 pgoyette Exp $
+# $NetBSD: md.i386,v 1.73 2016/12/15 12:56:52 kre Exp $
 #
 # NOTE that there are three sets of files here:
 # @MODULEDIR@, i386-xen, and i386pae-xen
 #
+
 ./@MODULEDIR@/acpiacad				base-kernel-modules	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/acpibat				base-kernel-modules	kmod
@@ -121,17 +122,16 @@
 ./@MODULEDIR@/lm_wbsio/lm_wbsio.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/mach64drm				base-kernel-modules	kmod
 ./@MODULEDIR@/mach64drm/mach64drm.kmod		base-kernel-modules	kmod
-./@MODULEDIR@/mlx_eisa				base-obsolete		obsolete
-./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod		base-obsolete		obsolete
 ./@MODULEDIR@/mgadrm				base-kernel-modules	kmod
 ./@MODULEDIR@/mgadrm/mgadrm.kmod		base-kernel-modules	kmod
+./@MODULEDIR@/mlx_eisa				base-obsolete		obsolete
+./@MODULEDIR@/mlx_eisa/mlx_eisa.kmod		base-obsolete		obsolete
 ./@MODULEDIR@/mt2131				base-kernel-modules	kmod
 ./@MODULEDIR@/mt2131/mt2131.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/nsclpcsio				base-kernel-modules	kmod
 ./@MODULEDIR@/nsclpcsio/nsclpcsio.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/nvme				base-obsolete		obsolete
 ./@MODULEDIR@/nvme/nvme.kmod			base-obsolete		obsolete
-
 ./@MODULEDIR@/nxt2k				base-kernel-modules	kmod
 ./@MODULEDIR@/nxt2k/nxt2k.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/odcm				base-kernel-modules	kmod

Index: src/distrib/sets/lists/modules/md.ia64
diff -u src/distrib/sets/lists/modules/md.ia64:1.4 src/distrib/sets/lists/modules/md.ia64:1.5
--- src/distrib/sets/lists/modules/md.ia64:1.4	Fri Aug  5 16:21:09 2016
+++ src/distrib/sets/lists/modules/md.ia64	Thu Dec 15 12:56:52 2016
@@ -1,5 +1,5 @@
-# $NetBSD: md.ia64,v 1.4 2016/08/05 16:21:09 scole Exp $
-./@MODULEDIR@/exec_elf64			base-kernel-modules	kmod
-./@MODULEDIR@/exec_elf64/exec_elf64.kmod	base-kernel-modules	kmod
+# $NetBSD: md.ia64,v 1.5 2016/12/15 12:56:52 kre Exp $
 ./@MODULEDIR@/acpiverbose			base-kernel-modules	kmod
 ./@MODULEDIR@/acpiverbose/acpiverbose.kmod	base-kernel-modules	kmod
+./@MODULEDIR@/exec_elf64			base-kernel-modules	kmod
+./@MODULEDIR@/exec_elf64/exec_elf64.kmod	base-kernel-modules	kmod

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.105 src/distrib/sets/lists/modules/mi:1.106
--- src/distrib/sets/lists/modules/mi:1.105	Thu Dec 15 07:08:27 2016
+++ src/distrib/sets/lists/modules/mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.105 2016/12/15 07:08:27 pgoyette Exp $
+# $NetBSD: mi,v 1.106 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -314,12 +314,12 @@
 ./@MODULEDIR@/smbfs/smbfs.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/solaris				base-kernel-modules     kmod,solaris
 ./@MODULEDIR@/solaris/solaris.kmod		base-kernel-modules     kmod,solaris
+./@MODULEDIR@/spdmem				base-kernel-modules	kmod
+./@MODULEDIR@/spdmem/spdmem.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/spkr				base-kernel-modules	kmod
+./@MODULEDIR@/spkr/_synchspkr._synchkmod	base-obsolete		obsolete
 ./@MODULEDIR@/spkr/spkr.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/spkr_synch			base-obsolete		obsolete
-./@MODULEDIR@/spkr/_synchspkr._synchkmod	base-obsolete		obsolete
-./@MODULEDIR@/spdmem				base-kernel-modules	kmod
-./@MODULEDIR@/spdmem/spdmem.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/sppp_subr				base-kernel-modules	kmod
 ./@MODULEDIR@/sppp_subr/sppp_subr.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/suser				base-kernel-modules	kmod

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.708 src/distrib/sets/lists/tests/mi:1.709
--- src/distrib/sets/lists/tests/mi:1.708	Tue Dec 13 18:00:10 2016
+++ src/distrib/sets/lists/tests/mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.708 2016/12/13 18:00:10 kamil Exp $
+# $NetBSD: mi,v 1.709 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -25,9 +25,9 @@
 ./usr/libdata/debug/usr/tests/dev					tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/dev/audio					tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/dev/cgd					tests-fs-debug		compattestfile,atf
+./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd				tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/dev/clock_subr				tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/dev/fss					tests-fs-debug		compattestfile,atf
-./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd				tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/dev/md					tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/dev/scsipi				tests-fs-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/dev/sysmon				tests-fs-debug		compattestfile,atf
@@ -133,8 +133,8 @@
 ./usr/libdata/debug/usr/tests/lib/libpthread				tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen			tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread_dbg			tests-lib-debug		compattestfile,atf
-./usr/libdata/debug/usr/tests/lib/librt					tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/librefuse				tests-lib-debug		compattestfile,atf
+./usr/libdata/debug/usr/tests/lib/librt					tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/librumpclient				tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/librumphijack				tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libskey				tests-lib-debug		compattestfile,atf
@@ -1264,9 +1264,9 @@
 ./usr/tests/bin/sh/dotcmd/while_return_subshell	tests-bin-tests	compattestfile,atf
 ./usr/tests/bin/sh/dotcmd/while_return_until	tests-bin-tests	compattestfile,atf
 ./usr/tests/bin/sh/dotcmd/while_return_while	tests-bin-tests	compattestfile,atf
-./usr/tests/bin/sh/t_compexit			tests-obsolete		obsolete
 ./usr/tests/bin/sh/t_arith			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_cmdsub			tests-bin-tests		compattestfile,atf
+./usr/tests/bin/sh/t_compexit			tests-obsolete		obsolete
 ./usr/tests/bin/sh/t_evaltested			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_exit			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_expand			tests-bin-tests		compattestfile,atf
@@ -3050,14 +3050,14 @@
 ./usr/tests/lib/libpthread_dbg/Kyuafile		tests-lib-tests		compattestfile,atf,kyua
 ./usr/tests/lib/libpthread_dbg/t_dummy		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libpthread_dbg/t_threads	tests-lib-tests		compattestfile,atf
+./usr/tests/lib/librefuse			tests-lib-tests		compattestfile,atf
+./usr/tests/lib/librefuse/Atffile		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/librefuse/t_refuse_opt		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librt				tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librt/Atffile			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librt/Kyuafile			tests-lib-tests		compattestfile,atf,kyua
 ./usr/tests/lib/librt/t_sched			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librt/t_sem			tests-lib-tests		compattestfile,atf
-./usr/tests/lib/librefuse			tests-lib-tests		compattestfile,atf
-./usr/tests/lib/librefuse/Atffile		tests-lib-tests		compattestfile,atf
-./usr/tests/lib/librefuse/t_refuse_opt		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librumpclient				tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/librumpclient/Atffile			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumpclient/Kyuafile			tests-lib-tests		atf,rump,kyua
@@ -3298,8 +3298,8 @@
 ./usr/tests/net/net/Kyuafile			tests-net-tests		compattestfile,atf,kyua
 ./usr/tests/net/net/t_forwarding		tests-net-tests		atf,rump
 ./usr/tests/net/net/t_ipaddress			tests-net-tests		atf,rump
-./usr/tests/net/net/t_ipv6address		tests-net-tests		atf,rump
 ./usr/tests/net/net/t_ipv6_lifetime		tests-net-tests		atf,rump
+./usr/tests/net/net/t_ipv6address		tests-net-tests		atf,rump
 ./usr/tests/net/net/t_mtudisc			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_mtudisc6			tests-net-tests		atf,rump
 ./usr/tests/net/net/t_ping6_opts		tests-net-tests		atf,rump
@@ -3378,17 +3378,17 @@
 ./usr/tests/sbin/gpt				tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/Atffile			tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/Kyuafile			tests-sbin-tests	compattestfile,atf,kyua
-./usr/tests/sbin/gpt/t_gpt			tests-sbin-tests	compattestfile,atf
-./usr/tests/sbin/gpt/gpt.disklabel		tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.2part.show.label	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.2part.show.normal	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.2part.show.uuid	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.backup			tests-sbin-tests	compattestfile,atf
+./usr/tests/sbin/gpt/gpt.disklabel		tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.disklabel.show.normal	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.empty.show.normal 	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.removepart.show.normal	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.resizedisk.show.normal	tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/gpt/gpt.resizepart.show.normal	tests-sbin-tests	compattestfile,atf
+./usr/tests/sbin/gpt/t_gpt			tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/ifconfig			tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/ifconfig/Atffile		tests-sbin-tests	compattestfile,atf
 ./usr/tests/sbin/ifconfig/Kyuafile		tests-sbin-tests	compattestfile,atf,kyua
@@ -3879,8 +3879,8 @@
 ./usr/tests/usr.bin/uniq/Atffile	tests-usr.bin-tests compattestfile,atf
 ./usr/tests/usr.bin/uniq/d_basic.in		tests-usr.bin-tests compattestfile,atf
 ./usr/tests/usr.bin/uniq/d_basic.out	tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/uniq/d_input.in		tests-usr.bin-tests compattestfile,atf
 ./usr/tests/usr.bin/uniq/d_counts.out	tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/uniq/d_input.in		tests-usr.bin-tests compattestfile,atf
 ./usr/tests/usr.bin/uniq/d_show_duplicates.out 		tests-usr.bin-tests compattestfile,atf
 ./usr/tests/usr.bin/uniq/d_show_uniques.out		tests-usr.bin-tests compattestfile,atf
 ./usr/tests/usr.bin/uniq/t_uniq 	tests-usr.bin-tests compattestfile,atf
@@ -3909,8 +3909,8 @@
 ./usr/tests/usr.bin/xlint/lint1/d_c99_nested_struct.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_struct_init.c		tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/d_c99_union_init1.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_cast.c		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_union_init1.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init2.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init3.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_union_init4.c		tests-usr.bin-tests	compattestfile,atf

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.138 src/distrib/sets/lists/xbase/mi:1.139
--- src/distrib/sets/lists/xbase/mi:1.138	Thu Dec 15 09:17:26 2016
+++ src/distrib/sets/lists/xbase/mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.138 2016/12/15 09:17:26 mrg Exp $
+# $NetBSD: mi,v 1.139 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -15,6 +15,7 @@
 ./usr/X11R7/bin/bmtoa					-unknown-	xorg
 ./usr/X11R7/bin/ccmakedep				-unknown-	xorg
 ./usr/X11R7/bin/cleanlinks				-unknown-	xorg
+./usr/X11R7/bin/ctwm					-unknown-	xorg
 ./usr/X11R7/bin/cxpm					-unknown-	xorg
 ./usr/X11R7/bin/dga					-unknown-	xorg
 ./usr/X11R7/bin/editres					-unknown-	xorg
@@ -61,7 +62,6 @@
 ./usr/X11R7/bin/startx					-unknown-	xorg
 ./usr/X11R7/bin/sxpm					-unknown-	xorg
 ./usr/X11R7/bin/twm					-unknown-	xorg
-./usr/X11R7/bin/ctwm					-unknown-	xorg
 ./usr/X11R7/bin/ucs2any					-unknown-	xorg
 ./usr/X11R7/bin/uxterm					-unknown-	xorg
 ./usr/X11R7/bin/viewres					-unknown-	xorg
@@ -169,10 +169,7 @@
 ./usr/X11R7/include/X11/pixmaps/NetBSD-flag2.xpm	-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/NetBSD-inv.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/NetBSD.xpm		-unknown-	xorg
-./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm		-unknown-	xorg
-./usr/X11R7/include/X11/pixmaps/xorg.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm				base-x11-root	xorg
-./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm		-unknown- xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/3D_Expand15.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/3D_Iconify15.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/3D_Lightning15.xpm		-unknown-	xorg
@@ -229,6 +226,7 @@
 ./usr/X11R7/include/X11/pixmaps/ctwm/pixmap.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/postit.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm		-unknown-	xorg
+./usr/X11R7/include/X11/pixmaps/ctwm/skull.xpm		-unknown- xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/spider.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/term.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/unknown.xpm		-unknown-	xorg
@@ -253,6 +251,8 @@
 ./usr/X11R7/include/X11/pixmaps/ctwm/xrn.nonews.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/xrn.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/ctwm/xterm.xpm		-unknown-	xorg
+./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm		-unknown-	xorg
+./usr/X11R7/include/X11/pixmaps/xorg.xpm		-unknown-	xorg
 ./usr/X11R7/include/drm					base-x11-root	obsolete
 ./usr/X11R7/include/epoxy				base-x11-root	xorg
 ./usr/X11R7/include/fontconfig				base-x11-root	xorg
@@ -1023,8 +1023,8 @@
 ./usr/X11R7/lib/X11/xkb/symbols/np			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ogham			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/olpc			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/parens			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ori			-unknown-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/parens			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/pc			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/pc/al			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/pc/am			-unknown-	obsolete
@@ -1260,6 +1260,7 @@
 ./usr/X11R7/man/cat1/bmtoa.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/ccmakedep.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/cleanlinks.0			-unknown-	.cat,xorg
+./usr/X11R7/man/cat1/ctwm.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/cxpm.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/dga.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/editres.0				-unknown-	.cat,xorg
@@ -1300,7 +1301,6 @@
 ./usr/X11R7/man/cat1/startx.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/sxpm.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/twm.0				-unknown-	.cat,xorg
-./usr/X11R7/man/cat1/ctwm.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/ucs2any.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/viewres.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/x11perf.0				-unknown-	.cat,xorg
@@ -1404,6 +1404,7 @@
 ./usr/X11R7/man/html1/bmtoa.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/ccmakedep.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/cleanlinks.html			-unknown-	html,xorg
+./usr/X11R7/man/html1/ctwm.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/cxpm.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/dga.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/editres.html			-unknown-	html,xorg
@@ -1444,7 +1445,6 @@
 ./usr/X11R7/man/html1/startx.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/sxpm.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/twm.html				-unknown-	html,xorg
-./usr/X11R7/man/html1/ctwm.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/ucs2any.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/viewres.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/x11perf.html			-unknown-	html,xorg
@@ -1548,6 +1548,7 @@
 ./usr/X11R7/man/man1/bmtoa.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/ccmakedep.1			-unknown-	.man,xorg
 ./usr/X11R7/man/man1/cleanlinks.1			-unknown-	.man,xorg
+./usr/X11R7/man/man1/ctwm.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/cxpm.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/dga.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/editres.1				-unknown-	.man,xorg
@@ -1589,7 +1590,6 @@
 ./usr/X11R7/man/man1/startx.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/sxpm.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/twm.1				-unknown-	.man,xorg
-./usr/X11R7/man/man1/ctwm.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/ucs2any.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/viewres.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/x11perf.1				-unknown-	.man,xorg

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.73 src/distrib/sets/lists/xbase/shl.mi:1.74
--- src/distrib/sets/lists/xbase/shl.mi:1.73	Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xbase/shl.mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.73 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: shl.mi,v 1.74 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -35,9 +35,6 @@
 ./usr/X11R7/lib/libICE.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libICE.so.7			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libICE.so.7.0			-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libglapi.so			-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libglapi.so.0			-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libglapi.so.0.0			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libOSMesa.so			-unknown-		obsolete
 ./usr/X11R7/lib/libOSMesa.so.7			-unknown-		obsolete
 ./usr/X11R7/lib/libOSMesa.so.7.0		-unknown-		obsolete
@@ -116,12 +113,12 @@
 ./usr/X11R7/lib/libXp.so			-obsolete-		obsolete
 ./usr/X11R7/lib/libXp.so.7			-obsolete-		obsolete
 ./usr/X11R7/lib/libXp.so.7.0			-obsolete-		obsolete
-./usr/X11R7/lib/libXpresent.so			-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libXpresent.so.1		-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libXpresent.so.1.0		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXpm.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXpm.so.5			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXpm.so.5.0			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libXpresent.so			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libXpresent.so.1		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libXpresent.so.1.0		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXprintAppUtil.so		-obsolete-		obsolete
 ./usr/X11R7/lib/libXprintAppUtil.so.2		-obsolete-		obsolete
 ./usr/X11R7/lib/libXprintAppUtil.so.2.0		-obsolete-		obsolete
@@ -188,6 +185,9 @@
 ./usr/X11R7/lib/libgbm.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libgbm.so.1			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libgbm.so.1.0			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libglapi.so			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libglapi.so.0			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libglapi.so.0.0			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libglut.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libglut.so.4			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libglut.so.4.0			-unknown-		xorg,compatx11file

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.186 src/distrib/sets/lists/xcomp/mi:1.187
--- src/distrib/sets/lists/xcomp/mi:1.186	Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xcomp/mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.186 2016/09/24 21:57:38 mrg Exp $
+#	 $NetBSD: mi,v 1.187 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -768,8 +768,8 @@
 ./usr/X11R7/include/xorg/atKeynames.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/bstore.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/bstorestr.h			-unknown-	obsolete
-./usr/X11R7/include/xorg/bt829.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/bt829.h			-unknown-	xorg,obsolete,xorg_server_ver=118
+./usr/X11R7/include/xorg/bt829.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/callback.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/cfb.h				-unknown-	obsolete
 ./usr/X11R7/include/xorg/cfb16.h			-unknown-	obsolete

Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.46 src/distrib/sets/lists/xcomp/shl.mi:1.47
--- src/distrib/sets/lists/xcomp/shl.mi:1.46	Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xcomp/shl.mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: shl.mi,v 1.46 2016/08/19 22:37:03 mrg Exp $
+#	$NetBSD: shl.mi,v 1.47 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -8,7 +8,6 @@
 ./usr/X11R7/lib/libGLw_pic.a				-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libICE_pic.a				-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libOSMesa_pic.a				-unknown-	obsolete
-./usr/X11R7/lib/libglapi_pic.a				-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libSM_pic.a				-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libX11-xcb_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libX11_pic.a				-unknown-	xorg,picinstall,compatx11file
@@ -57,6 +56,7 @@
 ./usr/X11R7/lib/libfontenc_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libfreetype_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libgbm_pic.a				-unknown-	xorg,picinstall,compatx11file
+./usr/X11R7/lib/libglapi_pic.a				-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libglut_pic.a				-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/liblbxutil_pic.a			-obsolete-	obsolete
 ./usr/X11R7/lib/liblisp_pic.a				-obsolete-	obsolete

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.37 src/distrib/sets/lists/xdebug/md.amd64:1.38
--- src/distrib/sets/lists/xdebug/md.amd64:1.37	Mon Sep 26 22:37:31 2016
+++ src/distrib/sets/lists/xdebug/md.amd64	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.37 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: md.amd64,v 1.38 2016/12/15 12:56:52 kre Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg,compatx11file
@@ -14,8 +14,8 @@
 ./usr/X11R7/lib/modules/extensions/librecord_g.a	-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/extensions/libshadow_g.a	-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/libexa_g.a			-unknown-	xorg,debuglib,obsolete
-./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/libfb_g.a			-unknown-	xorg,debuglib,obsolete
+./usr/X11R7/lib/modules/libi2c_g.a			-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/libint10_g.a			-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/libshadowfb_g.a			-unknown-	xorg,debuglib,obsolete
 ./usr/X11R7/lib/modules/libvbe_g.a			-unknown-	xorg,debuglib,obsolete

Index: src/distrib/sets/lists/xdebug/md.mac68k
diff -u src/distrib/sets/lists/xdebug/md.mac68k:1.5 src/distrib/sets/lists/xdebug/md.mac68k:1.6
--- src/distrib/sets/lists/xdebug/md.mac68k:1.5	Sat Sep 24 21:57:38 2016
+++ src/distrib/sets/lists/xdebug/md.mac68k	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,5 @@
-# $NetBSD: md.mac68k,v 1.5 2016/09/24 21:57:38 mrg Exp $
+# $NetBSD: md.mac68k,v 1.6 2016/12/15 12:56:52 kre Exp $
+
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	-unknown-	debug,xorg
@@ -23,4 +24,3 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug	-unknown-	debug,xorg,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug	-unknown-	debug,xorg,xorg_server_ver=118,obsolete
-

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.24 src/distrib/sets/lists/xdebug/mi:1.25
--- src/distrib/sets/lists/xdebug/mi:1.24	Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.24 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: mi,v 1.25 2016/12/15 12:56:52 kre Exp $
 ./etc/mtree/set.xdebug					comp-sys-root
 ./usr/X11R7/lib						-unknown-	debuglib,xorg,compatx11dir
 ./usr/X11R7/lib/libFS_g.a				-unknown-	debuglib,xorg,compatx11file
@@ -7,7 +7,6 @@
 ./usr/X11R7/lib/libGLw_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libICE_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libOSMesa_g.a				-unknown-	obsolete
-./usr/X11R7/lib/libglapi_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libSM_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libX11-xcb_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libX11_g.a				-unknown-	debuglib,xorg,compatx11file
@@ -57,6 +56,7 @@
 ./usr/X11R7/lib/libfontenc_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libfreetype_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libgbm_g.a				-unknown-	debuglib,xorg,compatx11file
+./usr/X11R7/lib/libglapi_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/libglut_g.a				-unknown-	debuglib,xorg,compatx11file
 ./usr/X11R7/lib/liblbxutil_g.a				-obsolete-	obsolete
 ./usr/X11R7/lib/liblisp_g.a				-obsolete-	obsolete
@@ -227,5 +227,5 @@
 ./usr/libdata/debug/usr/X11R7/bin/xwd.debug		-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/xwininfo.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/bin/xwud.debug		-unknown-	debug,xorg
-./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	-unknown-	debug,xorg
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-		debug,xorg
+./usr/libdata/debug/usr/X11R7/libexec/chooser.debug	-unknown-	debug,xorg

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.36 src/distrib/sets/lists/xdebug/shl.mi:1.37
--- src/distrib/sets/lists/xdebug/shl.mi:1.36	Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/shl.mi	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.36 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: shl.mi,v 1.37 2016/12/15 12:56:52 kre Exp $
 ./usr/libdata/debug/usr/X11R7/lib	-unknown-		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		xorg,obsolete
@@ -41,8 +41,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug	-unknown-		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libXpresent.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXpm.so.5.0.debug	-unknown-		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXpresent.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.2.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXrender.so.2.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXss.so.2.0.debug	-unknown-		xorg,debug,compatx11file
@@ -61,8 +61,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.13.debug	-unknown-		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug	-unknown-		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug	-unknown-		xorg,debug,compatx11file
@@ -104,10 +104,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	-unknown-	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=i386
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=amd64
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=i386
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	obsolete	obsolete,xorg,debug,!machine=i386,!machine=amd64
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	obsolete	obsolete,xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	-unknown-	xorg,debug,machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	-unknown-	xorg,debug,machine=i386
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	obsolete	obsolete,xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	-unknown-	xorg,debug

Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.26 src/distrib/sets/lists/xetc/mi:1.27
--- src/distrib/sets/lists/xetc/mi:1.26	Thu Sep  3 22:24:02 2015
+++ src/distrib/sets/lists/xetc/mi	Thu Dec 15 12:56:52 2016
@@ -1,8 +1,8 @@
-# $NetBSD: mi,v 1.26 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
-./etc/drirc						-unknown-	xorg
+./etc/X11/ctwm/system.ctwmrc				-unknown-	xorg
 ./etc/X11/fs/config					-unknown-	x11
 ./etc/X11/fs/config					-unknown-	xorg
 ./etc/X11/lbxproxy/AtomControl				-obsolete-	obsolete,xorg
@@ -23,7 +23,6 @@
 ./etc/X11/rstart/contexts/x				-unknown-	x11
 ./etc/X11/rstart/contexts/x11				-unknown-	x11
 ./etc/X11/rstart/contexts/x11r6				-unknown-	x11
-./etc/X11/ctwm/system.ctwmrc				-unknown-	xorg
 ./etc/X11/twm/system.twmrc				-unknown-	x11
 ./etc/X11/twm/system.twmrc				-unknown-	xorg
 ./etc/X11/xdm/GiveConsole				-unknown-	x11
@@ -57,6 +56,7 @@
 ./etc/X11/xserver/SecurityPolicy			-unknown-	x11
 ./etc/X11/xsm/system.xsm				-unknown-	x11
 ./etc/X11/xsm/system.xsm				-unknown-	xorg
+./etc/drirc						-unknown-	xorg
 ./etc/fonts/conf.avail/10-autohint.conf			-unknown-	xorg
 ./etc/fonts/conf.avail/10-no-sub-pixel.conf		-unknown-	xorg
 ./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf	-unknown-	xorg

Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.54 src/distrib/sets/lists/xserver/md.sgimips:1.55
--- src/distrib/sets/lists/xserver/md.sgimips:1.54	Tue Oct 18 12:56:11 2016
+++ src/distrib/sets/lists/xserver/md.sgimips	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.54 2016/10/18 12:56:11 christos Exp $	x11
+# $NetBSD: md.sgimips,v 1.55 2016/12/15 12:56:52 kre Exp $	x11
 ./usr/X11R7/bin/X					-unknown-	xorg
 ./usr/X11R7/bin/Xorg					-unknown-	xorg
 ./usr/X11R7/bin/cvt					-unknown-	xorg
@@ -9,12 +9,12 @@
 ./usr/X11R7/lib/X11/doc/README.fonts			-unknown-	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			-unknown-	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		-unknown-	obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/crime_drv.so		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/crime_drv.so		-unknown-	xorg,xorg_server_ver=118
 ./usr/X11R7/lib/modules/drivers/crime_drv.so.0		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/crime_drv.so.0		-unknown-	xorg,xorg_server_ver=118
-./usr/X11R7/lib/modules/drivers/cirrus_drv.so		-unknown-	xorg
-./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		-unknown-	xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg,xorg_server_ver=110
@@ -26,8 +26,8 @@
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/newport_drv.so		-unknown-	xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/newport_drv.so.0	-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/newport_drv.so		-unknown-	xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/lib/modules/drivers/newport_drv.so.0	-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/newport_drv.so.0	-unknown-	xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/lib/modules/drivers/s3_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/s3_drv.so.0		-unknown-	xorg
@@ -176,9 +176,9 @@
 ./usr/X11R7/man/html1/cvt.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/gtf.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/xorgconfig.html			-unknown-	obsolete
+./usr/X11R7/man/html4/cirrus.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/crime.html			-unknown-	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/crime.html			-unknown-	html,xorg,xorg_server_ver=118,obsolete
-./usr/X11R7/man/html4/cirrus.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/exa.html				-unknown-	html,xorg
 ./usr/X11R7/man/html4/glint.html			-unknown-	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/glint.html			-unknown-	html,xorg,xorg_server_ver=118,obsolete
@@ -196,9 +196,9 @@
 ./usr/X11R7/man/man1/cvt.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/xorgconfig.1			-unknown-	obsolete
+./usr/X11R7/man/man4/cirrus.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/crime.4				-unknown-	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/crime.4				-unknown-	.man,xorg,xorg_server_ver=118,obsolete
-./usr/X11R7/man/man4/cirrus.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/exa.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/glint.4				-unknown-	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/glint.4				-unknown-	.man,xorg,xorg_server_ver=118,obsolete

Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.64 src/distrib/sets/lists/xserver/md.sparc:1.65
--- src/distrib/sets/lists/xserver/md.sparc:1.64	Tue Oct  4 21:34:02 2016
+++ src/distrib/sets/lists/xserver/md.sparc	Thu Dec 15 12:56:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.64 2016/10/04 21:34:02 mrg Exp $
+# $NetBSD: md.sparc,v 1.65 2016/12/15 12:56:52 kre Exp $
 ./usr/X11R7/bin/X					-unknown-	xorg
 ./usr/X11R7/bin/Xorg					-unknown-	xorg
 ./usr/X11R7/bin/cvt					-unknown-	xorg
@@ -42,8 +42,8 @@
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/pnozz_drv.so		-unknown-	xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/pnozz_drv.so		-unknown-	xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0		-unknown-	xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/lib/modules/drivers/r128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so.6		-unknown-	xorg

Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.37 src/distrib/sets/lists/xserver/mi:1.38
--- src/distrib/sets/lists/xserver/mi:1.37	Fri Aug 19 22:37:04 2016
+++ src/distrib/sets/lists/xserver/mi	Thu Dec 15 12:56:52 2016
@@ -1,22 +1,22 @@
-# $NetBSD: mi,v 1.37 2016/08/19 22:37:04 mrg Exp $
+# $NetBSD: mi,v 1.38 2016/12/15 12:56:52 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
 ./etc/mtree/set.xserver					xserver-sys-root	xorg
 ./usr/X11R7/bin/Xnest					-unknown-	xorg
 ./usr/X11R7/bin/Xvfb					-unknown-	xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	xorg,machine=i386
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=i386
-./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	xorg,machine=amd64
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=amd64
-./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
-./usr/X11R7/lib/modules/dri/swrast_dri.so		-unknown-	xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/gallium_dri.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/gallium_dri.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	xorg,machine=amd64
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	xorg,machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=amd64
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=i386
+./usr/X11R7/lib/modules/dri/swrast_dri.so		-unknown-	xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0		-unknown-	xorg
 ./usr/X11R7/man/cat1/Xmark.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/Xnest.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/Xserver.0				-unknown-	.cat,xorg

Reply via email to