Module Name: src
Committed By: mrg
Date: Sun Jul 18 07:07:09 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/lib: Makefile
Log Message:
build and install libxcb and xcb-util libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.110 -r1.111 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.93 src/distrib/sets/lists/xbase/mi:1.94
--- src/distrib/sets/lists/xbase/mi:1.93 Fri May 28 12:38:34 2010
+++ src/distrib/sets/lists/xbase/mi Sun Jul 18 07:07:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.93 2010/05/28 12:38:34 ghen Exp $
+# $NetBSD: mi,v 1.94 2010/07/18 07:07:08 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1515,6 +1515,7 @@
./usr/X11R7/include/freetype2/freetype/internal base-x11-root xorg
./usr/X11R7/include/freetype2/freetype/internal/services base-x11-root xorg
./usr/X11R7/include/pixman-1 base-x11-root xorg
+./usr/X11R7/include/xcb base-x11-root xorg
./usr/X11R7/include/xorg base-x11-root xorg
./usr/X11R7/lib base-x11-root xorg
./usr/X11R7/lib/X11 base-x11-root xorg
@@ -2851,6 +2852,7 @@
./usr/X11R7/share/examples/ssh-askpass/SshAskpass-green.ad -unknown- xorg
./usr/X11R7/share/examples/ssh-askpass/SshAskpass-motif.ad -unknown- xorg
./usr/X11R7/share/pciids base-x11-root xorg
+./usr/X11R7/share/xcb base-x11-root xorg
./usr/libdata/debug/usr/X11R6 base-sys-usr x11
./usr/libdata/debug/usr/X11R6/bin base-sys-usr x11
./usr/libdata/debug/usr/X11R6/lib base-sys-usr x11
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.38 src/distrib/sets/lists/xbase/shl.mi:1.39
--- src/distrib/sets/lists/xbase/shl.mi:1.38 Fri Jul 2 07:43:36 2010
+++ src/distrib/sets/lists/xbase/shl.mi Sun Jul 18 07:07:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.38 2010/07/02 07:43:36 mrg Exp $
+# $NetBSD: shl.mi,v 1.39 2010/07/18 07:07:08 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -324,6 +324,96 @@
./usr/X11R7/lib/libpixman-1.so -unknown- xorg
./usr/X11R7/lib/libpixman-1.so.2 -unknown- xorg
./usr/X11R7/lib/libpixman-1.so.2.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-atom.so -unknown- xorg
+./usr/X11R7/lib/libxcb-atom.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-atom.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-aux.so -unknown- xorg
+./usr/X11R7/lib/libxcb-aux.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-aux.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-composite.so -unknown- xorg
+./usr/X11R7/lib/libxcb-composite.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-composite.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-damage.so -unknown- xorg
+./usr/X11R7/lib/libxcb-damage.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-damage.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-dpms.so -unknown- xorg
+./usr/X11R7/lib/libxcb-dpms.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-dpms.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg
+./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-dri2.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-event.so -unknown- xorg
+./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-glx.so -unknown- xorg
+./usr/X11R7/lib/libxcb-glx.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-glx.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-icccm.so -unknown- xorg
+./usr/X11R7/lib/libxcb-icccm.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-icccm.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-image.so -unknown- xorg
+./usr/X11R7/lib/libxcb-image.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-image.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-keysyms.so -unknown- xorg
+./usr/X11R7/lib/libxcb-keysyms.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-keysyms.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-property.so -unknown- xorg
+./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-randr.so -unknown- xorg
+./usr/X11R7/lib/libxcb-randr.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-randr.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-record.so -unknown- xorg
+./usr/X11R7/lib/libxcb-record.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-record.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-render-util.so -unknown- xorg
+./usr/X11R7/lib/libxcb-render-util.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-render-util.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-render.so -unknown- xorg
+./usr/X11R7/lib/libxcb-render.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-render.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-reply.so -unknown- xorg
+./usr/X11R7/lib/libxcb-reply.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb-reply.so.1.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-res.so -unknown- xorg
+./usr/X11R7/lib/libxcb-res.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-res.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-screensaver.so -unknown- xorg
+./usr/X11R7/lib/libxcb-screensaver.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-screensaver.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-shape.so -unknown- xorg
+./usr/X11R7/lib/libxcb-shape.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-shape.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-shm.so -unknown- xorg
+./usr/X11R7/lib/libxcb-shm.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-shm.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-sync.so -unknown- xorg
+./usr/X11R7/lib/libxcb-sync.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-sync.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xevie.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xevie.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xevie.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xf86dri.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xf86dri.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xf86dri.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xfixes.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xfixes.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xfixes.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xinerama.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xinerama.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xinerama.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xtest.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xtest.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xtest.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xv.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xv.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xv.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xvmc.so -unknown- xorg
+./usr/X11R7/lib/libxcb-xvmc.so.0 -unknown- xorg
+./usr/X11R7/lib/libxcb-xvmc.so.0.0 -unknown- xorg
+./usr/X11R7/lib/libxcb.so -unknown- xorg
+./usr/X11R7/lib/libxcb.so.1 -unknown- xorg
+./usr/X11R7/lib/libxcb.so.1.1 -unknown- xorg
./usr/X11R7/lib/libxkbfile.so -unknown- xorg
./usr/X11R7/lib/libxkbfile.so.2 -unknown- xorg
./usr/X11R7/lib/libxkbfile.so.2.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.110 src/distrib/sets/lists/xcomp/mi:1.111
--- src/distrib/sets/lists/xcomp/mi:1.110 Fri May 28 13:01:23 2010
+++ src/distrib/sets/lists/xcomp/mi Sun Jul 18 07:07:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.110 2010/05/28 13:01:23 ghen Exp $
+# $NetBSD: mi,v 1.111 2010/07/18 07:07:08 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5800,6 +5800,33 @@
./usr/X11R7/include/pixman-1/pixman-version.h -unknown- xorg
./usr/X11R7/include/pixman-1/pixman.h -unknown- xorg
./usr/X11R7/include/pciaccess.h -unknown- xorg
+./usr/X11R7/include/xcb/bigreq.h -unknown- xorg
+./usr/X11R7/include/xcb/composite.h -unknown- xorg
+./usr/X11R7/include/xcb/damage.h -unknown- xorg
+./usr/X11R7/include/xcb/dpms.h -unknown- xorg
+./usr/X11R7/include/xcb/dri2.h -unknown- xorg
+./usr/X11R7/include/xcb/glx.h -unknown- xorg
+./usr/X11R7/include/xcb/randr.h -unknown- xorg
+./usr/X11R7/include/xcb/record.h -unknown- xorg
+./usr/X11R7/include/xcb/render.h -unknown- xorg
+./usr/X11R7/include/xcb/res.h -unknown- xorg
+./usr/X11R7/include/xcb/screensaver.h -unknown- xorg
+./usr/X11R7/include/xcb/shape.h -unknown- xorg
+./usr/X11R7/include/xcb/shm.h -unknown- xorg
+./usr/X11R7/include/xcb/sync.h -unknown- xorg
+./usr/X11R7/include/xcb/xc_misc.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb.h -unknown- xorg
+./usr/X11R7/include/xcb/xcbext.h -unknown- xorg
+./usr/X11R7/include/xcb/xevie.h -unknown- xorg
+./usr/X11R7/include/xcb/xf86dri.h -unknown- xorg
+./usr/X11R7/include/xcb/xfixes.h -unknown- xorg
+./usr/X11R7/include/xcb/xinerama.h -unknown- xorg
+./usr/X11R7/include/xcb/xinput.h -unknown- xorg
+./usr/X11R7/include/xcb/xproto.h -unknown- xorg
+./usr/X11R7/include/xcb/xselinux.h -unknown- xorg
+./usr/X11R7/include/xcb/xtest.h -unknown- xorg
+./usr/X11R7/include/xcb/xv.h -unknown- xorg
+./usr/X11R7/include/xcb/xvmc.h -unknown- xorg
./usr/X11R7/include/xorg/BT.h -unknown- xorg
./usr/X11R7/include/xorg/IBM.h -unknown- xorg
./usr/X11R7/include/xorg/dixaccess.h -unknown- xorg
@@ -6251,6 +6278,96 @@
./usr/X11R7/lib/libre.a -unknown- xorg
./usr/X11R7/lib/libre_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libre_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-atom.a -unknown- xorg
+./usr/X11R7/lib/libxcb-atom_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-atom_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-aux.a -unknown- xorg
+./usr/X11R7/lib/libxcb-aux_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-aux_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-composite.a -unknown- xorg
+./usr/X11R7/lib/libxcb-composite_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-composite_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-damage.a -unknown- xorg
+./usr/X11R7/lib/libxcb-damage_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-damage_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-dpms.a -unknown- xorg
+./usr/X11R7/lib/libxcb-dpms_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-dpms_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-dri2.a -unknown- xorg
+./usr/X11R7/lib/libxcb-dri2_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-dri2_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-event.a -unknown- xorg
+./usr/X11R7/lib/libxcb-event_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-event_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-glx.a -unknown- xorg
+./usr/X11R7/lib/libxcb-glx_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-glx_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-icccm.a -unknown- xorg
+./usr/X11R7/lib/libxcb-icccm_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-icccm_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-image.a -unknown- xorg
+./usr/X11R7/lib/libxcb-image_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-image_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-keysyms.a -unknown- xorg
+./usr/X11R7/lib/libxcb-keysyms_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-keysyms_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-property.a -unknown- xorg
+./usr/X11R7/lib/libxcb-property_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-property_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-randr.a -unknown- xorg
+./usr/X11R7/lib/libxcb-randr_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-randr_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-record.a -unknown- xorg
+./usr/X11R7/lib/libxcb-record_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-record_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-render-util.a -unknown- xorg
+./usr/X11R7/lib/libxcb-render-util_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-render-util_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-render.a -unknown- xorg
+./usr/X11R7/lib/libxcb-render_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-render_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-reply.a -unknown- xorg
+./usr/X11R7/lib/libxcb-reply_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-reply_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-res.a -unknown- xorg
+./usr/X11R7/lib/libxcb-res_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-res_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-screensaver.a -unknown- xorg
+./usr/X11R7/lib/libxcb-screensaver_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-screensaver_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-shape.a -unknown- xorg
+./usr/X11R7/lib/libxcb-shape_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-shape_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-shm.a -unknown- xorg
+./usr/X11R7/lib/libxcb-shm_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-shm_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-sync.a -unknown- xorg
+./usr/X11R7/lib/libxcb-sync_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-sync_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xevie.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xevie_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xevie_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xf86dri.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xf86dri_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xf86dri_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xfixes.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xfixes_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xfixes_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xinerama.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xinerama_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xinerama_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xtest.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xtest_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xtest_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xv.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xv_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xv_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb-xvmc.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xvmc_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb-xvmc_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libxcb.a -unknown- xorg
+./usr/X11R7/lib/libxcb_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libxcb_p.a -unknown- profile,xorg
./usr/X11R7/lib/libxkbfile.a -unknown- xorg
./usr/X11R7/lib/libxkbfile_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libxkbfile_p.a -unknown- profile,xorg
@@ -6298,6 +6415,37 @@
./usr/X11R7/lib/pkgconfig/xaw7.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xaw8.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/xbitmaps.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-atom.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-aux.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-composite.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-damage.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-dpms.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-dri2.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-event.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-glx.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-icccm.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-image.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-keysyms.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-property.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-proto.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-randr.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-record.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-render.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-renderutil.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-reply.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-res.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-screensaver.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-shape.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-shm.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-sync.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xevie.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xf86dri.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xfixes.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xinerama.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xtest.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xv.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb-xvmc.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/xcb.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcmiscproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcomposite.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/xcursor.pc -unknown- xorg
@@ -9048,6 +9196,33 @@
./usr/X11R7/man/man3/XvUngrabPort.3 -unknown- .man,xorg
./usr/X11R7/man/man3/XvVideoNotify.3 -unknown- .man,xorg
./usr/X11R7/man/man3/libXp.3 -obsolete- obsolete
+./usr/X11R7/share/xcb/bigreq.xml -unknown- xorg
+./usr/X11R7/share/xcb/composite.xml -unknown- xorg
+./usr/X11R7/share/xcb/damage.xml -unknown- xorg
+./usr/X11R7/share/xcb/dpms.xml -unknown- xorg
+./usr/X11R7/share/xcb/dri2.xml -unknown- xorg
+./usr/X11R7/share/xcb/glx.xml -unknown- xorg
+./usr/X11R7/share/xcb/randr.xml -unknown- xorg
+./usr/X11R7/share/xcb/record.xml -unknown- xorg
+./usr/X11R7/share/xcb/render.xml -unknown- xorg
+./usr/X11R7/share/xcb/res.xml -unknown- xorg
+./usr/X11R7/share/xcb/screensaver.xml -unknown- xorg
+./usr/X11R7/share/xcb/shape.xml -unknown- xorg
+./usr/X11R7/share/xcb/shm.xml -unknown- xorg
+./usr/X11R7/share/xcb/sync.xml -unknown- xorg
+./usr/X11R7/share/xcb/xc_misc.xml -unknown- xorg
+./usr/X11R7/share/xcb/xcb.xsd -unknown- xorg
+./usr/X11R7/share/xcb/xevie.xml -unknown- xorg
+./usr/X11R7/share/xcb/xf86dri.xml -unknown- xorg
+./usr/X11R7/share/xcb/xfixes.xml -unknown- xorg
+./usr/X11R7/share/xcb/xinerama.xml -unknown- xorg
+./usr/X11R7/share/xcb/xinput.xml -unknown- xorg
+./usr/X11R7/share/xcb/xprint.xml -unknown- xorg
+./usr/X11R7/share/xcb/xproto.xml -unknown- xorg
+./usr/X11R7/share/xcb/xselinux.xml -unknown- xorg
+./usr/X11R7/share/xcb/xtest.xml -unknown- xorg
+./usr/X11R7/share/xcb/xv.xml -unknown- xorg
+./usr/X11R7/share/xcb/xvmc.xml -unknown- xorg
./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
@@ -9351,8 +9526,8 @@
./usr/libdata/lint/llib-lXmu.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXmuu.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXmuu.ln -unknown- lint,xorg
-./usr/libdata/lint/llib-lXp.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXp.ln -obsolete- obsolete,xorg
+./usr/libdata/lint/llib-lXp.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXpm.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXpm.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXprintAppUtil.ln -obsolete- obsolete
@@ -9393,14 +9568,35 @@
./usr/libdata/lint/llib-lfreetype.ln -unknown- lint,x11
./usr/libdata/lint/llib-lfreetype.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lglut.ln -unknown- lint,xorg
-./usr/libdata/lint/llib-llbxutil.ln -unknown- lint,x11
./usr/libdata/lint/llib-llbxutil.ln -obsolete- obsolete,xorg
+./usr/libdata/lint/llib-llbxutil.ln -unknown- lint,x11
./usr/libdata/lint/llib-llisp.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lmp.ln -unknown- lint,xorg
./usr/libdata/lint/llib-loldX.ln -unknown- lint,x11
./usr/libdata/lint/llib-lpciaccess.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lpsres.ln -unknown- lint,x11
./usr/libdata/lint/llib-lre.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-composite.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-damage.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-dpms.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-dri2.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-glx.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-randr.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-record.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-render.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-res.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-screensaver.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-shape.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-shm.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-sync.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xevie.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xf86dri.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xfixes.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xinerama.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xtest.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xv.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb-xvmc.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lxcb.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lxkbfile.ln -unknown- lint,x11
./usr/libdata/lint/llib-lxkbfile.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lxkbui.ln -unknown- lint,x11
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.23 src/distrib/sets/lists/xcomp/shl.mi:1.24
--- src/distrib/sets/lists/xcomp/shl.mi:1.23 Sun May 23 04:26:19 2010
+++ src/distrib/sets/lists/xcomp/shl.mi Sun Jul 18 07:07:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.23 2010/05/23 04:26:19 mrg Exp $
+# $NetBSD: shl.mi,v 1.24 2010/07/18 07:07:08 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -102,6 +102,36 @@
./usr/X11R7/lib/libpciaccess_pic.a -unknown- xorg
./usr/X11R7/lib/libpixman-1_pic.a -unknown- xorg
./usr/X11R7/lib/libre_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-atom_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-aux_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-composite_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-damage_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-dpms_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-dri2_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-event_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-glx_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-icccm_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-image_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-keysyms_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-property_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-randr_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-record_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-render-util_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-render_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-reply_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-res_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-screensaver_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-shape_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-shm_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-sync_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xevie_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xf86dri_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xfixes_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xinerama_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xtest_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xv_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb-xvmc_pic.a -unknown- xorg
+./usr/X11R7/lib/libxcb_pic.a -unknown- xorg
./usr/X11R7/lib/libxkbfile_pic.a -unknown- xorg
./usr/X11R7/lib/libxkbui_pic.a -unknown- xorg
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.8 src/etc/mtree/NetBSD.dist.Xorg:1.9
--- src/etc/mtree/NetBSD.dist.Xorg:1.8 Fri May 28 17:17:12 2010
+++ src/etc/mtree/NetBSD.dist.Xorg Sun Jul 18 07:07:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.8 2010/05/28 17:17:12 ghen Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.9 2010/07/18 07:07:09 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
@@ -30,6 +30,7 @@
./usr/X11R7/include/freetype2/freetype/internal
./usr/X11R7/include/freetype2/freetype/internal/services
./usr/X11R7/include/pixman-1
+./usr/X11R7/include/xcb
./usr/X11R7/include/xorg
./usr/X11R7/lib
./usr/X11R7/lib/X11
@@ -173,6 +174,7 @@
./usr/X11R7/share/examples
./usr/X11R7/share/examples/ssh-askpass
./usr/X11R7/share/pciids
+./usr/X11R7/share/xcb
./usr/libdata/debug/usr/X11R7
./usr/libdata/debug/usr/X11R7/bin
./usr/libdata/debug/usr/X11R7/lib
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.3 src/external/mit/xorg/include/Makefile:1.4
--- src/external/mit/xorg/include/Makefile:1.3 Wed Jun 10 04:37:27 2009
+++ src/external/mit/xorg/include/Makefile Sun Jul 18 07:07:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/10 04:37:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/18 07:07:09 mrg Exp $
# *proto packages for xorg
@@ -7,7 +7,7 @@
resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
compositeproto damageproto trapproto glproto randrproto fontcacheproto \
xf86driproto xf86vidmodeproto renderproto dri2proto \
- xproxymanagementprotocol xbitmaps .WAIT \
+ xproxymanagementprotocol xbitmaps xcb-proto .WAIT \
xtrans
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.19 src/external/mit/xorg/lib/Makefile:1.20
--- src/external/mit/xorg/lib/Makefile:1.19 Thu Jun 3 09:49:45 2010
+++ src/external/mit/xorg/lib/Makefile Sun Jul 18 07:07:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/06/03 09:49:45 veego Exp $
+# $NetBSD: Makefile,v 1.20 2010/07/18 07:07:09 mrg Exp $
# build libraries for xorg
@@ -26,6 +26,7 @@
SUBDIR+=libGLU libGLw libXaw6 libXaw libXcursor \
libXrandr \
.WAIT \
- libXft libglut
+ libXft libglut \
+ libxcb .WAIT xcb-util
.include <bsd.subdir.mk>
