sync

21 files changed, 61 insertions, 9 deletions

diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 749fe2293..84d96368a 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -87,7 +87,7 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm.so.2.4
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 3d2e3debd..c8d591841 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_sarea.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/privates.h
 ./usr/X11R6/include/xorg/registry.h
@@ -68,6 +69,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_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 644beab90..9a54326f2 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -17,6 +17,7 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
@@ -69,7 +70,10 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm.so.2.4
+./usr/X11R6/lib/libdrm_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index f8768c6e5..e72b29d63 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -14,6 +14,7 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_sarea.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
 ./usr/X11R6/include/xorg/privates.h
@@ -77,6 +78,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_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 4ef627700..cad062039 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -17,7 +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/intel_bufmgr.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -89,9 +88,6 @@
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.4
-./usr/X11R6/lib/libdrm_intel.a
-./usr/X11R6/lib/libdrm_intel.so.1.0
-./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 6e67273c2..e665816c9 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -14,6 +14,7 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_sarea.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/privates.h
 ./usr/X11R6/include/xorg/registry.h
@@ -68,6 +69,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_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 598be6baf..082468c31 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,11 +1,15 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/GL/internal/dri_sarea.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/privates.h
 ./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libGL.so.8.0
+./usr/X11R6/lib/libdrm_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/pkgconfig/dri.pc
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index eac6fdeeb..7d7ddca16 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -17,6 +17,7 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -84,7 +85,10 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm.so.2.4
+./usr/X11R6/lib/libdrm_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_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 248d86cb2..3b5a7a37f 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -17,6 +17,7 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -86,7 +87,10 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm.so.2.4
+./usr/X11R6/lib/libdrm_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index af44eb63a..a7174ab9d 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -1,5 +1,9 @@
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/lib/libdrm_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_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 749fe2293..2fd2e95b5 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -17,6 +17,7 @@
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
@@ -87,7 +88,10 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.2.3
+./usr/X11R6/lib/libdrm.so.2.4
+./usr/X11R6/lib/libdrm_intel.a
+./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 91bbb4273..03d3e598e 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -1,4 +1,5 @@
 ./usr/X11R6/bin/X
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xvfb
@@ -227,6 +228,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/Xserver.1
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index 64ae28846..e6b92445b 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -1,4 +1,5 @@
 ./usr/X11R6/bin/X
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xvfb
@@ -229,6 +230,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/Xserver.1
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 3b2cdc7eb..95590756c 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -1,4 +1,6 @@
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index ccf6bce79..5102c8fcc 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -1,4 +1,5 @@
 ./usr/X11R6/bin/X
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xvfb
@@ -220,6 +221,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/Xserver.1
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index b7e73e37e..92d6e9c5d 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -1,8 +1,10 @@
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
index ea60834aa..6d7a0772b 100644
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ b/distrib/sets/lists/xserv/md.mvme88k
@@ -1,7 +1,9 @@
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index 9ba0fc48a..cf75cc890 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -1,4 +1,5 @@
 ./usr/X11R6/bin/X
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xvfb
@@ -223,6 +224,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/Xserver.1
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 477ecfb58..3e5996046 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -1,4 +1,5 @@
 ./usr/X11R6/bin/X
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xvfb
@@ -224,6 +225,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/Xserver.1
diff --git a/distrib/sets/lists/xserv/md.vax b/distrib/sets/lists/xserv/md.vax
index 6255936d2..1d87c3346 100644
--- a/distrib/sets/lists/xserv/md.vax
+++ b/distrib/sets/lists/xserv/md.vax
@@ -1,6 +1,8 @@
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 91bbb4273..03d3e598e 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -1,4 +1,5 @@
 ./usr/X11R6/bin/X
+./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xvfb
@@ -227,6 +228,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/Xserver.1