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

Conflicts:
	xserver/Makefile.bsd-wrapper

13 files changed, 319 insertions, 20 deletions

diff --git a/distrib/notes/README.hp300 b/distrib/notes/README.hp300
index 7f90cc36d..cc8f579ed 100644
--- a/distrib/notes/README.hp300
+++ b/distrib/notes/README.hp300
@@ -1,8 +1,21 @@
 Post-installation instructions for X.Org on OpenBSD/hp300
 ---------------------------------------------------------
 
-There is no X server for hp300.  Only userland X.
+OpenBSD use the X.Org X server on hp300.
+
+An unaccelerated frame buffer driver, wsfb, is provided for all frame
+buffers but those on the SGC bus (including the 425e built-in EVRX).
+DaVinci and Renaissance frame buffers are currently only supported
+in monochrome mode.
+
+No xorg.conf is needed in this configuration, unless you want to 
+change default options.
+
+To start xdm, the X display manager, activate the xdm_flags option in
+/etc/rc.conf. You will need to disable the console getty in /etc/ttys.
+
+Alternatively, you can log in on console and use `startx'.
 
 problem_blurb
 
-$OpenBSD: README.hp300,v 1.3 2012/02/07 19:53:13 matthieu Exp $
+$OpenBSD: README.hp300,v 1.4 2013/03/14 20:49:52 miod Exp $
diff --git a/distrib/notes/README.luna88k b/distrib/notes/README.luna88k
new file mode 100644
index 000000000..6a277acac
--- /dev/null
+++ b/distrib/notes/README.luna88k
@@ -0,0 +1,8 @@
+Post-installation instructions for X.Org on OpenBSD/luna88k
+-----------------------------------------------------------
+
+There is no X server for luna88k.  Only userland X.
+
+problem_blurb
+
+$OpenBSD: README.luna88k,v 1.1 2013/03/16 01:24:43 aoyama Exp $
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
diff --git a/distrib/sets/lists/xetc/md.hp300 b/distrib/sets/lists/xetc/md.hp300
index 7aa8b58b2..e0199028d 100644
--- a/distrib/sets/lists/xetc/md.hp300
+++ b/distrib/sets/lists/xetc/md.hp300
@@ -1,2 +1 @@
 ./etc/X11/fs/config
-./etc/X11/xorg.conf
diff --git a/distrib/sets/lists/xetc/md.luna88k b/distrib/sets/lists/xetc/md.luna88k
new file mode 100644
index 000000000..e0199028d
--- /dev/null
+++ b/distrib/sets/lists/xetc/md.luna88k
@@ -0,0 +1 @@
+./etc/X11/fs/config
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index e5b0fb780..670fd3f0b 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
@@ -8,11 +9,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -65,6 +65,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -90,6 +92,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -102,11 +105,11 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Cursor.h
@@ -141,12 +144,21 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
+./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions/libdbe.la
 ./usr/X11R6/lib/modules/extensions/libdbe.so
+./usr/X11R6/lib/modules/extensions/libdri.la
+./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
 ./usr/X11R6/lib/modules/extensions/libextmod.la
 ./usr/X11R6/lib/modules/extensions/libextmod.so
+./usr/X11R6/lib/modules/extensions/libglx.la
+./usr/X11R6/lib/modules/extensions/libglx.so
+./usr/X11R6/lib/modules/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
 ./usr/X11R6/lib/modules/input/kbd_drv.so
 ./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -177,8 +189,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -193,7 +203,9 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-mouse.pc
 ./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
@@ -263,8 +275,8 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.luna88k b/distrib/sets/lists/xserv/md.luna88k
new file mode 100644
index 000000000..93c6035fa
--- /dev/null
+++ b/distrib/sets/lists/xserv/md.luna88k
@@ -0,0 +1,12 @@
+./usr/X11R6/bin/Xephyr
+./usr/X11R6/bin/Xnest
+./usr/X11R6/bin/Xvfb
+./usr/X11R6/include/xorg
+./usr/X11R6/lib/modules/dri/swrast_dri.so
+./usr/X11R6/man/man1/Xephyr.1
+./usr/X11R6/man/man1/Xnest.1
+./usr/X11R6/man/man1/Xserver.1
+./usr/X11R6/man/man1/Xvfb.1
+./var/db/xkb
+./var/db/xkb/README.compiled
+./var/log
diff --git a/distrib/sets/lists/xshare/md.luna88k b/distrib/sets/lists/xshare/md.luna88k
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/distrib/sets/lists/xshare/md.luna88k
diff --git a/driver/Makefile b/driver/Makefile
index be638bf85..6b70be272 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2012/08/11 09:56:55 matthieu Exp $
+# $OpenBSD: Makefile,v 1.54 2013/03/16 01:24:43 aoyama Exp $
 
 INPUT_DRV_DEFAULT= \
 	xf86-input-keyboard \
@@ -16,7 +16,7 @@ INPUT_DRV_alpha=
 
 INPUT_DRV_amd64= ${INPUT_DRV_COMMON} xf86-input-synaptics xf86-input-vmmouse
 
-INPUT_DRV_hp300=
+INPUT_DRV_hp300= ${INPUT_DRV_DEFAULT}
 
 INPUT_DRV_hppa= ${INPUT_DRV_DEFAULT}
 
@@ -26,6 +26,8 @@ INPUT_DRV_landisk=
 
 INPUT_DRV_loongson= ${INPUT_DRV_DEFAULT}
 
+INPUT_DRV_luna88k=
+
 INPUT_DRV_macppc= ${INPUT_DRV_COMMON}
 
 INPUT_DRV_mvme68k=
@@ -62,7 +64,8 @@ VIDEO_DRV_amd64= \
 VIDEO_DRV_armish= \
 	xf86-video-wsfb	xf86-video-wsudl
 
-VIDEO_DRV_hp300=
+VIDEO_DRV_hp300= \
+	xf86-video-wsfb
 
 VIDEO_DRV_hppa= \
 	xf86-video-wsfb \
@@ -79,6 +82,8 @@ VIDEO_DRV_landisk=
 VIDEO_DRV_loongson= \
 	xf86-video-wsfb
 
+VIDEO_DRV_luna88k=
+
 VIDEO_DRV_macppc= \
 	xf86-video-ati xf86-video-mach64 xf86-video-nv xf86-video-r128 \
 	xf86-video-radeonold xf86-video-wsfb xf86-video-wsudl
diff --git a/lib/fontconfig/src/Makefile b/lib/fontconfig/src/Makefile
index ba0d30ce8..34ada90f0 100644
--- a/lib/fontconfig/src/Makefile
+++ b/lib/fontconfig/src/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2013/03/09 14:34:46 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.3 2013/03/13 23:56:54 matthieu Exp $
 
 FONTCONFIG=	${.CURDIR}/../../../dist/fontconfig
 
@@ -63,11 +63,20 @@ fcobjshash.h: fcobjshash.gperf
 	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
 .endif
 
-beforedepend: fcalias.h fcftalias.h fcobjshash.h
+beforedepend: fcalias.h fcftalias.h fcobjshash.h lib${LIB}.la
+
+lib${LIB}.la: ${.CURDIR}/lib${LIB}.la.in
+	@sed -e 's#@libdir@#${LIBDIR}#g' \
+	     -e 's#@major@#${SHLIB_MAJOR}#g' \
+	     -e 's#@minor@#${SHLIB_MINOR}#g' \
+	< $? > $@
+
+afterinstall:
+	${INSTALL_DATA} lib${LIB}.la ${DESTDIR}${LIBDIR}
 
 obj:_xenocara_obj
 
-CLEANFILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h 
+CLEANFILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h lib${LIB}.la
 
 .PATH: ${FONTCONFIG}/src
 
diff --git a/lib/fontconfig/src/libfontconfig.la.in b/lib/fontconfig/src/libfontconfig.la.in
new file mode 100644
index 000000000..b5c9717ce
--- /dev/null
+++ b/lib/fontconfig/src/libfontconfig.la.in
@@ -0,0 +1,41 @@
+# libfontconfig.la - a libtool library file
+# Generated by libtool
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libfontconfig.so.@major@.@minor@'
+
+# Names of this library.
+library_names='libfontconfig.so.@major@.@minor@'
+
+# The name of the static archive.
+old_library='libfontconfig.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs='-L/usr/X11R6/lib -lfreetype -lz -lexpat -lpthread-stubs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libfontconfig.
+current=5
+age=4
+revision=4
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='@libdir@'
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 9db2956e1..e995b62e9 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.42 2012/03/10 18:35:56 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.45 2013/03/16 01:24:43 aoyama Exp $
 
 .include <bsd.xconf.mk>
 
 DIST= ${.CURDIR}
 
 # Machines for which we don't build the Xorg Xserver
-NO_XORG_MACHINES=	alpha aviion hp300 hppa64 landisk mac68k \
+NO_XORG_MACHINES=	alpha aviion hppa64 landisk luna88k \
 			mvme68k mvme88k mvmeppc solbourne vax
 
 NO_XF86UTIL_MACHINES=	hp300 landisk mac68k sgi sparc vax