Sort entries in strcmp order. trunk
authorjoerg <joerg@NetBSD.org>
Sun, 11 Aug 2013 22:29:02 +0000
branchtrunk
changeset 220365 23e7b8f93c28
parent 220364 0d43905c2209
child 220366 8235b4c7b364
Sort entries in strcmp order.
distrib/sets/lists/base/ad.arm
distrib/sets/lists/base/ad.mips
distrib/sets/lists/base/md.amd64
distrib/sets/lists/base/md.bebox
distrib/sets/lists/base/md.cobalt
distrib/sets/lists/base/md.ews4800mips
distrib/sets/lists/base/md.macppc
distrib/sets/lists/base/md.mmeye
distrib/sets/lists/base/md.ofppc
distrib/sets/lists/base/md.prep
distrib/sets/lists/base/md.sparc
distrib/sets/lists/base/md.sparc64
distrib/sets/lists/base/md.sun2
distrib/sets/lists/base/md.x68k
distrib/sets/lists/base/mi
distrib/sets/lists/base/rescue.mi
distrib/sets/lists/base/shl.mi
distrib/sets/lists/comp/ad.arm
distrib/sets/lists/comp/ad.m68k
distrib/sets/lists/comp/ad.mips
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.amigappc
distrib/sets/lists/comp/md.emips
distrib/sets/lists/comp/md.evbcf
distrib/sets/lists/comp/md.ews4800mips
distrib/sets/lists/comp/md.i386
distrib/sets/lists/comp/md.landisk
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/ad.m68k
distrib/sets/lists/debug/ad.mips
distrib/sets/lists/debug/md.amd64
distrib/sets/lists/debug/md.i386
distrib/sets/lists/debug/md.sparc64
distrib/sets/lists/debug/mi
distrib/sets/lists/debug/shl.mi
distrib/sets/lists/etc/mi
distrib/sets/lists/man/mi
distrib/sets/lists/misc/mi
distrib/sets/lists/modules/ad.arm
distrib/sets/lists/modules/md.amd64
distrib/sets/lists/modules/md.evbppc
distrib/sets/lists/modules/md.i386
distrib/sets/lists/modules/mi
distrib/sets/lists/tests/mi
distrib/sets/lists/tests/shl.mi
distrib/sets/lists/xbase/md.amd64
distrib/sets/lists/xbase/md.i386
distrib/sets/lists/xbase/mi
distrib/sets/lists/xbase/shl.mi
distrib/sets/lists/xcomp/md.amd64
distrib/sets/lists/xcomp/md.i386
distrib/sets/lists/xcomp/mi
distrib/sets/lists/xcomp/shl.mi
distrib/sets/lists/xdebug/md.alpha
distrib/sets/lists/xdebug/md.bebox
distrib/sets/lists/xdebug/md.dreamcast
distrib/sets/lists/xdebug/md.ews4800mips
distrib/sets/lists/xdebug/md.hp300
distrib/sets/lists/xdebug/md.hpcarm
distrib/sets/lists/xdebug/md.hpcmips
distrib/sets/lists/xdebug/md.hpcsh
distrib/sets/lists/xdebug/md.luna68k
distrib/sets/lists/xdebug/md.netwinder
distrib/sets/lists/xdebug/md.newsmips
distrib/sets/lists/xdebug/md.prep
distrib/sets/lists/xdebug/md.zaurus
distrib/sets/lists/xdebug/mi
distrib/sets/lists/xdebug/shl.mi
distrib/sets/lists/xetc/mi
distrib/sets/lists/xserver/md.alpha
distrib/sets/lists/xserver/md.amd64
distrib/sets/lists/xserver/md.bebox
distrib/sets/lists/xserver/md.cats
distrib/sets/lists/xserver/md.dreamcast
distrib/sets/lists/xserver/md.evbarm
distrib/sets/lists/xserver/md.evbmips
distrib/sets/lists/xserver/md.ews4800mips
distrib/sets/lists/xserver/md.hp300
distrib/sets/lists/xserver/md.hpcarm
distrib/sets/lists/xserver/md.hpcmips
distrib/sets/lists/xserver/md.hpcsh
distrib/sets/lists/xserver/md.i386
distrib/sets/lists/xserver/md.luna68k
distrib/sets/lists/xserver/md.macppc
distrib/sets/lists/xserver/md.netwinder
distrib/sets/lists/xserver/md.newsmips
distrib/sets/lists/xserver/md.ofppc
distrib/sets/lists/xserver/md.prep
distrib/sets/lists/xserver/md.sgimips
distrib/sets/lists/xserver/md.shark
distrib/sets/lists/xserver/md.sparc
distrib/sets/lists/xserver/md.sparc64
distrib/sets/lists/xserver/md.vax
distrib/sets/lists/xserver/md.zaurus
--- a/distrib/sets/lists/base/ad.arm	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/ad.arm	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: ad.arm,v 1.18 2013/07/28 14:02:56 pgoyette Exp $
-./sbin/ldconfig					base-sysutil-root	pic,endian=1234
+# $NetBSD: ad.arm,v 1.19 2013/08/11 22:29:02 joerg Exp $
 ./lib/oabi					base-compat-shlib	compat
 ./lib/oabi/npf					base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -12,27 +11,15 @@
 ./lib/oabi/npf/ext_rndblock.so.0		base-npf-shlib		compat,pic
 ./lib/oabi/npf/ext_rndblock.so.0.0		base-npf-shlib		compat,pic
 ./libexec/ld.elf_so-oabi			base-sysutil-bin	compat,pic
+./sbin/ldconfig					base-sysutil-root	pic,endian=1234
 ./usr/bin/fdformat				base-util-bin
-./usr/sbin/apm					base-sysutil-bin
-./usr/sbin/apmd					base-sysutil-bin
-./usr/sbin/elftosb				base-sysutil-bin	endian=1234
-./usr/sbin/eeprom				base-sysutil-bin
-./usr/sbin/ofctl				base-sysutil-bin
-./usr/sbin/sbtool				base-sysutil-bin	endian=1234
-./usr/sbin/sbkeygen				base-sysutil-bin	endian=1234
-./usr/sbin/tpctl				base-sysutil-bin
-./usr/sbin/zzz					base-sysutil-bin
 ./usr/lib/libarm.so				base-sys-shlib		pic
 ./usr/lib/libarm.so.0				base-sys-shlib		pic
 ./usr/lib/libarm.so.0.0				base-sys-shlib		pic
 ./usr/lib/libpmc.so				base-sys-shlib		pic
 ./usr/lib/libpmc.so.1				base-sys-shlib		pic
 ./usr/lib/libpmc.so.1.0				base-sys-shlib		pic
-./usr/libexec/ld.so				base-sys-shlib		pic,endian=1234
-./usr/libexec/ld.elf_so-oabi			base-sysutil-bin	compat,pic
 ./usr/lib/oabi					base-compat-lib		compat,eabi
-./usr/lib/oabi/libarm.so.0			base-sys-shlib		compat,pic
-./usr/lib/oabi/libarm.so.0.0			base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n				base-compat-lib		compat,eabi
 ./usr/lib/oabi/i18n/libBIG5.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/oabi/i18n/libBIG5.so.5.0		base-i18n-shlib		compat,pic
@@ -84,12 +71,14 @@
 ./usr/lib/oabi/libamu.so.4.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libarchive.so.3			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libarchive.so.3.1		base-compat-shlib	compat,pic
+./usr/lib/oabi/libarm.so.0			base-sys-shlib		compat,pic
+./usr/lib/oabi/libarm.so.0.0			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libasn1.so.9			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/oabi/libasn1.so.9.0			base-compat-shlib	compat,pic,kerberos
+./usr/lib/oabi/libatf-c++.so.0			base-compat-shlib	compat,pic,atf
+./usr/lib/oabi/libatf-c++.so.0.0		base-compat-shlib	compat,pic,atf
 ./usr/lib/oabi/libatf-c.so.0			base-compat-shlib	compat,pic,atf
 ./usr/lib/oabi/libatf-c.so.0.0			base-compat-shlib	compat,pic,atf
-./usr/lib/oabi/libatf-c++.so.0			base-compat-shlib	compat,pic,atf
-./usr/lib/oabi/libatf-c++.so.0.0		base-compat-shlib	compat,pic,atf
 ./usr/lib/oabi/libbfd.so.12			base-compat-shlib	compat,pic,binutils
 ./usr/lib/oabi/libbfd.so.12.0			base-compat-shlib	compat,pic,binutils
 ./usr/lib/oabi/libbind9.so.7			base-compat-shlib	compat,pic
@@ -98,16 +87,14 @@
 ./usr/lib/oabi/libbluetooth.so.4.2		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libbsdmalloc.so.0		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libbsdmalloc.so.0.0		base-compat-shlib	compat,pic
-./usr/lib/oabi/libexecinfo.so.0			base-compat-shlib	compat,pic
-./usr/lib/oabi/libexecinfo.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libbz2.so.1			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libbz2.so.1.1			base-compat-shlib	compat,pic
+./usr/lib/oabi/libc++.so.1			base-compat-shlib	compat,pic,libcxx
+./usr/lib/oabi/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libc.so.12			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc.so.12.185			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc_vfp.so.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libc_vfp.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/oabi/libc++.so.1			base-compat-shlib	compat,pic,libcxx
-./usr/lib/oabi/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/oabi/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/oabi/libcom_err.so.7.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/oabi/libcrypt.so.1			base-compat-shlib	compat,pic
@@ -144,6 +131,8 @@
 ./usr/lib/oabi/libevent_openssl.so.4.0		base-compat-shlib	compat,pic,crypto
 ./usr/lib/oabi/libevent_pthreads.so.4		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libevent_pthreads.so.4.0		base-compat-shlib	compat,pic
+./usr/lib/oabi/libexecinfo.so.0			base-compat-shlib	compat,pic
+./usr/lib/oabi/libexecinfo.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libexpat.so.2			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libexpat.so.2.1			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libfetch.so.3			base-compat-shlib	compat,pic
@@ -241,13 +230,13 @@
 ./usr/lib/oabi/libpcap.so.5			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libpcap.so.5.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libpci.so.2			base-compat-shlib	compat,pic
+./usr/lib/oabi/libpci.so.2			base-compat-shlib	compat,pic
+./usr/lib/oabi/libpci.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libpci.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libperfuse.so.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libperfuse.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libpmc.so.1			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libpmc.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/oabi/libpci.so.2			base-compat-shlib	compat,pic
-./usr/lib/oabi/libpci.so.2.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libposix.so.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libposix.so.0.1			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libppath.so.0			base-compat-shlib	compat,pic
@@ -368,13 +357,15 @@
 ./usr/lib/oabi/security/pam_skey.so.4		base-compat-shlib	compat,pic,skey,pam
 ./usr/lib/oabi/security/pam_ssh.so.4		base-compat-shlib	compat,pic,crypto,pam
 ./usr/lib/oabi/security/pam_unix.so.4		base-compat-shlib	compat,pic,pam
+./usr/libexec/ld.elf_so-oabi			base-sysutil-bin	compat,pic
+./usr/libexec/ld.so				base-sys-shlib		pic,endian=1234
 ./usr/mdec/BBBB					base-obsolete		obsolete
 ./usr/mdec/boot26				base-sysutil-bin	endian=1234,!eabi
 ./usr/mdec/boot26,ffa				base-sysutil-bin	endian=1234,!eabi
 ./usr/mdec/boot32				base-sysutil-bin	endian=1234,!eabi
 ./usr/mdec/boot32,ffa				base-sysutil-bin	endian=1234,!eabi
-./usr/mdec/nbfs					base-sysutil-bin	endian=1234,!eabi
-./usr/mdec/nbfs,ffa				base-sysutil-bin	endian=1234,!eabi
+./usr/mdec/bootimx23				base-sysutil-bin	endian=1234
+./usr/mdec/bootmini2440				base-sysutil-bin
 ./usr/mdec/gzboot_ADI_BRH_0x00140000.bin	base-sysutil-bin
 ./usr/mdec/gzboot_GEMINI_0x01600000.bin		base-sysutil-bin	endian=1234
 ./usr/mdec/gzboot_IQ80310_0x00080000.bin	base-sysutil-bin	endian=1234
@@ -383,7 +374,16 @@
 ./usr/mdec/gzboot_SMDK2800_0x00000000.bin	base-sysutil-bin	endian=1234
 ./usr/mdec/gzboot_SMDK2800_0x00100000.bin	base-sysutil-bin	endian=1234
 ./usr/mdec/gzboot_TS7200_0x60660000.bin		base-sysutil-bin	endian=1234
-./usr/mdec/bootmini2440				base-sysutil-bin
-./usr/mdec/bootimx23				base-sysutil-bin	endian=1234
+./usr/mdec/nbfs					base-sysutil-bin	endian=1234,!eabi
+./usr/mdec/nbfs,ffa				base-sysutil-bin	endian=1234,!eabi
 ./usr/mdec/zboot				base-sysutil-bin	endian=1234
 ./usr/mdec/zbsdmod.o				base-sysutil-bin	endian=1234
+./usr/sbin/apm					base-sysutil-bin
+./usr/sbin/apmd					base-sysutil-bin
+./usr/sbin/eeprom				base-sysutil-bin
+./usr/sbin/elftosb				base-sysutil-bin	endian=1234
+./usr/sbin/ofctl				base-sysutil-bin
+./usr/sbin/sbkeygen				base-sysutil-bin	endian=1234
+./usr/sbin/sbtool				base-sysutil-bin	endian=1234
+./usr/sbin/tpctl				base-sysutil-bin
+./usr/sbin/zzz					base-sysutil-bin
--- a/distrib/sets/lists/base/ad.mips	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/ad.mips	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.13 2013/07/28 20:25:34 pgoyette Exp $
+# $NetBSD: ad.mips,v 1.14 2013/08/11 22:29:02 joerg Exp $
 ./lib/64					base-compat-shlib	compat,arch64
 ./lib/64/npf					base-npf-shlib		compat,arch64
 ./lib/64/npf/ext_log.so				base-npf-shlib		compat,pic,arch64
@@ -77,10 +77,10 @@
 ./usr/lib/64/libarchive.so.3.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libasn1.so.9			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/64/libasn1.so.9.0			base-compat-shlib	compat,pic,kerberos,arch64
+./usr/lib/64/libatf-c++.so.0			base-compat-shlib	compat,pic,atf,arch64
+./usr/lib/64/libatf-c++.so.0.0			base-compat-shlib	compat,pic,atf,arch64
 ./usr/lib/64/libatf-c.so.0			base-compat-shlib	compat,pic,atf,arch64
 ./usr/lib/64/libatf-c.so.0.0			base-compat-shlib	compat,pic,atf,arch64
-./usr/lib/64/libatf-c++.so.0			base-compat-shlib	compat,pic,atf,arch64
-./usr/lib/64/libatf-c++.so.0.0			base-compat-shlib	compat,pic,atf,arch64
 ./usr/lib/64/libbfd.so.12			base-compat-shlib	compat,pic,binutils,arch64
 ./usr/lib/64/libbfd.so.12.0			base-compat-shlib	compat,pic,binutils,arch64
 ./usr/lib/64/libbind9.so.7			base-compat-shlib	compat,pic,arch64
@@ -91,10 +91,10 @@
 ./usr/lib/64/libbsdmalloc.so.0.0		base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libbz2.so.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libbz2.so.1.1			base-compat-shlib	compat,pic,arch64
+./usr/lib/64/libc++.so.1			base-compat-shlib	compat,pic,libcxx,arch64
+./usr/lib/64/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/64/libc.so.12				base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libc.so.12.185			base-compat-shlib	compat,pic,arch64
-./usr/lib/64/libc++.so.1			base-compat-shlib	compat,pic,libcxx,arch64
-./usr/lib/64/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/64/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/64/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/64/libcrypt.so.1			base-compat-shlib	compat,pic,arch64
@@ -131,6 +131,8 @@
 ./usr/lib/64/libevent_openssl.so.4.0		base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/64/libevent_pthreads.so.4		base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libevent_pthreads.so.4.0		base-compat-shlib	compat,pic,arch64
+./usr/lib/64/libexecinfo.so.0			base-compat-shlib	compat,pic,arch64
+./usr/lib/64/libexecinfo.so.0.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libexpat.so.2			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libexpat.so.2.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libfetch.so.3			base-compat-shlib	compat,pic,arch64
@@ -312,8 +314,6 @@
 ./usr/lib/64/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/64/libwrap.so.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libwrap.so.1.0			base-compat-shlib	compat,pic,arch64
-./usr/lib/64/libexecinfo.so.0			base-compat-shlib	compat,pic,arch64
-./usr/lib/64/libexecinfo.so.0.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libz.so.1				base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/libz.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/64/lua				base-compat-shlib	compat,arch64
@@ -407,10 +407,10 @@
 ./usr/lib/o32/libarchive.so.3.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libasn1.so.9			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/o32/libasn1.so.9.0			base-compat-shlib	compat,pic,kerberos,arch64
+./usr/lib/o32/libatf-c++.so.0			base-compat-shlib	compat,pic,atf,arch64
+./usr/lib/o32/libatf-c++.so.0.0			base-compat-shlib	compat,pic,atf,arch64
 ./usr/lib/o32/libatf-c.so.0			base-compat-shlib	compat,pic,atf,arch64
 ./usr/lib/o32/libatf-c.so.0.0			base-compat-shlib	compat,pic,atf,arch64
-./usr/lib/o32/libatf-c++.so.0			base-compat-shlib	compat,pic,atf,arch64
-./usr/lib/o32/libatf-c++.so.0.0			base-compat-shlib	compat,pic,atf,arch64
 ./usr/lib/o32/libbfd.so.12			base-compat-shlib	compat,pic,binutils,arch64
 ./usr/lib/o32/libbfd.so.12.0			base-compat-shlib	compat,pic,binutils,arch64
 ./usr/lib/o32/libbind9.so.7			base-compat-shlib	compat,pic,arch64
@@ -421,10 +421,10 @@
 ./usr/lib/o32/libbsdmalloc.so.0.0		base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libbz2.so.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libbz2.so.1.1			base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/libc++.so.1			base-compat-shlib	compat,pic,libcxx,arch64
+./usr/lib/o32/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/o32/libc.so.12			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libc.so.12.185			base-compat-shlib	compat,pic,arch64
-./usr/lib/o32/libc++.so.1			base-compat-shlib	compat,pic,libcxx,arch64
-./usr/lib/o32/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx,arch64
 ./usr/lib/o32/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/o32/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/o32/libcrypt.so.1			base-compat-shlib	compat,pic,arch64
@@ -455,6 +455,8 @@
 ./usr/lib/o32/libevent_openssl.so.4.0		base-compat-shlib	compat,pic,crypto,arch64
 ./usr/lib/o32/libevent_pthreads.so.4		base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libevent_pthreads.so.4.0		base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/libexecinfo.so.0			base-compat-shlib	compat,pic,arch64
+./usr/lib/o32/libexecinfo.so.0.0		base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libexpat.so.2			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libexpat.so.2.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libfetch.so.3			base-compat-shlib	compat,pic,arch64
@@ -636,8 +638,6 @@
 ./usr/lib/o32/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos,arch64
 ./usr/lib/o32/libwrap.so.1			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libwrap.so.1.0			base-compat-shlib	compat,pic,arch64
-./usr/lib/o32/libexecinfo.so.0			base-compat-shlib	compat,pic,arch64
-./usr/lib/o32/libexecinfo.so.0.0		base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libz.so.1				base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libz.so.1.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/lua				base-compat-shlib	compat,arch64
--- a/distrib/sets/lists/base/md.amd64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.amd64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.208 2013/07/28 14:02:56 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.209 2013/08/11 22:29:02 joerg Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./lib/i386					base-compat-shlib		compat
@@ -69,10 +69,10 @@
 ./usr/lib/i386/libarchive.so.3.1		base-compat-shlib	compat,pic
 ./usr/lib/i386/libasn1.so.9			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/i386/libasn1.so.9.0			base-compat-shlib	compat,pic,kerberos
+./usr/lib/i386/libatf-c++.so.0			base-compat-shlib	compat,pic,atf
+./usr/lib/i386/libatf-c++.so.0.0		base-compat-shlib	compat,pic,atf
 ./usr/lib/i386/libatf-c.so.0			base-compat-shlib	compat,pic,atf
 ./usr/lib/i386/libatf-c.so.0.0			base-compat-shlib	compat,pic,atf
-./usr/lib/i386/libatf-c++.so.0			base-compat-shlib	compat,pic,atf
-./usr/lib/i386/libatf-c++.so.0.0		base-compat-shlib	compat,pic,atf
 ./usr/lib/i386/libbfd.so.12			base-compat-shlib	compat,pic,binutils
 ./usr/lib/i386/libbfd.so.12.0			base-compat-shlib	compat,pic,binutils
 ./usr/lib/i386/libbind9.so.7			base-compat-shlib	compat,pic
@@ -83,10 +83,10 @@
 ./usr/lib/i386/libbsdmalloc.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/i386/libbz2.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libbz2.so.1.1			base-compat-shlib	compat,pic
+./usr/lib/i386/libc++.so.1			base-compat-shlib	compat,pic,libcxx
+./usr/lib/i386/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/i386/libc.so.12			base-compat-shlib	compat,pic
 ./usr/lib/i386/libc.so.12.185			base-compat-shlib	compat,pic
-./usr/lib/i386/libc++.so.1			base-compat-shlib	compat,pic,libcxx
-./usr/lib/i386/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/i386/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/i386/libcom_err.so.7.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/i386/libcrypt.so.1			base-compat-shlib	compat,pic
@@ -101,12 +101,6 @@
 ./usr/lib/i386/libcrypto_rc5.so.7.0		base-compat-shlib	compat,pic,crypto,crypto_rc5
 ./usr/lib/i386/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcurses.so.7.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libgmp.so.10			base-compat-shlib	obsolete
-./usr/lib/i386/libgmp.so.10.2			base-compat-shlib	obsolete
-./usr/lib/i386/libmpc.so.2			base-compat-shlib	obsolete
-./usr/lib/i386/libmpc.so.2.0			base-compat-shlib	obsolete
-./usr/lib/i386/libmpfr.so.4			base-compat-shlib	obsolete
-./usr/lib/i386/libmpfr.so.4.1			base-compat-shlib	obsolete
 ./usr/lib/i386/libdes.so.8			base-compat-shlib	compat,pic
 ./usr/lib/i386/libdes.so.8.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libdevmapper.so.1		base-compat-shlib	compat,pic,lvm
@@ -140,6 +134,8 @@
 ./usr/lib/i386/libform.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libgcc_s.so.1			base-compat-shlib	compat,pic,gcccmds
 ./usr/lib/i386/libgcc_s.so.1.0			base-compat-shlib	compat,pic,gcccmds
+./usr/lib/i386/libgmp.so.10			base-compat-shlib	obsolete
+./usr/lib/i386/libgmp.so.10.2			base-compat-shlib	obsolete
 ./usr/lib/i386/libgnumalloc.so.1		base-compat-shlib	compat,pic
 ./usr/lib/i386/libgnumalloc.so.1.0		base-compat-shlib	compat,pic
 ./usr/lib/i386/libgomp.so.1			base-compat-shlib	compat,pic,gcc=45
@@ -208,6 +204,10 @@
 ./usr/lib/i386/libmenu.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmj.so.1			base-compat-shlib	compat,pic,crypto
 ./usr/lib/i386/libmj.so.1.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/i386/libmpc.so.2			base-compat-shlib	obsolete
+./usr/lib/i386/libmpc.so.2.0			base-compat-shlib	obsolete
+./usr/lib/i386/libmpfr.so.4			base-compat-shlib	obsolete
+./usr/lib/i386/libmpfr.so.4.1			base-compat-shlib	obsolete
 ./usr/lib/i386/libnetpgp.so.3			base-compat-shlib	compat,pic
 ./usr/lib/i386/libnetpgp.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libnetpgpverify.so.4		base-compat-shlib	compat,pic
@@ -259,18 +259,18 @@
 ./usr/lib/i386/librt.so.1.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/librump.so.0			base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librump.so.0.0			base-compat-shlib	compat,pic,rump
+./usr/lib/i386/librumpclient.so.0			base-compat-shlib	compat,pic,rump
+./usr/lib/i386/librumpclient.so.0.0		base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpcrypto.so.0		base-obsolete		obsolete,rump
 ./usr/lib/i386/librumpcrypto.so.0.0		base-obsolete		obsolete,rump
-./usr/lib/i386/librumpclient.so.0			base-compat-shlib	compat,pic,rump
-./usr/lib/i386/librumpclient.so.0.0		base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpdev.so.0			base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpdev.so.0.0		base-compat-shlib	compat,pic,rump
+./usr/lib/i386/librumphijack.so.0			base-compat-shlib	compat,pic,rump
+./usr/lib/i386/librumphijack.so.0.0		base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpnet.so.0			base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpnet.so.0.0		base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpuser.so.0			base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpuser.so.0.1		base-compat-shlib	compat,pic,rump
-./usr/lib/i386/librumphijack.so.0			base-compat-shlib	compat,pic,rump
-./usr/lib/i386/librumphijack.so.0.0		base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpvfs.so.0			base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/librumpvfs.so.0.0		base-compat-shlib	compat,pic,rump
 ./usr/lib/i386/libsaslc.so.0			base-compat-shlib	compat,pic,crypto
--- a/distrib/sets/lists/base/md.bebox	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.bebox	Sun Aug 11 22:29:02 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: md.bebox,v 1.19 2009/02/14 22:46:05 abs Exp $
+# $NetBSD: md.bebox,v 1.20 2013/08/11 22:29:02 joerg Exp $
 ./dev/pms0					base-obsolete		obsolete
 ./usr/mdec/boot					base-sysutil-root
+./usr/mdec/boot_com0				base-sysutil-root
+./usr/mdec/boot_vga				base-sysutil-root
 ./usr/mdec/elf2pef				base-obsolete		obsolete
 ./usr/mdec/mkbootimage				base-sysutil-root
-./usr/mdec/boot_com0				base-sysutil-root
-./usr/mdec/boot_vga				base-sysutil-root
--- a/distrib/sets/lists/base/md.cobalt	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.cobalt	Sun Aug 11 22:29:02 2013 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: md.cobalt,v 1.10 2008/11/29 17:57:33 tsutsui Exp $
+# $NetBSD: md.cobalt,v 1.11 2013/08/11 22:29:02 joerg Exp $
+./usr/mdec/boot					base-sysutil-bin
 ./usr/mdec/installkernel			base-sysutil-bin
-./usr/mdec/boot					base-sysutil-bin
--- a/distrib/sets/lists/base/md.ews4800mips	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.ews4800mips	Sun Aug 11 22:29:02 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.ews4800mips,v 1.5 2008/11/29 17:57:33 tsutsui Exp $
+# $NetBSD: md.ews4800mips,v 1.6 2013/08/11 22:29:02 joerg Exp $
 ./usr/mdec/boot					base-sysutil-bin
 ./usr/mdec/boot.coff				base-sysutil-bin
+./usr/mdec/boot_kernel.gz			base-sysutil-bin
 ./usr/mdec/bootxx_bfs				base-sysutil-bin
 ./usr/mdec/bootxx_ustarfs			base-sysutil-bin
-./usr/mdec/boot_kernel.gz			base-sysutil-bin
--- a/distrib/sets/lists/base/md.macppc	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.macppc	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.31 2012/04/06 22:46:15 christos Exp $
+# $NetBSD: md.macppc,v 1.32 2013/08/11 22:29:02 joerg Exp $
 ./usr/mdec/bootxx				base-sysutil-bin
 ./usr/mdec/installboot				base-obsolete		obsolete
 ./usr/mdec/mbr					base-obsolete		obsolete
@@ -7,6 +7,6 @@
 ./usr/mdec/ofwboot.xcf				base-sysutil-bin
 ./usr/sbin/apm					base-sysutil-bin
 ./usr/sbin/apmd					base-sysutil-bin
-./usr/sbin/zzz					base-sysutil-bin
 ./usr/sbin/eeprom				base-sysutil-bin
 ./usr/sbin/ofctl				base-sysutil-bin
+./usr/sbin/zzz					base-sysutil-bin
--- a/distrib/sets/lists/base/md.mmeye	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.mmeye	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.mmeye,v 1.8 2011/03/05 21:19:46 he Exp $
+# $NetBSD: md.mmeye,v 1.9 2013/08/11 22:29:02 joerg Exp $
+./usr/mdec/boot					base-sysutil-bin
 ./usr/mdec/bootelf				base-sysutil-bin
 ./usr/mdec/osloader				base-sysutil-bin
-./usr/mdec/boot					base-sysutil-bin
--- a/distrib/sets/lists/base/md.ofppc	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.ofppc	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: md.ofppc,v 1.11 2010/06/20 21:32:33 matt Exp $
-./usr/mdec/ofwboot				base-sysutil-bin
+# $NetBSD: md.ofppc,v 1.12 2013/08/11 22:29:02 joerg Exp $
 ./usr/mdec/mkbootinfo				base-sysutil-bin
 ./usr/mdec/netbsd.chrp				base-sysutil-bin
+./usr/mdec/ofwboot				base-sysutil-bin
 ./usr/sbin/ofctl				base-sysutil-bin
--- a/distrib/sets/lists/base/md.prep	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.prep	Sun Aug 11 22:29:02 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: md.prep,v 1.15 2008/11/29 17:57:34 tsutsui Exp $
+# $NetBSD: md.prep,v 1.16 2013/08/11 22:29:02 joerg Exp $
 ./usr/mdec/boot					base-sysutil-bin
 ./usr/mdec/boot_com0				base-sysutil-bin
 ./usr/mdec/boot_com0_vreset				base-sysutil-bin
+./usr/mdec/installboot			base-obsolete		obsolete
 ./usr/mdec/mkbootimage				base-sysutil-bin
-./usr/mdec/installboot			base-obsolete		obsolete
 ./usr/sbin/eeprom				base-sysutil-bin
--- a/distrib/sets/lists/base/md.sparc	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.sparc	Sun Aug 11 22:29:02 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: md.sparc,v 1.80 2010/03/10 23:13:09 abs Exp $
-./sbin/edlabel					base-sysutil-root	obsolete
+# $NetBSD: md.sparc,v 1.81 2013/08/11 22:29:02 joerg 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/ldconfig					base-sysutil-root	pic
 ./usr/bin/fdformat				base-util-bin
 ./usr/lib/libsparc_v8.so.0			base-sys-shlib		pic
@@ -18,9 +18,9 @@
 ./usr/mdec/installboot				base-obsolete		obsolete
 ./usr/mdec/ofwboot				base-sysutil-bin
 ./usr/mdec/ofwboot.net				base-sysutil-bin
+./usr/sbin/apm					base-sysutil-bin
 ./usr/sbin/apmd					base-sysutil-bin
-./usr/sbin/apm					base-sysutil-bin
+./usr/sbin/eeprom				base-sysutil-bin
+./usr/sbin/ofctl				base-sysutil-bin
+./usr/sbin/tadpolectl				base-sysutil-bin
 ./usr/sbin/zzz					base-sysutil-bin
-./usr/sbin/eeprom				base-sysutil-bin
-./usr/sbin/tadpolectl				base-sysutil-bin
-./usr/sbin/ofctl				base-sysutil-bin
--- a/distrib/sets/lists/base/md.sparc64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.sparc64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.195 2013/07/28 14:02:56 pgoyette Exp $
+# $NetBSD: md.sparc64,v 1.196 2013/08/11 22:29:02 joerg Exp $
 ./lib/sparc					base-npf-shlib		compat
 ./lib/sparc/npf					base-npf-shlib		compat
 ./lib/sparc/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -67,10 +67,10 @@
 ./usr/lib/sparc/libarchive.so.3.1		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libasn1.so.9			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/sparc/libasn1.so.9.0			base-compat-shlib	compat,pic,kerberos
+./usr/lib/sparc/libatf-c++.so.0			base-compat-shlib	compat,pic,atf
+./usr/lib/sparc/libatf-c++.so.0.0		base-compat-shlib	compat,pic,atf
 ./usr/lib/sparc/libatf-c.so.0			base-compat-shlib	compat,pic,atf
 ./usr/lib/sparc/libatf-c.so.0.0			base-compat-shlib	compat,pic,atf
-./usr/lib/sparc/libatf-c++.so.0			base-compat-shlib	compat,pic,atf
-./usr/lib/sparc/libatf-c++.so.0.0		base-compat-shlib	compat,pic,atf
 ./usr/lib/sparc/libbfd.so.12			base-compat-shlib	compat,pic,binutils
 ./usr/lib/sparc/libbfd.so.12.0			base-compat-shlib	compat,pic,binutils
 ./usr/lib/sparc/libbind9.so.7			base-compat-shlib	compat,pic
@@ -81,10 +81,10 @@
 ./usr/lib/sparc/libbsdmalloc.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libbz2.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libbz2.so.1.1			base-compat-shlib	compat,pic
+./usr/lib/sparc/libc++.so.1			base-compat-shlib	compat,pic,libcxx
+./usr/lib/sparc/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/sparc/libc.so.12			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libc.so.12.185			base-compat-shlib	compat,pic
-./usr/lib/sparc/libc++.so.1			base-compat-shlib	compat,pic,libcxx
-./usr/lib/sparc/libc++.so.1.0			base-compat-shlib	compat,pic,libcxx
 ./usr/lib/sparc/libcom_err.so.7			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/sparc/libcom_err.so.7.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/sparc/libcrypt.so.1			base-compat-shlib	compat,pic
@@ -121,6 +121,8 @@
 ./usr/lib/sparc/libevent_openssl.so.4.0		base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libevent_pthreads.so.4		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libevent_pthreads.so.4.0	base-compat-shlib	compat,pic
+./usr/lib/sparc/libexecinfo.so.0		base-compat-shlib	compat,pic
+./usr/lib/sparc/libexecinfo.so.0.0 		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libexpat.so.2			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libexpat.so.2.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libfetch.so.3			base-compat-shlib	compat,pic
@@ -303,8 +305,6 @@
 ./usr/lib/sparc/libwind.so.0.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/sparc/libwrap.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libwrap.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/sparc/libexecinfo.so.0		base-compat-shlib	compat,pic
-./usr/lib/sparc/libexecinfo.so.0.0 		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libz.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libz.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/lua				base-compat-shlib	compat
--- a/distrib/sets/lists/base/md.sun2	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.sun2	Sun Aug 11 22:29:02 2013 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: md.sun2,v 1.10 2013/07/18 21:03:07 matt Exp $
+# $NetBSD: md.sun2,v 1.11 2013/08/11 22:29:02 joerg Exp $
+./usr/bin/fdformat				base-util-bin
 ./usr/mdec/bootxx				base-sysutil-bin
 ./usr/mdec/bootyy				base-sysutil-bin
 ./usr/mdec/installboot				base-obsolete		obsolete
 ./usr/mdec/netboot				base-sysutil-bin
 ./usr/mdec/tapeboot				base-sysutil-bin
 ./usr/mdec/ufsboot				base-sysutil-bin
-./usr/bin/fdformat				base-util-bin
--- a/distrib/sets/lists/base/md.x68k	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/md.x68k	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.x68k,v 1.45 2012/10/12 20:16:30 tsutsui Exp $
+# $NetBSD: md.x68k,v 1.46 2013/08/11 22:29:02 joerg Exp $
 ./dev/pow0					base-obsolete		obsolete
 ./dev/pow1					base-obsolete		obsolete
 ./usr/bin/bellctrl				base-util-bin
@@ -18,12 +18,12 @@
 ./usr/mdec/newdisk				base-sysutil-bin
 ./usr/mdec/sdboot_ufs				base-sysutil-bin
 ./usr/mdec/xxboot				base-obsolete		obsolete
-./usr/mdec/xxboot_ufs				base-sysutil-bin
 ./usr/mdec/xxboot_cd9660			base-sysutil-bin
 ./usr/mdec/xxboot_ffsv1				base-sysutil-bin
 ./usr/mdec/xxboot_ffsv2				base-sysutil-bin
 ./usr/mdec/xxboot_lfsv1				base-sysutil-bin
 ./usr/mdec/xxboot_lfsv2				base-sysutil-bin
+./usr/mdec/xxboot_ufs				base-sysutil-bin
 ./usr/sbin/memswitch				base-sysutil-bin
 ./usr/sbin/poffd				base-obsolete		obsolete
 ./usr/share/keymaps/x68k/ascii_kmap		base-sys-share
--- a/distrib/sets/lists/base/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1038 2013/08/11 22:09:40 joerg Exp $
+# $NetBSD: mi,v 1.1039 2013/08/11 22:29:02 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -125,9 +125,9 @@
 ./etc/uucp					base-obsolete		obsolete
 ./etc/zfs					base-zfs-root
 ./lib						base-sys-root
-./lib/npf					base-sys-root
 ./lib/libdes.so					base-obsolete		obsolete
 ./lib/libssp.so					base-obsolete		obsolete
+./lib/npf					base-sys-root
 ./libdata					base-sys-root
 ./libdata/firmware				base-firmware-root
 ./libdata/firmware/if_athn			base-firmware-root
@@ -217,8 +217,8 @@
 ./libexec/dhcpcd-hooks/01-test			base-dhcpcd-root
 ./libexec/dhcpcd-hooks/02-dump			base-dhcpcd-root
 ./libexec/dhcpcd-hooks/10-mtu			base-dhcpcd-root
+./libexec/dhcpcd-hooks/10-resolv.conf		base-obsolete			obsolete
 ./libexec/dhcpcd-hooks/10-wpa_supplicant	base-dhcpcd-root
-./libexec/dhcpcd-hooks/10-resolv.conf		base-obsolete			obsolete
 ./libexec/dhcpcd-hooks/14-lookup-hostname	base-obsolete			obsolete
 ./libexec/dhcpcd-hooks/15-hostname		base-obsolete			obsolete
 ./libexec/dhcpcd-hooks/15-timezone		base-dhcpcd-root
@@ -412,8 +412,8 @@
 ./usr/bin/atf2kyua				base-kyua-bin		kyua
 ./usr/bin/atq					base-cron-bin
 ./usr/bin/atrm					base-cron-bin
+./usr/bin/audiocfg				base-audio-bin
 ./usr/bin/audioctl				base-audio-bin
-./usr/bin/audiocfg				base-audio-bin
 ./usr/bin/audioplay				base-audio-bin
 ./usr/bin/audiorecord				base-audio-bin
 ./usr/bin/awk					base-util-bin
@@ -441,9 +441,9 @@
 ./usr/bin/chsh					base-util-bin
 ./usr/bin/ci					base-rcs-bin
 ./usr/bin/cksum					base-util-bin
+./usr/bin/cleantags				base-util-bin
 ./usr/bin/clear					base-util-bin
 ./usr/bin/cmp					base-util-bin
-./usr/bin/cleantags				base-util-bin
 ./usr/bin/co					base-rcs-bin
 ./usr/bin/col					base-util-bin
 ./usr/bin/colcrt				base-util-bin
@@ -825,8 +825,8 @@
 ./usr/include/dev/dm	                        base-c-usr
 ./usr/include/dev/dmover			base-c-usr
 ./usr/include/dev/dtv				base-c-usr
+./usr/include/dev/eisa				base-obsolete		obsolete
 ./usr/include/dev/filemon			base-c-usr
-./usr/include/dev/eisa				base-obsolete		obsolete
 ./usr/include/dev/hpc				base-c-usr
 ./usr/include/dev/i2c				base-c-usr
 ./usr/include/dev/i2o				base-c-usr
@@ -883,8 +883,8 @@
 ./usr/include/g++/std				base-obsolete		obsolete
 ./usr/include/g++/tr1				base-cxx-usr
 ./usr/include/g++/tr1_impl			base-cxx-usr
+./usr/include/gcc-4.1				base-c-usr		gcc=4
 ./usr/include/gcc-4.1				base-obsolete		!gcc,obsolete
-./usr/include/gcc-4.1				base-c-usr		gcc=4
 ./usr/include/gcc-4.1				base-obsolete		gcc=45,obsolete
 ./usr/include/gcc-4.5				base-c-usr
 ./usr/include/gssapi				base-c-usr
@@ -1535,7 +1535,6 @@
 ./usr/sbin/tcsd					base-tpm-bin		tpm
 ./usr/sbin/timed				base-timed-bin
 ./usr/sbin/timedc				base-timed-bin
-./usr/sbin/tprof				base-sysutil-bin
 ./usr/sbin/tpm_changeownerauth			base-tpm-bin		tpm
 ./usr/sbin/tpm_clear				base-tpm-bin		tpm
 ./usr/sbin/tpm_createek				base-tpm-bin		tpm
@@ -1557,6 +1556,7 @@
 ./usr/sbin/tpm_setownable			base-tpm-bin		tpm
 ./usr/sbin/tpm_setpresence			base-tpm-bin		tpm
 ./usr/sbin/tpm_takeownership			base-tpm-bin		tpm
+./usr/sbin/tprof				base-sysutil-bin
 ./usr/sbin/traceroute				base-netutil-bin
 ./usr/sbin/traceroute6				base-netutil-bin	use_inet6
 ./usr/sbin/trpt					base-netutil-bin
@@ -2594,369 +2594,6 @@
 ./usr/share/lkm/vfs/module/Makefile		base-obsolete		obsolete
 ./usr/share/lkm/vfs/module/kernfsmod.c		base-obsolete		obsolete
 ./usr/share/locale				base-locale-share
-./usr/share/locale/af_ZA.UTF-8			base-locale-af
-./usr/share/locale/af_ZA.UTF-8/LC_CTYPE		base-locale-af		nls
-./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES	base-locale-af		nls
-./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-af		nls
-./usr/share/locale/af_ZA.UTF-8/LC_MONETARY	base-locale-af		nls
-./usr/share/locale/af_ZA.UTF-8/LC_NUMERIC	base-locale-af		nls
-./usr/share/locale/af_ZA.UTF-8/LC_TIME		base-locale-af		nls
-./usr/share/locale/be_BY.UTF-8			base-locale-be
-./usr/share/locale/be_BY.UTF-8/LC_CTYPE		base-locale-be		nls
-./usr/share/locale/be_BY.UTF-8/LC_MESSAGES	base-locale-be		nls
-./usr/share/locale/be_BY.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-be		nls
-./usr/share/locale/be_BY.UTF-8/LC_MONETARY	base-locale-be		nls
-./usr/share/locale/be_BY.UTF-8/LC_NUMERIC	base-locale-be		nls
-./usr/share/locale/be_BY.UTF-8/LC_TIME		base-locale-be		nls
-./usr/share/locale/bg_BG.UTF-8			base-locale-bg
-./usr/share/locale/bg_BG.UTF-8/LC_CTYPE		base-locale-bg		nls
-./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES	base-locale-bg		nls
-./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-bg		nls
-./usr/share/locale/bg_BG.UTF-8/LC_MONETARY	base-locale-bg		nls
-./usr/share/locale/bg_BG.UTF-8/LC_NUMERIC	base-locale-bg		nls
-./usr/share/locale/bg_BG.UTF-8/LC_TIME		base-locale-bg		nls
-./usr/share/locale/ca_ES.UTF-8			base-locale-ca
-./usr/share/locale/ca_ES.UTF-8/LC_CTYPE		base-locale-ca		nls
-./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES	base-locale-ca		nls
-./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ca		nls
-./usr/share/locale/ca_ES.UTF-8/LC_MONETARY	base-locale-ca		nls
-./usr/share/locale/ca_ES.UTF-8/LC_NUMERIC	base-locale-ca		nls
-./usr/share/locale/ca_ES.UTF-8/LC_TIME		base-locale-ca		nls
-./usr/share/locale/cs_CZ.UTF-8			base-locale-cs
-./usr/share/locale/cs_CZ.UTF-8/LC_CTYPE		base-locale-cs		nls
-./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES	base-locale-cs		nls
-./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-cs		nls
-./usr/share/locale/cs_CZ.UTF-8/LC_MONETARY	base-locale-cs		nls
-./usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC	base-locale-cs		nls
-./usr/share/locale/cs_CZ.UTF-8/LC_TIME		base-locale-cs		nls
-./usr/share/locale/da_DK.UTF-8			base-locale-da
-./usr/share/locale/da_DK.UTF-8/LC_CTYPE		base-locale-da		nls
-./usr/share/locale/da_DK.UTF-8/LC_MESSAGES	base-locale-da		nls
-./usr/share/locale/da_DK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-da		nls
-./usr/share/locale/da_DK.UTF-8/LC_MONETARY	base-locale-da		nls
-./usr/share/locale/da_DK.UTF-8/LC_NUMERIC	base-locale-da		nls
-./usr/share/locale/da_DK.UTF-8/LC_TIME		base-locale-da		nls
-./usr/share/locale/de_AT.UTF-8			base-locale-de
-./usr/share/locale/de_AT.UTF-8/LC_CTYPE		base-locale-de		nls
-./usr/share/locale/de_AT.UTF-8/LC_MESSAGES	base-locale-de		nls
-./usr/share/locale/de_AT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-de		nls
-./usr/share/locale/de_AT.UTF-8/LC_MONETARY	base-locale-de		nls
-./usr/share/locale/de_AT.UTF-8/LC_NUMERIC	base-locale-de		nls
-./usr/share/locale/de_AT.UTF-8/LC_TIME		base-locale-de		nls
-./usr/share/locale/de_CH.UTF-8			base-locale-de
-./usr/share/locale/de_CH.UTF-8/LC_CTYPE		base-locale-de		nls
-./usr/share/locale/de_CH.UTF-8/LC_MESSAGES	base-locale-de		nls
-./usr/share/locale/de_CH.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-de		nls
-./usr/share/locale/de_CH.UTF-8/LC_MONETARY	base-locale-de		nls
-./usr/share/locale/de_CH.UTF-8/LC_NUMERIC	base-locale-de		nls
-./usr/share/locale/de_CH.UTF-8/LC_TIME		base-locale-de		nls
-./usr/share/locale/de_DE.UTF-8			base-locale-de
-./usr/share/locale/de_DE.UTF-8/LC_CTYPE		base-locale-de		nls
-./usr/share/locale/de_DE.UTF-8/LC_MESSAGES	base-locale-de		nls
-./usr/share/locale/de_DE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-de		nls
-./usr/share/locale/de_DE.UTF-8/LC_MONETARY	base-locale-de		nls
-./usr/share/locale/de_DE.UTF-8/LC_NUMERIC	base-locale-de		nls
-./usr/share/locale/de_DE.UTF-8/LC_TIME		base-locale-de		nls
-./usr/share/locale/el_GR.UTF-8			base-locale-el
-./usr/share/locale/el_GR.UTF-8/LC_CTYPE		base-locale-el		nls
-./usr/share/locale/el_GR.UTF-8/LC_MESSAGES	base-locale-el		nls
-./usr/share/locale/el_GR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-el		nls
-./usr/share/locale/el_GR.UTF-8/LC_MONETARY	base-locale-el		nls
-./usr/share/locale/el_GR.UTF-8/LC_NUMERIC	base-locale-el		nls
-./usr/share/locale/el_GR.UTF-8/LC_TIME		base-locale-el		nls
-./usr/share/locale/en_AU.UTF-8			base-locale-en
-./usr/share/locale/en_AU.UTF-8/LC_CTYPE		base-locale-en		nls
-./usr/share/locale/en_AU.UTF-8/LC_MESSAGES	base-locale-en		nls
-./usr/share/locale/en_AU.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
-./usr/share/locale/en_AU.UTF-8/LC_MONETARY	base-locale-en		nls
-./usr/share/locale/en_AU.UTF-8/LC_NUMERIC	base-locale-en		nls
-./usr/share/locale/en_AU.UTF-8/LC_TIME		base-locale-en		nls
-./usr/share/locale/en_CA.UTF-8			base-locale-en
-./usr/share/locale/en_CA.UTF-8/LC_CTYPE		base-locale-en		nls
-./usr/share/locale/en_CA.UTF-8/LC_MESSAGES	base-locale-en		nls
-./usr/share/locale/en_CA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
-./usr/share/locale/en_CA.UTF-8/LC_MONETARY	base-locale-en		nls
-./usr/share/locale/en_CA.UTF-8/LC_NUMERIC	base-locale-en		nls
-./usr/share/locale/en_CA.UTF-8/LC_TIME		base-locale-en		nls
-./usr/share/locale/en_GB.UTF-8			base-locale-en
-./usr/share/locale/en_GB.UTF-8/LC_CTYPE		base-locale-en		nls
-./usr/share/locale/en_GB.UTF-8/LC_MESSAGES	base-locale-en		nls
-./usr/share/locale/en_GB.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
-./usr/share/locale/en_GB.UTF-8/LC_MONETARY	base-locale-en		nls
-./usr/share/locale/en_GB.UTF-8/LC_NUMERIC	base-locale-en		nls
-./usr/share/locale/en_GB.UTF-8/LC_TIME		base-locale-en		nls
-./usr/share/locale/en_NZ.UTF-8			base-locale-en
-./usr/share/locale/en_NZ.UTF-8/LC_CTYPE		base-locale-en		nls
-./usr/share/locale/en_NZ.UTF-8/LC_MESSAGES	base-locale-en		nls
-./usr/share/locale/en_NZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
-./usr/share/locale/en_NZ.UTF-8/LC_MONETARY	base-locale-en		nls
-./usr/share/locale/en_NZ.UTF-8/LC_NUMERIC	base-locale-en		nls
-./usr/share/locale/en_NZ.UTF-8/LC_TIME		base-locale-en		nls
-./usr/share/locale/es_ES.UTF-8			base-locale-es
-./usr/share/locale/es_ES.UTF-8/LC_CTYPE		base-locale-es		nls
-./usr/share/locale/es_ES.UTF-8/LC_MESSAGES	base-locale-es		nls
-./usr/share/locale/es_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-es		nls
-./usr/share/locale/es_ES.UTF-8/LC_MONETARY	base-locale-es		nls
-./usr/share/locale/es_ES.UTF-8/LC_NUMERIC	base-locale-es		nls
-./usr/share/locale/es_ES.UTF-8/LC_TIME		base-locale-es		nls
-./usr/share/locale/et_EE.UTF-8			base-locale-ee
-./usr/share/locale/et_EE.UTF-8/LC_CTYPE		base-locale-ee		nls
-./usr/share/locale/et_EE.UTF-8/LC_MESSAGES	base-locale-ee		nls
-./usr/share/locale/et_EE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ee		nls
-./usr/share/locale/et_EE.UTF-8/LC_MONETARY	base-locale-ee		nls
-./usr/share/locale/et_EE.UTF-8/LC_NUMERIC	base-locale-ee		nls
-./usr/share/locale/et_EE.UTF-8/LC_TIME		base-locale-ee		nls
-./usr/share/locale/eu_ES.UTF-8			base-locale-eu
-./usr/share/locale/eu_ES.UTF-8/LC_CTYPE		base-locale-eu		nls
-./usr/share/locale/eu_ES.UTF-8/LC_MESSAGES	base-locale-eu		nls
-./usr/share/locale/eu_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-eu		nls
-./usr/share/locale/eu_ES.UTF-8/LC_MONETARY	base-locale-eu		nls
-./usr/share/locale/eu_ES.UTF-8/LC_NUMERIC	base-locale-eu		nls
-./usr/share/locale/eu_ES.UTF-8/LC_TIME		base-locale-eu		nls
-./usr/share/locale/fi_FI.UTF-8			base-locale-fi
-./usr/share/locale/fi_FI.UTF-8/LC_CTYPE		base-locale-fi		nls
-./usr/share/locale/fi_FI.UTF-8/LC_MESSAGES	base-locale-fi		nls
-./usr/share/locale/fi_FI.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-fi		nls
-./usr/share/locale/fi_FI.UTF-8/LC_MONETARY	base-locale-fi		nls
-./usr/share/locale/fi_FI.UTF-8/LC_NUMERIC	base-locale-fi		nls
-./usr/share/locale/fi_FI.UTF-8/LC_TIME		base-locale-fi		nls
-./usr/share/locale/hr_HR.UTF-8			base-locale-hr
-./usr/share/locale/hr_HR.UTF-8/LC_CTYPE		base-locale-hr		nls
-./usr/share/locale/hr_HR.UTF-8/LC_MESSAGES	base-locale-hr		nls
-./usr/share/locale/hr_HR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-hr		nls
-./usr/share/locale/hr_HR.UTF-8/LC_MONETARY	base-locale-hr		nls
-./usr/share/locale/hr_HR.UTF-8/LC_NUMERIC	base-locale-hr		nls
-./usr/share/locale/hr_HR.UTF-8/LC_TIME		base-locale-hr		nls
-./usr/share/locale/hu_HU.UTF-8			base-locale-hu
-./usr/share/locale/hu_HU.UTF-8/LC_CTYPE		base-locale-hu		nls
-./usr/share/locale/hu_HU.UTF-8/LC_MESSAGES	base-locale-hu		nls
-./usr/share/locale/hu_HU.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-hu		nls
-./usr/share/locale/hu_HU.UTF-8/LC_MONETARY	base-locale-hu		nls
-./usr/share/locale/hu_HU.UTF-8/LC_NUMERIC	base-locale-hu		nls
-./usr/share/locale/hu_HU.UTF-8/LC_TIME		base-locale-hu		nls
-./usr/share/locale/hy_AM.UTF-8			base-locale-hy
-./usr/share/locale/hy_AM.UTF-8/LC_CTYPE		base-locale-hy		nls
-./usr/share/locale/hy_AM.UTF-8/LC_MESSAGES	base-locale-hy		nls
-./usr/share/locale/hy_AM.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-hy		nls
-./usr/share/locale/hy_AM.UTF-8/LC_MONETARY	base-locale-hy		nls
-./usr/share/locale/hy_AM.UTF-8/LC_NUMERIC	base-locale-hy		nls
-./usr/share/locale/hy_AM.UTF-8/LC_TIME		base-locale-hy		nls
-./usr/share/locale/is_IS.UTF-8			base-locale-is
-./usr/share/locale/is_IS.UTF-8/LC_CTYPE		base-locale-is		nls
-./usr/share/locale/is_IS.UTF-8/LC_MESSAGES	base-locale-is		nls
-./usr/share/locale/is_IS.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-is		nls
-./usr/share/locale/is_IS.UTF-8/LC_MONETARY	base-locale-is		nls
-./usr/share/locale/is_IS.UTF-8/LC_NUMERIC	base-locale-is		nls
-./usr/share/locale/is_IS.UTF-8/LC_TIME		base-locale-is		nls
-./usr/share/locale/it_CH.UTF-8			base-locale-it
-./usr/share/locale/it_CH.UTF-8/LC_CTYPE		base-locale-it		nls
-./usr/share/locale/it_CH.UTF-8/LC_MESSAGES	base-locale-it		nls
-./usr/share/locale/it_CH.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-it		nls
-./usr/share/locale/it_CH.UTF-8/LC_MONETARY	base-locale-it		nls
-./usr/share/locale/it_CH.UTF-8/LC_NUMERIC	base-locale-it		nls
-./usr/share/locale/it_CH.UTF-8/LC_TIME		base-locale-it		nls
-./usr/share/locale/it_IT.UTF-8			base-locale-it
-./usr/share/locale/it_IT.UTF-8/LC_CTYPE		base-locale-it		nls
-./usr/share/locale/it_IT.UTF-8/LC_MESSAGES	base-locale-it		nls
-./usr/share/locale/it_IT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-it		nls
-./usr/share/locale/it_IT.UTF-8/LC_MONETARY	base-locale-it		nls
-./usr/share/locale/it_IT.UTF-8/LC_NUMERIC	base-locale-it		nls
-./usr/share/locale/it_IT.UTF-8/LC_TIME		base-locale-it		nls
-./usr/share/locale/ja_JP.UTF-8			base-locale-ja
-./usr/share/locale/ja_JP.UTF-8/LC_CTYPE		base-locale-ja		nls
-./usr/share/locale/ja_JP.UTF-8/LC_MESSAGES	base-locale-ja		nls
-./usr/share/locale/ja_JP.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ja		nls
-./usr/share/locale/ja_JP.UTF-8/LC_MONETARY	base-locale-ja		nls
-./usr/share/locale/ja_JP.UTF-8/LC_NUMERIC	base-locale-ja		nls
-./usr/share/locale/ja_JP.UTF-8/LC_TIME		base-locale-ja		nls
-./usr/share/locale/kk_KZ.UTF-8			base-locale-kk
-./usr/share/locale/kk_KZ.UTF-8/LC_CTYPE		base-locale-kk		nls
-./usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES	base-locale-kk		nls
-./usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-kk		nls
-./usr/share/locale/kk_KZ.UTF-8/LC_MONETARY	base-locale-kk		nls
-./usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC	base-locale-kk		nls
-./usr/share/locale/kk_KZ.UTF-8/LC_TIME		base-locale-kk		nls
-./usr/share/locale/ko_KR.UTF-8			base-locale-ko
-./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES	base-locale-ko		nls
-./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ko		nls
-./usr/share/locale/ko_KR.UTF-8/LC_MONETARY	base-locale-ko		nls
-./usr/share/locale/ko_KR.UTF-8/LC_NUMERIC	base-locale-ko		nls
-./usr/share/locale/ko_KR.UTF-8/LC_TIME		base-locale-ko		nls
-./usr/share/locale/lt_LT.UTF-8			base-locale-lt
-./usr/share/locale/lt_LT.UTF-8/LC_CTYPE		base-locale-lt		nls
-./usr/share/locale/lt_LT.UTF-8/LC_MESSAGES	base-locale-lt		nls
-./usr/share/locale/lt_LT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-lt		nls
-./usr/share/locale/lt_LT.UTF-8/LC_MONETARY	base-locale-lt		nls
-./usr/share/locale/lt_LT.UTF-8/LC_NUMERIC	base-locale-lt		nls
-./usr/share/locale/lt_LT.UTF-8/LC_TIME		base-locale-lt		nls
-./usr/share/locale/nb_NO.ISO8859-1		base-locale-nb
-./usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-1/LC_TIME	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-15		base-locale-nb
-./usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC	base-locale-nb		nls
-./usr/share/locale/nb_NO.ISO8859-15/LC_TIME	base-locale-nb		nls
-./usr/share/locale/nb_NO.UTF-8			base-locale-nb
-./usr/share/locale/nb_NO.UTF-8/LC_CTYPE		base-locale-nb		nls
-./usr/share/locale/nb_NO.UTF-8/LC_MESSAGES	base-locale-nb		nls
-./usr/share/locale/nb_NO.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nb		nls
-./usr/share/locale/nb_NO.UTF-8/LC_MONETARY	base-locale-nb		nls
-./usr/share/locale/nb_NO.UTF-8/LC_NUMERIC	base-locale-nb		nls
-./usr/share/locale/nb_NO.UTF-8/LC_TIME		base-locale-nb		nls
-./usr/share/locale/nl_BE.UTF-8			base-locale-nl
-./usr/share/locale/nl_BE.UTF-8/LC_CTYPE		base-locale-nl		nls
-./usr/share/locale/nl_BE.UTF-8/LC_MESSAGES	base-locale-nl		nls
-./usr/share/locale/nl_BE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nl		nls
-./usr/share/locale/nl_BE.UTF-8/LC_MONETARY	base-locale-nl		nls
-./usr/share/locale/nl_BE.UTF-8/LC_NUMERIC	base-locale-nl		nls
-./usr/share/locale/nl_BE.UTF-8/LC_TIME		base-locale-nl		nls
-./usr/share/locale/nl_NL.UTF-8			base-locale-nl
-./usr/share/locale/nl_NL.UTF-8/LC_CTYPE		base-locale-nl		nls
-./usr/share/locale/nl_NL.UTF-8/LC_MESSAGES	base-locale-nl		nls
-./usr/share/locale/nl_NL.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nl		nls
-./usr/share/locale/nl_NL.UTF-8/LC_MONETARY	base-locale-nl		nls
-./usr/share/locale/nl_NL.UTF-8/LC_NUMERIC	base-locale-nl		nls
-./usr/share/locale/nl_NL.UTF-8/LC_TIME		base-locale-nl		nls
-./usr/share/locale/nn_NO.UTF-8			base-locale-nn
-./usr/share/locale/nn_NO.UTF-8/LC_CTYPE		base-locale-nn		nls
-./usr/share/locale/nn_NO.UTF-8/LC_MESSAGES	base-locale-nn		nls
-./usr/share/locale/nn_NO.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nn		nls
-./usr/share/locale/nn_NO.UTF-8/LC_MONETARY	base-locale-nn		nls
-./usr/share/locale/nn_NO.UTF-8/LC_NUMERIC	base-locale-nn		nls
-./usr/share/locale/nn_NO.UTF-8/LC_TIME		base-locale-nn		nls
-./usr/share/locale/pl_PL.UTF-8			base-locale-pl
-./usr/share/locale/pl_PL.UTF-8/LC_CTYPE		base-locale-pl		nls
-./usr/share/locale/pl_PL.UTF-8/LC_MESSAGES	base-locale-pl		nls
-./usr/share/locale/pl_PL.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-pl		nls
-./usr/share/locale/pl_PL.UTF-8/LC_MONETARY	base-locale-pl		nls
-./usr/share/locale/pl_PL.UTF-8/LC_NUMERIC	base-locale-pl		nls
-./usr/share/locale/pl_PL.UTF-8/LC_TIME		base-locale-pl		nls
-./usr/share/locale/pt_BR.UTF-8			base-locale-pt
-./usr/share/locale/pt_BR.UTF-8/LC_CTYPE		base-locale-pt		nls
-./usr/share/locale/pt_BR.UTF-8/LC_MESSAGES	base-locale-pt		nls
-./usr/share/locale/pt_BR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-pt		nls
-./usr/share/locale/pt_BR.UTF-8/LC_MONETARY	base-locale-pt		nls
-./usr/share/locale/pt_BR.UTF-8/LC_NUMERIC	base-locale-pt		nls
-./usr/share/locale/pt_BR.UTF-8/LC_TIME		base-locale-pt		nls
-./usr/share/locale/pt_PT.UTF-8			base-locale-pt
-./usr/share/locale/pt_PT.UTF-8/LC_CTYPE		base-locale-pt		nls
-./usr/share/locale/pt_PT.UTF-8/LC_MESSAGES	base-locale-pt		nls
-./usr/share/locale/pt_PT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-pt		nls
-./usr/share/locale/pt_PT.UTF-8/LC_MONETARY	base-locale-pt		nls
-./usr/share/locale/pt_PT.UTF-8/LC_NUMERIC	base-locale-pt		nls
-./usr/share/locale/pt_PT.UTF-8/LC_TIME		base-locale-pt		nls
-./usr/share/locale/ro_RO.UTF-8			base-locale-ro
-./usr/share/locale/ro_RO.UTF-8/LC_CTYPE		base-locale-ro		nls
-./usr/share/locale/ro_RO.UTF-8/LC_MESSAGES	base-locale-ro		nls
-./usr/share/locale/ro_RO.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ro		nls
-./usr/share/locale/ro_RO.UTF-8/LC_MONETARY	base-locale-ro		nls
-./usr/share/locale/ro_RO.UTF-8/LC_NUMERIC	base-locale-ro		nls
-./usr/share/locale/ro_RO.UTF-8/LC_TIME		base-locale-ro		nls
-./usr/share/locale/ru_BY.UTF-8			base-locale-ru
-./usr/share/locale/ru_BY.UTF-8/LC_CTYPE		base-locale-ru		nls
-./usr/share/locale/ru_BY.UTF-8/LC_MESSAGES	base-locale-ru		nls
-./usr/share/locale/ru_BY.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ru		nls
-./usr/share/locale/ru_BY.UTF-8/LC_MONETARY	base-locale-ru		nls
-./usr/share/locale/ru_BY.UTF-8/LC_NUMERIC	base-locale-ru		nls
-./usr/share/locale/ru_BY.UTF-8/LC_TIME		base-locale-ru		nls
-./usr/share/locale/ru_RU.UTF-8			base-locale-ru
-./usr/share/locale/ru_RU.UTF-8/LC_CTYPE		base-locale-ru		nls
-./usr/share/locale/ru_RU.UTF-8/LC_MESSAGES	base-locale-ru		nls
-./usr/share/locale/ru_RU.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ru		nls
-./usr/share/locale/ru_RU.UTF-8/LC_MONETARY	base-locale-ru		nls
-./usr/share/locale/ru_RU.UTF-8/LC_NUMERIC	base-locale-ru		nls
-./usr/share/locale/ru_RU.UTF-8/LC_TIME		base-locale-ru		nls
-./usr/share/locale/sk_SK.UTF-8			base-locale-sk
-./usr/share/locale/sk_SK.UTF-8/LC_CTYPE		base-locale-sk		nls
-./usr/share/locale/sk_SK.UTF-8/LC_MESSAGES	base-locale-sk		nls
-./usr/share/locale/sk_SK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sk		nls
-./usr/share/locale/sk_SK.UTF-8/LC_MONETARY	base-locale-sk		nls
-./usr/share/locale/sk_SK.UTF-8/LC_NUMERIC	base-locale-sk		nls
-./usr/share/locale/sk_SK.UTF-8/LC_TIME		base-locale-sk		nls
-./usr/share/locale/sl_SI.UTF-8			base-locale-sl
-./usr/share/locale/sl_SI.UTF-8/LC_CTYPE		base-locale-sl		nls
-./usr/share/locale/sl_SI.UTF-8/LC_MESSAGES	base-locale-sl		nls
-./usr/share/locale/sl_SI.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sl		nls
-./usr/share/locale/sl_SI.UTF-8/LC_MONETARY	base-locale-sl		nls
-./usr/share/locale/sl_SI.UTF-8/LC_NUMERIC	base-locale-sl		nls
-./usr/share/locale/sl_SI.UTF-8/LC_TIME		base-locale-sl		nls
-./usr/share/locale/sr_Cyrl_ME.UTF-8			base-locale-sr
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_CTYPE		base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MESSAGES	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MONETARY	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_NUMERIC	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_TIME		base-locale-sr		nls
-./usr/share/locale/sr_Latn_ME.UTF-8			base-locale-sr
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_CTYPE		base-locale-sr		nls
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_MESSAGES	base-locale-sr		nls
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_MONETARY	base-locale-sr		nls
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_NUMERIC	base-locale-sr		nls
-./usr/share/locale/sr_Latn_ME.UTF-8/LC_TIME		base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.UTF-8			base-locale-sr
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE		base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME		base-locale-sr		nls
-./usr/share/locale/sr_Latn_RS.UTF-8			base-locale-sr
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE		base-locale-sr		nls
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES	base-locale-sr		nls
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY	base-locale-sr		nls
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC	base-locale-sr		nls
-./usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME		base-locale-sr		nls
-./usr/share/locale/sv_SE.UTF-8			base-locale-sv
-./usr/share/locale/sv_SE.UTF-8/LC_CTYPE		base-locale-sv		nls
-./usr/share/locale/sv_SE.UTF-8/LC_MESSAGES	base-locale-sv		nls
-./usr/share/locale/sv_SE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sv		nls
-./usr/share/locale/sv_SE.UTF-8/LC_MONETARY	base-locale-sv		nls
-./usr/share/locale/sv_SE.UTF-8/LC_NUMERIC	base-locale-sv		nls
-./usr/share/locale/sv_SE.UTF-8/LC_TIME		base-locale-sv		nls
-./usr/share/locale/tr_TR.UTF-8			base-locale-tr
-./usr/share/locale/tr_TR.UTF-8/LC_CTYPE		base-locale-tr		nls
-./usr/share/locale/tr_TR.UTF-8/LC_MESSAGES	base-locale-tr		nls
-./usr/share/locale/tr_TR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-tr		nls
-./usr/share/locale/tr_TR.UTF-8/LC_MONETARY	base-locale-tr		nls
-./usr/share/locale/tr_TR.UTF-8/LC_NUMERIC	base-locale-tr		nls
-./usr/share/locale/tr_TR.UTF-8/LC_TIME		base-locale-tr		nls
-./usr/share/locale/uk_UA.UTF-8			base-locale-uk
-./usr/share/locale/uk_UA.UTF-8/LC_CTYPE		base-locale-uk		nls
-./usr/share/locale/uk_UA.UTF-8/LC_MESSAGES	base-locale-uk		nls
-./usr/share/locale/uk_UA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-uk		nls
-./usr/share/locale/uk_UA.UTF-8/LC_MONETARY	base-locale-uk		nls
-./usr/share/locale/uk_UA.UTF-8/LC_NUMERIC	base-locale-uk		nls
-./usr/share/locale/uk_UA.UTF-8/LC_TIME		base-locale-uk		nls
-./usr/share/locale/zh_CN.UTF-8			base-locale-zh
-./usr/share/locale/zh_CN.UTF-8/LC_CTYPE		base-locale-zh		nls
-./usr/share/locale/zh_CN.UTF-8/LC_MESSAGES	base-locale-zh		nls
-./usr/share/locale/zh_CN.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-zh		nls
-./usr/share/locale/zh_CN.UTF-8/LC_MONETARY	base-locale-zh		nls
-./usr/share/locale/zh_CN.UTF-8/LC_NUMERIC	base-locale-zh		nls
-./usr/share/locale/zh_CN.UTF-8/LC_TIME		base-locale-zh		nls
-./usr/share/locale/zh_HK.UTF-8			base-locale-zh
-./usr/share/locale/zh_HK.UTF-8/LC_CTYPE		base-locale-zh		nls
-./usr/share/locale/zh_HK.UTF-8/LC_MESSAGES	base-locale-zh		nls
-./usr/share/locale/zh_HK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-zh		nls
-./usr/share/locale/zh_HK.UTF-8/LC_MONETARY	base-locale-zh		nls
-./usr/share/locale/zh_HK.UTF-8/LC_NUMERIC	base-locale-zh		nls
-./usr/share/locale/zh_HK.UTF-8/LC_TIME		base-locale-zh		nls
-./usr/share/locale/zh_TW.UTF-8			base-locale-zh
-./usr/share/locale/zh_TW.UTF-8/LC_CTYPE		base-locale-zh		nls
-./usr/share/locale/zh_TW.UTF-8/LC_MESSAGES	base-locale-zh		nls
-./usr/share/locale/zh_TW.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-zh	nls
-./usr/share/locale/zh_TW.UTF-8/LC_MONETARY	base-locale-zh		nls
-./usr/share/locale/zh_TW.UTF-8/LC_NUMERIC	base-locale-zh		nls
-./usr/share/locale/zh_TW.UTF-8/LC_TIME		base-locale-zh		nls
 ./usr/share/locale/af_ZA.ISO8859-1		base-locale-af
 ./usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE	base-locale-af		nls
 ./usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES	base-locale-af
@@ -2971,6 +2608,13 @@
 ./usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY	base-locale-af		nls
 ./usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC	base-locale-af		nls
 ./usr/share/locale/af_ZA.ISO8859-15/LC_TIME	base-locale-af		nls
+./usr/share/locale/af_ZA.UTF-8			base-locale-af
+./usr/share/locale/af_ZA.UTF-8/LC_CTYPE		base-locale-af		nls
+./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES	base-locale-af		nls
+./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-af		nls
+./usr/share/locale/af_ZA.UTF-8/LC_MONETARY	base-locale-af		nls
+./usr/share/locale/af_ZA.UTF-8/LC_NUMERIC	base-locale-af		nls
+./usr/share/locale/af_ZA.UTF-8/LC_TIME		base-locale-af		nls
 ./usr/share/locale/be				base-locale-be
 ./usr/share/locale/be/LC_MESSAGES		base-locale-be
 ./usr/share/locale/be_BY.CP1251			base-locale-be
@@ -2987,6 +2631,13 @@
 ./usr/share/locale/be_BY.ISO8859-5/LC_MONETARY	base-locale-be		nls
 ./usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC	base-locale-be		nls
 ./usr/share/locale/be_BY.ISO8859-5/LC_TIME	base-locale-be		nls
+./usr/share/locale/be_BY.UTF-8			base-locale-be
+./usr/share/locale/be_BY.UTF-8/LC_CTYPE		base-locale-be		nls
+./usr/share/locale/be_BY.UTF-8/LC_MESSAGES	base-locale-be		nls
+./usr/share/locale/be_BY.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-be		nls
+./usr/share/locale/be_BY.UTF-8/LC_MONETARY	base-locale-be		nls
+./usr/share/locale/be_BY.UTF-8/LC_NUMERIC	base-locale-be		nls
+./usr/share/locale/be_BY.UTF-8/LC_TIME		base-locale-be		nls
 ./usr/share/locale/bg_BG.CP1251			base-locale-bg
 ./usr/share/locale/bg_BG.CP1251/LC_CTYPE	base-locale-bg		nls
 ./usr/share/locale/bg_BG.CP1251/LC_MESSAGES	base-locale-bg
@@ -2994,6 +2645,13 @@
 ./usr/share/locale/bg_BG.CP1251/LC_MONETARY	base-locale-bg		nls
 ./usr/share/locale/bg_BG.CP1251/LC_NUMERIC	base-locale-bg		nls
 ./usr/share/locale/bg_BG.CP1251/LC_TIME		base-locale-bg		nls
+./usr/share/locale/bg_BG.UTF-8			base-locale-bg
+./usr/share/locale/bg_BG.UTF-8/LC_CTYPE		base-locale-bg		nls
+./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES	base-locale-bg		nls
+./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-bg		nls
+./usr/share/locale/bg_BG.UTF-8/LC_MONETARY	base-locale-bg		nls
+./usr/share/locale/bg_BG.UTF-8/LC_NUMERIC	base-locale-bg		nls
+./usr/share/locale/bg_BG.UTF-8/LC_TIME		base-locale-bg		nls
 ./usr/share/locale/ca				base-locale-ca
 ./usr/share/locale/ca/LC_MESSAGES		base-locale-ca
 ./usr/share/locale/ca_ES.ISO8859-1		base-locale-ca
@@ -3010,6 +2668,13 @@
 ./usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY	base-locale-ca		nls
 ./usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC	base-locale-ca		nls
 ./usr/share/locale/ca_ES.ISO8859-15/LC_TIME	base-locale-ca		nls
+./usr/share/locale/ca_ES.UTF-8			base-locale-ca
+./usr/share/locale/ca_ES.UTF-8/LC_CTYPE		base-locale-ca		nls
+./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES	base-locale-ca		nls
+./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ca		nls
+./usr/share/locale/ca_ES.UTF-8/LC_MONETARY	base-locale-ca		nls
+./usr/share/locale/ca_ES.UTF-8/LC_NUMERIC	base-locale-ca		nls
+./usr/share/locale/ca_ES.UTF-8/LC_TIME		base-locale-ca		nls
 ./usr/share/locale/cs				base-locale-cs
 ./usr/share/locale/cs/LC_MESSAGES		base-locale-cs
 ./usr/share/locale/cs/LC_MESSAGES/grep.mo	base-util_locale-cs	nls,!bsdgrep
@@ -3023,6 +2688,13 @@
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY	base-locale-cs		nls
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC	base-locale-cs		nls
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_TIME	base-locale-cs		nls
+./usr/share/locale/cs_CZ.UTF-8			base-locale-cs
+./usr/share/locale/cs_CZ.UTF-8/LC_CTYPE		base-locale-cs		nls
+./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES	base-locale-cs		nls
+./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-cs		nls
+./usr/share/locale/cs_CZ.UTF-8/LC_MONETARY	base-locale-cs		nls
+./usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC	base-locale-cs		nls
+./usr/share/locale/cs_CZ.UTF-8/LC_TIME		base-locale-cs		nls
 ./usr/share/locale/da				base-locale-da
 ./usr/share/locale/da/LC_MESSAGES		base-locale-da
 ./usr/share/locale/da/LC_MESSAGES/tar.mo	base-obsolete		obsolete
@@ -3041,6 +2713,13 @@
 ./usr/share/locale/da_DK.ISO8859-15/LC_MONETARY	base-locale-da		nls
 ./usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC	base-locale-da		nls
 ./usr/share/locale/da_DK.ISO8859-15/LC_TIME	base-locale-da		nls
+./usr/share/locale/da_DK.UTF-8			base-locale-da
+./usr/share/locale/da_DK.UTF-8/LC_CTYPE		base-locale-da		nls
+./usr/share/locale/da_DK.UTF-8/LC_MESSAGES	base-locale-da		nls
+./usr/share/locale/da_DK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-da		nls
+./usr/share/locale/da_DK.UTF-8/LC_MONETARY	base-locale-da		nls
+./usr/share/locale/da_DK.UTF-8/LC_NUMERIC	base-locale-da		nls
+./usr/share/locale/da_DK.UTF-8/LC_TIME		base-locale-da		nls
 ./usr/share/locale/de				base-locale-de
 ./usr/share/locale/de/LC_MESSAGES		base-locale-de
 ./usr/share/locale/de/LC_MESSAGES/grep.mo	base-util_locale-de	nls,!bsdgrep
@@ -3062,6 +2741,13 @@
 ./usr/share/locale/de_AT.ISO8859-15/LC_MONETARY	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-15/LC_NUMERIC	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-15/LC_TIME	base-locale-de		nls
+./usr/share/locale/de_AT.UTF-8			base-locale-de
+./usr/share/locale/de_AT.UTF-8/LC_CTYPE		base-locale-de		nls
+./usr/share/locale/de_AT.UTF-8/LC_MESSAGES	base-locale-de		nls
+./usr/share/locale/de_AT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-de		nls
+./usr/share/locale/de_AT.UTF-8/LC_MONETARY	base-locale-de		nls
+./usr/share/locale/de_AT.UTF-8/LC_NUMERIC	base-locale-de		nls
+./usr/share/locale/de_AT.UTF-8/LC_TIME		base-locale-de		nls
 ./usr/share/locale/de_AT/LC_MESSAGES		base-locale-de
 ./usr/share/locale/de_AT/LC_MESSAGES/texinfo.mo	base-texinfo_locale-de	nls
 ./usr/share/locale/de_CH.ISO8859-1		base-locale-de
@@ -3078,6 +2764,13 @@
 ./usr/share/locale/de_CH.ISO8859-15/LC_MONETARY	base-locale-de		nls
 ./usr/share/locale/de_CH.ISO8859-15/LC_NUMERIC	base-locale-de		nls
 ./usr/share/locale/de_CH.ISO8859-15/LC_TIME	base-locale-de		nls
+./usr/share/locale/de_CH.UTF-8			base-locale-de
+./usr/share/locale/de_CH.UTF-8/LC_CTYPE		base-locale-de		nls
+./usr/share/locale/de_CH.UTF-8/LC_MESSAGES	base-locale-de		nls
+./usr/share/locale/de_CH.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-de		nls
+./usr/share/locale/de_CH.UTF-8/LC_MONETARY	base-locale-de		nls
+./usr/share/locale/de_CH.UTF-8/LC_NUMERIC	base-locale-de		nls
+./usr/share/locale/de_CH.UTF-8/LC_TIME		base-locale-de		nls
 ./usr/share/locale/de_DE.ISO8859-1		base-locale-de
 ./usr/share/locale/de_DE.ISO8859-1/LC_CTYPE	base-locale-de		nls
 ./usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES	base-locale-de
@@ -3092,6 +2785,13 @@
 ./usr/share/locale/de_DE.ISO8859-15/LC_MONETARY	base-locale-de		nls
 ./usr/share/locale/de_DE.ISO8859-15/LC_NUMERIC	base-locale-de		nls
 ./usr/share/locale/de_DE.ISO8859-15/LC_TIME	base-locale-de		nls
+./usr/share/locale/de_DE.UTF-8			base-locale-de
+./usr/share/locale/de_DE.UTF-8/LC_CTYPE		base-locale-de		nls
+./usr/share/locale/de_DE.UTF-8/LC_MESSAGES	base-locale-de		nls
+./usr/share/locale/de_DE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-de		nls
+./usr/share/locale/de_DE.UTF-8/LC_MONETARY	base-locale-de		nls
+./usr/share/locale/de_DE.UTF-8/LC_NUMERIC	base-locale-de		nls
+./usr/share/locale/de_DE.UTF-8/LC_TIME		base-locale-de		nls
 ./usr/share/locale/el				base-locale-el
 ./usr/share/locale/el/LC_MESSAGES		base-locale-el
 ./usr/share/locale/el/LC_MESSAGES/grep.mo	base-util_locale-el	nls,!bsdgrep
@@ -3102,6 +2802,13 @@
 ./usr/share/locale/el_GR.ISO8859-7/LC_MONETARY	base-locale-el		nls
 ./usr/share/locale/el_GR.ISO8859-7/LC_NUMERIC	base-locale-el		nls
 ./usr/share/locale/el_GR.ISO8859-7/LC_TIME	base-locale-el		nls
+./usr/share/locale/el_GR.UTF-8			base-locale-el
+./usr/share/locale/el_GR.UTF-8/LC_CTYPE		base-locale-el		nls
+./usr/share/locale/el_GR.UTF-8/LC_MESSAGES	base-locale-el		nls
+./usr/share/locale/el_GR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-el		nls
+./usr/share/locale/el_GR.UTF-8/LC_MONETARY	base-locale-el		nls
+./usr/share/locale/el_GR.UTF-8/LC_NUMERIC	base-locale-el		nls
+./usr/share/locale/el_GR.UTF-8/LC_TIME		base-locale-el		nls
 ./usr/share/locale/en@boldquot			base-locale-en
 ./usr/share/locale/en@boldquot/LC_MESSAGES	base-locale-en
 ./usr/share/locale/en@quot			base-locale-en
@@ -3120,6 +2827,13 @@
 ./usr/share/locale/en_AU.ISO8859-15/LC_MONETARY	base-locale-en		nls
 ./usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC	base-locale-en		nls
 ./usr/share/locale/en_AU.ISO8859-15/LC_TIME	base-locale-en		nls
+./usr/share/locale/en_AU.UTF-8			base-locale-en
+./usr/share/locale/en_AU.UTF-8/LC_CTYPE		base-locale-en		nls
+./usr/share/locale/en_AU.UTF-8/LC_MESSAGES	base-locale-en		nls
+./usr/share/locale/en_AU.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
+./usr/share/locale/en_AU.UTF-8/LC_MONETARY	base-locale-en		nls
+./usr/share/locale/en_AU.UTF-8/LC_NUMERIC	base-locale-en		nls
+./usr/share/locale/en_AU.UTF-8/LC_TIME		base-locale-en		nls
 ./usr/share/locale/en_CA.ISO8859-1		base-locale-en
 ./usr/share/locale/en_CA.ISO8859-1/LC_CTYPE	base-locale-en		nls
 ./usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES	base-locale-en
@@ -3134,6 +2848,13 @@
 ./usr/share/locale/en_CA.ISO8859-15/LC_MONETARY	base-locale-en		nls
 ./usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC	base-locale-en		nls
 ./usr/share/locale/en_CA.ISO8859-15/LC_TIME	base-locale-en		nls
+./usr/share/locale/en_CA.UTF-8			base-locale-en
+./usr/share/locale/en_CA.UTF-8/LC_CTYPE		base-locale-en		nls
+./usr/share/locale/en_CA.UTF-8/LC_MESSAGES	base-locale-en		nls
+./usr/share/locale/en_CA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
+./usr/share/locale/en_CA.UTF-8/LC_MONETARY	base-locale-en		nls
+./usr/share/locale/en_CA.UTF-8/LC_NUMERIC	base-locale-en		nls
+./usr/share/locale/en_CA.UTF-8/LC_TIME		base-locale-en		nls
 ./usr/share/locale/en_GB.ISO8859-1		base-locale-en
 ./usr/share/locale/en_GB.ISO8859-1/LC_CTYPE	base-locale-en		nls
 ./usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES	base-locale-en
@@ -3148,6 +2869,13 @@
 ./usr/share/locale/en_GB.ISO8859-15/LC_MONETARY	base-locale-en		nls
 ./usr/share/locale/en_GB.ISO8859-15/LC_NUMERIC	base-locale-en		nls
 ./usr/share/locale/en_GB.ISO8859-15/LC_TIME	base-locale-en		nls
+./usr/share/locale/en_GB.UTF-8			base-locale-en
+./usr/share/locale/en_GB.UTF-8/LC_CTYPE		base-locale-en		nls
+./usr/share/locale/en_GB.UTF-8/LC_MESSAGES	base-locale-en		nls
+./usr/share/locale/en_GB.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
+./usr/share/locale/en_GB.UTF-8/LC_MONETARY	base-locale-en		nls
+./usr/share/locale/en_GB.UTF-8/LC_NUMERIC	base-locale-en		nls
+./usr/share/locale/en_GB.UTF-8/LC_TIME		base-locale-en		nls
 ./usr/share/locale/en_NZ.ISO8859-1		base-locale-en
 ./usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE	base-locale-en		nls
 ./usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES	base-locale-en
@@ -3162,6 +2890,13 @@
 ./usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY	base-locale-en		nls
 ./usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC	base-locale-en		nls
 ./usr/share/locale/en_NZ.ISO8859-15/LC_TIME	base-locale-en		nls
+./usr/share/locale/en_NZ.UTF-8			base-locale-en
+./usr/share/locale/en_NZ.UTF-8/LC_CTYPE		base-locale-en		nls
+./usr/share/locale/en_NZ.UTF-8/LC_MESSAGES	base-locale-en		nls
+./usr/share/locale/en_NZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-en		nls
+./usr/share/locale/en_NZ.UTF-8/LC_MONETARY	base-locale-en		nls
+./usr/share/locale/en_NZ.UTF-8/LC_NUMERIC	base-locale-en		nls
+./usr/share/locale/en_NZ.UTF-8/LC_TIME		base-locale-en		nls
 ./usr/share/locale/en_US.ISO8859-1		base-locale-en
 ./usr/share/locale/en_US.ISO8859-1/LC_CTYPE	base-locale-en		nls
 ./usr/share/locale/en_US.ISO8859-1/LC_MESSAGES	base-locale-en
@@ -3214,6 +2949,13 @@
 ./usr/share/locale/es_ES.ISO8859-15/LC_MONETARY	base-locale-es		nls
 ./usr/share/locale/es_ES.ISO8859-15/LC_NUMERIC	base-locale-es		nls
 ./usr/share/locale/es_ES.ISO8859-15/LC_TIME	base-locale-es		nls
+./usr/share/locale/es_ES.UTF-8			base-locale-es
+./usr/share/locale/es_ES.UTF-8/LC_CTYPE		base-locale-es		nls
+./usr/share/locale/es_ES.UTF-8/LC_MESSAGES	base-locale-es		nls
+./usr/share/locale/es_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-es		nls
+./usr/share/locale/es_ES.UTF-8/LC_MONETARY	base-locale-es		nls
+./usr/share/locale/es_ES.UTF-8/LC_NUMERIC	base-locale-es		nls
+./usr/share/locale/es_ES.UTF-8/LC_TIME		base-locale-es		nls
 ./usr/share/locale/et				base-locale-et
 ./usr/share/locale/et/LC_MESSAGES		base-locale-et
 ./usr/share/locale/et/LC_MESSAGES/grep.mo	base-util_locale-et	nls,!bsdgrep
@@ -3225,6 +2967,13 @@
 ./usr/share/locale/et_EE.ISO8859-15/LC_MONETARY	base-locale-et		nls
 ./usr/share/locale/et_EE.ISO8859-15/LC_NUMERIC	base-locale-et		nls
 ./usr/share/locale/et_EE.ISO8859-15/LC_TIME	base-locale-et		nls
+./usr/share/locale/et_EE.UTF-8			base-locale-ee
+./usr/share/locale/et_EE.UTF-8/LC_CTYPE		base-locale-ee		nls
+./usr/share/locale/et_EE.UTF-8/LC_MESSAGES	base-locale-ee		nls
+./usr/share/locale/et_EE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ee		nls
+./usr/share/locale/et_EE.UTF-8/LC_MONETARY	base-locale-ee		nls
+./usr/share/locale/et_EE.UTF-8/LC_NUMERIC	base-locale-ee		nls
+./usr/share/locale/et_EE.UTF-8/LC_TIME		base-locale-ee		nls
 ./usr/share/locale/eu_ES.ISO8859-1		base-locale-eu
 ./usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE	base-locale-eu		nls
 ./usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES	base-locale-eu
@@ -3239,6 +2988,13 @@
 ./usr/share/locale/eu_ES.ISO8859-15/LC_MONETARY	base-locale-eu		nls
 ./usr/share/locale/eu_ES.ISO8859-15/LC_NUMERIC	base-locale-eu		nls
 ./usr/share/locale/eu_ES.ISO8859-15/LC_TIME	base-locale-eu		nls
+./usr/share/locale/eu_ES.UTF-8			base-locale-eu
+./usr/share/locale/eu_ES.UTF-8/LC_CTYPE		base-locale-eu		nls
+./usr/share/locale/eu_ES.UTF-8/LC_MESSAGES	base-locale-eu		nls
+./usr/share/locale/eu_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-eu		nls
+./usr/share/locale/eu_ES.UTF-8/LC_MONETARY	base-locale-eu		nls
+./usr/share/locale/eu_ES.UTF-8/LC_NUMERIC	base-locale-eu		nls
+./usr/share/locale/eu_ES.UTF-8/LC_TIME		base-locale-eu		nls
 ./usr/share/locale/fi				base-locale-fi
 ./usr/share/locale/fi/LC_MESSAGES		base-locale-fi
 ./usr/share/locale/fi_FI.ISO8859-1		base-locale-fi
@@ -3255,6 +3011,13 @@
 ./usr/share/locale/fi_FI.ISO8859-15/LC_MONETARY	base-locale-fi		nls
 ./usr/share/locale/fi_FI.ISO8859-15/LC_NUMERIC	base-locale-fi		nls
 ./usr/share/locale/fi_FI.ISO8859-15/LC_TIME	base-locale-fi		nls
+./usr/share/locale/fi_FI.UTF-8			base-locale-fi
+./usr/share/locale/fi_FI.UTF-8/LC_CTYPE		base-locale-fi		nls
+./usr/share/locale/fi_FI.UTF-8/LC_MESSAGES	base-locale-fi		nls
+./usr/share/locale/fi_FI.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-fi		nls
+./usr/share/locale/fi_FI.UTF-8/LC_MONETARY	base-locale-fi		nls
+./usr/share/locale/fi_FI.UTF-8/LC_NUMERIC	base-locale-fi		nls
+./usr/share/locale/fi_FI.UTF-8/LC_TIME		base-locale-fi		nls
 ./usr/share/locale/fr				base-locale-fr
 ./usr/share/locale/fr/LC_MESSAGES		base-locale-fr
 ./usr/share/locale/fr/LC_MESSAGES/grep.mo	base-util_locale-fr	nls,!bsdgrep
@@ -3361,6 +3124,13 @@
 ./usr/share/locale/hr_HR.ISO8859-2/LC_MONETARY	base-locale-hr		nls
 ./usr/share/locale/hr_HR.ISO8859-2/LC_NUMERIC	base-locale-hr		nls
 ./usr/share/locale/hr_HR.ISO8859-2/LC_TIME	base-locale-hr		nls
+./usr/share/locale/hr_HR.UTF-8			base-locale-hr
+./usr/share/locale/hr_HR.UTF-8/LC_CTYPE		base-locale-hr		nls
+./usr/share/locale/hr_HR.UTF-8/LC_MESSAGES	base-locale-hr		nls
+./usr/share/locale/hr_HR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-hr		nls
+./usr/share/locale/hr_HR.UTF-8/LC_MONETARY	base-locale-hr		nls
+./usr/share/locale/hr_HR.UTF-8/LC_NUMERIC	base-locale-hr		nls
+./usr/share/locale/hr_HR.UTF-8/LC_TIME		base-locale-hr		nls
 ./usr/share/locale/hu_HU.ISO8859-2		base-locale-hu
 ./usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE	base-locale-hu		nls
 ./usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES	base-locale-hu
@@ -3368,6 +3138,13 @@
 ./usr/share/locale/hu_HU.ISO8859-2/LC_MONETARY	base-locale-hu		nls
 ./usr/share/locale/hu_HU.ISO8859-2/LC_NUMERIC	base-locale-hu		nls
 ./usr/share/locale/hu_HU.ISO8859-2/LC_TIME	base-locale-hu		nls
+./usr/share/locale/hu_HU.UTF-8			base-locale-hu
+./usr/share/locale/hu_HU.UTF-8/LC_CTYPE		base-locale-hu		nls
+./usr/share/locale/hu_HU.UTF-8/LC_MESSAGES	base-locale-hu		nls
+./usr/share/locale/hu_HU.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-hu		nls
+./usr/share/locale/hu_HU.UTF-8/LC_MONETARY	base-locale-hu		nls
+./usr/share/locale/hu_HU.UTF-8/LC_NUMERIC	base-locale-hu		nls
+./usr/share/locale/hu_HU.UTF-8/LC_TIME		base-locale-hu		nls
 ./usr/share/locale/hy_AM.ARMSCII-8		base-locale-hy
 ./usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE	base-locale-hy		nls
 ./usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES	base-locale-hy
@@ -3375,6 +3152,13 @@
 ./usr/share/locale/hy_AM.ARMSCII-8/LC_MONETARY	base-locale-hy		nls
 ./usr/share/locale/hy_AM.ARMSCII-8/LC_NUMERIC	base-locale-hy		nls
 ./usr/share/locale/hy_AM.ARMSCII-8/LC_TIME	base-locale-hy		nls
+./usr/share/locale/hy_AM.UTF-8			base-locale-hy
+./usr/share/locale/hy_AM.UTF-8/LC_CTYPE		base-locale-hy		nls
+./usr/share/locale/hy_AM.UTF-8/LC_MESSAGES	base-locale-hy		nls
+./usr/share/locale/hy_AM.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-hy		nls
+./usr/share/locale/hy_AM.UTF-8/LC_MONETARY	base-locale-hy		nls
+./usr/share/locale/hy_AM.UTF-8/LC_NUMERIC	base-locale-hy		nls
+./usr/share/locale/hy_AM.UTF-8/LC_TIME		base-locale-hy		nls
 ./usr/share/locale/id				base-locale-id
 ./usr/share/locale/id/LC_MESSAGES		base-locale-id
 ./usr/share/locale/id/LC_MESSAGES/grep.mo	base-util_locale-id	nls,!bsdgrep
@@ -3393,6 +3177,13 @@
 ./usr/share/locale/is_IS.ISO8859-15/LC_MONETARY	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-15/LC_TIME	base-locale-is		nls
+./usr/share/locale/is_IS.UTF-8			base-locale-is
+./usr/share/locale/is_IS.UTF-8/LC_CTYPE		base-locale-is		nls
+./usr/share/locale/is_IS.UTF-8/LC_MESSAGES	base-locale-is		nls
+./usr/share/locale/is_IS.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-is		nls
+./usr/share/locale/is_IS.UTF-8/LC_MONETARY	base-locale-is		nls
+./usr/share/locale/is_IS.UTF-8/LC_NUMERIC	base-locale-is		nls
+./usr/share/locale/is_IS.UTF-8/LC_TIME		base-locale-is		nls
 ./usr/share/locale/it				base-locale-it
 ./usr/share/locale/it/LC_MESSAGES		base-locale-it
 ./usr/share/locale/it/LC_MESSAGES/grep.mo	base-util_locale-it	nls,!bsdgrep
@@ -3412,6 +3203,13 @@
 ./usr/share/locale/it_CH.ISO8859-15/LC_MONETARY	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-15/LC_TIME	base-locale-it		nls
+./usr/share/locale/it_CH.UTF-8			base-locale-it
+./usr/share/locale/it_CH.UTF-8/LC_CTYPE		base-locale-it		nls
+./usr/share/locale/it_CH.UTF-8/LC_MESSAGES	base-locale-it		nls
+./usr/share/locale/it_CH.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-it		nls
+./usr/share/locale/it_CH.UTF-8/LC_MONETARY	base-locale-it		nls
+./usr/share/locale/it_CH.UTF-8/LC_NUMERIC	base-locale-it		nls
+./usr/share/locale/it_CH.UTF-8/LC_TIME		base-locale-it		nls
 ./usr/share/locale/it_IT.ISO8859-1		base-locale-it
 ./usr/share/locale/it_IT.ISO8859-1/LC_CTYPE	base-locale-it		nls
 ./usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES	base-locale-it
@@ -3426,6 +3224,13 @@
 ./usr/share/locale/it_IT.ISO8859-15/LC_MONETARY	base-locale-it		nls
 ./usr/share/locale/it_IT.ISO8859-15/LC_NUMERIC	base-locale-it		nls
 ./usr/share/locale/it_IT.ISO8859-15/LC_TIME	base-locale-it		nls
+./usr/share/locale/it_IT.UTF-8			base-locale-it
+./usr/share/locale/it_IT.UTF-8/LC_CTYPE		base-locale-it		nls
+./usr/share/locale/it_IT.UTF-8/LC_MESSAGES	base-locale-it		nls
+./usr/share/locale/it_IT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-it		nls
+./usr/share/locale/it_IT.UTF-8/LC_MONETARY	base-locale-it		nls
+./usr/share/locale/it_IT.UTF-8/LC_NUMERIC	base-locale-it		nls
+./usr/share/locale/it_IT.UTF-8/LC_TIME		base-locale-it		nls
 ./usr/share/locale/ja				base-locale-ja
 ./usr/share/locale/ja/LC_MESSAGES		base-locale-ja
 ./usr/share/locale/ja/LC_MESSAGES/grep.mo	base-util_locale-ja	nls,!bsdgrep
@@ -3456,6 +3261,13 @@
 ./usr/share/locale/ja_JP.SJIS/LC_MONETARY	base-locale-ja		nls
 ./usr/share/locale/ja_JP.SJIS/LC_NUMERIC	base-locale-ja		nls
 ./usr/share/locale/ja_JP.SJIS/LC_TIME		base-locale-ja		nls
+./usr/share/locale/ja_JP.UTF-8			base-locale-ja
+./usr/share/locale/ja_JP.UTF-8/LC_CTYPE		base-locale-ja		nls
+./usr/share/locale/ja_JP.UTF-8/LC_MESSAGES	base-locale-ja		nls
+./usr/share/locale/ja_JP.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ja		nls
+./usr/share/locale/ja_JP.UTF-8/LC_MONETARY	base-locale-ja		nls
+./usr/share/locale/ja_JP.UTF-8/LC_NUMERIC	base-locale-ja		nls
+./usr/share/locale/ja_JP.UTF-8/LC_TIME		base-locale-ja		nls
 ./usr/share/locale/ja_JP.ct			base-locale-ja
 ./usr/share/locale/ja_JP.ct/LC_CTYPE		base-locale-ja		nls
 ./usr/share/locale/ja_JP.ct/LC_MESSAGES		base-locale-ja
@@ -3477,11 +3289,24 @@
 ./usr/share/locale/kk_KZ.PT154/LC_MONETARY	base-locale-kk		nls
 ./usr/share/locale/kk_KZ.PT154/LC_NUMERIC	base-locale-kk		nls
 ./usr/share/locale/kk_KZ.PT154/LC_TIME		base-locale-kk		nls
+./usr/share/locale/kk_KZ.UTF-8			base-locale-kk
+./usr/share/locale/kk_KZ.UTF-8/LC_CTYPE		base-locale-kk		nls
+./usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES	base-locale-kk		nls
+./usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-kk		nls
+./usr/share/locale/kk_KZ.UTF-8/LC_MONETARY	base-locale-kk		nls
+./usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC	base-locale-kk		nls
+./usr/share/locale/kk_KZ.UTF-8/LC_TIME		base-locale-kk		nls
 ./usr/share/locale/ko				base-locale-ko
 ./usr/share/locale/ko/LC_MESSAGES		base-locale-ko
 ./usr/share/locale/ko/LC_MESSAGES/grep.mo	base-locale-ko		nls,!bsdgrep
 ./usr/share/locale/ko/LC_MESSAGES/tar.mo	base-obsolete		obsolete
+./usr/share/locale/ko_KR.UTF-8			base-locale-ko
 ./usr/share/locale/ko_KR.UTF-8/LC_CTYPE		base-obsolete		obsolete
+./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES	base-locale-ko		nls
+./usr/share/locale/ko_KR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ko		nls
+./usr/share/locale/ko_KR.UTF-8/LC_MONETARY	base-locale-ko		nls
+./usr/share/locale/ko_KR.UTF-8/LC_NUMERIC	base-locale-ko		nls
+./usr/share/locale/ko_KR.UTF-8/LC_TIME		base-locale-ko		nls
 ./usr/share/locale/ko_KR.eucKR			base-locale-ko
 ./usr/share/locale/ko_KR.eucKR/LC_CTYPE		base-locale-ko		nls
 ./usr/share/locale/ko_KR.eucKR/LC_MESSAGES	base-locale-ko
@@ -3504,9 +3329,37 @@
 ./usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY	base-locale-lt		nls
 ./usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC	base-locale-lt		nls
 ./usr/share/locale/lt_LT.ISO8859-4/LC_TIME	base-locale-lt		nls
+./usr/share/locale/lt_LT.UTF-8			base-locale-lt
+./usr/share/locale/lt_LT.UTF-8/LC_CTYPE		base-locale-lt		nls
+./usr/share/locale/lt_LT.UTF-8/LC_MESSAGES	base-locale-lt		nls
+./usr/share/locale/lt_LT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-lt		nls
+./usr/share/locale/lt_LT.UTF-8/LC_MONETARY	base-locale-lt		nls
+./usr/share/locale/lt_LT.UTF-8/LC_NUMERIC	base-locale-lt		nls
+./usr/share/locale/lt_LT.UTF-8/LC_TIME		base-locale-lt		nls
 ./usr/share/locale/nb				base-locale-nb
 ./usr/share/locale/nb/LC_MESSAGES		base-locale-nb
 ./usr/share/locale/nb/LC_MESSAGES/texinfo.mo	base-texinfo_locale-nb	nls
+./usr/share/locale/nb_NO.ISO8859-1		base-locale-nb
+./usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-1/LC_TIME	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-15		base-locale-nb
+./usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC	base-locale-nb		nls
+./usr/share/locale/nb_NO.ISO8859-15/LC_TIME	base-locale-nb		nls
+./usr/share/locale/nb_NO.UTF-8			base-locale-nb
+./usr/share/locale/nb_NO.UTF-8/LC_CTYPE		base-locale-nb		nls
+./usr/share/locale/nb_NO.UTF-8/LC_MESSAGES	base-locale-nb		nls
+./usr/share/locale/nb_NO.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nb		nls
+./usr/share/locale/nb_NO.UTF-8/LC_MONETARY	base-locale-nb		nls
+./usr/share/locale/nb_NO.UTF-8/LC_NUMERIC	base-locale-nb		nls
+./usr/share/locale/nb_NO.UTF-8/LC_TIME		base-locale-nb		nls
 ./usr/share/locale/nl				base-locale-nl
 ./usr/share/locale/nl/LC_MESSAGES		base-locale-nl
 ./usr/share/locale/nl/LC_MESSAGES/grep.mo	base-locale-nl		nls,!bsdgrep
@@ -3526,6 +3379,13 @@
 ./usr/share/locale/nl_BE.ISO8859-15/LC_MONETARY	base-locale-nl		nls
 ./usr/share/locale/nl_BE.ISO8859-15/LC_NUMERIC	base-locale-nl		nls
 ./usr/share/locale/nl_BE.ISO8859-15/LC_TIME	base-locale-nl		nls
+./usr/share/locale/nl_BE.UTF-8			base-locale-nl
+./usr/share/locale/nl_BE.UTF-8/LC_CTYPE		base-locale-nl		nls
+./usr/share/locale/nl_BE.UTF-8/LC_MESSAGES	base-locale-nl		nls
+./usr/share/locale/nl_BE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nl		nls
+./usr/share/locale/nl_BE.UTF-8/LC_MONETARY	base-locale-nl		nls
+./usr/share/locale/nl_BE.UTF-8/LC_NUMERIC	base-locale-nl		nls
+./usr/share/locale/nl_BE.UTF-8/LC_TIME		base-locale-nl		nls
 ./usr/share/locale/nl_NL.ISO8859-1		base-locale-nl
 ./usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE	base-locale-nl		nls
 ./usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES	base-locale-nl
@@ -3540,6 +3400,13 @@
 ./usr/share/locale/nl_NL.ISO8859-15/LC_MONETARY	base-locale-nl		nls
 ./usr/share/locale/nl_NL.ISO8859-15/LC_NUMERIC	base-locale-nl		nls
 ./usr/share/locale/nl_NL.ISO8859-15/LC_TIME	base-locale-nl		nls
+./usr/share/locale/nl_NL.UTF-8			base-locale-nl
+./usr/share/locale/nl_NL.UTF-8/LC_CTYPE		base-locale-nl		nls
+./usr/share/locale/nl_NL.UTF-8/LC_MESSAGES	base-locale-nl		nls
+./usr/share/locale/nl_NL.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nl		nls
+./usr/share/locale/nl_NL.UTF-8/LC_MONETARY	base-locale-nl		nls
+./usr/share/locale/nl_NL.UTF-8/LC_NUMERIC	base-locale-nl		nls
+./usr/share/locale/nl_NL.UTF-8/LC_TIME		base-locale-nl		nls
 ./usr/share/locale/nn				base-locale-nn
 ./usr/share/locale/nn/LC_MESSAGES		base-locale-nn
 ./usr/share/locale/nn_NO.ISO8859-1		base-locale-nn
@@ -3556,6 +3423,13 @@
 ./usr/share/locale/nn_NO.ISO8859-15/LC_MONETARY	base-locale-nn		nls
 ./usr/share/locale/nn_NO.ISO8859-15/LC_NUMERIC	base-locale-nn		nls
 ./usr/share/locale/nn_NO.ISO8859-15/LC_TIME	base-locale-nn		nls
+./usr/share/locale/nn_NO.UTF-8			base-locale-nn
+./usr/share/locale/nn_NO.UTF-8/LC_CTYPE		base-locale-nn		nls
+./usr/share/locale/nn_NO.UTF-8/LC_MESSAGES	base-locale-nn		nls
+./usr/share/locale/nn_NO.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-nn		nls
+./usr/share/locale/nn_NO.UTF-8/LC_MONETARY	base-locale-nn		nls
+./usr/share/locale/nn_NO.UTF-8/LC_NUMERIC	base-locale-nn		nls
+./usr/share/locale/nn_NO.UTF-8/LC_TIME		base-locale-nn		nls
 ./usr/share/locale/no				base-locale-no
 ./usr/share/locale/no/LC_MESSAGES		base-locale-no
 ./usr/share/locale/no/LC_MESSAGES/grep.mo	base-locale-no		nls,!bsdgrep
@@ -3589,6 +3463,13 @@
 ./usr/share/locale/pl_PL.ISO8859-2/LC_MONETARY	base-locale-pl		nls
 ./usr/share/locale/pl_PL.ISO8859-2/LC_NUMERIC	base-locale-pl		nls
 ./usr/share/locale/pl_PL.ISO8859-2/LC_TIME	base-locale-pl		nls
+./usr/share/locale/pl_PL.UTF-8			base-locale-pl
+./usr/share/locale/pl_PL.UTF-8/LC_CTYPE		base-locale-pl		nls
+./usr/share/locale/pl_PL.UTF-8/LC_MESSAGES	base-locale-pl		nls
+./usr/share/locale/pl_PL.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-pl		nls
+./usr/share/locale/pl_PL.UTF-8/LC_MONETARY	base-locale-pl		nls
+./usr/share/locale/pl_PL.UTF-8/LC_NUMERIC	base-locale-pl		nls
+./usr/share/locale/pl_PL.UTF-8/LC_TIME		base-locale-pl		nls
 ./usr/share/locale/pt				base-locale-pt
 ./usr/share/locale/pt/LC_MESSAGES		base-locale-pt
 ./usr/share/locale/pt/LC_MESSAGES/tar.mo	base-obsolete		obsolete
@@ -3600,6 +3481,13 @@
 ./usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY	base-locale-pt		nls
 ./usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC	base-locale-pt		nls
 ./usr/share/locale/pt_BR.ISO8859-1/LC_TIME	base-locale-pt		nls
+./usr/share/locale/pt_BR.UTF-8			base-locale-pt
+./usr/share/locale/pt_BR.UTF-8/LC_CTYPE		base-locale-pt		nls
+./usr/share/locale/pt_BR.UTF-8/LC_MESSAGES	base-locale-pt		nls
+./usr/share/locale/pt_BR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-pt		nls
+./usr/share/locale/pt_BR.UTF-8/LC_MONETARY	base-locale-pt		nls
+./usr/share/locale/pt_BR.UTF-8/LC_NUMERIC	base-locale-pt		nls
+./usr/share/locale/pt_BR.UTF-8/LC_TIME		base-locale-pt		nls
 ./usr/share/locale/pt_BR/LC_MESSAGES		base-locale-pt
 ./usr/share/locale/pt_BR/LC_MESSAGES/grep.mo	base-locale-pt		nls,!bsdgrep
 ./usr/share/locale/pt_BR/LC_MESSAGES/tar.mo	base-obsolete		obsolete
@@ -3617,6 +3505,13 @@
 ./usr/share/locale/pt_PT.ISO8859-15/LC_MONETARY	base-locale-pt		nls
 ./usr/share/locale/pt_PT.ISO8859-15/LC_NUMERIC	base-locale-pt		nls
 ./usr/share/locale/pt_PT.ISO8859-15/LC_TIME	base-locale-pt		nls
+./usr/share/locale/pt_PT.UTF-8			base-locale-pt
+./usr/share/locale/pt_PT.UTF-8/LC_CTYPE		base-locale-pt		nls
+./usr/share/locale/pt_PT.UTF-8/LC_MESSAGES	base-locale-pt		nls
+./usr/share/locale/pt_PT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-pt		nls
+./usr/share/locale/pt_PT.UTF-8/LC_MONETARY	base-locale-pt		nls
+./usr/share/locale/pt_PT.UTF-8/LC_NUMERIC	base-locale-pt		nls
+./usr/share/locale/pt_PT.UTF-8/LC_TIME		base-locale-pt		nls
 ./usr/share/locale/ro				base-locale-ro
 ./usr/share/locale/ro/LC_MESSAGES		base-locale-ro
 ./usr/share/locale/ro/LC_MESSAGES/texinfo.mo	base-texinfo_locale-ro	nls
@@ -3627,6 +3522,13 @@
 ./usr/share/locale/ro_RO.ISO8859-2/LC_MONETARY	base-locale-ro		nls
 ./usr/share/locale/ro_RO.ISO8859-2/LC_NUMERIC	base-locale-ro		nls
 ./usr/share/locale/ro_RO.ISO8859-2/LC_TIME	base-locale-ro		nls
+./usr/share/locale/ro_RO.UTF-8			base-locale-ro
+./usr/share/locale/ro_RO.UTF-8/LC_CTYPE		base-locale-ro		nls
+./usr/share/locale/ro_RO.UTF-8/LC_MESSAGES	base-locale-ro		nls
+./usr/share/locale/ro_RO.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ro		nls
+./usr/share/locale/ro_RO.UTF-8/LC_MONETARY	base-locale-ro		nls
+./usr/share/locale/ro_RO.UTF-8/LC_NUMERIC	base-locale-ro		nls
+./usr/share/locale/ro_RO.UTF-8/LC_TIME		base-locale-ro		nls
 ./usr/share/locale/ru				base-locale-ru
 ./usr/share/locale/ru/LC_MESSAGES		base-locale-ru
 ./usr/share/locale/ru/LC_MESSAGES/grep.mo	base-locale-ru		nls,!bsdgrep
@@ -3639,6 +3541,13 @@
 ./usr/share/locale/ru_BY.CP1251/LC_MONETARY	base-locale-ru		nls
 ./usr/share/locale/ru_BY.CP1251/LC_NUMERIC	base-locale-ru		nls
 ./usr/share/locale/ru_BY.CP1251/LC_TIME		base-locale-ru		nls
+./usr/share/locale/ru_BY.UTF-8			base-locale-ru
+./usr/share/locale/ru_BY.UTF-8/LC_CTYPE		base-locale-ru		nls
+./usr/share/locale/ru_BY.UTF-8/LC_MESSAGES	base-locale-ru		nls
+./usr/share/locale/ru_BY.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ru		nls
+./usr/share/locale/ru_BY.UTF-8/LC_MONETARY	base-locale-ru		nls
+./usr/share/locale/ru_BY.UTF-8/LC_NUMERIC	base-locale-ru		nls
+./usr/share/locale/ru_BY.UTF-8/LC_TIME		base-locale-ru		nls
 ./usr/share/locale/ru_RU.CP1251			base-locale-ru
 ./usr/share/locale/ru_RU.CP1251/LC_CTYPE	base-locale-ru		nls
 ./usr/share/locale/ru_RU.CP1251/LC_MESSAGES	base-locale-ru
@@ -3667,6 +3576,13 @@
 ./usr/share/locale/ru_RU.KOI8-R/LC_MONETARY	base-locale-ru		nls
 ./usr/share/locale/ru_RU.KOI8-R/LC_NUMERIC	base-locale-ru		nls
 ./usr/share/locale/ru_RU.KOI8-R/LC_TIME		base-locale-ru		nls
+./usr/share/locale/ru_RU.UTF-8			base-locale-ru
+./usr/share/locale/ru_RU.UTF-8/LC_CTYPE		base-locale-ru		nls
+./usr/share/locale/ru_RU.UTF-8/LC_MESSAGES	base-locale-ru		nls
+./usr/share/locale/ru_RU.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-ru		nls
+./usr/share/locale/ru_RU.UTF-8/LC_MONETARY	base-locale-ru		nls
+./usr/share/locale/ru_RU.UTF-8/LC_NUMERIC	base-locale-ru		nls
+./usr/share/locale/ru_RU.UTF-8/LC_TIME		base-locale-ru		nls
 ./usr/share/locale/ru_SU.CP866			base-obsolete		obsolete
 ./usr/share/locale/ru_SU.CP866/LC_CTYPE		base-obsolete		obsolete
 ./usr/share/locale/ru_SU.ISO8859-5		base-obsolete		obsolete
@@ -3682,6 +3598,13 @@
 ./usr/share/locale/sk_SK.ISO8859-2/LC_MONETARY	base-locale-sk		nls
 ./usr/share/locale/sk_SK.ISO8859-2/LC_NUMERIC	base-locale-sk		nls
 ./usr/share/locale/sk_SK.ISO8859-2/LC_TIME	base-locale-sk		nls
+./usr/share/locale/sk_SK.UTF-8			base-locale-sk
+./usr/share/locale/sk_SK.UTF-8/LC_CTYPE		base-locale-sk		nls
+./usr/share/locale/sk_SK.UTF-8/LC_MESSAGES	base-locale-sk		nls
+./usr/share/locale/sk_SK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sk		nls
+./usr/share/locale/sk_SK.UTF-8/LC_MONETARY	base-locale-sk		nls
+./usr/share/locale/sk_SK.UTF-8/LC_NUMERIC	base-locale-sk		nls
+./usr/share/locale/sk_SK.UTF-8/LC_TIME		base-locale-sk		nls
 ./usr/share/locale/sl				base-locale-sl
 ./usr/share/locale/sl/LC_MESSAGES		base-locale-sl
 ./usr/share/locale/sl/LC_MESSAGES/grep.mo	base-locale-sl		nls,!bsdgrep
@@ -3693,8 +3616,43 @@
 ./usr/share/locale/sl_SI.ISO8859-2/LC_MONETARY	base-locale-sl		nls
 ./usr/share/locale/sl_SI.ISO8859-2/LC_NUMERIC	base-locale-sl		nls
 ./usr/share/locale/sl_SI.ISO8859-2/LC_TIME	base-locale-sl		nls
+./usr/share/locale/sl_SI.UTF-8			base-locale-sl
+./usr/share/locale/sl_SI.UTF-8/LC_CTYPE		base-locale-sl		nls
+./usr/share/locale/sl_SI.UTF-8/LC_MESSAGES	base-locale-sl		nls
+./usr/share/locale/sl_SI.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sl		nls
+./usr/share/locale/sl_SI.UTF-8/LC_MONETARY	base-locale-sl		nls
+./usr/share/locale/sl_SI.UTF-8/LC_NUMERIC	base-locale-sl		nls
+./usr/share/locale/sl_SI.UTF-8/LC_TIME		base-locale-sl		nls
 ./usr/share/locale/sr				base-locale-sr
 ./usr/share/locale/sr/LC_MESSAGES		base-locale-sr
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5		base-locale-sr
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_CTYPE	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MESSAGES	base-locale-sr
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-sr	nls
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MONETARY	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_NUMERIC	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_TIME	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.UTF-8			base-locale-sr
+./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_CTYPE		base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MESSAGES	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_MONETARY	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_NUMERIC	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_ME.UTF-8/LC_TIME		base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5		base-locale-sr
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES	base-locale-sr
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-sr	nls
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.UTF-8			base-locale-sr
+./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE		base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC	base-locale-sr		nls
+./usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME		base-locale-sr		nls
 ./usr/share/locale/sr_Latn_ME.ISO8859-2		base-locale-sr
 ./usr/share/locale/sr_Latn_ME.ISO8859-2/LC_CTYPE	base-locale-sr		nls
 ./usr/share/locale/sr_Latn_ME.ISO8859-2/LC_MESSAGES	base-locale-sr
@@ -3702,13 +3660,13 @@
 ./usr/share/locale/sr_Latn_ME.ISO8859-2/LC_MONETARY	base-locale-sr		nls
 ./usr/share/locale/sr_Latn_ME.ISO8859-2/LC_NUMERIC	base-locale-sr		nls
 ./usr/share/locale/sr_Latn_ME.ISO8859-2/LC_TIME	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5		base-locale-sr
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_CTYPE	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MESSAGES	base-locale-sr
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-sr	nls
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_MONETARY	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_NUMERIC	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_ME.ISO8859-5/LC_TIME	base-locale-sr		nls
+./usr/share/locale/sr_Latn_ME.UTF-8			base-locale-sr
+./usr/share/locale/sr_Latn_ME.UTF-8/LC_CTYPE		base-locale-sr		nls
+./usr/share/locale/sr_Latn_ME.UTF-8/LC_MESSAGES	base-locale-sr		nls
+./usr/share/locale/sr_Latn_ME.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
+./usr/share/locale/sr_Latn_ME.UTF-8/LC_MONETARY	base-locale-sr		nls
+./usr/share/locale/sr_Latn_ME.UTF-8/LC_NUMERIC	base-locale-sr		nls
+./usr/share/locale/sr_Latn_ME.UTF-8/LC_TIME		base-locale-sr		nls
 ./usr/share/locale/sr_Latn_RS.ISO8859-2		base-locale-sr
 ./usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE	base-locale-sr		nls
 ./usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES	base-locale-sr
@@ -3716,13 +3674,13 @@
 ./usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY	base-locale-sr		nls
 ./usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC	base-locale-sr		nls
 ./usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5		base-locale-sr
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES	base-locale-sr
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-sr	nls
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC	base-locale-sr		nls
-./usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME	base-locale-sr		nls
+./usr/share/locale/sr_Latn_RS.UTF-8			base-locale-sr
+./usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE		base-locale-sr		nls
+./usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES	base-locale-sr		nls
+./usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sr		nls
+./usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY	base-locale-sr		nls
+./usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC	base-locale-sr		nls
+./usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME		base-locale-sr		nls
 ./usr/share/locale/sr_ME.ISO8859-2		base-obsolete		obsolete
 ./usr/share/locale/sr_ME.ISO8859-2/LC_CTYPE	base-obsolete		obsolete
 ./usr/share/locale/sr_ME.ISO8859-2/LC_MESSAGES	base-obsolete		obsolete
@@ -3774,6 +3732,13 @@
 ./usr/share/locale/sv_SE.ISO8859-15/LC_MONETARY	base-locale-sv		nls
 ./usr/share/locale/sv_SE.ISO8859-15/LC_NUMERIC	base-locale-sv		nls
 ./usr/share/locale/sv_SE.ISO8859-15/LC_TIME	base-locale-sv		nls
+./usr/share/locale/sv_SE.UTF-8			base-locale-sv
+./usr/share/locale/sv_SE.UTF-8/LC_CTYPE		base-locale-sv		nls
+./usr/share/locale/sv_SE.UTF-8/LC_MESSAGES	base-locale-sv		nls
+./usr/share/locale/sv_SE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-sv		nls
+./usr/share/locale/sv_SE.UTF-8/LC_MONETARY	base-locale-sv		nls
+./usr/share/locale/sv_SE.UTF-8/LC_NUMERIC	base-locale-sv		nls
+./usr/share/locale/sv_SE.UTF-8/LC_TIME		base-locale-sv		nls
 ./usr/share/locale/tr				base-locale-tr
 ./usr/share/locale/tr/LC_MESSAGES		base-locale-tr
 ./usr/share/locale/tr/LC_MESSAGES/tar.mo	base-obsolete		obsolete
@@ -3785,6 +3750,13 @@
 ./usr/share/locale/tr_TR.ISO8859-9/LC_MONETARY	base-locale-tr		nls
 ./usr/share/locale/tr_TR.ISO8859-9/LC_NUMERIC	base-locale-tr		nls
 ./usr/share/locale/tr_TR.ISO8859-9/LC_TIME	base-locale-tr		nls
+./usr/share/locale/tr_TR.UTF-8			base-locale-tr
+./usr/share/locale/tr_TR.UTF-8/LC_CTYPE		base-locale-tr		nls
+./usr/share/locale/tr_TR.UTF-8/LC_MESSAGES	base-locale-tr		nls
+./usr/share/locale/tr_TR.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-tr		nls
+./usr/share/locale/tr_TR.UTF-8/LC_MONETARY	base-locale-tr		nls
+./usr/share/locale/tr_TR.UTF-8/LC_NUMERIC	base-locale-tr		nls
+./usr/share/locale/tr_TR.UTF-8/LC_TIME		base-locale-tr		nls
 ./usr/share/locale/uk				base-locale-uk
 ./usr/share/locale/uk/LC_MESSAGES		base-locale-uk
 ./usr/share/locale/uk_UA.CP1251			base-locale-uk
@@ -3808,6 +3780,13 @@
 ./usr/share/locale/uk_UA.KOI8-U/LC_MONETARY	base-locale-uk		nls
 ./usr/share/locale/uk_UA.KOI8-U/LC_NUMERIC	base-locale-uk		nls
 ./usr/share/locale/uk_UA.KOI8-U/LC_TIME		base-locale-uk		nls
+./usr/share/locale/uk_UA.UTF-8			base-locale-uk
+./usr/share/locale/uk_UA.UTF-8/LC_CTYPE		base-locale-uk		nls
+./usr/share/locale/uk_UA.UTF-8/LC_MESSAGES	base-locale-uk		nls
+./usr/share/locale/uk_UA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-uk		nls
+./usr/share/locale/uk_UA.UTF-8/LC_MONETARY	base-locale-uk		nls
+./usr/share/locale/uk_UA.UTF-8/LC_NUMERIC	base-locale-uk		nls
+./usr/share/locale/uk_UA.UTF-8/LC_TIME		base-locale-uk		nls
 ./usr/share/locale/zh_CN			base-locale-zh
 ./usr/share/locale/zh_CN.GB18030		base-locale-zh
 ./usr/share/locale/zh_CN.GB18030/LC_CTYPE	base-locale-zh		nls
@@ -3816,6 +3795,13 @@
 ./usr/share/locale/zh_CN.GB18030/LC_MONETARY	base-locale-zh		nls
 ./usr/share/locale/zh_CN.GB18030/LC_NUMERIC	base-locale-zh		nls
 ./usr/share/locale/zh_CN.GB18030/LC_TIME	base-locale-zh		nls
+./usr/share/locale/zh_CN.UTF-8			base-locale-zh
+./usr/share/locale/zh_CN.UTF-8/LC_CTYPE		base-locale-zh		nls
+./usr/share/locale/zh_CN.UTF-8/LC_MESSAGES	base-locale-zh		nls
+./usr/share/locale/zh_CN.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-zh		nls
+./usr/share/locale/zh_CN.UTF-8/LC_MONETARY	base-locale-zh		nls
+./usr/share/locale/zh_CN.UTF-8/LC_NUMERIC	base-locale-zh		nls
+./usr/share/locale/zh_CN.UTF-8/LC_TIME		base-locale-zh		nls
 ./usr/share/locale/zh_CN.eucCN			base-locale-zh
 ./usr/share/locale/zh_CN.eucCN/LC_CTYPE		base-locale-zh		nls
 ./usr/share/locale/zh_CN.eucCN/LC_MESSAGES	base-locale-zh
@@ -3834,6 +3820,13 @@
 ./usr/share/locale/zh_HK.Big5hkscs/LC_MONETARY	base-locale-zh		nls
 ./usr/share/locale/zh_HK.Big5hkscs/LC_NUMERIC	base-locale-zh		nls
 ./usr/share/locale/zh_HK.Big5hkscs/LC_TIME	base-locale-zh		nls
+./usr/share/locale/zh_HK.UTF-8			base-locale-zh
+./usr/share/locale/zh_HK.UTF-8/LC_CTYPE		base-locale-zh		nls
+./usr/share/locale/zh_HK.UTF-8/LC_MESSAGES	base-locale-zh		nls
+./usr/share/locale/zh_HK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES		base-locale-zh		nls
+./usr/share/locale/zh_HK.UTF-8/LC_MONETARY	base-locale-zh		nls
+./usr/share/locale/zh_HK.UTF-8/LC_NUMERIC	base-locale-zh		nls
+./usr/share/locale/zh_HK.UTF-8/LC_TIME		base-locale-zh		nls
 ./usr/share/locale/zh_TW			base-locale-zh
 ./usr/share/locale/zh_TW.BIG5			base-obsolete		obsolete
 ./usr/share/locale/zh_TW.BIG5/LC_CTYPE		base-obsolete		obsolete
@@ -3844,6 +3837,13 @@
 ./usr/share/locale/zh_TW.Big5/LC_MONETARY	base-locale-zh		nls
 ./usr/share/locale/zh_TW.Big5/LC_NUMERIC	base-locale-zh		nls
 ./usr/share/locale/zh_TW.Big5/LC_TIME		base-locale-zh		nls
+./usr/share/locale/zh_TW.UTF-8			base-locale-zh
+./usr/share/locale/zh_TW.UTF-8/LC_CTYPE		base-locale-zh		nls
+./usr/share/locale/zh_TW.UTF-8/LC_MESSAGES	base-locale-zh		nls
+./usr/share/locale/zh_TW.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-zh	nls
+./usr/share/locale/zh_TW.UTF-8/LC_MONETARY	base-locale-zh		nls
+./usr/share/locale/zh_TW.UTF-8/LC_NUMERIC	base-locale-zh		nls
+./usr/share/locale/zh_TW.UTF-8/LC_TIME		base-locale-zh		nls
 ./usr/share/locale/zh_TW.eucTW			base-locale-zh
 ./usr/share/locale/zh_TW.eucTW/LC_CTYPE		base-locale-zh		nls
 ./usr/share/locale/zh_TW.eucTW/LC_MESSAGES	base-locale-zh
@@ -4844,9 +4844,9 @@
 ./usr/share/zoneinfo/America/Coral_Harbour	base-sys-share		share
 ./usr/share/zoneinfo/America/Cordoba		base-sys-share		share
 ./usr/share/zoneinfo/America/Costa_Rica		base-sys-share		share
+./usr/share/zoneinfo/America/Creston		base-sys-share		share
 ./usr/share/zoneinfo/America/Cuiaba		base-sys-share		share
 ./usr/share/zoneinfo/America/Curacao		base-sys-share		share
-./usr/share/zoneinfo/America/Creston		base-sys-share		share
 ./usr/share/zoneinfo/America/Danmarkshavn	base-sys-share		share
 ./usr/share/zoneinfo/America/Dawson		base-sys-share		share
 ./usr/share/zoneinfo/America/Dawson_Creek	base-sys-share		share
--- a/distrib/sets/lists/base/rescue.mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/rescue.mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rescue.mi,v 1.34 2012/05/25 21:46:13 jnemeth Exp $
+# $NetBSD: rescue.mi,v 1.35 2013/08/11 22:29:02 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -66,8 +66,8 @@
 ./rescue/ldd					base-rescue-root
 ./rescue/less					base-rescue-root
 ./rescue/lfs_cleanerd				base-rescue-root
+./rescue/lmcconfig				base-rescue-root
 ./rescue/lmcctl					base-obsolete	obsolete
-./rescue/lmcconfig				base-rescue-root
 ./rescue/ln					base-rescue-root
 ./rescue/ls					base-rescue-root
 ./rescue/mbrlabel				base-rescue-root
@@ -152,8 +152,8 @@
 ./rescue/tunefs					base-rescue-root
 ./rescue/umount					base-rescue-root
 ./rescue/veriexecctl				base-rescue-root
+./rescue/vi					base-rescue-root
 ./rescue/vnconfig				base-rescue-root
-./rescue/vi					base-rescue-root
 ./rescue/wdogctl				base-rescue-root
 ./rescue/wsconsctl				base-rescue-root
 ./rescue/zcat					base-rescue-root
--- a/distrib/sets/lists/base/shl.mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/base/shl.mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.669 2013/08/08 06:23:01 matt Exp $
+# $NetBSD: shl.mi,v 1.670 2013/08/11 22:29:02 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -13,15 +13,6 @@
 #
 # Note:	libtermcap and libtermlib are hardlinked and share the same version.
 #
-./lib/npf/ext_log.so				base-npf-shlib		npf
-./lib/npf/ext_log.so.0				base-npf-shlib		npf
-./lib/npf/ext_log.so.0.0			base-npf-shlib		npf
-./lib/npf/ext_normalize.so			base-npf-shlib		npf
-./lib/npf/ext_normalize.so.0			base-npf-shlib		npf
-./lib/npf/ext_normalize.so.0.0			base-npf-shlib		npf
-./lib/npf/ext_rndblock.so			base-npf-shlib		npf
-./lib/npf/ext_rndblock.so.0			base-npf-shlib		npf
-./lib/npf/ext_rndblock.so.0.0			base-npf-shlib		npf
 ./lib/libc.so					base-sys-shlib		dynamicroot
 ./lib/libc.so.12				base-sys-shlib		dynamicroot
 ./lib/libc.so.12.185				base-sys-shlib		dynamicroot
@@ -55,12 +46,12 @@
 ./lib/liblzma.so				base-sys-shlib		dynamicroot
 ./lib/liblzma.so.1				base-sys-shlib		dynamicroot
 ./lib/liblzma.so.1.1				base-sys-shlib		dynamicroot
+./lib/libm.so					base-sys-shlib		dynamicroot
+./lib/libm.so.0					base-sys-shlib		dynamicroot
+./lib/libm.so.0.10				base-sys-shlib		dynamicroot
 ./lib/libnpf.so					base-sys-shlib		dynamicroot
 ./lib/libnpf.so.0				base-sys-shlib		dynamicroot
 ./lib/libnpf.so.0.0				base-sys-shlib		dynamicroot
-./lib/libm.so					base-sys-shlib		dynamicroot
-./lib/libm.so.0					base-sys-shlib		dynamicroot
-./lib/libm.so.0.10				base-sys-shlib		dynamicroot
 ./lib/libpcap.so				base-sys-shlib		dynamicroot
 ./lib/libpcap.so.5				base-sys-shlib		dynamicroot
 ./lib/libpcap.so.5.0				base-sys-shlib		dynamicroot
@@ -91,6 +82,15 @@
 ./lib/libz.so					base-sys-shlib		dynamicroot
 ./lib/libz.so.1					base-sys-shlib		dynamicroot
 ./lib/libz.so.1.0				base-sys-shlib		dynamicroot
+./lib/npf/ext_log.so				base-npf-shlib		npf
+./lib/npf/ext_log.so.0				base-npf-shlib		npf
+./lib/npf/ext_log.so.0.0			base-npf-shlib		npf
+./lib/npf/ext_normalize.so			base-npf-shlib		npf
+./lib/npf/ext_normalize.so.0			base-npf-shlib		npf
+./lib/npf/ext_normalize.so.0.0			base-npf-shlib		npf
+./lib/npf/ext_rndblock.so			base-npf-shlib		npf
+./lib/npf/ext_rndblock.so.0			base-npf-shlib		npf
+./lib/npf/ext_rndblock.so.0.0			base-npf-shlib		npf
 ./libexec/ld.elf_so				base-sys-shlib		dynamicroot
 ./usr/lib/i18n/libBIG5.so			base-i18n-shlib
 ./usr/lib/i18n/libBIG5.so.5			base-i18n-shlib
@@ -169,12 +169,12 @@
 ./usr/lib/libasn1.so				base-krb5-shlib		kerberos
 ./usr/lib/libasn1.so.9				base-krb5-shlib		kerberos
 ./usr/lib/libasn1.so.9.0			base-krb5-shlib		kerberos
+./usr/lib/libatf-c++.so				base-atf-shlib		atf
+./usr/lib/libatf-c++.so.0			base-atf-shlib		atf
+./usr/lib/libatf-c++.so.0.0			base-atf-shlib		atf
 ./usr/lib/libatf-c.so				base-atf-shlib		atf
 ./usr/lib/libatf-c.so.0				base-atf-shlib		atf
 ./usr/lib/libatf-c.so.0.0			base-atf-shlib		atf
-./usr/lib/libatf-c++.so				base-atf-shlib		atf
-./usr/lib/libatf-c++.so.0			base-atf-shlib		atf
-./usr/lib/libatf-c++.so.0.0			base-atf-shlib		atf
 ./usr/lib/libavl.so				base-zfs-shlib		dynamicroot,zfs
 ./usr/lib/libavl.so.0				base-zfs-shlib		dynamicroot,zfs
 ./usr/lib/libavl.so.0.0          		base-zfs-shlib		zfs,dynamicroot
@@ -192,12 +192,12 @@
 ./usr/lib/libbz2.so				base-sys-shlib
 ./usr/lib/libbz2.so.1				base-sys-shlib
 ./usr/lib/libbz2.so.1.1				base-sys-shlib
+./usr/lib/libc++.so				base-sys-shlib		libcxx
+./usr/lib/libc++.so.1				base-sys-shlib		libcxx
+./usr/lib/libc++.so.1.0				base-sys-shlib		libcxx
 ./usr/lib/libc.so				base-sys-shlib
 ./usr/lib/libc.so.12				base-sys-shlib
 ./usr/lib/libc.so.12.185			base-sys-shlib
-./usr/lib/libc++.so				base-sys-shlib		libcxx
-./usr/lib/libc++.so.1				base-sys-shlib		libcxx
-./usr/lib/libc++.so.1.0				base-sys-shlib		libcxx
 ./usr/lib/libcdk.so				base-obsolete		obsolete
 ./usr/lib/libcom_err.so				base-krb5-shlib		kerberos
 ./usr/lib/libcom_err.so.7			base-krb5-shlib		kerberos
@@ -328,10 +328,10 @@
 ./usr/lib/libkafs.so				base-krb5-shlib		kerberos
 ./usr/lib/libkafs.so.12				base-krb5-shlib		kerberos
 ./usr/lib/libkafs.so.12.0			base-krb5-shlib		kerberos
+./usr/lib/libkdb.so				base-obsolete		obsolete
 ./usr/lib/libkdc.so				base-krb5-shlib		kerberos
 ./usr/lib/libkdc.so.2				base-krb5-shlib		kerberos
 ./usr/lib/libkdc.so.2.0				base-krb5-shlib		kerberos
-./usr/lib/libkdb.so				base-obsolete		obsolete
 ./usr/lib/libkrb.so				base-obsolete		obsolete
 ./usr/lib/libkrb5.so				base-krb5-shlib		kerberos
 ./usr/lib/libkrb5.so.26				base-krb5-shlib		kerberos
@@ -358,12 +358,12 @@
 ./usr/lib/liblwres.so				base-bind-shlib
 ./usr/lib/liblwres.so.7				base-bind-shlib
 ./usr/lib/liblwres.so.7.0			base-bind-shlib
+./usr/lib/liblzf.so				base-sys-shlib
+./usr/lib/liblzf.so.1				base-sys-shlib
+./usr/lib/liblzf.so.1.0				base-sys-shlib
 ./usr/lib/liblzma.so				base-sys-shlib
 ./usr/lib/liblzma.so.1				base-sys-shlib
 ./usr/lib/liblzma.so.1.1			base-sys-shlib
-./usr/lib/liblzf.so				base-sys-shlib
-./usr/lib/liblzf.so.1				base-sys-shlib
-./usr/lib/liblzf.so.1.0				base-sys-shlib
 ./usr/lib/libm.so				base-sys-shlib
 ./usr/lib/libm.so.0				base-sys-shlib
 ./usr/lib/libm.so.0.10				base-sys-shlib
@@ -390,8 +390,8 @@
 ./usr/lib/libnvpair.so.0.0			base-zfs-shlib		zfs,dynamicroot
 ./usr/lib/libobjc.so				base-sys-shlib		gcc
 ./usr/lib/libobjc.so.3				base-sys-shlib		gcc=4
+./usr/lib/libobjc.so.3				base-sys-shlib		gcc=45
 ./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=4
-./usr/lib/libobjc.so.3				base-sys-shlib		gcc=45
 ./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=45
 ./usr/lib/libopenpgpsdk.so			base-obsolete		obsolete
 ./usr/lib/libopenpgpsdk.so.0			base-obsolete		obsolete
@@ -399,9 +399,6 @@
 ./usr/lib/libossaudio.so			base-sys-shlib
 ./usr/lib/libossaudio.so.1			base-sys-shlib
 ./usr/lib/libossaudio.so.1.0			base-sys-shlib
-./usr/lib/libperfuse.so				base-perfuse-shlib
-./usr/lib/libperfuse.so.0			base-perfuse-shlib
-./usr/lib/libperfuse.so.0.0			base-perfuse-shlib
 ./usr/lib/libp2k.so				base-puffs-shlib	rump
 ./usr/lib/libp2k.so.2				base-puffs-shlib	rump
 ./usr/lib/libp2k.so.2.0				base-puffs-shlib	rump
@@ -414,6 +411,9 @@
 ./usr/lib/libpci.so				base-sys-shlib
 ./usr/lib/libpci.so.2				base-sys-shlib
 ./usr/lib/libpci.so.2.0				base-sys-shlib
+./usr/lib/libperfuse.so				base-perfuse-shlib
+./usr/lib/libperfuse.so.0			base-perfuse-shlib
+./usr/lib/libperfuse.so.0.0			base-perfuse-shlib
 ./usr/lib/libposix.so				base-sys-shlib
 ./usr/lib/libposix.so.0				base-sys-shlib
 ./usr/lib/libposix.so.0.1			base-sys-shlib
@@ -621,6 +621,9 @@
 ./usr/lib/librumpfs_zfs.so			base-rump-shlib		zfs,rump
 ./usr/lib/librumpfs_zfs.so.0			base-rump-shlib		zfs,rump
 ./usr/lib/librumpfs_zfs.so.0.0			base-rump-shlib		zfs,rump
+./usr/lib/librumphijack.so			base-rump-shlib	rump
+./usr/lib/librumphijack.so.0			base-rump-shlib	rump
+./usr/lib/librumphijack.so.0.0			base-rump-shlib	rump
 ./usr/lib/librumpkern_crypto.so			base-rump-shlib	rump
 ./usr/lib/librumpkern_crypto.so.0		base-rump-shlib	rump
 ./usr/lib/librumpkern_crypto.so.0.0		base-rump-shlib	rump
@@ -678,9 +681,6 @@
 ./usr/lib/librumpuser.so			base-rump-shlib	rump
 ./usr/lib/librumpuser.so.0			base-rump-shlib	rump
 ./usr/lib/librumpuser.so.0.1			base-rump-shlib	rump
-./usr/lib/librumphijack.so			base-rump-shlib	rump
-./usr/lib/librumphijack.so.0			base-rump-shlib	rump
-./usr/lib/librumphijack.so.0.0			base-rump-shlib	rump
 ./usr/lib/librumpvfs.so				base-rump-shlib	rump
 ./usr/lib/librumpvfs.so.0			base-rump-shlib	rump
 ./usr/lib/librumpvfs.so.0.0			base-rump-shlib	rump
--- a/distrib/sets/lists/comp/ad.arm	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/ad.arm	Sun Aug 11 22:29:02 2013 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: ad.arm,v 1.50 2013/08/11 22:27:44 joerg Exp $
-./usr/include/gcc-4.5/arm_neon.h		comp-c-include		gcccmds,gcc=45
-./usr/include/gcc-4.5/mmintrin.h		comp-c-include		gcccmds,gcc=45
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
+# $NetBSD: ad.arm,v 1.51 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/acorn26				comp-c-include
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -16,8 +13,8 @@
 ./usr/include/acorn26/elf_machdep.h		comp-obsolete		obsolete
 ./usr/include/acorn26/endian.h			comp-obsolete		obsolete
 ./usr/include/acorn26/endian_machdep.h		comp-obsolete		obsolete
+./usr/include/acorn26/fenv.h			comp-obsolete		obsolete
 ./usr/include/acorn26/float.h			comp-obsolete		obsolete
-./usr/include/acorn26/fenv.h			comp-obsolete		obsolete
 ./usr/include/acorn26/fp.h			comp-obsolete		obsolete
 ./usr/include/acorn26/frame.h			comp-obsolete		obsolete
 ./usr/include/acorn26/ieee.h			comp-obsolete		obsolete
@@ -180,8 +177,8 @@
 ./usr/include/arm/sysarch.h			comp-c-include
 ./usr/include/arm/trap.h			comp-c-include
 ./usr/include/arm/types.h			comp-c-include
+./usr/include/arm/varargs.h			comp-obsolete		obsolete
 ./usr/include/arm/vfpreg.h			comp-c-include
-./usr/include/arm/varargs.h			comp-obsolete		obsolete
 ./usr/include/arm/vmparam.h			comp-c-include
 ./usr/include/arm/wchar_limits.h		comp-c-include
 ./usr/include/arm26				comp-obsolete		obsolete
@@ -388,6 +385,9 @@
 ./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		gcccmds,gcc=45
+./usr/include/gcc-4.5/mmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/hpcarm				comp-c-include
 ./usr/include/hpcarm/ansi.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/aout_machdep.h		comp-obsolete		obsolete
@@ -438,6 +438,7 @@
 ./usr/include/hpcarm/varargs.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/vmparam.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/wchar_limits.h		comp-obsolete		obsolete
+./usr/include/ieeefp.h				comp-c-include
 ./usr/include/iyonix				comp-c-include
 ./usr/include/iyonix/ansi.h			comp-obsolete		obsolete
 ./usr/include/iyonix/aout_machdep.h		comp-obsolete		obsolete
@@ -538,6 +539,7 @@
 ./usr/include/netwinder/varargs.h		comp-obsolete		obsolete
 ./usr/include/netwinder/vmparam.h		comp-obsolete		obsolete
 ./usr/include/netwinder/wchar_limits.h		comp-obsolete		obsolete
+./usr/include/pmc.h				comp-c-include
 ./usr/include/shark				comp-c-include
 ./usr/include/shark/ansi.h			comp-obsolete		obsolete
 ./usr/include/shark/aout_machdep.h		comp-obsolete		obsolete
@@ -637,8 +639,6 @@
 ./usr/include/zaurus/varargs.h			comp-obsolete		obsolete
 ./usr/include/zaurus/vmparam.h			comp-obsolete		obsolete
 ./usr/include/zaurus/wchar_limits.h		comp-obsolete		obsolete
-./usr/include/ieeefp.h				comp-c-include
-./usr/include/pmc.h				comp-c-include
 ./usr/lib/libarm.a				comp-c-lib
 ./usr/lib/libarm32.a				comp-obsolete		obsolete
 ./usr/lib/libarm32_p.a				comp-obsolete		obsolete
@@ -648,1228 +648,1228 @@
 ./usr/lib/libpmc.a				comp-c-lib
 ./usr/lib/libpmc_p.a				comp-c-proflib		profile
 ./usr/lib/oabi/crt0.o				comp-c-lib		compat
+./usr/lib/oabi/crt0.o				comp-c-lib		compat
+./usr/lib/oabi/crtbegin.o			comp-c-lib		compat
 ./usr/lib/oabi/crtbegin.o			comp-c-lib		compat
 ./usr/lib/oabi/crtbeginS.o			comp-c-lib		compat,pic
+./usr/lib/oabi/crtbeginS.o			comp-c-lib		compat,pic
+./usr/lib/oabi/crtbeginT.o			comp-c-lib		compat,pic
 ./usr/lib/oabi/crtbeginT.o			comp-c-lib		compat,pic
 ./usr/lib/oabi/crtend.o				comp-c-lib		compat
+./usr/lib/oabi/crtend.o				comp-c-lib		compat
+./usr/lib/oabi/crtendS.o				comp-c-lib		compat,pic
 ./usr/lib/oabi/crtendS.o			comp-c-lib		compat,pic
 ./usr/lib/oabi/crti.o				comp-c-lib		compat
+./usr/lib/oabi/crti.o				comp-c-lib		compat
 ./usr/lib/oabi/crtn.o				comp-c-lib		compat
+./usr/lib/oabi/crtn.o				comp-c-lib		compat
+./usr/lib/oabi/gcrt0.o				comp-c-lib		compat
 ./usr/lib/oabi/gcrt0.o				comp-c-lib		compat
 ./usr/lib/oabi/i18n/libBIG5.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libBIG5.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libBIG5.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libBIG5.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libBIG5_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libBIG5_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libBIG5_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libBIG5_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libDECHanyu.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libDECHanyu.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libDECHanyu.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libDECHanyu.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libDECHanyu_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libDECHanyu_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libDECHanyu_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libDECHanyu_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libEUC.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libEUC.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libEUC.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libEUC.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libEUCTW.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libEUCTW.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libEUCTW.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libEUCTW.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libEUCTW_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libEUCTW_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libEUCTW_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libEUCTW_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libEUC_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libEUC_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libEUC_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libEUC_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libGBK2K.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libGBK2K.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libGBK2K.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libGBK2K.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libGBK2K_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libGBK2K_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libGBK2K_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libGBK2K_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libHZ.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libHZ.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libHZ.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libHZ.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libHZ_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libHZ_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libHZ_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libHZ_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libISO2022.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libISO2022.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libISO2022.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libISO2022.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libISO2022_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libISO2022_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libISO2022_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libISO2022_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libJOHAB.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libJOHAB.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libJOHAB.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libJOHAB.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libJOHAB_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libJOHAB_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libJOHAB_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libJOHAB_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libMSKanji.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libMSKanji.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libMSKanji.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libMSKanji.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libMSKanji_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libMSKanji_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libMSKanji_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libMSKanji_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUES.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libUES.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libUES.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libUES.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libUES_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUES_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUES_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUES_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUTF1632.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libUTF1632.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libUTF1632.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libUTF1632.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libUTF1632_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUTF1632_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUTF1632_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUTF1632_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUTF7.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libUTF7.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libUTF7.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libUTF7.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libUTF7_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUTF7_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUTF7_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUTF7_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUTF8.a			comp-c-lib		compat
+./usr/lib/oabi/i18n/libUTF8.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libUTF8.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libUTF8.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libUTF8_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUTF8_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libUTF8_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libUTF8_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libVIQR.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libVIQR.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libVIQR.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libVIQR.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libVIQR_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libVIQR_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libVIQR_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libVIQR_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libZW.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libZW.a			comp-c-lib		compat
 ./usr/lib/oabi/i18n/libZW.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libZW.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libZW_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libZW_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libZW_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libZW_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libiconv_none.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libiconv_none.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libiconv_none.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libiconv_none.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libiconv_none_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libiconv_none_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libiconv_none_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libiconv_none_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libiconv_std.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libiconv_std.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libiconv_std.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libiconv_std.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libiconv_std_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libiconv_std_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libiconv_std_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libiconv_std_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_646.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libmapper_646.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libmapper_646.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libmapper_646.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libmapper_646_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_646_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_646_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_646_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_none.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libmapper_none.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libmapper_none.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libmapper_none.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libmapper_none_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_none_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_none_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_none_pic.a	comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_parallel.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libmapper_parallel.a	comp-c-lib		compat
 ./usr/lib/oabi/i18n/libmapper_parallel.so	base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libmapper_parallel.so	base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libmapper_parallel_p.a	comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_parallel_p.a	comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_parallel_pic.a	comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_parallel_pic.a	comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_serial.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libmapper_serial.a		comp-c-lib		compat
 ./usr/lib/oabi/i18n/libmapper_serial.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libmapper_serial.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/i18n/libmapper_serial_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_serial_p.a	comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_serial_pic.a	comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_serial_pic.a	comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_std.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libmapper_std.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libmapper_std.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libmapper_std.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libmapper_std_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_std_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_std_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_std_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_zone.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libmapper_zone.a		comp-c-lib		compat
+./usr/lib/oabi/i18n/libmapper_zone.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libmapper_zone.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/i18n/libmapper_zone_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_zone_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/i18n/libmapper_zone_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/i18n/libmapper_zone_pic.a	comp-obsolete		obsolete
 ./usr/lib/oabi/libarchive.a			comp-c-lib		compat
+./usr/lib/oabi/libarchive.a			comp-c-lib		compat
+./usr/lib/oabi/libarchive.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libarchive.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libarchive_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libarchive_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libarchive_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libarchive_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libarm.a				comp-c-lib		compat
 ./usr/lib/oabi/libarm.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libarm_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libarm_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libasn1.a				comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libasn1.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libasn1.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libasn1.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libasn1_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libasn1_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libasn1_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libasn1_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libatf-c++.a			comp-c-lib		compat,atf
+./usr/lib/oabi/libatf-c++.a			comp-c-lib		compat,atf
 ./usr/lib/oabi/libatf-c++.so			base-sys-lib		compat,pic,atf
+./usr/lib/oabi/libatf-c++.so			base-sys-lib		compat,pic,atf
+./usr/lib/oabi/libatf-c++_p.a			comp-c-proflib		compat,profile,atf
 ./usr/lib/oabi/libatf-c++_p.a			comp-c-proflib		compat,profile,atf
 ./usr/lib/oabi/libatf-c++_pic.a			comp-c-piclib		compat,pic,atf
+./usr/lib/oabi/libatf-c++_pic.a			comp-c-piclib		compat,pic,atf
+./usr/lib/oabi/libatf-c.a			comp-c-lib		compat,atf
 ./usr/lib/oabi/libatf-c.a			comp-c-lib		compat,atf
 ./usr/lib/oabi/libatf-c.so			base-sys-lib		compat,pic,atf
+./usr/lib/oabi/libatf-c.so			base-sys-lib		compat,pic,atf
+./usr/lib/oabi/libatf-c_p.a			comp-c-proflib		compat,profile,atf
 ./usr/lib/oabi/libatf-c_p.a			comp-c-proflib		compat,profile,atf
 ./usr/lib/oabi/libatf-c_pic.a			comp-c-piclib		compat,pic,atf
+./usr/lib/oabi/libatf-c_pic.a			comp-c-piclib		compat,pic,atf
 ./usr/lib/oabi/libbfd.a				comp-obsolete		obsolete
+./usr/lib/oabi/libbfd.a				comp-obsolete		obsolete
+./usr/lib/oabi/libbfd.so				base-obsolete		obsolete
 ./usr/lib/oabi/libbfd.so			base-obsolete		obsolete
 ./usr/lib/oabi/libbfd_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libbfd_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libbfd_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libbfd_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libbind9.a			comp-c-lib		compat
 ./usr/lib/oabi/libbind9.a			comp-c-lib		compat
 ./usr/lib/oabi/libbind9.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libbind9.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libbind9_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libbind9_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libbind9_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libbind9_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libbluetooth.a			comp-c-lib		compat
 ./usr/lib/oabi/libbluetooth.a			comp-c-lib		compat
 ./usr/lib/oabi/libbluetooth.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libbluetooth.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libbluetooth_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libbluetooth_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libbluetooth_pic.a		comp-c-piclib		compat,pic
+./usr/lib/oabi/libbluetooth_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libbsdmalloc.a			comp-c-lib		compat
+./usr/lib/oabi/libbsdmalloc.a			comp-c-lib		compat
+./usr/lib/oabi/libbsdmalloc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libbsdmalloc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libbsdmalloc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libbsdmalloc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libbsdmalloc_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libbsdmalloc_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libbz2.a				comp-c-lib		compat
+./usr/lib/oabi/libbz2.a				comp-c-lib		compat
+./usr/lib/oabi/libbz2.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libbz2.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libbz2_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libbz2_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libbz2_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libbz2_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libc++.a				comp-c-lib		compat,libcxx
+./usr/lib/oabi/libc++.so			comp-sys-shlib		compat,pic,libcxx
+./usr/lib/oabi/libc++_p.a			comp-c-proflib		compat,profile,libcxx
+./usr/lib/oabi/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
+./usr/lib/oabi/libc.a				comp-c-lib		compat
 ./usr/lib/oabi/libc.a				comp-c-lib		compat
 ./usr/lib/oabi/libc.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libc.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libc_p.a				comp-c-proflib		compat,profile
+./usr/lib/oabi/libc_p.a				comp-c-proflib		compat,profile
+./usr/lib/oabi/libc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libc_vfp.a			comp-c-lib		compat
 ./usr/lib/oabi/libc_vfp.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libc_vfp_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libc_vfp_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libc++.a				comp-c-lib		compat,libcxx
-./usr/lib/oabi/libc++.so			comp-sys-shlib		compat,pic,libcxx
-./usr/lib/oabi/libc++_p.a			comp-c-proflib		compat,profile,libcxx
-./usr/lib/oabi/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
+./usr/lib/oabi/libcom_err.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libcom_err.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libcom_err.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libcom_err.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libcom_err_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libcom_err_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libcompat.a			comp-c-lib		compat
 ./usr/lib/oabi/libcompat.a			comp-c-lib		compat
 ./usr/lib/oabi/libcompat_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libcompat_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libcompat_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libcompat_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libcrypt.a			comp-c-lib		compat
+./usr/lib/oabi/libcrypt.a			comp-c-lib		compat
 ./usr/lib/oabi/libcrypt.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libcrypt.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libcrypt_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libcrypt_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libcrypt_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libcrypt_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libcrypto.a			comp-c-lib		compat,crypto
 ./usr/lib/oabi/libcrypto.a			comp-c-lib		compat,crypto
 ./usr/lib/oabi/libcrypto.so			base-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libcrypto.so			base-sys-shlib		compat,crypto,pic
+./usr/lib/oabi/libcrypto_idea.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_idea.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_idea.so		base-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_idea_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/libcrypto_idea_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_idea_pic.a		comp-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_mdc2.a			comp-obsolete		obsolete
+./usr/lib/oabi/libcrypto_mdc2.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_mdc2.so		base-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_mdc2_p.a		comp-obsolete		obsolete
+./usr/lib/oabi/libcrypto_mdc2_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/libcrypto_mdc2_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libcrypto_rc5.a			comp-c-lib		crypto_rc5,compat
 ./usr/lib/oabi/libcrypto_rc5.a			comp-c-lib		crypto_rc5,compat
 ./usr/lib/oabi/libcrypto_rc5.so			base-sys-shlib		compat,crypto,crypto_rc5,pic
+./usr/lib/oabi/libcrypto_rc5_p.a			comp-c-proflib		crypto_rc5,compat,profile
 ./usr/lib/oabi/libcrypto_rc5_p.a		comp-c-proflib		crypto_rc5,compat,profile
 ./usr/lib/oabi/libcrypto_rc5_pic.a		comp-c-piclib		compat,crypto,crypto_rc5,pic
 ./usr/lib/oabi/libcurses.a			comp-c-lib		compat
+./usr/lib/oabi/libcurses.a			comp-c-lib		compat
 ./usr/lib/oabi/libcurses.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libcurses.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libcurses_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libcurses_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libcurses_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libcurses_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libdes.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libdes.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libdes.so				base-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libdes.so			base-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libdes_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libdes_p.a			comp-c-proflib		compat,crypto,profile
 ./usr/lib/oabi/libdes_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libdes_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libdevmapper.a			comp-lvm-lib		compat,lvm
+./usr/lib/oabi/libdevmapper.a			comp-lvm-lib		compat,lvm
+./usr/lib/oabi/libdevmapper.so			base-lvm-shlib		compat,lvm,pic
 ./usr/lib/oabi/libdevmapper.so			base-lvm-shlib		compat,lvm,pic
 ./usr/lib/oabi/libdevmapper_p.a			comp-lvm-proflib	compat,profile,lvm
+./usr/lib/oabi/libdevmapper_p.a			comp-lvm-proflib	compat,profile,lvm
+./usr/lib/oabi/libdevmapper_pic.a		comp-lvm-piclib		compat,pic,lvm
 ./usr/lib/oabi/libdevmapper_pic.a		comp-lvm-piclib		compat,pic,lvm
 ./usr/lib/oabi/libdm.a				comp-c-lib		compat
+./usr/lib/oabi/libdm.a				comp-c-lib		compat
 ./usr/lib/oabi/libdm.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libdm.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libdm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libdm_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libdm_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libdm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libdns.a				comp-c-lib		compat
+./usr/lib/oabi/libdns.a				comp-c-lib		compat
+./usr/lib/oabi/libdns.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libdns.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libdns_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libdns_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libdns_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libdns_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libdns_sd.a			comp-c-lib		compat,mdns
+./usr/lib/oabi/libdns_sd.a			comp-c-lib		compat,mdns
 ./usr/lib/oabi/libdns_sd.so			base-mdns-shlib		compat,pic,mdns
+./usr/lib/oabi/libdns_sd.so			base-mdns-shlib		compat,pic,mdns
+./usr/lib/oabi/libdns_sd_p.a			comp-c-proflib		compat,profile,mdns
 ./usr/lib/oabi/libdns_sd_p.a			comp-c-proflib		compat,profile,mdns
 ./usr/lib/oabi/libdns_sd_pic.a			comp-c-piclib		compat,pic,mdns
+./usr/lib/oabi/libdns_sd_pic.a			comp-c-piclib		compat,pic,mdns
+./usr/lib/oabi/libdwarf.a			comp-c-lib		compat
 ./usr/lib/oabi/libdwarf.a			comp-c-lib		compat
 ./usr/lib/oabi/libdwarf.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libdwarf.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libdwarf_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libdwarf_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libdwarf_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libdwarf_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libedit.a				comp-c-lib		compat
 ./usr/lib/oabi/libedit.a			comp-c-lib		compat
 ./usr/lib/oabi/libedit.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libedit.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libedit_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libedit_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libedit_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libedit_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libelf.a				comp-c-lib		compat
+./usr/lib/oabi/libelf.a				comp-c-lib		compat
+./usr/lib/oabi/libelf.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libelf.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libelf_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libelf_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libelf_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libelf_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libevent.a			comp-c-lib		compat
 ./usr/lib/oabi/libevent.a			comp-c-lib		compat
 ./usr/lib/oabi/libevent.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libevent.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libevent_openssl.a		comp-c-lib		compat,crypto
+./usr/lib/oabi/libevent_openssl.a		comp-c-lib		compat,crypto
+./usr/lib/oabi/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
+./usr/lib/oabi/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
+./usr/lib/oabi/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
+./usr/lib/oabi/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
+./usr/lib/oabi/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/oabi/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/oabi/libevent_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libevent_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libevent_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libevent_openssl.a		comp-c-lib		compat,crypto
-./usr/lib/oabi/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
-./usr/lib/oabi/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
-./usr/lib/oabi/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/oabi/libevent_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libevent_pthreads.a		comp-c-lib		compat
 ./usr/lib/oabi/libevent_pthreads.a		comp-c-lib		compat
 ./usr/lib/oabi/libevent_pthreads.so		base-sys-shlib		compat,pic
+./usr/lib/oabi/libevent_pthreads.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/libevent_pthreads_p.a		comp-c-proflib		compat,profile
+./usr/lib/oabi/libevent_pthreads_p.a		comp-c-proflib		compat,profile
+./usr/lib/oabi/libevent_pthreads_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libevent_pthreads_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libexecinfo.a			comp-c-lib		compat
+./usr/lib/oabi/libexecinfo.a			comp-c-lib		compat
+./usr/lib/oabi/libexecinfo.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libexecinfo.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libexecinfo_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libexecinfo_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libexecinfo_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libexecinfo_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libexpat.a			comp-c-lib		compat
+./usr/lib/oabi/libexpat.a			comp-c-lib		compat
+./usr/lib/oabi/libexpat.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libexpat.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libexpat_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libexpat_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libexpat_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libexpat_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libfetch.a			comp-c-lib		compat
+./usr/lib/oabi/libfetch.a			comp-c-lib		compat
+./usr/lib/oabi/libfetch.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libfetch.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libfetch_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libfetch_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libfetch_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libfetch_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libfl.a				comp-c-lib		compat
+./usr/lib/oabi/libfl.a				comp-c-lib		compat
+./usr/lib/oabi/libfl_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libfl_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libform.a				comp-c-lib		compat
 ./usr/lib/oabi/libform.a			comp-c-lib		compat
 ./usr/lib/oabi/libform.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libform.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libform_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libform_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libform_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libform_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libgcc.a				comp-c-lib		compat
 ./usr/lib/oabi/libgcc.a				comp-c-lib		compat,gcccmds
+./usr/lib/oabi/libgcc_eh.a			comp-c-lib		compat,pic
 ./usr/lib/oabi/libgcc_eh.a			comp-c-lib		compat,pic,gcccmds
 ./usr/lib/oabi/libgcc_eh_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libgcc_eh_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libgcc_eh_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libgcc_eh_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libgcc_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libgcc_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libgcc_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libgcc_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libgcc_s.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcc_s.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcc_s.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libgcc_s.so			base-sys-shlib		compat,pic,gcccmds
 ./usr/lib/oabi/libgcc_s_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcc_s_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libgcc_s_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcc_s_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcov.a				comp-c-lib		compat,gcccmds
 ./usr/lib/oabi/libgcov.a			comp-c-lib		compat,gcccmds
 ./usr/lib/oabi/libgcov_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcov_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libgcov_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libgcov_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libgmp.a				comp-c-lib		obsolete
+./usr/lib/oabi/libgmp.a				comp-c-lib		obsolete
+./usr/lib/oabi/libgmp.so				base-sys-shlib		obsolete
 ./usr/lib/oabi/libgmp.so			base-sys-shlib		obsolete
 ./usr/lib/oabi/libgmp_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libgmp_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libgmp_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libgmp_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libgnumalloc.a			comp-c-lib		compat
+./usr/lib/oabi/libgnumalloc.a			comp-c-lib		compat
 ./usr/lib/oabi/libgnumalloc.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libgnumalloc.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libgnumalloc_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libgnumalloc_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libgnumalloc_pic.a		comp-c-piclib		compat,pic
+./usr/lib/oabi/libgnumalloc_pic.a		comp-c-piclib		compat,pic
+./usr/lib/oabi/libgomp.a				comp-c-lib		compat,gcc=45
 ./usr/lib/oabi/libgomp.a			comp-c-lib		compat,gcc=45,notyet
+./usr/lib/oabi/libgomp.so			base-sys-shlib		compat,pic,gcc=45
 ./usr/lib/oabi/libgomp.so			base-sys-shlib		compat,pic,gcc=45,notyet
+./usr/lib/oabi/libgomp_p.a			comp-c-proflib		compat,profile,gcc=45
 ./usr/lib/oabi/libgomp_p.a			comp-c-proflib		compat,profile,gcc=45,notyet
+./usr/lib/oabi/libgomp_pic.a			comp-c-piclib		compat,pic,gcc=45
 ./usr/lib/oabi/libgomp_pic.a			comp-c-piclib		compat,pic,gcc=45,notyet
 ./usr/lib/oabi/libgssapi.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libgssapi.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libgssapi.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libgssapi.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libgssapi_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libgssapi_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libgssapi_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libgssapi_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libhdb.a				comp-c-lib		compat,kerberos
+./usr/lib/oabi/libhdb.a				comp-c-lib		compat,kerberos
+./usr/lib/oabi/libhdb.so				base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libhdb.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libhdb_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libhdb_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libhdb_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libhdb_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libheimbase.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libheimbase.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libheimbase.so			comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libheimbase.so			comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libheimbase_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libheimbase_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libheimbase_pic.a			comp-c-proflib		compat,pic,kerberos
 ./usr/lib/oabi/libheimbase_pic.a		comp-c-proflib		compat,pic,kerberos
 ./usr/lib/oabi/libheimntlm.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libheimntlm.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libheimntlm.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libheimntlm.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libheimntlm_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libheimntlm_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libheimntlm_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libheimntlm_pic.a		comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libhx509.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libhx509.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libhx509.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libhx509.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libhx509_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libhx509_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libhx509_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libhx509_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libiberty.a			comp-obsolete		obsolete
+./usr/lib/oabi/libiberty.a			comp-obsolete		obsolete
+./usr/lib/oabi/libiberty_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libiberty_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libiberty_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libiberty_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libintl.a				comp-c-lib		compat
 ./usr/lib/oabi/libintl.a			comp-c-lib		compat
 ./usr/lib/oabi/libintl.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libintl.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libintl_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libintl_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libintl_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libintl_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libipsec.a			comp-c-lib		compat
 ./usr/lib/oabi/libipsec.a			comp-c-lib		compat
 ./usr/lib/oabi/libipsec.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libipsec.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libipsec_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libipsec_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libipsec_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libipsec_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libisc.a				comp-c-lib		compat
+./usr/lib/oabi/libisc.a				comp-c-lib		compat
+./usr/lib/oabi/libisc.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libisc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libisc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libisc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libisccc.a			comp-c-lib		compat
+./usr/lib/oabi/libisccc.a			comp-c-lib		compat
+./usr/lib/oabi/libisccc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libisccc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libisccc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisccc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisccc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libisccc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libisccfg.a			comp-c-lib		compat
+./usr/lib/oabi/libisccfg.a			comp-c-lib		compat
+./usr/lib/oabi/libisccfg.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libisccfg.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libisccfg_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisccfg_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisccfg_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libisccfg_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libiscsi.a			comp-c-lib		compat,iscsi
+./usr/lib/oabi/libiscsi.a			comp-c-lib		compat,iscsi
+./usr/lib/oabi/libiscsi.so			base-sys-shlib		compat,pic,iscsi
 ./usr/lib/oabi/libiscsi.so			base-sys-shlib		compat,pic,iscsi
 ./usr/lib/oabi/libiscsi_p.a			comp-c-proflib		compat,profile,iscsi
+./usr/lib/oabi/libiscsi_p.a			comp-c-proflib		compat,profile,iscsi
 ./usr/lib/oabi/libiscsi_pic.a			comp-c-piclib		compat,pic,iscsi
+./usr/lib/oabi/libiscsi_pic.a			comp-c-piclib		compat,pic,iscsi
+./usr/lib/oabi/libisns.a				comp-c-lib		compat
 ./usr/lib/oabi/libisns.a			comp-c-lib		compat
 ./usr/lib/oabi/libisns.so			comp-sys-shlib		compat
+./usr/lib/oabi/libisns.so			comp-sys-shlib		compat
 ./usr/lib/oabi/libisns_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libisns_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libisns_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libisns_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libkadm5clnt.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libkadm5clnt.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libkadm5clnt.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libkadm5clnt.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libkadm5clnt_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libkadm5clnt_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libkadm5clnt_pic.a		comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libkadm5clnt_pic.a		comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libkadm5srv.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libkadm5srv.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libkadm5srv.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libkadm5srv.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libkadm5srv_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libkadm5srv_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libkadm5srv_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libkadm5srv_pic.a		comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libkafs.a				comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libkafs.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libkafs.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libkafs.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libkafs_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libkafs_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libkafs_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libkafs_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libkdc.a				comp-c-lib		compat,kerberos
+./usr/lib/oabi/libkdc.a				comp-c-lib		compat,kerberos
+./usr/lib/oabi/libkdc.so				comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libkdc.so			comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libkdc_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libkdc_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libkdc_pic.a			comp-c-proflib		compat,pic,kerberos
+./usr/lib/oabi/libkdc_pic.a			comp-c-proflib		compat,pic,kerberos
+./usr/lib/oabi/libkrb5.a				comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libkrb5.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libkrb5.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libkrb5.so			base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libkrb5_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libkrb5_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libkrb5_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libkrb5_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libkvm.a				comp-c-lib		compat
+./usr/lib/oabi/libkvm.a				comp-c-lib		compat
+./usr/lib/oabi/libkvm.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libkvm.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libkvm_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libkvm_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libkvm_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libkvm_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libl.a				comp-c-lib		compat
 ./usr/lib/oabi/libl.a				comp-c-lib		compat
 ./usr/lib/oabi/libl_p.a				comp-c-proflib		compat,profile
+./usr/lib/oabi/libl_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libl_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libl_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/liblber.a				comp-c-lib		compat,ldap
 ./usr/lib/oabi/liblber.a			comp-c-lib		compat,ldap
 ./usr/lib/oabi/liblber.so			base-sys-shlib		compat,pic,ldap
+./usr/lib/oabi/liblber.so			base-sys-shlib		compat,pic,ldap
+./usr/lib/oabi/liblber_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/oabi/liblber_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/oabi/liblber_pic.a			comp-c-piclib		compat,pic,ldap
+./usr/lib/oabi/liblber_pic.a			comp-c-piclib		compat,pic,ldap
+./usr/lib/oabi/libldap.a				comp-c-lib		compat,ldap
 ./usr/lib/oabi/libldap.a			comp-c-lib		compat,ldap
 ./usr/lib/oabi/libldap.so			base-sys-shlib		compat,pic,ldap
+./usr/lib/oabi/libldap.so			base-sys-shlib		compat,pic,ldap
+./usr/lib/oabi/libldap_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/oabi/libldap_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/oabi/libldap_pic.a			comp-c-piclib		compat,pic,ldap
+./usr/lib/oabi/libldap_pic.a			comp-c-piclib		compat,pic,ldap
+./usr/lib/oabi/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/oabi/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/oabi/libldap_r.so			base-sys-shlib		compat,pic,ldap
+./usr/lib/oabi/libldap_r.so			base-sys-shlib		compat,pic,ldap
+./usr/lib/oabi/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/oabi/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/oabi/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
+./usr/lib/oabi/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/oabi/liblua.a				comp-c-lib		compat
+./usr/lib/oabi/liblua.a				comp-c-lib		compat
+./usr/lib/oabi/liblua.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblua.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblua_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/liblua_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/liblua_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/liblua_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/liblutok.a			comp-c-lib		compat,kyua
 ./usr/lib/oabi/liblutok.a			comp-c-lib		compat,kyua
 ./usr/lib/oabi/liblutok.so			base-sys-shlib		compat,pic,kyua
+./usr/lib/oabi/liblutok.so			base-sys-shlib		compat,pic,kyua
+./usr/lib/oabi/liblutok_p.a			comp-c-proflib		compat,profile,kyua
 ./usr/lib/oabi/liblutok_p.a			comp-c-proflib		compat,profile,kyua
 ./usr/lib/oabi/liblutok_pic.a			comp-c-piclib		compat,pic,kyua
+./usr/lib/oabi/liblutok_pic.a			comp-c-piclib		compat,pic,kyua
 ./usr/lib/oabi/liblwres.a			comp-c-lib		compat
+./usr/lib/oabi/liblwres.a			comp-c-lib		compat
+./usr/lib/oabi/liblwres.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblwres.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblwres_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/liblwres_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/liblzf.a				comp-c-lib		compat
+./usr/lib/oabi/liblzf.a				comp-c-lib		compat
+./usr/lib/oabi/liblzf.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblzf.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblzf_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/liblzf_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/liblzf_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/liblzf_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/liblzma.a				comp-c-lib		compat
 ./usr/lib/oabi/liblzma.a			comp-c-lib		compat
 ./usr/lib/oabi/liblzma.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/liblzma.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/liblzma_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/liblzma_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libm.a				comp-c-lib		compat
+./usr/lib/oabi/libm.a				comp-c-lib		compat
 ./usr/lib/oabi/libm.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libm.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libm_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libm_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libmagic.a			comp-c-lib		compat
 ./usr/lib/oabi/libmagic.a			comp-c-lib		compat
 ./usr/lib/oabi/libmagic.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libmagic.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libmagic_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libmagic_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libmenu.a				comp-c-lib		compat
 ./usr/lib/oabi/libmenu.a			comp-c-lib		compat
 ./usr/lib/oabi/libmenu.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libmenu.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libmenu_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libmenu_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libmenu_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libmenu_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libmj.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libmj.a				comp-c-lib		compat,crypto
 ./usr/lib/oabi/libmj.so				comp-sys-shlib		compat,crypto,pic
+./usr/lib/oabi/libmj.so				comp-sys-shlib		compat,crypto,pic
+./usr/lib/oabi/libmj_p.a				comp-c-proflib		compat,crypto,profile
 ./usr/lib/oabi/libmj_p.a			comp-c-proflib		compat,crypto,profile
 ./usr/lib/oabi/libmj_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libmj_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libmpc.a				comp-c-lib		obsolete
+./usr/lib/oabi/libmpc.a				comp-c-lib		obsolete
+./usr/lib/oabi/libmpc.so				base-sys-shlib		obsolete
 ./usr/lib/oabi/libmpc.so			base-sys-shlib		obsolete
 ./usr/lib/oabi/libmpc_p.a			comp-c-proflib		obsolete
+./usr/lib/oabi/libmpc_p.a			comp-c-proflib		obsolete
 ./usr/lib/oabi/libmpc_pic.a			comp-c-piclib		obsolete
+./usr/lib/oabi/libmpc_pic.a			comp-c-piclib		obsolete
+./usr/lib/oabi/libmpfr.a				comp-c-lib		obsolete
 ./usr/lib/oabi/libmpfr.a			comp-c-lib		obsolete
 ./usr/lib/oabi/libmpfr.so			base-sys-shlib		obsolete
+./usr/lib/oabi/libmpfr.so			base-sys-shlib		obsolete
+./usr/lib/oabi/libmpfr_p.a			comp-c-proflib		obsolete
 ./usr/lib/oabi/libmpfr_p.a			comp-c-proflib		obsolete
 ./usr/lib/oabi/libmpfr_pic.a			comp-c-piclib		obsolete
+./usr/lib/oabi/libmpfr_pic.a			comp-c-piclib		obsolete
+./usr/lib/oabi/libnetpgp.a			comp-c-lib		compat,crypto
 ./usr/lib/oabi/libnetpgp.a			comp-c-lib		compat,crypto
 ./usr/lib/oabi/libnetpgp.so			comp-sys-shlib		compat,crypto,pic
+./usr/lib/oabi/libnetpgp.so			comp-sys-shlib		compat,crypto,pic
+./usr/lib/oabi/libnetpgp_p.a			comp-c-proflib		compat,crypto,profile
 ./usr/lib/oabi/libnetpgp_p.a			comp-c-proflib		compat,crypto,profile
 ./usr/lib/oabi/libnetpgp_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libnetpgp_pic.a			comp-c-piclib		compat,crypto,pic
+./usr/lib/oabi/libnetpgpverify.a			comp-c-lib		compat,crypto
 ./usr/lib/oabi/libnetpgpverify.a		comp-c-lib		compat,crypto
 ./usr/lib/oabi/libnetpgpverify.so		comp-sys-shlib		compat,crypto,pic
+./usr/lib/oabi/libnetpgpverify.so		comp-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libnetpgpverify_p.a		comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libnetpgpverify_p.a		comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libnetpgpverify_pic.a		comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libnetpgpverify_pic.a		comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libnpf.a				comp-c-lib		compat,npf
+./usr/lib/oabi/libnpf.a				comp-c-lib		compat,npf
+./usr/lib/oabi/libnpf.so				comp-sys-shlib		compat,npf,pic
 ./usr/lib/oabi/libnpf.so			comp-sys-shlib		compat,npf,pic
 ./usr/lib/oabi/libnpf_p.a			comp-c-proflib		compat,npf,profile
+./usr/lib/oabi/libnpf_p.a			comp-c-proflib		compat,npf,profile
 ./usr/lib/oabi/libnpf_pic.a			comp-c-piclib		compat,npf,pic
+./usr/lib/oabi/libnpf_pic.a			comp-c-piclib		compat,npf,pic
+./usr/lib/oabi/libobjc.a				comp-c-lib		compat,gcccmds
 ./usr/lib/oabi/libobjc.a			comp-c-lib		compat,gcccmds
 ./usr/lib/oabi/libobjc.so			base-sys-shlib		compat,pic,gcccmds
+./usr/lib/oabi/libobjc.so			base-sys-shlib		compat,pic,gcccmds
+./usr/lib/oabi/libobjc_p.a			comp-c-proflib		compat,profile,gcccmds
 ./usr/lib/oabi/libobjc_p.a			comp-c-proflib		compat,profile,gcccmds
 ./usr/lib/oabi/libobjc_pic.a			comp-c-piclib		compat,pic,gcccmds
+./usr/lib/oabi/libobjc_pic.a			comp-c-piclib		compat,pic,gcccmds
+./usr/lib/oabi/libopcodes.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libopcodes.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libopcodes.so			base-obsolete		obsolete
+./usr/lib/oabi/libopcodes.so			base-obsolete		obsolete
+./usr/lib/oabi/libopcodes_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libopcodes_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libopcodes_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libopcodes_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libossaudio.a			comp-c-lib		compat
 ./usr/lib/oabi/libossaudio.a			comp-c-lib		compat
 ./usr/lib/oabi/libossaudio.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libossaudio.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libossaudio_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libossaudio_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libossaudio_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libossaudio_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libp2k.a				comp-c-lib		compat,rump
+./usr/lib/oabi/libp2k.a				comp-c-lib		compat,rump
+./usr/lib/oabi/libp2k.so				base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/libp2k.so			base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/libp2k_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/libp2k_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/libp2k_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/libp2k_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/libpam.a				comp-c-lib		compat
+./usr/lib/oabi/libpam.a				comp-c-lib		compat
+./usr/lib/oabi/libpam.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpam.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpam_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libpam_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libpam_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libpam_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libpcap.a				comp-c-lib		compat
 ./usr/lib/oabi/libpcap.a			comp-c-lib		compat
 ./usr/lib/oabi/libpcap.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libpcap.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libpcap_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libpcap_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libpcap_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libpcap_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpci.a				comp-c-lib		compat
+./usr/lib/oabi/libpci.a				comp-c-lib		compat
+./usr/lib/oabi/libpci.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpci.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpci_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libpci_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libpci_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpci_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libperfuse.a			comp-c-lib		compat
+./usr/lib/oabi/libperfuse.a			comp-c-lib		compat
+./usr/lib/oabi/libperfuse.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libperfuse.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libperfuse_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libperfuse_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libperfuse_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libperfuse_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpmc.a				comp-c-lib		compat
 ./usr/lib/oabi/libpmc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpmc_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libpmc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libposix.a			comp-c-lib		compat
+./usr/lib/oabi/libposix.a			comp-c-lib		compat
+./usr/lib/oabi/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libposix.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libposix_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libposix_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libposix_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libposix_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libppath.a			comp-c-lib		compat
+./usr/lib/oabi/libppath.a			comp-c-lib		compat
+./usr/lib/oabi/libppath.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libppath.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libppath_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libppath_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libppath_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libppath_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libprop.a				comp-c-lib		compat
 ./usr/lib/oabi/libprop.a			comp-c-lib		compat
 ./usr/lib/oabi/libprop.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libprop.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libprop_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libprop_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libprop_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libprop_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpthread.a			comp-c-lib		compat
+./usr/lib/oabi/libpthread.a			comp-c-lib		compat
+./usr/lib/oabi/libpthread.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpthread.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpthread_dbg.a			comp-c-lib		compat
+./usr/lib/oabi/libpthread_dbg.a			comp-c-lib		compat
+./usr/lib/oabi/libpthread_dbg.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpthread_dbg.so		base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpthread_dbg_p.a		comp-c-proflib		compat,profile
+./usr/lib/oabi/libpthread_dbg_p.a		comp-c-proflib		compat,profile
+./usr/lib/oabi/libpthread_dbg_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpthread_dbg_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpthread_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libpthread_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libpthread_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpthread_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpuffs.a			comp-c-lib		compat
+./usr/lib/oabi/libpuffs.a			comp-c-lib		compat
+./usr/lib/oabi/libpuffs.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpuffs.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libpuffs_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libpuffs_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libpuffs_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libpuffs_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libquota.a			comp-c-lib		compat
+./usr/lib/oabi/libquota.a			comp-c-lib		compat
+./usr/lib/oabi/libquota.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libquota.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libquota_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libquota_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libquota_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libquota_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libradius.a			comp-c-lib		compat
+./usr/lib/oabi/libradius.a			comp-c-lib		compat
+./usr/lib/oabi/libradius.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libradius.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libradius_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libradius_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libradius_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libradius_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/librefuse.a			comp-c-lib		compat
+./usr/lib/oabi/librefuse.a			comp-c-lib		compat
 ./usr/lib/oabi/librefuse.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/librefuse.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/librefuse_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/librefuse_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/librefuse_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/librefuse_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libresolv.a			comp-c-lib		compat
 ./usr/lib/oabi/libresolv.a			comp-c-lib		compat
 ./usr/lib/oabi/libresolv.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libresolv.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libresolv_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libresolv_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libresolv_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libresolv_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/librmt.a				comp-c-lib		compat
 ./usr/lib/oabi/librmt.a				comp-c-lib		compat
 ./usr/lib/oabi/librmt_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/librmt_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/librmt_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/librmt_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libroken.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libroken.a			comp-c-lib		compat,kerberos
+./usr/lib/oabi/libroken.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libroken.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libroken_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libroken_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libroken_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/libroken_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/oabi/librpcsvc.a			comp-c-lib		compat
+./usr/lib/oabi/librpcsvc.a			comp-c-lib		compat
+./usr/lib/oabi/librpcsvc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/librpcsvc.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/librpcsvc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/librpcsvc_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/librpcsvc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/librpcsvc_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/librt.a				comp-c-lib		compat
+./usr/lib/oabi/librt.a				comp-c-lib		compat
 ./usr/lib/oabi/librt.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/librt.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/librt_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/librt_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/librt_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/librt_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/librump.a				comp-c-lib		compat,rump
 ./usr/lib/oabi/librump.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/librump.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librump.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librump_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/librump_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/librump_pic.a			comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/librump_pic.a			comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/librumpclient.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/librumpclient.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/librumpclient.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumpclient.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumpclient_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/librumpclient_p.a		comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/librumpclient_pic.a		comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/librumpclient_pic.a		comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/librumpcrypto.a			comp-obsolete		obsolete
 ./usr/lib/oabi/librumpcrypto.a			comp-obsolete		obsolete
 ./usr/lib/oabi/librumpcrypto.so			base-obsolete		obsolete
+./usr/lib/oabi/librumpcrypto.so			base-obsolete		obsolete
+./usr/lib/oabi/librumpcrypto_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/librumpcrypto_p.a		comp-obsolete		obsolete
 ./usr/lib/oabi/librumpcrypto_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/librumpcrypto_pic.a		comp-obsolete		obsolete
+./usr/lib/oabi/librumpdev.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/librumpdev.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/librumpdev.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumpdev.so			base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/librumpdev_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/librumpdev_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/librumpdev_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumpdev_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumphijack.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumphijack.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumphijack_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumphijack_pic.a		comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumpnet.a			comp-c-lib		compat,rump
+./usr/lib/oabi/librumpnet.a			comp-c-lib		compat,rump
+./usr/lib/oabi/librumpnet.so			base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/librumpnet.so			base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/librumpnet_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/librumpnet_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/librumpnet_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumpnet_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumpuser.a			comp-c-lib		compat,rump
+./usr/lib/oabi/librumpuser.a			comp-c-lib		compat,rump
+./usr/lib/oabi/librumpuser.so			base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/librumpuser.so			base-sys-shlib		compat,pic,rump
 ./usr/lib/oabi/librumpuser_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/librumpuser_p.a			comp-c-proflib		compat,profile,rump
+./usr/lib/oabi/librumpuser_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumpuser_pic.a		comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/librumpvfs.a			comp-c-lib		compat,rump
+./usr/lib/oabi/librumpvfs.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/librumpvfs.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumpvfs.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/librumpvfs_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/librumpvfs_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/librumpvfs_pic.a			comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/librumpvfs_pic.a			comp-c-piclib		compat,pic,rump
 ./usr/lib/oabi/libsaslc.a			comp-c-lib		compat,crypto
+./usr/lib/oabi/libsaslc.a			comp-c-lib		compat,crypto
+./usr/lib/oabi/libsaslc.so			base-sys-shlib		compat,pic,crypto
 ./usr/lib/oabi/libsaslc.so			base-sys-shlib		compat,pic,crypto
 ./usr/lib/oabi/libsaslc_p.a			comp-c-proflib		compat,profile,crypto
+./usr/lib/oabi/libsaslc_p.a			comp-c-proflib		compat,profile,crypto
+./usr/lib/oabi/libsaslc_pic.a			comp-c-piclib		compat,pic,crypto
 ./usr/lib/oabi/libsaslc_pic.a			comp-c-piclib		compat,pic,crypto
 ./usr/lib/oabi/libsdp.a				comp-obsolete		obsolete
+./usr/lib/oabi/libsdp.a				comp-obsolete		obsolete
+./usr/lib/oabi/libsdp.so				base-obsolete		obsolete
 ./usr/lib/oabi/libsdp.so			base-obsolete		obsolete
 ./usr/lib/oabi/libsdp_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libsdp_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libsdp_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libsdp_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libskey.a				comp-c-lib		compat,skey
 ./usr/lib/oabi/libskey.a			comp-c-lib		compat,skey
 ./usr/lib/oabi/libskey.so			base-sys-shlib		compat,pic,skey
+./usr/lib/oabi/libskey.so			base-sys-shlib		compat,pic,skey
 ./usr/lib/oabi/libskey_p.a			comp-c-proflib		compat,profile,skey
+./usr/lib/oabi/libskey_p.a			comp-c-proflib		compat,profile,skey
+./usr/lib/oabi/libskey_pic.a			comp-c-piclib		compat,pic,skey
 ./usr/lib/oabi/libskey_pic.a			comp-c-piclib		compat,pic,skey
 ./usr/lib/oabi/libsl.a				comp-c-lib		compat,kerberos
+./usr/lib/oabi/libsl.a				comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libsl.so				base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libsl.so				base-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libsl_p.a				comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libsl_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libsl_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libsl_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libsqlite3.a			comp-c-lib		compat
 ./usr/lib/oabi/libsqlite3.a			comp-c-lib		compat
 ./usr/lib/oabi/libsqlite3.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libsqlite3.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libsqlite3_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libsqlite3_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libsqlite3_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libsqlite3_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libss.a				comp-c-lib		obsolete
 ./usr/lib/oabi/libss.a				comp-c-lib		obsolete
 ./usr/lib/oabi/libss.so				base-sys-shlib		obsolete
+./usr/lib/oabi/libss.so				base-sys-shlib		obsolete
+./usr/lib/oabi/libss_p.a				comp-c-proflib		obsolete
 ./usr/lib/oabi/libss_p.a			comp-c-proflib		obsolete
 ./usr/lib/oabi/libss_pic.a			comp-c-piclib		obsolete
+./usr/lib/oabi/libss_pic.a			comp-c-piclib		obsolete
 ./usr/lib/oabi/libssh.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libssh.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libssh.so				base-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libssh.so			base-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libssh_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libssh_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libssh_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libssh_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libssl.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libssl.a				comp-c-lib		compat,crypto
+./usr/lib/oabi/libssl.so				base-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libssl.so			base-sys-shlib		compat,crypto,pic
 ./usr/lib/oabi/libssl_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libssl_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/oabi/libssl_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libssl_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/oabi/libstdc++.a			comp-c-lib		compat,cxx,gcccmds,libstdcxx
+./usr/lib/oabi/libstdc++.a			comp-c-lib		compat,cxx,gcccmds,libstdcxx
+./usr/lib/oabi/libstdc++.so			base-sys-shlib		compat,pic,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libstdc++.so			base-sys-shlib		compat,pic,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libstdc++_p.a			comp-c-proflib		compat,profile,cxx,gcccmds,libstdcxx
+./usr/lib/oabi/libstdc++_p.a			comp-c-proflib		compat,profile,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libstdc++_pic.a			comp-c-piclib		compat,pic,cxx,gcccmds,libstdcxx
+./usr/lib/oabi/libstdc++_pic.a			comp-c-piclib		compat,pic,cxx,gcccmds,libstdcxx
+./usr/lib/oabi/libsupc++.a			comp-c-lib		compat,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libsupc++.a			comp-c-lib		compat,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libsupc++.so			base-obsolete		obsolete
+./usr/lib/oabi/libsupc++.so			base-obsolete		obsolete
+./usr/lib/oabi/libsupc++_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libsupc++_pic.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libtermcap.a			comp-c-lib		compat
+./usr/lib/oabi/libtermcap.a			comp-c-lib		compat
+./usr/lib/oabi/libtermcap.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libtermcap.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libtermcap_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libtermcap_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libtermcap_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libtermcap_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libterminfo.a			comp-c-lib		compat
+./usr/lib/oabi/libterminfo.a			comp-c-lib		compat
+./usr/lib/oabi/libterminfo.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libterminfo.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libterminfo_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libterminfo_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libterminfo_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libterminfo_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/oabi/libtermlib.a			comp-c-lib		compat
+./usr/lib/oabi/libtermlib.a			comp-c-lib		compat
+./usr/lib/oabi/libtermlib.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libtermlib.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libtermlib_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libtermlib_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libtermlib_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libtermlib_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/libtre.a				comp-c-lib		compat
+./usr/lib/oabi/libtre.a				comp-c-lib		compat
+./usr/lib/oabi/libtre.so				base-sys-shlib		compat,pic
 ./usr/lib/oabi/libtre.so			base-sys-shlib		compat,pic
 ./usr/lib/oabi/libtre_p.a			comp-c-proflib		compat,profile
+./usr/lib/oabi/libtre_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libtre_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libtre_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libukfs.a				comp-c-lib		compat,rump
 ./usr/lib/oabi/libukfs.a			comp-c-lib		compat,rump
 ./usr/lib/oabi/libukfs.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/libukfs.so			base-sys-shlib		compat,pic,rump
+./usr/lib/oabi/libukfs_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/libukfs_p.a			comp-c-proflib		compat,profile,rump
 ./usr/lib/oabi/libukfs_pic.a			comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/libukfs_pic.a			comp-c-piclib		compat,pic,rump
+./usr/lib/oabi/libusbhid.a			comp-c-lib		compat
 ./usr/lib/oabi/libusbhid.a			comp-c-lib		compat
 ./usr/lib/oabi/libusbhid.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libusbhid.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libusbhid_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libusbhid_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libusbhid_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libusbhid_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libutil.a				comp-c-lib		compat
 ./usr/lib/oabi/libutil.a			comp-c-lib		compat
 ./usr/lib/oabi/libutil.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libutil.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libutil_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libutil_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libutil_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libutil_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libvers.a				comp-obsolete		obsolete
 ./usr/lib/oabi/libvers.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libvers_p.a			comp-obsolete		obsolete
+./usr/lib/oabi/libvers_p.a			comp-obsolete		obsolete
 ./usr/lib/oabi/libvers_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libvers_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libwind.a				comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libwind.a			comp-c-lib		compat,kerberos
 ./usr/lib/oabi/libwind.so			comp-sys-shlib		compat,pic,kerberos
+./usr/lib/oabi/libwind.so			comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/oabi/libwind_p.a			comp-c-proflib		compat,profile,kerberos
+./usr/lib/oabi/libwind_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/oabi/libwind_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libwind_pic.a			comp-c-piclib		compat,pic,kerberos
+./usr/lib/oabi/libwrap.a				comp-c-lib		compat
 ./usr/lib/oabi/libwrap.a			comp-c-lib		compat
 ./usr/lib/oabi/libwrap.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libwrap.so			base-sys-shlib		compat,pic
+./usr/lib/oabi/libwrap_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libwrap_p.a			comp-c-proflib		compat,profile
 ./usr/lib/oabi/libwrap_pic.a			comp-c-piclib		compat,pic
+./usr/lib/oabi/libwrap_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/oabi/liby.a				comp-c-lib		compat
+./usr/lib/oabi/liby.a				comp-c-lib		compat
+./usr/lib/oabi/liby_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/liby_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/liby_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/liby_pic.a			comp-obsolete		obsolete
+./usr/lib/oabi/libz.a				comp-c-lib		compat
 ./usr/lib/oabi/libz.a				comp-c-lib		compat
 ./usr/lib/oabi/libz.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libz.so				base-sys-shlib		compat,pic
+./usr/lib/oabi/libz_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libz_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libz_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/crt0.o				comp-c-lib		compat
-./usr/lib/oabi/crtbegin.o			comp-c-lib		compat
-./usr/lib/oabi/crtbeginS.o			comp-c-lib		compat,pic
-./usr/lib/oabi/crtbeginT.o			comp-c-lib		compat,pic
-./usr/lib/oabi/crtend.o				comp-c-lib		compat
-./usr/lib/oabi/crtendS.o				comp-c-lib		compat,pic
-./usr/lib/oabi/crti.o				comp-c-lib		compat
-./usr/lib/oabi/crtn.o				comp-c-lib		compat
-./usr/lib/oabi/gcrt0.o				comp-c-lib		compat
-./usr/lib/oabi/i18n/libBIG5.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libBIG5.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libBIG5_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libBIG5_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libDECHanyu.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libDECHanyu.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libDECHanyu_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libDECHanyu_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libEUC.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libEUC.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libEUCTW.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libEUCTW.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libEUCTW_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libEUCTW_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libEUC_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libEUC_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libGBK2K.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libGBK2K.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libGBK2K_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libGBK2K_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libHZ.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libHZ.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libHZ_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libHZ_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libISO2022.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libISO2022.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libISO2022_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libISO2022_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libJOHAB.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libJOHAB.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libJOHAB_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libJOHAB_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libMSKanji.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libMSKanji.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libMSKanji_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libMSKanji_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUES.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libUES.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libUES_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUES_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUTF1632.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libUTF1632.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libUTF1632_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUTF1632_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUTF7.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libUTF7.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libUTF7_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUTF7_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUTF8.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libUTF8.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libUTF8_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libUTF8_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libVIQR.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libVIQR.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libVIQR_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libVIQR_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libZW.a			comp-c-lib		compat
-./usr/lib/oabi/i18n/libZW.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libZW_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libZW_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libiconv_none.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libiconv_none.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libiconv_none_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libiconv_none_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libiconv_std.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libiconv_std.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libiconv_std_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libiconv_std_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_646.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libmapper_646.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libmapper_646_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_646_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_none.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libmapper_none.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libmapper_none_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_none_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_parallel.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libmapper_parallel.so	base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libmapper_parallel_p.a	comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_parallel_pic.a	comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_serial.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libmapper_serial.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libmapper_serial_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_serial_pic.a	comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_std.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libmapper_std.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libmapper_std_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_std_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_zone.a		comp-c-lib		compat
-./usr/lib/oabi/i18n/libmapper_zone.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/i18n/libmapper_zone_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/i18n/libmapper_zone_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/libarchive.a			comp-c-lib		compat
-./usr/lib/oabi/libarchive.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libarchive_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libarchive_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libasn1.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libasn1.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libasn1_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libasn1_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libatf-c++.a			comp-c-lib		compat,atf
-./usr/lib/oabi/libatf-c++.so			base-sys-lib		compat,pic,atf
-./usr/lib/oabi/libatf-c++_p.a			comp-c-proflib		compat,profile,atf
-./usr/lib/oabi/libatf-c++_pic.a			comp-c-piclib		compat,pic,atf
-./usr/lib/oabi/libatf-c.a			comp-c-lib		compat,atf
-./usr/lib/oabi/libatf-c.so			base-sys-lib		compat,pic,atf
-./usr/lib/oabi/libatf-c_p.a			comp-c-proflib		compat,profile,atf
-./usr/lib/oabi/libatf-c_pic.a			comp-c-piclib		compat,pic,atf
-./usr/lib/oabi/libbfd.a				comp-obsolete		obsolete
-./usr/lib/oabi/libbfd.so				base-obsolete		obsolete
-./usr/lib/oabi/libbfd_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libbfd_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libbind9.a			comp-c-lib		compat
-./usr/lib/oabi/libbind9.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libbind9_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libbind9_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libbluetooth.a			comp-c-lib		compat
-./usr/lib/oabi/libbluetooth.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libbluetooth_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libbluetooth_pic.a		comp-c-piclib		compat,pic
-./usr/lib/oabi/libbsdmalloc.a			comp-c-lib		compat
-./usr/lib/oabi/libbsdmalloc.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libbsdmalloc_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libbsdmalloc_pic.a		comp-c-piclib		compat,pic
-./usr/lib/oabi/libbz2.a				comp-c-lib		compat
-./usr/lib/oabi/libbz2.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libbz2_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libbz2_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libc.a				comp-c-lib		compat
-./usr/lib/oabi/libc.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libc_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/libc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libcom_err.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libcom_err.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libcom_err_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libcompat.a			comp-c-lib		compat
-./usr/lib/oabi/libcompat_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libcompat_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libcrypt.a			comp-c-lib		compat
-./usr/lib/oabi/libcrypt.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libcrypt_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libcrypt_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libcrypto.a			comp-c-lib		compat,crypto
-./usr/lib/oabi/libcrypto.so			base-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libcrypto_idea.a			comp-obsolete		obsolete
-./usr/lib/oabi/libcrypto_idea_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/libcrypto_mdc2.a			comp-obsolete		obsolete
-./usr/lib/oabi/libcrypto_mdc2_p.a		comp-obsolete		obsolete
-./usr/lib/oabi/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libcrypto_rc5.a			comp-c-lib		crypto_rc5,compat
-./usr/lib/oabi/libcrypto_rc5_p.a			comp-c-proflib		crypto_rc5,compat,profile
-./usr/lib/oabi/libcurses.a			comp-c-lib		compat
-./usr/lib/oabi/libcurses.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libcurses_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libcurses_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libdes.a				comp-c-lib		compat,crypto
-./usr/lib/oabi/libdes.so				base-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libdes_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libdes_pic.a			comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libdevmapper.a			comp-lvm-lib		compat,lvm
-./usr/lib/oabi/libdevmapper.so			base-lvm-shlib		compat,lvm,pic
-./usr/lib/oabi/libdevmapper_p.a			comp-lvm-proflib	compat,profile,lvm
-./usr/lib/oabi/libdevmapper_pic.a		comp-lvm-piclib		compat,pic,lvm
-./usr/lib/oabi/libdm.a				comp-c-lib		compat
-./usr/lib/oabi/libdm.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libdm_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/libdm_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libdns.a				comp-c-lib		compat
-./usr/lib/oabi/libdns.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libdns_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libdns_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libdns_sd.a			comp-c-lib		compat,mdns
-./usr/lib/oabi/libdns_sd.so			base-mdns-shlib		compat,pic,mdns
-./usr/lib/oabi/libdns_sd_p.a			comp-c-proflib		compat,profile,mdns
-./usr/lib/oabi/libdns_sd_pic.a			comp-c-piclib		compat,pic,mdns
-./usr/lib/oabi/libdwarf.a			comp-c-lib		compat
-./usr/lib/oabi/libdwarf.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libdwarf_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libdwarf_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libedit.a				comp-c-lib		compat
-./usr/lib/oabi/libedit.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libedit_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libedit_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libelf.a				comp-c-lib		compat
-./usr/lib/oabi/libelf.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libelf_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libelf_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libevent.a			comp-c-lib		compat
-./usr/lib/oabi/libevent.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libevent_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libevent_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libevent_openssl.a		comp-c-lib		compat,crypto
-./usr/lib/oabi/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
-./usr/lib/oabi/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
-./usr/lib/oabi/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
-./usr/lib/oabi/libevent_pthreads.a		comp-c-lib		compat
-./usr/lib/oabi/libevent_pthreads.so		base-sys-shlib		compat,pic
-./usr/lib/oabi/libevent_pthreads_p.a		comp-c-proflib		compat,profile
-./usr/lib/oabi/libevent_pthreads_pic.a		comp-c-piclib		compat,pic
-./usr/lib/oabi/libexecinfo.a			comp-c-lib		compat
-./usr/lib/oabi/libexecinfo.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libexecinfo_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libexecinfo_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libexpat.a			comp-c-lib		compat
-./usr/lib/oabi/libexpat.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libexpat_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libexpat_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libfetch.a			comp-c-lib		compat
-./usr/lib/oabi/libfetch.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libfetch_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libfetch_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libfl.a				comp-c-lib		compat
-./usr/lib/oabi/libfl_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/libform.a				comp-c-lib		compat
-./usr/lib/oabi/libform.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libform_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libform_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libgcc.a				comp-c-lib		compat
-./usr/lib/oabi/libgcc_eh.a			comp-c-lib		compat,pic
-./usr/lib/oabi/libgcc_eh_p.a			comp-c-proflib		obsolete
-./usr/lib/oabi/libgcc_eh_pic.a			comp-c-piclib		obsolete
-./usr/lib/oabi/libgcc_p.a			comp-c-proflib		obsolete
-./usr/lib/oabi/libgcc_pic.a			comp-c-piclib		obsolete
-./usr/lib/oabi/libgcc_s.a			comp-obsolete		obsolete
-./usr/lib/oabi/libgcc_s.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libgcc_s_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libgcc_s_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libgcov.a				comp-c-lib		compat,gcccmds
-./usr/lib/oabi/libgcov_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libgcov_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libgmp.a				comp-c-lib		obsolete
-./usr/lib/oabi/libgmp.so				base-sys-shlib		obsolete
-./usr/lib/oabi/libgmp_p.a			comp-c-proflib		obsolete
-./usr/lib/oabi/libgmp_pic.a			comp-c-piclib		obsolete
-./usr/lib/oabi/libgnumalloc.a			comp-c-lib		compat
-./usr/lib/oabi/libgnumalloc.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libgnumalloc_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libgnumalloc_pic.a		comp-c-piclib		compat,pic
-./usr/lib/oabi/libgomp.a				comp-c-lib		compat,gcc=45
-./usr/lib/oabi/libgomp.so			base-sys-shlib		compat,pic,gcc=45
-./usr/lib/oabi/libgomp_p.a			comp-c-proflib		compat,profile,gcc=45
-./usr/lib/oabi/libgomp_pic.a			comp-c-piclib		compat,pic,gcc=45
-./usr/lib/oabi/libgssapi.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libgssapi.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libgssapi_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libgssapi_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libhdb.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libhdb.so				base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libhdb_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libhdb_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libheimbase.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libheimbase.so			comp-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libheimbase_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libheimbase_pic.a			comp-c-proflib		compat,pic,kerberos
-./usr/lib/oabi/libheimntlm.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libheimntlm.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libheimntlm_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libheimntlm_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libhx509.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libhx509.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libhx509_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libhx509_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libiberty.a			comp-obsolete		obsolete
-./usr/lib/oabi/libiberty_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libiberty_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libintl.a				comp-c-lib		compat
-./usr/lib/oabi/libintl.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libintl_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libintl_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libipsec.a			comp-c-lib		compat
-./usr/lib/oabi/libipsec.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libipsec_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libipsec_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libisc.a				comp-c-lib		compat
-./usr/lib/oabi/libisc.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libisc_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libisc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libisccc.a			comp-c-lib		compat
-./usr/lib/oabi/libisccc.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libisccc_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libisccc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libisccfg.a			comp-c-lib		compat
-./usr/lib/oabi/libisccfg.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libisccfg_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libisccfg_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libiscsi.a			comp-c-lib		compat,iscsi
-./usr/lib/oabi/libiscsi.so			base-sys-shlib		compat,pic,iscsi
-./usr/lib/oabi/libiscsi_p.a			comp-c-proflib		compat,profile,iscsi
-./usr/lib/oabi/libiscsi_pic.a			comp-c-piclib		compat,pic,iscsi
-./usr/lib/oabi/libisns.a				comp-c-lib		compat
-./usr/lib/oabi/libisns.so			comp-sys-shlib		compat
-./usr/lib/oabi/libisns_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libisns_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libkadm5clnt.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libkadm5clnt.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libkadm5clnt_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libkadm5clnt_pic.a		comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libkadm5srv.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libkadm5srv.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libkadm5srv_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libkadm5srv_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libkafs.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libkafs.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libkafs_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libkafs_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libkdc.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libkdc.so				comp-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libkdc_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libkdc_pic.a			comp-c-proflib		compat,pic,kerberos
-./usr/lib/oabi/libkrb5.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libkrb5.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libkrb5_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libkrb5_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libkvm.a				comp-c-lib		compat
-./usr/lib/oabi/libkvm.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libkvm_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libkvm_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libl.a				comp-c-lib		compat
-./usr/lib/oabi/libl_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/libl_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/liblber.a				comp-c-lib		compat,ldap
-./usr/lib/oabi/liblber.so			base-sys-shlib		compat,pic,ldap
-./usr/lib/oabi/liblber_p.a			comp-c-proflib		compat,profile,ldap
-./usr/lib/oabi/liblber_pic.a			comp-c-piclib		compat,pic,ldap
-./usr/lib/oabi/libldap.a				comp-c-lib		compat,ldap
-./usr/lib/oabi/libldap.so			base-sys-shlib		compat,pic,ldap
-./usr/lib/oabi/libldap_p.a			comp-c-proflib		compat,profile,ldap
-./usr/lib/oabi/libldap_pic.a			comp-c-piclib		compat,pic,ldap
-./usr/lib/oabi/libldap_r.a			comp-c-lib		compat,ldap
-./usr/lib/oabi/libldap_r.so			base-sys-shlib		compat,pic,ldap
-./usr/lib/oabi/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
-./usr/lib/oabi/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
-./usr/lib/oabi/liblua.a				comp-c-lib		compat
-./usr/lib/oabi/liblua.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/liblua_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/liblua_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/liblutok.a			comp-c-lib		compat,kyua
-./usr/lib/oabi/liblutok.so			base-sys-shlib		compat,pic,kyua
-./usr/lib/oabi/liblutok_p.a			comp-c-proflib		compat,profile,kyua
-./usr/lib/oabi/liblutok_pic.a			comp-c-piclib		compat,pic,kyua
-./usr/lib/oabi/liblwres.a			comp-c-lib		compat
-./usr/lib/oabi/liblwres.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/liblwres_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/liblwres_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/liblzf.a				comp-c-lib		compat
-./usr/lib/oabi/liblzf.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/liblzf_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/liblzf_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/liblzma.a				comp-c-lib		compat
-./usr/lib/oabi/liblzma.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/liblzma_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/liblzma_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libm.a				comp-c-lib		compat
-./usr/lib/oabi/libm.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libm_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/libm_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libmagic.a			comp-c-lib		compat
-./usr/lib/oabi/libmagic.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libmagic_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libmagic_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libmenu.a				comp-c-lib		compat
-./usr/lib/oabi/libmenu.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libmenu_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libmenu_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libmj.a				comp-c-lib		compat,crypto
-./usr/lib/oabi/libmj.so				comp-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libmj_p.a				comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libmj_pic.a			comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libmpc.a				comp-c-lib		obsolete
-./usr/lib/oabi/libmpc.so				base-sys-shlib		obsolete
-./usr/lib/oabi/libmpc_p.a			comp-c-proflib		obsolete
-./usr/lib/oabi/libmpc_pic.a			comp-c-piclib		obsolete
-./usr/lib/oabi/libmpfr.a				comp-c-lib		obsolete
-./usr/lib/oabi/libmpfr.so			base-sys-shlib		obsolete
-./usr/lib/oabi/libmpfr_p.a			comp-c-proflib		obsolete
-./usr/lib/oabi/libmpfr_pic.a			comp-c-piclib		obsolete
-./usr/lib/oabi/libnetpgp.a			comp-c-lib		compat,crypto
-./usr/lib/oabi/libnetpgp.so			comp-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libnetpgp_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libnetpgp_pic.a			comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libnetpgpverify.a			comp-c-lib		compat,crypto
-./usr/lib/oabi/libnetpgpverify.so		comp-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libnetpgpverify_p.a		comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libnetpgpverify_pic.a		comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libnpf.a				comp-c-lib		compat,npf
-./usr/lib/oabi/libnpf.so				comp-sys-shlib		compat,npf,pic
-./usr/lib/oabi/libnpf_p.a			comp-c-proflib		compat,npf,profile
-./usr/lib/oabi/libnpf_pic.a			comp-c-piclib		compat,npf,pic
-./usr/lib/oabi/libobjc.a				comp-c-lib		compat,gcccmds
-./usr/lib/oabi/libobjc.so			base-sys-shlib		compat,pic,gcccmds
-./usr/lib/oabi/libobjc_p.a			comp-c-proflib		compat,profile,gcccmds
-./usr/lib/oabi/libobjc_pic.a			comp-c-piclib		compat,pic,gcccmds
-./usr/lib/oabi/libopcodes.a			comp-obsolete		obsolete
-./usr/lib/oabi/libopcodes.so			base-obsolete		obsolete
-./usr/lib/oabi/libopcodes_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libopcodes_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libossaudio.a			comp-c-lib		compat
-./usr/lib/oabi/libossaudio.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libossaudio_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libossaudio_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libp2k.a				comp-c-lib		compat,rump
-./usr/lib/oabi/libp2k.so				base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/libp2k_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/libp2k_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/libpam.a				comp-c-lib		compat
-./usr/lib/oabi/libpam.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libpam_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libpam_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libpcap.a				comp-c-lib		compat
-./usr/lib/oabi/libpcap.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libpcap_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libpcap_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libpci.a				comp-c-lib		compat
-./usr/lib/oabi/libpci.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libpci_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libpci_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libperfuse.a			comp-c-lib		compat
-./usr/lib/oabi/libperfuse.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libperfuse_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libperfuse_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libposix.a			comp-c-lib		compat
-./usr/lib/oabi/libposix.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libposix_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libposix_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libppath.a			comp-c-lib		compat
-./usr/lib/oabi/libppath.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libppath_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libppath_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libprop.a				comp-c-lib		compat
-./usr/lib/oabi/libprop.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libprop_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libprop_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libpthread.a			comp-c-lib		compat
-./usr/lib/oabi/libpthread.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libpthread_dbg.a			comp-c-lib		compat
-./usr/lib/oabi/libpthread_dbg.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libpthread_dbg_p.a		comp-c-proflib		compat,profile
-./usr/lib/oabi/libpthread_dbg_pic.a		comp-c-piclib		compat,pic
-./usr/lib/oabi/libpthread_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libpthread_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libpuffs.a			comp-c-lib		compat
-./usr/lib/oabi/libpuffs.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libpuffs_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libpuffs_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libquota.a			comp-c-lib		compat
-./usr/lib/oabi/libquota.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libquota_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libquota_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libradius.a			comp-c-lib		compat
-./usr/lib/oabi/libradius.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libradius_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libradius_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/librefuse.a			comp-c-lib		compat
-./usr/lib/oabi/librefuse.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/librefuse_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/librefuse_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libresolv.a			comp-c-lib		compat
-./usr/lib/oabi/libresolv.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libresolv_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libresolv_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/librmt.a				comp-c-lib		compat
-./usr/lib/oabi/librmt_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/librmt_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libroken.a			comp-c-lib		compat,kerberos
-./usr/lib/oabi/libroken.so			base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libroken_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libroken_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/librpcsvc.a			comp-c-lib		compat
-./usr/lib/oabi/librpcsvc.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/librpcsvc_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/librpcsvc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/librt.a				comp-c-lib		compat
-./usr/lib/oabi/librt.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/librt_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/librt_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/librump.a				comp-c-lib		compat,rump
-./usr/lib/oabi/librump.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librump_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/librump_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/librumpclient.a			comp-c-lib		compat,rump
-./usr/lib/oabi/librumpclient.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librumpclient_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/librumpclient_pic.a		comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/librumpcrypto.a			comp-obsolete		obsolete
-./usr/lib/oabi/librumpcrypto.so			base-obsolete		obsolete
-./usr/lib/oabi/librumpcrypto_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/librumpcrypto_pic.a		comp-obsolete		obsolete
-./usr/lib/oabi/librumpdev.a			comp-c-lib		compat,rump
-./usr/lib/oabi/librumpdev.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librumpdev_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/librumpdev_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/librumphijack.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librumphijack_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/librumpnet.a			comp-c-lib		compat,rump
-./usr/lib/oabi/librumpnet.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librumpnet_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/librumpnet_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/librumpuser.a			comp-c-lib		compat,rump
-./usr/lib/oabi/librumpuser.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librumpuser_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/librumpuser_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/librumpvfs.a			comp-c-lib		compat,rump
-./usr/lib/oabi/librumpvfs.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/librumpvfs_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/librumpvfs_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/libsaslc.a			comp-c-lib		compat,crypto
-./usr/lib/oabi/libsaslc.so			base-sys-shlib		compat,pic,crypto
-./usr/lib/oabi/libsaslc_p.a			comp-c-proflib		compat,profile,crypto
-./usr/lib/oabi/libsaslc_pic.a			comp-c-piclib		compat,pic,crypto
-./usr/lib/oabi/libsdp.a				comp-obsolete		obsolete
-./usr/lib/oabi/libsdp.so				base-obsolete		obsolete
-./usr/lib/oabi/libsdp_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libsdp_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libskey.a				comp-c-lib		compat,skey
-./usr/lib/oabi/libskey.so			base-sys-shlib		compat,pic,skey
-./usr/lib/oabi/libskey_p.a			comp-c-proflib		compat,profile,skey
-./usr/lib/oabi/libskey_pic.a			comp-c-piclib		compat,pic,skey
-./usr/lib/oabi/libsl.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libsl.so				base-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libsl_p.a				comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libsl_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libsqlite3.a			comp-c-lib		compat
-./usr/lib/oabi/libsqlite3.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libsqlite3_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libsqlite3_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libss.a				comp-c-lib		obsolete
-./usr/lib/oabi/libss.so				base-sys-shlib		obsolete
-./usr/lib/oabi/libss_p.a				comp-c-proflib		obsolete
-./usr/lib/oabi/libss_pic.a			comp-c-piclib		obsolete
-./usr/lib/oabi/libssh.a				comp-c-lib		compat,crypto
-./usr/lib/oabi/libssh.so				base-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libssh_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libssh_pic.a			comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libssl.a				comp-c-lib		compat,crypto
-./usr/lib/oabi/libssl.so				base-sys-shlib		compat,crypto,pic
-./usr/lib/oabi/libssl_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/oabi/libssl_pic.a			comp-c-piclib		compat,crypto,pic
-./usr/lib/oabi/libstdc++.a			comp-c-lib		compat,cxx,gcccmds,libstdcxx
-./usr/lib/oabi/libstdc++.so			base-sys-shlib		compat,pic,cxx,gcccmds,libstdcxx
-./usr/lib/oabi/libstdc++_p.a			comp-c-proflib		compat,profile,cxx,gcccmds,libstdcxx
-./usr/lib/oabi/libstdc++_pic.a			comp-c-piclib		compat,pic,cxx,gcccmds,libstdcxx
-./usr/lib/oabi/libsupc++.a			comp-c-lib		compat,cxx,gcccmds,libstdcxx
-./usr/lib/oabi/libsupc++.so			base-obsolete		obsolete
-./usr/lib/oabi/libsupc++_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libtermcap.a			comp-c-lib		compat
-./usr/lib/oabi/libtermcap.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libtermcap_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libtermcap_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libterminfo.a			comp-c-lib		compat
-./usr/lib/oabi/libterminfo.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libterminfo_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libterminfo_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libtermlib.a			comp-c-lib		compat
-./usr/lib/oabi/libtermlib.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libtermlib_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libtermlib_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libtre.a				comp-c-lib		compat
-./usr/lib/oabi/libtre.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libtre_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libtre_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libukfs.a				comp-c-lib		compat,rump
-./usr/lib/oabi/libukfs.so			base-sys-shlib		compat,pic,rump
-./usr/lib/oabi/libukfs_p.a			comp-c-proflib		compat,profile,rump
-./usr/lib/oabi/libukfs_pic.a			comp-c-piclib		compat,pic,rump
-./usr/lib/oabi/libusbhid.a			comp-c-lib		compat
-./usr/lib/oabi/libusbhid.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libusbhid_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libusbhid_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libutil.a				comp-c-lib		compat
-./usr/lib/oabi/libutil.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libutil_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libutil_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/libvers.a				comp-obsolete		obsolete
-./usr/lib/oabi/libvers_p.a			comp-obsolete		obsolete
-./usr/lib/oabi/libvers_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libwind.a				comp-c-lib		compat,kerberos
-./usr/lib/oabi/libwind.so			comp-sys-shlib		compat,pic,kerberos
-./usr/lib/oabi/libwind_p.a			comp-c-proflib		compat,profile,kerberos
-./usr/lib/oabi/libwind_pic.a			comp-c-piclib		compat,pic,kerberos
-./usr/lib/oabi/libwrap.a				comp-c-lib		compat
-./usr/lib/oabi/libwrap.so			base-sys-shlib		compat,pic
-./usr/lib/oabi/libwrap_p.a			comp-c-proflib		compat,profile
-./usr/lib/oabi/libwrap_pic.a			comp-c-piclib		compat,pic
-./usr/lib/oabi/liby.a				comp-c-lib		compat
-./usr/lib/oabi/liby_p.a				comp-c-proflib		compat,profile
-./usr/lib/oabi/liby_pic.a			comp-obsolete		obsolete
-./usr/lib/oabi/libz.a				comp-c-lib		compat
-./usr/lib/oabi/libz.so				base-sys-shlib		compat,pic
-./usr/lib/oabi/libz_p.a				comp-c-proflib		compat,profile
 ./usr/lib/oabi/libz_pic.a			comp-c-piclib		compat,pic
 ./usr/libdata/lint/llib-larm.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-larm32.ln		comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/ad.m68k	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/ad.m68k	Sun Aug 11 22:29:02 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: ad.m68k,v 1.47 2013/07/17 05:41:30 matt Exp $
+# $NetBSD: ad.m68k,v 1.48 2013/08/11 22:29:02 joerg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
+./usr/include/gcc-4.5/math-68881.h		comp-c-include		gcccmds,gcc=45
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
-./usr/include/gcc-4.5/math-68881.h		comp-c-include		gcccmds,gcc=45
 ./usr/include/m68k				comp-c-include
 ./usr/include/m68k/ansi.h			comp-c-include
 ./usr/include/m68k/aout_machdep.h		comp-c-include
--- a/distrib/sets/lists/comp/ad.mips	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/ad.mips	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.41 2013/04/30 23:41:23 matt Exp $
+# $NetBSD: ad.mips,v 1.42 2013/08/11 22:29:02 joerg Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h		comp-c-include		gcccmds,gcc=45
@@ -199,14 +199,14 @@
 ./usr/lib/64/libbz2.so				base-sys-shlib		compat,pic
 ./usr/lib/64/libbz2_p.a				comp-c-proflib		compat,profile
 ./usr/lib/64/libbz2_pic.a			comp-c-piclib		compat,pic
+./usr/lib/64/libc++.a				comp-c-lib		compat,libcxx
+./usr/lib/64/libc++.so				comp-sys-shlib		compat,pic,libcxx
+./usr/lib/64/libc++_p.a				comp-c-proflib		compat,profile,libcxx
+./usr/lib/64/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/64/libc.a				comp-c-lib		compat
 ./usr/lib/64/libc.so				base-sys-shlib		compat,pic
 ./usr/lib/64/libc_p.a				comp-c-proflib		compat,profile
 ./usr/lib/64/libc_pic.a				comp-c-piclib		compat,pic
-./usr/lib/64/libc++.a				comp-c-lib		compat,libcxx
-./usr/lib/64/libc++.so				comp-sys-shlib		compat,pic,libcxx
-./usr/lib/64/libc++_p.a				comp-c-proflib		compat,profile,libcxx
-./usr/lib/64/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/64/libcom_err.a			comp-c-lib		compat,kerberos
 ./usr/lib/64/libcom_err.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/64/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
@@ -220,8 +220,6 @@
 ./usr/lib/64/libcrypt_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libcrypto.a			comp-c-lib		compat,crypto
 ./usr/lib/64/libcrypto.so			base-sys-shlib		compat,crypto,pic
-./usr/lib/64/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/64/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/64/libcrypto_idea.a			comp-obsolete		obsolete
 ./usr/lib/64/libcrypto_idea.so			base-obsolete		obsolete
 ./usr/lib/64/libcrypto_idea_p.a			comp-obsolete		obsolete
@@ -230,6 +228,8 @@
 ./usr/lib/64/libcrypto_mdc2.so			base-obsolete		obsolete
 ./usr/lib/64/libcrypto_mdc2_p.a			comp-obsolete		obsolete
 ./usr/lib/64/libcrypto_mdc2_pic.a		comp-obsolete		obsolete
+./usr/lib/64/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/64/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/64/libcrypto_rc5.a			comp-c-lib		crypto_rc5,compat
 ./usr/lib/64/libcrypto_rc5.so			base-sys-shlib		compat,crypto,crypto_rc5,pic
 ./usr/lib/64/libcrypto_rc5_p.a			comp-c-proflib		crypto_rc5,compat,profile
@@ -272,12 +272,12 @@
 ./usr/lib/64/libelf_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libevent.a				comp-c-lib		compat
 ./usr/lib/64/libevent.so			base-sys-shlib		compat,pic
-./usr/lib/64/libevent_p.a			comp-c-proflib		compat,profile
-./usr/lib/64/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libevent_openssl.a			comp-c-lib		compat,crypto
 ./usr/lib/64/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
 ./usr/lib/64/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
 ./usr/lib/64/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/64/libevent_p.a			comp-c-proflib		compat,profile
+./usr/lib/64/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libevent_pthreads.a		comp-c-lib		compat
 ./usr/lib/64/libevent_pthreads.so		base-sys-shlib		compat,pic
 ./usr/lib/64/libevent_pthreads_p.a		comp-c-proflib		compat,profile
@@ -810,14 +810,14 @@
 ./usr/lib/o32/libbz2.so				base-sys-shlib		compat,pic
 ./usr/lib/o32/libbz2_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libbz2_pic.a			comp-c-piclib		compat,pic
+./usr/lib/o32/libc++.a				comp-c-lib		compat,libcxx
+./usr/lib/o32/libc++.so				comp-sys-shlib		compat,pic,libcxx
+./usr/lib/o32/libc++_p.a			comp-c-proflib		compat,profile,libcxx
+./usr/lib/o32/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/o32/libc.a				comp-c-lib		compat
 ./usr/lib/o32/libc.so				base-sys-shlib		compat,pic
 ./usr/lib/o32/libc_p.a				comp-c-proflib		compat,profile
 ./usr/lib/o32/libc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/o32/libc++.a				comp-c-lib		compat,libcxx
-./usr/lib/o32/libc++.so				comp-sys-shlib		compat,pic,libcxx
-./usr/lib/o32/libc++_p.a			comp-c-proflib		compat,profile,libcxx
-./usr/lib/o32/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/o32/libcom_err.a			comp-c-lib		compat,kerberos
 ./usr/lib/o32/libcom_err.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/o32/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
@@ -877,12 +877,12 @@
 ./usr/lib/o32/libelf_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libevent.a			comp-c-lib		compat
 ./usr/lib/o32/libevent.so			base-sys-shlib		compat,pic
-./usr/lib/o32/libevent_p.a			comp-c-proflib		compat,profile
-./usr/lib/o32/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libevent_openssl.a		comp-c-lib		compat,crypto
 ./usr/lib/o32/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
 ./usr/lib/o32/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
 ./usr/lib/o32/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/o32/libevent_p.a			comp-c-proflib		compat,profile
+./usr/lib/o32/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libevent_pthreads.a		comp-c-lib		compat
 ./usr/lib/o32/libevent_pthreads.so		base-sys-shlib		compat,pic
 ./usr/lib/o32/libevent_pthreads_p.a		comp-c-proflib		compat,profile
--- a/distrib/sets/lists/comp/md.amd64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.197 2013/05/28 17:37:33 joerg Exp $
+# $NetBSD: md.amd64,v 1.198 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -68,8 +68,8 @@
 ./usr/include/amd64/varargs.h			comp-obsolete		obsolete
 ./usr/include/amd64/vmparam.h			comp-c-include
 ./usr/include/amd64/wchar_limits.h		comp-c-include
+./usr/include/clang-3.0/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/bmi2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/bmiintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/emmintrin.h		comp-obsolete		obsolete
@@ -90,8 +90,8 @@
 ./usr/include/clang-3.2/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.2/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/bmi2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/bmiintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/emmintrin.h		comp-obsolete		obsolete
@@ -116,8 +116,8 @@
 ./usr/include/clang-3.3/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.3/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.3/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.3/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/bmi2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/bmiintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/emmintrin.h		comp-obsolete		obsolete
@@ -131,8 +131,8 @@
 ./usr/include/clang-3.3/mmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/nmmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/popcntintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/prfchwintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.3/popcntintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/rdseedintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/rtmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/smmintrin.h		comp-obsolete		obsolete
@@ -144,8 +144,8 @@
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-c-include		llvm
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-c-include		llvm
 ./usr/include/clang-3.4/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-3.4/avx2intrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/avxintrin.h		comp-c-include		llvm
-./usr/include/clang-3.4/avx2intrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/bmi2intrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/bmiintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/emmintrin.h		comp-c-include		llvm
@@ -159,8 +159,8 @@
 ./usr/include/clang-3.4/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/nmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.4/popcntintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/prfchwintrin.h		comp-c-include		llvm
-./usr/include/clang-3.4/popcntintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/rdseedintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/rtmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/smmintrin.h		comp-c-include		llvm
@@ -511,14 +511,14 @@
 ./usr/lib/i386/libbz2.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libbz2_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libbz2_pic.a			comp-c-piclib		compat,pic
+./usr/lib/i386/libc++.a				comp-c-lib		compat,libcxx
+./usr/lib/i386/libc++.so			comp-sys-shlib		compat,pic,libcxx
+./usr/lib/i386/libc++_p.a			comp-c-proflib		compat,profile,libcxx
+./usr/lib/i386/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/i386/libc.a				comp-c-lib		compat
 ./usr/lib/i386/libc.so				comp-sys-shlib		compat,pic
 ./usr/lib/i386/libc_p.a				comp-c-proflib		compat,profile
 ./usr/lib/i386/libc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/i386/libc++.a				comp-c-lib		compat,libcxx
-./usr/lib/i386/libc++.so			comp-sys-shlib		compat,pic,libcxx
-./usr/lib/i386/libc++_p.a			comp-c-proflib		compat,profile,libcxx
-./usr/lib/i386/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/i386/libcom_err.a			comp-c-lib		compat,kerberos
 ./usr/lib/i386/libcom_err.so			comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/i386/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
@@ -532,8 +532,6 @@
 ./usr/lib/i386/libcrypt_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libcrypto.a			comp-c-lib		compat,crypto
 ./usr/lib/i386/libcrypto.so			base-sys-shlib		compat,crypto,pic
-./usr/lib/i386/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/i386/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/i386/libcrypto_idea.a			comp-obsolete		obsolete
 ./usr/lib/i386/libcrypto_idea.so		base-obsolete		obsolete
 ./usr/lib/i386/libcrypto_idea_p.a		comp-obsolete		obsolete
@@ -542,6 +540,8 @@
 ./usr/lib/i386/libcrypto_mdc2.so		base-obsolete		obsolete
 ./usr/lib/i386/libcrypto_mdc2_p.a		comp-obsolete		obsolete
 ./usr/lib/i386/libcrypto_mdc2_pic.a		comp-obsolete		obsolete
+./usr/lib/i386/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/i386/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/i386/libcrypto_rc5.a			comp-c-lib		crypto_rc5,compat
 ./usr/lib/i386/libcrypto_rc5.so			base-sys-shlib		compat,crypto,crypto_rc5,pic
 ./usr/lib/i386/libcrypto_rc5_p.a		comp-c-proflib		crypto_rc5,compat,profile
@@ -584,12 +584,12 @@
 ./usr/lib/i386/libelf_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libevent.a			comp-c-lib		compat
 ./usr/lib/i386/libevent.so			comp-sys-shlib		compat,pic
-./usr/lib/i386/libevent_p.a			comp-c-proflib		compat,profile
-./usr/lib/i386/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libevent_openssl.a		comp-c-lib		compat,crypto
 ./usr/lib/i386/libevent_openssl.so		comp-sys-shlib		compat,pic,crypto
 ./usr/lib/i386/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
 ./usr/lib/i386/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/i386/libevent_p.a			comp-c-proflib		compat,profile
+./usr/lib/i386/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libevent_pthreads.a		comp-c-lib		compat
 ./usr/lib/i386/libevent_pthreads.so		comp-sys-shlib		compat,pic
 ./usr/lib/i386/libevent_pthreads_p.a		comp-c-proflib		compat,profile
@@ -961,14 +961,14 @@
 ./usr/lib/i386/libtpm_unseal.so			comp-sys-shlib		compat,pic,tpm
 ./usr/lib/i386/libtpm_unseal_p.a		comp-c-proflib		compat,profile,tpm
 ./usr/lib/i386/libtpm_unseal_pic.a		comp-c-piclib		compat,pic,tpm
+./usr/lib/i386/libtre.a				comp-c-lib		compat
+./usr/lib/i386/libtre.so			comp-sys-shlib		compat,pic
+./usr/lib/i386/libtre_p.a			comp-c-proflib		compat,profile
+./usr/lib/i386/libtre_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libtspi.a			comp-c-lib		compat,tpm
 ./usr/lib/i386/libtspi.so			comp-sys-shlib		compat,pic,tpm
 ./usr/lib/i386/libtspi_p.a			comp-c-proflib		compat,profile,tpm
 ./usr/lib/i386/libtspi_pic.a			comp-c-piclib		compat,pic,tpm
-./usr/lib/i386/libtre.a				comp-c-lib		compat
-./usr/lib/i386/libtre.so			comp-sys-shlib		compat,pic
-./usr/lib/i386/libtre_p.a			comp-c-proflib		compat,profile
-./usr/lib/i386/libtre_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libukfs.a			comp-c-lib		compat,rump
 ./usr/lib/i386/libukfs.so			comp-sys-shlib		compat,pic,rump
 ./usr/lib/i386/libukfs_p.a			comp-c-proflib		compat,profile,rump
--- a/distrib/sets/lists/comp/md.amigappc	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.amigappc	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: md.amigappc,v 1.9 2013/08/11 22:27:44 joerg Exp $
-./usr/include/ieeefp.h				comp-c-include
+# $NetBSD: md.amigappc,v 1.10 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/amigappc				comp-c-include
 ./usr/include/amigappc/_G_config.h		comp-obsolete		obsolete
 ./usr/include/amigappc/ansi.h			comp-c-include
@@ -59,3 +58,4 @@
 ./usr/include/amigappc/vmparam.h		comp-c-include
 ./usr/include/amigappc/wchar_limits.h		comp-c-include
 ./usr/include/amigappc/z8530var.h		comp-obsolete		obsolete
+./usr/include/ieeefp.h				comp-c-include
--- a/distrib/sets/lists/comp/md.emips	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.emips	Sun Aug 11 22:29:02 2013 +0000
@@ -1,6 +1,5 @@
-#	$NetBSD: md.emips,v 1.3 2012/11/25 21:55:50 alnsn Exp $
+#	$NetBSD: md.emips,v 1.4 2013/08/11 22:29:02 joerg Exp $
 #
-./usr/include/ieeefp.h				comp-c-include
 ./usr/include/emips				comp-c-include
 ./usr/include/emips/ansi.h			comp-c-include
 ./usr/include/emips/asm.h			comp-c-include
@@ -56,3 +55,4 @@
 ./usr/include/emips/varargs.h			comp-obsolete		obsolete
 ./usr/include/emips/vmparam.h			comp-c-include
 ./usr/include/emips/wchar_limits.h		comp-c-include
+./usr/include/ieeefp.h				comp-c-include
--- a/distrib/sets/lists/comp/md.evbcf	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.evbcf	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: md.evbcf,v 1.1 2013/07/18 22:08:59 matt Exp $
-./usr/include/ieeefp.h				comp-c-include
+# $NetBSD: md.evbcf,v 1.2 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/evbcf				comp-c-include
 ./usr/include/evbcf/ansi.h			comp-c-include
 ./usr/include/evbcf/aout_machdep.h		comp-c-include
@@ -45,3 +44,4 @@
 ./usr/include/evbcf/types.h			comp-c-include
 ./usr/include/evbcf/vmparam.h			comp-c-include
 ./usr/include/evbcf/wchar_limits.h		comp-c-include
+./usr/include/ieeefp.h				comp-c-include
--- a/distrib/sets/lists/comp/md.ews4800mips	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.ews4800mips	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.6 2012/11/25 21:55:50 alnsn Exp $
-./usr/include/ieeefp.h				comp-c-include
+# $NetBSD: md.ews4800mips,v 1.7 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/ews4800mips			comp-c-include
 ./usr/include/ews4800mips/ansi.h		comp-c-include
 ./usr/include/ews4800mips/aout_machdep.h	comp-c-include
@@ -56,3 +55,4 @@
 ./usr/include/ews4800mips/vmparam.h		comp-c-include
 ./usr/include/ews4800mips/vtoc.h		comp-c-include
 ./usr/include/ews4800mips/wchar_limits.h	comp-c-include
+./usr/include/ieeefp.h				comp-c-include
--- a/distrib/sets/lists/comp/md.i386	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.i386	Sun Aug 11 22:29:02 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.i386,v 1.135 2013/05/28 17:37:33 joerg Exp $
+# $NetBSD: md.i386,v 1.136 2013/08/11 22:29:02 joerg Exp $
+./usr/include/clang-3.0/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.0/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/bmi2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/bmiintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.0/emmintrin.h		comp-obsolete		obsolete
@@ -21,8 +21,8 @@
 ./usr/include/clang-3.2/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.2/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.2/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.2/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/bmi2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/bmiintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.2/emmintrin.h		comp-obsolete		obsolete
@@ -47,8 +47,8 @@
 ./usr/include/clang-3.3/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.3/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.3/ammintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/avxintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.3/avx2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/bmi2intrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/bmiintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/emmintrin.h		comp-obsolete		obsolete
@@ -62,8 +62,8 @@
 ./usr/include/clang-3.3/mmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/nmmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/pmmintrin.h		comp-obsolete		obsolete
+./usr/include/clang-3.3/popcntintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/prfchwintrin.h		comp-obsolete		obsolete
-./usr/include/clang-3.3/popcntintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/rdseedintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/rtmintrin.h		comp-obsolete		obsolete
 ./usr/include/clang-3.3/smmintrin.h		comp-obsolete		obsolete
@@ -75,8 +75,8 @@
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-c-include		llvm
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-c-include		llvm
 ./usr/include/clang-3.4/ammintrin.h		comp-c-include		llvm
+./usr/include/clang-3.4/avx2intrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/avxintrin.h		comp-c-include		llvm
-./usr/include/clang-3.4/avx2intrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/bmi2intrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/bmiintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/emmintrin.h		comp-c-include		llvm
@@ -90,8 +90,8 @@
 ./usr/include/clang-3.4/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/nmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/pmmintrin.h		comp-c-include		llvm
+./usr/include/clang-3.4/popcntintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/prfchwintrin.h		comp-c-include		llvm
-./usr/include/clang-3.4/popcntintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/rdseedintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/rtmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.4/smmintrin.h		comp-c-include		llvm
--- a/distrib/sets/lists/comp/md.landisk	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.landisk	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.landisk,v 1.4 2011/07/18 17:29:20 dyoung Exp $
+# $NetBSD: md.landisk,v 1.5 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/landisk				comp-c-include
 ./usr/include/landisk/ansi.h			comp-c-include
@@ -28,8 +28,8 @@
 ./usr/include/landisk/int_types.h		comp-c-include
 ./usr/include/landisk/intr.h			comp-c-include
 ./usr/include/landisk/limits.h			comp-c-include
+./usr/include/landisk/loadfile_machdep.h	comp-c-include
 ./usr/include/landisk/lock.h			comp-c-include
-./usr/include/landisk/loadfile_machdep.h	comp-c-include
 ./usr/include/landisk/math.h			comp-c-include
 ./usr/include/landisk/mcontext.h		comp-c-include
 ./usr/include/landisk/mutex.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sparc	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.sparc	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.79 2013/05/30 20:10:14 macallan Exp $
+# $NetBSD: md.sparc,v 1.80 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
@@ -97,12 +97,12 @@
 ./usr/include/sparc64/ieee.h			comp-c-include
 ./usr/include/sparc64/ieeefp.h			comp-c-include
 ./usr/include/sparc64/instr.h			comp-c-include
-./usr/include/sparc64/intr.h			comp-c-include
 ./usr/include/sparc64/int_const.h		comp-c-include
 ./usr/include/sparc64/int_fmtio.h		comp-c-include
 ./usr/include/sparc64/int_limits.h		comp-c-include
 ./usr/include/sparc64/int_mwgwtypes.h		comp-c-include
 ./usr/include/sparc64/int_types.h		comp-c-include
+./usr/include/sparc64/intr.h			comp-c-include
 ./usr/include/sparc64/joystick.h		comp-c-include
 ./usr/include/sparc64/kbd.h			comp-c-include
 ./usr/include/sparc64/kbio.h			comp-c-include
--- a/distrib/sets/lists/comp/md.sparc64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.sparc64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.170 2013/04/28 15:24:12 joerg Exp $
+# $NetBSD: md.sparc64,v 1.171 2013/08/11 22:29:02 joerg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
@@ -274,14 +274,14 @@
 ./usr/lib/sparc/libbz2.so			base-sys-shlib		compat,pic
 ./usr/lib/sparc/libbz2_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/libbz2_pic.a			comp-c-piclib		compat,pic
+./usr/lib/sparc/libc++.a			comp-c-lib		compat,libcxx
+./usr/lib/sparc/libc++.so			comp-sys-shlib		compat,pic,libcxx
+./usr/lib/sparc/libc++_p.a			comp-c-proflib		compat,profile,libcxx
+./usr/lib/sparc/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/sparc/libc.a				comp-c-lib		compat
 ./usr/lib/sparc/libc.so				base-sys-shlib		compat,pic
 ./usr/lib/sparc/libc_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/libc_pic.a			comp-c-piclib		compat,pic
-./usr/lib/sparc/libc++.a			comp-c-lib		compat,libcxx
-./usr/lib/sparc/libc++.so			comp-sys-shlib		compat,pic,libcxx
-./usr/lib/sparc/libc++_p.a			comp-c-proflib		compat,profile,libcxx
-./usr/lib/sparc/libc++_pic.a			comp-c-piclib		compat,pic,libcxx
 ./usr/lib/sparc/libcom_err.a			comp-c-lib		compat,kerberos
 ./usr/lib/sparc/libcom_err.so			base-sys-shlib		compat,pic,kerberos
 ./usr/lib/sparc/libcom_err_p.a			comp-c-proflib		compat,profile,kerberos
@@ -295,8 +295,6 @@
 ./usr/lib/sparc/libcrypt_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libcrypto.a			comp-c-lib		compat,crypto
 ./usr/lib/sparc/libcrypto.so			base-sys-shlib		compat,crypto,pic
-./usr/lib/sparc/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
-./usr/lib/sparc/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/sparc/libcrypto_idea.a		comp-obsolete		obsolete
 ./usr/lib/sparc/libcrypto_idea.so		base-obsolete		obsolete
 ./usr/lib/sparc/libcrypto_idea_p.a		comp-obsolete		obsolete
@@ -305,6 +303,8 @@
 ./usr/lib/sparc/libcrypto_mdc2.so		base-obsolete		obsolete
 ./usr/lib/sparc/libcrypto_mdc2_p.a		comp-obsolete		obsolete
 ./usr/lib/sparc/libcrypto_mdc2_pic.a		comp-obsolete		obsolete
+./usr/lib/sparc/libcrypto_p.a			comp-c-proflib		compat,crypto,profile
+./usr/lib/sparc/libcrypto_pic.a			comp-c-piclib		compat,crypto,pic
 ./usr/lib/sparc/libcrypto_rc5.a			comp-c-lib		crypto_rc5,compat
 ./usr/lib/sparc/libcrypto_rc5.so		base-sys-shlib		compat,crypto,crypto_rc5,pic
 ./usr/lib/sparc/libcrypto_rc5_p.a		comp-c-proflib		crypto_rc5,compat,profile
@@ -347,12 +347,12 @@
 ./usr/lib/sparc/libelf_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libevent.a			comp-c-lib		compat
 ./usr/lib/sparc/libevent.so			base-sys-shlib		compat,pic
-./usr/lib/sparc/libevent_p.a			comp-c-proflib		compat,profile
-./usr/lib/sparc/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libevent_openssl.a		comp-c-lib		compat,crypto
 ./usr/lib/sparc/libevent_openssl.so		base-sys-shlib		compat,pic,crypto
 ./usr/lib/sparc/libevent_openssl_p.a		comp-c-proflib		compat,profile,crypto
 ./usr/lib/sparc/libevent_openssl_pic.a		comp-c-piclib		compat,pic,crypto
+./usr/lib/sparc/libevent_p.a			comp-c-proflib		compat,profile
+./usr/lib/sparc/libevent_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libevent_pthreads.a		comp-c-lib		compat
 ./usr/lib/sparc/libevent_pthreads.so		base-sys-shlib		compat,pic
 ./usr/lib/sparc/libevent_pthreads_p.a		comp-c-proflib		compat,profile
--- a/distrib/sets/lists/comp/md.vax	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/md.vax	Sun Aug 11 22:29:02 2013 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.vax,v 1.38 2013/01/16 16:01:06 christos Exp $
+# $NetBSD: md.vax,v 1.39 2013/08/11 22:29:02 joerg Exp $
+./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/ieeefp.h				comp-obsolete		obsolete
-./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/vax				comp-c-include
 ./usr/include/vax/_G_config.h			comp-obsolete		obsolete
 ./usr/include/vax/ansi.h			comp-c-include
@@ -41,8 +41,8 @@
 ./usr/include/vax/macros.h			comp-c-include
 ./usr/include/vax/math.h			comp-c-include
 ./usr/include/vax/mcontext.h			comp-c-include
+./usr/include/vax/mtpr.h			comp-c-include
 ./usr/include/vax/mutex.h			comp-c-include
-./usr/include/vax/mtpr.h			comp-c-include
 ./usr/include/vax/nexus.h			comp-c-include
 ./usr/include/vax/param.h			comp-c-include
 ./usr/include/vax/pcb.h				comp-c-include
--- a/distrib/sets/lists/comp/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1830 2013/08/06 22:33:59 soren Exp $
+#	$NetBSD: mi,v 1.1831 2013/08/11 22:29:02 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -227,7 +227,6 @@
 ./usr/include/c++/cassert			comp-cxx-include	libcxx
 ./usr/include/c++/ccomplex			comp-cxx-include	libcxx
 ./usr/include/c++/cctype			comp-cxx-include	libcxx
-./usr/include/c++/cxxabi.h			comp-cxx-include	libcxx
 ./usr/include/c++/cerrno			comp-cxx-include	libcxx
 ./usr/include/c++/cfenv				comp-cxx-include	libcxx
 ./usr/include/c++/cfloat			comp-cxx-include	libcxx
@@ -254,6 +253,7 @@
 ./usr/include/c++/ctime				comp-cxx-include	libcxx
 ./usr/include/c++/cwchar			comp-cxx-include	libcxx
 ./usr/include/c++/cwctype			comp-cxx-include	libcxx
+./usr/include/c++/cxxabi.h			comp-cxx-include	libcxx
 ./usr/include/c++/deque				comp-cxx-include	libcxx
 ./usr/include/c++/exception			comp-cxx-include	libcxx
 ./usr/include/c++/ext/__hash			comp-cxx-include	libcxx
@@ -748,6 +748,7 @@
 ./usr/include/eti.h				comp-c-include
 ./usr/include/evdns.h				comp-c-include
 ./usr/include/event-config.h			comp-obsolete	obsolete
+./usr/include/event.h				comp-c-include
 ./usr/include/event2/buffer.h 			comp-c-include
 ./usr/include/event2/buffer_compat.h 		comp-c-include
 ./usr/include/event2/bufferevent.h 		comp-c-include
@@ -773,7 +774,6 @@
 ./usr/include/event2/tag_compat.h 		comp-c-include
 ./usr/include/event2/thread.h 			comp-c-include
 ./usr/include/event2/util.h			comp-c-include
-./usr/include/event.h				comp-c-include
 ./usr/include/evhttp.h				comp-c-include
 ./usr/include/evrpc.h				comp-c-include
 ./usr/include/evutil.h				comp-c-include
@@ -1940,8 +1940,8 @@
 ./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/bpfdesc.h			comp-c-include
-./usr/include/net/bpf_jit.h			comp-c-include		obsolete
 ./usr/include/net/bpfjit.h			comp-c-include
 ./usr/include/net/dlt.h				comp-c-include
 ./usr/include/net/ethertypes.h			comp-c-include
@@ -2714,6 +2714,13 @@
 ./usr/include/sys/xattr.h			comp-c-include
 ./usr/include/sysexits.h			comp-c-include
 ./usr/include/syslog.h				comp-c-include
+./usr/include/tar.h				comp-c-include
+./usr/include/tcpd.h				comp-c-include
+./usr/include/term.h				comp-c-include
+./usr/include/termcap.h				comp-c-include
+./usr/include/termios.h				comp-c-include
+./usr/include/threadlib.h			comp-obsolete		obsolete
+./usr/include/time.h				comp-c-include
 ./usr/include/trousers/trousers.h		comp-c-include		tpm
 ./usr/include/trousers/tss.h			comp-c-include		tpm
 ./usr/include/tss/compat11b.h			comp-c-include		tpm
@@ -2739,13 +2746,6 @@
 ./usr/include/tss/tss_error_basics.h		comp-c-include		tpm
 ./usr/include/tss/tss_structs.h			comp-c-include		tpm
 ./usr/include/tss/tss_typedef.h			comp-c-include		tpm
-./usr/include/tar.h				comp-c-include
-./usr/include/tcpd.h				comp-c-include
-./usr/include/term.h				comp-c-include
-./usr/include/termcap.h				comp-c-include
-./usr/include/termios.h				comp-c-include
-./usr/include/threadlib.h			comp-obsolete		obsolete
-./usr/include/time.h				comp-c-include
 ./usr/include/ttyent.h				comp-c-include
 ./usr/include/tzfile.h				comp-c-include
 ./usr/include/ucontext.h			comp-c-include
@@ -2885,10 +2885,10 @@
 ./usr/lib/libbsdmalloc_p.a			comp-c-proflib		profile
 ./usr/lib/libbz2.a				comp-c-lib
 ./usr/lib/libbz2_p.a				comp-c-proflib		profile
+./usr/lib/libc++.a				comp-c-lib		libcxx
+./usr/lib/libc++_p.a				comp-c-proflib		libcxx,profile
 ./usr/lib/libc.a				comp-c-lib
 ./usr/lib/libc_p.a				comp-c-proflib		profile
-./usr/lib/libc++.a				comp-c-lib		libcxx
-./usr/lib/libc++_p.a				comp-c-proflib		libcxx,profile
 ./usr/lib/libcdk.a				comp-obsolete		obsolete
 ./usr/lib/libcdk_p.a				comp-obsolete		obsolete
 ./usr/lib/libcom_err.a				comp-krb5-lib		kerberos
@@ -2928,9 +2928,9 @@
 ./usr/lib/libelf.a				comp-c-lib
 ./usr/lib/libelf_p.a				comp-c-proflib		profile
 ./usr/lib/libevent.a				comp-c-lib
-./usr/lib/libevent_p.a				comp-c-proflib		profile
 ./usr/lib/libevent_openssl.a			comp-c-lib		crypto
 ./usr/lib/libevent_openssl_p.a			comp-c-proflib		profile,crypto
+./usr/lib/libevent_p.a				comp-c-proflib		profile
 ./usr/lib/libevent_pthreads.a			comp-c-lib
 ./usr/lib/libevent_pthreads_p.a			comp-c-proflib		profile
 ./usr/lib/libexecinfo.a				comp-c-lib
@@ -4995,7 +4995,6 @@
 ./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_ssl.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
@@ -5003,6 +5002,7 @@
 ./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_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/byteorder.0		comp-c-catman		.cat
@@ -7039,8 +7039,8 @@
 ./usr/share/man/cat3/menu_mark.0		comp-c-catman		.cat
 ./usr/share/man/cat3/menu_new.0			comp-c-catman		.cat
 ./usr/share/man/cat3/menu_opts.0		comp-c-catman		.cat
+./usr/share/man/cat3/menu_opts_off.0		comp-c-catman		.cat
 ./usr/share/man/cat3/menu_opts_on.0		comp-c-catman		.cat
-./usr/share/man/cat3/menu_opts_off.0		comp-c-catman		.cat
 ./usr/share/man/cat3/menu_pad.0			comp-c-catman		.cat
 ./usr/share/man/cat3/menu_pattern.0		comp-c-catman		.cat
 ./usr/share/man/cat3/menu_post.0		comp-c-catman		.cat
@@ -8840,7 +8840,6 @@
 ./usr/share/man/cat9/VOP_WHITEOUT.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/VOP_WRITE.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/VREF.0			comp-obsolete		obsolete
-./usr/share/man/cat9/atop.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/accept_filt_add.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/accept_filt_del.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/accept_filt_generic_mod_event.0	comp-sys-catman		.cat
@@ -8873,6 +8872,7 @@
 ./usr/share/man/cat9/arp_ifinit.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/arpintr.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/arpresolve.0		comp-sys-catman		.cat
+./usr/share/man/cat9/atop.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/audio.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/autoconf.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/bawrite.0			comp-sys-catman		.cat
@@ -9639,10 +9639,10 @@
 ./usr/share/man/cat9/pcq_peek.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/pcq_put.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/pcu.0			comp-sys-catman		.cat
+./usr/share/man/cat9/pcu_discard.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/pcu_load.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/pcu_save.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/pcu_save_all.0		comp-sys-catman		.cat
-./usr/share/man/cat9/pcu_discard.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/pcu_used_p.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/percpu.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/percpu_alloc.0		comp-sys-catman		.cat
@@ -11587,7 +11587,6 @@
 ./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_ssl.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
@@ -11595,6 +11594,7 @@
 ./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_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/byteorder.html		comp-c-htmlman		html
@@ -13549,8 +13549,8 @@
 ./usr/share/man/html3/menu_mark.html		comp-c-htmlman		html
 ./usr/share/man/html3/menu_new.html		comp-c-htmlman		html
 ./usr/share/man/html3/menu_opts.html		comp-c-htmlman		html
+./usr/share/man/html3/menu_opts_off.html	comp-c-htmlman		html
 ./usr/share/man/html3/menu_opts_on.html		comp-c-htmlman		html
-./usr/share/man/html3/menu_opts_off.html	comp-c-htmlman		html
 ./usr/share/man/html3/menu_pad.html		comp-c-htmlman		html
 ./usr/share/man/html3/menu_pattern.html		comp-c-htmlman		html
 ./usr/share/man/html3/menu_post.html		comp-c-htmlman		html
@@ -15287,7 +15287,6 @@
 ./usr/share/man/html9/VOP_WHITEOUT.html		comp-sys-htmlman	html
 ./usr/share/man/html9/VOP_WRITE.html		comp-sys-htmlman	html
 ./usr/share/man/html9/VREF.html			comp-obsolete	obsolete
-./usr/share/man/html9/atop.html			comp-sys-htmlman	html
 ./usr/share/man/html9/accept_filt_add.html	comp-sys-htmlman	html
 ./usr/share/man/html9/accept_filt_del.html	comp-sys-htmlman	html
 ./usr/share/man/html9/accept_filt_generic_mod_event.html	comp-sys-htmlman	html
@@ -15319,6 +15318,7 @@
 ./usr/share/man/html9/arp_ifinit.html		comp-sys-htmlman	html
 ./usr/share/man/html9/arpintr.html		comp-sys-htmlman	html
 ./usr/share/man/html9/arpresolve.html		comp-sys-htmlman	html
+./usr/share/man/html9/atop.html			comp-sys-htmlman	html
 ./usr/share/man/html9/audio.html		comp-sys-htmlman	html
 ./usr/share/man/html9/autoconf.html		comp-sys-htmlman	html
 ./usr/share/man/html9/bawrite.html		comp-sys-htmlman	html
@@ -15834,10 +15834,10 @@
 ./usr/share/man/html9/kcpuset_atomic_clear.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_atomic_set.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_clear.html	comp-sys-htmlman	html
-./usr/share/man/html9/kcpuset_countset.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_copy.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_copyin.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_copyout.html	comp-sys-htmlman	html
+./usr/share/man/html9/kcpuset_countset.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_create.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_destroy.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kcpuset_export_32.html	comp-sys-htmlman	html
@@ -16057,10 +16057,10 @@
 ./usr/share/man/html9/pcq_peek.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pcq_put.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pcu.html			comp-sys-htmlman	html
+./usr/share/man/html9/pcu_discard.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pcu_load.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pcu_save.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pcu_save_all.html		comp-sys-htmlman	html
-./usr/share/man/html9/pcu_discard.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pcu_used_p.html		comp-sys-htmlman	html
 ./usr/share/man/html9/percpu.html		comp-sys-htmlman	html
 ./usr/share/man/html9/percpu_alloc.html		comp-sys-htmlman	html
@@ -18001,7 +18001,6 @@
 ./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_ssl.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
@@ -18009,6 +18008,7 @@
 ./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_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/byteorder.3		comp-c-man		.man
@@ -20045,8 +20045,8 @@
 ./usr/share/man/man3/menu_mark.3		comp-c-man		.man
 ./usr/share/man/man3/menu_new.3			comp-c-man		.man
 ./usr/share/man/man3/menu_opts.3		comp-c-man		.man
+./usr/share/man/man3/menu_opts_off.3		comp-c-man		.man
 ./usr/share/man/man3/menu_opts_on.3		comp-c-man		.man
-./usr/share/man/man3/menu_opts_off.3		comp-c-man		.man
 ./usr/share/man/man3/menu_pad.3			comp-c-man		.man
 ./usr/share/man/man3/menu_pattern.3		comp-c-man		.man
 ./usr/share/man/man3/menu_post.3		comp-c-man		.man
@@ -21841,7 +21841,6 @@
 ./usr/share/man/man9/VOP_WHITEOUT.9		comp-sys-man		.man
 ./usr/share/man/man9/VOP_WRITE.9		comp-sys-man		.man
 ./usr/share/man/man9/VREF.9			comp-obsolete		obsolete
-./usr/share/man/man9/atop.9			comp-sys-man		.man
 ./usr/share/man/man9/accept_filt_add.9		comp-sys-man		.man
 ./usr/share/man/man9/accept_filt_del.9		comp-sys-man		.man
 ./usr/share/man/man9/accept_filt_generic_mod_event.9	comp-sys-man		.man
@@ -21874,6 +21873,7 @@
 ./usr/share/man/man9/arp_ifinit.9		comp-sys-man		.man
 ./usr/share/man/man9/arpintr.9			comp-sys-man		.man
 ./usr/share/man/man9/arpresolve.9		comp-sys-man		.man
+./usr/share/man/man9/atop.9			comp-sys-man		.man
 ./usr/share/man/man9/audio.9			comp-sys-man		.man
 ./usr/share/man/man9/autoconf.9			comp-sys-man		.man
 ./usr/share/man/man9/bawrite.9			comp-sys-man		.man
@@ -22640,10 +22640,10 @@
 ./usr/share/man/man9/pcq_peek.9			comp-sys-man		.man
 ./usr/share/man/man9/pcq_put.9			comp-sys-man		.man
 ./usr/share/man/man9/pcu.9			comp-sys-man		.man
+./usr/share/man/man9/pcu_discard.9		comp-sys-man		.man
 ./usr/share/man/man9/pcu_load.9			comp-sys-man		.man
 ./usr/share/man/man9/pcu_save.9			comp-sys-man		.man
 ./usr/share/man/man9/pcu_save_all.9		comp-sys-man		.man
-./usr/share/man/man9/pcu_discard.9		comp-sys-man		.man
 ./usr/share/man/man9/pcu_used_p.9		comp-sys-man		.man
 ./usr/share/man/man9/percpu.9			comp-sys-man		.man
 ./usr/share/man/man9/percpu_alloc.9		comp-sys-man		.man
--- a/distrib/sets/lists/comp/shl.mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/comp/shl.mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.251 2013/08/08 06:23:01 matt Exp $
+# $NetBSD: shl.mi,v 1.252 2013/08/11 22:29:02 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -16,8 +16,8 @@
 ./usr/lib/libbluetooth_pic.a			comp-c-piclib
 ./usr/lib/libbsdmalloc_pic.a			comp-c-piclib
 ./usr/lib/libbz2_pic.a				comp-c-piclib
+./usr/lib/libc++_pic.a				comp-c-piclib		libcxx
 ./usr/lib/libc_pic.a				comp-c-piclib
-./usr/lib/libc++_pic.a				comp-c-piclib		libcxx
 ./usr/lib/libcdk_pic.a				comp-obsolete		obsolete
 ./usr/lib/libcom_err_pic.a			comp-c-piclib		kerberos
 ./usr/lib/libcompat_pic.a			comp-c-piclib
@@ -34,8 +34,8 @@
 ./usr/lib/libdwarf_pic.a			comp-c-piclib
 ./usr/lib/libedit_pic.a				comp-c-piclib
 ./usr/lib/libelf_pic.a				comp-c-piclib
+./usr/lib/libevent_openssl_pic.a		comp-c-piclib		crypto
 ./usr/lib/libevent_pic.a			comp-c-piclib
-./usr/lib/libevent_openssl_pic.a		comp-c-piclib		crypto
 ./usr/lib/libevent_pthreads_pic.a		comp-c-piclib
 ./usr/lib/libexecinfo_pic.a			comp-c-piclib
 ./usr/lib/libexpat_pic.a			comp-c-piclib
@@ -97,19 +97,19 @@
 ./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/libmudflap_pic.a			comp-c-piclib		gcc=45
 ./usr/lib/libmudflap.so				comp-c-shlib		gcc=45
 ./usr/lib/libmudflap.so.0			comp-c-shlib		gcc=45
 ./usr/lib/libmudflap.so.0.0			comp-c-shlib		gcc=45
-./usr/lib/libmudflapth_pic.a			comp-c-piclib		gcc=45
+./usr/lib/libmudflap_pic.a			comp-c-piclib		gcc=45
 ./usr/lib/libmudflapth.so			comp-c-shlib		gcc=45
 ./usr/lib/libmudflapth.so.0			comp-c-shlib		gcc=45
 ./usr/lib/libmudflapth.so.0.0			comp-c-shlib		gcc=45
+./usr/lib/libmudflapth_pic.a			comp-c-piclib		gcc=45
 ./usr/lib/libnetpgp_pic.a			comp-c-piclib		crypto
 ./usr/lib/libnetpgpverify_pic.a			comp-c-piclib		crypto
 ./usr/lib/libnpf_pic.a				comp-npf-piclib		npf
+./usr/lib/libntp_pic.a				comp-obsolete		obsolete
 ./usr/lib/libnvpair_pic.a			comp-zfs-piclib		zfs
-./usr/lib/libntp_pic.a				comp-obsolete		obsolete
 ./usr/lib/libobjc_pic.a				comp-objc-piclib	gcccmds
 ./usr/lib/libopcodes.so.5			comp-c-shlib		binutils
 ./usr/lib/libopcodes.so.5.0			comp-c-shlib		binutils
@@ -224,17 +224,17 @@
 ./usr/lib/libssp_pic.a				comp-obsolete		obsolete
 ./usr/lib/libstdc++_pic.a			comp-cxx-piclib		cxx,gcccmds,libstdcxx
 ./usr/lib/libtddl_pic.a				comp-c-piclib		tpm
-./usr/lib/libtspi_pic.a				comp-c-piclib		tpm
 ./usr/lib/libtelnet_pic.a			comp-obsolete		obsolete
 ./usr/lib/libtermcap_pic.a			comp-c-piclib
 ./usr/lib/libterminfo_pic.a			comp-c-piclib
 ./usr/lib/libtermlib_pic.a			comp-c-piclib
 ./usr/lib/libtpm_unseal_pic.a			comp-tpm-lib		tpm
 ./usr/lib/libtre_pic.a				comp-c-piclib
+./usr/lib/libtspi_pic.a				comp-c-piclib		tpm
 ./usr/lib/libukfs_pic.a				comp-c-piclib		rump
 ./usr/lib/libumem_pic.a				comp-zfs-piclib		zfs
+./usr/lib/libusb_pic.a				comp-obsolete		obsolete
 ./usr/lib/libusbhid_pic.a			comp-c-piclib
-./usr/lib/libusb_pic.a				comp-obsolete		obsolete
 ./usr/lib/libutil_pic.a				comp-c-piclib
 ./usr/lib/libuutil_pic.a			comp-zfs-piclib		zfs
 ./usr/lib/libwind_pic.a				comp-c-piclib		kerberos
--- a/distrib/sets/lists/debug/ad.arm	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/ad.arm	Sun Aug 11 22:29:02 2013 +0000
@@ -1,20 +1,30 @@
-# $NetBSD: ad.arm,v 1.10 2013/07/30 20:51:38 htodd Exp $
+# $NetBSD: ad.arm,v 1.11 2013/08/11 22:29:02 joerg Exp $
 ./usr/lib/libarm_g.a				-unknown-		debuglib
 ./usr/lib/libc_vfp_g.a				-unknown-		debuglib,softfloat
 ./usr/lib/libpmc_g.a				-unknown-		debuglib
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic,endian=1234
+./usr/lib/oabi/libdevmapper_g.a			-unknown-		compat,debuglib,lvm
+./usr/lib/oabi/libdm_g.a			-unknown-		compat,debuglib
+./usr/lib/oabi/libgmp_g.a			-unknown-		obsolete
+./usr/lib/oabi/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos
+./usr/lib/oabi/libkdc_g.a			comp-c-proflib		compat,debuglib,kerberos
+./usr/lib/oabi/liblzf_g.a			-unknown-		compat,debuglib
+./usr/lib/oabi/libmpc_g.a			-unknown-		obsolete
+./usr/lib/oabi/libmpfr_g.a			-unknown-		obsolete
+./usr/lib/oabi/libperfuse_g.a			comp-c-proflib		compat,debuglib
+./usr/lib/oabi/libppath_g.a			comp-c-proflib		compat,debuglib
+./usr/lib/oabi/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos
 ./usr/libdata/debug/lib/libc_vfp.so.0.0.debug	comp-sys-debug		debug,pic,softfloat
-./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
-./usr/libdata/debug/usr/lib/libarm.so.0.0.debug	comp-sys-debug		debug,pic
-./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug	comp-sys-debug		debug,pic,softfloat
-./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug	comp-sys-debug		debug,pic
 ./usr/libdata/debug/lib/oabi			-unknown-		debug,compat
 ./usr/libdata/debug/lib/oabi/npf		-unknown-		debug,compat
 ./usr/libdata/debug/lib/oabi/npf/ext_log.so.0.0.debug	comp-npf-debug		debug,compat
 ./usr/libdata/debug/lib/oabi/npf/ext_normalize.so.0.0.debug	comp-npf-debug		debug,compat
 ./usr/libdata/debug/lib/oabi/npf/ext_rndblock.so.0.0.debug	comp-npf-debug		debug,compat
 ./usr/libdata/debug/libexec/ld.elf_so-oabi.debug		comp-sys-debug		debug,compat
-./usr/libdata/debug/usr/libexec/ld.elf_so-oabi	comp-obsolete		obsolete
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic,endian=1234
+./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
+./usr/libdata/debug/usr/lib/libarm.so.0.0.debug	comp-sys-debug		debug,pic
+./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug	comp-sys-debug		debug,pic,softfloat
+./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug	comp-sys-debug		debug,pic
 ./usr/libdata/debug/usr/lib/oabi		-unknown-	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/i18n		-unknown-	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/i18n/libBIG5.so.5.0.debug	comp-i18n-debug	debug,compat
@@ -40,28 +50,22 @@
 ./usr/libdata/debug/usr/lib/oabi/i18n/libmapper_serial.so.5.0.debug	comp-i18n-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/i18n/libmapper_std.so.5.0.debug	comp-i18n-debug		debug,compat
 ./usr/libdata/debug/usr/lib/oabi/i18n/libmapper_zone.so.5.0.debug	comp-i18n-debug		debug,compat
-./usr/libdata/debug/usr/lib/oabi/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/oabi/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/oabi/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/oabi/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/oabi/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/oabi/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug		comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libamu.so.4.0.debug		comp-amd-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libarchive.so.3.1.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug		comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libasn1.so.8.0.debug		comp-compat-shlib	compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/oabi/libasn1.so.9.0.debug		comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/oabi/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug
 ./usr/libdata/debug/usr/lib/oabi/libatf-c.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug
-./usr/libdata/debug/usr/lib/oabi/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug
 ./usr/libdata/debug/usr/lib/oabi/libavl.so.0.0.debug		comp-zfs-debug	zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libbfd.so.12.0.debug	comp-sys-debug	binutils,debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libbind9.so.7.0.debug	comp-bind-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libbluetooth.so.4.2.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libbsdmalloc.so.0.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libbz2.so.1.1.debug		comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/oabi/libc++.so.1.0.debug		comp-sys-debug	debug,compat,pic,libcxx
 ./usr/libdata/debug/usr/lib/oabi/libc.so.12.185.debug		comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug		comp-sys-debug	debug,compat,pic
-./usr/libdata/debug/usr/lib/oabi/libc++.so.1.0.debug		comp-sys-debug	debug,compat,pic,libcxx
 ./usr/libdata/debug/usr/lib/oabi/libcom_err.so.6.0.debug	comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/oabi/libcom_err.so.7.0.debug	comp-compat-shlib	 compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/oabi/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
@@ -87,9 +91,9 @@
 ./usr/libdata/debug/usr/lib/oabi/libform.so.6.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libg2c.so.2.0.debug		comp-sys-debug	gcc=3,debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libgcc_s.so.1.0.debug	comp-sys-debug	gcc,debug,compat
+./usr/libdata/debug/usr/lib/oabi/libgmp.so.10.2.debug	comp-sys-debug	obsolete
 ./usr/libdata/debug/usr/lib/oabi/libgnumalloc.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libgomp.so.1.0.debug	comp-sys-debug	debug,compat,gcc=45
-./usr/libdata/debug/usr/lib/oabi/libgmp.so.10.2.debug	comp-sys-debug	obsolete
 ./usr/libdata/debug/usr/lib/oabi/libgssapi.so.10.0.debug	comp-compat-shlib	 compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/oabi/libgssapi.so.9.0.debug	comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/oabi/libhdb.so.13.0.debug		comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
@@ -192,21 +196,17 @@
 ./usr/libdata/debug/usr/lib/oabi/libz.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libzfs.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/oabi/libzpool.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat
-./usr/lib/oabi/libdevmapper_g.a			-unknown-		compat,debuglib,lvm
-./usr/lib/oabi/libdm_g.a			-unknown-		compat,debuglib
-./usr/lib/oabi/libgmp_g.a			-unknown-		obsolete
-./usr/lib/oabi/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos
-./usr/lib/oabi/libkdc_g.a			comp-c-proflib		compat,debuglib,kerberos
-./usr/lib/oabi/liblzf_g.a			-unknown-		compat,debuglib
-./usr/lib/oabi/libmpc_g.a			-unknown-		obsolete
-./usr/lib/oabi/libmpfr_g.a			-unknown-		obsolete
-./usr/lib/oabi/libperfuse_g.a			comp-c-proflib		compat,debuglib
-./usr/lib/oabi/libppath_g.a			comp-c-proflib		compat,debuglib
-./usr/lib/oabi/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos
+./usr/libdata/debug/usr/lib/oabi/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/oabi/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/oabi/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/oabi/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/oabi/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/oabi/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/libexec/ld.elf_so-oabi	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/sbin/apm.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/apmd.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/usr/sbin/eeprom.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/elftosb.debug	comp-util-debug		debug,endian=1234
-./usr/libdata/debug/usr/sbin/eeprom.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/ofctl.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/sbkeygen.debug	comp-util-debug		debug,endian=1234
 ./usr/libdata/debug/usr/sbin/sbtool.debug	comp-util-debug		debug,endian=1234
--- a/distrib/sets/lists/debug/ad.m68k	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/ad.m68k	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.m68k,v 1.1 2013/01/16 16:01:07 christos Exp $
+# $NetBSD: ad.m68k,v 1.2 2013/08/11 22:29:02 joerg Exp $
+./usr/lib/libm68k_g.a				-unknown-		debuglib
 ./usr/libdata/debug/usr/bin/elf2aout.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
-./usr/lib/libm68k_g.a				-unknown-		debuglib
--- a/distrib/sets/lists/debug/ad.mips	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/ad.mips	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,30 @@
-# $NetBSD: ad.mips,v 1.5 2013/07/30 20:51:38 htodd Exp $
+# $NetBSD: ad.mips,v 1.6 2013/08/11 22:29:02 joerg Exp $
+./usr/lib/64/libcrypto_g.a			comp-c-proflib		compat,crypto,debuglib,arch64
+./usr/lib/64/libcrypto_idea_g.a			comp-obsolete		obsolete
+./usr/lib/64/libcrypto_mdc2_g.a			comp-obsolete		obsolete
+./usr/lib/64/libcrypto_rc5_g.a			comp-c-proflib		compat,crypto,crypto_rc5,debuglib,arch64
+./usr/lib/64/libdevmapper_g.a			-unknown-		compat,debuglib,lvm,arch64
+./usr/lib/64/libdm_g.a				-unknown-		compat,debuglib,arch64
+./usr/lib/64/libgmp_g.a				-unknown-		obsolete
+./usr/lib/64/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
+./usr/lib/64/libkdc_g.a				comp-c-proflib		compat,debuglib,kerberos,arch64
+./usr/lib/64/liblzf_g.a				-unknown-		compat,debuglib,arch64
+./usr/lib/64/libmpc_g.a				-unknown-		obsolete
+./usr/lib/64/libmpfr_g.a			-unknown-		obsolete
+./usr/lib/64/libperfuse_g.a			comp-c-proflib		compat,debuglib,arch64
+./usr/lib/64/libppath_g.a			comp-c-proflib		compat,debuglib,arch64
+./usr/lib/64/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
+./usr/lib/o32/libdevmapper_g.a			-unknown-		compat,debuglib,lvm,arch64
+./usr/lib/o32/libdm_g.a				-unknown-		compat,debuglib,arch64
+./usr/lib/o32/libgmp_g.a			-unknown-		obsolete
+./usr/lib/o32/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
+./usr/lib/o32/libkdc_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
+./usr/lib/o32/liblzf_g.a			-unknown-		compat,debuglib,arch64
+./usr/lib/o32/libmpc_g.a			-unknown-		obsolete
+./usr/lib/o32/libmpfr_g.a			-unknown-		obsolete
+./usr/lib/o32/libperfuse_g.a			comp-c-proflib		compat,debuglib,arch64
+./usr/lib/o32/libppath_g.a			comp-c-proflib		compat,debuglib,arch64
+./usr/lib/o32/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
 ./usr/libdata/debug/lib/64/npf/ext_log.so.0.0.debug	comp-npf-debug		debug,compat,arch64
 ./usr/libdata/debug/lib/64/npf/ext_normalize.so.0.0.debug	comp-npf-debug		debug,compat,arch64
 ./usr/libdata/debug/lib/64/npf/ext_rndblock.so.0.0.debug	comp-npf-debug		debug,compat,arch64
@@ -32,18 +58,12 @@
 ./usr/libdata/debug/usr/lib/64/i18n/libmapper_serial.so.5.0.debug	comp-i18n-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/i18n/libmapper_std.so.5.0.debug	comp-i18n-debug		debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/i18n/libmapper_zone.so.5.0.debug	comp-i18n-debug		debug,compat,arch64
-./usr/libdata/debug/usr/lib/64/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/64/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/64/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/64/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/64/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/64/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/64/libamu.so.4.0.debug		comp-amd-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libarchive.so.3.1.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libasn1.so.8.0.debug		comp-compat-shlib	compat,pic,kerberos,debug,obsolete,arch64
 ./usr/libdata/debug/usr/lib/64/libasn1.so.9.0.debug		comp-compat-shlib	compat,pic,kerberos,debug,arch64
+./usr/libdata/debug/usr/lib/64/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug,arch64
 ./usr/libdata/debug/usr/lib/64/libatf-c.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug,arch64
-./usr/libdata/debug/usr/lib/64/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug,arch64
 ./usr/libdata/debug/usr/lib/64/libavl.so.0.0.debug		comp-zfs-debug	zfs,dynamicroot,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libbfd.so.12.0.debug	comp-sys-debug	binutils,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libbind9.so.7.0.debug	comp-bind-debug	debug,compat,arch64
@@ -180,6 +200,12 @@
 ./usr/libdata/debug/usr/lib/64/libz.so.1.0.debug		comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libzfs.so.0.0.debug		comp-zfs-debug	zfs,dynamicroot,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/64/libzpool.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat,arch64
+./usr/libdata/debug/usr/lib/64/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/64/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/64/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/64/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/64/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/64/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/o32/i18n/libBIG5.so.5.0.debug	comp-i18n-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/i18n/libDECHanyu.so.5.0.debug	comp-i18n-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/i18n/libEUC.so.5.0.debug	comp-i18n-debug	debug,compat,arch64
@@ -203,18 +229,12 @@
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_serial.so.5.0.debug	comp-i18n-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_std.so.5.0.debug	comp-i18n-debug		debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_zone.so.5.0.debug	comp-i18n-debug		debug,compat,arch64
-./usr/libdata/debug/usr/lib/o32/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/o32/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/o32/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/o32/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/o32/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/o32/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/o32/libamu.so.4.0.debug		comp-amd-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libarchive.so.3.1.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libasn1.so.8.0.debug		comp-compat-shlib	compat,pic,kerberos,debug,obsolete,arch64
 ./usr/libdata/debug/usr/lib/o32/libasn1.so.9.0.debug		comp-compat-shlib	compat,pic,kerberos,debug,arch64
+./usr/libdata/debug/usr/lib/o32/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug,arch64
 ./usr/libdata/debug/usr/lib/o32/libatf-c.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug,arch64
-./usr/libdata/debug/usr/lib/o32/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug,arch64
 ./usr/libdata/debug/usr/lib/o32/libavl.so.0.0.debug		comp-zfs-debug	zfs,dynamicroot,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libbfd.so.12.0.debug	comp-sys-debug	binutils,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libbind9.so.7.0.debug	comp-bind-debug	debug,compat,arch64
@@ -247,9 +267,9 @@
 ./usr/libdata/debug/usr/lib/o32/libform.so.6.0.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libg2c.so.2.0.debug		comp-sys-debug	gcc=3,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libgcc_s.so.1.0.debug	comp-sys-debug	gcc,debug,compat,arch64
+./usr/libdata/debug/usr/lib/o32/libgmp.so.10.2.debug	comp-sys-debug	obsolete
 ./usr/libdata/debug/usr/lib/o32/libgnumalloc.so.1.0.debug	comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libgomp.so.1.0.debug	comp-sys-debug	debug,compat,gcc=45,arch64
-./usr/libdata/debug/usr/lib/o32/libgmp.so.10.2.debug	comp-sys-debug	obsolete
 ./usr/libdata/debug/usr/lib/o32/libgssapi.so.10.0.debug	comp-compat-shlib	 compat,pic,kerberos,debug,arch64
 ./usr/libdata/debug/usr/lib/o32/libgssapi.so.9.0.debug	comp-compat-shlib	 compat,pic,kerberos,debug,obsolete,arch64
 ./usr/libdata/debug/usr/lib/o32/libhdb.so.13.0.debug		comp-compat-shlib	 compat,pic,kerberos,debug,obsolete,arch64
@@ -351,31 +371,11 @@
 ./usr/libdata/debug/usr/lib/o32/libz.so.1.0.debug		comp-sys-debug	debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libzfs.so.0.0.debug		comp-zfs-debug	zfs,dynamicroot,debug,compat,arch64
 ./usr/libdata/debug/usr/lib/o32/libzpool.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat,arch64
+./usr/libdata/debug/usr/lib/o32/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/o32/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/o32/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/o32/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/o32/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/o32/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug	comp-sys-debug		debug,compat,arch64
 ./usr/libdata/debug/usr/libexec/ld.elf_so-o32.debug	comp-sys-debug		debug,compat,arch64
-./usr/lib/64/libcrypto_g.a			comp-c-proflib		compat,crypto,debuglib,arch64
-./usr/lib/64/libcrypto_idea_g.a			comp-obsolete		obsolete
-./usr/lib/64/libcrypto_mdc2_g.a			comp-obsolete		obsolete
-./usr/lib/64/libcrypto_rc5_g.a			comp-c-proflib		compat,crypto,crypto_rc5,debuglib,arch64
-./usr/lib/64/libdevmapper_g.a			-unknown-		compat,debuglib,lvm,arch64
-./usr/lib/64/libdm_g.a				-unknown-		compat,debuglib,arch64
-./usr/lib/64/libgmp_g.a				-unknown-		obsolete
-./usr/lib/64/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
-./usr/lib/64/libkdc_g.a				comp-c-proflib		compat,debuglib,kerberos,arch64
-./usr/lib/64/liblzf_g.a				-unknown-		compat,debuglib,arch64
-./usr/lib/64/libmpc_g.a				-unknown-		obsolete
-./usr/lib/64/libmpfr_g.a			-unknown-		obsolete
-./usr/lib/64/libperfuse_g.a			comp-c-proflib		compat,debuglib,arch64
-./usr/lib/64/libppath_g.a			comp-c-proflib		compat,debuglib,arch64
-./usr/lib/64/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
-./usr/lib/o32/libdevmapper_g.a			-unknown-		compat,debuglib,lvm,arch64
-./usr/lib/o32/libdm_g.a				-unknown-		compat,debuglib,arch64
-./usr/lib/o32/libgmp_g.a			-unknown-		obsolete
-./usr/lib/o32/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
-./usr/lib/o32/libkdc_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
-./usr/lib/o32/liblzf_g.a			-unknown-		compat,debuglib,arch64
-./usr/lib/o32/libmpc_g.a			-unknown-		obsolete
-./usr/lib/o32/libmpfr_g.a			-unknown-		obsolete
-./usr/lib/o32/libperfuse_g.a			comp-c-proflib		compat,debuglib,arch64
-./usr/lib/o32/libppath_g.a			comp-c-proflib		compat,debuglib,arch64
-./usr/lib/o32/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos,arch64
--- a/distrib/sets/lists/debug/md.amd64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/md.amd64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,178 +1,4 @@
-# $NetBSD: md.amd64,v 1.26 2013/07/30 20:51:38 htodd Exp $
-./usr/libdata/debug/lib/i386/npf/ext_log.so.0.0.debug	comp-npf-debug		debug,compat
-./usr/libdata/debug/lib/i386/npf/ext_normalize.so.0.0.debug	comp-npf-debug		debug,compat
-./usr/libdata/debug/lib/i386/npf/ext_rndblock.so.0.0.debug	comp-npf-debug		debug,compat
-./usr/libdata/debug/libexec/ld.elf_so-i386.debug	comp-sys-debug		debug,compat
-./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug	comp-sys-debug		debug,compat
-./usr/libdata/debug/usr/libexec/ld.elf_so-i386	comp-obsolete	obsolete
-./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
-./usr/libdata/debug/usr/bin/iasl.debug		comp-util-debug		debug
-./usr/libdata/debug/usr/lib/i386/i18n/libBIG5.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libDECHanyu.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libEUC.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libEUCTW.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libGBK2K.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libHZ.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libISO2022.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libJOHAB.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libMSKanji.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libUES.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libUTF1632.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libUTF7.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libUTF8.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libVIQR.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libZW.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libiconv_none.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libiconv_std.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libmapper_646.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libmapper_none.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libmapper_parallel.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libmapper_serial.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libmapper_std.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/i18n/libmapper_zone.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/i386/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/i386/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/i386/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/i386/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/i386/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/i386/libamu.so.4.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libarchive.so.3.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libasn1.so.8.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libasn1.so.9.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libatf-c.so.0.0.debug	comp-compat-shlib	compat,pic,atf,debug
-./usr/libdata/debug/usr/lib/i386/libatf-c++.so.0.0.debug	comp-compat-shlib	compat,pic,atf,debug
-./usr/libdata/debug/usr/lib/i386/libbfd.so.12.0.debug	comp-compat-shlib	compat,pic,binutils,debug
-./usr/libdata/debug/usr/lib/i386/libbind9.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libbluetooth.so.4.2.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libc.so.12.185.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libcom_err.so.6.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libcrypto.so.8.1.debug	comp-compat-shlib	crypto,compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libcrypto_rc5.so.7.0.debug	comp-compat-shlib	crypto,crypto_rc5,compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libdes.so.8.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug	comp-compat-shlib	compat,pic,lvm,debug
-./usr/libdata/debug/usr/lib/i386/libdm.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libdns.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libdns_sd.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libdwarf.so.0.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libedit.so.3.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libelf.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libevent.so.4.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libevent_openssl.so.4.0.debug	comp-compat-shlib	compat,pic,debug,crypto
-./usr/libdata/debug/usr/lib/i386/libevent_pthreads.so.4.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libexecinfo.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libexpat.so.2.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libfetch.so.3.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libform.so.6.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libgcc_s.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libgmp.so.10.2.debug	comp-compat-shlib	obsolete
-./usr/libdata/debug/usr/lib/i386/libgnumalloc.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libgomp.so.1.0.debug	comp-compat-shlib	compat,pic,debug,gcc=45
-./usr/libdata/debug/usr/lib/i386/libgssapi.so.10.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libgssapi.so.9.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libhdb.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libhdb.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libheimbase.so.1.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libheimntlm.so.3.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libheimntlm.so.4.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libhx509.so.5.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libi386.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libintl.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libipsec.so.3.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libisc.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libisc.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libisccc.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libisccc.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libisccfg.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libisccfg.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libiscsi.so.2.0.debug	comp-compat-shlib	compat,pic,debug,iscsi
-./usr/libdata/debug/usr/lib/i386/libisns.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libkadm5clnt.so.12.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libkadm5clnt.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libkadm5srv.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libkadm5srv.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libkafs.so.11.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libkafs.so.12.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libkdc.so.2.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libkrb5.so.24.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libkrb5.so.26.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libkvm.so.6.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/liblber.so.3.2.debug	comp-compat-shlib	compat,pic,ldap,debug
-./usr/libdata/debug/usr/lib/i386/libldap.so.4.2.debug	comp-compat-shlib	compat,pic,ldap,debug
-./usr/libdata/debug/usr/lib/i386/libldap_r.so.4.2.debug	comp-compat-shlib	compat,pic,ldap,debug
-./usr/libdata/debug/usr/lib/i386/liblua.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/liblutok.so.1.0.debug	comp-compat-shlib	compat,pic,debug,kyua
-./usr/libdata/debug/usr/lib/i386/liblwres.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/liblwres.so.7.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/liblzf.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/liblzma.so.1.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libm.so.0.10.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libmagic.so.5.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libmenu.so.6.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libmj.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libmpc.so.2.0.debug	comp-compat-shlib	obsolete
-./usr/libdata/debug/usr/lib/i386/libmpfr.so.4.1.debug	comp-compat-shlib	obsolete
-./usr/libdata/debug/usr/lib/i386/libnetpgp.so.3.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libnetpgpverify.so.4.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libnpf.so.0.0.debug	comp-compat-shlib	compat,pic,npf,debug
-./usr/libdata/debug/usr/lib/i386/libobjc.so.3.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libopcodes.so.5.0.debug	comp-compat-shlib	compat,pic,binutils,debug
-./usr/libdata/debug/usr/lib/i386/libossaudio.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libp2k.so.2.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/libpam.so.4.0.debug	comp-compat-shlib	compat,pic,pam,debug
-./usr/libdata/debug/usr/lib/i386/libpcap.so.5.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libpci.so.2.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libposix.so.0.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libppath.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libprop.so.1.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libpthread.so.1.2.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libpthread_dbg.so.2.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libpuffs.so.2.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libquota.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libradius.so.4.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/librefuse.so.2.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libresolv.so.3.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libroken.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libroken.so.19.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/librpcsvc.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/librt.so.1.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/librump.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/librumpclient.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug	comp-obsolete obsolete,rump
-./usr/libdata/debug/usr/lib/i386/librumpdev.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/librumphijack.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/librumpnet.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/librumpuser.so.0.1.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/librumpvfs.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/libsaslc.so.0.0.debug	comp-compat-shlib	compat,pic,crypto,debug
-./usr/libdata/debug/usr/lib/i386/libskey.so.2.0.debug	comp-compat-shlib	compat,pic,skey,debug
-./usr/libdata/debug/usr/lib/i386/libsl.so.4.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libsl.so.5.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libsqlite3.so.1.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libss.so.6.0.debug	comp-compat-shlib	obsolete
-./usr/libdata/debug/usr/lib/i386/libssh.so.21.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libssl.so.10.1.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.0.debug	comp-compat-shlib	gcc=4,compat,pic,debug,libstdcxx
-./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.1.debug	comp-compat-shlib	gcc=45,compat,pic,debug,libstdcxx
-./usr/libdata/debug/usr/lib/i386/libterminfo.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libtpm_unseal.so.1.0.debug	comp-compat-shlib	compat,pic,debug,tpm
-./usr/libdata/debug/usr/lib/i386/libtspi.so.3.0.debug	comp-compat-shlib	compat,pic,debug,tpm
-./usr/libdata/debug/usr/lib/i386/libtre.so.0.8.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libukfs.so.1.0.debug	comp-compat-shlib	compat,pic,debug,rump
-./usr/libdata/debug/usr/lib/i386/libusbhid.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libutil.so.7.21.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libwind.so.0.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
-./usr/libdata/debug/usr/lib/i386/libwrap.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libz.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug	comp-sys-shlib		pic,debug
-./usr/libdata/debug/usr/sbin/acpidump.debug	comp-sysutil-debug	debug
-./usr/libdata/debug/usr/sbin/amldb.debug	comp-sysutil-debug	debug
+# $NetBSD: md.amd64,v 1.27 2013/08/11 22:29:02 joerg Exp $
 ./usr/lib/i386/i18n/libBIG5_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/i18n/libDECHanyu_g.a		comp-c-proflib		compat,debuglib
 ./usr/lib/i386/i18n/libEUCTW_g.a		comp-c-proflib		compat,debuglib
@@ -329,3 +155,177 @@
 ./usr/lib/i386/liby_g.a				comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libz_g.a				comp-c-proflib		compat,debuglib
 ./usr/lib/libx86_64_g.a				comp-c-proflib		debuglib
+./usr/libdata/debug/lib/i386/npf/ext_log.so.0.0.debug	comp-npf-debug		debug,compat
+./usr/libdata/debug/lib/i386/npf/ext_normalize.so.0.0.debug	comp-npf-debug		debug,compat
+./usr/libdata/debug/lib/i386/npf/ext_rndblock.so.0.0.debug	comp-npf-debug		debug,compat
+./usr/libdata/debug/libexec/ld.elf_so-i386.debug	comp-sys-debug		debug,compat
+./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
+./usr/libdata/debug/usr/bin/iasl.debug		comp-util-debug		debug
+./usr/libdata/debug/usr/lib/i386/i18n/libBIG5.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libDECHanyu.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libEUC.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libEUCTW.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libGBK2K.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libHZ.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libISO2022.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libJOHAB.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libMSKanji.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libUES.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libUTF1632.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libUTF7.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libUTF8.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libVIQR.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libZW.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libiconv_none.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libiconv_std.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libmapper_646.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libmapper_none.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libmapper_parallel.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libmapper_serial.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libmapper_std.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/i18n/libmapper_zone.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libamu.so.4.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libarchive.so.3.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libasn1.so.8.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libasn1.so.9.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libatf-c++.so.0.0.debug	comp-compat-shlib	compat,pic,atf,debug
+./usr/libdata/debug/usr/lib/i386/libatf-c.so.0.0.debug	comp-compat-shlib	compat,pic,atf,debug
+./usr/libdata/debug/usr/lib/i386/libbfd.so.12.0.debug	comp-compat-shlib	compat,pic,binutils,debug
+./usr/libdata/debug/usr/lib/i386/libbind9.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libbluetooth.so.4.2.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libc.so.12.185.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libcom_err.so.6.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libcrypto.so.8.1.debug	comp-compat-shlib	crypto,compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libcrypto_rc5.so.7.0.debug	comp-compat-shlib	crypto,crypto_rc5,compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdes.so.8.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug	comp-compat-shlib	compat,pic,lvm,debug
+./usr/libdata/debug/usr/lib/i386/libdm.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdns.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdns_sd.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdwarf.so.0.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libedit.so.3.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libelf.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libevent.so.4.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libevent_openssl.so.4.0.debug	comp-compat-shlib	compat,pic,debug,crypto
+./usr/libdata/debug/usr/lib/i386/libevent_pthreads.so.4.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libexecinfo.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libexpat.so.2.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libfetch.so.3.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libform.so.6.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libgcc_s.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libgmp.so.10.2.debug	comp-compat-shlib	obsolete
+./usr/libdata/debug/usr/lib/i386/libgnumalloc.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libgomp.so.1.0.debug	comp-compat-shlib	compat,pic,debug,gcc=45
+./usr/libdata/debug/usr/lib/i386/libgssapi.so.10.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libgssapi.so.9.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libhdb.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libhdb.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libheimbase.so.1.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libheimntlm.so.3.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libheimntlm.so.4.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libhx509.so.5.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libi386.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libintl.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libipsec.so.3.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libisc.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libisc.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libisccc.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libisccc.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libisccfg.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libisccfg.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libiscsi.so.2.0.debug	comp-compat-shlib	compat,pic,debug,iscsi
+./usr/libdata/debug/usr/lib/i386/libisns.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libkadm5clnt.so.12.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libkadm5clnt.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libkadm5srv.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libkadm5srv.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libkafs.so.11.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libkafs.so.12.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libkdc.so.2.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libkrb5.so.24.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libkrb5.so.26.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libkvm.so.6.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/liblber.so.3.2.debug	comp-compat-shlib	compat,pic,ldap,debug
+./usr/libdata/debug/usr/lib/i386/libldap.so.4.2.debug	comp-compat-shlib	compat,pic,ldap,debug
+./usr/libdata/debug/usr/lib/i386/libldap_r.so.4.2.debug	comp-compat-shlib	compat,pic,ldap,debug
+./usr/libdata/debug/usr/lib/i386/liblua.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/liblutok.so.1.0.debug	comp-compat-shlib	compat,pic,debug,kyua
+./usr/libdata/debug/usr/lib/i386/liblwres.so.6.0.debug	comp-compat-shlib	compat,pic,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/liblwres.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/liblzf.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/liblzma.so.1.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libm.so.0.10.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmagic.so.5.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmenu.so.6.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmj.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmpc.so.2.0.debug	comp-compat-shlib	obsolete
+./usr/libdata/debug/usr/lib/i386/libmpfr.so.4.1.debug	comp-compat-shlib	obsolete
+./usr/libdata/debug/usr/lib/i386/libnetpgp.so.3.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libnetpgpverify.so.4.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libnpf.so.0.0.debug	comp-compat-shlib	compat,pic,npf,debug
+./usr/libdata/debug/usr/lib/i386/libobjc.so.3.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libopcodes.so.5.0.debug	comp-compat-shlib	compat,pic,binutils,debug
+./usr/libdata/debug/usr/lib/i386/libossaudio.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libp2k.so.2.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/libpam.so.4.0.debug	comp-compat-shlib	compat,pic,pam,debug
+./usr/libdata/debug/usr/lib/i386/libpcap.so.5.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libpci.so.2.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libperfuse.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libposix.so.0.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libppath.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libprop.so.1.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libpthread.so.1.2.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libpthread_dbg.so.2.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libpuffs.so.2.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libquota.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libradius.so.4.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/librefuse.so.2.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libresolv.so.3.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libroken.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libroken.so.19.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/librpcsvc.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/librt.so.1.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/librump.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/librumpclient.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug	comp-obsolete obsolete,rump
+./usr/libdata/debug/usr/lib/i386/librumpdev.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/librumphijack.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/librumpnet.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/librumpuser.so.0.1.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/librumpvfs.so.0.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/libsaslc.so.0.0.debug	comp-compat-shlib	compat,pic,crypto,debug
+./usr/libdata/debug/usr/lib/i386/libskey.so.2.0.debug	comp-compat-shlib	compat,pic,skey,debug
+./usr/libdata/debug/usr/lib/i386/libsl.so.4.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
+./usr/libdata/debug/usr/lib/i386/libsl.so.5.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libsqlite3.so.1.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libss.so.6.0.debug	comp-compat-shlib	obsolete
+./usr/libdata/debug/usr/lib/i386/libssh.so.21.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libssl.so.10.1.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.0.debug	comp-compat-shlib	gcc=4,compat,pic,debug,libstdcxx
+./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.1.debug	comp-compat-shlib	gcc=45,compat,pic,debug,libstdcxx
+./usr/libdata/debug/usr/lib/i386/libterminfo.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libtpm_unseal.so.1.0.debug	comp-compat-shlib	compat,pic,debug,tpm
+./usr/libdata/debug/usr/lib/i386/libtre.so.0.8.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libtspi.so.3.0.debug	comp-compat-shlib	compat,pic,debug,tpm
+./usr/libdata/debug/usr/lib/i386/libukfs.so.1.0.debug	comp-compat-shlib	compat,pic,debug,rump
+./usr/libdata/debug/usr/lib/i386/libusbhid.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libutil.so.7.21.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libwind.so.0.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/i386/libwrap.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libz.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/i386/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/i386/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/i386/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/i386/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/i386/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug	comp-sys-shlib		pic,debug
+./usr/libdata/debug/usr/libexec/ld.elf_so-i386	comp-obsolete	obsolete
+./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug	comp-sys-debug		debug,compat
+./usr/libdata/debug/usr/sbin/acpidump.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/usr/sbin/amldb.debug	comp-sysutil-debug	debug
--- a/distrib/sets/lists/debug/md.i386	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/md.i386	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: md.i386,v 1.3 2013/04/15 09:21:05 njoly Exp $
+# $NetBSD: md.i386,v 1.4 2013/08/11 22:29:02 joerg Exp $
+./usr/lib/libi386_g.a				-unknown-		debuglib
+./usr/lib/libm387_g.a				-unknown-		debuglib
+./usr/lib/libpmc_g.a				-unknown-		debuglib
 ./usr/libdata/debug/lib/libm387.so.0.1.debug	comp-sys-debug	pic,debug
 ./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
@@ -14,6 +17,3 @@
 ./usr/libdata/debug/usr/sbin/bad144.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/ipwctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/ndiscvt.debug	comp-sysutil-debug	debug
-./usr/lib/libi386_g.a				-unknown-		debuglib
-./usr/lib/libm387_g.a				-unknown-		debuglib
-./usr/lib/libpmc_g.a				-unknown-		debuglib
--- a/distrib/sets/lists/debug/md.sparc64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/md.sparc64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,12 +1,164 @@
-# $NetBSD: md.sparc64,v 1.27 2013/07/30 20:51:38 htodd Exp $
+# $NetBSD: md.sparc64,v 1.28 2013/08/11 22:29:02 joerg Exp $
+./usr/lib/sparc/i18n/libBIG5_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libDECHanyu_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libEUCTW_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libEUC_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libGBK2K_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libHZ_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libISO2022_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libJOHAB_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libMSKanji_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libUES_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libUTF1632_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libUTF7_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libUTF8_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libVIQR_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libZW_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libiconv_none_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libiconv_std_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libmapper_646_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libmapper_none_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libmapper_parallel_g.a	comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libmapper_serial_g.a	comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libmapper_std_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/i18n/libmapper_zone_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/libamu_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libarchive_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libasn1_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libatf-c++_g.a			-unknown-		compat,debuglib,atf
+./usr/lib/sparc/libatf-c_g.a			-unknown-		compat,debuglib,atf
+./usr/lib/sparc/libbfd_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libbind9_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libbluetooth_g.a		-unknown-		compat,debuglib
+./usr/lib/sparc/libbsdmalloc_g.a		-unknown-		compat,debuglib
+./usr/lib/sparc/libbz2_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libc_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libcom_err_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libcompat_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libcrypt_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libcrypto_g.a			comp-c-proflib		compat,crypto,debuglib
+./usr/lib/sparc/libcrypto_idea_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/libcrypto_mdc2_g.a		comp-obsolete		obsolete
+./usr/lib/sparc/libcrypto_rc5_g.a		comp-c-proflib		compat,crypto,crypto_rc5,debuglib
+./usr/lib/sparc/libcurses_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libdes_g.a			-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libdevmapper_g.a		-unknown-		compat,debuglib,lvm
+./usr/lib/sparc/libdm_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libdns_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libdns_sd_g.a			-unknown-		compat,debuglib,mdns
+./usr/lib/sparc/libdwarf_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libedit_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libelf_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libevent_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libevent_openssl_g.a		-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libevent_pthreads_g.a		-unknown-		compat,debuglib
+./usr/lib/sparc/libexecinfo_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libexpat_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libfetch_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libfl_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libform_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libgcc_eh_g.a			-unknown-		compat,debuglib,pic,gcccmds
+./usr/lib/sparc/libgcc_g.a			-unknown-		compat,debuglib,gcccmds
+./usr/lib/sparc/libgcc_s_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libgcov_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libgmp_g.a			-unknown-		obsolete
+./usr/lib/sparc/libgnumalloc_g.a		-unknown-		compat,debuglib
+./usr/lib/sparc/libgomp_g.a			-unknown-		compat,debuglib,gcc=45
+./usr/lib/sparc/libgssapi_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libhdb_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos
+./usr/lib/sparc/libheimntlm_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libhx509_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libiberty_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libintl_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libipsec_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libisc_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libisccc_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libisccfg_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libiscsi_g.a			-unknown-		compat,debuglib,iscsi
+./usr/lib/sparc/libisns_g.a		comp-c-piclib	compat,debuglib
+./usr/lib/sparc/libkadm5clnt_g.a		-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libkadm5srv_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libkafs_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libkdc_g.a			comp-c-proflib		compat,debuglib,kerberos
+./usr/lib/sparc/libkrb5_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libkvm_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libl_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/liblber_g.a			-unknown-		compat,debuglib,ldap
+./usr/lib/sparc/libldap_g.a			-unknown-		compat,debuglib,ldap
+./usr/lib/sparc/libldap_r_g.a			-unknown-		compat,debuglib,ldap
+./usr/lib/sparc/liblua_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/liblutok_g.a			-unknown-		compat,debuglib,kyua
+./usr/lib/sparc/liblwres_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/liblzf_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/liblzma_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libm_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libmagic_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libmenu_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libmj_g.a			-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libmpc_g.a			-unknown-		obsolete
+./usr/lib/sparc/libmpfr_g.a			-unknown-		obsolete
+./usr/lib/sparc/libnetpgp_g.a			-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libnetpgpverify_g.a		-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libnpf_g.a			-unknown-		compat,debuglib,npf
+./usr/lib/sparc/libobjc_g.a			-unknown-		compat,debuglib,gcccmds
+./usr/lib/sparc/libopcodes_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libossaudio_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libp2k_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/libpam_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libpcap_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libpci_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libperfuse_g.a			comp-c-proflib		compat,debuglib
+./usr/lib/sparc/libposix_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libppath_g.a			comp-c-proflib		compat,debuglib
+./usr/lib/sparc/libprop_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libpthread_dbg_g.a		-unknown-		compat,debuglib
+./usr/lib/sparc/libpthread_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libpuffs_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libquota_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libradius_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/librefuse_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libresolv_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/librmt_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libroken_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/librpcsvc_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/librt_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/librump_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/librumpclient_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/librumpcrypto_g.a		comp-obsolete		obsolete,rump
+./usr/lib/sparc/librumpdev_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/librumphijack_g.a		-unknown-		compat,debuglib,rump
+./usr/lib/sparc/librumpnet_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/librumpuser_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/librumpvfs_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/libsaslc_g.a			-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libsdp_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libskey_g.a			-unknown-		compat,debuglib,skey
+./usr/lib/sparc/libsl_g.a			-unknown-		compat,debuglib,kerberos
+./usr/lib/sparc/libsqlite3_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libss_g.a			-unknown-		obsolete
+./usr/lib/sparc/libssh_g.a			-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libssl_g.a			-unknown-		compat,debuglib,crypto
+./usr/lib/sparc/libstdc++_g.a			-unknown-		compat,debuglib,cxx,gcccmds,libstdcxx
+./usr/lib/sparc/libsupc++_g.a			-unknown-		compat,debuglib,gcccmds,libstdcxx
+./usr/lib/sparc/libtermcap_g.a			obsolete		compat,obsolete
+./usr/lib/sparc/libterminfo_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libtermlib_g.a			obsolete		compat,obsolete
+./usr/lib/sparc/libtre_g.a			obsolete		compat,obsolete
+./usr/lib/sparc/libukfs_g.a			-unknown-		compat,debuglib,rump
+./usr/lib/sparc/libusbhid_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libutil_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libvers_g.a			comp-obsolete		obsolete
+./usr/lib/sparc/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos
+./usr/lib/sparc/libwrap_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/liby_g.a			-unknown-		compat,debuglib
+./usr/lib/sparc/libz_g.a			-unknown-		compat,debuglib
 ./usr/libdata/debug/lib/sparc/npf/ext_log.so.0.0.debug	comp-npf-debug		debug,compat
 ./usr/libdata/debug/lib/sparc/npf/ext_normalize.so.0.0.debug	comp-npf-debug		debug,compat
 ./usr/libdata/debug/lib/sparc/npf/ext_rndblock.so.0.0.debug	comp-npf-debug		debug,compat
 ./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/usr/bin/fdformat.debug	comp-util-debug		debug
-./usr/libdata/debug/usr/libexec/ld.elf_so-sparc.debug	comp-sys-debug		debug,compat
-./usr/libdata/debug/usr/libexec/ld.elf_so.sparc	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/lib/sparc/i18n/libBIG5.so.5.0.debug		comp-i18n-shlib		compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/i18n/libDECHanyu.so.5.0.debug		comp-i18n-shlib		compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/i18n/libEUC.so.5.0.debug		comp-i18n-shlib		compat,pic,debug
@@ -30,18 +182,12 @@
 ./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_serial.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_std.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_zone.so.5.0.debug	comp-i18n-shlib		compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/sparc/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/sparc/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/sparc/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/sparc/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
-./usr/libdata/debug/usr/lib/sparc/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/sparc/libamu.so.4.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libarchive.so.3.1.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libasn1.so.8.0.debug		comp-compat-shlib	compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/sparc/libasn1.so.9.0.debug		comp-compat-shlib	compat,pic,kerberos,debug
+./usr/libdata/debug/usr/lib/sparc/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug
 ./usr/libdata/debug/usr/lib/sparc/libatf-c.so.0.0.debug			comp-compat-shlib	compat,pic,atf,debug
-./usr/libdata/debug/usr/lib/sparc/libatf-c++.so.0.0.debug		comp-compat-shlib	compat,pic,atf,debug
 ./usr/libdata/debug/usr/lib/sparc/libbfd.so.12.0.debug			comp-compat-shlib	compat,pic,binutils,debug
 ./usr/libdata/debug/usr/lib/sparc/libbind9.so.7.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libbluetooth.so.4.2.debug		comp-compat-shlib	compat,pic,debug
@@ -163,159 +309,13 @@
 ./usr/libdata/debug/usr/lib/sparc/libwind.so.0.0.debug			comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/sparc/libwrap.so.1.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libz.so.1.0.debug			comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/npf/ext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/sparc/npf/ext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/sparc/npf/ext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/sparc/npf/libext_log.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/sparc/npf/libext_normalise.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/lib/sparc/npf/libext_rndblock.so.0.0.debug	comp-obsolete	obsolete
+./usr/libdata/debug/usr/libexec/ld.elf_so-sparc.debug	comp-sys-debug		debug,compat
+./usr/libdata/debug/usr/libexec/ld.elf_so.sparc	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/sbin/eeprom.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/ofctl.debug	comp-sysutil-debug	debug
-./usr/lib/sparc/i18n/libBIG5_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libDECHanyu_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libEUCTW_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libEUC_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libGBK2K_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libHZ_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libISO2022_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libJOHAB_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libMSKanji_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libUES_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libUTF1632_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libUTF7_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libUTF8_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libVIQR_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libZW_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libiconv_none_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libiconv_std_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libmapper_646_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libmapper_none_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libmapper_parallel_g.a	comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libmapper_serial_g.a	comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libmapper_std_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/i18n/libmapper_zone_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/libamu_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libarchive_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libasn1_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libatf-c++_g.a			-unknown-		compat,debuglib,atf
-./usr/lib/sparc/libatf-c_g.a			-unknown-		compat,debuglib,atf
-./usr/lib/sparc/libbfd_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libbind9_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libbluetooth_g.a		-unknown-		compat,debuglib
-./usr/lib/sparc/libbsdmalloc_g.a		-unknown-		compat,debuglib
-./usr/lib/sparc/libbz2_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libc_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libcom_err_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libcompat_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libcrypt_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libcrypto_g.a			comp-c-proflib		compat,crypto,debuglib
-./usr/lib/sparc/libcrypto_idea_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/libcrypto_mdc2_g.a		comp-obsolete		obsolete
-./usr/lib/sparc/libcrypto_rc5_g.a		comp-c-proflib		compat,crypto,crypto_rc5,debuglib
-./usr/lib/sparc/libcurses_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libdes_g.a			-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libdevmapper_g.a		-unknown-		compat,debuglib,lvm
-./usr/lib/sparc/libdm_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libdns_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libdns_sd_g.a			-unknown-		compat,debuglib,mdns
-./usr/lib/sparc/libdwarf_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libedit_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libelf_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libevent_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libevent_openssl_g.a		-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libevent_pthreads_g.a		-unknown-		compat,debuglib
-./usr/lib/sparc/libexecinfo_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libexpat_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libfetch_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libfl_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libform_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libgcc_eh_g.a			-unknown-		compat,debuglib,pic,gcccmds
-./usr/lib/sparc/libgcc_g.a			-unknown-		compat,debuglib,gcccmds
-./usr/lib/sparc/libgcc_s_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libgcov_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libgmp_g.a			-unknown-		obsolete
-./usr/lib/sparc/libgnumalloc_g.a		-unknown-		compat,debuglib
-./usr/lib/sparc/libgomp_g.a			-unknown-		compat,debuglib,gcc=45
-./usr/lib/sparc/libgssapi_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libhdb_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libheimbase_g.a			comp-c-proflib		compat,debuglib,kerberos
-./usr/lib/sparc/libheimntlm_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libhx509_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libiberty_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libintl_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libipsec_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libisc_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libisccc_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libisccfg_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libiscsi_g.a			-unknown-		compat,debuglib,iscsi
-./usr/lib/sparc/libisns_g.a		comp-c-piclib	compat,debuglib
-./usr/lib/sparc/libkadm5clnt_g.a		-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libkadm5srv_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libkafs_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libkdc_g.a			comp-c-proflib		compat,debuglib,kerberos
-./usr/lib/sparc/libkrb5_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libkvm_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libl_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/liblber_g.a			-unknown-		compat,debuglib,ldap
-./usr/lib/sparc/libldap_g.a			-unknown-		compat,debuglib,ldap
-./usr/lib/sparc/libldap_r_g.a			-unknown-		compat,debuglib,ldap
-./usr/lib/sparc/liblua_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/liblutok_g.a			-unknown-		compat,debuglib,kyua
-./usr/lib/sparc/liblwres_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/liblzf_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/liblzma_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libm_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libmagic_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libmenu_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libmj_g.a			-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libmpc_g.a			-unknown-		obsolete
-./usr/lib/sparc/libmpfr_g.a			-unknown-		obsolete
-./usr/lib/sparc/libnetpgp_g.a			-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libnetpgpverify_g.a		-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libnpf_g.a			-unknown-		compat,debuglib,npf
-./usr/lib/sparc/libobjc_g.a			-unknown-		compat,debuglib,gcccmds
-./usr/lib/sparc/libopcodes_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libossaudio_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libp2k_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/libpam_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libpcap_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libpci_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libperfuse_g.a			comp-c-proflib		compat,debuglib
-./usr/lib/sparc/libppath_g.a			comp-c-proflib		compat,debuglib
-./usr/lib/sparc/libposix_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libprop_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libpthread_dbg_g.a		-unknown-		compat,debuglib
-./usr/lib/sparc/libpthread_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libpuffs_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libquota_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libradius_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/librefuse_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libresolv_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/librmt_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libroken_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/librpcsvc_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/librt_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/librump_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/librumpclient_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/librumpcrypto_g.a		comp-obsolete		obsolete,rump
-./usr/lib/sparc/librumpdev_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/librumphijack_g.a		-unknown-		compat,debuglib,rump
-./usr/lib/sparc/librumpnet_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/librumpuser_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/librumpvfs_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/libsaslc_g.a			-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libsdp_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libskey_g.a			-unknown-		compat,debuglib,skey
-./usr/lib/sparc/libsl_g.a			-unknown-		compat,debuglib,kerberos
-./usr/lib/sparc/libsqlite3_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libss_g.a			-unknown-		obsolete
-./usr/lib/sparc/libssh_g.a			-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libssl_g.a			-unknown-		compat,debuglib,crypto
-./usr/lib/sparc/libstdc++_g.a			-unknown-		compat,debuglib,cxx,gcccmds,libstdcxx
-./usr/lib/sparc/libsupc++_g.a			-unknown-		compat,debuglib,gcccmds,libstdcxx
-./usr/lib/sparc/libtermcap_g.a			obsolete		compat,obsolete
-./usr/lib/sparc/libterminfo_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libtermlib_g.a			obsolete		compat,obsolete
-./usr/lib/sparc/libtre_g.a			obsolete		compat,obsolete
-./usr/lib/sparc/libukfs_g.a			-unknown-		compat,debuglib,rump
-./usr/lib/sparc/libusbhid_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libutil_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libvers_g.a			comp-obsolete		obsolete
-./usr/lib/sparc/libwind_g.a			comp-c-proflib		compat,debuglib,kerberos
-./usr/lib/sparc/libwrap_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/liby_g.a			-unknown-		compat,debuglib
-./usr/lib/sparc/libz_g.a			-unknown-		compat,debuglib
--- a/distrib/sets/lists/debug/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,240 @@
-# $NetBSD: mi,v 1.28 2013/07/18 20:35:39 matt Exp $
+# $NetBSD: mi,v 1.29 2013/08/11 22:29:02 joerg Exp $
+
 ./etc/mtree/set.debug                           comp-sys-root
+./usr/lib/i18n/libBIG5_g.a			-unknown-		debuglib
+./usr/lib/i18n/libDECHanyu_g.a			-unknown-		debuglib
+./usr/lib/i18n/libEUCTW_g.a			-unknown-		debuglib
+./usr/lib/i18n/libEUC_g.a			-unknown-		debuglib
+./usr/lib/i18n/libGBK2K_g.a			-unknown-		debuglib
+./usr/lib/i18n/libHZ_g.a			-unknown-		debuglib
+./usr/lib/i18n/libISO2022_g.a			-unknown-		debuglib
+./usr/lib/i18n/libJOHAB_g.a			-unknown-		debuglib
+./usr/lib/i18n/libMSKanji_g.a			-unknown-		debuglib
+./usr/lib/i18n/libUES_g.a			-unknown-		debuglib
+./usr/lib/i18n/libUTF1632_g.a			-unknown-		debuglib
+./usr/lib/i18n/libUTF7_g.a			-unknown-		debuglib
+./usr/lib/i18n/libUTF8_g.a			-unknown-		debuglib
+./usr/lib/i18n/libVIQR_g.a			-unknown-		debuglib
+./usr/lib/i18n/libZW_g.a			-unknown-		debuglib
+./usr/lib/i18n/libiconv_none_g.a		-unknown-		debuglib
+./usr/lib/i18n/libiconv_std_g.a			-unknown-		debuglib
+./usr/lib/i18n/libmapper_646_g.a		-unknown-		debuglib
+./usr/lib/i18n/libmapper_none_g.a		-unknown-		debuglib
+./usr/lib/i18n/libmapper_parallel_g.a		-unknown-		debuglib
+./usr/lib/i18n/libmapper_serial_g.a		-unknown-		debuglib
+./usr/lib/i18n/libmapper_std_g.a		-unknown-		debuglib
+./usr/lib/i18n/libmapper_zone_g.a		-unknown-		debuglib
+./usr/lib/libamu_g.a				-unknown-		debuglib
+./usr/lib/libarchive_g.a			-unknown-		debuglib
+./usr/lib/libasn1_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libatf-c++_g.a			-unknown-		atf,debuglib
+./usr/lib/libatf-c_g.a				-unknown-		atf,debuglib
+./usr/lib/libavl_g.a				-unknown-		debuglib,zfs
+./usr/lib/libbfd_g.a				-unknown-		debuglib,binutils
+./usr/lib/libbind9_g.a				-unknown-		debuglib
+./usr/lib/libbluetooth_g.a			-unknown-		debuglib
+./usr/lib/libbsdmalloc_g.a			-unknown-		debuglib
+./usr/lib/libbz2_g.a				-unknown-		debuglib
+./usr/lib/libc_g.a				-unknown-		debuglib
+./usr/lib/libcom_err_g.a			-unknown-		debuglib,kerberos
+./usr/lib/libcompat_g.a				-unknown-		debuglib
+./usr/lib/libcrypt_g.a				-unknown-		debuglib
+./usr/lib/libcrypto_g.a				-unknown-		debuglib,crypto
+./usr/lib/libcrypto_idea_g.a			comp-obsolete		obsolete
+./usr/lib/libcrypto_mdc2_g.a			comp-obsolete		obsolete
+./usr/lib/libcrypto_rc5_g.a			-unknown-		debuglib,crypto_rc5
+./usr/lib/libctf_g.a				-unknown-		dtrace,debuglib
+./usr/lib/libcurses_g.a				-unknown-		debuglib
+./usr/lib/libdes_g.a				-unknown-		debuglib,crypto
+./usr/lib/libdevmapper_g.a			-unknown-		debuglib,lvm
+./usr/lib/libdm_g.a				-unknown-		debuglib
+./usr/lib/libdns_g.a				-unknown-		debuglib
+./usr/lib/libdns_sd_g.a				-unknown-		debuglib,mdns
+./usr/lib/libdtrace_g.a				-unknown-		dtrace,debuglib
+./usr/lib/libdwarf_g.a				-unknown-		debuglib
+./usr/lib/libedit_g.a				-unknown-		debuglib
+./usr/lib/libelf_g.a				-unknown-		debuglib
+./usr/lib/libevent_g.a				-unknown-		debuglib
+./usr/lib/libevent_openssl_g.a			-unknown-		debuglib,crypto
+./usr/lib/libevent_pthreads_g.a			-unknown-		debuglib
+./usr/lib/libexecinfo_g.a			-unknown-		debuglib
+./usr/lib/libexpat_g.a				-unknown-		debuglib
+./usr/lib/libfetch_g.a				-unknown-		debuglib
+./usr/lib/libfl_g.a				-unknown-		debuglib
+./usr/lib/libform_g.a				-unknown-		debuglib
+./usr/lib/libgcc_eh_g.a				-unknown-		debuglib,gcccmds
+./usr/lib/libgcc_g.a				-unknown-		debuglib,gcccmds
+./usr/lib/libgcc_s_g.a				-unknown-		debuglib,gcccmds
+./usr/lib/libgcov_g.a				-unknown-		debuglib,gcccmds
+./usr/lib/libgnumalloc_g.a			-unknown-		debuglib
+./usr/lib/libgomp_g.a				-unknown-		debuglib,gcc=45
+./usr/lib/libgssapi_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libhdb_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libheimbase_g.a			-unknown-		debuglib,kerberos
+./usr/lib/libheimntlm_g.a			-unknown-		debuglib,kerberos
+./usr/lib/libhx509_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libiberty_g.a				-unknown-		debuglib,binutils
+./usr/lib/libintl_g.a				-unknown-		debuglib
+./usr/lib/libipsec_g.a				-unknown-		debuglib
+./usr/lib/libisc_g.a				-unknown-		debuglib
+./usr/lib/libisccc_g.a				-unknown-		debuglib
+./usr/lib/libisccfg_g.a				-unknown-		debuglib
+./usr/lib/libiscsi_g.a				-unknown-		debuglib,iscsi
+./usr/lib/libisns_g.a		comp-isns-lib	debuglib
+./usr/lib/libkadm5clnt_g.a			-unknown-		debuglib,kerberos
+./usr/lib/libkadm5srv_g.a			-unknown-		debuglib,kerberos
+./usr/lib/libkafs_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libkdc_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libkrb5_g.a				-unknown-		debuglib,kerberos
+./usr/lib/libkvm_g.a				-unknown-		debuglib
+./usr/lib/libl_g.a				-unknown-		debuglib
+./usr/lib/liblber_g.a				-unknown-		debuglib,ldap
+./usr/lib/libldap_g.a				-unknown-		debuglib,ldap
+./usr/lib/libldap_r_g.a				-unknown-		debuglib,ldap
+./usr/lib/liblua_g.a				-unknown-		debuglib
+./usr/lib/liblwres_g.a				-unknown-		debuglib
+./usr/lib/liblzf_g.a				-unknown-		debuglib
+./usr/lib/liblzma_g.a				-unknown-		debuglib
+./usr/lib/libm_g.a				-unknown-		debuglib
+./usr/lib/libmagic_g.a				-unknown-		debuglib
+./usr/lib/libmenu_g.a				-unknown-		debuglib
+./usr/lib/libmj_g.a				-unknown-		debuglib
+./usr/lib/libmudflap_g.a			-unknown-		gcc=45,debuglib
+./usr/lib/libmudflapth_g.a			-unknown-		gcc=45,debuglib
+./usr/lib/libnetpgp_g.a				-unknown-		debuglib
+./usr/lib/libnetpgpverify_g.a			-unknown-		debuglib
+./usr/lib/libnpf_g.a				-unknown-		debuglib
+./usr/lib/libnvpair_g.a				-unknown-		debuglib,zfs
+./usr/lib/libobjc_g.a				-unknown-		debuglib,gcccmds
+./usr/lib/libopcodes_g.a			comp-obsolete		debuglib,binutils
+./usr/lib/libopenpgpsdk_g.a			comp-obsolete		obsolete
+./usr/lib/libossaudio_g.a			-unknown-		debuglib
+./usr/lib/libp2k_g.a				-unknown-		debuglib,rump
+./usr/lib/libpam_g.a				-unknown-		pam,debuglib
+./usr/lib/libpcap_g.a				-unknown-		debuglib
+./usr/lib/libpcc_g.a				-unknown-		obsolete
+./usr/lib/libpci_g.a				-unknown-		debuglib
+./usr/lib/libperfuse_g.a			comp-perfuse-lib	debuglib
+./usr/lib/libposix_g.a				-unknown-		debuglib
+./usr/lib/libppath_g.a				-unknown-		debuglib
+./usr/lib/libprop_g.a				-unknown-		debuglib
+./usr/lib/libpthread_dbg_g.a			-unknown-		debuglib
+./usr/lib/libpthread_g.a			-unknown-		debuglib
+./usr/lib/libpuffs_g.a				-unknown-		debuglib
+./usr/lib/libquota_g.a				-unknown-		debuglib
+./usr/lib/libradius_g.a				-unknown-		debuglib
+./usr/lib/librefuse_g.a				-unknown-		debuglib 
+./usr/lib/libresolv_g.a				-unknown-		debuglib
+./usr/lib/librmt_g.a				-unknown-		debuglib
+./usr/lib/libroken_g.a				-unknown-		debuglib,kerberos
+./usr/lib/librpcsvc_g.a				-unknown-		debuglib
+./usr/lib/librt_g.a				-unknown-		debuglib
+./usr/lib/librump_g.a				-unknown-		debuglib,rump
+./usr/lib/librumpclient_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpcrypto_g.a			comp-obsolete		obsolete
+./usr/lib/librumpdev_audio_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_bpf_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_cgd_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_disk_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_dm_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_drvctl_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_fss_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_md_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_netsmb_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_pad_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_pud_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_putter_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_raidframe_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpdev_rnd_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_scsipi_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_scsitest_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpdev_sysmon_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_ubt_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_ucom_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_ugenhc_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_ulpt_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_umass_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_usb_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpdev_wscons_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_cd9660_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_efs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_ext2fs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_fdesc_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_ffs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_hfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_kernfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_lfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_mfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_msdos_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_nfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_nfsserver_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpfs_nilfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_ntfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_null_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_nullfs_g.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_ptyfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_smbfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_syspuffs_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpfs_sysvbfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_tmpfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_udf_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_ufs_g.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_umap_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_umapfs_g.a			comp-obsolete		obsolete
+./usr/lib/librumpfs_union_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_v7fs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpfs_zfs_g.a			-unknown-		zfs,debuglib,rump
+./usr/lib/librumphijack_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpkern_crypto_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpkern_ksem_g.a			comp-obsolete		obsolete
+./usr/lib/librumpkern_solaris_g.a		-unknown-		debuglib,zfs,rump
+./usr/lib/librumpkern_tty_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpkern_z_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_agr_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_bridge_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_local_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_net80211_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpnet_net_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_netbt_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_netinet_g.a		-unknown-		debuglib,rump
+./usr/lib/librumpnet_npf_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_shmif_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_sockin_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpnet_virtif_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpuser_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpvfs_fifofs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpvfs_g.a			-unknown-		debuglib,rump
+./usr/lib/librumpvfs_layerfs_g.a		-unknown-		debuglib,rump
+./usr/lib/libsaslc_g.a				-unknown-		crypto,debuglib
+./usr/lib/libsdp_g.a				-obsolete		obsolete
+./usr/lib/libskey_g.a				-unknown-		debuglib,skey
+./usr/lib/libsl_g.a				-unknown-		kerberos,debuglib
+./usr/lib/libsqlite3_g.a			-unknown-		debuglib
+./usr/lib/libss_g.a				-unknown-		obsolete
+./usr/lib/libssh_g.a				-unknown-		debuglib
+./usr/lib/libssl_g.a				-unknown-		debuglib
+./usr/lib/libstdc++_g.a				-unknown-		debuglib,cxx,gcccmds,libstdcxx
+./usr/lib/libsupc++_g.a				-unknown-		debuglib,cxx,gcccmds,libstdcxx
+./usr/lib/libtddl_g.a				comp-c-lib		tpm,debuglib
+./usr/lib/libtermcap_g.a			comp-obsolete		obsolete
+./usr/lib/libterminfo_g.a			-unknown-		debuglib
+./usr/lib/libtpm_unseal_g.a			comp-c-lib		tpm,debug
+./usr/lib/libtre_g.a				comp-c-lib		debuglib
+./usr/lib/libtspi_g.a				comp-c-lib		tpm,debuglib
+./usr/lib/libukfs_g.a				-unknown-		debuglib,rump
+./usr/lib/libumem_g.a				-unknown-		debuglib,zfs
+./usr/lib/libusbhid_g.a				-unknown-		debuglib
+./usr/lib/libutil_g.a				-unknown-		debuglib
+./usr/lib/libuutil_g.a				-unknown-		debuglib,zfs
+./usr/lib/libvers_g.a				-unknown-		kerberos,debuglib
+./usr/lib/libwind_g.a				-unknown-		kerberos,debuglib
+./usr/lib/libwrap_g.a				-unknown-		debuglib
+./usr/lib/liby_g.a				-unknown-		debuglib
+./usr/lib/libz_g.a				-unknown-		debuglib
+./usr/lib/libzfs_g.a				-unknown-		debuglib,zfs
+./usr/lib/libzpool_g.a				-unknown-		debuglib,zfs
 ./usr/libdata/debug/bin/cat.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/chio.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/chmod.debug		comp-util-debug		debug
@@ -1029,6 +1264,59 @@
 ./usr/libdata/debug/usr/sbin/zdb.debug		comp-zfs-debug		zfs,debug
 ./usr/libdata/debug/usr/sbin/zdump.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/zic.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/usr/tests/atf/atf-c++/application_test.debug	tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/atf_c++_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/build_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/check_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/config_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/application_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/auto_array_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/env_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/exceptions_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/expand_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/fs_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/parser_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/process_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/sanity_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/text_test.debug	tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail/ui_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/env_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/exceptions_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/expand_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/fs_test.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/io_test.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/macros_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/parser_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/process_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/sanity_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/signals_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_application.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_atf_c++.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_atffile.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_build.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_check.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_config.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_env.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_exceptions.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_expand.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_formats.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_fs.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_io.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_macros.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_parser.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_process.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_sanity.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_signals.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_tests.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_text.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_ui.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_user.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/t_utils.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/tests_test.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/atf-c++/text_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/ui_test.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/user_test.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/atf-c++/utils_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/atf_c_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/build_test.debug		tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/check_test.debug		tests-atf-debug		debug,atf
@@ -1085,59 +1373,6 @@
 ./usr/libdata/debug/usr/tests/atf/atf-c/tp_test.debug			tests-atf-debug		debug,atf
 ./usr/libdata/debug/usr/tests/atf/atf-c/user_test.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-c/utils_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/application_test.debug	tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/atf_c++_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/build_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/check_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/config_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/application_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/auto_array_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/env_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/exceptions_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/expand_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/fs_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/parser_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/process_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/sanity_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/text_test.debug	tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail/ui_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/env_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/exceptions_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/expand_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/fs_test.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/io_test.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/macros_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/parser_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/process_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/sanity_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/signals_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/tests_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/text_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/ui_test.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/user_test.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/utils_test.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_application.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_atf_c++.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_atffile.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_build.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_check.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_config.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_env.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_exceptions.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_expand.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_formats.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_fs.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_io.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_macros.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_parser.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_process.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_sanity.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_signals.debug		tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_tests.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_text.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_ui.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_user.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/atf-c++/t_utils.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-compile/h_mode.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-report/fail_helper.debug		tests-atf-tests		debug,atf,!kyua
 ./usr/libdata/debug/usr/tests/atf/atf-report/fail_helper.debug		tests-obsolete		debug,kyua,obsolete
@@ -1190,10 +1425,10 @@
 ./usr/libdata/debug/usr/tests/atf/atf-run/zero_tcs_helper.debug		tests-obsolete		debug,kyua,obsolete
 ./usr/libdata/debug/usr/tests/atf/formats/h_parser.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/formats/t_writers.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/atf/test-programs/c_helpers.debug		tests-atf-debug		debug,atf
+./usr/libdata/debug/usr/tests/atf/test-programs/cpp_helpers.debug	tests-atf-debug		debug,atf
 ./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/test-programs/c_helpers.debug		tests-atf-debug		debug,atf
-./usr/libdata/debug/usr/tests/atf/test-programs/cpp_helpers.debug	tests-atf-debug		debug,atf
 ./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
@@ -1225,8 +1460,8 @@
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_enginetest.debug	tests-crypto-debug	debug,atf,crypto
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_evp_test.debug		tests-crypto-debug	debug,atf,crypto
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_exptest.debug		tests-crypto-debug	debug,atf,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_hmactest.debug		tests-crypto-debug	debug,atf,crypto
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug		tests-crypto-debug	debug,atf,crypto
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_hmactest.debug		tests-crypto-debug	debug,atf,crypto
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_lhashtest.debug	tests-crypto-debug	debug,atf,crypto
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug		tests-crypto-debug	debug,atf,crypto
 ./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md4test.debug		tests-crypto-debug	debug,atf,crypto
@@ -1264,17 +1499,17 @@
 ./usr/libdata/debug/usr/tests/fs/kernfs/t_basic.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/lfs/t_pr.debug				tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/msdosfs/t_snapshot.debug		tests-fs-debug		debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/nfs/nfsservice/rumpnfsd.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/nfs/t_mountd.debug			tests-fs-debug		debug,atf,rump
-./usr/libdata/debug/usr/tests/fs/nfs/nfsservice/rumpnfsd.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/nullfs/t_basic.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/psshfs/h_have_puffs.debug		tests-fs-debug		debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/ptyfs/t_nullpts.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/ptyfs/t_ptyfs.debug			tests-fs-debug		debug,atf,rump
-./usr/libdata/debug/usr/tests/fs/ptyfs/t_nullpts.debug			tests-fs-debug		debug,atf,rump
+./usr/libdata/debug/usr/tests/fs/puffs/h_dtfs/h_dtfs.debug		tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/puffs/h_have_puffs.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/fs/puffs/t_basic.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/puffs/t_fuzz.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/puffs/t_io.debug			tests-fs-debug		debug,atf,rump
-./usr/libdata/debug/usr/tests/fs/puffs/h_dtfs/h_dtfs.debug		tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/tmpfs/h_tools.debug			tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/tmpfs/t_renamerace.debug		tests-fs-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/fs/umapfs/t_basic.debug			tests-fs-debug		debug,atf,rump
@@ -1321,12 +1556,12 @@
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_fifo.debug		tests-kernel-tests	debug,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_pipe.debug		tests-kernel-tests	debug,atf
 ./usr/libdata/debug/usr/tests/kernel/kqueue/write/t_ttypty.debug	tests-kernel-tests	debug,atf
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_fileactions.debug	tests-kernel-tests	obsolete
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawn.debug		tests-kernel-tests	obsolete
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawnattr.debug	tests-kernel-tests	obsolete
+./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_fileactions.debug	tests-kernel-tests	obsolete
 ./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawn.debug		tests-kernel-tests	obsolete
 ./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_spawnattr.debug	tests-kernel-tests	obsolete
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/t_fileactions.debug	tests-kernel-tests	obsolete
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawn.debug		tests-kernel-tests	obsolete
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_fileactions.debug	tests-kernel-tests	obsolete
-./usr/libdata/debug/usr/tests/kernel/posix_spawn/h_spawnattr.debug	tests-kernel-tests	obsolete
 ./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
 ./usr/libdata/debug/usr/tests/kernel/t_filedesc.debug			tests-kernel-tests	debug,atf,rump
@@ -1491,12 +1726,12 @@
 ./usr/libdata/debug/usr/tests/lib/libc/c063/t_unlinkat.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/c063/t_utimensat.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/db/h_db.debug			tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_fileactions.debug	tests-kernel-tests	debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_spawn.debug		tests-kernel-tests	debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_spawnattr.debug	tests-kernel-tests	debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/t_fileactions.debug	tests-kernel-tests	debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/t_spawn.debug		tests-kernel-tests	debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/t_spawnattr.debug	tests-kernel-tests	debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/t_fileactions.debug	tests-kernel-tests	debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_spawn.debug		tests-kernel-tests	debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_fileactions.debug	tests-kernel-tests	debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_spawnattr.debug	tests-kernel-tests	debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_alarm.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_assert.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_basedirname.debug		tests-lib-debug		debug,atf
@@ -1520,8 +1755,8 @@
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_pause.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_raise.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_randomid.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_realpath.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_setdomainname.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_sethostname.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/gen/t_siginfo.debug		tests-lib-debug		debug,atf
@@ -1541,33 +1776,33 @@
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp/t_nan_inf.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp/t_round.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp/t_subnormal.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/inet/t_inet_network.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype1.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype2.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_io.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbrtowc.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbsnrtowcs.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbstowcs.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbsnrtowcs.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbtowc.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcscspn.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcspbrk.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcsspn.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcstod.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_wctomb.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/inet/t_inet_network.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net/getaddrinfo/h_gai.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net/h_nsd_recurse.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net/h_protoent.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net/h_servent.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net/t_ether_aton.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net/t_getprotoent.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/regex/t_exhaust.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/regex/h_regex.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/regex/h_regex_att.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/regex/t_exhaust.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/regex/t_regex_att.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/rpc/t_rpc.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/rpc/t_xdr.debug			tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_setjmp.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_threadjmp.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_setjmp.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_fgets.debug		tests-lib-debug		debug,atf,ssp
 ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd.debug		tests-lib-debug		debug,atf,ssp
 ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_gets.debug			tests-lib-debug		debug,atf,ssp
@@ -1589,8 +1824,8 @@
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fflush.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fopen.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fputc.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_mktemp.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_popen.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_printf.debug		tests-lib-debug		debug,atf
@@ -1655,8 +1890,8 @@
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_kill.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_link.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_listen.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/sys/t_lwp_create.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_lwp_ctl.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/sys/t_lwp_create.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_mincore.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_mkdir.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_mkfifo.debug		tests-lib-debug		debug,atf
@@ -1692,15 +1927,11 @@
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_umask.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_unlink.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_write.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/termios/t_tcsetpgrp.debug	tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_static.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ttyio/t_ptm.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/ttyio/t_ttyio.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/t_cdb.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/t_cerror.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/t_clone.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/t_context.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/t_convfp.debug			tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/t_cdb.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/t_gdtoa.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/t_hsearch.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/t_inet.debug			tests-obsolete		obsolete
@@ -1708,13 +1939,16 @@
 ./usr/libdata/debug/usr/tests/lib/libc/t_ptm.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/t_randomid.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/t_strptime.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/termios/t_tcsetpgrp.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/time/t_mktime.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/time/t_strptime.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/tls/t_tls_static.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/ttyio/t_ptm.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/ttyio/t_ttyio.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libcrypt/t_crypt.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libcurses/director.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libcurses/slave.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libdes/t_des.debug			tests-lib-debug		debug,atf,crypto
-./usr/libdata/debug/usr/tests/lib/semaphore/pthread/t_sem_pth.debug	tests-lib-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/lib/libevent/h_event.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libexecinfo/t_backtrace.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/liblutok/c_gate_test.debug		tests-lutok-debug	debug,atf,kyua
@@ -1735,8 +1969,8 @@
 ./usr/libdata/debug/usr/tests/lib/libm/t_floor.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libm/t_infinity.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libm/t_ldexp.debug			tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libm/t_libm.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libm/t_log.debug			tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libm/t_libm.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libm/t_pow.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libm/t_round.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libm/t_scalbn.debug			tests-lib-debug		debug,atf
@@ -1752,10 +1986,9 @@
 ./usr/libdata/debug/usr/tests/lib/libppath/t_ppath.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libprop/t_basic.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/h_pthread_dlopen.so.1.debug	tests-lib-debug	debug,atf,pic
+./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/t_dlopen.debug	tests-lib-debug	debug,atf,pic
 ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/t_dso_pthread_create.debug 	tests-lib-debug	debug,atf,pic
-./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/t_dlopen.debug	tests-lib-debug	debug,atf,pic
 ./usr/libdata/debug/usr/tests/lib/libpthread/dlopen/t_main_pthread_create.debug 	tests-lib-debug	debug,atf,pic
-
 ./usr/libdata/debug/usr/tests/lib/libpthread/h_atexit.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/h_cancel.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/h_exit.debug		tests-lib-tests		debug,atf
@@ -1775,9 +2008,9 @@
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_preempt.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_rwlock.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_sem.debug		tests-lib-tests		debug,atf
+./usr/libdata/debug/usr/tests/lib/libpthread/t_siglongjmp.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_sigmask.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_sigsuspend.debug		tests-lib-tests		debug,atf
-./usr/libdata/debug/usr/tests/lib/libpthread/t_siglongjmp.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_sleep.debug		tests-lib-tests		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_status.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libpthread/t_swapcontext.debug	tests-lib-tests		debug,atf
@@ -1800,6 +2033,7 @@
 ./usr/libdata/debug/usr/tests/lib/libutil/t_pidfile.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_snprintb.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_sockaddr_snprintf.debug	tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/semaphore/pthread/t_sem_pth.debug	tests-lib-debug		debug,atf,rump
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen1.debug	tests-libexec-debug	debug,atf,pic
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen2.debug	tests-libexec-debug	debug,atf,pic
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_dl_symver_v0.debug	tests-libexec-debug	debug,atf,pic
@@ -1829,6 +2063,13 @@
 ./usr/libdata/debug/usr/tests/net/sys/t_rfc6056.debug			tests-net-debug		debug,atf
 ./usr/libdata/debug/usr/tests/net/sys/t_socketpair.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/rump/modautoload/t_modautoload.debug	tests-syscall-debug	debug,atf,rump
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_forkcli.debug			tests-syscall-debug	debug,atf,rump
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_reboot.debug			tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_reconcli.debug			tests-syscall-debug	debug,atf,rump
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_sigcli.debug			tests-syscall-debug	debug,atf,rump
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_simplecli.debug			tests-syscall-debug	debug,atf,rump
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_stresscli.debug			tests-syscall-debug	debug,atf,rump
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_server/h_simpleserver.debug			tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpkern/t_copy.debug		tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpkern/t_kern.debug		tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpkern/t_lwproc.debug		tests-syscall-debug	debug,atf,rump
@@ -1838,13 +2079,6 @@
 ./usr/libdata/debug/usr/tests/rump/rumpkern/t_threads.debug		tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpkern/t_tsleep.debug		tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpkern/t_vm.debug			tests-syscall-debug	debug,atf,rump
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_reboot.debug			tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_forkcli.debug			tests-syscall-debug	debug,atf,rump
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_reconcli.debug			tests-syscall-debug	debug,atf,rump
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_sigcli.debug			tests-syscall-debug	debug,atf,rump
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_simplecli.debug			tests-syscall-debug	debug,atf,rump
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_stresscli.debug			tests-syscall-debug	debug,atf,rump
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_server/h_simpleserver.debug			tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_basic.debug		tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_etfs.debug		tests-syscall-debug	debug,atf,rump
 ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_p2kifs.debug		tests-syscall-debug	debug,atf,rump
@@ -1886,237 +2120,3 @@
 ./usr/libdata/debug/usr/tests/util/df/h_df.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/util/id/h_id.debug			tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/util/systrace/h_have_systrace.debug	tests-obsolete		obsolete
-./usr/lib/i18n/libBIG5_g.a			-unknown-		debuglib
-./usr/lib/i18n/libDECHanyu_g.a			-unknown-		debuglib
-./usr/lib/i18n/libEUCTW_g.a			-unknown-		debuglib
-./usr/lib/i18n/libEUC_g.a			-unknown-		debuglib
-./usr/lib/i18n/libGBK2K_g.a			-unknown-		debuglib
-./usr/lib/i18n/libHZ_g.a			-unknown-		debuglib
-./usr/lib/i18n/libISO2022_g.a			-unknown-		debuglib
-./usr/lib/i18n/libJOHAB_g.a			-unknown-		debuglib
-./usr/lib/i18n/libMSKanji_g.a			-unknown-		debuglib
-./usr/lib/i18n/libUES_g.a			-unknown-		debuglib
-./usr/lib/i18n/libUTF1632_g.a			-unknown-		debuglib
-./usr/lib/i18n/libUTF7_g.a			-unknown-		debuglib
-./usr/lib/i18n/libUTF8_g.a			-unknown-		debuglib
-./usr/lib/i18n/libVIQR_g.a			-unknown-		debuglib
-./usr/lib/i18n/libZW_g.a			-unknown-		debuglib
-./usr/lib/i18n/libiconv_none_g.a		-unknown-		debuglib
-./usr/lib/i18n/libiconv_std_g.a			-unknown-		debuglib
-./usr/lib/i18n/libmapper_646_g.a		-unknown-		debuglib
-./usr/lib/i18n/libmapper_none_g.a		-unknown-		debuglib
-./usr/lib/i18n/libmapper_parallel_g.a		-unknown-		debuglib
-./usr/lib/i18n/libmapper_serial_g.a		-unknown-		debuglib
-./usr/lib/i18n/libmapper_std_g.a		-unknown-		debuglib
-./usr/lib/i18n/libmapper_zone_g.a		-unknown-		debuglib
-./usr/lib/libamu_g.a				-unknown-		debuglib
-./usr/lib/libarchive_g.a			-unknown-		debuglib
-./usr/lib/libasn1_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libatf-c++_g.a			-unknown-		atf,debuglib
-./usr/lib/libatf-c_g.a				-unknown-		atf,debuglib
-./usr/lib/libavl_g.a				-unknown-		debuglib,zfs
-./usr/lib/libbfd_g.a				-unknown-		debuglib,binutils
-./usr/lib/libbind9_g.a				-unknown-		debuglib
-./usr/lib/libbluetooth_g.a			-unknown-		debuglib
-./usr/lib/libbsdmalloc_g.a			-unknown-		debuglib
-./usr/lib/libbz2_g.a				-unknown-		debuglib
-./usr/lib/libc_g.a				-unknown-		debuglib
-./usr/lib/libcom_err_g.a			-unknown-		debuglib,kerberos
-./usr/lib/libcompat_g.a				-unknown-		debuglib
-./usr/lib/libcrypt_g.a				-unknown-		debuglib
-./usr/lib/libcrypto_g.a				-unknown-		debuglib,crypto
-./usr/lib/libcrypto_idea_g.a			comp-obsolete		obsolete
-./usr/lib/libcrypto_mdc2_g.a			comp-obsolete		obsolete
-./usr/lib/libcrypto_rc5_g.a			-unknown-		debuglib,crypto_rc5
-./usr/lib/libctf_g.a				-unknown-		dtrace,debuglib
-./usr/lib/libcurses_g.a				-unknown-		debuglib
-./usr/lib/libdes_g.a				-unknown-		debuglib,crypto
-./usr/lib/libdevmapper_g.a			-unknown-		debuglib,lvm
-./usr/lib/libdm_g.a				-unknown-		debuglib
-./usr/lib/libdns_g.a				-unknown-		debuglib
-./usr/lib/libdns_sd_g.a				-unknown-		debuglib,mdns
-./usr/lib/libdtrace_g.a				-unknown-		dtrace,debuglib
-./usr/lib/libdwarf_g.a				-unknown-		debuglib
-./usr/lib/libedit_g.a				-unknown-		debuglib
-./usr/lib/libelf_g.a				-unknown-		debuglib
-./usr/lib/libevent_g.a				-unknown-		debuglib
-./usr/lib/libevent_openssl_g.a			-unknown-		debuglib,crypto
-./usr/lib/libevent_pthreads_g.a			-unknown-		debuglib
-./usr/lib/libexecinfo_g.a			-unknown-		debuglib
-./usr/lib/libexpat_g.a				-unknown-		debuglib
-./usr/lib/libfetch_g.a				-unknown-		debuglib
-./usr/lib/libfl_g.a				-unknown-		debuglib
-./usr/lib/libform_g.a				-unknown-		debuglib
-./usr/lib/libgcc_eh_g.a				-unknown-		debuglib,gcccmds
-./usr/lib/libgcc_g.a				-unknown-		debuglib,gcccmds
-./usr/lib/libgcc_s_g.a				-unknown-		debuglib,gcccmds
-./usr/lib/libgcov_g.a				-unknown-		debuglib,gcccmds
-./usr/lib/libgnumalloc_g.a			-unknown-		debuglib
-./usr/lib/libgomp_g.a				-unknown-		debuglib,gcc=45
-./usr/lib/libgssapi_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libhdb_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libheimbase_g.a			-unknown-		debuglib,kerberos
-./usr/lib/libheimntlm_g.a			-unknown-		debuglib,kerberos
-./usr/lib/libhx509_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libiberty_g.a				-unknown-		debuglib,binutils
-./usr/lib/libintl_g.a				-unknown-		debuglib
-./usr/lib/libipsec_g.a				-unknown-		debuglib
-./usr/lib/libisc_g.a				-unknown-		debuglib
-./usr/lib/libisccc_g.a				-unknown-		debuglib
-./usr/lib/libisccfg_g.a				-unknown-		debuglib
-./usr/lib/libiscsi_g.a				-unknown-		debuglib,iscsi
-./usr/lib/libisns_g.a		comp-isns-lib	debuglib
-./usr/lib/libkadm5clnt_g.a			-unknown-		debuglib,kerberos
-./usr/lib/libkadm5srv_g.a			-unknown-		debuglib,kerberos
-./usr/lib/libkafs_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libkdc_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libkrb5_g.a				-unknown-		debuglib,kerberos
-./usr/lib/libkvm_g.a				-unknown-		debuglib
-./usr/lib/libl_g.a				-unknown-		debuglib
-./usr/lib/liblber_g.a				-unknown-		debuglib,ldap
-./usr/lib/libldap_g.a				-unknown-		debuglib,ldap
-./usr/lib/libldap_r_g.a				-unknown-		debuglib,ldap
-./usr/lib/liblua_g.a				-unknown-		debuglib
-./usr/lib/liblwres_g.a				-unknown-		debuglib
-./usr/lib/liblzf_g.a				-unknown-		debuglib
-./usr/lib/liblzma_g.a				-unknown-		debuglib
-./usr/lib/libm_g.a				-unknown-		debuglib
-./usr/lib/libmagic_g.a				-unknown-		debuglib
-./usr/lib/libmenu_g.a				-unknown-		debuglib
-./usr/lib/libmj_g.a				-unknown-		debuglib
-./usr/lib/libmudflap_g.a			-unknown-		gcc=45,debuglib
-./usr/lib/libmudflapth_g.a			-unknown-		gcc=45,debuglib
-./usr/lib/libnetpgp_g.a				-unknown-		debuglib
-./usr/lib/libnetpgpverify_g.a			-unknown-		debuglib
-./usr/lib/libnpf_g.a				-unknown-		debuglib
-./usr/lib/libnvpair_g.a				-unknown-		debuglib,zfs
-./usr/lib/libobjc_g.a				-unknown-		debuglib,gcccmds
-./usr/lib/libopcodes_g.a			comp-obsolete		debuglib,binutils
-./usr/lib/libopenpgpsdk_g.a			comp-obsolete		obsolete
-./usr/lib/libossaudio_g.a			-unknown-		debuglib
-./usr/lib/libp2k_g.a				-unknown-		debuglib,rump
-./usr/lib/libpam_g.a				-unknown-		pam,debuglib
-./usr/lib/libpcap_g.a				-unknown-		debuglib
-./usr/lib/libpcc_g.a				-unknown-		obsolete
-./usr/lib/libpci_g.a				-unknown-		debuglib
-./usr/lib/libperfuse_g.a			comp-perfuse-lib	debuglib
-./usr/lib/libposix_g.a				-unknown-		debuglib
-./usr/lib/libppath_g.a				-unknown-		debuglib
-./usr/lib/libprop_g.a				-unknown-		debuglib
-./usr/lib/libpthread_dbg_g.a			-unknown-		debuglib
-./usr/lib/libpthread_g.a			-unknown-		debuglib
-./usr/lib/libpuffs_g.a				-unknown-		debuglib
-./usr/lib/libquota_g.a				-unknown-		debuglib
-./usr/lib/libradius_g.a				-unknown-		debuglib
-./usr/lib/librefuse_g.a				-unknown-		debuglib 
-./usr/lib/libresolv_g.a				-unknown-		debuglib
-./usr/lib/librmt_g.a				-unknown-		debuglib
-./usr/lib/libroken_g.a				-unknown-		debuglib,kerberos
-./usr/lib/librpcsvc_g.a				-unknown-		debuglib
-./usr/lib/librt_g.a				-unknown-		debuglib
-./usr/lib/librump_g.a				-unknown-		debuglib,rump
-./usr/lib/librumpclient_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpcrypto_g.a			comp-obsolete		obsolete
-./usr/lib/librumpdev_audio_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_bpf_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_cgd_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_disk_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_dm_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_drvctl_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_fss_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_md_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_netsmb_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_pad_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_pud_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_putter_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_raidframe_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpdev_rnd_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_scsipi_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_scsitest_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpdev_sysmon_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_ubt_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_ucom_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_ugenhc_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_ulpt_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_umass_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_usb_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpdev_wscons_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_cd9660_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_efs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_ext2fs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_fdesc_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_ffs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_hfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_kernfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_lfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_mfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_msdos_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_nfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_nfsserver_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpfs_nilfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_ntfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_null_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_nullfs_g.a			comp-obsolete		obsolete
-./usr/lib/librumpfs_ptyfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_smbfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_syspuffs_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpfs_sysvbfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_tmpfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_udf_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_ufs_g.a			comp-obsolete		obsolete
-./usr/lib/librumpfs_umap_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_umapfs_g.a			comp-obsolete		obsolete
-./usr/lib/librumpfs_union_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_v7fs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpfs_zfs_g.a			-unknown-		zfs,debuglib,rump
-./usr/lib/librumphijack_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpkern_crypto_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpkern_ksem_g.a			comp-obsolete		obsolete
-./usr/lib/librumpkern_solaris_g.a		-unknown-		debuglib,zfs,rump
-./usr/lib/librumpkern_tty_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpkern_z_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_agr_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_bridge_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_local_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_net80211_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpnet_net_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_netbt_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_netinet_g.a		-unknown-		debuglib,rump
-./usr/lib/librumpnet_npf_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_shmif_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_sockin_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpnet_virtif_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpuser_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpvfs_fifofs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpvfs_g.a			-unknown-		debuglib,rump
-./usr/lib/librumpvfs_layerfs_g.a		-unknown-		debuglib,rump
-./usr/lib/libsaslc_g.a				-unknown-		crypto,debuglib
-./usr/lib/libsdp_g.a				-obsolete		obsolete
-./usr/lib/libskey_g.a				-unknown-		debuglib,skey
-./usr/lib/libsl_g.a				-unknown-		kerberos,debuglib
-./usr/lib/libsqlite3_g.a			-unknown-		debuglib
-./usr/lib/libss_g.a				-unknown-		obsolete
-./usr/lib/libssh_g.a				-unknown-		debuglib
-./usr/lib/libssl_g.a				-unknown-		debuglib
-./usr/lib/libstdc++_g.a				-unknown-		debuglib,cxx,gcccmds,libstdcxx
-./usr/lib/libsupc++_g.a				-unknown-		debuglib,cxx,gcccmds,libstdcxx
-./usr/lib/libtddl_g.a				comp-c-lib		tpm,debuglib
-./usr/lib/libtermcap_g.a			comp-obsolete		obsolete
-./usr/lib/libterminfo_g.a			-unknown-		debuglib
-./usr/lib/libtpm_unseal_g.a			comp-c-lib		tpm,debug
-./usr/lib/libtre_g.a				comp-c-lib		debuglib
-./usr/lib/libtspi_g.a				comp-c-lib		tpm,debuglib
-./usr/lib/libukfs_g.a				-unknown-		debuglib,rump
-./usr/lib/libumem_g.a				-unknown-		debuglib,zfs
-./usr/lib/libusbhid_g.a				-unknown-		debuglib
-./usr/lib/libutil_g.a				-unknown-		debuglib
-./usr/lib/libuutil_g.a				-unknown-		debuglib,zfs
-./usr/lib/libvers_g.a				-unknown-		kerberos,debuglib
-./usr/lib/libwind_g.a				-unknown-		kerberos,debuglib
-./usr/lib/libwrap_g.a				-unknown-		debuglib
-./usr/lib/liby_g.a				-unknown-		debuglib
-./usr/lib/libz_g.a				-unknown-		debuglib
-./usr/lib/libzfs_g.a				-unknown-		debuglib,zfs
-./usr/lib/libzpool_g.a				-unknown-		debuglib,zfs
--- a/distrib/sets/lists/debug/shl.mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/debug/shl.mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.29 2013/07/30 20:51:38 htodd Exp $
+# $NetBSD: shl.mi,v 1.30 2013/08/11 22:29:03 joerg Exp $
 ./usr/libdata/debug/lib/libc.so.12.185.debug		comp-sys-debug	debug
 ./usr/libdata/debug/lib/libcrypt.so.1.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/lib/libcrypto.so.8.1.debug		comp-sys-debug	debug
@@ -24,7 +24,6 @@
 ./usr/libdata/debug/lib/npf/ext_normalize.so.0.0.debug	comp-sys-debug	debug,npf
 ./usr/libdata/debug/lib/npf/ext_rndblock.so.0.0.debug	comp-sys-debug	debug,npf
 ./usr/libdata/debug/libexec/ld.elf_so.debug		comp-sys-debug	debug
-./usr/libdata/debug/usr/libexec/ld.elf_so.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/i18n/libBIG5.so.5.0.debug	comp-i18n-debug	debug
 ./usr/libdata/debug/usr/lib/i18n/libDECHanyu.so.5.0.debug	comp-i18n-debug	debug
 ./usr/libdata/debug/usr/lib/i18n/libEUC.so.5.0.debug	comp-i18n-debug	debug
@@ -258,6 +257,7 @@
 ./usr/libdata/debug/usr/lib/npf/libext_log.so.0.0.debug	comp-obsolete	debug,npf,obsolete
 ./usr/libdata/debug/usr/lib/npf/libext_normalise.so.0.0.debug	comp-obsolete	debug,npf,obsolete
 ./usr/libdata/debug/usr/lib/npf/libext_rndblock.so.0.0.debug	comp-obsolete	debug,npf,obsolete
+./usr/libdata/debug/usr/libexec/ld.elf_so.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/tests/lib/csu/h_initfini3_dso.so.1.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/csu/libh_initfini3_dso.so.1.debug	tests-obsolete		debug,atf,obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/tls/h_tls_dlopen.so.1.debug	tests-lib-debug		debug,atf
--- a/distrib/sets/lists/etc/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/etc/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.231 2013/05/01 05:36:25 agc Exp $
+# $NetBSD: mi,v 1.232 2013/08/11 22:29:03 joerg Exp $
 #
 # Note: end-user configuration files that are moved to another location
 #	should not be marked "obsolete"; they should just be removed from
@@ -17,11 +17,6 @@
 ./etc/atf/atf-run.hooks				etc-atf-etc		atf
 ./etc/atf/common.conf				etc-atf-etc		atf
 ./etc/audit-packages.conf			etc-obsolete		obsolete
-./etc/bootptab					etc-bootserver-etc
-./etc/changelist				etc-sys-etc
-./etc/csh.cshrc					etc-util-etc
-./etc/csh.login					etc-util-etc
-./etc/csh.logout				etc-util-etc
 ./etc/bluetooth					etc-sys-etc
 ./etc/bluetooth/bluetooth.conf			etc-obsolete		obsolete
 ./etc/bluetooth/btattach.conf			etc-sys-etc
@@ -29,6 +24,11 @@
 ./etc/bluetooth/btuartd.conf			etc-obsolete		obsolete
 ./etc/bluetooth/hosts				etc-sys-etc
 ./etc/bluetooth/protocols			etc-sys-etc
+./etc/bootptab					etc-bootserver-etc
+./etc/changelist				etc-sys-etc
+./etc/csh.cshrc					etc-util-etc
+./etc/csh.login					etc-util-etc
+./etc/csh.logout				etc-util-etc
 ./etc/daily					etc-sys-etc
 ./etc/daily.conf				etc-sys-etc
 ./etc/default					etc-obsolete		obsolete
@@ -197,14 +197,14 @@
 ./etc/rc.d/envsys				etc-sys-rc
 ./etc/rc.d/fixsb				etc-obsolete		obsolete
 ./etc/rc.d/fsck					etc-sys-rc
+./etc/rc.d/fsck.sh				etc-obsolete		obsolete
 ./etc/rc.d/fsck_root				etc-sys-rc
-./etc/rc.d/fsck.sh				etc-obsolete		obsolete
 ./etc/rc.d/ftp_proxy				etc-net-rc
 ./etc/rc.d/ftpd					etc-net-rc
+./etc/rc.d/gated				etc-obsolete		obsolete
+./etc/rc.d/gpio					etc-sys-rc
 ./etc/rc.d/hostapd				etc-net-rc
 ./etc/rc.d/httpd				etc-net-rc
-./etc/rc.d/gated				etc-obsolete		obsolete
-./etc/rc.d/gpio					etc-sys-rc
 ./etc/rc.d/identd				etc-net-rc
 ./etc/rc.d/ifwatchd				etc-net-rc
 ./etc/rc.d/inetd				etc-net-rc
@@ -309,10 +309,10 @@
 ./etc/rpc					etc-net-etc
 ./etc/saslc.d					etc-libsaslc-etc
 ./etc/saslc.d/mech				obsolete		obsolete
+./etc/saslc.d/postfix				etc-libsaslc-postfix
+./etc/saslc.d/postfix/mech			etc-libsaslc-postfix
 ./etc/saslc.d/saslc				etc-libsaslc-etc
 ./etc/saslc.d/saslc/mech			etc-libsaslc-etc
-./etc/saslc.d/postfix				etc-libsaslc-postfix
-./etc/saslc.d/postfix/mech			etc-libsaslc-postfix
 ./etc/security					etc-sys-etc
 ./etc/security.conf				etc-sys-etc
 ./etc/services					etc-net-etc
--- a/distrib/sets/lists/man/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/man/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1434 2013/08/09 11:41:24 rkujawa Exp $
+# $NetBSD: mi,v 1.1435 2013/08/11 22:29:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1347,8 +1347,8 @@
 ./usr/share/man/cat4/mlx.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mly.0			man-sys-catman		.cat
 ./usr/share/man/cat4/module.0			man-obsolete		obsolete
+./usr/share/man/cat4/mpii.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mpls.0			man-sys-catman		.cat
-./usr/share/man/cat4/mpii.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mpt.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mpu.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mr.0			man-obsolete		obsolete
@@ -1915,8 +1915,8 @@
 ./usr/share/man/cat4/x86/odcm.0			man-sys-catman		.cat
 ./usr/share/man/cat4/x86/powernow.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/soekrisgpio.0		man-sys-catman		.cat
+./usr/share/man/cat4/x86/tprof_amdpmi.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/tprof_pmi.0		man-sys-catman		.cat
-./usr/share/man/cat4/x86/tprof_amdpmi.0		man-sys-catman		.cat
 ./usr/share/man/cat4/x86/vmt.0			man-sys-catman		.cat
 ./usr/share/man/cat4/xbd.0			man-sys-catman		.cat
 ./usr/share/man/cat4/xbdback.0			man-sys-catman		.cat
@@ -2356,9 +2356,9 @@
 ./usr/share/man/cat8/evbarm/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/evbarm/bootmini2440.0	man-sysutil-catman	.cat
 ./usr/share/man/cat8/evbarm/elftosb.0		man-sysutil-catman	.cat
+./usr/share/man/cat8/evbarm/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/evbarm/sbkeygen.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/evbarm/sbtool.0		man-sysutil-catman	.cat
-./usr/share/man/cat8/evbarm/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/evbmips/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/evbmips/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/evbppc/MAKEDEV.0		man-obsolete		obsolete
@@ -2417,8 +2417,8 @@
 ./usr/share/man/cat8/hp300/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/hp700/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/hp700/boot.0		man-sys-catman		.cat
+./usr/share/man/cat8/hp700/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/hp700/mkboot.0		man-sys-catman		.cat
-./usr/share/man/cat8/hp700/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/hpcarm/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/hpcarm/boot.0		man-sys-catman		.cat
 ./usr/share/man/cat8/hpcarm/makedev.0		man-obsolete		obsolete
@@ -2977,16 +2977,16 @@
 ./usr/share/man/cat8/tpm_setownable.0		man-tpm-catman		tpm,.cat
 ./usr/share/man/cat8/tpm_setpresence.0		man-tpm-catman		tpm,.cat
 ./usr/share/man/cat8/tpm_takeownership.0	man-tpm-catman		tpm,.cat
+./usr/share/man/cat8/tprof.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/tprof.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/trace.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/trace.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/traceroute.0		man-netutil-catman	.cat
-./usr/share/man/cat8/traceroute6.0		man-netutil-catman	use_inet6,.cat
-./usr/share/man/cat8/trivial-rewrite.0	man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/traceroute.0		man-netutil-catman	.cat
 ./usr/share/man/cat8/traceroute6.0		man-netutil-catman	use_inet6,.cat
+./usr/share/man/cat8/traceroute6.0		man-netutil-catman	use_inet6,.cat
 ./usr/share/man/cat8/trivial-rewrite.0		man-postfix-catman	postfix,.cat
-./usr/share/man/cat8/tprof.0			man-sysutil-catman	.cat
+./usr/share/man/cat8/trivial-rewrite.0	man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/trpt.0			man-netutil-catman	.cat
 ./usr/share/man/cat8/trsp.0			man-obsolete		obsolete
 ./usr/share/man/cat8/ttyflags.0			man-sysutil-catman	.cat
@@ -4285,8 +4285,8 @@
 ./usr/share/man/html4/mlx.html			man-sys-htmlman		html
 ./usr/share/man/html4/mly.html			man-sys-htmlman		html
 ./usr/share/man/html4/module.html		man-obsolete		obsolete
+./usr/share/man/html4/mpii.html			man-sys-htmlman		html
 ./usr/share/man/html4/mpls.html			man-sys-htmlman		html
-./usr/share/man/html4/mpii.html			man-sys-htmlman		html
 ./usr/share/man/html4/mpt.html			man-sys-htmlman		html
 ./usr/share/man/html4/mpu.html			man-sys-htmlman		html
 ./usr/share/man/html4/mr.html			man-obsolete		obsolete
@@ -5177,14 +5177,14 @@
 ./usr/share/man/html8/edquota.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/eeprom.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/emips/boot.html		man-sys-htmlman		html
+./usr/share/man/html8/envstat.html		man-sysutil-htmlman	html
+./usr/share/man/html8/error.html		man-postfix-htmlman	postfix,html
+./usr/share/man/html8/eshconfig.html		man-sysutil-htmlman	html
+./usr/share/man/html8/etcupdate.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/evbarm/bootmini2440.html	man-sysutil-htmlman	html
 ./usr/share/man/html8/evbarm/elftosb.html	man-sysutil-htmlman	html
 ./usr/share/man/html8/evbarm/sbkeygen.html	man-sysutil-htmlman	html
 ./usr/share/man/html8/evbarm/sbtool.html	man-sysutil-htmlman	html
-./usr/share/man/html8/envstat.html		man-sysutil-htmlman	html
-./usr/share/man/html8/error.html		man-postfix-htmlman	postfix,html
-./usr/share/man/html8/eshconfig.html		man-sysutil-htmlman	html
-./usr/share/man/html8/etcupdate.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/extattrctl.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/faithd.html		man-router-htmlman	inet6,html
 ./usr/share/man/html8/fastboot.html		man-sysutil-htmlman	html
@@ -6485,8 +6485,8 @@
 ./usr/share/man/man4/amiga/autoconf.4		man-sys-man		.man
 ./usr/share/man/man4/amiga/bah.4		man-sys-man		.man
 ./usr/share/man/man4/amiga/bppcsc.4		man-sys-man		.man
+./usr/share/man/man4/amiga/clockport.4		man-sys-man		.man
 ./usr/share/man/man4/amiga/console.4		man-sys-man		.man
-./usr/share/man/man4/amiga/clockport.4		man-sys-man		.man
 ./usr/share/man/man4/amiga/cv3dpb.4		man-sys-man		.man
 ./usr/share/man/man4/amiga/ed.4			man-sys-man		.man
 ./usr/share/man/man4/amiga/efa.4		man-sys-man		.man
@@ -7071,8 +7071,8 @@
 ./usr/share/man/man4/mlx.4			man-sys-man		.man
 ./usr/share/man/man4/mly.4			man-sys-man		.man
 ./usr/share/man/man4/module.4			man-obsolete		obsolete
+./usr/share/man/man4/mpii.4			man-sys-man		.man
 ./usr/share/man/man4/mpls.4			man-sys-man		.man
-./usr/share/man/man4/mpii.4			man-sys-man		.man
 ./usr/share/man/man4/mpt.4			man-sys-man		.man
 ./usr/share/man/man4/mpu.4			man-sys-man		.man
 ./usr/share/man/man4/mr.4			man-obsolete		obsolete
@@ -7830,9 +7830,9 @@
 ./usr/share/man/man5/shells.5			man-sys-man		.man
 ./usr/share/man/man5/siginfo.5			man-obsolete		obsolete
 ./usr/share/man/man5/spamd.conf.5		man-obsolete		obsolete
+./usr/share/man/man5/sqlite_table.5		man-postfix-man		postfix,.man
 ./usr/share/man/man5/ssh_config.5		man-secsh-man		crypto,.man
 ./usr/share/man/man5/sshd_config.5		man-secsh-man		crypto,.man
-./usr/share/man/man5/sqlite_table.5		man-postfix-man		postfix,.man
 ./usr/share/man/man5/stab.5			man-sys-man		.man
 ./usr/share/man/man5/sysctl.conf.5		man-sys-man		.man
 ./usr/share/man/man5/syslog.conf.5		man-sysutil-man		.man
@@ -8072,16 +8072,16 @@
 ./usr/share/man/man8/emips/boot.8		man-sys-man		.man
 ./usr/share/man/man8/emips/installboot.8		man-obsolete		obsolete
 ./usr/share/man/man8/emips/makedev.8		man-obsolete		obsolete
-./usr/share/man/man8/evbarm/bootmini2440.8	man-sysutils-man	.man
-./usr/share/man/man8/evbarm/elftosb.8		man-sysutil-man		.man
-./usr/share/man/man8/evbarm/sbkeygen.8		man-sysutil-man		.man
-./usr/share/man/man8/evbarm/sbtool.8		man-sysutil-man		.man
 ./usr/share/man/man8/envstat.8			man-sysutil-man		.man
 ./usr/share/man/man8/error.8			man-postfix-man		postfix,.man
 ./usr/share/man/man8/eshconfig.8		man-sysutil-man		.man
 ./usr/share/man/man8/etcupdate.8		man-sysutil-man		.man
 ./usr/share/man/man8/evbarm/MAKEDEV.8		man-obsolete		obsolete
+./usr/share/man/man8/evbarm/bootmini2440.8	man-sysutils-man	.man
+./usr/share/man/man8/evbarm/elftosb.8		man-sysutil-man		.man
 ./usr/share/man/man8/evbarm/makedev.8		man-obsolete		obsolete
+./usr/share/man/man8/evbarm/sbkeygen.8		man-sysutil-man		.man
+./usr/share/man/man8/evbarm/sbtool.8		man-sysutil-man		.man
 ./usr/share/man/man8/evbmips/MAKEDEV.8		man-obsolete		obsolete
 ./usr/share/man/man8/evbmips/makedev.8		man-obsolete		obsolete
 ./usr/share/man/man8/evbppc/MAKEDEV.8		man-obsolete		obsolete
@@ -8140,8 +8140,8 @@
 ./usr/share/man/man8/hp300/makedev.8		man-obsolete		obsolete
 ./usr/share/man/man8/hp700/MAKEDEV.8		man-obsolete		obsolete
 ./usr/share/man/man8/hp700/boot.8		man-sys-man		.man
+./usr/share/man/man8/hp700/makedev.8		man-obsolete		obsolete
 ./usr/share/man/man8/hp700/mkboot.8		man-sys-man		.man
-./usr/share/man/man8/hp700/makedev.8		man-obsolete		obsolete
 ./usr/share/man/man8/hpcarm/MAKEDEV.8		man-obsolete		obsolete
 ./usr/share/man/man8/hpcarm/boot.8		man-sys-man		.man
 ./usr/share/man/man8/hpcarm/makedev.8		man-obsolete		obsolete
@@ -8701,11 +8701,11 @@
 ./usr/share/man/man8/tpm_setownable.8		man-tpm-man		tpm,.man
 ./usr/share/man/man8/tpm_setpresence.8		man-tpm-man		tpm,.man
 ./usr/share/man/man8/tpm_takeownership.8	man-tpm-man		tpm,.man
+./usr/share/man/man8/tprof.8			man-sysutil-man		.man
 ./usr/share/man/man8/trace.8			man-postfix-man		postfix,.man
 ./usr/share/man/man8/traceroute.8		man-netutil-man		.man
 ./usr/share/man/man8/traceroute6.8		man-netutil-man		use_inet6,.man
 ./usr/share/man/man8/trivial-rewrite.8		man-postfix-man		postfix,.man
-./usr/share/man/man8/tprof.8			man-sysutil-man		.man
 ./usr/share/man/man8/trpt.8			man-netutil-man		.man
 ./usr/share/man/man8/trsp.8			man-obsolete		obsolete
 ./usr/share/man/man8/ttyflags.8			man-sysutil-man		.man
--- a/distrib/sets/lists/misc/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/misc/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.184 2013/02/25 00:34:14 jmmv Exp $
+# $NetBSD: mi,v 1.185 2013/08/11 22:29:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -769,7 +769,6 @@
 ./usr/share/examples/libsaslc			misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/README		misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/mech		misc-libsaslc-examples	share
-./usr/share/examples/libsaslc/saslc.conf	misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/mech/ANONYMOUS.conf	misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/mech/CRAM-MD5.conf	misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/mech/DIGEST-MD5.conf	misc-libsaslc-examples	share
@@ -777,6 +776,7 @@
 ./usr/share/examples/libsaslc/mech/GSSAPI.conf	misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/mech/LOGIN.conf	misc-libsaslc-examples	share
 ./usr/share/examples/libsaslc/mech/PLAIN.conf	misc-libsaslc-examples	share
+./usr/share/examples/libsaslc/saslc.conf	misc-libsaslc-examples	share
 ./usr/share/examples/lutok			misc-lutok-examples
 ./usr/share/examples/lutok/bindings.cpp		misc-lutok-examples	share,kyua
 ./usr/share/examples/lutok/hello.cpp		misc-lutok-examples	share,kyua
@@ -965,8 +965,8 @@
 ./usr/share/xml/atf				misc-atf-share
 ./usr/share/xml/atf/tests-results.dtd		misc-atf-share		share,atf,!kyua
 ./usr/share/xml/atf/tests-results.dtd		misc-obsolete		share,kyua,obsolete
+./usr/share/xml/catalog				misc-obsolete		share,kyua,obsolete
 ./usr/share/xml/catalog				misc-xml-share		share,!kyua
-./usr/share/xml/catalog				misc-obsolete		share,kyua,obsolete
 ./usr/share/xsl					misc-xml-share
 ./usr/share/xsl/atf				misc-atf-share
 ./usr/share/xsl/atf/tests-results.xsl		misc-atf-share		share,atf,!kyua
--- a/distrib/sets/lists/modules/ad.arm	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/modules/ad.arm	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.1 2009/09/07 02:27:28 jnemeth Exp $
+# $NetBSD: ad.arm,v 1.2 2013/08/11 22:29:03 joerg Exp $
+
 ./@MODULEDIR@/exec_elf32			base-kernel-modules	kmod
 ./@MODULEDIR@/exec_elf32/exec_elf32.kmod	base-kernel-modules	kmod
-
--- a/distrib/sets/lists/modules/md.amd64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/modules/md.amd64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.36 2012/10/27 22:36:13 alnsn Exp $
+# $NetBSD: md.amd64,v 1.37 2013/08/11 22:29:03 joerg Exp $
 ./@MODULEDIR@/acpiacad				base-kernel-modules	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/acpibat				base-kernel-modules	kmod
@@ -47,10 +47,10 @@
 ./@MODULEDIR@/compat_linux32/compat_linux32.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32			base-kernel-modules	kmod
 ./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod	base-kernel-modules	kmod
+./@MODULEDIR@/coram				base-kernel-modules	kmod
+./@MODULEDIR@/coram/coram.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/coretemp				base-kernel-modules	kmod
 ./@MODULEDIR@/coretemp/coretemp.kmod		base-kernel-modules	kmod
-./@MODULEDIR@/coram				base-kernel-modules	kmod
-./@MODULEDIR@/coram/coram.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/cx24227				base-kernel-modules	kmod
 ./@MODULEDIR@/cx24227/cx24227.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/cxdtv				base-kernel-modules	kmod
--- a/distrib/sets/lists/modules/md.evbppc	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/modules/md.evbppc	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc,v 1.31 2013/03/11 15:53:05 christos Exp $
+# $NetBSD: md.evbppc,v 1.32 2013/08/11 22:29:03 joerg Exp $
 ./stand/powerpc-4xx							base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@						base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules					base-kernel-modules	kmod,compatmodules
@@ -188,10 +188,10 @@
 ./stand/powerpc-4xx/@OSRELEASE@/modules/union/union.kmod			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose/usbverbose.kmod	base-kernel-modules	kmod,compatmodules
+./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs 				base-kernel-modules	kmod,compatmodules
+./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs/v7fs.kmod		        base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/vcoda				base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/vcoda/vcoda.kmod		base-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs 				base-kernel-modules	kmod,compatmodules
-./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs/v7fs.kmod		        base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd 				base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd/vnd.kmod		        base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-4xx/@OSRELEASE@/modules/zfs				base-kernel-modules     kmod,zfs
@@ -385,10 +385,10 @@
 ./stand/powerpc-booke/@OSRELEASE@/modules/union/union.kmod		base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/usbverbose			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/usbverbose/usbverbose.kmod	base-kernel-modules	kmod,compatmodules
+./stand/powerpc-booke/@OSRELEASE@/modules/v7fs 				base-kernel-modules	kmod,compatmodules
+./stand/powerpc-booke/@OSRELEASE@/modules/v7fs/v7fs.kmod	        base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/vcoda 			base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/vcoda/vcoda.kmod	        base-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/v7fs 				base-kernel-modules	kmod,compatmodules
-./stand/powerpc-booke/@OSRELEASE@/modules/v7fs/v7fs.kmod	        base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/vnd 				base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/vnd/vnd.kmod		        base-kernel-modules	kmod,compatmodules
 ./stand/powerpc-booke/@OSRELEASE@/modules/zfs				base-kernel-modules     kmod,zfs
--- a/distrib/sets/lists/modules/md.i386	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/modules/md.i386	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.41 2012/10/28 16:25:02 alnsn Exp $
+# $NetBSD: md.i386,v 1.42 2013/08/11 22:29:03 joerg Exp $
 ./@MODULEDIR@/acpiacad				base-kernel-modules	kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/acpibat				base-kernel-modules	kmod
@@ -119,8 +119,6 @@
 ./@MODULEDIR@/powernow/powernow.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/pwdog				base-kernel-modules	kmod
 ./@MODULEDIR@/pwdog/pwdog.kmod			base-kernel-modules	kmod
-./@MODULEDIR@/sljit				base-kernel-modules	kmod
-./@MODULEDIR@/sljit/sljit.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/r128drm				base-kernel-modules	kmod
 ./@MODULEDIR@/r128drm/r128drm.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/radeondrm				base-kernel-modules	kmod
@@ -129,6 +127,8 @@
 ./@MODULEDIR@/savagedrm/savagedrm.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/sisdrm				base-kernel-modules	kmod
 ./@MODULEDIR@/sisdrm/sisdrm.kmod		base-kernel-modules	kmod
+./@MODULEDIR@/sljit				base-kernel-modules	kmod
+./@MODULEDIR@/sljit/sljit.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/syscallemu			base-kernel-modules	kmod
 ./@MODULEDIR@/syscallemu/syscallemu.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/tdfxdrm				base-kernel-modules	kmod
--- a/distrib/sets/lists/modules/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/modules/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.51 2013/03/11 15:53:05 christos Exp $
+# $NetBSD: mi,v 1.52 2013/08/11 22:29:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7,9 +7,6 @@
 #		powerpc-4xx and powerpc-booke modules are incompatible.
 #		Sorry for any inconvenience this may cause, the management.
 #
-./etc/mtree/set.modules				modules-sys-root	kmod
-./stand/@MACHINE@				base-kernel-modules	kmod
-./stand/@MACHINE@/@OSRELEASE@			base-kernel-modules	kmod
 ./@MODULEDIR@					base-kernel-modules	kmod
 ./@MODULEDIR@/accf_dataready			base-kernel-modules	kmod
 ./@MODULEDIR@/accf_dataready/accf_dataready.kmod	base-kernel-modules	kmod
@@ -195,11 +192,14 @@
 ./@MODULEDIR@/union/union.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/usbverbose			base-kernel-modules	kmod
 ./@MODULEDIR@/usbverbose/usbverbose.kmod	base-kernel-modules	kmod
+./@MODULEDIR@/v7fs				base-kernel-modules	kmod
+./@MODULEDIR@/v7fs/v7fs.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/vcoda				base-kernel-modules	kmod
 ./@MODULEDIR@/vcoda/vcoda.kmod			base-kernel-modules	kmod
-./@MODULEDIR@/v7fs				base-kernel-modules	kmod
-./@MODULEDIR@/v7fs/v7fs.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/vnd 				base-kernel-modules	kmod
 ./@MODULEDIR@/vnd/vnd.kmod		        base-kernel-modules	kmod
 ./@MODULEDIR@/zfs				base-kernel-modules     kmod,zfs
 ./@MODULEDIR@/zfs/zfs.kmod			base-kernel-modules     kmod,zfs
+./etc/mtree/set.modules				modules-sys-root	kmod
+./stand/@MACHINE@				base-kernel-modules	kmod
+./stand/@MACHINE@/@OSRELEASE@			base-kernel-modules	kmod
--- a/distrib/sets/lists/tests/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/tests/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.543 2013/08/10 22:37:06 dholland Exp $
+# $NetBSD: mi,v 1.544 2013/08/11 22:29:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -6,22 +6,21 @@
 ./usr/libdata/debug/usr/tests						tests-base-debug
 ./usr/libdata/debug/usr/tests/atf					tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-c					tests-atf-debug
-./usr/libdata/debug/usr/tests/atf/atf-c/detail				tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-c++				tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-c++/detail			tests-atf-debug
+./usr/libdata/debug/usr/tests/atf/atf-c/detail				tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/atf-compile				tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/atf/atf-report				tests-atf-tests
 ./usr/libdata/debug/usr/tests/atf/atf-run				tests-atf-tests
 ./usr/libdata/debug/usr/tests/atf/formats				tests-atf-debug
+./usr/libdata/debug/usr/tests/atf/test-programs				tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/test_programs				tests-obsolete		obsolete
-./usr/libdata/debug/usr/tests/atf/test-programs				tests-atf-debug
 ./usr/libdata/debug/usr/tests/atf/tools					tests-atf-debug		obsolete
 ./usr/libdata/debug/usr/tests/atf/units					tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/bin					tests-bin-debug
 ./usr/libdata/debug/usr/tests/bin/df					tests-bin-debug
 ./usr/libdata/debug/usr/tests/crypto					tests-crypto-debug
 ./usr/libdata/debug/usr/tests/crypto/libcrypto				tests-crypto-debug
-./usr/libdata/debug/usr/tests/fs					tests-fs-debug
 ./usr/libdata/debug/usr/tests/dev					tests-fs-debug
 ./usr/libdata/debug/usr/tests/dev/audio					tests-fs-debug
 ./usr/libdata/debug/usr/tests/dev/cgd					tests-fs-debug
@@ -29,6 +28,7 @@
 ./usr/libdata/debug/usr/tests/dev/md					tests-fs-debug
 ./usr/libdata/debug/usr/tests/dev/scsipi					tests-fs-debug
 ./usr/libdata/debug/usr/tests/dev/sysmon					tests-fs-debug
+./usr/libdata/debug/usr/tests/fs					tests-fs-debug
 ./usr/libdata/debug/usr/tests/fs/ffs					tests-fs-debug,rump
 ./usr/libdata/debug/usr/tests/fs/fifofs					tests-fs-debug,rump
 ./usr/libdata/debug/usr/tests/fs/hfs					tests-fs-debug,rump
@@ -90,8 +90,8 @@
 ./usr/libdata/debug/usr/tests/lib/libc/getaddrinfo/h_gai		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/hash				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp				tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/inet				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/locale				tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/libc/inet				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/net				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/net/getaddrinfo			tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/regex				tests-lib-debug
@@ -103,14 +103,12 @@
 ./usr/libdata/debug/usr/tests/lib/libc/string				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/sys				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/termios				tests-lib-debug
+./usr/libdata/debug/usr/tests/lib/libc/time				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/tls				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/ttyio				tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/libc/time				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libcrypt				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libcurses				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libdes				tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/semaphore				tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/semaphore/pthread			tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libevent				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libexecinfo				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/liblutok				tests-lutok-debug
@@ -131,6 +129,8 @@
 ./usr/libdata/debug/usr/tests/lib/libsljit				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libtre				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libutil				tests-lib-debug
+./usr/libdata/debug/usr/tests/lib/semaphore				tests-lib-debug
+./usr/libdata/debug/usr/tests/lib/semaphore/pthread			tests-lib-debug
 ./usr/libdata/debug/usr/tests/libexec					tests-lib-debug
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so				tests-libexec-debug
 ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_helper_symver_dso0	tests-libexec-debug
@@ -171,6 +171,92 @@
 ./usr/tests/atf/Atffile				tests-atf-tests		atf
 ./usr/tests/atf/Kyuafile			tests-atf-tests		atf,kyua
 ./usr/tests/atf/atf-c				tests-atf-tests
+./usr/tests/atf/atf-c++				tests-atf-tests
+./usr/tests/atf/atf-c++/Atffile			tests-atf-tests		atf
+./usr/tests/atf/atf-c++/Kyuafile		tests-atf-tests		atf,kyua
+./usr/tests/atf/atf-c++/application_test	tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/atf_c++_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/build_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/check_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/config_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/d_include_application_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_atf_c++_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_atffile_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_build_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_check_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_config_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_env_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_exceptions_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_expand_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_formats_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_fs_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_io_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_macros_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_parser_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_process_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_sanity_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_signals_hpp.cpp	tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_tests_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_text_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_ui_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_user_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_include_utils_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/d_use_macros_hpp.cpp		tests-obsolete	obsolete
+./usr/tests/atf/atf-c++/detail			tests-atf-tests
+./usr/tests/atf/atf-c++/detail/Atffile		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/Kyuafile		tests-atf-tests		atf,kyua
+./usr/tests/atf/atf-c++/detail/application_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/auto_array_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/env_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/exceptions_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/expand_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/fs_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/parser_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/process_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/sanity_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/text_test	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/detail/ui_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/env_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/exceptions_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/expand_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/fs_test			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/io_test			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/macros_hpp_test.cpp	tests-atf-tests		atf
+./usr/tests/atf/atf-c++/macros_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/parser_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/pkg_config_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/process_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/sanity_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/signals_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_application		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_atf_c++		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_atffile		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_build			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_check			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_config		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_env			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_exceptions		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_expand		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_formats		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_fs			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_io			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_macros		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_parser		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_pkg_config		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_process		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_sanity		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_signals		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_tests			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_text			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_ui			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_user			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/t_utils			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/tests_test		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/text_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/ui_test			tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/unused_test.cpp		tests-atf-tests		atf
+./usr/tests/atf/atf-c++/user_test		tests-obsolete		obsolete
+./usr/tests/atf/atf-c++/utils_test		tests-atf-tests		atf
 ./usr/tests/atf/atf-c/Atffile			tests-atf-tests		atf
 ./usr/tests/atf/atf-c/Kyuafile			tests-atf-tests		atf,kyua
 ./usr/tests/atf/atf-c/atf_c_test		tests-atf-tests		atf
@@ -261,92 +347,6 @@
 ./usr/tests/atf/atf-c/unused_test.c		tests-atf-tests		atf
 ./usr/tests/atf/atf-c/user_test			tests-obsolete		obsolete
 ./usr/tests/atf/atf-c/utils_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++				tests-atf-tests
-./usr/tests/atf/atf-c++/Atffile			tests-atf-tests		atf
-./usr/tests/atf/atf-c++/Kyuafile		tests-atf-tests		atf,kyua
-./usr/tests/atf/atf-c++/application_test	tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/atf_c++_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/build_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/check_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/config_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/d_include_application_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_atf_c++_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_atffile_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_build_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_check_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_config_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_env_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_exceptions_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_expand_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_formats_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_fs_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_io_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_macros_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_parser_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_process_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_sanity_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_signals_hpp.cpp	tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_tests_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_text_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_ui_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_user_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_include_utils_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/d_use_macros_hpp.cpp		tests-obsolete	obsolete
-./usr/tests/atf/atf-c++/detail			tests-atf-tests
-./usr/tests/atf/atf-c++/detail/Atffile		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/Kyuafile		tests-atf-tests		atf,kyua
-./usr/tests/atf/atf-c++/detail/application_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/auto_array_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/env_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/exceptions_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/expand_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/fs_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/parser_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/process_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/sanity_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/text_test	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/detail/ui_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/env_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/exceptions_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/expand_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/fs_test			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/io_test			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/macros_hpp_test.cpp	tests-atf-tests		atf
-./usr/tests/atf/atf-c++/macros_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/parser_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/pkg_config_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/process_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/sanity_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/signals_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_application		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_atf_c++		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_atffile		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_build			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_check			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_config		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_env			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_exceptions		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_expand		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_formats		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_fs			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_io			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_macros		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_parser		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_pkg_config		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_process		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_sanity		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_signals		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_tests			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_text			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_ui			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_user			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/t_utils			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/tests_test		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/text_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/ui_test			tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/unused_test.cpp		tests-atf-tests		atf
-./usr/tests/atf/atf-c++/user_test		tests-obsolete		obsolete
-./usr/tests/atf/atf-c++/utils_test		tests-atf-tests		atf
 ./usr/tests/atf/atf-check			tests-obsolete		obsolete
 ./usr/tests/atf/atf-check/Atffile		tests-obsolete		obsolete
 ./usr/tests/atf/atf-check/integration_test	tests-obsolete		obsolete
@@ -398,8 +398,6 @@
 ./usr/tests/atf/atf-run/expect_helpers		tests-obsolete		obsolete,kyua
 ./usr/tests/atf/atf-run/fs_test			tests-atf-tests		atf,!kyua
 ./usr/tests/atf/atf-run/fs_test			tests-obsolete		obsolete,kyua
-./usr/tests/atf/atf-run/io_test			tests-atf-tests		atf,!kyua
-./usr/tests/atf/atf-run/io_test			tests-obsolete		obsolete,kyua
 ./usr/tests/atf/atf-run/h_bad_metadata		tests-obsolete		obsolete
 ./usr/tests/atf/atf-run/h_fail			tests-obsolete		obsolete
 ./usr/tests/atf/atf-run/h_misc			tests-obsolete		obsolete
@@ -408,6 +406,8 @@
 ./usr/tests/atf/atf-run/h_zero_tcs		tests-obsolete		obsolete
 ./usr/tests/atf/atf-run/integration_test	tests-atf-tests		atf,!kyua
 ./usr/tests/atf/atf-run/integration_test	tests-obsolete		obsolete,kyua
+./usr/tests/atf/atf-run/io_test			tests-atf-tests		atf,!kyua
+./usr/tests/atf/atf-run/io_test			tests-obsolete		obsolete,kyua
 ./usr/tests/atf/atf-run/misc_helpers		tests-atf-tests		atf,!kyua
 ./usr/tests/atf/atf-run/misc_helpers		tests-obsolete		obsolete,kyua
 ./usr/tests/atf/atf-run/pass_helper		tests-atf-tests		atf,!kyua
@@ -517,6 +517,50 @@
 ./usr/tests/atf/formats/d_headers_8.experr	tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_headers_9		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_headers_9.experr	tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_1			tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_1.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_2			tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_2.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_3			tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_3.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_50		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_50.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_51		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_51.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_52		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_52.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_53		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_53.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_54		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_54.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_60		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_60.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_61		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_61.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_61.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_70		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_70.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_70.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_71		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_71.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_71.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_72		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_72.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_72.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_73		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_73.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_73.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_74		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_74.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_74.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_75		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_75.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_75.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_76		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_76.experr		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_76.expout		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_77		tests-obsolete		obsolete
+./usr/tests/atf/formats/d_tcr_77.experr		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tcs_1			tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tcs_1.errin		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tcs_1.expout		tests-obsolete		obsolete
@@ -562,50 +606,6 @@
 ./usr/tests/atf/formats/d_tcs_57.experr		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tcs_57.expout		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tcs_57.outin		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_1			tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_1.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_2			tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_2.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_3			tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_3.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_50		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_50.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_51		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_51.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_52		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_52.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_53		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_53.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_54		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_54.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_60		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_60.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_61		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_61.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_61.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_70		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_70.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_70.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_71		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_71.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_71.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_72		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_72.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_72.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_73		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_73.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_73.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_74		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_74.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_74.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_75		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_75.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_75.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_76		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_76.experr		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_76.expout		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_77		tests-obsolete		obsolete
-./usr/tests/atf/formats/d_tcr_77.experr		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tp_1			tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tp_1.expout		tests-obsolete		obsolete
 ./usr/tests/atf/formats/d_tp_2			tests-obsolete		obsolete
@@ -788,10 +788,6 @@
 ./usr/tests/bin/ps/Kyuafile			tests-bin-tests		atf,kyua
 ./usr/tests/bin/ps/keywords			tests-bin-tests		atf
 ./usr/tests/bin/ps/t_ps				tests-bin-tests		atf
-./usr/tests/bin/sleep				tests-bin-tests
-./usr/tests/bin/sleep/Atffile			tests-bin-tests		atf
-./usr/tests/bin/sleep/Kyuafile			tests-bin-tests		atf,kyua
-./usr/tests/bin/sleep/t_sleep			tests-bin-tests		atf
 ./usr/tests/bin/sh				tests-bin-tests
 ./usr/tests/bin/sh/Atffile			tests-bin-tests		atf
 ./usr/tests/bin/sh/Kyuafile			tests-bin-tests		atf,kyua
@@ -805,6 +801,10 @@
 ./usr/tests/bin/sh/t_ulimit			tests-bin-tests		atf
 ./usr/tests/bin/sh/t_varquote			tests-bin-tests		atf
 ./usr/tests/bin/sh/t_wait			tests-bin-tests		atf
+./usr/tests/bin/sleep				tests-bin-tests
+./usr/tests/bin/sleep/Atffile			tests-bin-tests		atf
+./usr/tests/bin/sleep/Kyuafile			tests-bin-tests		atf,kyua
+./usr/tests/bin/sleep/t_sleep			tests-bin-tests		atf
 ./usr/tests/bin/tar				tests-bin-tests
 ./usr/tests/bin/tar/Atffile			tests-bin-tests		atf
 ./usr/tests/bin/tar/Kyuafile			tests-bin-tests		atf,kyua
@@ -815,10 +815,11 @@
 ./usr/tests/crypto/libcrypto			tests-crypto-tests
 ./usr/tests/crypto/libcrypto/Atffile		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/Kyuafile		tests-crypto-tests	crypto,kyua
+./usr/tests/crypto/libcrypto/d_client.pem	tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/d_conf.out		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/d_conf_ssleay.cnf	tests-crypto-tests	crypto
-./usr/tests/crypto/libcrypto/d_client.pem	tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/d_server.pem	tests-crypto-tests	crypto
+./usr/tests/crypto/libcrypto/evptests.txt	tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_bftest		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_bntest		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_casttest		tests-crypto-tests	crypto
@@ -832,7 +833,6 @@
 ./usr/tests/crypto/libcrypto/h_ectest		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_enginetest	tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_evp_test		tests-crypto-tests	crypto
-./usr/tests/crypto/libcrypto/evptests.txt	tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_exptest		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_hmactest		tests-crypto-tests	crypto
 ./usr/tests/crypto/libcrypto/h_ideatest		tests-crypto-tests	crypto
@@ -869,11 +869,11 @@
 ./usr/tests/dev/cgd				tests-fs-tests
 ./usr/tests/dev/cgd/Atffile			tests-fs-tests		atf
 ./usr/tests/dev/cgd/Kyuafile			tests-fs-tests		atf,kyua
-./usr/tests/dev/cgd/t_cgd			tests-fs-tests		atf
+./usr/tests/dev/cgd/h_img2cgd			tests-obsolete	obsolete
+./usr/tests/dev/cgd/h_img2cgd/cgd.conf		tests-obsolete	obsolete
+./usr/tests/dev/cgd/h_img2cgd/h_img2cgd		tests-obsolete	obsolete
 ./usr/tests/dev/cgd/paramsfile			tests-fs-tests		atf
-./usr/tests/dev/cgd/h_img2cgd			tests-obsolete	obsolete
-./usr/tests/dev/cgd/h_img2cgd/h_img2cgd		tests-obsolete	obsolete
-./usr/tests/dev/cgd/h_img2cgd/cgd.conf		tests-obsolete	obsolete
+./usr/tests/dev/cgd/t_cgd			tests-fs-tests		atf
 ./usr/tests/dev/md				tests-fs-tests
 ./usr/tests/dev/md/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/dev/md/Kyuafile			tests-fs-tests		atf,rump,kyua
@@ -898,7 +898,6 @@
 ./usr/tests/fs					tests-fs-tests
 ./usr/tests/fs/Atffile				tests-fs-tests		atf,rump
 ./usr/tests/fs/Kyuafile				tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/h_funcs.subr			tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs				tests-fs-tests
 ./usr/tests/fs/ffs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/ffs/Kyuafile			tests-fs-tests		atf,rump,kyua
@@ -926,6 +925,7 @@
 ./usr/tests/fs/fifofs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/fifofs/Kyuafile			tests-fs-tests		atf,rump,kyua
 ./usr/tests/fs/fifofs/t_fifo			tests-fs-tests		atf,rump
+./usr/tests/fs/h_funcs.subr			tests-fs-tests		atf,rump
 ./usr/tests/fs/hfs				tests-fs-tests
 ./usr/tests/fs/hfs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/hfs/Kyuafile			tests-fs-tests		atf,rump,kyua
@@ -946,11 +946,11 @@
 ./usr/tests/fs/nfs				tests-fs-tests
 ./usr/tests/fs/nfs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/nfs/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/nfs/t_mountd				tests-fs-tests	atf,rump
-./usr/tests/fs/nfs/t_rquotad				tests-fs-tests	atf,rump
 ./usr/tests/fs/nfs/nfsservice				tests-fs-tests
 ./usr/tests/fs/nfs/nfsservice/exports			tests-fs-tests		atf,rump
 ./usr/tests/fs/nfs/nfsservice/rumpnfsd			tests-fs-tests		atf,rump
+./usr/tests/fs/nfs/t_mountd				tests-fs-tests	atf,rump
+./usr/tests/fs/nfs/t_rquotad				tests-fs-tests	atf,rump
 ./usr/tests/fs/nullfs				tests-fs-tests
 ./usr/tests/fs/nullfs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/nullfs/Kyuafile			tests-fs-tests		atf,rump,kyua
@@ -967,14 +967,11 @@
 ./usr/tests/fs/ptyfs				tests-fs-tests
 ./usr/tests/fs/ptyfs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/ptyfs/Kyuafile			tests-fs-tests		atf,rump,kyua
+./usr/tests/fs/ptyfs/t_nullpts			tests-fs-tests		atf,rump
 ./usr/tests/fs/ptyfs/t_ptyfs			tests-fs-tests		atf,rump
-./usr/tests/fs/ptyfs/t_nullpts			tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs				tests-fs-tests
 ./usr/tests/fs/puffs/Atffile			tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs/Kyuafile			tests-fs-tests		atf,rump,kyua
-./usr/tests/fs/puffs/t_basic			tests-fs-tests		atf,rump
-./usr/tests/fs/puffs/t_fuzz			tests-fs-tests		atf,rump
-./usr/tests/fs/puffs/t_io			tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs/h_dtfs			tests-fs-tests
 ./usr/tests/fs/puffs/h_dtfs/h_dtfs		tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs/h_have_puffs		tests-obsolete		obsolete
@@ -982,6 +979,9 @@
 ./usr/tests/fs/puffs/ssh_host_key		tests-obsolete		obsolete
 ./usr/tests/fs/puffs/ssh_host_key.pub		tests-obsolete		obsolete
 ./usr/tests/fs/puffs/sshd_config.in		tests-obsolete		obsolete
+./usr/tests/fs/puffs/t_basic			tests-fs-tests		atf,rump
+./usr/tests/fs/puffs/t_fuzz			tests-fs-tests		atf,rump
+./usr/tests/fs/puffs/t_io			tests-fs-tests		atf,rump
 ./usr/tests/fs/puffs/t_psshfs			tests-obsolete		obsolete
 ./usr/tests/fs/tmpfs				tests-fs-tests
 ./usr/tests/fs/tmpfs/Atffile			tests-fs-tests		atf,rump
@@ -1571,14 +1571,14 @@
 ./usr/tests/kernel/kqueue/write/t_ttypty	tests-kernel-tests		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/t_fileactions	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_fileactions	tests-kernel-tests		obsolete
-./usr/tests/kernel/posix_spawn/h_nonexec	tests-kernel-tests		obsolete
-./usr/tests/kernel/posix_spawn/h_zero		tests-kernel-tests		obsolete
 ./usr/tests/kernel/t_extattrctl			tests-kernel-tests		atf,rump
 ./usr/tests/kernel/t_extent			tests-kernel-tests		atf
 ./usr/tests/kernel/t_filedesc			tests-kernel-tests		atf,rump
@@ -1819,6 +1819,10 @@
 ./usr/tests/lib/libbluetooth/t_sdp_match	tests-lib-tests		atf
 ./usr/tests/lib/libbluetooth/t_sdp_put		tests-lib-tests		atf
 ./usr/tests/lib/libbluetooth/t_sdp_set		tests-lib-tests		atf
+./usr/tests/lib/libbpfjit			tests-lib-tests		atf
+./usr/tests/lib/libbpfjit/Atffile		tests-lib-tests		atf,sljit
+./usr/tests/lib/libbpfjit/Kyuafile		tests-lib-tests		atf,sljit,kyua
+./usr/tests/lib/libbpfjit/t_bpfjit		tests-lib-tests		atf,sljit
 ./usr/tests/lib/libc				tests-lib-tests
 ./usr/tests/lib/libc/Atffile			tests-lib-tests		atf
 ./usr/tests/lib/libc/Kyuafile			tests-lib-tests		atf,kyua
@@ -1853,14 +1857,14 @@
 ./usr/tests/lib/libc/gen/posix_spawn			tests-kernel-tests
 ./usr/tests/lib/libc/gen/posix_spawn/Atffile		tests-kernel-tests	atf
 ./usr/tests/lib/libc/gen/posix_spawn/Kyuafile		tests-kernel-tests	atf,kyua
+./usr/tests/lib/libc/gen/posix_spawn/h_fileactions	tests-kernel-tests	atf
+./usr/tests/lib/libc/gen/posix_spawn/h_nonexec	tests-kernel-tests		atf
+./usr/tests/lib/libc/gen/posix_spawn/h_spawn		tests-kernel-tests	atf
+./usr/tests/lib/libc/gen/posix_spawn/h_spawnattr	tests-kernel-tests	atf
+./usr/tests/lib/libc/gen/posix_spawn/h_zero	tests-kernel-tests		atf
+./usr/tests/lib/libc/gen/posix_spawn/t_fileactions	tests-kernel-tests	atf
 ./usr/tests/lib/libc/gen/posix_spawn/t_spawn		tests-kernel-tests	atf
 ./usr/tests/lib/libc/gen/posix_spawn/t_spawnattr	tests-kernel-tests	atf
-./usr/tests/lib/libc/gen/posix_spawn/t_fileactions	tests-kernel-tests	atf
-./usr/tests/lib/libc/gen/posix_spawn/h_spawn		tests-kernel-tests	atf
-./usr/tests/lib/libc/gen/posix_spawn/h_spawnattr	tests-kernel-tests	atf
-./usr/tests/lib/libc/gen/posix_spawn/h_fileactions	tests-kernel-tests	atf
-./usr/tests/lib/libc/gen/posix_spawn/h_nonexec	tests-kernel-tests		atf
-./usr/tests/lib/libc/gen/posix_spawn/h_zero	tests-kernel-tests		atf
 ./usr/tests/lib/libc/gen/t_alarm		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_assert		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_basedirname		tests-lib-tests		atf
@@ -1884,8 +1888,8 @@
 ./usr/tests/lib/libc/gen/t_pause		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_raise		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_randomid		tests-lib-tests		atf
+./usr/tests/lib/libc/gen/t_rbstress		tests-obsolete		obsolete
 ./usr/tests/lib/libc/gen/t_realpath		tests-lib-tests		atf
-./usr/tests/lib/libc/gen/t_rbstress		tests-obsolete		obsolete
 ./usr/tests/lib/libc/gen/t_setdomainname	tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_sethostname		tests-lib-tests		atf
 ./usr/tests/lib/libc/gen/t_siginfo		tests-lib-tests		atf
@@ -1934,6 +1938,10 @@
 ./usr/tests/lib/libc/ieeefp/t_nan_inf		tests-obsolete		obsolete
 ./usr/tests/lib/libc/ieeefp/t_round		tests-obsolete		obsolete
 ./usr/tests/lib/libc/ieeefp/t_subnormal		tests-obsolete		obsolete
+./usr/tests/lib/libc/inet			tests-lib-tests
+./usr/tests/lib/libc/inet/Atffile		tests-lib-tests		atf
+./usr/tests/lib/libc/inet/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libc/inet/t_inet_network	tests-lib-tests		atf
 ./usr/tests/lib/libc/locale			tests-lib-tests
 ./usr/tests/lib/libc/locale/Atffile		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/Kyuafile		tests-lib-tests		atf,kyua
@@ -1941,18 +1949,14 @@
 ./usr/tests/lib/libc/locale/t_ctype2		tests-obsolete		obsolete
 ./usr/tests/lib/libc/locale/t_io		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_mbrtowc		tests-lib-tests		atf
+./usr/tests/lib/libc/locale/t_mbsnrtowcs	tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_mbstowcs		tests-lib-tests		atf
-./usr/tests/lib/libc/locale/t_mbsnrtowcs	tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_mbtowc		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wcscspn		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wcspbrk		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wcsspn		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wcstod		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wctomb		tests-lib-tests		atf
-./usr/tests/lib/libc/inet			tests-lib-tests
-./usr/tests/lib/libc/inet/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libc/inet/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/libc/inet/t_inet_network	tests-lib-tests		atf
 ./usr/tests/lib/libc/net			tests-lib-tests
 ./usr/tests/lib/libc/net/Atffile		tests-lib-tests		atf
 ./usr/tests/lib/libc/net/Kyuafile		tests-lib-tests		atf,kyua
@@ -2027,8 +2031,8 @@
 ./usr/tests/lib/libc/setjmp			tests-lib-tests
 ./usr/tests/lib/libc/setjmp/Atffile		tests-lib-tests		atf
 ./usr/tests/lib/libc/setjmp/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libc/setjmp/t_setjmp		tests-lib-tests		atf
 ./usr/tests/lib/libc/setjmp/t_threadjmp		tests-lib-tests		atf
-./usr/tests/lib/libc/setjmp/t_setjmp		tests-lib-tests		atf
 ./usr/tests/lib/libc/ssp			tests-lib-tests
 ./usr/tests/lib/libc/ssp/Atffile		tests-lib-tests		atf,ssp
 ./usr/tests/lib/libc/ssp/Kyuafile		tests-lib-tests		atf,ssp,kyua
@@ -2057,8 +2061,8 @@
 ./usr/tests/lib/libc/stdio/t_fflush		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_fmemopen		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_fopen		tests-lib-tests		atf
+./usr/tests/lib/libc/stdio/t_format		tests-obsolete		obsolete
 ./usr/tests/lib/libc/stdio/t_fputc		tests-lib-tests		atf
-./usr/tests/lib/libc/stdio/t_format		tests-obsolete		obsolete
 ./usr/tests/lib/libc/stdio/t_mktemp		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_popen		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_printf		tests-lib-tests		atf
@@ -2069,8 +2073,8 @@
 ./usr/tests/lib/libc/stdlib/h_atexit		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/h_getopt		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/h_getopt_long	tests-lib-tests		atf
+./usr/tests/lib/libc/stdlib/t_abs		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_atexit		tests-lib-tests		atf
-./usr/tests/lib/libc/stdlib/t_abs		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_atoi		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_div		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdlib/t_environment	tests-obsolete		obsolete
@@ -2134,8 +2138,8 @@
 ./usr/tests/lib/libc/sys/t_kill			tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_link			tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_listen		tests-lib-tests		atf
+./usr/tests/lib/libc/sys/t_lwp_create		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_lwp_ctl		tests-lib-tests		atf
-./usr/tests/lib/libc/sys/t_lwp_create		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_mincore		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_mkdir		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_mkfifo		tests-lib-tests		atf
@@ -2160,8 +2164,8 @@
 ./usr/tests/lib/libc/sys/t_setuid		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_sigaction		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_sigqueue		tests-lib-tests		atf
+./usr/tests/lib/libc/sys/t_sigtimedwait		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_sigtimedwait_pr_47625	tests-obsolete		obsolete
-./usr/tests/lib/libc/sys/t_sigtimedwait		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_socketpair		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_stat			tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_swapcontext		tests-lib-tests		atf
@@ -2171,25 +2175,12 @@
 ./usr/tests/lib/libc/sys/t_umask		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_unlink		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys/t_write		tests-lib-tests		atf
-./usr/tests/lib/libc/termios			tests-lib-tests
-./usr/tests/lib/libc/termios/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libc/termios/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/libc/termios/t_tcsetpgrp	tests-lib-tests		atf
-./usr/tests/lib/libc/tls			tests-lib-tests
-./usr/tests/lib/libc/tls/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libc/tls/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/libc/tls/t_tls_static		tests-lib-tests		atf
-./usr/tests/lib/libc/ttyio			tests-lib-tests
-./usr/tests/lib/libc/ttyio/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libc/ttyio/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/libc/ttyio/t_ptm		tests-lib-tests		atf
-./usr/tests/lib/libc/ttyio/t_ttyio		tests-lib-tests		atf
 ./usr/tests/lib/libc/t_atexit			tests-obsolete		obsolete
+./usr/tests/lib/libc/t_cdb			tests-lib-tests		atf
 ./usr/tests/lib/libc/t_cerror			tests-obsolete		obsolete
 ./usr/tests/lib/libc/t_clone			tests-obsolete		obsolete
 ./usr/tests/lib/libc/t_context			tests-obsolete		obsolete
 ./usr/tests/lib/libc/t_convfp			tests-lib-tests		atf
-./usr/tests/lib/libc/t_cdb			tests-lib-tests		atf
 ./usr/tests/lib/libc/t_gdtoa			tests-lib-tests		atf
 ./usr/tests/lib/libc/t_hsearch			tests-obsolete		obsolete
 ./usr/tests/lib/libc/t_inet			tests-obsolete		obsolete
@@ -2200,15 +2191,30 @@
 ./usr/tests/lib/libc/t_randomid			tests-obsolete		obsolete
 ./usr/tests/lib/libc/t_servent			tests-obsolete		obsolete
 ./usr/tests/lib/libc/t_strptime			tests-obsolete		obsolete
+./usr/tests/lib/libc/termios			tests-lib-tests
+./usr/tests/lib/libc/termios/Atffile		tests-lib-tests		atf
+./usr/tests/lib/libc/termios/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libc/termios/t_tcsetpgrp	tests-lib-tests		atf
 ./usr/tests/lib/libc/time			tests-lib-tests
+./usr/tests/lib/libc/time/Atffile		tests-lib-tests		atf
+./usr/tests/lib/libc/time/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libc/time/t_mktime		tests-lib-tests		atf
+./usr/tests/lib/libc/time/t_strptime		tests-lib-tests		atf
+./usr/tests/lib/libc/tls			tests-lib-tests
+./usr/tests/lib/libc/tls/Atffile		tests-lib-tests		atf
+./usr/tests/lib/libc/tls/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libc/tls/t_tls_static		tests-lib-tests		atf
+./usr/tests/lib/libc/ttyio			tests-lib-tests
+./usr/tests/lib/libc/ttyio/Atffile		tests-lib-tests		atf
+./usr/tests/lib/libc/ttyio/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libc/ttyio/t_ptm		tests-lib-tests		atf
+./usr/tests/lib/libc/ttyio/t_ttyio		tests-lib-tests		atf
 ./usr/tests/lib/libcrypt			tests-lib-tests
 ./usr/tests/lib/libcrypt/Atffile		tests-lib-tests
 ./usr/tests/lib/libcrypt/Kyuafile		tests-lib-tests		kyua
 ./usr/tests/lib/libcrypt/t_crypt		tests-lib-tests
 ./usr/tests/lib/libcurses			tests-lib-tests
 ./usr/tests/lib/libcurses/.terminfo.db		tests-obsolete		obsolete
-./usr/tests/lib/libcurses/terminfo.cdb		tests-lib-tests		atf
-./usr/tests/lib/libcurses/terminfo.db		tests-obsolete		obsolete
 ./usr/tests/lib/libcurses/Atffile		tests-lib-tests		atf
 ./usr/tests/lib/libcurses/Kyuafile		tests-lib-tests		atf,kyua
 ./usr/tests/lib/libcurses/check_files			tests-lib-tests
@@ -2274,6 +2280,8 @@
 ./usr/tests/lib/libcurses/director		tests-lib-tests		atf
 ./usr/tests/lib/libcurses/slave			tests-lib-tests		atf
 ./usr/tests/lib/libcurses/t_curses		tests-lib-tests		atf
+./usr/tests/lib/libcurses/terminfo.cdb		tests-lib-tests		atf
+./usr/tests/lib/libcurses/terminfo.db		tests-obsolete		obsolete
 ./usr/tests/lib/libcurses/tests			tests-lib-tests
 ./usr/tests/lib/libcurses/tests/addch		tests-lib-tests		atf
 ./usr/tests/lib/libcurses/tests/addchnstr	tests-lib-tests		atf
@@ -2308,24 +2316,9 @@
 ./usr/tests/lib/libcurses/tests/wprintw		tests-lib-tests		atf
 ./usr/tests/lib/libcurses/tests/wscrl		tests-lib-tests		atf
 ./usr/tests/lib/libdes				tests-lib-tests
-./usr/tests/lib/libc/time/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libc/time/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/libc/time/t_mktime		tests-lib-tests		atf
-./usr/tests/lib/libc/time/t_strptime		tests-lib-tests		atf
 ./usr/tests/lib/libdes/Atffile			tests-lib-tests		atf,crypto
 ./usr/tests/lib/libdes/Kyuafile			tests-lib-tests		atf,crypto,kyua
 ./usr/tests/lib/libdes/t_des			tests-lib-tests		atf,crypto
-./usr/tests/lib/semaphore			tests-lib-tests
-./usr/tests/lib/semaphore/Atffile		tests-lib-tests		atf
-./usr/tests/lib/semaphore/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/semaphore/pthread		tests-lib-tests
-./usr/tests/lib/semaphore/pthread/Atffile	tests-lib-tests		atf,rump
-./usr/tests/lib/semaphore/pthread/Kyuafile	tests-lib-tests		atf,rump,kyua
-./usr/tests/lib/semaphore/pthread/t_sem_pth	tests-lib-tests		atf,rump
-./usr/tests/lib/libbpfjit			tests-lib-tests		atf
-./usr/tests/lib/libbpfjit/Atffile		tests-lib-tests		atf,sljit
-./usr/tests/lib/libbpfjit/Kyuafile		tests-lib-tests		atf,sljit,kyua
-./usr/tests/lib/libbpfjit/t_bpfjit		tests-lib-tests		atf,sljit
 ./usr/tests/lib/libevent			tests-lib-tests
 ./usr/tests/lib/libevent/Atffile		tests-lib-tests		atf
 ./usr/tests/lib/libevent/Kyuafile		tests-lib-tests		atf,kyua
@@ -2359,8 +2352,8 @@
 ./usr/tests/lib/libm/t_floor			tests-obsolete		obsolete
 ./usr/tests/lib/libm/t_infinity			tests-lib-tests		atf
 ./usr/tests/lib/libm/t_ldexp			tests-lib-tests		atf
+./usr/tests/lib/libm/t_libm			tests-obsolete		obsolete
 ./usr/tests/lib/libm/t_log			tests-lib-tests		atf
-./usr/tests/lib/libm/t_libm			tests-obsolete		obsolete
 ./usr/tests/lib/libm/t_pow			tests-lib-tests		atf
 ./usr/tests/lib/libm/t_round			tests-lib-tests		atf
 ./usr/tests/lib/libm/t_scalbn			tests-lib-tests		atf
@@ -2397,6 +2390,9 @@
 ./usr/tests/lib/libprop/Kyuafile		tests-lib-tests		atf,kyua
 ./usr/tests/lib/libprop/t_basic			tests-lib-tests		atf
 ./usr/tests/lib/libpthread			tests-lib-tests
+./usr/tests/lib/libpthread/Atffile		tests-lib-tests		atf
+./usr/tests/lib/libpthread/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/libpthread/d_mach		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/dlopen			tests-lib-tests
 ./usr/tests/lib/libpthread/dlopen/Atffile	tests-lib-tests		atf
 ./usr/tests/lib/libpthread/dlopen/Kyuafile	tests-lib-tests		atf,kyua
@@ -2405,9 +2401,6 @@
 ./usr/tests/lib/libpthread/dlopen/t_dlopen	tests-lib-tests		atf,pic
 ./usr/tests/lib/libpthread/dlopen/t_dso_pthread_create	tests-lib-tests		atf,pic
 ./usr/tests/lib/libpthread/dlopen/t_main_pthread_create	tests-lib-tests		atf,pic
-./usr/tests/lib/libpthread/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libpthread/Kyuafile		tests-lib-tests		atf,kyua
-./usr/tests/lib/libpthread/d_mach		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/h_atexit		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/h_cancel		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/h_exit		tests-lib-tests		atf
@@ -2431,9 +2424,9 @@
 ./usr/tests/lib/libpthread/t_resolv		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/t_rwlock		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/t_sem		tests-lib-tests		atf
+./usr/tests/lib/libpthread/t_siglongjmp		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/t_sigmask		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/t_sigsuspend		tests-lib-tests		atf
-./usr/tests/lib/libpthread/t_siglongjmp		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/t_sleep		tests-lib-tests		atf
 ./usr/tests/lib/libpthread/t_status		tests-obsolete		obsolete
 ./usr/tests/lib/libpthread/t_swapcontext	tests-lib-tests		atf
@@ -2458,16 +2451,16 @@
 ./usr/tests/lib/librumphijack/h_netget			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/index.html			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/netstat.expout			tests-lib-tests		atf,rump
+./usr/tests/lib/librumphijack/ssh_config.in			tests-lib-tests		atf,rump
+./usr/tests/lib/librumphijack/ssh_host_key			tests-lib-tests		atf,rump
+./usr/tests/lib/librumphijack/ssh_host_key.pub			tests-lib-tests		atf,rump
+./usr/tests/lib/librumphijack/sshd_config.in			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/t_asyncio			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/t_config			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/t_cwd			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/t_sh			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/t_tcpip			tests-lib-tests		atf,rump
 ./usr/tests/lib/librumphijack/t_vfs			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/ssh_config.in			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/ssh_host_key			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/ssh_host_key.pub			tests-lib-tests		atf,rump
-./usr/tests/lib/librumphijack/sshd_config.in			tests-lib-tests		atf,rump
 ./usr/tests/lib/libskey				tests-lib-tests		atf
 ./usr/tests/lib/libskey/Atffile			tests-lib-tests		atf,skey
 ./usr/tests/lib/libskey/Kyuafile		tests-lib-tests		atf,skey,kyua
@@ -2480,9 +2473,6 @@
 ./usr/tests/lib/libtre				tests-lib-tests		atf
 ./usr/tests/lib/libtre/Atffile			tests-lib-tests		atf
 ./usr/tests/lib/libtre/Kyuafile			tests-lib-tests		atf,kyua
-./usr/tests/lib/libtre/h_regex_att		tests-obsolete		obsolete
-./usr/tests/lib/libtre/t_exhaust		tests-lib-tests		atf
-./usr/tests/lib/libtre/t_regex_att		tests-lib-tests		atf
 ./usr/tests/lib/libtre/data			tests-lib-tests		atf
 ./usr/tests/lib/libtre/data/README		tests-lib-tests		atf
 ./usr/tests/lib/libtre/data/anchor.in		tests-lib-tests		atf
@@ -2511,6 +2501,9 @@
 ./usr/tests/lib/libtre/data/subtle.in		tests-lib-tests		atf
 ./usr/tests/lib/libtre/data/word_bound.in	tests-lib-tests		atf
 ./usr/tests/lib/libtre/data/zero.in		tests-lib-tests		atf
+./usr/tests/lib/libtre/h_regex_att		tests-obsolete		obsolete
+./usr/tests/lib/libtre/t_exhaust		tests-lib-tests		atf
+./usr/tests/lib/libtre/t_regex_att		tests-lib-tests		atf
 ./usr/tests/lib/libutil				tests-lib-tests		atf
 ./usr/tests/lib/libutil/Atffile			tests-lib-tests		atf
 ./usr/tests/lib/libutil/Kyuafile		tests-lib-tests		atf,kyua
@@ -2519,6 +2512,13 @@
 ./usr/tests/lib/libutil/t_pidfile		tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_snprintb		tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_sockaddr_snprintf	tests-lib-tests		atf
+./usr/tests/lib/semaphore			tests-lib-tests
+./usr/tests/lib/semaphore/Atffile		tests-lib-tests		atf
+./usr/tests/lib/semaphore/Kyuafile		tests-lib-tests		atf,kyua
+./usr/tests/lib/semaphore/pthread		tests-lib-tests
+./usr/tests/lib/semaphore/pthread/Atffile	tests-lib-tests		atf,rump
+./usr/tests/lib/semaphore/pthread/Kyuafile	tests-lib-tests		atf,rump,kyua
+./usr/tests/lib/semaphore/pthread/t_sem_pth	tests-lib-tests		atf,rump
 ./usr/tests/libexec				tests-lib-tests
 ./usr/tests/libexec/Atffile			tests-lib-tests		atf
 ./usr/tests/libexec/Kyuafile			tests-lib-tests		atf,kyua
@@ -2582,11 +2582,11 @@
 ./usr/tests/net/fdpass/fdpass32			tests-net-tests		atf
 ./usr/tests/net/fdpass/fdpass64			tests-net-tests		atf
 ./usr/tests/net/fdpass/t_fdpass			tests-net-tests		atf
-./usr/tests/net/icmp/t_forward		tests-net-tests		atf,rump
 ./usr/tests/net/icmp				tests-net-tests
 ./usr/tests/net/icmp/Atffile			tests-net-tests		atf,rump
 ./usr/tests/net/icmp/Kyuafile			tests-net-tests		atf,rump,kyua
 ./usr/tests/net/icmp/t_forward		tests-net-tests		atf,rump
+./usr/tests/net/icmp/t_forward		tests-net-tests		atf,rump
 ./usr/tests/net/icmp/t_ping		tests-net-tests		atf,rump
 ./usr/tests/net/icmp/t_ping2		tests-net-tests		atf,rump
 ./usr/tests/net/if			tests-net-tests
@@ -2637,25 +2637,25 @@
 ./usr/tests/rump/rumpkern			tests-rump-tests
 ./usr/tests/rump/rumpkern/Atffile		tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/Kyuafile		tests-rump-tests	atf,rump,kyua
-./usr/tests/rump/rumpkern/t_copy		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_kern		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_lwproc		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_modcmd		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_modlinkset		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_sp			tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_signals		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_threads		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_tsleep		tests-rump-tests	atf,rump
-./usr/tests/rump/rumpkern/t_vm			tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client		tests-rump-tests
+./usr/tests/rump/rumpkern/h_client/h_forkcli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client/h_reboot	tests-obsolete		obsolete
-./usr/tests/rump/rumpkern/h_client/h_forkcli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client/h_reconcli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client/h_sigcli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client/h_simplecli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_client/h_stresscli	tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpkern/h_server		tests-rump-tests
 ./usr/tests/rump/rumpkern/h_server/h_simpleserver	tests-rump-tests atf,rump
+./usr/tests/rump/rumpkern/t_copy		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_kern		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_lwproc		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_modcmd		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_modlinkset		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_signals		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_sp			tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_threads		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_tsleep		tests-rump-tests	atf,rump
+./usr/tests/rump/rumpkern/t_vm			tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpnet			tests-rump-tests
 ./usr/tests/rump/rumpnet/Atffile		tests-rump-tests	atf,rump
 ./usr/tests/rump/rumpnet/Kyuafile		tests-rump-tests	atf,rump,kyua
@@ -2706,16 +2706,16 @@
 ./usr/tests/sbin/sysctl/t_perm			tests-sbin-tests	atf
 ./usr/tests/sbin/sysctl/t_sysctl		tests-sbin-tests	atf
 ./usr/tests/share				tests-sys-tests
+./usr/tests/share/Atffile			tests-sys-tests		atf
+./usr/tests/share/Kyuafile			tests-sys-tests		atf,kyua
 ./usr/tests/share/examples			tests-asm-tests
 ./usr/tests/share/examples/Atffile		tests-asm-tests		atf,share
 ./usr/tests/share/examples/Kyuafile		tests-asm-tests		atf,share,kyua
-./usr/tests/share/examples/t_asm		tests-asm-tests		atf,share
-./usr/tests/share/Atffile			tests-sys-tests		atf
-./usr/tests/share/Kyuafile			tests-sys-tests		atf,kyua
 ./usr/tests/share/examples/lutok		tests-lutok-tests
 ./usr/tests/share/examples/lutok/Atffile	tests-lutok-tests	atf,kyua,share
 ./usr/tests/share/examples/lutok/Kyuafile	tests-lutok-tests	atf,kyua,share,kyua
 ./usr/tests/share/examples/lutok/examples_test	tests-lutok-tests	atf,kyua,share
+./usr/tests/share/examples/t_asm		tests-asm-tests		atf,share
 ./usr/tests/share/mk				tests-mk-tests
 ./usr/tests/share/mk/Atffile			tests-mk-tests		atf
 ./usr/tests/share/mk/Kyuafile			tests-mk-tests		atf,kyua
@@ -2779,7 +2779,6 @@
 ./usr/tests/usr.bin/awk				tests-usr.bin-tests
 ./usr/tests/usr.bin/awk/Atffile			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/awk/Kyuafile		tests-usr.bin-tests	atf,kyua
-./usr/tests/usr.bin/awk/t_awk			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/awk/d_assign_NF.awk		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/awk/d_assign_NF.in		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/awk/d_assign_NF.out		tests-usr.bin-tests	atf
@@ -2803,6 +2802,7 @@
 ./usr/tests/usr.bin/awk/d_toupper.awk		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/awk/d_toupper.in		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/awk/d_toupper.out		tests-usr.bin-tests	atf
+./usr/tests/usr.bin/awk/t_awk			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/basename			tests-usr.bin-tests
 ./usr/tests/usr.bin/basename/Atffile		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/basename/Kyuafile		tests-usr.bin-tests	atf,kyua
@@ -2810,13 +2810,13 @@
 ./usr/tests/usr.bin/bzip2			tests-usr.bin-tests
 ./usr/tests/usr.bin/bzip2/Atffile		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/Kyuafile		tests-usr.bin-tests	atf,kyua
-./usr/tests/usr.bin/bzip2/t_bzip2		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/d_sample1.bz2		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/d_sample1.ref		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/d_sample2.bz2		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/d_sample2.ref		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/d_sample3.bz2		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/bzip2/d_sample3.ref		tests-usr.bin-tests	atf
+./usr/tests/usr.bin/bzip2/t_bzip2		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/cc				tests-usr.bin-tests
 ./usr/tests/usr.bin/cc/Atffile			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/cc/Kyuafile			tests-usr.bin-tests	atf,kyua
@@ -2829,7 +2829,6 @@
 ./usr/tests/usr.bin/config/Atffile		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/config/Kyuafile		tests-usr.bin-tests	atf,kyua
 ./usr/tests/usr.bin/config/Makefile.regress	tests-usr.bin-tests	atf
-./usr/tests/usr.bin/config/t_config		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/config/d_deffs_redef	tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/config/d_loop		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/config/d_loop2		tests-usr.bin-tests	atf
@@ -2849,6 +2848,7 @@
 ./usr/tests/usr.bin/config/support/arch/regress/conf/std.regress		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/config/support/conf		tests-usr.bin-tests
 ./usr/tests/usr.bin/config/support/conf/files	tests-usr.bin-tests	atf
+./usr/tests/usr.bin/config/t_config		tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/cut				tests-usr.bin-tests
 ./usr/tests/usr.bin/cut/Atffile			tests-usr.bin-tests	atf
 ./usr/tests/usr.bin/cut/Kyuafile		tests-usr.bin-tests	atf,kyua
@@ -3115,11 +3115,11 @@
 ./usr/tests/usr.sbin/mtree/d_convert_D.out	tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/mtree/d_convert_D_S.out	tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/mtree/d_create.out		tests-obsolete		obsolete
-./usr/tests/usr.sbin/mtree/mtree_d_create.out	tests-usr.sbin-tests	atf
-./usr/tests/usr.sbin/mtree/netbsd6_d_create.out	tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/mtree/d_merge.in		tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/mtree/d_merge_C_M.out	tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/mtree/d_merge_C_M_S.out	tests-usr.sbin-tests	atf
+./usr/tests/usr.sbin/mtree/mtree_d_create.out	tests-usr.sbin-tests	atf
+./usr/tests/usr.sbin/mtree/netbsd6_d_create.out	tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/mtree/t_mtree		tests-usr.sbin-tests	atf
 ./usr/tests/usr.sbin/tcpdump			tests-usr.sbin-tests
 ./usr/tests/usr.sbin/tcpdump/Atffile		tests-usr.sbin-tests	atf
@@ -3224,8 +3224,8 @@
 ./usr/tests/util/grep/d_context_d.out		tests-obsolete		obsolete
 ./usr/tests/util/grep/d_egrep.out		tests-obsolete		obsolete
 ./usr/tests/util/grep/d_file_exp.in		tests-obsolete		obsolete
+./usr/tests/util/grep/d_file_exp.inout		tests-obsolete		obsolete
 ./usr/tests/util/grep/d_file_exp.out		tests-obsolete		obsolete
-./usr/tests/util/grep/d_file_exp.inout		tests-obsolete		obsolete
 ./usr/tests/util/grep/d_ignore_case.out		tests-obsolete		obsolete
 ./usr/tests/util/grep/d_input			tests-obsolete		obsolete
 ./usr/tests/util/grep/d_invert.in		tests-obsolete		obsolete
@@ -3239,8 +3239,8 @@
 ./usr/tests/util/grep/t_grep			tests-obsolete		obsolete
 ./usr/tests/util/id				tests-obsolete		obsolete
 ./usr/tests/util/id/Atffile			tests-obsolete		obsolete
+./usr/tests/util/id/h_id			tests-obsolete		obsolete
 ./usr/tests/util/id/libfake_pic.a		tests-obsolete		obsolete
-./usr/tests/util/id/h_id			tests-obsolete		obsolete
 ./usr/tests/util/id/t_groups			tests-obsolete		obsolete
 ./usr/tests/util/id/t_id			tests-obsolete		obsolete
 ./usr/tests/util/id/t_whoami			tests-obsolete		obsolete
@@ -3336,10 +3336,10 @@
 ./usr/tests/util/sh				tests-obsolete		obsolete
 ./usr/tests/util/sh/Atffile			tests-obsolete		obsolete
 ./usr/tests/util/sh/t_compexit			tests-obsolete		obsolete
+./usr/tests/util/sh/t_evaltested		tests-obsolete		obsolete
 ./usr/tests/util/sh/t_exit			tests-obsolete		obsolete
 ./usr/tests/util/sh/t_exitstatus		tests-obsolete		obsolete
 ./usr/tests/util/sh/t_expand			tests-obsolete		obsolete
-./usr/tests/util/sh/t_evaltested		tests-obsolete		obsolete
 ./usr/tests/util/sh/t_fsplit			tests-obsolete		obsolete
 ./usr/tests/util/sh/t_here			tests-obsolete		obsolete
 ./usr/tests/util/sh/t_set_e			tests-obsolete		obsolete
@@ -3354,8 +3354,8 @@
 ./usr/tests/util/sort/t_sort			tests-obsolete		obsolete
 ./usr/tests/util/systrace			tests-obsolete		obsolete
 ./usr/tests/util/systrace/Atffile		tests-obsolete		obsolete
+./usr/tests/util/systrace/h_have_systrace	tests-obsolete		obsolete
 ./usr/tests/util/systrace/id.policy		tests-obsolete		obsolete
-./usr/tests/util/systrace/h_have_systrace	tests-obsolete		obsolete
 ./usr/tests/util/systrace/t_id			tests-obsolete		obsolete
 ./usr/tests/util/t_basename			tests-obsolete		obsolete
 ./usr/tests/util/t_cp				tests-obsolete		obsolete
--- a/distrib/sets/lists/tests/shl.mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/tests/shl.mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.7 2013/01/16 16:01:08 christos Exp $
+# $NetBSD: shl.mi,v 1.8 2013/08/11 22:29:03 joerg Exp $
 #
 ./usr/tests/lib/csu/h_initfini3_dso.so		tests-lib-tests		atf
 ./usr/tests/lib/csu/h_initfini3_dso.so.1	tests-lib-tests		atf
@@ -10,8 +10,6 @@
 ./usr/tests/lib/libc/tls/libh_tls_dynamic.so.1	tests-lib-tests		atf
 ./usr/tests/lib/libc/tls/t_tls_dlopen		tests-lib-tests		atf
 ./usr/tests/lib/libc/tls/t_tls_dynamic		tests-lib-tests		atf
-./usr/tests/util/id/libfake.so.0		tests-obsolete		obsolete
-./usr/tests/util/id/libfake.so.0.0		tests-obsolete		obsolete
 ./usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso.so	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso.so.1	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso.so	tests-libexec-tests	atf
@@ -22,3 +20,5 @@
 ./usr/tests/libexec/ld.elf_so/libh_helper_dso1.so.1	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/libh_helper_dso2.so	tests-libexec-tests	atf
 ./usr/tests/libexec/ld.elf_so/libh_helper_dso2.so.1	tests-libexec-tests	atf
+./usr/tests/util/id/libfake.so.0		tests-obsolete		obsolete
+./usr/tests/util/id/libfake.so.0.0		tests-obsolete		obsolete
--- a/distrib/sets/lists/xbase/md.amd64	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/xbase/md.amd64	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: md.amd64,v 1.10 2011/01/20 18:55:38 jmcneill Exp $
-./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete
+# $NetBSD: md.amd64,v 1.11 2013/08/11 22:29:03 joerg Exp $
 ./usr/X11R7/lib/libI810XvMC.so			-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		-unknown-		xorg
@@ -15,3 +14,4 @@
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
+./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete
--- a/distrib/sets/lists/xbase/md.i386	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/xbase/md.i386	Sun Aug 11 22:29:02 2013 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: md.i386,v 1.26 2011/01/20 18:55:38 jmcneill Exp $
-./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete
+# $NetBSD: md.i386,v 1.27 2013/08/11 22:29:03 joerg Exp $
 ./usr/X11R7/lib/libI810XvMC.so			-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libI810XvMC.so.1.0		-unknown-		xorg
@@ -15,3 +14,4 @@
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
+./usr/X11R7/share/pciids/pci.ids		-unknown-		obsolete
--- a/distrib/sets/lists/xbase/mi	Sun Aug 11 22:27:44 2013 +0000
+++ b/distrib/sets/lists/xbase/mi	Sun Aug 11 22:29:02 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.118 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: mi,v 1.119 2013/08/11 22:29:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1368,9 +1368,9 @@
 ./usr/X11R7/bin/fc-cat					-unknown-	xorg
 ./usr/X11R7/bin/fc-list					-unknown-	xorg
 ./usr/X11R7/bin/fc-match				-unknown-	xorg
+./usr/X11R7/bin/fc-pattern				-unknown-	xorg
 ./usr/X11R7/bin/fc-query				-unknown-	xorg
 ./usr/X11R7/bin/fc-scan					-unknown-	xorg
-./usr/X11R7/bin/fc-pattern				-unknown-	xorg
 ./usr/X11R7/bin/fc-validate				-unknown-	xorg
 ./usr/X11R7/bin/fillblnk				-unknown-	xorg
 ./usr/X11R7/bin/fonttosfnt				-unknown-	xorg
@@ -1509,16 +1509,14 @@
 ./usr/X11R7/include/X11/fonts				base-x11-root	xorg
 ./usr/X11R7/include/X11/pixmaps				base-x11-root	xorg
 ./usr/X11R7/include/X11/pixmaps/NetBSD-bw.xpm		-unknown-	xorg
-./usr/X11R7/include/X11/pixmaps/NetBSD-inv.xpm		-unknown-	xorg
-./usr/X11R7/include/X11/pixmaps/NetBSD.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/NetBSD-flag.png		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/NetBSD-flag1.xpm	-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/NetBSD-flag2.xpm	-unknown-	xorg
+./usr/X11R7/include/X11/pixmaps/NetBSD-inv.xpm		-unknown-	xorg
+./usr/X11R7/include/X11/pixmaps/NetBSD.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm		-unknown-	xorg
 ./usr/X11R7/include/X11/pixmaps/xorg.xpm		-unkno