sync

18 files changed, 27 insertions, 153 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 2826d88e2..54aee51a9 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -98,8 +86,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index d3b0a9556..f30b36f28 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -101,13 +89,10 @@
 ./usr/X11R6/lib/libXxf86dga.so.5.0
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
-./usr/X11R6/lib/libchromeXvMC.la
-./usr/X11R6/lib/libchromeXvMC.so.1.0
-./usr/X11R6/lib/libchromeXvMCPro.la
-./usr/X11R6/lib/libchromeXvMCPro.so.1.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index d66340842..749fe2293 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -98,8 +86,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 1d374617d..3d2e3debd 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -68,6 +68,7 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 67d0120f8..8de60d85b 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -16,18 +16,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
@@ -79,8 +67,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 63c8df311..d26a7443d 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -101,13 +89,10 @@
 ./usr/X11R6/lib/libXxf86dga.so.5.0
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
-./usr/X11R6/lib/libchromeXvMC.la
-./usr/X11R6/lib/libchromeXvMC.so.1.0
-./usr/X11R6/lib/libchromeXvMCPro.la
-./usr/X11R6/lib/libchromeXvMCPro.so.1.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index dfbfeda8d..644beab90 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
@@ -80,8 +68,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index a69912717..f8768c6e5 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -77,6 +77,7 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index fde540e28..00e420bb1 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -98,8 +86,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 3445f8b0a..6e67273c2 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -68,6 +68,7 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index bb0a7c0a5..598be6baf 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -6,6 +6,7 @@
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libGL.so.8.0
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/xorg
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 5e6414001..cf8338137 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -95,8 +83,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index fd67faaee..248d86cb2 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -97,8 +85,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 8466a22ab..1e5c06bcd 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -98,8 +86,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index af44eb63a..d9ad126c6 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -1,5 +1,6 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/xorg
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/xorg
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index d66340842..749fe2293 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -17,18 +17,6 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/drm/drm.h
-./usr/X11R6/include/drm/drm_sarea.h
-./usr/X11R6/include/drm/i915_drm.h
-./usr/X11R6/include/drm/mach64_drm.h
-./usr/X11R6/include/drm/mga_drm.h
-./usr/X11R6/include/drm/r128_drm.h
-./usr/X11R6/include/drm/r300_reg.h
-./usr/X11R6/include/drm/radeon_drm.h
-./usr/X11R6/include/drm/savage_drm.h
-./usr/X11R6/include/drm/sis_drm.h
-./usr/X11R6/include/drm/via_3d_reg.h
-./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -98,8 +86,9 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 0acdaff05..cc9037341 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -168,7 +168,6 @@
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/modules/dri/tdfx_dri.so
 ./usr/X11R6/lib/modules/dri/trident_dri.so
-./usr/X11R6/lib/modules/dri/unichrome_dri.so
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
 ./usr/X11R6/lib/modules/drivers/ark_drv.la
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index c975dc488..fe2bd31b5 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -168,7 +168,6 @@
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/modules/dri/tdfx_dri.so
 ./usr/X11R6/lib/modules/dri/trident_dri.so
-./usr/X11R6/lib/modules/dri/unichrome_dri.so
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
 ./usr/X11R6/lib/modules/drivers/ark_drv.la