Merge remote-tracking branch 'origin/master' into matthieu/xserver-1.13

Conflicts:
	xserver/Makefile.bsd-wrapper

2 files changed, 201 insertions, 2 deletions

diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 254d71cdf..a8cc8bd19 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -11,20 +11,26 @@
 ./usr/X11R6/include/GL/glu.h
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
+./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86driproto.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
+./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/compositeext.h
 ./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/dri.h
 ./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/events.h
 ./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
-./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/include/xorg/list.h
 ./usr/X11R6/include/xorg/mioverlay.h
 ./usr/X11R6/include/xorg/optionstr.h
@@ -34,6 +40,7 @@
 ./usr/X11R6/include/xorg/ptrveloc.h
 ./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/rrtransform.h
+./usr/X11R6/include/xorg/sarea.h
 ./usr/X11R6/include/xorg/shmint.h
 ./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/ws-properties.h
@@ -85,6 +92,8 @@
 ./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.a
+./usr/X11R6/lib/libdrm.so.3.1
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.19.0
@@ -131,8 +140,9 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
new file mode 100644
index 000000000..89846166d
--- /dev/null
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -0,0 +1,189 @@
+./usr/X11R6/bin/glxgears
+./usr/X11R6/bin/glxinfo
+./usr/X11R6/bin/ucs2any
+./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
+./usr/X11R6/include/GL/GLwDrawA.h
+./usr/X11R6/include/GL/GLwDrawAP.h
+./usr/X11R6/include/GL/GLwMDrawA.h
+./usr/X11R6/include/GL/GLwMDrawAP.h
+./usr/X11R6/include/GL/gl.h
+./usr/X11R6/include/GL/glext.h
+./usr/X11R6/include/GL/glu.h
+./usr/X11R6/include/GL/glx.h
+./usr/X11R6/include/GL/glxext.h
+./usr/X11R6/include/GL/internal/dri_interface.h
+./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86driproto.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
+./usr/X11R6/include/pixman-1/pixman-version.h
+./usr/X11R6/include/pixman-1/pixman.h
+./usr/X11R6/include/xf86drm.h
+./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/lib/libFS.so.9.0
+./usr/X11R6/lib/libGL.a
+./usr/X11R6/lib/libGL.so.13.0
+./usr/X11R6/lib/libGLU.a
+./usr/X11R6/lib/libGLU.so.7.0
+./usr/X11R6/lib/libGLw.a
+./usr/X11R6/lib/libGLw.so.5.1
+./usr/X11R6/lib/libICE.so.9.0
+./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.15.1
+./usr/X11R6/lib/libXRes.so.4.0
+./usr/X11R6/lib/libXau.so.9.0
+./usr/X11R6/lib/libXaw.so.14.0
+./usr/X11R6/lib/libXaw7.so.14.0
+./usr/X11R6/lib/libXcomposite.so.3.0
+./usr/X11R6/lib/libXcursor.so.4.0
+./usr/X11R6/lib/libXdamage.so.3.1
+./usr/X11R6/lib/libXdmcp.so.10.0
+./usr/X11R6/lib/libXext.so.12.0
+./usr/X11R6/lib/libXfixes.so.5.1
+./usr/X11R6/lib/libXfont.so.9.0
+./usr/X11R6/lib/libXfontcache.so.4.0
+./usr/X11R6/lib/libXft.so.8.0
+./usr/X11R6/lib/libXi.so.11.1
+./usr/X11R6/lib/libXinerama.so.5.0
+./usr/X11R6/lib/libXmu.so.10.0
+./usr/X11R6/lib/libXmuu.so.5.0
+./usr/X11R6/lib/libXpm.so.8.0
+./usr/X11R6/lib/libXrandr.so.6.1
+./usr/X11R6/lib/libXrender.so.5.0
+./usr/X11R6/lib/libXss.so.5.0
+./usr/X11R6/lib/libXt.so.10.1
+./usr/X11R6/lib/libXtst.so.10.0
+./usr/X11R6/lib/libXv.so.5.0
+./usr/X11R6/lib/libXvMC.so.5.0
+./usr/X11R6/lib/libXvMCW.so.1.0
+./usr/X11R6/lib/libXxf86dga.so.5.0
+./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.a
+./usr/X11R6/lib/libdrm.so.3.1
+./usr/X11R6/lib/libfontconfig.so.7.0
+./usr/X11R6/lib/libfontenc.so.3.0
+./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libpciaccess.so.1.1
+./usr/X11R6/lib/libpixman-1.a
+./usr/X11R6/lib/libpixman-1.la
+./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpthread-stubs.so.1.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-dri2.so.0.2
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.2
+./usr/X11R6/lib/libxcb-icccm.so.1.1
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.1
+./usr/X11R6/lib/libxcb-record.so.0.1
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.1
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.1
+./usr/X11R6/lib/libxcb-screensaver.so.0.1
+./usr/X11R6/lib/libxcb-shape.so.0.1
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.2
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.1.2
+./usr/X11R6/lib/libxcb-xfixes.so.0.1
+./usr/X11R6/lib/libxcb-xinerama.so.0.1
+./usr/X11R6/lib/libxcb-xprint.so.1.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.1
+./usr/X11R6/lib/libxcb-xvmc.so.0.1
+./usr/X11R6/lib/libxcb.so.2.4
+./usr/X11R6/lib/libxkbfile.so.5.0
+./usr/X11R6/lib/libxkbui.so.4.0
+./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
+./usr/X11R6/lib/pkgconfig/gl.pc
+./usr/X11R6/lib/pkgconfig/glu.pc
+./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
+./usr/X11R6/lib/xorg/protocol.txt
+./usr/X11R6/man/man1/bdftruncate.1
+./usr/X11R6/man/man1/dga.1
+./usr/X11R6/man/man1/glxgears.1
+./usr/X11R6/man/man1/glxinfo.1
+./usr/X11R6/man/man1/ucs2any.1
+./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/man/man3/XDGA.3
+./usr/X11R6/man/man3/XDGAChangePixmapMode.3
+./usr/X11R6/man/man3/XDGACloseFramebuffer.3
+./usr/X11R6/man/man3/XDGACopyArea.3
+./usr/X11R6/man/man3/XDGACopyTransparentArea.3
+./usr/X11R6/man/man3/XDGACreateColormap.3
+./usr/X11R6/man/man3/XDGAFillRectangle.3
+./usr/X11R6/man/man3/XDGAGetViewportStatus.3
+./usr/X11R6/man/man3/XDGAInstallColormap.3
+./usr/X11R6/man/man3/XDGAKeyEventToXKeyEvent.3
+./usr/X11R6/man/man3/XDGAOpenFramebuffer.3
+./usr/X11R6/man/man3/XDGAQueryExtension.3
+./usr/X11R6/man/man3/XDGAQueryModes.3
+./usr/X11R6/man/man3/XDGAQueryVersion.3
+./usr/X11R6/man/man3/XDGASelectInput.3
+./usr/X11R6/man/man3/XDGASetClientVersion.3
+./usr/X11R6/man/man3/XDGASetMode.3
+./usr/X11R6/man/man3/XDGASetViewport.3
+./usr/X11R6/man/man3/XDGASync.3
+./usr/X11R6/man/man3/XF86DGA.3
+./usr/X11R6/man/man3/XF86Misc.3
+./usr/X11R6/man/man3/XF86MiscGetKbdSettings.3
+./usr/X11R6/man/man3/XF86MiscGetMouseSettings.3
+./usr/X11R6/man/man3/XF86MiscGetSaver.3
+./usr/X11R6/man/man3/XF86MiscQueryExtension.3
+./usr/X11R6/man/man3/XF86MiscQueryVersion.3
+./usr/X11R6/man/man3/XF86MiscSetKbdSettings.3
+./usr/X11R6/man/man3/XF86MiscSetMouseSettings.3
+./usr/X11R6/man/man3/XF86MiscSetSaver.3
+./usr/X11R6/man/man3/XF86VM.3
+./usr/X11R6/man/man3/XF86VidModeDeleteModeLine.3
+./usr/X11R6/man/man3/XF86VidModeGetAllModeLines.3
+./usr/X11R6/man/man3/XF86VidModeGetDotClocks.3
+./usr/X11R6/man/man3/XF86VidModeGetGamma.3
+./usr/X11R6/man/man3/XF86VidModeGetGammaRamp.3
+./usr/X11R6/man/man3/XF86VidModeGetGammaRampSize.3
+./usr/X11R6/man/man3/XF86VidModeGetModeLine.3
+./usr/X11R6/man/man3/XF86VidModeGetMonitor.3
+./usr/X11R6/man/man3/XF86VidModeGetPermissions.3
+./usr/X11R6/man/man3/XF86VidModeGetViewPort.3
+./usr/X11R6/man/man3/XF86VidModeLockModeSwitch.3
+./usr/X11R6/man/man3/XF86VidModeModModeLine.3
+./usr/X11R6/man/man3/XF86VidModeQueryExtension.3
+./usr/X11R6/man/man3/XF86VidModeQueryVersion.3
+./usr/X11R6/man/man3/XF86VidModeSetClientVersion.3
+./usr/X11R6/man/man3/XF86VidModeSetGamma.3
+./usr/X11R6/man/man3/XF86VidModeSetGammaRamp.3
+./usr/X11R6/man/man3/XF86VidModeSetViewPort.3
+./usr/X11R6/man/man3/XF86VidModeSwitchMode.3
+./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
+./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
+./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3