Module Name: src
Committed By: matt
Date: Wed Jun 24 22:20:26 UTC 2015
Modified Files:
src: Makefile
src/compat: compatsubdir.mk
src/compat/amd64/i386: bsd.i386.mk
src/compat/arm/eabi: bsd.eabi.mk
src/compat/arm/eabihf: bsd.eabihf.mk
src/compat/arm/oabi: bsd.oabi.mk
src/compat/mips64/o32: bsd.o32.mk
src/compat/powerpc64/powerpc: bsd.powerpc.mk
src/compat/riscv64/rv32: bsd.rv32.mk
src/compat/sparc64/sparc: bsd.sparc.mk
src/distrib/sets/lists/xbase: md.amd64 mi shl.mi
src/distrib/sets/lists/xcomp: md.amd64 mi shl.mi
src/distrib/sets/lists/xdebug: md.amd64 shl.mi
src/etc/mtree: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/libpciaccess: Makefile
src/external/mit/xorg/tools: Makefile
src/external/mit/xorg/tools/makekeys: Makefile Makefile.makekeys
src/external/mit/xorg/tools/makestrs: Makefile Makefile.makestrs
src/share/mk: bsd.own.mk bsd.x11.mk
src/tools: Makefile
Added Files:
src/etc/mtree: NetBSD.dist.xcompat.in
src/tools/makekeys: Makefile
src/tools/makestrs: Makefile
Log Message:
Support building the xorg X11 libraries under MKCOMPAT.
Add XORG_MACHINE_ARCH to compat's bsd.*.mk
Turn xorg makekeys and makestrs into real host tools which are installed into
${TOOLSDIR}
To generate a diff of this commit:
cvs rdiff -u -r1.313 -r1.314 src/Makefile
cvs rdiff -u -r1.10 -r1.11 src/compat/compatsubdir.mk
cvs rdiff -u -r1.5 -r1.6 src/compat/amd64/i386/bsd.i386.mk
cvs rdiff -u -r1.3 -r1.4 src/compat/arm/eabi/bsd.eabi.mk
cvs rdiff -u -r1.2 -r1.3 src/compat/arm/eabihf/bsd.eabihf.mk
cvs rdiff -u -r1.3 -r1.4 src/compat/arm/oabi/bsd.oabi.mk
cvs rdiff -u -r1.12 -r1.13 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.3 -r1.4 src/compat/powerpc64/powerpc/bsd.powerpc.mk
cvs rdiff -u -r1.1 -r1.2 src/compat/riscv64/rv32/bsd.rv32.mk
cvs rdiff -u -r1.5 -r1.6 src/compat/sparc64/sparc/bsd.sparc.mk
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xcomp/md.amd64 \
src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.164 -r1.165 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.25 -r1.26 src/etc/mtree/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.xcompat.in
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libpciaccess/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/makekeys/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/tools/makekeys/Makefile.makekeys
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/makestrs/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/tools/makestrs/Makefile.makestrs
cvs rdiff -u -r1.857 -r1.858 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.115 -r1.116 src/share/mk/bsd.x11.mk
cvs rdiff -u -r1.180 -r1.181 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/makekeys/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/makestrs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.313 src/Makefile:1.314
--- src/Makefile:1.313 Sun May 3 15:13:13 2015
+++ src/Makefile Wed Jun 24 22:20:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2015/05/03 15:13:13 martin Exp $
+# $NetBSD: Makefile,v 1.314 2015/06/24 22:20:24 matt Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -485,6 +485,9 @@ do-x11: .PHONY .MAKE
.if ${X11FLAVOUR} == "Xorg"
${MAKEDIRTARGET} external/mit/xorg/tools all
${MAKEDIRTARGET} external/mit/xorg/lib build_install
+.if ${MKCOMPAT} != "no"
+ ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
+.endif
.else
${MAKEDIRTARGET} x11 build
.endif
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.10 src/compat/compatsubdir.mk:1.11
--- src/compat/compatsubdir.mk:1.10 Mon Jun 22 00:11:33 2015
+++ src/compat/compatsubdir.mk Wed Jun 24 22:20:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.10 2015/06/22 00:11:33 matt Exp $
+# $NetBSD: compatsubdir.mk,v 1.11 2015/06/24 22:20:24 matt Exp $
# Build netbsd libraries.
@@ -30,7 +30,10 @@ SUBDIR+= ../../../tests
SUBDIR+= ../../../tests/share # because MKSHARE=no above
SUBDIR+= ../../../external/bsd/atf/tests
.endif
-.endif
+.if ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj)
+SUBDIR+= ../../../external/mit/xorg/lib
+.endif # } MKX11
+.endif # } BOOTSTRAP_SUBDIRS
.include <bsd.subdir.mk>
Index: src/compat/amd64/i386/bsd.i386.mk
diff -u src/compat/amd64/i386/bsd.i386.mk:1.5 src/compat/amd64/i386/bsd.i386.mk:1.6
--- src/compat/amd64/i386/bsd.i386.mk:1.5 Fri Sep 23 06:44:36 2011
+++ src/compat/amd64/i386/bsd.i386.mk Wed Jun 24 22:20:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386.mk,v 1.5 2011/09/23 06:44:36 mrg Exp $
+# $NetBSD: bsd.i386.mk,v 1.6 2015/06/24 22:20:24 matt Exp $
LD+= -m elf_i386
MLIBDIR= i386
@@ -11,5 +11,6 @@ CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
+XORG_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/compat/arm/eabi/bsd.eabi.mk
diff -u src/compat/arm/eabi/bsd.eabi.mk:1.3 src/compat/arm/eabi/bsd.eabi.mk:1.4
--- src/compat/arm/eabi/bsd.eabi.mk:1.3 Sun Aug 10 23:26:25 2014
+++ src/compat/arm/eabi/bsd.eabi.mk Wed Jun 24 22:20:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabi.mk,v 1.3 2014/08/10 23:26:25 matt Exp $
+# $NetBSD: bsd.eabi.mk,v 1.4 2015/06/24 22:20:24 matt Exp $
.if !defined(MLIBDIR)
@@ -41,6 +41,7 @@ PTHREAD_MACHINE_ARCH= ${ARM_MACHINE_ARCH
BFD_MACHINE_ARCH= earm
CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_MACHINE_CPU= arm
COMPAT_MACHINE_CPU= arm
Index: src/compat/arm/eabihf/bsd.eabihf.mk
diff -u src/compat/arm/eabihf/bsd.eabihf.mk:1.2 src/compat/arm/eabihf/bsd.eabihf.mk:1.3
--- src/compat/arm/eabihf/bsd.eabihf.mk:1.2 Wed Sep 10 22:43:36 2014
+++ src/compat/arm/eabihf/bsd.eabihf.mk Wed Jun 24 22:20:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabihf.mk,v 1.2 2014/09/10 22:43:36 matt Exp $
+# $NetBSD: bsd.eabihf.mk,v 1.3 2015/06/24 22:20:24 matt Exp $
.if !defined(MLIBDIR)
@@ -41,6 +41,7 @@ PTHREAD_MACHINE_ARCH= ${ARM_MACHINE_ARCH
BFD_MACHINE_ARCH= earmhf
CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_MACHINE_CPU= arm
COMPAT_MACHINE_CPU= arm
Index: src/compat/arm/oabi/bsd.oabi.mk
diff -u src/compat/arm/oabi/bsd.oabi.mk:1.3 src/compat/arm/oabi/bsd.oabi.mk:1.4
--- src/compat/arm/oabi/bsd.oabi.mk:1.3 Sun Aug 10 23:26:26 2014
+++ src/compat/arm/oabi/bsd.oabi.mk Wed Jun 24 22:20:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.oabi.mk,v 1.3 2014/08/10 23:26:26 matt Exp $
+# $NetBSD: bsd.oabi.mk,v 1.4 2015/06/24 22:20:24 matt Exp $
.if !defined(MLIBDIR)
MLIBDIR= oabi
@@ -31,6 +31,7 @@ PTHREAD_MACHINE_ARCH= ${ARM_MACHINE_ARCH
BFD_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
CSU_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
GOMP_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
+XORG_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
COMMON_MACHINE_CPU= arm
COMPAT_MACHINE_CPU= arm
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.12 src/compat/mips64/o32/bsd.o32.mk:1.13
--- src/compat/mips64/o32/bsd.o32.mk:1.12 Mon Jun 22 00:09:39 2015
+++ src/compat/mips64/o32/bsd.o32.mk Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.o32.mk,v 1.12 2015/06/22 00:09:39 matt Exp $
+# $NetBSD: bsd.o32.mk,v 1.13 2015/06/24 22:20:25 matt Exp $
.if ${MACHINE_ARCH} == "mips64eb"
LD+= -m elf32btsmip
@@ -10,6 +10,7 @@ MLIBDIR= o32
LIBGCC_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
GOMP_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
+XORG_MACHINE_ARCH= ${MACHINE_ARCH:S/64//}
COPTS+= -mabi=32 -march=mips3
CPUFLAGS+= -mabi=32 -march=mips3
Index: src/compat/powerpc64/powerpc/bsd.powerpc.mk
diff -u src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.3 src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.4
--- src/compat/powerpc64/powerpc/bsd.powerpc.mk:1.3 Sat Aug 23 02:20:55 2014
+++ src/compat/powerpc64/powerpc/bsd.powerpc.mk Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.powerpc.mk,v 1.3 2014/08/23 02:20:55 matt Exp $
+# $NetBSD: bsd.powerpc.mk,v 1.4 2015/06/24 22:20:25 matt Exp $
LD+= -m elf32ppc_nbsd
.if empty(LDFLAGS:M*elf32ppc_nbsd*)
@@ -15,6 +15,7 @@ CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_ARCH= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
+XORG_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
.endif
Index: src/compat/riscv64/rv32/bsd.rv32.mk
diff -u src/compat/riscv64/rv32/bsd.rv32.mk:1.1 src/compat/riscv64/rv32/bsd.rv32.mk:1.2
--- src/compat/riscv64/rv32/bsd.rv32.mk:1.1 Fri Sep 19 17:36:24 2014
+++ src/compat/riscv64/rv32/bsd.rv32.mk Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.rv32.mk,v 1.1 2014/09/19 17:36:24 matt Exp $
+# $NetBSD: bsd.rv32.mk,v 1.2 2015/06/24 22:20:25 matt Exp $
.if empty(LD:M-m)
@@ -16,6 +16,7 @@ CSU_MACHINE_ARCH= riscv32
CRYPTO_MACHINE_CPU= riscv32
LDELFSO_MACHINE_CPU= riscv32
GOMP_MACHINE_ARCH= riscv32
+XORG_MACHINE_ARCH= riscv32
.include "${.PARSEDIR}/../../m32.mk"
.endif
Index: src/compat/sparc64/sparc/bsd.sparc.mk
diff -u src/compat/sparc64/sparc/bsd.sparc.mk:1.5 src/compat/sparc64/sparc/bsd.sparc.mk:1.6
--- src/compat/sparc64/sparc/bsd.sparc.mk:1.5 Fri Sep 23 06:44:37 2011
+++ src/compat/sparc64/sparc/bsd.sparc.mk Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sparc.mk,v 1.5 2011/09/23 06:44:37 mrg Exp $
+# $NetBSD: bsd.sparc.mk,v 1.6 2015/06/24 22:20:25 matt Exp $
LD+= -m elf32_sparc
MLIBDIR= sparc
@@ -11,5 +11,6 @@ CSU_MACHINE_ARCH= ${MLIBDIR}
CRYPTO_MACHINE_CPU= ${MLIBDIR}
LDELFSO_MACHINE_CPU= ${MLIBDIR}
GOMP_MACHINE_ARCH= ${MLIBDIR}
+XORG_MACHINE_ARCH= ${MLIBDIR}
.include "${.PARSEDIR}/../../m32.mk"
Index: src/distrib/sets/lists/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.11 src/distrib/sets/lists/xbase/md.amd64:1.12
--- src/distrib/sets/lists/xbase/md.amd64:1.11 Sun Aug 11 22:29:03 2013
+++ src/distrib/sets/lists/xbase/md.amd64 Wed Jun 24 22:20:25 2015
@@ -1,17 +1,17 @@
-# $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
-./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg
-./usr/X11R7/lib/libIntelXvMC.so.1 -unknown- xorg
-./usr/X11R7/lib/libIntelXvMC.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg
-./usr/X11R7/lib/libchromeXvMC.so.1 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMC.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.so -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg
-./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
+# $NetBSD: md.amd64,v 1.12 2015/06/24 22:20:25 matt Exp $
+./usr/X11R7/lib/libI810XvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg,compatfile
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.124 src/distrib/sets/lists/xbase/mi:1.125
--- src/distrib/sets/lists/xbase/mi:1.124 Sat Jul 12 19:46:22 2014
+++ src/distrib/sets/lists/xbase/mi Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.124 2014/07/12 19:46:22 nakayama Exp $
+# $NetBSD: mi,v 1.125 2015/06/24 22:20:25 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1533,7 +1533,7 @@
./usr/X11R7/include/pixman-1 base-x11-root xorg
./usr/X11R7/include/xcb base-x11-root xorg
./usr/X11R7/include/xorg base-x11-root xorg
-./usr/X11R7/lib base-x11-root xorg
+./usr/X11R7/lib base-x11-root xorg,compatdir
./usr/X11R7/lib/X11 base-x11-root xorg
./usr/X11R7/lib/X11/XErrorDB -unknown- xorg
./usr/X11R7/lib/X11/XKeysymDB -unknown- xorg
@@ -2936,7 +2936,7 @@
./usr/libdata/debug/usr/X11R6/libexec base-sys-usr x11
./usr/libdata/debug/usr/X11R7 base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/bin base-sys-usr xorg
-./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg
+./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,compatdir
./usr/libdata/debug/usr/X11R7/lib/X11 base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/lib/X11/locale base-sys-usr xorg
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib base-sys-usr xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.61 src/distrib/sets/lists/xbase/shl.mi:1.62
--- src/distrib/sets/lists/xbase/shl.mi:1.61 Mon May 4 23:51:25 2015
+++ src/distrib/sets/lists/xbase/shl.mi Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.61 2015/05/04 23:51:25 mrg Exp $
+# $NetBSD: shl.mi,v 1.62 2015/06/24 22:20:25 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -165,282 +165,282 @@
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libFS.so -unknown- xorg
-./usr/X11R7/lib/libFS.so.7 -unknown- xorg
-./usr/X11R7/lib/libFS.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libGL.so -unknown- xorg
-./usr/X11R7/lib/libGL.so.2 -unknown- xorg
-./usr/X11R7/lib/libGL.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libGLU.so -unknown- xorg
-./usr/X11R7/lib/libGLU.so.2 -unknown- xorg
-./usr/X11R7/lib/libGLU.so.2.1 -unknown- xorg
-./usr/X11R7/lib/libGLw.so -unknown- xorg
-./usr/X11R7/lib/libGLw.so.2 -unknown- xorg
-./usr/X11R7/lib/libGLw.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libICE.so -unknown- xorg
-./usr/X11R7/lib/libICE.so.7 -unknown- xorg
-./usr/X11R7/lib/libICE.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libglapi.so -unknown- xorg
-./usr/X11R7/lib/libglapi.so.0 -unknown- xorg
-./usr/X11R7/lib/libglapi.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libFS.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libFS.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libFS.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGL.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libGL.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGL.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.so.2.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi.so.0.0 -unknown- xorg,compatfile
./usr/X11R7/lib/libOSMesa.so -unknown- obsolete
./usr/X11R7/lib/libOSMesa.so.7 -unknown- obsolete
./usr/X11R7/lib/libOSMesa.so.7.0 -unknown- obsolete
-./usr/X11R7/lib/libSM.so -unknown- xorg
-./usr/X11R7/lib/libSM.so.7 -unknown- xorg
-./usr/X11R7/lib/libSM.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libX11-xcb.so -unknown- xorg
-./usr/X11R7/lib/libX11-xcb.so.1 -unknown- xorg
-./usr/X11R7/lib/libX11-xcb.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libX11.so -unknown- xorg
-./usr/X11R7/lib/libX11.so.7 -unknown- xorg
-./usr/X11R7/lib/libX11.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXRes.so -unknown- xorg
-./usr/X11R7/lib/libXRes.so.2 -unknown- xorg
-./usr/X11R7/lib/libXRes.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXTrap.so -unknown- xorg
-./usr/X11R7/lib/libXTrap.so.7 -unknown- xorg
-./usr/X11R7/lib/libXTrap.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXau.so -unknown- xorg
-./usr/X11R7/lib/libXau.so.7 -unknown- xorg
-./usr/X11R7/lib/libXau.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXaw.so -unknown- xorg
-./usr/X11R7/lib/libXaw6.so.7 -unknown- xorg
-./usr/X11R7/lib/libXaw6.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXaw7.so -unknown- xorg
-./usr/X11R7/lib/libXaw7.so.10 -unknown- xorg
-./usr/X11R7/lib/libXaw7.so.10.0 -unknown xorg
+./usr/X11R7/lib/libSM.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libSM.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libSM.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11-xcb.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11-xcb.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11-xcb.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXRes.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXRes.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXRes.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXTrap.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXTrap.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXTrap.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXau.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXau.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXau.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw6.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw6.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw7.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw7.so.10 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw7.so.10.0 -unknown xorg,compatfile
./usr/X11R7/lib/libXaw8.so -obsolete- obsolete
./usr/X11R7/lib/libXaw8.so.9 -obsolete- obsolete
./usr/X11R7/lib/libXaw8.so.9.0 -obsolete- obsolete
-./usr/X11R7/lib/libXcomposite.so -unknown- xorg
-./usr/X11R7/lib/libXcomposite.so.2 -unknown- xorg
-./usr/X11R7/lib/libXcomposite.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXcursor.so -unknown- xorg
-./usr/X11R7/lib/libXcursor.so.2 -unknown- xorg
-./usr/X11R7/lib/libXcursor.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXdamage.so -unknown- xorg
-./usr/X11R7/lib/libXdamage.so.2 -unknown- xorg
-./usr/X11R7/lib/libXdamage.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXdmGreet.so -unknown- xorg
-./usr/X11R7/lib/libXdmGreet.so.0 -unknown- xorg
-./usr/X11R7/lib/libXdmGreet.so.0.0 -unknown- xorg
-./usr/X11R7/lib/libXdmcp.so -unknown- xorg
-./usr/X11R7/lib/libXdmcp.so.7 -unknown- xorg
-./usr/X11R7/lib/libXdmcp.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXevie.so -unknown- xorg
-./usr/X11R7/lib/libXevie.so.2 -unknown- xorg
-./usr/X11R7/lib/libXevie.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXext.so -unknown- xorg
-./usr/X11R7/lib/libXext.so.7 -unknown- xorg
-./usr/X11R7/lib/libXext.so.7.1 -unknown- xorg
-./usr/X11R7/lib/libXfixes.so -unknown- xorg
-./usr/X11R7/lib/libXfixes.so.4 -unknown- xorg
-./usr/X11R7/lib/libXfixes.so.4.0 -unknown- xorg
-./usr/X11R7/lib/libXfont.so -unknown- xorg
-./usr/X11R7/lib/libXfont.so.3 -unknown- xorg
-./usr/X11R7/lib/libXfont.so.3.0 -unknown- xorg
-./usr/X11R7/lib/libXfontcache.so -unknown- xorg
-./usr/X11R7/lib/libXfontcache.so.2 -unknown- xorg
-./usr/X11R7/lib/libXfontcache.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXft.so -unknown- xorg
-./usr/X11R7/lib/libXft.so.3 -unknown- xorg
-./usr/X11R7/lib/libXft.so.3.0 -unknown- xorg
-./usr/X11R7/lib/libXi.so -unknown- xorg
-./usr/X11R7/lib/libXi.so.7 -unknown- xorg
-./usr/X11R7/lib/libXi.so.7.1 -unknown- xorg
-./usr/X11R7/lib/libXinerama.so -unknown- xorg
-./usr/X11R7/lib/libXinerama.so.2 -unknown- xorg
-./usr/X11R7/lib/libXinerama.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXmu.so -unknown- xorg
-./usr/X11R7/lib/libXmu.so.7 -unknown- xorg
-./usr/X11R7/lib/libXmu.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXmuu.so -unknown- xorg
-./usr/X11R7/lib/libXmuu.so.2 -unknown- xorg
-./usr/X11R7/lib/libXmuu.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXcomposite.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcomposite.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcomposite.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcursor.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcursor.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcursor.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdamage.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdamage.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdamage.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmGreet.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmGreet.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmGreet.so.0.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmcp.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmcp.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmcp.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXevie.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXevie.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXevie.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXext.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXext.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXext.so.7.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfixes.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfixes.so.4 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfixes.so.4.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfont.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfont.so.3 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfont.so.3.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfontcache.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfontcache.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfontcache.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXft.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXft.so.3 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXft.so.3.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXi.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXi.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXi.so.7.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXinerama.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXinerama.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXinerama.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmu.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmu.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmu.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmuu.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmuu.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmuu.so.2.0 -unknown- xorg,compatfile
./usr/X11R7/lib/libXp.so -obsolete- obsolete
./usr/X11R7/lib/libXp.so.7 -obsolete- obsolete
./usr/X11R7/lib/libXp.so.7.0 -obsolete- obsolete
-./usr/X11R7/lib/libXpm.so -unknown- xorg
-./usr/X11R7/lib/libXpm.so.5 -unknown- xorg
-./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg
+./usr/X11R7/lib/libXpm.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXpm.so.5 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg,compatfile
./usr/X11R7/lib/libXprintAppUtil.so -obsolete- obsolete
./usr/X11R7/lib/libXprintAppUtil.so.2 -obsolete- obsolete
./usr/X11R7/lib/libXprintAppUtil.so.2.0 -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil.so -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil.so.2 -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil.so.2.0 -obsolete- obsolete
-./usr/X11R7/lib/libXrandr.so -unknown- xorg
-./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg
-./usr/X11R7/lib/libXrandr.so.3.1 -unknown- xorg
-./usr/X11R7/lib/libXrender.so -unknown- xorg
-./usr/X11R7/lib/libXrender.so.2 -unknown- xorg
-./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXrandr.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrandr.so.3.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrender.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrender.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg,compatfile
./usr/X11R7/lib/libXres.so -obsolete- obsolete
./usr/X11R7/lib/libXres.so.1 -obsolete- obsolete
./usr/X11R7/lib/libXres.so.1.0 -obsolete- obsolete
-./usr/X11R7/lib/libXss.so -unknown- xorg
-./usr/X11R7/lib/libXss.so.2 -unknown- xorg
-./usr/X11R7/lib/libXss.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXt.so -unknown- xorg
-./usr/X11R7/lib/libXt.so.7 -unknown- xorg
-./usr/X11R7/lib/libXt.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXtst.so -unknown- xorg
-./usr/X11R7/lib/libXtst.so.7 -unknown- xorg
-./usr/X11R7/lib/libXtst.so.7.0 -unknown- xorg
-./usr/X11R7/lib/libXv.so -unknown- xorg
-./usr/X11R7/lib/libXv.so.2 -unknown- xorg
-./usr/X11R7/lib/libXv.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXvMC.so -unknown- xorg
-./usr/X11R7/lib/libXvMC.so.2 -unknown- xorg
-./usr/X11R7/lib/libXvMC.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXvMCW.so -unknown- xorg
-./usr/X11R7/lib/libXvMCW.so.1 -unknown- xorg
-./usr/X11R7/lib/libXvMCW.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libXxf86dga.so -unknown- xorg
-./usr/X11R7/lib/libXxf86dga.so.2 -unknown- xorg
-./usr/X11R7/lib/libXxf86dga.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXxf86misc.so -unknown- xorg
-./usr/X11R7/lib/libXxf86misc.so.2 -unknown- xorg
-./usr/X11R7/lib/libXxf86misc.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libXxf86vm.so -unknown- xorg
-./usr/X11R7/lib/libXxf86vm.so.2 -unknown- xorg
-./usr/X11R7/lib/libXxf86vm.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libdrm.so -unknown- xorg
-./usr/X11R7/lib/libdrm.so.3 -unknown- xorg
-./usr/X11R7/lib/libdrm.so.3.2 -unknown- xorg
-./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg
-./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg
-./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libXss.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXss.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXss.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXt.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXt.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXt.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXtst.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXtst.so.7 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXtst.so.7.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXv.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXv.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXv.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMC.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMC.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMC.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMCW.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMCW.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMCW.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86dga.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86dga.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86dga.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86misc.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86misc.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86misc.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86vm.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86vm.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86vm.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm.so.3 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm.so.3.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg,compatfile
./usr/X11R7/lib/libexpat.so -obsolete- obsolete
./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
-./usr/X11R7/lib/libfontconfig.so -unknown- xorg
-./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg
-./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg
-./usr/X11R7/lib/libfontenc.so -unknown- xorg
-./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg
-./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libfreetype.so -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg
-./usr/X11R7/lib/libgbm.so -unknown- xorg
-./usr/X11R7/lib/libgbm.so.1 -unknown- xorg
-./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libglut.so -unknown- xorg
-./usr/X11R7/lib/libglut.so.4 -unknown- xorg
-./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg
+./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg,compatfile
+./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg,compatfile
+./usr/X11R7/lib/libgbm.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libglut.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libglut.so.4 -unknown- xorg,compatfile
+./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg,compatfile
./usr/X11R7/lib/liblbxutil.so -obsolete obsolete
./usr/X11R7/lib/liblbxutil.so.2 -obsolete obsolete
./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete
-./usr/X11R7/lib/libpciaccess.so -unknown- xorg
-./usr/X11R7/lib/libpciaccess.so.0 -unknown- xorg
-./usr/X11R7/lib/libpciaccess.so.0.3 -unknown- xorg
-./usr/X11R7/lib/libpixman-1.so -unknown- xorg
-./usr/X11R7/lib/libpixman-1.so.2 -unknown- xorg
-./usr/X11R7/lib/libpixman-1.so.2.2 -unknown- xorg
-./usr/X11R7/lib/libxcb-atom.so -unknown- xorg
-./usr/X11R7/lib/libxcb-atom.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-atom.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-aux.so -unknown- xorg
-./usr/X11R7/lib/libxcb-aux.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-aux.so.0.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-composite.so -unknown- xorg
-./usr/X11R7/lib/libxcb-composite.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-composite.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-damage.so -unknown- xorg
-./usr/X11R7/lib/libxcb-damage.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-damage.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-dpms.so -unknown- xorg
-./usr/X11R7/lib/libxcb-dpms.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-dpms.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg
-./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-dri2.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-dri3.so -unknown- xorg
-./usr/X11R7/lib/libxcb-dri3.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-dri3.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-event.so -unknown- xorg
-./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-glx.so -unknown- xorg
-./usr/X11R7/lib/libxcb-glx.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-glx.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-icccm.so -unknown- xorg
-./usr/X11R7/lib/libxcb-icccm.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-icccm.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-image.so -unknown- xorg
-./usr/X11R7/lib/libxcb-image.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-image.so.0.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-keysyms.so -unknown- xorg
-./usr/X11R7/lib/libxcb-keysyms.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-keysyms.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-present.so -unknown- xorg
-./usr/X11R7/lib/libxcb-present.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-present.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-property.so -unknown- xorg
-./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-randr.so -unknown- xorg
-./usr/X11R7/lib/libxcb-randr.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-randr.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-record.so -unknown- xorg
-./usr/X11R7/lib/libxcb-record.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-record.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-render-util.so -unknown- xorg
-./usr/X11R7/lib/libxcb-render-util.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-render-util.so.0.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-render.so -unknown- xorg
-./usr/X11R7/lib/libxcb-render.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-render.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-reply.so -unknown- xorg
-./usr/X11R7/lib/libxcb-reply.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-reply.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-res.so -unknown- xorg
-./usr/X11R7/lib/libxcb-res.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-res.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-screensaver.so -unknown- xorg
-./usr/X11R7/lib/libxcb-screensaver.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-screensaver.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-shape.so -unknown- xorg
-./usr/X11R7/lib/libxcb-shape.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-shape.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-shm.so -unknown- xorg
-./usr/X11R7/lib/libxcb-shm.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-shm.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-sync.so -unknown- xorg
-./usr/X11R7/lib/libxcb-sync.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-sync.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xevie.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xevie.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xevie.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xf86dri.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xf86dri.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xf86dri.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xfixes.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xfixes.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xfixes.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xinerama.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xinerama.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb.so.1.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xtest.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xv.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xv.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xv.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb-xvmc.so -unknown- xorg
-./usr/X11R7/lib/libxcb-xvmc.so.0 -unknown- xorg
-./usr/X11R7/lib/libxcb-xvmc.so.0.1 -unknown- xorg
-./usr/X11R7/lib/libxcb.so -unknown- xorg
-./usr/X11R7/lib/libxcb.so.2 -unknown- xorg
-./usr/X11R7/lib/libxcb.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libxkbfile.so -unknown- xorg
-./usr/X11R7/lib/libxkbfile.so.2 -unknown- xorg
-./usr/X11R7/lib/libxkbfile.so.2.0 -unknown- xorg
-./usr/X11R7/lib/libxkbui.so -unknown- xorg
-./usr/X11R7/lib/libxkbui.so.2 -unknown- xorg
-./usr/X11R7/lib/libxkbui.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libpciaccess.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libpciaccess.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libpciaccess.so.0.3 -unknown- xorg,compatfile
+./usr/X11R7/lib/libpixman-1.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libpixman-1.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libpixman-1.so.2.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-atom.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-atom.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-atom.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-aux.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-aux.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-aux.so.0.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-composite.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-composite.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-composite.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-damage.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-damage.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-damage.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dpms.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dpms.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dpms.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri2.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri3.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri3.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri3.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-event.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-glx.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-glx.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-glx.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-icccm.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-icccm.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-icccm.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-image.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-image.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-image.so.0.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-keysyms.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-keysyms.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-keysyms.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-present.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-present.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-present.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-property.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-randr.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-randr.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-randr.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-record.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-record.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-record.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render-util.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render-util.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render-util.so.0.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-reply.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-reply.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-reply.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-res.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-res.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-res.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-screensaver.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-screensaver.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-screensaver.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shape.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shape.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shape.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shm.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shm.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shm.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-sync.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-sync.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-sync.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xevie.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xevie.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xevie.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xf86dri.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xf86dri.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xf86dri.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xfixes.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xfixes.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xfixes.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xinerama.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xinerama.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xkb.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xkb.so.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xkb.so.1.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xtest.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xv.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xv.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xv.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xvmc.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xvmc.so.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xvmc.so.0.1 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbfile.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbfile.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbfile.so.2.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbui.so -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbui.so.2 -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbui.so.2.0 -unknown- xorg,compatfile
Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.39 src/distrib/sets/lists/xcomp/md.amd64:1.40
--- src/distrib/sets/lists/xcomp/md.amd64:1.39 Fri Aug 22 10:51:39 2014
+++ src/distrib/sets/lists/xcomp/md.amd64 Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.39 2014/08/22 10:51:39 apb Exp $
+# $NetBSD: md.amd64,v 1.40 2015/06/24 22:20:25 matt Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -71,21 +71,21 @@
./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3 -unknown- .man,x11
./usr/X11R6/man/man4/fpit.4 -unknown- .man,x11
./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete
-./usr/X11R7/lib/libI810XvMC.a -unknown- xorg
-./usr/X11R7/lib/libI810XvMC_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libI810XvMC_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libIntelXvMC.a -unknown- xorg
-./usr/X11R7/lib/libIntelXvMC_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libIntelXvMC_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libchromeXvMC.a -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro.a -unknown- xorg
-./usr/X11R7/lib/libchromeXvMCPro_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libchromeXvMCPro_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libchromeXvMC_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libchromeXvMC_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libdrm_intel.a -unknown- xorg
-./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libI810XvMC.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libI810XvMC_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libI810XvMC_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libIntelXvMC.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libchromeXvMC.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libchromeXvMC_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libdrm_intel.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
./usr/libdata/lint/llib-lI810XvMC.ln -unknown- lint,xorg
#./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.39 src/distrib/sets/lists/xcomp/shl.mi:1.40
--- src/distrib/sets/lists/xcomp/shl.mi:1.39 Mon Feb 23 11:14:58 2015
+++ src/distrib/sets/lists/xcomp/shl.mi Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.39 2015/02/23 11:14:58 martin Exp $
+# $NetBSD: shl.mi,v 1.40 2015/06/24 22:20:25 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -47,99 +47,99 @@
./usr/X11R6/lib/libpsres_pic.a -unknown- x11,picinstall
./usr/X11R6/lib/libxkbfile_pic.a -unknown- x11,picinstall
./usr/X11R6/lib/libxkbui_pic.a -unknown- x11,picinstall
-./usr/X11R7/lib/libFS_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libGLU_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libGL_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libGLw_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libICE_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libFS_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libGLU_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libGL_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libGLw_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libICE_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libOSMesa_pic.a -unknown- obsolete
-./usr/X11R7/lib/libglapi_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libSM_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libX11-xcb_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libX11_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXRes_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXTrap_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXau_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXaw7_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libglapi_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libSM_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libX11-xcb_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libX11_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXRes_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXTrap_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXau_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXaw7_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libXaw8_pic.a -obsolete- obsolete
-./usr/X11R7/lib/libXcomposite_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXcursor_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXdamage_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXdmGreet_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXdmcp_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXevie_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXext_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXfixes_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXfont_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXfontcache_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXft_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXi_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXinerama_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXmu_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXmuu_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libXcomposite_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXcursor_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXdamage_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXdmGreet_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXdmcp_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXevie_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXext_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXfixes_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXfont_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXfontcache_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXft_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXi_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXinerama_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXmu_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXmuu_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libXp_pic.a -obsolete- obsolete
-./usr/X11R7/lib/libXpm_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libXpm_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libXprintAppUtil_pic.a -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil_pic.a -obsolete- obsolete
-./usr/X11R7/lib/libXrandr_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXrender_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libXrandr_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXrender_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libXres_pic.a -obsolete- obsolete
-./usr/X11R7/lib/libXss_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXt_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXtst_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXvMCW_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXvMC_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXv_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXxf86dga_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXxf86misc_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libXxf86vm_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libdrm_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libdrm_radeon_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libXss_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXt_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXtst_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXvMCW_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXvMC_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXv_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXxf86dga_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXxf86misc_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXxf86vm_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libdrm_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libdrm_radeon_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libexpat_pic.a -obsolete- obsolete
-./usr/X11R7/lib/libfontconfig_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libfontenc_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libfreetype_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libgbm_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libglut_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libfontconfig_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libfontenc_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libfreetype_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libgbm_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libglut_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/liblbxutil_pic.a -obsolete- obsolete
./usr/X11R7/lib/liblisp_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libmp_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libpciaccess_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libpixman-1_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libpthread-stubs_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libpciaccess_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libpixman-1_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libpthread-stubs_pic.a -unknown- xorg,picinstall,compatfile
./usr/X11R7/lib/libre_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-atom_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-aux_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-composite_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-damage_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-dpms_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-dri2_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-dri3_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-event_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-glx_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-icccm_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-image_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-keysyms_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-present_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-property_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-randr_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-record_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-render-util_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-render_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-reply_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-res_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-screensaver_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-shape_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-shm_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-sync_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xevie_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xf86dri_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xfixes_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xinerama_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xkb_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xtest_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xv_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb-xvmc_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxcb_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxkbfile_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libxkbui_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/libxcb-atom_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-aux_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-composite_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-damage_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-dpms_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-dri2_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-dri3_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-event_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-glx_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-icccm_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-image_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-keysyms_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-present_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-property_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-randr_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-record_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-render-util_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-render_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-reply_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-res_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-screensaver_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-shape_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-shm_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-sync_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xevie_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xf86dri_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xfixes_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xinerama_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xkb_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xtest_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xv_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb-xvmc_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxcb_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxkbfile_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libxkbui_pic.a -unknown- xorg,picinstall,compatfile
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.164 src/distrib/sets/lists/xcomp/mi:1.165
--- src/distrib/sets/lists/xcomp/mi:1.164 Fri Mar 6 12:01:20 2015
+++ src/distrib/sets/lists/xcomp/mi Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.164 2015/03/06 12:01:20 wiz Exp $
+# $NetBSD: mi,v 1.165 2015/06/24 22:20:25 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6158,200 +6158,200 @@
./usr/X11R7/lib/X11/config/xorg.cf -unknown- xorg
./usr/X11R7/lib/X11/config/xorgsite.def -unknown- xorg
./usr/X11R7/lib/X11/config/xorgversion.def -unknown- xorg
-./usr/X11R7/lib/libFS.a -unknown- xorg
-./usr/X11R7/lib/libFS_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libGL.a -unknown- xorg
-./usr/X11R7/lib/libGLU.a -unknown- xorg
-./usr/X11R7/lib/libGLU_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libGL_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libGLw.a -unknown- xorg
-./usr/X11R7/lib/libGLw_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libICE.a -unknown- xorg
-./usr/X11R7/lib/libICE_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libOSMesa.a -unknown- obsolete
-./usr/X11R7/lib/libOSMesa_p.a -unknown- obsolete
-./usr/X11R7/lib/libglapi.a -unknown- xorg
-./usr/X11R7/lib/libglapi_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libSM.a -unknown- xorg
-./usr/X11R7/lib/libSM_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libX11-xcb.a -unknown- xorg
-./usr/X11R7/lib/libX11-xcb_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libX11.a -unknown- xorg
-./usr/X11R7/lib/libX11_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXRes.a -unknown- xorg
-./usr/X11R7/lib/libXRes_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXTrap.a -unknown- xorg
-./usr/X11R7/lib/libXTrap_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXau.a -unknown- xorg
-./usr/X11R7/lib/libXau_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXaw.a -unknown- xorg
-./usr/X11R7/lib/libXaw7.a -unknown- xorg
-./usr/X11R7/lib/libXaw7_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXaw8.a -obsolete- obsolete
-./usr/X11R7/lib/libXaw8_p.a -obsolete- obsolete
-./usr/X11R7/lib/libXaw_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXcomposite.a -unknown- xorg
-./usr/X11R7/lib/libXcomposite_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXcursor.a -unknown- xorg
-./usr/X11R7/lib/libXcursor_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXdamage.a -unknown- xorg
-./usr/X11R7/lib/libXdamage_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXdmGreet.a -unknown- xorg
-./usr/X11R7/lib/libXdmGreet_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXdmcp.a -unknown- xorg
-./usr/X11R7/lib/libXdmcp_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXevie.a -unknown- xorg
-./usr/X11R7/lib/libXevie_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXext.a -unknown- xorg
-./usr/X11R7/lib/libXext_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXfixes.a -unknown- xorg
-./usr/X11R7/lib/libXfixes_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXfont.a -unknown- xorg
-./usr/X11R7/lib/libXfont_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXfontcache.a -unknown- xorg
-./usr/X11R7/lib/libXfontcache_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXft.a -unknown- xorg
-./usr/X11R7/lib/libXft_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXi.a -unknown- xorg
-./usr/X11R7/lib/libXi_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXinerama.a -unknown- xorg
-./usr/X11R7/lib/libXinerama_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXmu.a -unknown- xorg
-./usr/X11R7/lib/libXmu_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXmuu.a -unknown- xorg
-./usr/X11R7/lib/libXmuu_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXp.a -obsolete- obsolete
-./usr/X11R7/lib/libXp_p.a -obsolete- obsolete
-./usr/X11R7/lib/libXpm.a -unknown- xorg
-./usr/X11R7/lib/libXpm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXprintAppUtil.a -obsolete- obsolete
-./usr/X11R7/lib/libXprintAppUtil_p.a -obsolete- obsolete
-./usr/X11R7/lib/libXprintUtil.a -obsolete- obsolete
-./usr/X11R7/lib/libXprintUtil_p.a -obsolete- obsolete
-./usr/X11R7/lib/libXrandr.a -unknown- xorg
-./usr/X11R7/lib/libXrandr_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXrender.a -unknown- xorg
-./usr/X11R7/lib/libXrender_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXres.a -obsolete- obsolete
-./usr/X11R7/lib/libXres_p.a -obsolete- obsolete
-./usr/X11R7/lib/libXss.a -unknown- xorg
-./usr/X11R7/lib/libXss_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXt.a -unknown- xorg
-./usr/X11R7/lib/libXt_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXtst.a -unknown- xorg
-./usr/X11R7/lib/libXtst_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXv.a -unknown- xorg
-./usr/X11R7/lib/libXvMC.a -unknown- xorg
-./usr/X11R7/lib/libXvMCW.a -unknown- xorg
-./usr/X11R7/lib/libXvMCW_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXvMC_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXv_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXxf86dga.a -unknown- xorg
-./usr/X11R7/lib/libXxf86dga_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXxf86misc.a -unknown- xorg
-./usr/X11R7/lib/libXxf86misc_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libXxf86vm.a -unknown- xorg
-./usr/X11R7/lib/libXxf86vm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libdrm.a -unknown- xorg
-./usr/X11R7/lib/libdrm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libdrm_radeon.a -unknown- xorg
-./usr/X11R7/lib/libdrm_radeon_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libexpat.a -unknown- obsolete
-./usr/X11R7/lib/libexpat_p.a -unknown- obsolete
-./usr/X11R7/lib/libfontconfig.a -unknown- xorg
-./usr/X11R7/lib/libfontconfig_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libfontenc.a -unknown- xorg
-./usr/X11R7/lib/libfontenc_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libfreetype.a -unknown- xorg
-./usr/X11R7/lib/libfreetype_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libgbm.a -unknown- xorg
-./usr/X11R7/lib/libgbm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libglut.a -unknown- xorg
-./usr/X11R7/lib/libglut_p.a -unknown- profile,xorg
-./usr/X11R7/lib/liblbxutil.a -obsolete- obsolete
-./usr/X11R7/lib/liblbxutil_p.a -obsolete- obsolete
+./usr/X11R7/lib/libFS.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libFS_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libGL.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLU_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libGL_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libGLw.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libGLw_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libICE.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libICE_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libOSMesa.a -unknown- obsolete,compatfile
+./usr/X11R7/lib/libOSMesa_p.a -unknown- obsolete,compatfile
+./usr/X11R7/lib/libglapi.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libglapi_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libSM.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libSM_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libX11-xcb.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11-xcb_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libX11.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libX11_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXRes.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXRes_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXTrap.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXTrap_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXau.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXau_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXaw.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw7.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXaw7_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXaw8.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXaw8_p.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXaw_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXcomposite.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcomposite_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXcursor.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXcursor_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXdamage.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdamage_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXdmGreet.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmGreet_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXdmcp.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXdmcp_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXevie.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXevie_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXext.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXext_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXfixes.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfixes_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXfont.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfont_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXfontcache.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXfontcache_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXft.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXft_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXi.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXi_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXinerama.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXinerama_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXmu.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmu_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXmuu.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXmuu_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXp.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXp_p.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXpm.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXpm_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXprintAppUtil.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXprintAppUtil_p.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXprintUtil.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXprintUtil_p.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXrandr.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrandr_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXrender.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXrender_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXres.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXres_p.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/libXss.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXss_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXt.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXt_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXtst.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXtst_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXv.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMC.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMCW.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXvMCW_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXvMC_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXv_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXxf86dga.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86dga_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXxf86misc.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86misc_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libXxf86vm.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libXxf86vm_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libdrm.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libdrm_radeon.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libdrm_radeon_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libexpat.a -unknown- obsolete,compatfile
+./usr/X11R7/lib/libexpat_p.a -unknown- obsolete,compatfile
+./usr/X11R7/lib/libfontconfig.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontconfig_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libfontenc.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libfontenc_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libfreetype.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libfreetype_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libgbm.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libgbm_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libglut.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libglut_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/liblbxutil.a -obsolete- obsolete,compatfile
+./usr/X11R7/lib/liblbxutil_p.a -obsolete- obsolete,compatfile
./usr/X11R7/lib/liblisp.a -unknown- xorg
./usr/X11R7/lib/liblisp_p.a -unknown- profile,xorg
./usr/X11R7/lib/libmp.a -unknown- xorg
./usr/X11R7/lib/libmp_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libpciaccess.a -unknown- xorg
-./usr/X11R7/lib/libpciaccess_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libpixman-1.a -unknown- xorg
-./usr/X11R7/lib/libpixman-1_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libpthread-stubs.a -unknown- xorg
-./usr/X11R7/lib/libpthread-stubs_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libpciaccess.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libpciaccess_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libpixman-1.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libpixman-1_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libpthread-stubs.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libpthread-stubs_p.a -unknown- profile,xorg,compatfile
./usr/X11R7/lib/libre.a -unknown- xorg
./usr/X11R7/lib/libre_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-atom.a -unknown- xorg
-./usr/X11R7/lib/libxcb-atom_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-aux.a -unknown- xorg
-./usr/X11R7/lib/libxcb-aux_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-composite.a -unknown- xorg
-./usr/X11R7/lib/libxcb-composite_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-damage.a -unknown- xorg
-./usr/X11R7/lib/libxcb-damage_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-dpms.a -unknown- xorg
-./usr/X11R7/lib/libxcb-dpms_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-dri2.a -unknown- xorg
-./usr/X11R7/lib/libxcb-dri2_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-dri3.a -unknown- xorg
-./usr/X11R7/lib/libxcb-dri3_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-event.a -unknown- xorg
-./usr/X11R7/lib/libxcb-event_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-glx.a -unknown- xorg
-./usr/X11R7/lib/libxcb-glx_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-icccm.a -unknown- xorg
-./usr/X11R7/lib/libxcb-icccm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-image.a -unknown- xorg
-./usr/X11R7/lib/libxcb-image_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-keysyms.a -unknown- xorg
-./usr/X11R7/lib/libxcb-keysyms_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-present.a -unknown- xorg
-./usr/X11R7/lib/libxcb-present_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-property.a -unknown- xorg
-./usr/X11R7/lib/libxcb-property_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-randr.a -unknown- xorg
-./usr/X11R7/lib/libxcb-randr_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-record.a -unknown- xorg
-./usr/X11R7/lib/libxcb-record_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-render-util.a -unknown- xorg
-./usr/X11R7/lib/libxcb-render-util_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-render.a -unknown- xorg
-./usr/X11R7/lib/libxcb-render_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-reply.a -unknown- xorg
-./usr/X11R7/lib/libxcb-reply_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-res.a -unknown- xorg
-./usr/X11R7/lib/libxcb-res_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-screensaver.a -unknown- xorg
-./usr/X11R7/lib/libxcb-screensaver_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-shape.a -unknown- xorg
-./usr/X11R7/lib/libxcb-shape_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-shm.a -unknown- xorg
-./usr/X11R7/lib/libxcb-shm_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-sync.a -unknown- xorg
-./usr/X11R7/lib/libxcb-sync_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xevie.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xevie_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xf86dri.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xf86dri_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xfixes.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xfixes_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xinerama.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xinerama_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xkb.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xkb_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xtest.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xtest_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xv.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xv_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb-xvmc.a -unknown- xorg
-./usr/X11R7/lib/libxcb-xvmc_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxcb.a -unknown- xorg
-./usr/X11R7/lib/libxcb_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxkbfile.a -unknown- xorg
-./usr/X11R7/lib/libxkbfile_p.a -unknown- profile,xorg
-./usr/X11R7/lib/libxkbui.a -unknown- xorg
-./usr/X11R7/lib/libxkbui_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-atom.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-atom_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-aux.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-aux_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-composite.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-composite_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-damage.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-damage_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-dpms.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dpms_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-dri2.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri2_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-dri3.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-dri3_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-event.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-event_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-glx.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-glx_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-icccm.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-icccm_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-image.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-image_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-keysyms.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-keysyms_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-present.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-present_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-property.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-property_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-randr.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-randr_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-record.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-record_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-render-util.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render-util_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-render.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-render_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-reply.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-reply_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-res.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-res_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-screensaver.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-screensaver_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-shape.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shape_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-shm.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-shm_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-sync.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-sync_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xevie.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xevie_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xf86dri.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xf86dri_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xfixes.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xfixes_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xinerama.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xinerama_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xkb.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xkb_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xtest.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xtest_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xv.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xv_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb-xvmc.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb-xvmc_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxcb.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxcb_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxkbfile.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbfile_p.a -unknown- profile,xorg,compatfile
+./usr/X11R7/lib/libxkbui.a -unknown- xorg,compatfile
+./usr/X11R7/lib/libxkbui_p.a -unknown- profile,xorg,compatfile
./usr/X11R7/lib/pkgconfig/bigreqsproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/compositeproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/damageproto.pc -unknown- xorg
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.14 src/distrib/sets/lists/xdebug/md.amd64:1.15
--- src/distrib/sets/lists/xdebug/md.amd64:1.14 Fri May 29 05:52:48 2015
+++ src/distrib/sets/lists/xdebug/md.amd64 Wed Jun 24 22:20:25 2015
@@ -1,9 +1,9 @@
-# $NetBSD: md.amd64,v 1.14 2015/05/29 05:52:48 htodd Exp $
-./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
+# $NetBSD: md.amd64,v 1.15 2015/06/24 22:20:25 matt Exp $
+./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg,compatfile
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- xorg,debuglib
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- xorg,debuglib
@@ -41,11 +41,11 @@
./usr/libdata/debug/usr/X11R7/bin/pcitweak.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/bin/scanpci.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/bin/xorgconfig.debug -unknown- obsolete
-./usr/libdata/debug/usr/X11R7/lib/libI810XvMC.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libI810XvMC.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug,compatfile
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.22 src/distrib/sets/lists/xdebug/shl.mi:1.23
--- src/distrib/sets/lists/xdebug/shl.mi:1.22 Wed May 6 05:12:10 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.22 2015/05/06 05:12:10 martin Exp $
+# $NetBSD: shl.mi,v 1.23 2015/06/24 22:20:25 matt Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -58,93 +58,93 @@
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libFS.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libGL.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libGLU.so.2.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libGLw.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libICE.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug -unknown- obsolete
-./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXaw6.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXaw7.so.10.0.debug -unknown xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXcomposite.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXcursor.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXdamage.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXdmGreet.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXdmcp.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXpm.so.5.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXrender.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXss.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXt.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
-./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-glx.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-icccm.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-image.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-keysyms.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-present.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-render.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-res.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-screensaver.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-shape.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-shm.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-sync.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xevie.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xf86dri.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xfixes.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xinerama.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.1.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xtest.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libFS.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libGL.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libGLU.so.2.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libGLw.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libICE.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug -unknown- obsolete,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXaw6.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXaw7.so.10.0.debug -unknown xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXcomposite.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXcursor.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXdamage.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXdmGreet.so.0.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXdmcp.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXpm.so.5.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXrender.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXss.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXt.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-glx.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-icccm.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-image.so.0.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-keysyms.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-present.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-render.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-res.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-screensaver.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-shape.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-shm.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-sync.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xevie.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xf86dri.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xfixes.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xinerama.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.1.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xtest.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug,compatfile
+./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug,compatfile
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=i386
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.25 src/etc/mtree/Makefile:1.26
--- src/etc/mtree/Makefile:1.25 Fri Jun 19 18:16:06 2015
+++ src/etc/mtree/Makefile Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/06/19 18:16:06 matt Exp $
+# $NetBSD: Makefile,v 1.26 2015/06/24 22:20:25 matt Exp $
.include <bsd.own.mk>
@@ -20,6 +20,9 @@ EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dis
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.earm
.endif
EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated
+.if ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
+EXTRA_DIST_FILES+= NetBSD.dist.xcompat # autogenerated
+.endif
.endif
.if ${MKATF} != "no"
@@ -49,6 +52,13 @@ NetBSD.dist.compat: ${.CURDIR}/NetBSD.di
${.CURDIR}/NetBSD.dist.compat.in \
> ${.TARGET}
+NetBSD.dist.xcompat: ${.CURDIR}/NetBSD.dist.xcompat.in ${.CURDIR}/mkcompat.awk
+ ${MKCREATE}
+ ${TOOL_AWK} -f ${.CURDIR}/mkcompat.awk \
+ -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \
+ ${.CURDIR}/NetBSD.dist.xcompat.in \
+ > ${.TARGET}
+
NetBSD.dist.tests.compat: ${.CURDIR}/NetBSD.dist.tests \
${.CURDIR}/mkcompattree.awk
${MKCREATE}
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.33 src/external/mit/xorg/lib/Makefile:1.34
--- src/external/mit/xorg/lib/Makefile:1.33 Mon Feb 23 00:09:30 2015
+++ src/external/mit/xorg/lib/Makefile Wed Jun 24 22:20:25 2015
@@ -1,15 +1,24 @@
-# $NetBSD: Makefile,v 1.33 2015/02/23 00:09:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.34 2015/06/24 22:20:25 matt Exp $
# build libraries for xorg
+.include <bsd.own.mk>
+
SUBDIR= libfontenc freetype libFS libICE libglapi \
libXau libXdmcp libdrm libpciaccess libpthread-stubs .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
.endif
-SUBDIR+=libdrm_radeon pixman xkeyboard-config libxcb \
+SUBDIR+=libdrm_radeon pixman
+.if !defined(MLIBDIR)
+SUBDIR+=xkeyboard-config
+.endif
+SUBDIR+=libxcb \
.WAIT
-SUBDIR+=dri7 dri gallium fontconfig libSM libX11 \
+.if !defined(MLIBDIR)
+SUBDIR+=dri7 dri gallium
+.endif
+SUBDIR+=fontconfig libSM libX11 \
.WAIT \
libXcomposite libXdamage libXext libXfixes libXt \
libxkbfile \
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.6 src/external/mit/xorg/lib/libpciaccess/Makefile:1.7
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.6 Fri Jan 14 16:04:49 2011
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/01/14 16:04:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/24 22:20:25 matt Exp $
.include <bsd.own.mk>
@@ -6,6 +6,8 @@ LIB= pciaccess
.PATH: ${X11SRCDIR.${LIB}}/src
.PATH: ${X11SRCDIR.${LIB}}/include
+XORG_MACHINE_ARCH?=${MACHINE_ARCH}
+
SRCS= common_bridge.c \
common_io.c \
common_iterator.c \
@@ -31,16 +33,16 @@ PKGDIST= ${LIB}
LDADD+= -lpci -lz
DPADD+= ${LIBPCI} ${LIBZ}
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${XORG_MACHINE_ARCH} == "i386" || ${XORG_MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DHAVE_MTRR
.endif
-.if ${MACHINE_ARCH} == "i386"
+.if ${XORG_MACHINE_ARCH} == "i386"
LDADD+= -li386
DPADD+= ${LIBI386}
.endif
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${XORG_MACHINE_ARCH} == "x86_64"
LDADD+= -lx86_64
DPADD+= ${LIBX86_64}
.endif
Index: src/external/mit/xorg/tools/Makefile
diff -u src/external/mit/xorg/tools/Makefile:1.5 src/external/mit/xorg/tools/Makefile:1.6
--- src/external/mit/xorg/tools/Makefile:1.5 Wed Jan 7 20:42:01 2015
+++ src/external/mit/xorg/tools/Makefile Wed Jun 24 22:20:25 2015
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2015/01/07 20:42:01 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/24 22:20:25 matt Exp $
.include <bsd.own.mk>
# These are used by the 'includes' phase,
# and can't assume that ${DESTDIR}${X11INCDIR} has been populated.
-SUBDIR+= makestrs .WAIT
+#SUBDIR+= makestrs .WAIT
# The rest of the tools can rely upon 'includes'
# XXX pswrap/gen_matypes -- missing
+# makekeys is now done src/tools
SUBDIR+=bdftopcf fc-cache ucs2any
-SUBDIR+=makekeys mkfontscale .WAIT xkbcomp
+SUBDIR+=mkfontscale .WAIT xkbcomp
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.1.1.1 src/external/mit/xorg/tools/makekeys/Makefile:1.2
--- src/external/mit/xorg/tools/makekeys/Makefile:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/tools/makekeys/Makefile Wed Jun 24 22:20:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/06/24 22:20:25 matt Exp $
NOMAN= 1
@@ -6,8 +6,9 @@ NOMAN= 1
.PATH: ${X11SRCDIR.X11}/src/util
-HOSTPROG= makekeys
-HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+PROG?= makekeys
+SRCS= makekeys.c
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
.include <bsd.x11.mk>
-.include <bsd.hostprog.mk>
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/tools/makekeys/Makefile.makekeys
diff -u src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.2 src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.3
--- src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.2 Mon Nov 22 00:52:33 2010
+++ src/external/mit/xorg/tools/makekeys/Makefile.makekeys Wed Jun 24 22:20:25 2015
@@ -1,17 +1,11 @@
-# $NetBSD: Makefile.makekeys,v 1.2 2010/11/22 00:52:33 mrg Exp $
-
-MAKEKEYSDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys && ${PRINTOBJDIR}
-MAKEKEYS= ${MAKEKEYSDIR}/makekeys
-
-${MAKEKEYS}:
- (cd ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys && ${MAKE})
+# $NetBSD: Makefile.makekeys,v 1.3 2015/06/24 22:20:25 matt Exp $
DPSRCS+= ks_tables.h
CLEANFILES+= ks_tables.h
KSDEF= ${DESTDIR}${X11INCDIR}/X11/keysymdef.h
-ks_tables.h: ${MAKEKEYS} ${KSDEF}
+ks_tables.h: ${KSDEF}
${_MKTARGET_CREATE}
rm -f ${.TARGET}
- ${MAKEKEYS} ${KSDEF} > ${.TARGET}
+ ${TOOL_MAKEKEYS} ${KSDEF} > ${.TARGET}
Index: src/external/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.3 src/external/mit/xorg/tools/makestrs/Makefile:1.4
--- src/external/mit/xorg/tools/makestrs/Makefile:1.3 Thu Jan 8 03:47:32 2015
+++ src/external/mit/xorg/tools/makestrs/Makefile Wed Jun 24 22:20:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/01/08 03:47:32 christos Exp $
+# $NetBSD: Makefile,v 1.4 2015/06/24 22:20:26 matt Exp $
NOMAN= 1
@@ -6,7 +6,9 @@ NOMAN= 1
.PATH: ${X11SRCDIR.Xt}/util
-HOSTPROG= makestrs
-HOST_CPPFLAGS+= -I.
+PROG= makestrs
+SRCS= makestrs.c
-.include <bsd.hostprog.mk>
+CPPFLAGS+= -I.
+
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/tools/makestrs/Makefile.makestrs
diff -u src/external/mit/xorg/tools/makestrs/Makefile.makestrs:1.1.1.1 src/external/mit/xorg/tools/makestrs/Makefile.makestrs:1.2
--- src/external/mit/xorg/tools/makestrs/Makefile.makestrs:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/tools/makestrs/Makefile.makestrs Wed Jun 24 22:20:26 2015
@@ -1,7 +1,3 @@
-# $NetBSD: Makefile.makestrs,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile.makestrs,v 1.2 2015/06/24 22:20:26 matt Exp $
-MAKESTRSDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/tools/makestrs && ${PRINTOBJDIR}
-MAKESTRS= ${MAKESTRSDIR}/makestrs
-
-${MAKESTRS}:
- (cd ${NETBSDSRCDIR}/external/mit/xorg/tools/makestrs && ${MAKE})
+MAKESTRS= ${TOOL_MAKESTRS}
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.857 src/share/mk/bsd.own.mk:1.858
--- src/share/mk/bsd.own.mk:1.857 Tue Jun 23 01:38:17 2015
+++ src/share/mk/bsd.own.mk Wed Jun 24 22:20:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.857 2015/06/23 01:38:17 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.858 2015/06/24 22:20:26 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -343,6 +343,8 @@ TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}
TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
TOOL_MAKEINFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
+TOOL_MAKEKEYS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makekeys
+TOOL_MAKESTRS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makestrs
TOOL_MAKEWHATIS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
TOOL_MANDOC_ASCII= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii
TOOL_MANDOC_HTML= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml
@@ -449,6 +451,8 @@ TOOL_M4= m4
TOOL_MACPPCFIXCOFF= macppc-fixcoff
TOOL_MAKEFS= makefs
TOOL_MAKEINFO= makeinfo
+TOOL_MAKEKEYS= makekeys
+TOOL_MAKESTRS= makestrs
TOOL_MAKEWHATIS= /usr/libexec/makewhatis
TOOL_MANDOC_ASCII= mandoc -Tascii
TOOL_MANDOC_HTML= mandoc -Thtml
@@ -1248,7 +1252,7 @@ X11INCDIR?= ${X11ROOTDIR}/include
X11LIBDIR?= ${X11ROOTDIR}/lib/X11
X11MANDIR?= ${X11ROOTDIR}/man
X11SHAREDIR?= ${X11ROOTDIR}/share
-X11USRLIBDIR?= ${X11ROOTDIR}/lib
+X11USRLIBDIR?= ${X11ROOTDIR}/lib${MLIBDIR:D/${MLIBDIR}}
#
# New modular-xorg based builds
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.115 src/share/mk/bsd.x11.mk:1.116
--- src/share/mk/bsd.x11.mk:1.115 Mon Feb 23 00:09:30 2015
+++ src/share/mk/bsd.x11.mk Wed Jun 24 22:20:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.115 2015/02/23 00:09:30 jmcneill Exp $
+# $NetBSD: bsd.x11.mk,v 1.116 2015/06/24 22:20:26 matt Exp $
.include <bsd.init.mk>
@@ -217,7 +217,7 @@ CLEANFILES+= ${CPPSCRIPTS}
.if defined(PKGDIST) && !defined(PKGCONFIG)
PKGCONFIG= ${PKGDIST:tl}
.endif
-.if defined(PKGCONFIG)
+.if defined(PKGCONFIG) && !defined(MLIBDIR)
.include <bsd.files.mk>
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.180 src/tools/Makefile:1.181
--- src/tools/Makefile:1.180 Wed Jan 7 20:42:02 2015
+++ src/tools/Makefile Wed Jun 24 22:20:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2015/01/07 20:42:02 joerg Exp $
+# $NetBSD: Makefile,v 1.181 2015/06/24 22:20:26 matt Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -212,7 +212,8 @@ SUBDIR+= mkubootimage
.endif
.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
-SUBDIR+= ../external/mit/xorg/tools/makestrs
+SUBDIR+= makestrs
+SUBDIR+= makekeys
.endif
.endif # TOOLCHAIN_BUILDRUMP
Added files:
Index: src/etc/mtree/NetBSD.dist.xcompat.in
diff -u /dev/null src/etc/mtree/NetBSD.dist.xcompat.in:1.1
--- /dev/null Wed Jun 24 22:20:26 2015
+++ src/etc/mtree/NetBSD.dist.xcompat.in Wed Jun 24 22:20:25 2015
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.xcompat.in,v 1.1 2015/06/24 22:20:25 matt Exp $
+./usr/X11R7/lib/@ARCH_SUBDIR@
+./usr/libdata/debug/usr/X11R7/lib/@ARCH_SUBDIR@
Index: src/tools/makekeys/Makefile
diff -u /dev/null src/tools/makekeys/Makefile:1.1
--- /dev/null Wed Jun 24 22:20:26 2015
+++ src/tools/makekeys/Makefile Wed Jun 24 22:20:26 2015
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2015/06/24 22:20:26 matt Exp $
+
+#NOMAN=
+
+#.include <bsd.own.mk>
+
+HOSTPROG= ${_TOOL_PREFIX}makekeys
+HOST_SRCDIR= external/mit/xorg/tools/makekeys
+
+#.PATH: ${X11SRCDIR.X11}/src/util
+
+#HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+
+#SRCS= makekeys.c
+
+.include "${.CURDIR}/../Makefile.host"
+#.include <bsd.hostprog.mk>
Index: src/tools/makestrs/Makefile
diff -u /dev/null src/tools/makestrs/Makefile:1.1
--- /dev/null Wed Jun 24 22:20:26 2015
+++ src/tools/makestrs/Makefile Wed Jun 24 22:20:26 2015
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2015/06/24 22:20:26 matt Exp $
+
+HOSTPROG= ${_TOOL_PREFIX}makestrs
+HOST_SRCDIR= external/mit/xorg/tools/makestrs
+
+.include "${.CURDIR}/../Makefile.host"
