Tag cleanup: if the last column contains 'obsolete', the one before should too. trunk
authorwiz <wiz@NetBSD.org>
Thu, 05 Jan 2017 13:45:50 +0000
branchtrunk
changeset 247370 b6d98c07032a
parent 247369 461845825179
child 247371 150ebcdbe736
Tag cleanup: if the last column contains 'obsolete', the one before should too.
distrib/sets/lists/base/ad.m68000
distrib/sets/lists/base/ad.m68k
distrib/sets/lists/base/md.sparc
distrib/sets/lists/base/md.sparc64
distrib/sets/lists/base/mi
distrib/sets/lists/base/rescue.ad.m68k
distrib/sets/lists/base/rescue.sparc
distrib/sets/lists/base/rescue.sparc64
distrib/sets/lists/base/rescue.sun2
distrib/sets/lists/comp/ad.aarch64
distrib/sets/lists/comp/ad.arm
distrib/sets/lists/comp/ad.powerpc
distrib/sets/lists/comp/ad.sh3
distrib/sets/lists/comp/md.alpha
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.hppa
distrib/sets/lists/comp/md.i386
distrib/sets/lists/comp/md.ia64
distrib/sets/lists/comp/md.sparc
distrib/sets/lists/comp/md.sparc64
distrib/sets/lists/comp/md.vax
distrib/sets/lists/comp/mi
distrib/sets/lists/comp/shl.mi
distrib/sets/lists/debug/ad.arm
distrib/sets/lists/debug/md.atari
distrib/sets/lists/debug/md.mvme68k
distrib/sets/lists/debug/md.sparc
distrib/sets/lists/debug/md.sparc64
distrib/sets/lists/debug/md.sun2
distrib/sets/lists/debug/md.sun3
distrib/sets/lists/debug/mi
distrib/sets/lists/debug/shl.mi
distrib/sets/lists/man/mi
distrib/sets/lists/tests/mi
distrib/sets/lists/xbase/mi
distrib/sets/lists/xbase/shl.mi
distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/base/ad.m68000	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/ad.m68000	Thu Jan 05 13:45:50 2017 +0000
@@ -1,2 +1,2 @@
-# $NetBSD: ad.m68000,v 1.2 2010/03/10 23:13:09 abs Exp $
-./sbin/edlabel					base-sysutil-root	obsolete
+# $NetBSD: ad.m68000,v 1.3 2017/01/05 13:45:50 wiz Exp $
+./sbin/edlabel					base-obsolete	obsolete
--- a/distrib/sets/lists/base/ad.m68k	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/ad.m68k	Thu Jan 05 13:45:50 2017 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: ad.m68k,v 1.18 2010/03/10 23:13:09 abs Exp $
-./sbin/edlabel					base-sysutil-root	obsolete
+# $NetBSD: ad.m68k,v 1.19 2017/01/05 13:45:50 wiz Exp $
+./sbin/edlabel					base-obsolete	obsolete
 ./usr/bin/fdformat				base-util-bin
--- a/distrib/sets/lists/base/md.sparc	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/md.sparc	Thu Jan 05 13:45:50 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: md.sparc,v 1.83 2014/08/06 12:15:01 martin Exp $
+# $NetBSD: md.sparc,v 1.84 2017/01/05 13:45:50 wiz Exp $
 ./lib/libsparc_v8.so.0				base-sys-shlib		dynamicroot,pic
 ./lib/libsparc_v8.so.0.0			base-sys-shlib		dynamicroot,pic
-./sbin/edlabel					base-sysutil-root	obsolete
+./sbin/edlabel					base-obsolete	obsolete
 ./sbin/ldconfig					base-sysutil-root	pic
 ./usr/bin/fdformat				base-util-bin
 ./usr/lib/libsparc_v8.so.0			base-sys-shlib		pic
--- a/distrib/sets/lists/base/md.sparc64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/md.sparc64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.sparc64,v 1.254 2015/07/03 18:28:37 matt Exp $
+# $NetBSD: md.sparc64,v 1.255 2017/01/05 13:45:50 wiz Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
-./sbin/edlabel					base-sysutil-root	obsolete
+./sbin/edlabel					base-obsolete	obsolete
 ./usr/bin/fdformat				base-util-bin
 ./usr/libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./usr/lkm/compat_netbsd32.o			base-obsolete		obsolete
--- a/distrib/sets/lists/base/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1143 2016/12/18 17:58:08 christos Exp $
+# $NetBSD: mi,v 1.1144 2017/01/05 13:45:50 wiz Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -399,7 +399,7 @@
 ./libdata/firmware/run/run-rt2870		base-firmware-root
 ./libdata/firmware/run/run-rt3071		base-firmware-root
 ./libdata/firmware/upgt				base-firmware-root
-./libdata/firmware/urtwn			base-firmware-root obsolete
+./libdata/firmware/urtwn			base-obsolete obsolete
 ./libdata/firmware/zyd				base-firmware-root
 ./libdata/firmware/zyd/zd1211-licence		base-obsolete			obsolete
 ./libdata/firmware/zyd/zd1211-license		base-firmware-root
@@ -1130,7 +1130,7 @@
 ./usr/include/g++/tr1_impl			base-cxx-usr
 ./usr/include/g++/tr2				base-cxx-usr
 ./usr/include/gcc-4.1				base-obsolete		obsolete
-./usr/include/gcc-4.5				base-c-usr		obsolete
+./usr/include/gcc-4.5				base-obsolete		obsolete
 ./usr/include/gcc-4.8				base-c-usr
 ./usr/include/gcc-5				base-c-usr
 ./usr/include/gssapi				base-c-usr
@@ -1270,167 +1270,167 @@
 ./usr/libdata/debug/usr/mdec			base-sys-usr
 ./usr/libdata/debug/usr/sbin			base-sys-usr
 ./usr/libdata/firmware				base-firmware-usr
-./usr/libdata/firmware/radeon			base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/ARUBA_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/ARUBA_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/ARUBA_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BARTS_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BARTS_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BARTS_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BARTS_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mec.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_sdma.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_uvd.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BONAIRE_vce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/BTC_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAICOS_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAICOS_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAICOS_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAICOS_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAYMAN_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAYMAN_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAYMAN_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAYMAN_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CAYMAN_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CEDAR_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CEDAR_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CEDAR_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CEDAR_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CYPRESS_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CYPRESS_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CYPRESS_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CYPRESS_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/CYPRESS_uvd.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAINAN_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_mec.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_sdma.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/HAWAII_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/JUNIPER_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/JUNIPER_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/JUNIPER_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/JUNIPER_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KABINI_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KABINI_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KABINI_mec.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KABINI_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KABINI_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KABINI_sdma.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KAVERI_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KAVERI_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KAVERI_mec.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KAVERI_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KAVERI_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/KAVERI_sdma.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/MULLINS_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/MULLINS_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/MULLINS_mec.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/MULLINS_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/MULLINS_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/MULLINS_sdma.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/OLAND_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PALM_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PALM_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R100_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R200_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R300_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R420_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R520_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R600_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R600_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R600_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/R700_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/REDWOOD_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/REDWOOD_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/REDWOOD_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/REDWOOD_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RS600_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RS690_cp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RS780_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RS780_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV610_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV610_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV620_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV620_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV630_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV630_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV635_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV635_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV670_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV670_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV710_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV710_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV710_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV710_uvd.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV730_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV730_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV730_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV740_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV770_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV770_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/RV770_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/SUMO2_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/SUMO2_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/SUMO_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/SUMO_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/SUMO_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/SUMO_uvd.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TAHITI_uvd.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TURKS_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TURKS_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TURKS_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/TURKS_smc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_ce.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_mc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_mc2.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_me.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_pfp.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_rlc.bin	base-firmware-usr	obsolete
-./usr/libdata/firmware/radeon/VERDE_smc.bin	base-firmware-usr	obsolete
+./usr/libdata/firmware/radeon			base-obsolete	obsolete
+./usr/libdata/firmware/radeon/ARUBA_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/ARUBA_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/ARUBA_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BARTS_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BARTS_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BARTS_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BARTS_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_mec.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_sdma.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_uvd.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BONAIRE_vce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/BTC_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAICOS_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAICOS_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAICOS_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAICOS_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAYMAN_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAYMAN_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAYMAN_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAYMAN_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CAYMAN_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CEDAR_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CEDAR_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CEDAR_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CEDAR_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CYPRESS_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CYPRESS_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CYPRESS_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CYPRESS_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/CYPRESS_uvd.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAINAN_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_mec.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_sdma.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/HAWAII_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/JUNIPER_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/JUNIPER_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/JUNIPER_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/JUNIPER_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KABINI_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KABINI_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KABINI_mec.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KABINI_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KABINI_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KABINI_sdma.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KAVERI_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KAVERI_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KAVERI_mec.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KAVERI_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KAVERI_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/KAVERI_sdma.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/MULLINS_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/MULLINS_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/MULLINS_mec.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/MULLINS_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/MULLINS_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/MULLINS_sdma.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/OLAND_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PALM_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PALM_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R100_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R200_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R300_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R420_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R520_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R600_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R600_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R600_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/R700_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/REDWOOD_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/REDWOOD_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/REDWOOD_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/REDWOOD_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RS600_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RS690_cp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RS780_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RS780_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV610_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV610_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV620_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV620_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV630_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV630_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV635_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV635_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV670_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV670_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV710_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV710_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV710_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV710_uvd.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV730_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV730_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV730_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV740_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV770_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV770_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/RV770_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/SUMO2_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/SUMO2_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/SUMO_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/SUMO_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/SUMO_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/SUMO_uvd.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TAHITI_uvd.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TURKS_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TURKS_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TURKS_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/TURKS_smc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_ce.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_mc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_mc2.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_me.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_pfp.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_rlc.bin	base-obsolete	obsolete
+./usr/libdata/firmware/radeon/VERDE_smc.bin	base-obsolete	obsolete
 ./usr/libdata/ldscripts				base-c-usr
 ./usr/libdata/lint				base-c-usr
 ./usr/libexec					base-sys-usr
 ./usr/libexec/atf-check				base-atf-bin		atf
 ./usr/libexec/atf-cleanup			base-obsolete		obsolete
-./usr/libexec/atf-exec				base-atf-bin		obsolete
+./usr/libexec/atf-exec				base-obsolete		obsolete
 ./usr/libexec/atf-format			base-obsolete		obsolete
 ./usr/libexec/atf-killpg			base-obsolete		obsolete
 ./usr/libexec/atrun				base-cron-bin
@@ -5124,10 +5124,10 @@
 ./usr/share/sushi/util/scripting/func		base-obsolete	obsolete
 ./usr/share/sysinst				base-util-share
 ./usr/share/sysinst/catalog			base-util-share
-./usr/share/sysinst/catalog/sysinstmsgs.de	base-util-share		obsolete
-./usr/share/sysinst/catalog/sysinstmsgs.es	base-util-share		obsolete
-./usr/share/sysinst/catalog/sysinstmsgs.fr	base-util-share		obsolete
-./usr/share/sysinst/catalog/sysinstmsgs.pl	base-util-share		obsolete
+./usr/share/sysinst/catalog/sysinstmsgs.de	base-obsolete		obsolete
+./usr/share/sysinst/catalog/sysinstmsgs.es	base-obsolete		obsolete
+./usr/share/sysinst/catalog/sysinstmsgs.fr	base-obsolete		obsolete
+./usr/share/sysinst/catalog/sysinstmsgs.pl	base-obsolete		obsolete
 ./usr/share/tabset				base-util-share
 ./usr/share/tabset/3101				base-util-share		share
 ./usr/share/tabset/9837				base-util-share		share
@@ -5949,8 +5949,8 @@
 ./var/games/sail				base-games-root
 ./var/games/save				base-obsolete		obsolete
 ./var/heimdal					base-krb5-root
-./var/lock					base-sys-root		obsolete
-./var/lock/lvm					base-sys-root		obsolete
+./var/lock					base-obsolete		obsolete
+./var/lock/lvm					base-obsolete		obsolete
 ./var/log					base-sys-root
 ./var/log/rdist					base-netutil-root
 ./var/mail					base-mail-root
--- a/distrib/sets/lists/base/rescue.ad.m68k	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/rescue.ad.m68k	Thu Jan 05 13:45:50 2017 +0000
@@ -1,2 +1,2 @@
-# $NetBSD: rescue.ad.m68k,v 1.3 2010/03/10 23:13:09 abs Exp $
-./rescue/edlabel				base-rescue-root	obsolete
+# $NetBSD: rescue.ad.m68k,v 1.4 2017/01/05 13:45:51 wiz Exp $
+./rescue/edlabel				base-obsolete	obsolete
--- a/distrib/sets/lists/base/rescue.sparc	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/rescue.sparc	Thu Jan 05 13:45:50 2017 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: rescue.sparc,v 1.4 2014/04/20 13:41:21 abs Exp $
-./rescue/edlabel				base-rescue-root	obsolete
+# $NetBSD: rescue.sparc,v 1.5 2017/01/05 13:45:51 wiz Exp $
+./rescue/edlabel				base-obsolete	obsolete
 ./rescue/ldconfig				base-rescue-root	pic
--- a/distrib/sets/lists/base/rescue.sparc64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/rescue.sparc64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,2 +1,2 @@
-# $NetBSD: rescue.sparc64,v 1.3 2010/03/10 23:13:09 abs Exp $
-./rescue/edlabel				base-rescue-root	obsolete
+# $NetBSD: rescue.sparc64,v 1.4 2017/01/05 13:45:51 wiz Exp $
+./rescue/edlabel				base-obsolete	obsolete
--- a/distrib/sets/lists/base/rescue.sun2	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/base/rescue.sun2	Thu Jan 05 13:45:50 2017 +0000
@@ -1,2 +1,2 @@
-# $NetBSD: rescue.sun2,v 1.3 2010/03/10 23:13:09 abs Exp $
-./rescue/edlabel				base-rescue-root	obsolete
+# $NetBSD: rescue.sun2,v 1.4 2017/01/05 13:45:51 wiz Exp $
+./rescue/edlabel				base-obsolete	obsolete
--- a/distrib/sets/lists/comp/ad.aarch64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/ad.aarch64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.13 2016/12/12 13:13:11 kamil Exp $
+# $NetBSD: ad.aarch64,v 1.14 2017/01/05 13:45:51 wiz Exp $
 ./usr/include/aarch64				comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -56,7 +56,7 @@
 ./usr/include/arm/arm26/types.h			comp-c-include
 ./usr/include/arm/arm32				comp-c-include
 ./usr/include/arm/arm32/frame.h			comp-c-include
-./usr/include/arm/arm32/katelib.h		comp-c-include		obsolete
+./usr/include/arm/arm32/katelib.h		comp-obsolete		obsolete
 ./usr/include/arm/arm32/param.h			comp-c-include
 ./usr/include/arm/arm32/pmap.h			comp-c-include
 ./usr/include/arm/arm32/psl.h			comp-c-include
--- a/distrib/sets/lists/comp/ad.arm	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/ad.arm	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.76 2016/11/01 14:45:25 skrll Exp $
+# $NetBSD: ad.arm,v 1.77 2017/01/05 13:45:51 wiz Exp $
 ./usr/include/acorn26				comp-c-include
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -115,7 +115,7 @@
 ./usr/include/arm/arm32				comp-c-include
 ./usr/include/arm/arm32/bus.h			comp-obsolete		obsolete
 ./usr/include/arm/arm32/frame.h			comp-c-include
-./usr/include/arm/arm32/katelib.h		comp-c-include		obsolete
+./usr/include/arm/arm32/katelib.h		comp-obsolete		obsolete
 ./usr/include/arm/arm32/param.h			comp-c-include
 ./usr/include/arm/arm32/pmap.h			comp-c-include
 ./usr/include/arm/arm32/psl.h			comp-c-include
@@ -393,13 +393,13 @@
 ./usr/include/evbarm/varargs.h			comp-obsolete		obsolete
 ./usr/include/evbarm/vmparam.h			comp-obsolete		obsolete
 ./usr/include/evbarm/wchar_limits.h		comp-obsolete		obsolete
-./usr/include/gcc-4.5/arm_neon.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/mmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
-./usr/include/gcc-4.8/arm_neon.h		comp-c-include		obsolete
-./usr/include/gcc-4.8/mmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
-./usr/include/gcc-4.8/unwind-arm-common.h	comp-c-include		obsolete
+./usr/include/gcc-4.5/arm_neon.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/mmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
+./usr/include/gcc-4.8/arm_neon.h		comp-obsolete		obsolete
+./usr/include/gcc-4.8/mmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.8/tgmath.h			comp-obsolete		obsolete
+./usr/include/gcc-4.8/unwind-arm-common.h	comp-obsolete		obsolete
 ./usr/include/gcc-5/arm_acle.h			comp-c-include		gcccmds,gcc=53
 ./usr/include/gcc-5/arm_neon.h			comp-c-include		gcccmds,gcc=53
 ./usr/include/gcc-5/mmintrin.h			comp-c-include		gcccmds,gcc=53
--- a/distrib/sets/lists/comp/ad.powerpc	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/ad.powerpc	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.84 2016/03/18 03:08:25 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.85 2017/01/05 13:45:51 wiz Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
@@ -13,15 +13,15 @@
 ./usr/include/g++/bits/powerpc64		comp-c-include		compat
 ./usr/include/g++/bits/powerpc64/c++config.h	comp-c-include		compat,gcc
 ./usr/include/gcc-4.1/altivec.h			comp-obsolete		obsolete
-./usr/include/gcc-4.5/altivec.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/paired.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/ppc-asm.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/ppu_intrinsics.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/si2vmx.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/spe.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/spu2vmx.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/vec_types.h		comp-c-include		obsolete
+./usr/include/gcc-4.5/altivec.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/paired.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/ppc-asm.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/ppu_intrinsics.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/si2vmx.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/spe.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/spu2vmx.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/vec_types.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.8/altivec.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/htmintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/htmxlintrin.h		comp-c-include		gcccmds,gcc=48
--- a/distrib/sets/lists/comp/ad.sh3	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/ad.sh3	Thu Jan 05 13:45:50 2017 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: ad.sh3,v 1.34 2016/12/14 12:59:51 kre Exp $
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
+# $NetBSD: ad.sh3,v 1.35 2017/01/05 13:45:51 wiz Exp $
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=53
 ./usr/include/ieeefp.h				comp-c-include
--- a/distrib/sets/lists/comp/md.alpha	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.alpha	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.70 2016/08/23 10:12:02 christos Exp $
+# $NetBSD: md.alpha,v 1.71 2017/01/05 13:45:51 wiz Exp $
 ./usr/include/alpha				comp-c-include
 ./usr/include/alpha/_G_config.h			comp-obsolete		obsolete
 ./usr/include/alpha/alpha_cpu.h			comp-c-include
@@ -8,7 +8,7 @@
 ./usr/include/alpha/atomic.h			comp-obsolete		obsolete
 ./usr/include/alpha/autoconf.h			comp-c-include
 ./usr/include/alpha/bswap.h			comp-c-include
-./usr/include/alpha/bus.h			comp-c-include		obsolete
+./usr/include/alpha/bus.h			comp-obsolete		obsolete
 ./usr/include/alpha/bus_user.h			comp-c-include
 ./usr/include/alpha/bwx.h			comp-c-include
 ./usr/include/alpha/cdefs.h			comp-c-include
@@ -70,7 +70,7 @@
 ./usr/include/alpha/wchar_limits.h		comp-c-include
 ./usr/include/alpha/wsconsio.h			comp-obsolete		obsolete
 ./usr/include/alpha/z8530var.h			comp-c-include
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=53
 ./usr/include/ieeefp.h				comp-c-include
--- a/distrib/sets/lists/comp/md.amd64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.240 2016/12/15 12:04:18 kamil Exp $
+# $NetBSD: md.amd64,v 1.241 2017/01/05 13:45:51 wiz Exp $
 
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
@@ -223,35 +223,35 @@
 ./usr/include/g++/bits/i386/c++config.h		comp-c-include		gcccmds,gcc,compat
 ./usr/include/g++/bits/x86_64			comp-c-include		compat
 ./usr/include/g++/bits/x86_64/c++config.h	comp-c-include		gcccmds,gcc,compat
-./usr/include/gcc-4.1/emmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.1/mm_malloc.h		comp-c-include		obsolete
-./usr/include/gcc-4.1/mmintrin.h		comp-c-include		obsolete
+./usr/include/gcc-4.1/emmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.1/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/gcc-4.1/mmintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.1/pmmintrin.h		comp-obsolete		obsolete
-./usr/include/gcc-4.1/xmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/abmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/ammintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/avxintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/bmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/cpuid.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/cross-stdarg.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/emmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/fma4intrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/ia32intrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/immintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/lwpintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/mm3dnow.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/mm_malloc.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/mmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/nmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/pmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/popcntintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/smmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/tmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/wmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/x86intrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/xmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/xopintrin.h		comp-c-include		obsolete
+./usr/include/gcc-4.1/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/abmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/ammintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/avxintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/bmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/cpuid.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/cross-stdarg.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/emmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/fma4intrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/ia32intrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/immintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/lwpintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/mm3dnow.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/mmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/nmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/popcntintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/smmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/tmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/wmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/x86intrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/xopintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.8/adxintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/ammintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/avx2intrin.h		comp-c-include		gcccmds,gcc=48
@@ -391,7 +391,7 @@
 ./usr/include/i386/mtrr.h			comp-c-include
 ./usr/include/i386/multiboot.h			comp-c-include
 ./usr/include/i386/mutex.h			comp-c-include
-./usr/include/i386/npx.h			comp-c-include		obsolete
+./usr/include/i386/npx.h			comp-obsolete		obsolete
 ./usr/include/i386/param.h			comp-c-include
 ./usr/include/i386/pcb.h			comp-c-include
 ./usr/include/i386/pio.h			comp-c-include
--- a/distrib/sets/lists/comp/md.hppa	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.hppa	Thu Jan 05 13:45:50 2017 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: md.hppa,v 1.6 2016/03/18 03:08:25 mrg Exp $
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
+# $NetBSD: md.hppa,v 1.7 2017/01/05 13:45:51 wiz Exp $
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=53
 ./usr/include/hp700				comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.i386	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.i386	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.160 2016/12/15 12:04:18 kamil Exp $
+# $NetBSD: md.i386,v 1.161 2017/01/05 13:45:51 wiz 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
@@ -147,35 +147,35 @@
 ./usr/include/clang-3.8/xsavesintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.8/xtestintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
-./usr/include/gcc-4.1/emmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.1/mm_malloc.h		comp-c-include		obsolete
-./usr/include/gcc-4.1/mmintrin.h		comp-c-include		obsolete
+./usr/include/gcc-4.1/emmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.1/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/gcc-4.1/mmintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.1/pmmintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.1/xmmintrin.h		comp-obsolete		obsolete
-./usr/include/gcc-4.5/abmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/ammintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/avxintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/bmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/cpuid.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/cross-stdarg.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/emmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/fma4intrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/ia32intrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/immintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/lwpintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/mm3dnow.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/mm_malloc.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/mmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/nmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/pmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/popcntintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/smmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
-./usr/include/gcc-4.5/tmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/wmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/x86intrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/xmmintrin.h		comp-c-include		obsolete
-./usr/include/gcc-4.5/xopintrin.h		comp-c-include		obsolete
+./usr/include/gcc-4.5/abmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/ammintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/avxintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/bmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/cpuid.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/cross-stdarg.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/emmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/fma4intrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/ia32intrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/immintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/lwpintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/mm3dnow.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/mm_malloc.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/mmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/nmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/popcntintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/smmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
+./usr/include/gcc-4.5/tmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/wmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/x86intrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/xmmintrin.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/xopintrin.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.8/adxintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/ammintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/avx2intrin.h		comp-c-include		gcccmds,gcc=48
@@ -289,7 +289,7 @@
 ./usr/include/i386/conf.h			comp-obsolete		obsolete
 ./usr/include/i386/cpu.h			comp-c-include
 ./usr/include/i386/cpu_rng.h			comp-c-include
-./usr/include/i386/cpufunc.h			comp-c-obsolete		obsolete
+./usr/include/i386/cpufunc.h			comp-obsolete		obsolete
 ./usr/include/i386/cputypes.h			comp-c-include
 ./usr/include/i386/db_machdep.h			comp-obsolete		obsolete
 ./usr/include/i386/disklabel.h			comp-c-include
@@ -322,7 +322,7 @@
 ./usr/include/i386/mtrr.h			comp-c-include
 ./usr/include/i386/multiboot.h			comp-c-include
 ./usr/include/i386/mutex.h			comp-c-include
-./usr/include/i386/npx.h			comp-c-include		obsolete
+./usr/include/i386/npx.h			comp-obsolete		obsolete
 ./usr/include/i386/param.h			comp-c-include
 ./usr/include/i386/pcb.h			comp-c-include
 ./usr/include/i386/pccons.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.ia64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.ia64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.ia64,v 1.1 2016/08/05 16:21:09 scole Exp $
-./usr/include/gcc-4.8/ia64intrin.h	comp-c-include			obsolete
-./usr/include/gcc-4.8/tgmath.h		comp-c-include			obsolete
+# $NetBSD: md.ia64,v 1.2 2017/01/05 13:45:51 wiz Exp $
+./usr/include/gcc-4.8/ia64intrin.h	comp-obsolete			obsolete
+./usr/include/gcc-4.8/tgmath.h		comp-obsolete			obsolete
 ./usr/include/gcc-5/ia64intrin.h	comp-c-include
 ./usr/include/gcc-5/tgmath.h		comp-c-include
 ./usr/include/ia64			comp-c-include
--- a/distrib/sets/lists/comp/md.sparc	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.sparc	Thu Jan 05 13:45:50 2017 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: md.sparc,v 1.89 2016/03/16 18:10:00 mrg Exp $
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
+# $NetBSD: md.sparc,v 1.90 2017/01/05 13:45:51 wiz Exp $
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/visintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=53
--- a/distrib/sets/lists/comp/md.sparc64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.sparc64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: md.sparc64,v 1.196 2016/03/16 18:10:00 mrg Exp $
+# $NetBSD: md.sparc64,v 1.197 2017/01/05 13:45:51 wiz Exp $
 ./usr/include/g++/bits/sparc			comp-c-include		compat
 ./usr/include/g++/bits/sparc/c++config.h	comp-c-include		gcc,compat
 ./usr/include/g++/bits/sparc64			comp-c-include		compat
 ./usr/include/g++/bits/sparc64/c++config.h	comp-c-include		gcc,compat
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/visintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=53
--- a/distrib/sets/lists/comp/md.vax	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/md.vax	Thu Jan 05 13:45:50 2017 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: md.vax,v 1.43 2016/03/18 03:08:25 mrg Exp $
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
+# $NetBSD: md.vax,v 1.44 2017/01/05 13:45:51 wiz Exp $
+./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=53
 ./usr/include/ieeefp.h				comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2094 2017/01/03 18:43:13 christos Exp $
+#	$NetBSD: mi,v 1.2095 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -27,14 +27,14 @@
 ./usr/bin/cvsbug				comp-cvs-bin		cvs
 ./usr/bin/cvslatest				comp-cvs-bin
 ./usr/bin/elfedit				comp-util-bin		binutils
-./usr/bin/f77					comp-fortran-bin	obsolete
+./usr/bin/f77					comp-obsolete	obsolete
 ./usr/bin/fgen					comp-util-bin
 ./usr/bin/flex					comp-c-bin
 ./usr/bin/flex++				comp-cxx-bin
-./usr/bin/fort77				comp-fortran-bin	obsolete
+./usr/bin/fort77				comp-obsolete	obsolete
 ./usr/bin/fpr					comp-fortran-bin
 ./usr/bin/g++					comp-cxx-bin		gcccmds
-./usr/bin/g77					comp-fortran-bin	obsolete
+./usr/bin/g77					comp-obsolete	obsolete
 ./usr/bin/gcc					comp-c-bin		gcccmds
 ./usr/bin/gcore					comp-debug-bin
 ./usr/bin/gcov					comp-debug-bin		gcccmds
@@ -936,14 +936,14 @@
 ./usr/include/g++/bits/alloc_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/allocated_ptr.h		comp-cxx-include	gcc=53,cxx,libstdcxx
 ./usr/include/g++/bits/allocator.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/atomic_0.h		comp-cxx-include	obsolete
-./usr/include/g++/bits/atomic_2.h		comp-cxx-include	obsolete
+./usr/include/g++/bits/atomic_0.h		comp-obsolete	obsolete
+./usr/include/g++/bits/atomic_2.h		comp-obsolete	obsolete
 ./usr/include/g++/bits/atomic_base.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/atomic_futex.h		comp-cxx-include	gcc=53,cxx,libstdcxx
 ./usr/include/g++/bits/atomic_lockfree_defines.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/atomic_word.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/atomicfwd_c.h		comp-cxx-include	obsolete
-./usr/include/g++/bits/atomicfwd_cxx.h		comp-cxx-include	obsolete
+./usr/include/g++/bits/atomicfwd_c.h		comp-obsolete	obsolete
+./usr/include/g++/bits/atomicfwd_cxx.h		comp-obsolete	obsolete
 ./usr/include/g++/bits/atomicity.h		comp-obsolete		obsolete
 ./usr/include/g++/bits/basic_file.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/basic_ios.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -958,7 +958,7 @@
 ./usr/include/g++/bits/c++io.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/c++locale.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/char_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/cmath.tcc		comp-cxx-include	obsolete
+./usr/include/g++/bits/cmath.tcc		comp-obsolete	obsolete
 ./usr/include/g++/bits/codecvt.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/codecvt_specializations.h	comp-obsolete		obsolete
 ./usr/include/g++/bits/concept_check.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -967,7 +967,7 @@
 ./usr/include/g++/bits/cpu_defines.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/ctype_base.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/ctype_inline.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/ctype_noninline.h	comp-cxx-include	obsolete
+./usr/include/g++/bits/ctype_noninline.h	comp-obsolete		obsolete
 ./usr/include/g++/bits/cxxabi_forced.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/cxxabi_tweaks.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/deque.tcc		comp-cxx-include	gcc,cxx,libstdcxx
@@ -987,7 +987,7 @@
 ./usr/include/g++/bits/gthr-default.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/gthr-posix.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/gthr-single.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/gthr-tpf.h		comp-cxx-include	obsolete
+./usr/include/g++/bits/gthr-tpf.h		comp-obsolete		obsolete
 ./usr/include/g++/bits/gthr.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/hash_bytes.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/hashtable.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1128,7 +1128,7 @@
 ./usr/include/g++/ctime				comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/cwchar			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/cwctype			comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/cxxabi-forced.h		comp-cxx-include	obsolete
+./usr/include/g++/cxxabi-forced.h		comp-obsolete 		obsolete
 ./usr/include/g++/cxxabi.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/array			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/bitset			comp-cxx-include	gcc,cxx,libstdcxx
@@ -1173,8 +1173,8 @@
 ./usr/include/g++/deque.h			comp-obsolete		obsolete
 ./usr/include/g++/editbuf.h			comp-obsolete		obsolete
 ./usr/include/g++/exception			comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/exception_defines.h		comp-cxx-include	obsolete
-./usr/include/g++/exception_ptr.h		comp-cxx-include	obsolete
+./usr/include/g++/exception_defines.h		comp-obsolete		obsolete
+./usr/include/g++/exception_ptr.h		comp-obsolete		obsolete
 ./usr/include/g++/ext/algorithm			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/aligned_buffer.h		comp-cxx-include	gcc=53,cxx,libstdcxx
 ./usr/include/g++/ext/alloc_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1200,7 +1200,7 @@
 ./usr/include/g++/ext/new_allocator.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/numeric			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/numeric_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/ext/opt_random.h							comp-cxx-include	gcc,obsolete
+./usr/include/g++/ext/opt_random.h							comp-obsolete		obsolete
 ./usr/include/g++/ext/pb_ds/assoc_container.hpp						comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp comp-cxx-include	gcc,cxx,libstdcxx
@@ -1470,7 +1470,7 @@
 ./usr/include/g++/ext/vstring_util.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/faralloc.h			comp-obsolete		obsolete
 ./usr/include/g++/fdeque.h			comp-obsolete		obsolete
-./usr/include/g++/fenv.h			comp-cxx-include	obsolete
+./usr/include/g++/fenv.h			comp-obsolete		obsolete
 ./usr/include/g++/flist.h			comp-obsolete		obsolete
 ./usr/include/g++/floatio.h			comp-obsolete		obsolete
 ./usr/include/g++/fmap.h			comp-obsolete		obsolete
@@ -1658,7 +1658,7 @@
 ./usr/include/g++/multiset.h			comp-obsolete		obsolete
 ./usr/include/g++/mutex				comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/neralloc.h			comp-obsolete		obsolete
-./usr/include/g++/nested_exception.h		comp-cxx-include	obsolete
+./usr/include/g++/nested_exception.h		comp-obsolete		obsolete
 ./usr/include/g++/new				comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/new.h				comp-obsolete		obsolete
 ./usr/include/g++/nmap.h			comp-obsolete		obsolete
@@ -1818,7 +1818,7 @@
 ./usr/include/g++/std/valarray_array.h		comp-obsolete		obsolete
 ./usr/include/g++/std/valarray_array.tcc	comp-obsolete		obsolete
 ./usr/include/g++/std/valarray_meta.h		comp-obsolete		obsolete
-./usr/include/g++/stdatomic.h			comp-cxx-include	obsolete
+./usr/include/g++/stdatomic.h			comp-obsolete		obsolete
 ./usr/include/g++/stddef			comp-obsolete		obsolete
 ./usr/include/g++/stdexcept			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/stdiostream.h			comp-obsolete		obsolete
@@ -1867,7 +1867,7 @@
 ./usr/include/g++/system_error			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tempbuf.cc			comp-obsolete		obsolete
 ./usr/include/g++/tempbuf.h			comp-obsolete		obsolete
-./usr/include/g++/tgmath.h			comp-cxx-include	obsolete
+./usr/include/g++/tgmath.h			comp-obsolete		obsolete
 ./usr/include/g++/thread			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr1/array			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr1/bessel_function.tcc	comp-cxx-include	gcc,cxx,libstdcxx
@@ -1942,21 +1942,21 @@
 ./usr/include/g++/tr1/utility			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr1/wchar.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr1/wctype.h			comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/tr1_impl/array		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/boost_sp_counted_base.h	comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cctype		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cfenv		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cinttypes		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cmath		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/complex		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cstdint		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cstdio		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cstdlib		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cwchar		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/cwctype		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/regex		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/type_traits		comp-cxx-include	obsolete
-./usr/include/g++/tr1_impl/utility		comp-cxx-include	obsolete
+./usr/include/g++/tr1_impl/array		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/boost_sp_counted_base.h	comp-obsolete	obsolete
+./usr/include/g++/tr1_impl/cctype		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cfenv		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cinttypes		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cmath		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/complex		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cstdint		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cstdio		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cstdlib		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cwchar		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/cwctype		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/regex		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/type_traits		comp-obsolete		obsolete
+./usr/include/g++/tr1_impl/utility		comp-obsolete		obsolete
 ./usr/include/g++/tr2/bool_set			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr2/bool_set.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr2/dynamic_bitset		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1978,8 +1978,8 @@
 ./usr/include/g++/values.h			comp-obsolete		obsolete
 ./usr/include/g++/vector			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/vector.h			comp-obsolete		obsolete
-./usr/include/gcc-4.5/mf-runtime.h		comp-gcc-include	obsolete
-./usr/include/gcc-4.5/omp.h			comp-gcc-include	obsolete
+./usr/include/gcc-4.5/mf-runtime.h		comp-obsolete		obsolete
+./usr/include/gcc-4.5/omp.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/mf-runtime.h		comp-gcc-include	gcc=48
 ./usr/include/gcc-4.8/omp.h			comp-gcc-include	gcc=48
 ./usr/include/gcc-5/omp.h			comp-gcc-include	gcc=53
@@ -1987,7 +1987,7 @@
 ./usr/include/gelf.h				comp-c-include
 ./usr/include/getopt.h				comp-c-include
 ./usr/include/glob.h				comp-c-include
-./usr/include/gmp.h				comp-cxx-include	obsolete
+./usr/include/gmp.h				comp-obsolete		obsolete
 ./usr/include/grp.h				comp-c-include
 ./usr/include/gssapi.h				comp-krb5-include	kerberos
 ./usr/include/gssapi/gssapi.h			comp-krb5-include	kerberos
@@ -2177,10 +2177,10 @@
 ./usr/include/mj.h				comp-c-include		crypto
 ./usr/include/mntopts.h				comp-c-include
 ./usr/include/monetary.h			comp-c-include
-./usr/include/mpc-log.h				comp-c-include		obsolete
-./usr/include/mpc.h				comp-c-include		obsolete
-./usr/include/mpf2mpfr.h			comp-c-include		obsolete
-./usr/include/mpfr.h				comp-c-include		obsolete
+./usr/include/mpc-log.h				comp-obsolete		obsolete
+./usr/include/mpc.h				comp-obsolete		obsolete
+./usr/include/mpf2mpfr.h			comp-obsolete		obsolete
+./usr/include/mpfr.h				comp-obsolete		obsolete
 ./usr/include/mpool.h				comp-c-include
 ./usr/include/mqueue.h				comp-c-include
 ./usr/include/msdosfs/bootsect.h		comp-c-include
@@ -2192,7 +2192,7 @@
 ./usr/include/ndbm.h				comp-c-include
 ./usr/include/net/agr/if_agrioctl.h		comp-c-include
 ./usr/include/net/bpf.h				comp-c-include
-./usr/include/net/bpf_jit.h			comp-c-include		obsolete
+./usr/include/net/bpf_jit.h			comp-obsolete		obsolete
 ./usr/include/net/bpfdesc.h			comp-c-include
 ./usr/include/net/bpfjit.h			comp-c-include
 ./usr/include/net/dlt.h				comp-c-include
@@ -2460,20 +2460,20 @@
 ./usr/include/objc/NXConstStr.h			comp-c-include		gcc
 ./usr/include/objc/Object.h			comp-c-include		gcc
 ./usr/include/objc/Protocol.h			comp-c-include		gcc
-./usr/include/objc/encoding.h			comp-c-include		obsolete
-./usr/include/objc/hash.h			comp-c-include		obsolete
+./usr/include/objc/encoding.h			comp-obsolete		obsolete
+./usr/include/objc/hash.h			comp-obsolete		obsolete
 ./usr/include/objc/list.h			comp-obsolete		obsolete
 ./usr/include/objc/message.h			comp-objc-include	libstdcxx,gcc
-./usr/include/objc/objc-api.h			comp-c-include		obsolete
+./usr/include/objc/objc-api.h			comp-obsolete		obsolete
 ./usr/include/objc/objc-decls.h			comp-cxx-include	gcc,cxx
 ./usr/include/objc/objc-exception.h		comp-objc-include	libstdcxx,gcc
-./usr/include/objc/objc-list.h			comp-c-include		obsolete
+./usr/include/objc/objc-list.h			comp-obsolete		obsolete
 ./usr/include/objc/objc-sync.h			comp-objc-include	libstdcxx,gcc
 ./usr/include/objc/objc.h			comp-c-include		gcc
 ./usr/include/objc/runtime.h			comp-objc-include	libstdcxx,gcc
-./usr/include/objc/sarray.h			comp-c-include		obsolete
+./usr/include/objc/sarray.h			comp-obsolete		obsolete
 ./usr/include/objc/thr.h			comp-c-include		gcc
-./usr/include/objc/typedstream.h		comp-c-include		obsolete
+./usr/include/objc/typedstream.h		comp-obsolete		obsolete
 ./usr/include/openpgpsdk/accumulate.h		comp-obsolete		obsolete
 ./usr/include/openpgpsdk/armour.h		comp-obsolete		obsolete
 ./usr/include/openpgpsdk/callback.h		comp-obsolete		obsolete
@@ -3248,12 +3248,11 @@
 ./usr/lib/libg2c.a				comp-obsolete		obsolete
 ./usr/lib/libg2c_p.a				comp-obsolete		obsolete
 ./usr/lib/libgcc.a				comp-c-lib		compatfile,gcc
-./usr/lib/libgcc_p.a				comp-c-proflib		obsolete
+./usr/lib/libgcc_p.a				comp-obsolete		obsolete
 ./usr/lib/libgcc_s.a				comp-obsolete		obsolete
 ./usr/lib/libgcov.a				comp-c-lib		compatfile,gcc
-./usr/lib/libgmp.a				-unknown-		obsolete
-./usr/lib/libgmp.a				comp-c-lib		obsolete
-./usr/lib/libgmp_p.a				comp-c-proflib		obsolete
+./usr/lib/libgmp.a				comp-obsolete		obsolete
+./usr/lib/libgmp_p.a				comp-obsolete		obsolete
 ./usr/lib/libgnumalloc.a			comp-c-lib		compatfile
 ./usr/lib/libgnumalloc_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libgomp.a				comp-c-lib		compatfile,gcc
@@ -3332,12 +3331,12 @@
 ./usr/lib/libmilter.a				comp-obsolete		obsolete
 ./usr/lib/libmj.a				comp-c-lib		compatfile,crypto
 ./usr/lib/libmj_p.a				comp-c-proflib		compatfile,crypto,profile
-./usr/lib/libmpc.a				-unknown-		obsolete
-./usr/lib/libmpc.a				comp-c-lib		obsolete
-./usr/lib/libmpc_p.a				comp-c-proflib		obsolete
-./usr/lib/libmpfr.a				-unknown-		obsolete
-./usr/lib/libmpfr.a				comp-c-lib		obsolete
-./usr/lib/libmpfr_p.a				comp-c-proflib		obsolete
+./usr/lib/libmpc.a				-obsolete		obsolete
+./usr/lib/libmpc.a				comp-obsolete		obsolete
+./usr/lib/libmpc_p.a				comp-obsolete		obsolete
+./usr/lib/libmpfr.a				-obsolete		obsolete
+./usr/lib/libmpfr.a				comp-obsolete		obsolete
+./usr/lib/libmpfr_p.a				comp-obsolete		obsolete
 ./usr/lib/libmudflap.a				comp-c-lib		compatfile,gcc=48
 ./usr/lib/libmudflap_p.a			comp-c-proflib		compatfile,gcc=48,profile
 ./usr/lib/libmudflapth.a			comp-c-lib		compatfile,gcc=48
@@ -3697,7 +3696,7 @@
 ./usr/libdata/lint/llib-lexpat.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lfetch.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lform.ln		comp-c-lintlib		lint
-./usr/libdata/lint/llib-lgmp.ln			comp-c-lintlib		obsolete
+./usr/libdata/lint/llib-lgmp.ln			comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lgnumalloc.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lgssapi.ln		comp-krb5-lintlib	lint,kerberos
 ./usr/libdata/lint/llib-lheimbase.ln		comp-krb5-lintlib	lint,kerberos
@@ -3725,8 +3724,8 @@
 ./usr/libdata/lint/llib-lmenu.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lmilter.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lmj.ln			comp-c-lintlib		lint,crypto
-./usr/libdata/lint/llib-lmpc.ln			comp-c-lintlib		obsolete
-./usr/libdata/lint/llib-lmpfr.ln		comp-c-lintlib		obsolete
+./usr/libdata/lint/llib-lmpc.ln			comp-obsolete		obsolete
+./usr/libdata/lint/llib-lmpfr.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lnetpgp.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lnetpgpverify.ln	comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lnpf.ln			comp-npf-lintlib	lint,npf
@@ -5474,16 +5473,16 @@
 ./usr/share/man/cat3/btree.0			comp-c-catman		.cat
 ./usr/share/man/cat3/buffer.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/bufferevent.0		comp-c-catman		.cat
-./usr/share/man/cat3/bufferevent_base_set.0	comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_disable.0	comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_enable.0	comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_free.0		comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_new.0		comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_read.0		comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_settimeout.0	comp-c-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_base_set.0	comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_disable.0	comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_enable.0	comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_free.0		comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_new.0		comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_read.0		comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_settimeout.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/bufferevent_ssl.0		comp-c-catman		.cat
-./usr/share/man/cat3/bufferevent_write.0	comp-c-obsolete		obsolete
-./usr/share/man/cat3/bufferevent_write_buffer.0 comp-c-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_write.0	comp-obsolete		obsolete
+./usr/share/man/cat3/bufferevent_write_buffer.0 comp-obsolete		obsolete
 ./usr/share/man/cat3/byteorder.0		comp-c-catman		.cat
 ./usr/share/man/cat3/bzero.0			comp-c-catman		.cat
 ./usr/share/man/cat3/cabs.0			comp-c-catman		complex,.cat
@@ -11196,7 +11195,7 @@
 ./usr/share/man/cat9/vcache_new.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/vcache_rekey_enter.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/vcache_rekey_exit.0	comp-sys-catman		.cat
-./usr/share/man/cat9/vcache_remove.0		comp-sys-catman		obsolete
+./usr/share/man/cat9/vcache_remove.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/vcons.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vcount.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/vdead_check.0		comp-sys-catman		.cat
@@ -11236,7 +11235,7 @@
 ./usr/share/man/cat9/vfs_write_suspend.0	comp-obsolete		obsolete
 ./usr/share/man/cat9/vfsops.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vfssubr.0			comp-sys-catman		.cat
-./usr/share/man/cat9/vget.0			comp-sys-catman		obsolete
+./usr/share/man/cat9/vget.0			comp-obsolete		obsolete
 ./usr/share/man/cat9/vgone.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vgonel.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vhold.0			comp-sys-catman		.cat
@@ -11281,8 +11280,8 @@
 ./usr/share/man/cat9/vn_poll.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vn_rdwr.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vn_read.0			comp-sys-catman		.cat
-./usr/share/man/cat9/vn_restorerecurse.0	comp-sys-catman		obsolete
-./usr/share/man/cat9/vn_setrecurse.0		comp-sys-catman		obsolete
+./usr/share/man/cat9/vn_restorerecurse.0	comp-obsolete		obsolete
+./usr/share/man/cat9/vn_setrecurse.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/vn_start_write.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/vn_stat.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/vn_statfile.0		comp-sys-catman		.cat
@@ -11393,13 +11392,13 @@
 ./usr/share/man/html1/elf2aout.html		comp-sysutil-htmlman	html
 ./usr/share/man/html1/elf2ecoff.html		comp-sysutil-htmlman	html
 ./usr/share/man/html1/elfedit.html		comp-util-htmlman	binutils,html
-./usr/share/man/html1/f77.html			comp-fortran-htmlman	obsolete
+./usr/share/man/html1/f77.html			comp-obsolete	obsolete
 ./usr/share/man/html1/fgen.html			comp-util-htmlman	html
 ./usr/share/man/html1/flex.html			comp-c-htmlman		html
-./usr/share/man/html1/fort77.html		comp-fortran-htmlman	obsolete
+./usr/share/man/html1/fort77.html		comp-obsolete	obsolete
 ./usr/share/man/html1/fpr.html			comp-fortran-htmlman	html
 ./usr/share/man/html1/g++.html			comp-cxx-htmlman	gcccmds,html
-./usr/share/man/html1/g77.html			comp-fortran-htmlman	obsolete
+./usr/share/man/html1/g77.html			comp-obsolete	obsolete
 ./usr/share/man/html1/gcc.html			comp-c-htmlman		gcccmds,html
 ./usr/share/man/html1/gcore.html		comp-debug-htmlman	html
 ./usr/share/man/html1/gcov.html			comp-debug-htmlman	gcccmds,html
@@ -12872,16 +12871,16 @@
 ./usr/share/man/html3/btowc.html		comp-c-htmlman		html
 ./usr/share/man/html3/btree.html		comp-c-htmlman		html
 ./usr/share/man/html3/bufferevent.html		comp-c-htmlman		html
-./usr/share/man/html3/bufferevent_base_set.html comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_disable.html	comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_enable.html	comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_free.html	comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_new.html	comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_read.html	comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_settimeout.html	comp-c-obsolete		obsolete
+./usr/share/man/html3/bufferevent_base_set.html comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_disable.html	comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_enable.html	comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_free.html	comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_new.html	comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_read.html	comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_settimeout.html	comp-obsolete		obsolete
 ./usr/share/man/html3/bufferevent_ssl.html	comp-c-htmlman		html
-./usr/share/man/html3/bufferevent_write.html	comp-c-obsolete		obsolete
-./usr/share/man/html3/bufferevent_write_buffer.html	comp-c-obsolete		obsolete
+./usr/share/man/html3/bufferevent_write.html	comp-obsolete		obsolete
+./usr/share/man/html3/bufferevent_write_buffer.html	comp-obsolete		obsolete
 ./usr/share/man/html3/byteorder.html		comp-c-htmlman		html
 ./usr/share/man/html3/bzero.html		comp-c-htmlman		html
 ./usr/share/man/html3/cabs.html			comp-c-htmlman		complex,html
@@ -18385,7 +18384,7 @@
 ./usr/share/man/html9/vcache_new.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vcache_rekey_enter.html	comp-sys-htmlman	html
 ./usr/share/man/html9/vcache_rekey_exit.html	comp-sys-htmlman	html
-./usr/share/man/html9/vcache_remove.html	comp-sys-htmlman	obsolete
+./usr/share/man/html9/vcache_remove.html	comp-obsolete	obsolete
 ./usr/share/man/html9/vcons.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vcount.html		comp-obsolete	obsolete
 ./usr/share/man/html9/vdead_check.html		comp-sys-htmlman	html
@@ -18422,7 +18421,7 @@
 ./usr/share/man/html9/vfs_vnode_iterator_next.html	comp-sys-htmlman	html
 ./usr/share/man/html9/vfsops.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vfssubr.html		comp-sys-htmlman	html
-./usr/share/man/html9/vget.html			comp-sys-htmlman	obsolete
+./usr/share/man/html9/vget.html			comp-obsolete	obsolete
 ./usr/share/man/html9/vgone.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vgonel.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vhold.html		comp-sys-htmlman	html
@@ -18464,8 +18463,8 @@
 ./usr/share/man/html9/vn_poll.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vn_rdwr.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vn_read.html		comp-sys-htmlman	html
-./usr/share/man/html9/vn_restorerecurse.html	comp-sys-htmlman	obsolete
-./usr/share/man/html9/vn_setrecurse.html	comp-sys-htmlman	obsolete
+./usr/share/man/html9/vn_restorerecurse.html	comp-obsolete	obsolete
+./usr/share/man/html9/vn_setrecurse.html	comp-obsolete	obsolete
 ./usr/share/man/html9/vn_stat.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vn_statfile.html		comp-sys-htmlman	html
 ./usr/share/man/html9/vn_write.html		comp-sys-htmlman	html
@@ -20091,16 +20090,16 @@
 ./usr/share/man/man3/btree.3			comp-c-man		.man
 ./usr/share/man/man3/buffer.3			comp-obsolete		obsolete
 ./usr/share/man/man3/bufferevent.3		comp-c-man		.man
-./usr/share/man/man3/bufferevent_base_set.3	comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_disable.3	comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_enable.3	comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_free.3		comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_new.3		comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_read.3		comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_settimeout.3	comp-c-obsolete		obsolete
+./usr/share/man/man3/bufferevent_base_set.3	comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_disable.3	comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_enable.3	comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_free.3		comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_new.3		comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_read.3		comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_settimeout.3	comp-obsolete		obsolete
 ./usr/share/man/man3/bufferevent_ssl.3		comp-c-man		.man
-./usr/share/man/man3/bufferevent_write.3	comp-c-obsolete		obsolete
-./usr/share/man/man3/bufferevent_write_buffer.3 comp-c-obsolete		obsolete
+./usr/share/man/man3/bufferevent_write.3	comp-obsolete		obsolete
+./usr/share/man/man3/bufferevent_write_buffer.3 comp-obsolete		obsolete
 ./usr/share/man/man3/byteorder.3		comp-c-man		.man
 ./usr/share/man/man3/bzero.3			comp-c-man		.man
 ./usr/share/man/man3/cabs.3			comp-c-man		complex,.man
@@ -25808,7 +25807,7 @@
 ./usr/share/man/man9/vcache_new.9		comp-sys-man		.man
 ./usr/share/man/man9/vcache_rekey_enter.9	comp-sys-man		.man
 ./usr/share/man/man9/vcache_rekey_exit.9	comp-sys-man		.man
-./usr/share/man/man9/vcache_remove.9		comp-sys-man		obsolete
+./usr/share/man/man9/vcache_remove.9		comp-obsolete		obsolete
 ./usr/share/man/man9/vcons.9			comp-sys-man		.man
 ./usr/share/man/man9/vcount.9			comp-obsolete		obsolete
 ./usr/share/man/man9/vdead_check.9		comp-sys-man		.man
@@ -25848,7 +25847,7 @@
 ./usr/share/man/man9/vfs_write_suspend.9	comp-obsolete		obsolete
 ./usr/share/man/man9/vfsops.9			comp-sys-man		.man
 ./usr/share/man/man9/vfssubr.9			comp-sys-man		.man
-./usr/share/man/man9/vget.9			comp-sys-man		obsolete
+./usr/share/man/man9/vget.9			comp-obsolete		obsolete
 ./usr/share/man/man9/vgone.9			comp-sys-man		.man
 ./usr/share/man/man9/vgonel.9			comp-sys-man		.man
 ./usr/share/man/man9/vhold.9			comp-sys-man		.man
@@ -25893,8 +25892,8 @@
 ./usr/share/man/man9/vn_poll.9			comp-sys-man		.man
 ./usr/share/man/man9/vn_rdwr.9			comp-sys-man		.man
 ./usr/share/man/man9/vn_read.9			comp-sys-man		.man
-./usr/share/man/man9/vn_restorerecurse.9	comp-sys-man		obsolete
-./usr/share/man/man9/vn_setrecurse.9		comp-sys-man		obsolete
+./usr/share/man/man9/vn_restorerecurse.9	comp-obsolete		obsolete
+./usr/share/man/man9/vn_setrecurse.9		comp-obsolete		obsolete
 ./usr/share/man/man9/vn_start_write.9		comp-obsolete		obsolete
 ./usr/share/man/man9/vn_stat.9			comp-sys-man		.man
 ./usr/share/man/man9/vn_statfile.9		comp-sys-man		.man
--- a/distrib/sets/lists/comp/shl.mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/comp/shl.mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.298 2016/11/26 03:17:58 ozaki-r Exp $
+# $NetBSD: shl.mi,v 1.299 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -48,13 +48,13 @@
 ./usr/lib/libg++_pic.a				comp-obsolete		obsolete
 ./usr/lib/libg2c_pic.a				comp-obsolete		obsolete
 ./usr/lib/libgcc_eh.a				comp-c-lib		compatfile,gcccmds
-./usr/lib/libgcc_eh_p.a				comp-c-proflib		obsolete
-./usr/lib/libgcc_eh_pic.a			comp-c-piclib		obsolete
-./usr/lib/libgcc_pic.a				comp-c-lib		obsolete
-./usr/lib/libgmp.so				comp-c-shlib		obsolete
-./usr/lib/libgmp.so.10				comp-c-shlib		obsolete
-./usr/lib/libgmp.so.10.2			comp-c-shlib		obsolete
-./usr/lib/libgmp_pic.a				comp-c-piclib		obsolete
+./usr/lib/libgcc_eh_p.a				comp-obsolete		obsolete
+./usr/lib/libgcc_eh_pic.a			comp-obsolete		obsolete
+./usr/lib/libgcc_pic.a				comp-obsolete		obsolete
+./usr/lib/libgmp.so				comp-obsolete		obsolete
+./usr/lib/libgmp.so.10				comp-obsolete		obsolete
+./usr/lib/libgmp.so.10.2			comp-obsolete		obsolete
+./usr/lib/libgmp_pic.a				comp-obsolete		obsolete
 ./usr/lib/libgnumalloc_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libgomp_pic.a				comp-c-piclib		compatfile,picinstall,gcc
 ./usr/lib/libgssapi_pic.a			comp-c-piclib		compatfile,picinstall,kerberos
@@ -92,14 +92,14 @@
 ./usr/lib/libmagic_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libmenu_pic.a				comp-c-piclib		compatfile,picinstall
 ./usr/lib/libmj_pic.a				comp-c-piclib		compatfile,picinstall,crypto
-./usr/lib/libmpc.so				comp-c-shlib		obsolete
-./usr/lib/libmpc.so.2				comp-c-shlib		obsolete
-./usr/lib/libmpc.so.2.0				comp-c-shlib		obsolete
-./usr/lib/libmpc_pic.a				comp-c-piclib		obsolete
-./usr/lib/libmpfr.so				comp-c-shlib		obsolete
-./usr/lib/libmpfr.so.4				comp-c-shlib		obsolete
-./usr/lib/libmpfr.so.4.1			comp-c-shlib		obsolete
-./usr/lib/libmpfr_pic.a				comp-c-piclib		obsolete
+./usr/lib/libmpc.so				comp-obsolete		obsolete
+./usr/lib/libmpc.so.2				comp-obsolete		obsolete
+./usr/lib/libmpc.so.2.0				comp-obsolete		obsolete
+./usr/lib/libmpc_pic.a				comp-obsolete		obsolete
+./usr/lib/libmpfr.so				comp-obsolete		obsolete
+./usr/lib/libmpfr.so.4				comp-obsolete		obsolete
+./usr/lib/libmpfr.so.4.1			comp-obsolete		obsolete
+./usr/lib/libmpfr_pic.a				comp-obsolete		obsolete
 ./usr/lib/libmudflap.so				comp-c-shlib		compatfile,gcc=48
 ./usr/lib/libmudflap.so.0			comp-c-shlib		compatfile,gcc=48
 ./usr/lib/libmudflap.so.0.0			comp-c-shlib		compatfile,gcc=48
--- a/distrib/sets/lists/debug/ad.arm	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/ad.arm	Thu Jan 05 13:45:50 2017 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: ad.arm,v 1.73 2015/10/02 22:17:22 riz Exp $
+# $NetBSD: ad.arm,v 1.74 2017/01/05 13:45:51 wiz Exp $
 ./usr/lib/libarm_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libc_vfp_g.a				comp-c-debuglib		debuglib,softfloat
 ./usr/lib/libpmc_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/oabi/libc_vfp_g.a			comp-c-debuglib		debuglib,compat
-./usr/lib/oabi/libgmp_g.a			comp-c-debuglib		obsolete
-./usr/lib/oabi/libmpc_g.a			comp-c-debuglib		obsolete
-./usr/lib/oabi/libmpfr_g.a			comp-c-debuglib		obsolete
+./usr/lib/oabi/libgmp_g.a			comp-obsolete		obsolete
+./usr/lib/oabi/libmpc_g.a			comp-obsolete		obsolete
+./usr/lib/oabi/libmpfr_g.a			comp-obsolete		obsolete
 ./usr/libdata/debug/lib/libc_vfp.so.0.0.debug	comp-sys-debug		debug,pic,softfloat
 ./usr/libdata/debug/libexec/ld.elf_so-oabi.debug	comp-sys-debug		debug,compat
 ./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic,endian=1234
--- a/distrib/sets/lists/debug/md.atari	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/md.atari	Thu Jan 05 13:45:50 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: md.atari,v 1.1 2013/01/16 16:01:07 christos Exp $
+# $NetBSD: md.atari,v 1.2 2017/01/05 13:45:51 wiz Exp $
 ./usr/libdata/debug/sbin/ahdilabel.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/binpatch.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/edahdi.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	obsolete
+./usr/libdata/debug/sbin/edlabel.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/msconfig.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/mdec/installboot.debug	comp-sysutil-debug	debug
--- a/distrib/sets/lists/debug/md.mvme68k	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/md.mvme68k	Thu Jan 05 13:45:50 2017 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: md.mvme68k,v 1.1 2013/01/16 16:01:07 christos Exp $
-./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	obsolete
+# $NetBSD: md.mvme68k,v 1.2 2017/01/05 13:45:51 wiz Exp $
+./usr/libdata/debug/sbin/edlabel.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/mdec/installboot.debug	comp-sysutil-debug	debug
--- a/distrib/sets/lists/debug/md.sparc	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/md.sparc	Thu Jan 05 13:45:50 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: md.sparc,v 1.3 2014/04/21 19:26:56 christos Exp $
+# $NetBSD: md.sparc,v 1.4 2017/01/05 13:45:51 wiz Exp $
 ./usr/lib/libsparc_v8_g.a 			comp-c-debuglib debuglib
 ./usr/libdata/debug/lib/libsparc_v8.so.0.0.debug	comp-sys-debug	debug,pic
-./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	obsolete
+./usr/libdata/debug/sbin/edlabel.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/lib/libsparc_v8.so.0.0.debug	comp-sys-debug	debug,pic
--- a/distrib/sets/lists/debug/md.sparc64	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/md.sparc64	Thu Jan 05 13:45:50 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.sparc64,v 1.88 2016/12/14 12:59:51 kre Exp $
+# $NetBSD: md.sparc64,v 1.89 2017/01/05 13:45:51 wiz Exp $
 ./usr/libdata/debug/libexec/ld.elf_so-sparc.debug	comp-sys-debug		debug,compat
-./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	obsolete
+./usr/libdata/debug/sbin/edlabel.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/lib/sparc/librtld_db.so.0.0.debug	comp-compat-shlib	compat,pic,debug,dtrace
 ./usr/libdata/debug/usr/libexec/ld.elf_so-sparc.debug	comp-sys-debug		debug,compat
--- a/distrib/sets/lists/debug/md.sun2	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/md.sun2	Thu Jan 05 13:45:50 2017 +0000
@@ -1,2 +1,2 @@
-# $NetBSD: md.sun2,v 1.1 2013/01/16 16:01:07 christos Exp $
-./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	obsolete
+# $NetBSD: md.sun2,v 1.2 2017/01/05 13:45:51 wiz Exp $
+./usr/libdata/debug/sbin/edlabel.debug		comp-obsolete	obsolete
--- a/distrib/sets/lists/debug/md.sun3	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/md.sun3	Thu Jan 05 13:45:50 2017 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: md.sun3,v 1.2 2013/01/16 21:11:10 christos Exp $
-./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	obsolete
+# $NetBSD: md.sun3,v 1.3 2017/01/05 13:45:51 wiz Exp $
+./usr/libdata/debug/sbin/edlabel.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/sbin/eeprom.debug	comp-sysutil-debug	debug
--- a/distrib/sets/lists/debug/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.188 2016/12/19 17:38:38 maya Exp $
+# $NetBSD: mi,v 1.189 2017/01/05 13:45:51 wiz 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
@@ -77,7 +77,7 @@
 ./usr/lib/libheimbase_g.a			comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libheimntlm_g.a			comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libhx509_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
-./usr/lib/libiberty_g.a				comp-c-obsolete		obsolete,compatfile,binutils
+./usr/lib/libiberty_g.a				comp-obsolete		obsolete,compatfile,binutils
 ./usr/lib/libintl_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libipsec_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libirs_g.a				comp-c-debuglib		debuglib,compatfile
@@ -111,14 +111,14 @@
 ./usr/lib/libnpf_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libnvpair_g.a				comp-c-debuglib		debuglib,zfs,compatfile
 ./usr/lib/libobjc_g.a				comp-c-debuglib		debuglib,gcccmds,compatfile
-./usr/lib/libopcodes_g.a			comp-obsolete		debuglib,compatfile,binutils
+./usr/lib/libopcodes_g.a			comp-c-debuglib		debuglib,compatfile,binutils
 ./usr/lib/libopenpgpsdk_g.a			comp-obsolete		obsolete,compatfile
 ./usr/lib/libossaudio_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libp2k_g.a				comp-c-debuglib		debuglib,compatfile,rump
 ./usr/lib/libpam_g.a				comp-c-debuglib		debuglib,compatfile,pam
 ./usr/lib/libpanel_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libpcap_g.a				comp-c-debuglib		debuglib,compatfile
-./usr/lib/libpcc_g.a				comp-c-debuglib		obsolete,compatfile
+./usr/lib/libpcc_g.a				comp-obsolete		obsolete,compatfile
 ./usr/lib/libpci_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libperfuse_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libposix_g.a				comp-c-debuglib		debuglib,compatfile
@@ -236,7 +236,7 @@
 ./usr/lib/libskey_g.a				comp-c-debuglib		debuglib,compatfile,skey
 ./usr/lib/libsl_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libsqlite3_g.a			comp-c-debuglib		debuglib,compatfile
-./usr/lib/libss_g.a				comp-c-debuglib		obsolete,compatfile
+./usr/lib/libss_g.a				comp-obsolete		obsolete,compatfile
 ./usr/lib/libssh_g.a				comp-c-debuglib		debuglib,compatfile,crypto
 ./usr/lib/libssl_g.a				comp-c-debuglib		debuglib,compatfile,crypto
 ./usr/lib/libstdc++_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcccmds,libstdcxx
@@ -514,7 +514,7 @@
 ./usr/libdata/debug/usr/bin/eqn.debug		comp-groff-debug	groff,debug
 ./usr/libdata/debug/usr/bin/error.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/expand.debug	comp-util-debug		debug
-./usr/libdata/debug/usr/bin/f77.debug		comp-fortran-debug	obsolete
+./usr/libdata/debug/usr/bin/f77.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/bin/fgen.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/file.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/fincore.debug	comp-util-debug		debug
@@ -523,14 +523,14 @@
 ./usr/libdata/debug/usr/bin/flock.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/fmt.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/fold.debug		comp-util-debug		debug
-./usr/libdata/debug/usr/bin/fort77.debug	comp-fortran-debug	obsolete
+./usr/libdata/debug/usr/bin/fort77.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/bin/fpr.debug		comp-fortran-debug	debug
 ./usr/libdata/debug/usr/bin/from.debug		comp-mail-debug		debug
 ./usr/libdata/debug/usr/bin/fsplit.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/fstat.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/ftp.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/usr/bin/g++.debug		comp-cxx-debug		gcccmds,debug
-./usr/libdata/debug/usr/bin/g77.debug		comp-fortran-debug	obsolete
+./usr/libdata/debug/usr/bin/g77.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/bin/gcc.debug		comp-c-debug		gcccmds,debug
 ./usr/libdata/debug/usr/bin/gcore.debug		comp-debug-debug	debug
 ./usr/libdata/debug/usr/bin/gcov.debug		comp-debug-debug	gcccmds,debug
@@ -553,7 +553,7 @@
 ./usr/libdata/debug/usr/bin/grolj4.debug	comp-groff-debug	groff,debug
 ./usr/libdata/debug/usr/bin/grops.debug		comp-groff-debug	groff,debug
 ./usr/libdata/debug/usr/bin/grotty.debug	comp-groff-debug	groff,debug
-./usr/libdata/debug/usr/bin/gss.debug		comp-krb5-debug		kerberos,debug,obsolete
+./usr/libdata/debug/usr/bin/gss.debug		comp-obsolete		kerberos,debug,obsolete
 ./usr/libdata/debug/usr/bin/gsstool.debug	comp-krb5-debug		kerberos,debug
 ./usr/libdata/debug/usr/bin/gzip.debug		comp-util-debug		debug,!pigzgzip
 ./usr/libdata/debug/usr/bin/head.debug		comp-util-debug		debug
@@ -582,7 +582,7 @@
 ./usr/libdata/debug/usr/bin/kdump.debug		comp-debug-debug	debug
 ./usr/libdata/debug/usr/bin/kgetcred.debug	comp-krb5-debug		kerberos,debug
 ./usr/libdata/debug/usr/bin/kinit.debug		comp-krb5-debug		kerberos,debug
-./usr/libdata/debug/usr/bin/klist.debug		comp-krb5-debug		kerberos,debug,obsolete
+./usr/libdata/debug/usr/bin/klist.debug		comp-obsolete		kerberos,debug,obsolete
 ./usr/libdata/debug/usr/bin/kpasswd.debug	comp-krb5-debug		kerberos,debug
 ./usr/libdata/debug/usr/bin/ktrace.debug	comp-debug-debug	debug
 ./usr/libdata/debug/usr/bin/ktruss.debug	comp-debug-debug	debug
@@ -905,7 +905,7 @@
 ./usr/libdata/debug/usr/games/wump.debug	comp-games-debug	debug
 ./usr/libdata/debug/usr/libexec/atf-check.debug	comp-atf-debug		atf,debug
 ./usr/libdata/debug/usr/libexec/atf-cleanup.debug	comp-obsolete		obsolete
-./usr/libdata/debug/usr/libexec/atf-exec.debug	comp-atf-debug		obsolete
+./usr/libdata/debug/usr/libexec/atf-exec.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec/atf-format.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec/atf-killpg.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec/atrun.debug	comp-cron-debug		debug
@@ -927,7 +927,7 @@
 ./usr/libdata/debug/usr/libexec/getNAME.debug	comp-man-debug		!makemandb,debug
 ./usr/libdata/debug/usr/libexec/getty.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/libexec/hpropd.debug	comp-krb5-debug		kerberos,debug
-./usr/libdata/debug/usr/libexec/httpd.debug	comp-netutil-debug	obsolete
+./usr/libdata/debug/usr/libexec/httpd.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/libexec/identd.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/libexec/ipropd-master.debug	comp-krb5-debug		kerberos,debug
 ./usr/libdata/debug/usr/libexec/ipropd-slave.debug	comp-krb5-debug		kerberos,debug
@@ -1476,61 +1476,61 @@
 ./usr/libdata/debug/usr/tests/atf/test_programs/h_c.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/test_programs/h_cpp.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/application_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/application_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/application_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/atffile_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/atffile_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/atffile_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/auto_array_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/auto_array_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/auto_array_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/bad_metadata_helper.debug	tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/bad_metadata_helper.debug	tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/bad_metadata_helper.debug	tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/config_file_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/config_file_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/config_file_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/config_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/config_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/config_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/env_test.debug			tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/env_test.debug			tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/env_test.debug			tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/expand_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/expand_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/expand_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/expect_helpers.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/expect_helpers.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/expect_helpers.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/fail_helper.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/fail_helper.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/fail_helper.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/fs_test.debug			tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/fs_test.debug			tests-atf-tests		debug,kyua,obsolete
-./usr/libdata/debug/usr/tests/atf/tools/h_fail.debug			tests-atf-debug		obsolete
-./usr/libdata/debug/usr/tests/atf/tools/h_misc.debug			tests-atf-debug		obsolete
-./usr/libdata/debug/usr/tests/atf/tools/h_mode.debug			tests-atf-debug		obsolete
-./usr/libdata/debug/usr/tests/atf/tools/h_pass.debug			tests-atf-debug		obsolete
+./usr/libdata/debug/usr/tests/atf/tools/fs_test.debug			tests-obsolete		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/h_fail.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/tools/h_misc.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/tools/h_mode.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/tools/h_pass.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/io_test.debug			tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/io_test.debug			tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/io_test.debug			tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/misc_helpers.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/misc_helpers.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/misc_helpers.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/parser_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/parser_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/parser_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/pass_helper.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/pass_helper.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/pass_helper.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/process_helpers.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/process_helpers.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/process_helpers.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/process_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/process_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/process_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/reader_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/reader_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/reader_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/requirements_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/requirements_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/requirements_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/several_tcs_helper.debug	tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/several_tcs_helper.debug	tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/several_tcs_helper.debug	tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/signals_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/signals_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/signals_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/test_program_test.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/test_program_test.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/test_program_test.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/text_test.debug			tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/text_test.debug			tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/text_test.debug			tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/ui_test.debug			tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/ui_test.debug			tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/ui_test.debug			tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/user_test.debug			tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/user_test.debug			tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/user_test.debug			tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/tools/zero_tcs_helper.debug		tests-atf-tests		compattestfile,debug,atf,!kyua
-./usr/libdata/debug/usr/tests/atf/tools/zero_tcs_helper.debug		tests-atf-tests		debug,kyua,obsolete
+./usr/libdata/debug/usr/tests/atf/tools/zero_tcs_helper.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/units/t_config.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/units/t_env.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/units/t_expand.debug			tests-obsolete		obsolete
@@ -1637,7 +1637,7 @@
 ./usr/libdata/debug/usr/tests/fs/vfs/t_renamerace.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/vfs/t_rmdirrace.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/vfs/t_ro.debug			tests-fs-debug		debug,atf,rump
-./usr/libdata/debug/usr/tests/fs/vfs/t_union.debug			tests-obsolete		debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/vfs/t_union.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/vfs/t_unpriv.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/vfs/t_vfsops.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/vfs/t_vnops.debug			tests-fs-debug		debug,atf,rump
@@ -1687,12 +1687,12 @@
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_fifo.debug		tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_pipe.debug		tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_ttypty.debug	tests-kernel-tests	debug,atf,compattestfile
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_fileactions.debug	tests-kernel-tests	obsolete,compattestfile
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawn.debug		tests-kernel-tests	obsolete,compattestfile
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawnattr.debug	tests-kernel-tests	obsolete,compattestfile
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_fileactions.debug	tests-kernel-tests	obsolete,compattestfile
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawn.debug		tests-kernel-tests	obsolete,compattestfile
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawnattr.debug	tests-kernel-tests	obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_fileactions.debug	tests-obsolete	obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawn.debug		tests-obsolete	obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawnattr.debug	tests-obsolete	obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_fileactions.debug	tests-obsolete	obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawn.debug		tests-obsolete	obsolete,compattestfile
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawnattr.debug	tests-obsolete	obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_extattrctl.debug			tests-kernel-tests	debug,atf,rump
 ./usr/libdata/debug/usr/tests/kernel/t_extent.debug			tests-kernel-tests	debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/kernel/t_filedesc.debug			tests-kernel-tests	debug,atf,rump
@@ -2242,7 +2242,7 @@
 ./usr/libdata/debug/usr/tests/net/if_loop/t_pr.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/in_cksum/in_cksum.debug	tests-net-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/net/mcast/mcast.debug		tests-net-debug		debug,atf,rump
-./usr/libdata/debug/usr/tests/net/mcast/t_mcast.debug		tests-net-debug		debug,atf,rump,obsolete
+./usr/libdata/debug/usr/tests/net/mcast/t_mcast.debug		tests-obsolete		debug,atf,rump,obsolete
 ./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug		tests-net-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/net/net/t_raw.debug		tests-net-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/net/t_tcp.debug		tests-net-debug		debug,atf,compattestfile
--- a/distrib/sets/lists/debug/shl.mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/debug/shl.mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.154 2017/01/02 20:45:09 martin Exp $
+# $NetBSD: shl.mi,v 1.155 2017/01/05 13:45:51 wiz Exp $
 ./usr/libdata/debug/lib						base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libc.so.12.205.debug			comp-sys-debug	debug,dynamicroot
@@ -21,7 +21,7 @@
 ./usr/libdata/debug/lib/libradius.so.4.0.debug			comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/librumpclient.so.0.0.debug		comp-sys-debug	debug,dynamicroot,rump
 ./usr/libdata/debug/lib/libterminfo.so.1.0.debug		comp-sys-debug	debug,dynamicroot
-./usr/libdata/debug/lib/libutil.so.7.23.debug			comp-sys-debug	debug,obsolete,compatfile
+./usr/libdata/debug/lib/libutil.so.7.23.debug			comp-obsolete	debug,obsolete,compatfile
 ./usr/libdata/debug/lib/libutil.so.7.24.debug			comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libz.so.1.0.debug			comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/npf/ext_log.so.0.0.debug		comp-sys-debug	debug,compatfile,npf
@@ -57,7 +57,7 @@
 ./usr/libdata/debug/usr/lib/libasan.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libasan.so.1.0.debug		comp-sys-debug	debug,compatfile,gcc=53
 ./usr/libdata/debug/usr/lib/libasn1.so.9.0.debug		comp-krb5-debug	debug,compatfile,kerberos
-./usr/libdata/debug/usr/lib/libatf-c++.so.0.0.debug		comp-atf-debug	debug,compatfile,atf,obsolete
+./usr/libdata/debug/usr/lib/libatf-c++.so.0.0.debug		comp-obsolete	debug,compatfile,atf,obsolete
 ./usr/libdata/debug/usr/lib/libatf-c++.so.1.0.debug		comp-atf-debug	debug,compatfile,atf
 ./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug		comp-atf-debug	debug,compatfile,atf
 ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,compatfile,zfs
@@ -77,7 +77,7 @@
 ./usr/libdata/debug/usr/lib/libcrypto_mdc2.so.7.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libcrypto_rc5.so.12.0.debug		comp-crypto-debug	debug,compatfile,crypto,crypto_rc5
 ./usr/libdata/debug/usr/lib/libctf.so.3.0.debug			comp-sys-debug	debug,compatfile,ctf
-./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug		comp-sys-debug	debug,obsolete,compatfile
+./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug		comp-obsolete	debug,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libcurses.so.7.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libdes.so.12.0.debug			comp-crypto-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libdevmapper.so.1.0.debug		comp-lvm-debug	debug,compatfile,lvm
@@ -95,9 +95,9 @@
 ./usr/libdata/debug/usr/lib/libexpat.so.2.3.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libform.so.6.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug			comp-sys-debug	obsolete
+./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug			comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/libgcc_s.so.1.0.debug		comp-sys-debug	debug,compatfile,gcc
-./usr/libdata/debug/usr/lib/libgmp.so.10.2.debug		comp-c-shlib	obsolete
+./usr/libdata/debug/usr/lib/libgmp.so.10.2.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libgomp.so.1.1.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libgomp.so.1.2.debug		comp-sys-debug	debug,compatfile,gcc=53
@@ -109,11 +109,11 @@
 ./usr/libdata/debug/usr/lib/libintl.so.1.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libipsec.so.3.0.debug		comp-net-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libirs.so.8.4.debug			comp-bind-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libisc.so.6.0.debug			comp-bind-debug	debug,compatfile,obsolete
+./usr/libdata/debug/usr/lib/libisc.so.6.0.debug			comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libisc.so.8.4.debug			comp-bind-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libisccc.so.6.0.debug		comp-bind-debug	debug,compatfile,obsolete
+./usr/libdata/debug/usr/lib/libisccc.so.6.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libisccc.so.8.4.debug		comp-bind-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libisccfg.so.6.0.debug		comp-bind-debug	debug,compatfile,obsolete
+./usr/libdata/debug/usr/lib/libisccfg.so.6.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libisccfg.so.8.4.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libiscsi.so.2.0.debug		comp-iscsi-debug	debug,compatfile,iscsi
 ./usr/libdata/debug/usr/lib/libisns.so.0.0.debug		comp-isns-debug	debug,compatfile
@@ -129,7 +129,7 @@
 ./usr/libdata/debug/usr/lib/liblua.so.5.3.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/liblutok.so.1.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/liblutok.so.2.0.debug		comp-kyua-debug	debug,compatfile,kyua
-./usr/libdata/debug/usr/lib/liblwres.so.6.0.debug		comp-bind-debug	debug,compatfile,obsolete
+./usr/libdata/debug/usr/lib/liblwres.so.6.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/liblwres.so.8.4.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/liblzf.so.1.0.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/liblzma.so.2.0.debug		comp-sys-debug	debug,compatfile
@@ -137,8 +137,8 @@
 ./usr/libdata/debug/usr/lib/libmagic.so.5.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libmenu.so.6.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libmj.so.1.0.debug			comp-crypto-debug	debug,compatfile,crypto
-./usr/libdata/debug/usr/lib/libmpc.so.2.0.debug			comp-c-shlib	debug,compatfile,obsolete
-./usr/libdata/debug/usr/lib/libmpfr.so.4.1.debug		comp-c-shlib	debug,compatfile,obsolete
+./usr/libdata/debug/usr/lib/libmpc.so.2.0.debug			comp-obsolete	debug,compatfile,obsolete
+./usr/libdata/debug/usr/lib/libmpfr.so.4.1.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libmudflap.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libmudflapth.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug		comp-crypto-debug	debug,compatfile,crypto
@@ -276,7 +276,7 @@
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libunbound.so.6.1.debug 		comp-net-debug	debug,compatfile,crypto,unbound
 ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libutil.so.7.23.debug		comp-sys-debug	debug,compatfile,obsolete,compatfile
+./usr/libdata/debug/usr/lib/libutil.so.7.23.debug		comp-obsolete	debug,compatfile,obsolete,compatfile
 ./usr/libdata/debug/usr/lib/libutil.so.7.24.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libuutil.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libwind.so.0.0.debug		comp-krb5-debug	debug,compatfile,kerberos
--- a/distrib/sets/lists/man/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/man/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1541 2017/01/03 08:49:04 maya Exp $
+# $NetBSD: mi,v 1.1542 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -55,7 +55,7 @@
 ./usr/share/man/cat1/atf-compile.0		man-obsolete		obsolete
 ./usr/share/man/cat1/atf-config.0		man-atf-catman		.cat,atf,!kyua
 ./usr/share/man/cat1/atf-config.0		man-obsolete		.cat,kyua,obsolete
-./usr/share/man/cat1/atf-exec.0			man-atf-catman		obsolete
+./usr/share/man/cat1/atf-exec.0			man-obsolete		obsolete
 ./usr/share/man/cat1/atf-format.0		man-obsolete		obsolete
 ./usr/share/man/cat1/atf-killpg.0		man-obsolete		obsolete
 ./usr/share/man/cat1/atf-report.0		man-atf-catman		.cat,atf
@@ -3234,7 +3234,7 @@
 ./usr/share/man/html1/atf-compile.html		man-obsolete		obsolete
 ./usr/share/man/html1/atf-config.html		man-atf-htmlman		html,atf,!kyua
 ./usr/share/man/html1/atf-config.html		man-obsolete		html,kyua,obsolete
-./usr/share/man/html1/atf-exec.html		man-atf-htmlman		obsolete
+./usr/share/man/html1/atf-exec.html		man-obsolete		obsolete
 ./usr/share/man/html1/atf-format.html		man-obsolete		obsolete
 ./usr/share/man/html1/atf-killpg.html		man-obsolete		obsolete
 ./usr/share/man/html1/atf-report.html		man-atf-htmlman		html,atf
@@ -6023,7 +6023,7 @@
 ./usr/share/man/man1/atf-compile.1		man-obsolete		obsolete
 ./usr/share/man/man1/atf-config.1		man-atf-man		.man,atf,!kyua
 ./usr/share/man/man1/atf-config.1		man-obsolete		.man,kyua,obsolete
-./usr/share/man/man1/atf-exec.1			man-atf-man		obsolete
+./usr/share/man/man1/atf-exec.1			man-obsolete		obsolete
 ./usr/share/man/man1/atf-format.1		man-obsolete		obsolete
 ./usr/share/man/man1/atf-killpg.1		man-obsolete		obsolete
 ./usr/share/man/man1/atf-report.1		man-atf-man		.man,atf
--- a/distrib/sets/lists/tests/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/tests/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.712 2017/01/02 21:05:06 martin Exp $
+# $NetBSD: mi,v 1.713 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -61,7 +61,7 @@
 ./usr/libdata/debug/usr/tests/kernel/kqueue				tests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueue/read			tests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write			tests-kernel-tests	compattestfile,atf
-./usr/libdata/debug/usr/tests/kernel/posix_spawn			tests-kernel-tests	obsolete
+./usr/libdata/debug/usr/tests/kernel/posix_spawn			tests-obsolete	obsolete
 ./usr/libdata/debug/usr/tests/kernel/tty				tests-kernel-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kyua-cli					tests-kyua-tests	compattestfile,atf
 ./usr/libdata/debug/usr/tests/kyua-cli/bootstrap			tests-kyua-tests	compattestfile,atf
@@ -726,59 +726,59 @@
 ./usr/tests/atf/test_programs/t_workdir					tests-obsolete		obsolete
 ./usr/tests/atf/tools							tests-atf-tests		compattestfile,atf
 ./usr/tests/atf/tools/Atffile						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/Atffile						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/Atffile						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/application_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/application_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/application_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/atf-config_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/atf-config_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/atf-config_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/atf-report_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/atf-report_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/atf-report_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/atf-run_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/atf-run_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/atf-run_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/atffile_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/atffile_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/atffile_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/auto_array_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/auto_array_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/auto_array_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/bad_metadata_helper				tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/bad_metadata_helper				tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/bad_metadata_helper				tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/config_file_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/config_file_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/config_file_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/config_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/config_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/config_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/env_test						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/env_test						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/env_test						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/expand_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/expand_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/expand_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/expect_helpers					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/expect_helpers					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/expect_helpers					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/fail_helper					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/fail_helper					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/fail_helper					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/fs_test						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/fs_test						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/fs_test						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/h_fail						tests-obsolete		obsolete
 ./usr/tests/atf/tools/h_misc						tests-obsolete		obsolete
 ./usr/tests/atf/tools/h_mode						tests-obsolete		obsolete
 ./usr/tests/atf/tools/h_pass						tests-obsolete		obsolete
 ./usr/tests/atf/tools/io_test						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/io_test						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/io_test						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/misc_helpers					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/misc_helpers					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/misc_helpers					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/parser_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/parser_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/parser_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/pass_helper					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/pass_helper					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/pass_helper					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/process_helpers					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/process_helpers					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/process_helpers					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/process_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/process_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/process_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/reader_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/reader_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/reader_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/requirements_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/requirements_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/requirements_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/several_tcs_helper				tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/several_tcs_helper				tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/several_tcs_helper				tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/signals_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/signals_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/signals_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/t_atf_check					tests-obsolete		obsolete
 ./usr/tests/atf/tools/t_atf_cleanup					tests-obsolete		obsolete
 ./usr/tests/atf/tools/t_atf_compile					tests-obsolete		obsolete
@@ -788,15 +788,15 @@
 ./usr/tests/atf/tools/t_atf_report					tests-obsolete		obsolete
 ./usr/tests/atf/tools/t_atf_run						tests-obsolete		obsolete
 ./usr/tests/atf/tools/test_program_test					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/test_program_test					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/test_program_test					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/text_test						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/text_test						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/text_test						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/ui_test						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/ui_test						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/ui_test						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/user_test						tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/user_test						tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/user_test						tests-obsolete		obsolete,kyua
 ./usr/tests/atf/tools/zero_tcs_helper					tests-atf-tests		compattestfile,atf,!kyua
-./usr/tests/atf/tools/zero_tcs_helper					tests-atf-tests		obsolete,kyua
+./usr/tests/atf/tools/zero_tcs_helper					tests-obsolete		obsolete,kyua
 ./usr/tests/atf/units							tests-obsolete		obsolete
 ./usr/tests/atf/units/Atffile						tests-obsolete		obsolete
 ./usr/tests/atf/units/t_config						tests-obsolete		obsolete
@@ -1818,7 +1818,7 @@
 ./usr/tests/ipf/input/n15_6			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/input/n16			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/input/n17			tests-ipf-tests		compattestfile,atf,ipfilter
-./usr/tests/ipf/input/n17_6			tests-ipf-tests		obsolete
+./usr/tests/ipf/input/n17_6			tests-obsolete		obsolete
 ./usr/tests/ipf/input/n18			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/input/n1_6			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/input/n2			tests-ipf-tests		compattestfile,atf,ipfilter
@@ -1983,7 +1983,7 @@
 ./usr/tests/ipf/regress/n16			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/regress/n16_6			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/regress/n17			tests-ipf-tests		compattestfile,atf,ipfilter
-./usr/tests/ipf/regress/n17_6			tests-ipf-tests		obsolete
+./usr/tests/ipf/regress/n17_6			tests-obsolete		obsolete
 ./usr/tests/ipf/regress/n18			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/regress/n1_6			tests-ipf-tests		compattestfile,atf,ipfilter
 ./usr/tests/ipf/regress/n2			tests-ipf-tests		compattestfile,atf,ipfilter
@@ -2130,16 +2130,16 @@
 ./usr/tests/kernel/kqueue/write/t_fifo		tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/kqueue/write/t_pipe		tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/kqueue/write/t_ttypty	tests-kernel-tests	compattestfile,atf
-./usr/tests/kernel/posix_spawn			tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/Atffile		tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/h_fileactions	tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/h_nonexec	tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/h_spawn		tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/h_spawnattr	tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/h_zero		tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/t_fileactions	tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/t_spawn		tests-kernel-tests	obsolete
-./usr/tests/kernel/posix_spawn/t_spawnattr	tests-kernel-tests	obsolete
+./usr/tests/kernel/posix_spawn			tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/Atffile		tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/h_fileactions	tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/h_nonexec	tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/h_spawn		tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/h_spawnattr	tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/h_zero		tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/t_fileactions	tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/t_spawn		tests-obsolete	obsolete
+./usr/tests/kernel/posix_spawn/t_spawnattr	tests-obsolete	obsolete
 ./usr/tests/kernel/t_extattrctl			tests-kernel-tests	atf,rump
 ./usr/tests/kernel/t_extent			tests-kernel-tests	compattestfile,atf
 ./usr/tests/kernel/t_filedesc			tests-kernel-tests	atf,rump
@@ -3283,7 +3283,7 @@
 ./usr/tests/net/mpls/Atffile			tests-net-tests		atf,rump
 ./usr/tests/net/mpls/Kyuafile			tests-net-tests		atf,rump,kyua
 ./usr/tests/net/mpls/t_ldp_regen		tests-net-tests		atf,rump
-./usr/tests/net/mpls/t_ldp_static		tests-net-tests		obsolete
+./usr/tests/net/mpls/t_ldp_static		tests-obsolete		obsolete
 ./usr/tests/net/mpls/t_mpls_fw			tests-net-tests		atf,rump
 ./usr/tests/net/mpls/t_mpls_fw6			tests-net-tests		atf,rump
 ./usr/tests/net/mpls/t_mpls_fw64		tests-net-tests		atf,rump
--- a/distrib/sets/lists/xbase/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/xbase/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.139 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.140 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -36,7 +36,7 @@
 ./usr/X11R7/bin/iceauth					-unknown-	xorg
 ./usr/X11R7/bin/ico					-unknown-	xorg
 ./usr/X11R7/bin/imake					-unknown-	xorg
-./usr/X11R7/bin/lbxproxy				-obsolete	obsolete
+./usr/X11R7/bin/lbxproxy				-unknown-	obsolete
 ./usr/X11R7/bin/listres					-unknown-	xorg
 ./usr/X11R7/bin/lndir					-unknown-	xorg
 ./usr/X11R7/bin/luit					-unknown-	xorg
@@ -113,12 +113,12 @@
 ./usr/X11R7/bin/xmlwf					-unknown-	xorg
 ./usr/X11R7/bin/xmodmap					-unknown-	xorg
 ./usr/X11R7/bin/xmore					-unknown-	xorg
-./usr/X11R7/bin/xphelloworld				-obsolete-	obsolete
-./usr/X11R7/bin/xplsprinters				-obsolete-	obsolete
-./usr/X11R7/bin/xprehashprinterlist			-obsolete-	obsolete
+./usr/X11R7/bin/xphelloworld				-unknown-	obsolete
+./usr/X11R7/bin/xplsprinters				-unknown-	obsolete
+./usr/X11R7/bin/xprehashprinterlist			-unknown-	obsolete
 ./usr/X11R7/bin/xprop					-unknown-	xorg
-./usr/X11R7/bin/xpsimplehelloworld			-obsolete-	obsolete
-./usr/X11R7/bin/xpxthelloworld				-obsolete-	obsolete
+./usr/X11R7/bin/xpsimplehelloworld			-unknown-	obsolete
+./usr/X11R7/bin/xpxthelloworld				-unknown-	obsolete
 ./usr/X11R7/bin/xrandr					-unknown-	xorg
 ./usr/X11R7/bin/xrdb					-unknown-	xorg
 ./usr/X11R7/bin/xrefresh				-unknown-	xorg
@@ -253,7 +253,7 @@
 ./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/drm					base-obsolete	obsolete
 ./usr/X11R7/include/epoxy				base-x11-root	xorg
 ./usr/X11R7/include/fontconfig				base-x11-root	xorg
 ./usr/X11R7/include/freetype2				base-x11-root	xorg
@@ -438,7 +438,7 @@
 ./usr/X11R7/lib/X11/locale/ja.JIS/Compose		-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/ja.JIS/XI18N_OBJS		-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/ja.JIS/XLC_LOCALE		-unknown-	xorg
-./usr/X11R7/lib/X11/locale/ja.S90			base-x11-obsolete	obsolete
+./usr/X11R7/lib/X11/locale/ja.S90			base-obsolete	obsolete
 ./usr/X11R7/lib/X11/locale/ja.S90/Compose		-unknown-	obsolete
 ./usr/X11R7/lib/X11/locale/ja.S90/XI18N_OBJS		-unknown-	obsolete
 ./usr/X11R7/lib/X11/locale/ja.S90/XLC_LOCALE		-unknown-	obsolete
@@ -446,7 +446,7 @@
 ./usr/X11R7/lib/X11/locale/ja.SJIS/Compose		-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/ja.SJIS/XI18N_OBJS		-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/ja.SJIS/XLC_LOCALE		-unknown-	xorg
-./usr/X11R7/lib/X11/locale/ja.U90			base-x11-obsolete	obsolete
+./usr/X11R7/lib/X11/locale/ja.U90			base-obsolete	obsolete
 ./usr/X11R7/lib/X11/locale/ja.U90/Compose		-unknown-	obsolete
 ./usr/X11R7/lib/X11/locale/ja.U90/XI18N_OBJS		-unknown-	obsolete
 ./usr/X11R7/lib/X11/locale/ja.U90/XLC_LOCALE		-unknown-	obsolete
@@ -642,7 +642,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/ataritt		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/chicony		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/dell			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/geometry/digital		-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/geometry/digital		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/digital/lk		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/digital/pc		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/digital/unix		-unknown-	obsolete
@@ -654,7 +654,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/fujitsu		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/hhk			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/hp			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/geometry/ibm			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/geometry/ibm			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/ibm/thinkpad		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/keytronic		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/kinesis		-unknown-	xorg
@@ -665,7 +665,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/northgate		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/pc			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sanwa			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/geometry/sgi			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/geometry/sgi			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/sgi/O2			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/sgi/indigo		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/sgi/indy		-unknown-	obsolete
@@ -685,7 +685,7 @@
 ./usr/X11R7/lib/X11/xkb/keycodes/aliases		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/amiga			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/ataritt		-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/keycodes/digital		-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/digital		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/digital/lk		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/digital/pc		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr		base-x11-root	xorg
@@ -700,7 +700,7 @@
 ./usr/X11R7/lib/X11/xkb/keycodes/macintosh		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/olpc			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2		-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/sgi			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/sgi			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/sgi/indigo		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/sgi/indy		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/sgi/iris		-unknown-	obsolete
@@ -712,17 +712,17 @@
 ./usr/X11R7/lib/X11/xkb/keycodes/sun			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/xfree86		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/xfree98		-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/keymap				base-x11-root	obsolete
+./usr/X11R7/lib/X11/xkb/keymap				base-obsolete	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap.dir			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/README			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/amiga			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/ataritt			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/digital			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/keymap/digital			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/digital/us		-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/digital_vndr		base-x11-root	obsolete
+./usr/X11R7/lib/X11/xkb/keymap/digital_vndr		base-obsolete	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/digital_vndr/us		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/macintosh		-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi/be			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi/bg			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi/ca			-unknown-	obsolete
@@ -751,7 +751,7 @@
 ./usr/X11R7/lib/X11/xkb/keymap/sgi/sk_qwerty		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi/th			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi/us			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr			base-x11-root	obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr			base-obsolete	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/be		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/bg		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ca		-unknown-	obsolete
@@ -776,7 +776,7 @@
 ./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/th		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/us		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sony			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun/de			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun/es			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun/fi			-unknown-	obsolete
@@ -787,7 +787,7 @@
 ./usr/X11R7/lib/X11/xkb/keymap/sun/se			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun/uk			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun/us			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr			base-x11-root	obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr			base-obsolete	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/all		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/de		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/es		-unknown-	obsolete
@@ -823,7 +823,7 @@
 ./usr/X11R7/lib/X11/xkb/rules/xorg-it.lst		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/rules/xorg.lst			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/xorg.xml			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/semantics			base-x11-root	obsolete
+./usr/X11R7/lib/X11/xkb/semantics			base-obsolete	obsolete
 ./usr/X11R7/lib/X11/xkb/semantics/basic			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/semantics/complete		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/semantics/default		-unknown-	obsolete
@@ -872,7 +872,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/de			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/de_CH			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/dev			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/digital/lk		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/digital/pc		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/digital/us		-unknown-	obsolete
@@ -894,7 +894,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/et			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/eu			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/eurosign		-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/extras			base-x11-root	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras			base-obsolete	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/extras/apl		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/extras/ir		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/extras/rs		-unknown-	obsolete
@@ -904,7 +904,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/fo			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/fr			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/fr_CH			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/fujitsu/jp		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/fujitsu/us		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr		base-x11-root	xorg
@@ -920,7 +920,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/group			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/guj			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/gur			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/hp			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hp			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/hp/us			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/hp_vndr			base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/hp_vndr/us		-unknown-	xorg
@@ -966,7 +966,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/lt_std			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/lv			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ma			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/macintosh		-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh/de		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh/de_CH		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh/dk		-unknown-	obsolete
@@ -1009,7 +1009,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/mv			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/my			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nbsp			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/nec			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/nec			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/nec/jp			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/nec_vndr		base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nec_vndr/jp		-unknown-	xorg
@@ -1108,11 +1108,11 @@
 ./usr/X11R7/lib/X11/xkb/symbols/se_FI			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/se_NO			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/se_SE			-unknown-	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sgi			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sgi			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sgi/jp			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr		base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr/jp		-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sharp			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sharp			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr		base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr/sl-c3x00	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr/ws003sh	-unknown-	xorg
@@ -1124,13 +1124,13 @@
 ./usr/X11R7/lib/X11/xkb/symbols/sk			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sk_qwerty		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sn			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sony			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sony			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sony/us			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr		base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr/us		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sr			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/srvr_ctrl		-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun/se			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun/us			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun/usb			-unknown-	obsolete
@@ -1197,7 +1197,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/us_intl			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/uz			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/vn			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/symbols/xfree68			-obsolete-	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/xfree68			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68/amiga		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68/ataritt		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr		base-x11-root	xorg
@@ -1278,7 +1278,7 @@
 ./usr/X11R7/man/cat1/iceauth.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/ico.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/imake.0				-unknown-	.cat,xorg
-./usr/X11R7/man/cat1/lbxproxy.0				-obsolete	obsolete
+./usr/X11R7/man/cat1/lbxproxy.0				-unknown-	obsolete
 ./usr/X11R7/man/cat1/listres.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/lndir.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/luit.0				-unknown-	.cat,xorg
@@ -1348,15 +1348,15 @@
 ./usr/X11R7/man/cat1/xmessage.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/xmh.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/xmkmf.0				-unknown-	.cat,xorg
-./usr/X11R7/man/cat1/xmlwf.0				-obsolete-	obsolete
+./usr/X11R7/man/cat1/xmlwf.0				-unknown-	obsolete
 ./usr/X11R7/man/cat1/xmodmap.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/xmore.0				-unknown-	.cat,xorg
-./usr/X11R7/man/cat1/xphelloworld.0			-obsolete-	obsolete
-./usr/X11R7/man/cat1/xplsprinters.0			-obsolete-	obsolete
-./usr/X11R7/man/cat1/xprehashprinterlist.0		-obsolete-	obsolete
+./usr/X11R7/man/cat1/xphelloworld.0			-unknown-	obsolete
+./usr/X11R7/man/cat1/xplsprinters.0			-unknown-	obsolete
+./usr/X11R7/man/cat1/xprehashprinterlist.0		-unknown-	obsolete
 ./usr/X11R7/man/cat1/xprop.0				-unknown-	.cat,xorg
-./usr/X11R7/man/cat1/xpsimplehelloworld.0		-obsolete-	obsolete
-./usr/X11R7/man/cat1/xpxthelloworld.0			-obsolete-	obsolete
+./usr/X11R7/man/cat1/xpsimplehelloworld.0		-unknown-	obsolete
+./usr/X11R7/man/cat1/xpxthelloworld.0			-unknown-	obsolete
 ./usr/X11R7/man/cat1/xrandr.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/xrdb.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat1/xrefresh.0				-unknown-	.cat,xorg
@@ -1422,7 +1422,7 @@
 ./usr/X11R7/man/html1/iceauth.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/ico.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/imake.html			-unknown-	html,xorg
-./usr/X11R7/man/html1/lbxproxy.html			-obsolete		obsolete
+./usr/X11R7/man/html1/lbxproxy.html			-unknown-		obsolete
 ./usr/X11R7/man/html1/listres.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/lndir.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/luit.html				-unknown-	html,xorg
@@ -1492,15 +1492,15 @@
 ./usr/X11R7/man/html1/xmessage.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/xmh.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/xmkmf.html			-unknown-	html,xorg
-./usr/X11R7/man/html1/xmlwf.html			-obsolete-	obsolete
+./usr/X11R7/man/html1/xmlwf.html			-unknown-	obsolete
 ./usr/X11R7/man/html1/xmodmap.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/xmore.html			-unknown-	html,xorg
-./usr/X11R7/man/html1/xphelloworld.html			-obsolete-	obsolete
-./usr/X11R7/man/html1/xplsprinters.html			-obsolete-	obsolete
-./usr/X11R7/man/html1/xprehashprinterlist.html		-obsolete-	obsolete
+./usr/X11R7/man/html1/xphelloworld.html			-unknown-	obsolete
+./usr/X11R7/man/html1/xplsprinters.html			-unknown-	obsolete
+./usr/X11R7/man/html1/xprehashprinterlist.html		-unknown-	obsolete
 ./usr/X11R7/man/html1/xprop.html			-unknown-	html,xorg
-./usr/X11R7/man/html1/xpsimplehelloworld.html		-obsolete-	obsolete
-./usr/X11R7/man/html1/xpxthelloworld.html		-obsolete-	obsolete
+./usr/X11R7/man/html1/xpsimplehelloworld.html		-unknown-	obsolete
+./usr/X11R7/man/html1/xpxthelloworld.html		-unknown-	obsolete
 ./usr/X11R7/man/html1/xrandr.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/xrdb.html				-unknown-	html,xorg
 ./usr/X11R7/man/html1/xrefresh.html			-unknown-	html,xorg
@@ -1566,7 +1566,7 @@
 ./usr/X11R7/man/man1/iceauth.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/ico.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/imake.1				-unknown-	.man,xorg
-./usr/X11R7/man/man1/lbxproxy.1				-obsolete	obsolete
+./usr/X11R7/man/man1/lbxproxy.1				-unknown-	obsolete
 ./usr/X11R7/man/man1/listres.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/lndir.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/luit.1				-unknown-	.man,xorg
@@ -1637,15 +1637,15 @@
 ./usr/X11R7/man/man1/xmessage.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/xmh.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/xmkmf.1				-unknown-	.man,xorg
-./usr/X11R7/man/man1/xmlwf.1				-obsolete-	obsolete
+./usr/X11R7/man/man1/xmlwf.1				-unknown-	obsolete
 ./usr/X11R7/man/man1/xmodmap.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/xmore.1				-unknown-	.man,xorg
-./usr/X11R7/man/man1/xphelloworld.1			-obsolete-	obsolete
-./usr/X11R7/man/man1/xplsprinters.1			-obsolete-	obsolete
-./usr/X11R7/man/man1/xprehashprinterlist.1		-obsolete-	obsolete
+./usr/X11R7/man/man1/xphelloworld.1			-unknown-	obsolete
+./usr/X11R7/man/man1/xplsprinters.1			-unknown-	obsolete
+./usr/X11R7/man/man1/xprehashprinterlist.1		-unknown-	obsolete
 ./usr/X11R7/man/man1/xprop.1				-unknown-	.man,xorg
-./usr/X11R7/man/man1/xpsimplehelloworld.1		-obsolete-	obsolete
-./usr/X11R7/man/man1/xpxthelloworld.1			-obsolete-	obsolete
+./usr/X11R7/man/man1/xpsimplehelloworld.1		-unknown-	obsolete
+./usr/X11R7/man/man1/xpxthelloworld.1			-unknown-	obsolete
 ./usr/X11R7/man/man1/xrandr.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/xrdb.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man1/xrefresh.1				-unknown-	.man,xorg
--- a/distrib/sets/lists/xbase/shl.mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/xbase/shl.mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.74 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: shl.mi,v 1.75 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -191,8 +191,8 @@
 ./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
-./usr/X11R7/lib/liblbxutil.so			-obsolete		obsolete
-./usr/X11R7/lib/liblbxutil.so.2			-obsolete		obsolete
+./usr/X11R7/lib/liblbxutil.so			-unknown-		obsolete
+./usr/X11R7/lib/liblbxutil.so.2			-unknown-		obsolete
 ./usr/X11R7/lib/liblbxutil.so.2.0		-obsolete-		obsolete
 ./usr/X11R7/lib/libpciaccess.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libpciaccess.so.0		-unknown-		xorg,compatx11file
--- a/distrib/sets/lists/xcomp/mi	Thu Jan 05 12:35:41 2017 +0000
+++ b/distrib/sets/lists/xcomp/mi	Thu Jan 05 13:45:50 2017 +0000
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.188 2017/01/05 02:22:19 christos Exp $
+#	 $NetBSD: mi,v 1.189 2017/01/05 13:45:51 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -122,8 +122,8 @@
 ./usr/X11R7/include/X11/Xaw/PannerP.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xaw/Porthole.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xaw/PortholeP.h			-unknown-	xorg
-./usr/X11R7/include/X11/Xaw/Print.h			-obsoltete-	obsolete
-./usr/X11R7/include/X11/Xaw/PrintSP.h			-obsolete-	obsolete
+./usr/X11R7/include/X11/Xaw/Print.h			-unknown-	obsolete
+./usr/X11R7/include/X11/Xaw/PrintSP.h			-unknown-	obsolete
 ./usr/X11R7/include/X11/Xaw/Repeater.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xaw/RepeaterP.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xaw/Reports.h			-unknown-	xorg
@@ -204,8 +204,8 @@
 ./usr/X11R7/include/X11/Xos_r.h				-unknown-	xorg
 ./usr/X11R7/include/X11/Xosdefs.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xpoll.h				-unknown-	xorg
-./usr/X11R7/include/X11/XprintAppUtil/xpapputil.h	-obsolete-	obsolete
-./usr/X11R7/include/X11/XprintUtil/xprintutil.h		-obsolete-	obsolete
+./usr/X11R7/include/X11/XprintAppUtil/xpapputil.h	-unknown-	obsolete
+./usr/X11R7/include/X11/XprintUtil/xprintutil.h		-unknown-	obsolete
 ./usr/X11R7/include/X11/Xproto.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xprotostr.h			-unknown-	xorg
 ./usr/X11R7/include/X11/Xregion.h			-unknown-	xorg
@@ -214,12 +214,12 @@
 ./usr/X11R7/include/X11/Xtos.h				-unknown-	xorg
 ./usr/X11R7/include/X11/Xtrans/Xtrans.c			-unknown-	xorg
 ./usr/X11R7/include/X11/Xtrans/Xtrans.h			-unknown-	xorg
-./usr/X11R7/include/X11/Xtrans/Xtransdnet.c		-obsolete-	obsolete
+./usr/X11R7/include/X11/Xtrans/Xtransdnet.c		-unknown-	obsolete
 ./usr/X11R7/include/X11/Xtrans/Xtransint.h		-unknown-	xorg
 ./usr/X11R7/include/X11/Xtrans/Xtranslcl.c		-unknown-	xorg
-./usr/X11R7/include/X11/Xtrans/Xtransos2.c		-obsolete-	obsolete
+./usr/X11R7/include/X11/Xtrans/Xtransos2.c		-unknown-	obsolete
 ./usr/X11R7/include/X11/Xtrans/Xtranssock.c		-unknown-	xorg
-./usr/X11R7/include/X11/Xtrans/Xtranstli.c		-obsolete-	obsolete
+./usr/X11R7/include/X11/Xtrans/Xtranstli.c		-unknown-	obsolete
 ./usr/X11R7/include/X11/Xtrans/Xtransutil.c		-unknown-	xorg
 ./usr/X11R7/include/X11/Xtrans/transport.c		-unknown-	xorg
 ./usr/X11R7/include/X11/Xutil.h				-unknown-	xorg
@@ -335,8 +335,8 @@
 ./usr/X11R7/include/X11/extensions/EVI.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/EVIproto.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/MITMisc.h		-unknown-	xorg
-./usr/X11R7/include/X11/extensions/Print.h		-obsolete-	obsolete
-./usr/X11R7/include/X11/extensions/Printstr.h		-obsolete-	obsolete
+./usr/X11R7/include/X11/extensions/Print.h		-unknown-	obsolete
+./usr/X11R7/include/X11/extensions/Printstr.h		-unknown-	obsolete
 ./usr/X11R7/include/X11/extensions/XEVI.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/XEVIstr.h		-unknown-	obsolete
 ./usr/X11R7/include/X11/extensions/XI.h			-unknown-	xorg
@@ -507,7 +507,7 @@
 ./usr/X11R7/include/X11/fonts/fontenc.h			-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/fontencc.h		-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/fontmisc.h		-unknown-	xorg
-./usr/X11R7/include/X11/fonts/fontmod.h			-obsolete-	obsolete
+./usr/X11R7/include/X11/fonts/fontmod.h			-unknown-	obsolete
 ./usr/X11R7/include/X11/fonts/fontproto.h		-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/fontshow.h		-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/fontstruct.h		-unknown-	xorg
@@ -521,7 +521,7 @@
 ./usr/X11R7/include/X11/keysymdef.h			-unknown-	xorg
 ./usr/X11R7/include/X11/xf86drm.h			-unknown-	obsolete
 ./usr/X11R7/include/X11/xf86drmMode.h			-unknown-	obsolete
-./usr/X11R7/include/X11/xf86mm.h			-obsolete-	obsolete
+./usr/X11R7/include/X11/xf86mm.h			-unknown-	obsolete
 ./usr/X11R7/include/X11/xpm.h				-unknown-	xorg
 ./usr/X11R7/include/X11/xshmfence.h			-unknown-	xorg
 ./usr/X11R7/include/drm/drm.h				-unknown-	obsolete
@@ -1116,8 +1116,8 @@
 ./usr/X11R7/lib/libXaw.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXaw7.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXaw7_p.a				-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libXaw8.a				-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/libXaw8_p.a				-obsolete-	obsolete,compatx11file
+./usr/X11R7/lib/libXaw8.a				-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/libXaw8_p.a				-unknown-	obsolete,compatx11file
 ./usr/X11R7/lib/libXaw_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXcomposite.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXcomposite_p.a			-unknown-	profile,xorg,compatx11file
@@ -1149,22 +1149,22 @@
 ./usr/X11R7/lib/libXmu_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXmuu.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXmuu_p.a				-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libXp.a					-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/libXp_p.a				-obsolete-	obsolete,compatx11file
+./usr/X11R7/lib/libXp.a					-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/libXp_p.a				-unknown-	obsolete,compatx11file
 ./usr/X11R7/lib/libXpm.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXpm_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXpresent.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXpresent_p.a				-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libXprintAppUtil.a			-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/libXprintAppUtil_p.a			-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/libXprintUtil.a				-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/libXprintUtil_p.a			-obsolete-	obsolete,compatx11file
+./usr/X11R7/lib/libXprintAppUtil.a			-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/libXprintAppUtil_p.a			-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/libXprintUtil.a				-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/libXprintUtil_p.a			-unknown-	obsolete,compatx11file
 ./usr/X11R7/lib/libXrandr.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXrandr_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXrender.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXrender_p.a				-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libXres.a				-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/libXres_p.a				-obsolete-	obsolete,compatx11file
+./usr/X11R7/lib/libXres.a				-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/libXres_p.a				-unknown-	obsolete,compatx11file
 ./usr/X11R7/lib/libXss.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXss_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXt.a					-unknown-	xorg,compatx11file
@@ -1203,20 +1203,20 @@
 ./usr/X11R7/lib/libglapi_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libglut.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libglut_p.a				-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/liblbxutil.a				-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/liblbxutil_p.a				-obsolete-	obsolete,compatx11file
-./usr/X11R7/lib/liblisp.a				-obsolete-	obsolete
-./usr/X11R7/lib/liblisp_p.a				-obsolete-	obsolete
-./usr/X11R7/lib/libmp.a					-obsolete-	obsolete
-./usr/X11R7/lib/libmp_p.a				-obsolete-	obsolete
+./usr/X11R7/lib/liblbxutil.a				-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/liblbxutil_p.a				-unknown-	obsolete,compatx11file
+./usr/X11R7/lib/liblisp.a				-unknown-	obsolete
+./usr/X11R7/lib/liblisp_p.a				-unknown-	obsolete
+./usr/X11R7/lib/libmp.a					-unknown-	obsolete
+./usr/X11R7/lib/libmp_p.a				-unknown-	obsolete
 ./usr/X11R7/lib/libpciaccess.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libpciaccess_p.a			-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libpixman-1_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libpthread-stubs.a			-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libpthread-stubs_p.a			-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libre.a					-obsolete-	obsolete
-./usr/X11R7/lib/libre_p.a				-obsolete-	obsolete
+./usr/X11R7/lib/libre.a					-unknown-	obsolete
+./usr/X11R7/lib/libre_p.a				-unknown-	obsolete
 ./usr/X11R7/lib/libxcb-atom.a				-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libxcb-atom_p.a				-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libxcb-aux.a				-unknown-	xorg,compatx11file
@@ -1313,14 +1313,14 @@
 ./usr/X11R7/lib/pkgconfig/ice.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/inputproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/kbproto.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/lbxutil.pc			-obsolete-	obsolete
+./usr/X11R7/lib/pkgconfig/lbxutil.pc			-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/libdrm.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/libdrm_radeon.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/libfs.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/pciaccess.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/pixman-1.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/presentproto.pc		-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/printproto.pc			-obsolete-	obsolete
+./usr/X11R7/lib/pkgconfig/printproto.pc			-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/pthread-stubs.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/randrproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/recordproto.pc		-unknown-	xorg
@@ -1335,7 +1335,7 @@
 ./usr/X11R7/lib/pkgconfig/xau.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xaw6.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xaw7.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/xaw8.pc			-obsolete-	obsolete
+./usr/X11R7/lib/pkgconfig/xaw8.pc			-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/xbitmaps.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xcb-atom.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xcb-aux.pc			-unknown-	xorg
@@ -1398,11 +1398,11 @@
 ./usr/X11R7/lib/pkgconfig/xmuu.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xorg-mouse.pc			-unknown-	xorg,xorg_server
 ./usr/X11R7/lib/pkgconfig/xorg-server.pc		-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/xp.pc				-obsolete-	obsolete
+./usr/X11R7/lib/pkgconfig/xp.pc				-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/xpm.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xpresent.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/xprintapputil.pc		-obsolete-	obsolete
-./usr/X11R7/lib/pkgconfig/xprintutil.pc			-obsolete-	obsolete
+./usr/X11R7/lib/pkgconfig/xprintapputil.pc		-unknown-	obsolete
+./usr/X11R7/lib/pkgconfig/xprintutil.pc			-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/xproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xproxymngproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xrandr.pc			-unknown-	xorg
@@ -2000,39 +2000,39 @@
 ./usr/X11R7/man/cat3/XmbufGetVersion.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XmbufGetWindowAttributes.0		-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XmbufQueryExtension.0		-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/XpCancelDoc.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpCancelJob.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpCancelPage.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpCreateContext.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpDestroyContext.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpEndDoc.0				-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpEndJob.0				-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpEndPage.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpFreePrinterList.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetAttributes.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetContext.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetDocumentData.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetImageResolution.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetLocaleHinter.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetOneAttribute.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetPageDimensions.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetPdmStartParams.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetPrinterList.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpGetScreenOfContext.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpInputSelected.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpPutDocumentData.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpQueryExtension.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpQueryScreens.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpQueryVersion.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpRehashPrinterList.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpSelectInput.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpSetAttributes.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpSetContext.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpSetImageResolution.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpSetLocaleHinter.0		-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpStartDoc.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpStartJob.0			-obsolete-	obsolete
-./usr/X11R7/man/cat3/XpStartPage.0			-obsolete-	obsolete
+./usr/X11R7/man/cat3/XpCancelDoc.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpCancelJob.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpCancelPage.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpCreateContext.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpDestroyContext.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpEndDoc.0				-unknown-	obsolete
+./usr/X11R7/man/cat3/XpEndJob.0				-unknown-	obsolete
+./usr/X11R7/man/cat3/XpEndPage.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpFreePrinterList.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetAttributes.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetContext.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetDocumentData.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetImageResolution.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetLocaleHinter.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetOneAttribute.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetPageDimensions.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetPdmStartParams.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetPrinterList.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpGetScreenOfContext.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpInputSelected.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpPutDocumentData.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpQueryExtension.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpQueryScreens.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpQueryVersion.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpRehashPrinterList.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpSelectInput.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpSetAttributes.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpSetContext.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpSetImageResolution.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpSetLocaleHinter.0		-unknown-	obsolete
+./usr/X11R7/man/cat3/XpStartDoc.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpStartJob.0			-unknown-	obsolete
+./usr/X11R7/man/cat3/XpStartPage.0			-unknown-	obsolete
 ./usr/X11R7/man/cat3/Xpresent.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/Xrandr.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XrmEnumerateDatabase.0		-unknown-	.cat,xorg
@@ -2329,7 +2329,7 @@
 ./usr/X11R7/man/cat3/XvStopVideo.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XvUngrabPort.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XvVideoNotify.0			-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/libXp.0				-obsolete-	obsolete
+./usr/X11R7/man/cat3/libXp.0				-unknown-	obsolete
 ./usr/X11R7/man/html1/mergelib.html			-unknown-	html,xorg
 ./usr/X11R7/man/html1/xft-config.html			-unknown-	obsolete
 ./usr/X11R7/man/html3/AllPlanes.html			-unknown-	html,xorg
@@ -2911,39 +2911,39 @@
 ./usr/X11R7/man/html3/XmbufGetVersion.html		-unknown-	html,xorg
 ./usr/X11R7/man/html3/XmbufGetWindowAttributes.html	-unknown-	html,xorg
 ./usr/X11R7/man/html3/XmbufQueryExtension.html		-unknown-	html,xorg
-./usr/X11R7/man/html3/XpCancelDoc.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpCancelJob.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpCancelPage.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpCreateContext.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpDestroyContext.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpEndDoc.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpEndJob.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpEndPage.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpFreePrinterList.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetAttributes.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetContext.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetDocumentData.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetImageResolution.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetLocaleHinter.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetOneAttribute.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetPageDimensions.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetPdmStartParams.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetPrinterList.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpGetScreenOfContext.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpInputSelected.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpPutDocumentData.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpQueryExtension.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpQueryScreens.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpQueryVersion.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpRehashPrinterList.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpSelectInput.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpSetAttributes.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpSetContext.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpSetImageResolution.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpSetLocaleHinter.html		-obsolete-	obsolete
-./usr/X11R7/man/html3/XpStartDoc.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpStartJob.html			-obsolete-	obsolete
-./usr/X11R7/man/html3/XpStartPage.html			-obsolete-	obsolete
+./usr/X11R7/man/html3/XpCancelDoc.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpCancelJob.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpCancelPage.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpCreateContext.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpDestroyContext.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpEndDoc.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpEndJob.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpEndPage.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpFreePrinterList.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetAttributes.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetContext.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetDocumentData.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetImageResolution.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetLocaleHinter.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetOneAttribute.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetPageDimensions.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetPdmStartParams.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetPrinterList.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpGetScreenOfContext.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpInputSelected.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpPutDocumentData.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpQueryExtension.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpQueryScreens.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpQueryVersion.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpRehashPrinterList.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpSelectInput.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpSetAttributes.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpSetContext.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpSetImageResolution.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpSetLocaleHinter.html		-unknown-	obsolete
+./usr/X11R7/man/html3/XpStartDoc.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpStartJob.html			-unknown-	obsolete
+./usr/X11R7/man/html3/XpStartPage.html			-unknown-	obsolete
 ./usr/X11R7/man/html3/Xpresent.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/Xrandr.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/XrmEnumerateDatabase.html		-unknown-	html,xorg
@@ -3240,7 +3240,7 @@
 ./usr/X11R7/man/html3/XvStopVideo.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/XvUngrabPort.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/XvVideoNotify.html		-unknown-	html,xorg
-./usr/X11R7/man/html3/libXp.html			-obsolete-	obsolete
+./usr/X11R7/man/html3/libXp.html			-unknown-	obsolete
 ./usr/X11R7/man/man1/xft-config.1			-unknown-	obsolete
 ./usr/X11R7/man/man3/AllPlanes.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/BlackPixelOfScreen.3		-unknown-	.man,xorg
@@ -3821,39 +3821,39 @@
 ./usr/X11R7/man/man3/XmbufGetVersion.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XmbufGetWindowAttributes.3		-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XmbufQueryExtension.3		-unknown-	.man,xorg
-./usr/X11R7/man/man3/XpCancelDoc.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpCancelJob.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpCancelPage.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpCreateContext.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpDestroyContext.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpEndDoc.3				-obsolete-	obsolete
-./usr/X11R7/man/man3/XpEndJob.3				-obsolete-	obsolete
-./usr/X11R7/man/man3/XpEndPage.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpFreePrinterList.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetAttributes.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetContext.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetDocumentData.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetImageResolution.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetLocaleHinter.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetOneAttribute.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetPageDimensions.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetPdmStartParams.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetPrinterList.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpGetScreenOfContext.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpInputSelected.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpPutDocumentData.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpQueryExtension.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpQueryScreens.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpQueryVersion.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpRehashPrinterList.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpSelectInput.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpSetAttributes.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpSetContext.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpSetImageResolution.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpSetLocaleHinter.3		-obsolete-	obsolete
-./usr/X11R7/man/man3/XpStartDoc.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpStartJob.3			-obsolete-	obsolete
-./usr/X11R7/man/man3/XpStartPage.3			-obsolete-	obsolete
+./usr/X11R7/man/man3/XpCancelDoc.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpCancelJob.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpCancelPage.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpCreateContext.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpDestroyContext.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpEndDoc.3				-unknown-	obsolete
+./usr/X11R7/man/man3/XpEndJob.3				-unknown-	obsolete
+./usr/X11R7/man/man3/XpEndPage.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpFreePrinterList.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetAttributes.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetContext.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetDocumentData.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetImageResolution.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetLocaleHinter.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetOneAttribute.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetPageDimensions.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetPdmStartParams.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetPrinterList.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpGetScreenOfContext.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpInputSelected.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpPutDocumentData.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpQueryExtension.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpQueryScreens.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpQueryVersion.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpRehashPrinterList.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpSelectInput.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpSetAttributes.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpSetContext.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpSetImageResolution.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpSetLocaleHinter.3		-unknown-	obsolete
+./usr/X11R7/man/man3/XpStartDoc.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpStartJob.3			-unknown-	obsolete
+./usr/X11R7/man/man3/XpStartPage.3			-unknown-	obsolete
 ./usr/X11R7/man/man3/Xpresent.3				-unknown-	.man,xorg
 ./usr/X11R7/man/man3/Xrandr.3				-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XrmEnumerateDatabase.3		-unknown-	.man,xorg
@@ -4150,7 +4150,7 @@
 ./usr/X11R7/man/man3/XvStopVideo.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XvUngrabPort.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XvVideoNotify.3			-unknown-	.man,xorg
-./usr/X11R7/man/man3/libXp.3				-obsolete-	obsolete
+./usr/X11R7/man/man3/libXp.3				-unknown-	obsolete
 ./usr/X11R7/share/aclocal/xtrans.m4			-unknown-	xorg
 ./usr/X11R7/share/xcb/bigreq.xml			-unknown-	xorg
 ./usr/X11R7/share/xcb/composite.xml			-unknown-	xorg
@@ -4195,7 +4195,7 @@
 ./usr/libdata/lint/llib-lXTrap.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXau.ln				-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXaw7.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lXaw8.ln			-obsolete-	obsolete
+./usr/libdata/lint/llib-lXaw8.ln			-unknown-	obsolete
 ./usr/libdata/lint/llib-lXcomposite.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXcursor.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXdamage.ln			-unknown-	lint,xorg
@@ -4211,11 +4211,11 @@
 ./usr/libdata/lint/llib-lXinerama.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXmu.ln				-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXmuu.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lXp.ln				-obsolete-	obsolete,xorg
+./usr/libdata/lint/llib-lXp.ln				-unknown-	obsolete,xorg
 ./usr/libdata/lint/llib-lXpm.ln				-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXpresent.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-lXprintAppUtil.ln		-obsolete-	obsolete
-./usr/libdata/lint/llib-lXprintUtil.ln			-obsolete-	obsolete
+./usr/libdata/lint/llib-lXprintAppUtil.ln		-unknown-	obsolete
+./usr/libdata/lint/llib-lXprintUtil.ln			-unknown-	obsolete
 ./usr/libdata/lint/llib-lXrandr.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXrender.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lXres.ln			comp-obsolete	obsolete
@@ -4236,13 +4236,13 @@
 ./usr/libdata/lint/llib-lfreetype.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lgbm.ln				-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lglut.ln			-unknown-	lint,xorg
-./usr/libdata/lint/llib-llbxutil.ln			-obsolete-	obsolete,xorg
-./usr/libdata/lint/llib-llisp.ln			-obsolete-	obsolete
-./usr/libdata/lint/llib-lmp.ln				-obsolete-	obsolete
+./usr/libdata/lint/llib-llbxutil.ln			-unknown-	obsolete,xorg
+./usr/libdata/lint/llib-llisp.ln			-unknown-	obsolete
+./usr/libdata/lint/llib-lmp.ln				-unknown-	obsolete
 ./usr/libdata/lint/llib-lpciaccess.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lpthread-stubs.ln		-unknown-	lint,xorg
-./usr/libdata/lint/llib-lre.ln				-obsolete-	obsolete
-./usr/libdata/lint/llib-lxcb-composite.ln		-obsolete-	obsolete
+./usr/libdata/lint/llib-lre.ln				-unknown-	obsolete
+./usr/libdata/lint/llib-lxcb-composite.ln		-unknown-	obsolete
 ./usr/libdata/lint/llib-lxcb-damage.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lxcb-dpms.ln			-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lxcb-dri2.ln			-unknown-	lint,xorg