From 60ec6c1ea80381fe005b498c4b25ad941a65e811 Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Sat, 3 Jan 2015 14:28:22 +0000
Subject: [PATCH] sync

---
 distrib/sets/lists/xbase/md.amd64 |  2 --
 distrib/sets/lists/xbase/md.i386  |  2 --
 distrib/sets/lists/xbase/mi       | 22 +++++++++++-----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 200fe32f3..9598695cf 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -95,8 +95,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libI810XvMC.la
-./usr/X11R6/lib/libI810XvMC.so.3.0
 ./usr/X11R6/lib/libICE.so.10.0
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.3.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 52c042c58..08014a138 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -95,8 +95,6 @@
 ./usr/X11R6/lib/libGLU.so.9.0
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libI810XvMC.la
-./usr/X11R6/lib/libI810XvMC.so.3.0
 ./usr/X11R6/lib/libICE.so.10.0
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.3.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index ec7020983..754b717b4 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -283,24 +283,31 @@
 ./usr/X11R6/lib/libfontenc.a
 ./usr/X11R6/lib/libfontenc.la
 ./usr/X11R6/lib/libfreetype.a
+./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libpciaccess.a
 ./usr/X11R6/lib/libpciaccess.la
 ./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-cursor.a
+./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dri2.a
 ./usr/X11R6/lib/libxcb-dri3.a
 ./usr/X11R6/lib/libxcb-ewmh.a
+./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-icccm.a
+./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-image.a
+./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-keysyms.a
+./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-present.a
 ./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-render-util.a
+./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-screensaver.a
@@ -308,6 +315,7 @@
 ./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-util.a
+./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xfixes.a
@@ -322,6 +330,9 @@
 ./usr/X11R6/lib/libxkbfile.la
 ./usr/X11R6/lib/libxkbui.a
 ./usr/X11R6/lib/libxkbui.la
+./usr/X11R6/lib/locate
+./usr/X11R6/lib/locate/xorg.db
+./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
@@ -421,14 +432,3 @@
 ./var/cache
 ./var/cache/fontconfig
 ./var/cache/fontconfig/CACHEDIR.TAG
-./usr/X11R6/lib/libgbm.a
-./usr/X11R6/lib/libxcb-cursor.la
-./usr/X11R6/lib/libxcb-ewmh.la
-./usr/X11R6/lib/libxcb-icccm.la
-./usr/X11R6/lib/libxcb-image.la
-./usr/X11R6/lib/libxcb-keysyms.la
-./usr/X11R6/lib/libxcb-render-util.la
-./usr/X11R6/lib/libxcb-util.la
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
-./usr/X11R6/lib/pkgconfig/presentproto.pc