Module Name: src
Committed By: matt
Date: Sat Jun 27 16:21:08 UTC 2015
Modified Files:
src: Makefile
src/compat: compatsubdir.mk
src/distrib/sets: sets.subr
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 mi shl.mi
src/share/mk: bsd.README bsd.own.mk
Log Message:
Add MKCOMPATX11 knob for making X11 compat libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/Makefile
cvs rdiff -u -r1.11 -r1.12 src/compat/compatsubdir.mk
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/sets.subr
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xbase/md.amd64
cvs rdiff -u -r1.125 -r1.126 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xcomp/md.amd64 \
src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.166 -r1.167 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xdebug/md.amd64 \
src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.344 -r1.345 src/share/mk/bsd.README
cvs rdiff -u -r1.858 -r1.859 src/share/mk/bsd.own.mk
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.314 src/Makefile:1.315
--- src/Makefile:1.314 Wed Jun 24 22:20:24 2015
+++ src/Makefile Sat Jun 27 16:21:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.314 2015/06/24 22:20:24 matt Exp $
+# $NetBSD: Makefile,v 1.315 2015/06/27 16:21:07 matt Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -485,7 +485,7 @@ do-x11: .PHONY .MAKE
.if ${X11FLAVOUR} == "Xorg"
${MAKEDIRTARGET} external/mit/xorg/tools all
${MAKEDIRTARGET} external/mit/xorg/lib build_install
-.if ${MKCOMPAT} != "no"
+.if ${MKCOMPATX11} != "no"
${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
.endif
.else
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.11 src/compat/compatsubdir.mk:1.12
--- src/compat/compatsubdir.mk:1.11 Wed Jun 24 22:20:24 2015
+++ src/compat/compatsubdir.mk Sat Jun 27 16:21:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.11 2015/06/24 22:20:24 matt Exp $
+# $NetBSD: compatsubdir.mk,v 1.12 2015/06/27 16:21:07 matt Exp $
# Build netbsd libraries.
@@ -30,7 +30,7 @@ SUBDIR+= ../../../tests
SUBDIR+= ../../../tests/share # because MKSHARE=no above
SUBDIR+= ../../../external/bsd/atf/tests
.endif
-.if ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj)
+.if ${MKCOMPATX11} != no && ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj)
SUBDIR+= ../../../external/mit/xorg/lib
.endif # } MKX11
.endif # } BOOTSTRAP_SUBDIRS
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.169 src/distrib/sets/sets.subr:1.170
--- src/distrib/sets/sets.subr:1.169 Sat Jun 27 15:41:26 2015
+++ src/distrib/sets/sets.subr Sat Jun 27 16:21:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.169 2015/06/27 15:41:26 matt Exp $
+# $NetBSD: sets.subr,v 1.170 2015/06/27 16:21:07 matt Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.169 2015/06/27 15:41:26 matt Exp $
+# # $NetBSD: sets.subr,v 1.170 2015/06/27 16:21:07 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -303,6 +303,8 @@ list_set_files()
ignoredkeywords["compatfile"] = 1
ignoredkeywords["compattestdir"] = 1
ignoredkeywords["compattestfile"] = 1
+ ignoredkeywords["compatx11dir"] = 1
+ ignoredkeywords["compatx11file"] = 1
for (vi in needvars) {
nv = needvars[vi]
kw = tolower(nv)
@@ -325,6 +327,11 @@ list_set_files()
compatdirkeywords["compattestdir"] = 1
compatfilekeywords["compattestfile"] = 1
}
+ if (wanted["compatx11"]) {
+ doingcompatx11 = 1;
+ compatdirkeywords["compatx11dir"] = 1
+ compatfilekeywords["compatx11file"] = 1
+ }
}
if (("kmod" in wanted) && ("compatmodules" in wanted)) {
Index: src/distrib/sets/lists/xbase/md.amd64
diff -u src/distrib/sets/lists/xbase/md.amd64:1.12 src/distrib/sets/lists/xbase/md.amd64:1.13
--- src/distrib/sets/lists/xbase/md.amd64:1.12 Wed Jun 24 22:20:25 2015
+++ src/distrib/sets/lists/xbase/md.amd64 Sat Jun 27 16:21:07 2015
@@ -1,17 +1,17 @@
-# $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
+# $NetBSD: md.amd64,v 1.13 2015/06/27 16:21:07 matt Exp $
+./usr/X11R7/lib/libI810XvMC.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libIntelXvMC.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libIntelXvMC.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMC.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMC.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg,compatx11file
./usr/X11R7/share/pciids/pci.ids -unknown- obsolete
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.125 src/distrib/sets/lists/xbase/mi:1.126
--- src/distrib/sets/lists/xbase/mi:1.125 Wed Jun 24 22:20:25 2015
+++ src/distrib/sets/lists/xbase/mi Sat Jun 27 16:21:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.125 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: mi,v 1.126 2015/06/27 16:21:07 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,compatdir
+./usr/X11R7/lib base-x11-root xorg,compatx11dir
./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,compatdir
+./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,compatx11dir
./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.62 src/distrib/sets/lists/xbase/shl.mi:1.63
--- src/distrib/sets/lists/xbase/shl.mi:1.62 Wed Jun 24 22:20:25 2015
+++ src/distrib/sets/lists/xbase/shl.mi Sat Jun 27 16:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.62 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: shl.mi,v 1.63 2015/06/27 16:21:08 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,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/libFS.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libFS.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libFS.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGL.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGL.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGL.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLU.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLU.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLU.so.2.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLw.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLw.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLw.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libICE.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libICE.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libICE.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglapi.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglapi.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglapi.so.0.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libOSMesa.so -unknown- obsolete
./usr/X11R7/lib/libOSMesa.so.7 -unknown- obsolete
./usr/X11R7/lib/libOSMesa.so.7.0 -unknown- obsolete
-./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/libSM.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libSM.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libSM.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11-xcb.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11-xcb.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11-xcb.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXRes.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXRes.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXRes.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXTrap.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXTrap.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXTrap.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXau.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXau.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXau.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw6.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw6.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw7.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw7.so.10 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw7.so.10.0 -unknown xorg,compatx11file
./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,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/libXcomposite.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcomposite.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcomposite.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcursor.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcursor.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcursor.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdamage.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdamage.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdamage.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmGreet.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmGreet.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmGreet.so.0.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmcp.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmcp.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmcp.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXevie.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXevie.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXevie.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXext.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXext.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXext.so.7.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfixes.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfixes.so.4 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfixes.so.4.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont.so.3 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont.so.3.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfontcache.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfontcache.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfontcache.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXft.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXft.so.3 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXft.so.3.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXi.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXi.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXi.so.7.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXinerama.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXinerama.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXinerama.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmu.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmu.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmu.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmuu.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmuu.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmuu.so.2.0 -unknown- xorg,compatx11file
./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,compatfile
-./usr/X11R7/lib/libXpm.so.5 -unknown- xorg,compatfile
-./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg,compatfile
+./usr/X11R7/lib/libXpm.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXpm.so.5 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/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,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/libXrandr.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrandr.so.3.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrender.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrender.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg,compatx11file
./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,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/libXss.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXss.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXss.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXt.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXt.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXt.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXtst.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXtst.so.7 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXtst.so.7.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXv.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXv.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXv.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMC.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMC.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMC.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMCW.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMCW.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMCW.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86dga.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86dga.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86dga.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86misc.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86misc.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86misc.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86vm.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86vm.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86vm.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm.so.3 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm.so.3.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg,compatx11file
./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,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/libfontconfig.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglut.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglut.so.4 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/liblbxutil.so -obsolete obsolete
./usr/X11R7/lib/liblbxutil.so.2 -obsolete obsolete
./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete
-./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
+./usr/X11R7/lib/libpciaccess.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpciaccess.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpciaccess.so.0.3 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.so.2.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-atom.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-atom.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-atom.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-aux.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-aux.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-aux.so.0.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-composite.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-composite.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-composite.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-damage.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-damage.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-damage.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dpms.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dpms.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dpms.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri2.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri3.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri3.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri3.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-event.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-glx.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-glx.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-glx.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-icccm.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-icccm.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-icccm.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-image.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-image.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-image.so.0.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-keysyms.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-keysyms.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-keysyms.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-present.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-present.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-present.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-property.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-randr.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-randr.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-randr.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-record.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-record.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-record.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.so.0.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-res.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-res.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-res.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-screensaver.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-screensaver.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-screensaver.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shape.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shape.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shape.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shm.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shm.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shm.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-sync.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-sync.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-sync.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xevie.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xevie.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xevie.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xfixes.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xfixes.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xfixes.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xinerama.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xinerama.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xkb.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xkb.so.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xkb.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xtest.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xv.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xv.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xv.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xvmc.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xvmc.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xvmc.so.0.1 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbfile.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbfile.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbfile.so.2.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbui.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbui.so.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbui.so.2.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.40 src/distrib/sets/lists/xcomp/md.amd64:1.41
--- src/distrib/sets/lists/xcomp/md.amd64:1.40 Wed Jun 24 22:20:25 2015
+++ src/distrib/sets/lists/xcomp/md.amd64 Sat Jun 27 16:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.40 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: md.amd64,v 1.41 2015/06/27 16:21:08 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,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/libI810XvMC.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libI810XvMC_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libI810XvMC_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libIntelXvMC.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libIntelXvMC_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libIntelXvMC_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libchromeXvMC.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libchromeXvMC_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMC_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libdrm_intel.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall,compatx11file
./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.40 src/distrib/sets/lists/xcomp/shl.mi:1.41
--- src/distrib/sets/lists/xcomp/shl.mi:1.40 Wed Jun 24 22:20:25 2015
+++ src/distrib/sets/lists/xcomp/shl.mi Sat Jun 27 16:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.40 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: shl.mi,v 1.41 2015/06/27 16:21:08 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,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/libFS_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libGLU_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libGL_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libGLw_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libICE_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libOSMesa_pic.a -unknown- obsolete
-./usr/X11R7/lib/libglapi_pic.a -unknown- xorg,picinstall,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/libglapi_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libSM_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libX11-xcb_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libX11_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXRes_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXTrap_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXau_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXaw7_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXaw8_pic.a -obsolete- obsolete
-./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/libXcomposite_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXcursor_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXdamage_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXdmGreet_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXdmcp_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXevie_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXext_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXfixes_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXfont_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXfontcache_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXft_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXi_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXinerama_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXmu_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXmuu_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXp_pic.a -obsolete- obsolete
-./usr/X11R7/lib/libXpm_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXpm_pic.a -unknown- xorg,picinstall,compatx11file
./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,compatfile
-./usr/X11R7/lib/libXrender_pic.a -unknown- xorg,picinstall,compatfile
+./usr/X11R7/lib/libXrandr_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXrender_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libXres_pic.a -obsolete- obsolete
-./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/libXss_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXt_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXtst_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXvMCW_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXvMC_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXv_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXxf86dga_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXxf86misc_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXxf86vm_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libdrm_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libdrm_radeon_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libexpat_pic.a -obsolete- obsolete
-./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/libfontconfig_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libfontenc_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libfreetype_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libgbm_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libglut_pic.a -unknown- xorg,picinstall,compatx11file
./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,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/libpciaccess_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libpixman-1_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libpthread-stubs_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libre_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
+./usr/X11R7/lib/libxcb-atom_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-aux_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-composite_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-damage_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-dpms_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-dri2_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-dri3_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-event_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-glx_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-icccm_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-image_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-keysyms_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-present_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-property_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-randr_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-record_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-render-util_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-render_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-reply_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-res_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-screensaver_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-shape_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-shm_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-sync_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xevie_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xfixes_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xinerama_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xkb_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xtest_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xv_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb-xvmc_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxcb_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxkbfile_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxkbui_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.166 src/distrib/sets/lists/xcomp/mi:1.167
--- src/distrib/sets/lists/xcomp/mi:1.166 Thu Jun 25 05:30:48 2015
+++ src/distrib/sets/lists/xcomp/mi Sat Jun 27 16:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.166 2015/06/25 05:30:48 matt Exp $
+# $NetBSD: mi,v 1.167 2015/06/27 16:21:08 matt Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6050,7 +6050,7 @@
./usr/X11R7/include/xorg/xsha1.h -unknown- xorg
./usr/X11R7/include/xorg/xvdix.h -unknown- xorg
./usr/X11R7/include/xorg/xvmcext.h -unknown- xorg
-./usr/X11R7/lib -unknown- xorg,compatdir
+./usr/X11R7/lib -unknown- xorg,compatx11dir
./usr/X11R7/lib/X11/config/Amoeba.cf -unknown- xorg
./usr/X11R7/lib/X11/config/DGUX.cf -unknown- xorg
./usr/X11R7/lib/X11/config/FreeBSD.cf -unknown- xorg
@@ -6159,200 +6159,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,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/libFS.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libFS_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libGL.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLU.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLU_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libGL_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libGLw.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libGLw_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libICE.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libICE_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libOSMesa.a -unknown- obsolete,compatx11file
+./usr/X11R7/lib/libOSMesa_p.a -unknown- obsolete,compatx11file
+./usr/X11R7/lib/libglapi.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglapi_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libSM.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libSM_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libX11-xcb.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11-xcb_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libX11.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libX11_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXRes.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXRes_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXTrap.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXTrap_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXau.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXau_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXaw.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw7.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXaw7_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXaw8.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXaw8_p.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXaw_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXcomposite.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcomposite_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXcursor.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXcursor_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXdamage.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdamage_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXdmGreet.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmGreet_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXdmcp.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXdmcp_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXevie.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXevie_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXext.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXext_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXfixes.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfixes_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXfont.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfont_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXfontcache.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXfontcache_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXft.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXft_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXi.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXi_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXinerama.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXinerama_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXmu.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmu_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXmuu.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXmuu_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXp.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXp_p.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXpm.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXpm_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXprintAppUtil.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXprintAppUtil_p.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXprintUtil.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXprintUtil_p.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXrandr.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrandr_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXrender.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXrender_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXres.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXres_p.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/libXss.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXss_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXt.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXt_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXtst.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXtst_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXv.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMC.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMCW.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXvMCW_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXvMC_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXv_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXxf86dga.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86dga_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXxf86misc.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86misc_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libXxf86vm.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libXxf86vm_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_radeon.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_radeon_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libexpat.a -unknown- obsolete,compatx11file
+./usr/X11R7/lib/libexpat_p.a -unknown- obsolete,compatx11file
+./usr/X11R7/lib/libfontconfig.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontconfig_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libfontenc.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontenc_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libfreetype.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libgbm.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libgbm_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libglut.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libglut_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/liblbxutil.a -obsolete- obsolete,compatx11file
+./usr/X11R7/lib/liblbxutil_p.a -obsolete- obsolete,compatx11file
./usr/X11R7/lib/liblisp.a -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,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/libpciaccess.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpciaccess_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libpixman-1.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpixman-1_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libpthread-stubs.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libpthread-stubs_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libre.a -unknown- xorg
./usr/X11R7/lib/libre_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/libxcb-atom.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-atom_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-aux.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-aux_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-composite.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-composite_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-damage.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-damage_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-dpms.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dpms_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri2.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri2_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri3.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri3_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-event.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-event_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-glx.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-glx_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-icccm.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-icccm_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-image.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-image_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-keysyms.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-keysyms_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-present.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-present_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-property.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-property_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-randr.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-randr_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-record.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-record_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-render.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-render_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-res.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-res_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-screensaver.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-screensaver_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-shape.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shape_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-shm.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-shm_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-sync.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-sync_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xevie.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xevie_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xfixes.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xfixes_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xinerama.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xinerama_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xkb.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xkb_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xtest.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xtest_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xv.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xv_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xvmc.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb-xvmc_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxcb.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxcb_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxkbfile.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbfile_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libxkbui.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libxkbui_p.a -unknown- profile,xorg,compatx11file
./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.15 src/distrib/sets/lists/xdebug/md.amd64:1.16
--- src/distrib/sets/lists/xdebug/md.amd64:1.15 Wed Jun 24 22:20:25 2015
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Jun 27 16:21:08 2015
@@ -1,9 +1,9 @@
-# $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
+# $NetBSD: md.amd64,v 1.16 2015/06/27 16:21:08 matt Exp $
+./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libchromeXvMC_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg,compatx11file
./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,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/libI810XvMC.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug,compatx11file
./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/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.15 src/distrib/sets/lists/xdebug/mi:1.16
--- src/distrib/sets/lists/xdebug/mi:1.15 Sat Jun 27 15:42:08 2015
+++ src/distrib/sets/lists/xdebug/mi Sat Jun 27 16:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.15 2015/06/27 15:42:08 matt Exp $
+# $NetBSD: mi,v 1.16 2015/06/27 16:21:08 matt Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R6/lib/libFS_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libGLU_g.a -unknown- debuglib,x11
@@ -47,104 +47,104 @@
./usr/X11R6/lib/libpsres_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libxkbfile_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libxkbui_g.a -unknown- debuglib,x11
-./usr/X11R7/lib -unknown- debuglib,xorg,compatdir
-./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libGLU_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libGL_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libGLw_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libICE_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib -unknown- debuglib,xorg,compatx11dir
+./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libGLU_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libGL_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libGLw_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libICE_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libOSMesa_g.a -unknown- obsolete
-./usr/X11R7/lib/libglapi_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libSM_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libX11-xcb_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libX11_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXRes_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXTrap_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXau_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXaw6_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXaw7_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libglapi_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libSM_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libX11-xcb_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libX11_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXRes_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXTrap_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXau_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXaw6_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXaw7_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXaw8_g.a -obsolete- obsolete
-./usr/X11R7/lib/libXcomposite_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXcursor_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXdamage_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXdmGreet_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXdmcp_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXevie_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXext_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXfixes_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXfont_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXfontcache_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXft_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXi_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXinerama_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXmu_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXmuu_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libXcomposite_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXcursor_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXdamage_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXdmGreet_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXdmcp_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXevie_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXext_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXfixes_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXfont_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXfontcache_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXft_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXi_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXinerama_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXmu_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXmuu_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXp_g.a -obsolete- obsolete
-./usr/X11R7/lib/libXpm_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libXpm_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXprintAppUtil_g.a -obsolete- obsolete
./usr/X11R7/lib/libXprintUtil_g.a -obsolete- obsolete
-./usr/X11R7/lib/libXrandr_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXrender_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libXrandr_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXrender_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libXres_g.a -obsolete- obsolete
-./usr/X11R7/lib/libXss_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXt_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXtst_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXvMCW_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXvMC_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXv_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXxf86dga_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXxf86misc_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libXxf86vm_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libdrm_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libdrm_radeon_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libXss_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXt_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXtst_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXvMCW_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXvMC_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXv_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXxf86dga_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXxf86misc_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libXxf86vm_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libdrm_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libdrm_radeon_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libexpat_g.a -unknown- obsolete
-./usr/X11R7/lib/libfontconfig_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libfontenc_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libfreetype_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libgbm_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libglut_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libfontconfig_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libfontenc_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libfreetype_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libgbm_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libglut_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/liblbxutil_g.a -obsolete- obsolete
./usr/X11R7/lib/liblisp_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libmp_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libpciaccess_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libpixman-1_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libpthread-stubs_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libpciaccess_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libpixman-1_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libpthread-stubs_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libre_g.a -unknown- debuglib,xorg
-./usr/X11R7/lib/libxcb-atom_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-aux_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-composite_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-damage_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-dpms_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-dri2_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-dri3_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-event_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-glx_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-icccm_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-image_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-keysyms_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-present_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-property_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-randr_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-record_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-render-util_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-render_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-reply_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-res_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-screensaver_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-shape_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-shm_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-sync_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xevie_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xf86dri_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xfixes_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xinerama_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xkb_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xtest_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xv_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb-xvmc_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxcb_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxkbfile_g.a -unknown- debuglib,xorg,compatfile
-./usr/X11R7/lib/libxkbui_g.a -unknown- debuglib,xorg,compatfile
+./usr/X11R7/lib/libxcb-atom_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-aux_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-composite_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-damage_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-dpms_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri2_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-dri3_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-event_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-glx_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-icccm_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-image_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-keysyms_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-present_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-property_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-randr_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-record_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-render-util_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-render_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-reply_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-res_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-screensaver_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-shape_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-shm_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-sync_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xevie_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xf86dri_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xfixes_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xinerama_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xkb_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xtest_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xv_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb-xvmc_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxcb_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxkbfile_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libxkbui_g.a -unknown- debuglib,xorg,compatx11file
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xprt.debug -unknown- debug,x11
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.24 src/distrib/sets/lists/xdebug/shl.mi:1.25
--- src/distrib/sets/lists/xdebug/shl.mi:1.24 Thu Jun 25 05:30:48 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Sat Jun 27 16:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.24 2015/06/25 05:30:48 matt Exp $
+# $NetBSD: shl.mi,v 1.25 2015/06/27 16:21:08 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
@@ -46,7 +46,7 @@
./usr/libdata/debug/usr/X11R6/lib/libpsres.so.1.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libxkbfile.so.1.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libxkbui.so.1.0.debug -unknown- x11,debug
-./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatdir
+./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcUTF8Load.so.2.0.debug obsolete xorg,obsolete
@@ -59,93 +59,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,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/libFS.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libGL.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libGLU.so.2.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libGLw.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libICE.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug -unknown- obsolete,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXaw6.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXaw7.so.10.0.debug -unknown xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXcomposite.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXcursor.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXdamage.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXdmGreet.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXdmcp.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXft.so.3.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXi.so.7.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXinerama.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXpm.so.5.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXrender.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXss.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXt.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXtst.so.7.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXv.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXvMC.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXvMCW.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXxf86dga.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXxf86misc.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-aux.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-composite.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-damage.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dpms.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dri2.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-dri3.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-event.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-glx.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-icccm.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-image.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-keysyms.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-present.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-render.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-reply.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-res.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-screensaver.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-shape.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-shm.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-sync.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xevie.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xf86dri.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xfixes.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xinerama.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xtest.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=i386
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.344 src/share/mk/bsd.README:1.345
--- src/share/mk/bsd.README:1.344 Fri Jun 19 18:13:52 2015
+++ src/share/mk/bsd.README Sat Jun 27 16:21:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.344 2015/06/19 18:13:52 matt Exp $
+# $NetBSD: bsd.README,v 1.345 2015/06/27 16:21:07 matt Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -140,6 +140,10 @@ MKCOMPATTESTS If "yes", build and inst
building and installing src/compat.
Default: no
+MKCOMPATX11 If "yes", build and install the X11 libraries when
+ building and installing src/compat.
+ Default: no
+
MKCOMPLEX If "no", don't build libm support for <complex.h>
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.858 src/share/mk/bsd.own.mk:1.859
--- src/share/mk/bsd.own.mk:1.858 Wed Jun 24 22:20:26 2015
+++ src/share/mk/bsd.own.mk Sat Jun 27 16:21:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.858 2015/06/24 22:20:26 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.859 2015/06/27 16:21:07 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -83,7 +83,8 @@ EXTERNAL_GCC_SUBDIR= gcc
.else
EXTERNAL_GCC_SUBDIR= /does/not/exist
.endif
-
+.else
+MKGCCCMDS?= no
.endif
.if !empty(MACHINE_ARCH:Mearm*)
@@ -914,6 +915,8 @@ MKCOMPAT?= yes
.else
# Don't let this build where it really isn't supported.
MKCOMPAT:= no
+MKCOMPATTESTS:= no
+MKCOMPATX11:= no
.endif
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
@@ -1013,7 +1016,7 @@ MKKMOD= no
#
_MKVARS.no= \
MKBSDGREP MKBSDTAR \
- MKCATPAGES MKCOMPATTESTS MKCRYPTO_RC5 MKCTF MKDEBUG \
+ MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCRYPTO_RC5 MKCTF MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC MKGROFFHTMLDOC \
MKKYUA MKLLD MKLLDB MKLINT \
MKMANZ MKMCLINKER MKOBJDIRS \
