Remove {hp300,mvme68k,mvme88k} bits.

20 files changed, 17 insertions, 1126 deletions

diff --git a/distrib/notes/README.hp300 b/distrib/notes/README.hp300
deleted file mode 100644
index cc8f579ed..000000000
--- a/distrib/notes/README.hp300
+++ /dev/null
@@ -1,21 +0,0 @@
-Post-installation instructions for X.Org on OpenBSD/hp300
----------------------------------------------------------
-
-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.4 2013/03/14 20:49:52 miod Exp $
diff --git a/distrib/notes/README.mvme68k b/distrib/notes/README.mvme68k
deleted file mode 100644
index c845c90ab..000000000
--- a/distrib/notes/README.mvme68k
+++ /dev/null
@@ -1,8 +0,0 @@
-Post-installation instructions for X.Org on OpenBSD/mvme68k
------------------------------------------------------------
-
-There is no X server for mvme68k.  Only userland X.
-
-problem_blurb
-
-$OpenBSD: README.mvme68k,v 1.1 2006/11/27 11:25:45 matthieu Exp $
diff --git a/distrib/notes/README.mvme88k b/distrib/notes/README.mvme88k
deleted file mode 100644
index 0dbd6e2b7..000000000
--- a/distrib/notes/README.mvme88k
+++ /dev/null
@@ -1,8 +0,0 @@
-Post-installation instructions for X.Org on OpenBSD/mvme88k
------------------------------------------------------------
-
-There is no X server for mvme88k.  Only userland X.
-
-problem_blurb
-
-$OpenBSD: README.mvme88k,v 1.1 2006/11/27 11:25:45 matthieu Exp $
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
deleted file mode 100644
index 1deedf827..000000000
--- a/distrib/sets/lists/xbase/md.hp300
+++ /dev/null
@@ -1,193 +0,0 @@
-./usr/X11R6/bin/glxgears
-./usr/X11R6/bin/glxinfo
-./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
-./usr/X11R6/include/EGL/egl.h
-./usr/X11R6/include/EGL/eglext.h
-./usr/X11R6/include/EGL/eglmesaext.h
-./usr/X11R6/include/EGL/eglplatform.h
-./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/glu_mangle.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/GLES/egl.h
-./usr/X11R6/include/GLES/gl.h
-./usr/X11R6/include/GLES/glext.h
-./usr/X11R6/include/GLES/glplatform.h
-./usr/X11R6/include/GLES2/gl2.h
-./usr/X11R6/include/GLES2/gl2ext.h
-./usr/X11R6/include/GLES2/gl2platform.h
-./usr/X11R6/include/GLES3/gl3.h
-./usr/X11R6/include/GLES3/gl3ext.h
-./usr/X11R6/include/GLES3/gl3platform.h
-./usr/X11R6/include/KHR/khrplatform.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/txc_dxtn.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/list.h
-./usr/X11R6/include/xorg/mioverlay.h
-./usr/X11R6/include/xorg/optionstr.h
-./usr/X11R6/include/xorg/panoramiX.h
-./usr/X11R6/include/xorg/panoramiXsrv.h
-./usr/X11R6/include/xorg/privates.h
-./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
-./usr/X11R6/include/xorg/xf86Optionstr.h
-./usr/X11R6/include/xorg/xf86VGAarbiter.h
-./usr/X11R6/include/xorg/xfixes.h
-./usr/X11R6/include/xorg/xkbfile.h
-./usr/X11R6/include/xorg/xkbrules.h
-./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/include/xorg/xserver-properties.h
-./usr/X11R6/lib/libEGL.a
-./usr/X11R6/lib/libEGL.so.0.0
-./usr/X11R6/lib/libFS.so.10.0
-./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.15.0
-./usr/X11R6/lib/libGLESv1_CM.a
-./usr/X11R6/lib/libGLESv1_CM.so.0.0
-./usr/X11R6/lib/libGLESv2.a
-./usr/X11R6/lib/libGLESv2.so.0.0
-./usr/X11R6/lib/libGLU.a
-./usr/X11R6/lib/libGLU.la
-./usr/X11R6/lib/libGLU.so.9.0
-./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libICE.so.10.0
-./usr/X11R6/lib/libSM.so.9.0
-./usr/X11R6/lib/libX11-xcb.so.2.0
-./usr/X11R6/lib/libX11.so.16.0
-./usr/X11R6/lib/libXRes.so.5.0
-./usr/X11R6/lib/libXau.so.10.0
-./usr/X11R6/lib/libXaw.so.15.0
-./usr/X11R6/lib/libXaw7.so.15.0
-./usr/X11R6/lib/libXcomposite.so.4.0
-./usr/X11R6/lib/libXcursor.so.5.0
-./usr/X11R6/lib/libXdamage.so.4.0
-./usr/X11R6/lib/libXdmcp.so.11.0
-./usr/X11R6/lib/libXext.so.13.0
-./usr/X11R6/lib/libXfixes.so.6.0
-./usr/X11R6/lib/libXfont.so.11.0
-./usr/X11R6/lib/libXfontcache.so.5.0
-./usr/X11R6/lib/libXft.so.9.0
-./usr/X11R6/lib/libXi.so.12.0
-./usr/X11R6/lib/libXinerama.so.6.0
-./usr/X11R6/lib/libXmu.so.11.0
-./usr/X11R6/lib/libXmuu.so.6.0
-./usr/X11R6/lib/libXpm.so.9.0
-./usr/X11R6/lib/libXrandr.so.7.0
-./usr/X11R6/lib/libXrender.so.6.0
-./usr/X11R6/lib/libXss.so.6.0
-./usr/X11R6/lib/libXt.so.11.0
-./usr/X11R6/lib/libXtst.so.11.0
-./usr/X11R6/lib/libXv.so.6.0
-./usr/X11R6/lib/libXvMC.so.6.0
-./usr/X11R6/lib/libXvMCW.so.2.0
-./usr/X11R6/lib/libXxf86dga.so.6.0
-./usr/X11R6/lib/libXxf86misc.so.6.0
-./usr/X11R6/lib/libXxf86vm.so.6.0
-./usr/X11R6/lib/libdmx.so.2.0
-./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.4.1
-./usr/X11R6/lib/libfontconfig.so.9.0
-./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libglapi.a
-./usr/X11R6/lib/libglapi.so.0.0
-./usr/X11R6/lib/libpciaccess.so.2.0
-./usr/X11R6/lib/libpixman-1.a
-./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
-./usr/X11R6/lib/libpthread-stubs.so.2.0
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
-./usr/X11R6/lib/libxcb-atom.so.2.0
-./usr/X11R6/lib/libxcb-aux.so.1.0
-./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-damage.so.1.0
-./usr/X11R6/lib/libxcb-dpms.so.1.0
-./usr/X11R6/lib/libxcb-dri2.so.1.0
-./usr/X11R6/lib/libxcb-event.so.2.0
-./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.so.2.0
-./usr/X11R6/lib/libxcb-image.so.1.0
-./usr/X11R6/lib/libxcb-keysyms.so.2.0
-./usr/X11R6/lib/libxcb-property.so.2.0
-./usr/X11R6/lib/libxcb-randr.so.2.0
-./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.so.1.0
-./usr/X11R6/lib/libxcb-render.so.1.0
-./usr/X11R6/lib/libxcb-reply.so.2.0
-./usr/X11R6/lib/libxcb-res.so.1.0
-./usr/X11R6/lib/libxcb-screensaver.so.1.0
-./usr/X11R6/lib/libxcb-shape.so.1.0
-./usr/X11R6/lib/libxcb-shm.so.1.0
-./usr/X11R6/lib/libxcb-sync.so.1.0
-./usr/X11R6/lib/libxcb-xevie.so.1.0
-./usr/X11R6/lib/libxcb-xf86dri.so.2.0
-./usr/X11R6/lib/libxcb-xfixes.so.1.0
-./usr/X11R6/lib/libxcb-xinerama.so.1.0
-./usr/X11R6/lib/libxcb-xprint.so.2.0
-./usr/X11R6/lib/libxcb-xtest.so.1.0
-./usr/X11R6/lib/libxcb-xv.so.1.0
-./usr/X11R6/lib/libxcb-xvmc.so.1.0
-./usr/X11R6/lib/libxcb.so.3.0
-./usr/X11R6/lib/libxkbfile.so.6.0
-./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
-./usr/X11R6/lib/pkgconfig/egl.pc
-./usr/X11R6/lib/pkgconfig/gl.pc
-./usr/X11R6/lib/pkgconfig/glesv1_cm.pc
-./usr/X11R6/lib/pkgconfig/glesv2.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/glxgears.1
-./usr/X11R6/man/man1/glxinfo.1
-./usr/X11R6/man/man1/xfs.1
-./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/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
deleted file mode 100644
index 356f9bec6..000000000
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ /dev/null
@@ -1,168 +0,0 @@
-./usr/X11R6/bin/glxgears
-./usr/X11R6/bin/glxinfo
-./usr/X11R6/bin/ucs2any
-./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
-./usr/X11R6/include/EGL/egl.h
-./usr/X11R6/include/EGL/eglext.h
-./usr/X11R6/include/EGL/eglmesaext.h
-./usr/X11R6/include/EGL/eglplatform.h
-./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/glu_mangle.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/GLES/egl.h
-./usr/X11R6/include/GLES/gl.h
-./usr/X11R6/include/GLES/glext.h
-./usr/X11R6/include/GLES/glplatform.h
-./usr/X11R6/include/GLES2/gl2.h
-./usr/X11R6/include/GLES2/gl2ext.h
-./usr/X11R6/include/GLES2/gl2platform.h
-./usr/X11R6/include/GLES3/gl3.h
-./usr/X11R6/include/GLES3/gl3ext.h
-./usr/X11R6/include/GLES3/gl3platform.h
-./usr/X11R6/include/KHR/khrplatform.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/txc_dxtn.h
-./usr/X11R6/include/xf86drm.h
-./usr/X11R6/include/xf86drmMode.h
-./usr/X11R6/lib/libEGL.a
-./usr/X11R6/lib/libEGL.so.0.0
-./usr/X11R6/lib/libFS.so.10.0
-./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.15.0
-./usr/X11R6/lib/libGLESv1_CM.a
-./usr/X11R6/lib/libGLESv1_CM.so.0.0
-./usr/X11R6/lib/libGLESv2.a
-./usr/X11R6/lib/libGLESv2.so.0.0
-./usr/X11R6/lib/libGLU.a
-./usr/X11R6/lib/libGLU.la
-./usr/X11R6/lib/libGLU.so.9.0
-./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libICE.so.10.0
-./usr/X11R6/lib/libSM.so.9.0
-./usr/X11R6/lib/libX11-xcb.so.2.0
-./usr/X11R6/lib/libX11.so.16.0
-./usr/X11R6/lib/libXRes.so.5.0
-./usr/X11R6/lib/libXau.so.10.0
-./usr/X11R6/lib/libXaw.so.15.0
-./usr/X11R6/lib/libXaw7.so.15.0
-./usr/X11R6/lib/libXcomposite.so.4.0
-./usr/X11R6/lib/libXcursor.so.5.0
-./usr/X11R6/lib/libXdamage.so.4.0
-./usr/X11R6/lib/libXdmcp.so.11.0
-./usr/X11R6/lib/libXext.so.13.0
-./usr/X11R6/lib/libXfixes.so.6.0
-./usr/X11R6/lib/libXfont.so.11.0
-./usr/X11R6/lib/libXfontcache.so.5.0
-./usr/X11R6/lib/libXft.so.9.0
-./usr/X11R6/lib/libXi.so.12.0
-./usr/X11R6/lib/libXinerama.so.6.0
-./usr/X11R6/lib/libXmu.so.11.0
-./usr/X11R6/lib/libXmuu.so.6.0
-./usr/X11R6/lib/libXpm.so.9.0
-./usr/X11R6/lib/libXrandr.so.7.0
-./usr/X11R6/lib/libXrender.so.6.0
-./usr/X11R6/lib/libXss.so.6.0
-./usr/X11R6/lib/libXt.so.11.0
-./usr/X11R6/lib/libXtst.so.11.0
-./usr/X11R6/lib/libXv.so.6.0
-./usr/X11R6/lib/libXvMC.so.6.0
-./usr/X11R6/lib/libXvMCW.so.2.0
-./usr/X11R6/lib/libXxf86dga.so.6.0
-./usr/X11R6/lib/libXxf86misc.so.6.0
-./usr/X11R6/lib/libXxf86vm.so.6.0
-./usr/X11R6/lib/libdmx.so.2.0
-./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.4.1
-./usr/X11R6/lib/libfontconfig.so.9.0
-./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libglapi.a
-./usr/X11R6/lib/libglapi.so.0.0
-./usr/X11R6/lib/libpciaccess.so.2.0
-./usr/X11R6/lib/libpixman-1.a
-./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
-./usr/X11R6/lib/libpthread-stubs.so.2.0
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
-./usr/X11R6/lib/libxcb-atom.so.2.0
-./usr/X11R6/lib/libxcb-aux.so.1.0
-./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-damage.so.1.0
-./usr/X11R6/lib/libxcb-dpms.so.1.0
-./usr/X11R6/lib/libxcb-dri2.so.1.0
-./usr/X11R6/lib/libxcb-event.so.2.0
-./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.so.2.0
-./usr/X11R6/lib/libxcb-image.so.1.0
-./usr/X11R6/lib/libxcb-keysyms.so.2.0
-./usr/X11R6/lib/libxcb-property.so.2.0
-./usr/X11R6/lib/libxcb-randr.so.2.0
-./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.so.1.0
-./usr/X11R6/lib/libxcb-render.so.1.0
-./usr/X11R6/lib/libxcb-reply.so.2.0
-./usr/X11R6/lib/libxcb-res.so.1.0
-./usr/X11R6/lib/libxcb-screensaver.so.1.0
-./usr/X11R6/lib/libxcb-shape.so.1.0
-./usr/X11R6/lib/libxcb-shm.so.1.0
-./usr/X11R6/lib/libxcb-sync.so.1.0
-./usr/X11R6/lib/libxcb-xevie.so.1.0
-./usr/X11R6/lib/libxcb-xf86dri.so.2.0
-./usr/X11R6/lib/libxcb-xfixes.so.1.0
-./usr/X11R6/lib/libxcb-xinerama.so.1.0
-./usr/X11R6/lib/libxcb-xprint.so.2.0
-./usr/X11R6/lib/libxcb-xtest.so.1.0
-./usr/X11R6/lib/libxcb-xv.so.1.0
-./usr/X11R6/lib/libxcb-xvmc.so.1.0
-./usr/X11R6/lib/libxcb.so.3.0
-./usr/X11R6/lib/libxkbfile.so.6.0
-./usr/X11R6/lib/modules/dri/swrast_dri.so
-./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
-./usr/X11R6/lib/pkgconfig/egl.pc
-./usr/X11R6/lib/pkgconfig/gl.pc
-./usr/X11R6/lib/pkgconfig/glesv1_cm.pc
-./usr/X11R6/lib/pkgconfig/glesv2.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/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/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
deleted file mode 100644
index 530def08d..000000000
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ /dev/null
@@ -1,220 +0,0 @@
-./usr/X11R6/bin/glxgears
-./usr/X11R6/bin/glxinfo
-./usr/X11R6/bin/ucs2any
-./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
-./usr/X11R6/include/EGL/egl.h
-./usr/X11R6/include/EGL/eglext.h
-./usr/X11R6/include/EGL/eglmesaext.h
-./usr/X11R6/include/EGL/eglplatform.h
-./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/glu_mangle.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/GLES/egl.h
-./usr/X11R6/include/GLES/gl.h
-./usr/X11R6/include/GLES/glext.h
-./usr/X11R6/include/GLES/glplatform.h
-./usr/X11R6/include/GLES2/gl2.h
-./usr/X11R6/include/GLES2/gl2ext.h
-./usr/X11R6/include/GLES2/gl2platform.h
-./usr/X11R6/include/GLES3/gl3.h
-./usr/X11R6/include/GLES3/gl3ext.h
-./usr/X11R6/include/GLES3/gl3platform.h
-./usr/X11R6/include/KHR/khrplatform.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/txc_dxtn.h
-./usr/X11R6/include/xf86drm.h
-./usr/X11R6/include/xf86drmMode.h
-./usr/X11R6/lib/libEGL.a
-./usr/X11R6/lib/libEGL.so.0.0
-./usr/X11R6/lib/libFS.so.10.0
-./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.15.0
-./usr/X11R6/lib/libGLESv1_CM.a
-./usr/X11R6/lib/libGLESv1_CM.so.0.0
-./usr/X11R6/lib/libGLESv2.a
-./usr/X11R6/lib/libGLESv2.so.0.0
-./usr/X11R6/lib/libGLU.a
-./usr/X11R6/lib/libGLU.la
-./usr/X11R6/lib/libGLU.so.9.0
-./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.6.0
-./usr/X11R6/lib/libICE.so.10.0
-./usr/X11R6/lib/libSM.so.9.0
-./usr/X11R6/lib/libX11-xcb.so.2.0
-./usr/X11R6/lib/libX11.so.16.0
-./usr/X11R6/lib/libXRes.so.5.0
-./usr/X11R6/lib/libXau.so.10.0
-./usr/X11R6/lib/libXaw.so.15.0
-./usr/X11R6/lib/libXaw7.so.15.0
-./usr/X11R6/lib/libXcomposite.so.4.0
-./usr/X11R6/lib/libXcursor.so.5.0
-./usr/X11R6/lib/libXdamage.so.4.0
-./usr/X11R6/lib/libXdmcp.so.11.0
-./usr/X11R6/lib/libXext.so.13.0
-./usr/X11R6/lib/libXfixes.so.6.0
-./usr/X11R6/lib/libXfont.so.11.0
-./usr/X11R6/lib/libXfontcache.so.5.0
-./usr/X11R6/lib/libXft.so.9.0
-./usr/X11R6/lib/libXi.so.12.0
-./usr/X11R6/lib/libXinerama.so.6.0
-./usr/X11R6/lib/libXmu.so.11.0
-./usr/X11R6/lib/libXmuu.so.6.0
-./usr/X11R6/lib/libXpm.so.9.0
-./usr/X11R6/lib/libXrandr.so.7.0
-./usr/X11R6/lib/libXrender.so.6.0
-./usr/X11R6/lib/libXss.so.6.0
-./usr/X11R6/lib/libXt.so.11.0
-./usr/X11R6/lib/libXtst.so.11.0
-./usr/X11R6/lib/libXv.so.6.0
-./usr/X11R6/lib/libXvMC.so.6.0
-./usr/X11R6/lib/libXvMCW.so.2.0
-./usr/X11R6/lib/libXxf86dga.so.6.0
-./usr/X11R6/lib/libXxf86misc.so.6.0
-./usr/X11R6/lib/libXxf86vm.so.6.0
-./usr/X11R6/lib/libdmx.so.2.0
-./usr/X11R6/lib/libdrm.a
-./usr/X11R6/lib/libdrm.so.4.1
-./usr/X11R6/lib/libfontconfig.so.9.0
-./usr/X11R6/lib/libfontenc.so.4.0
-./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libglapi.a
-./usr/X11R6/lib/libglapi.so.0.0
-./usr/X11R6/lib/libpciaccess.so.2.0
-./usr/X11R6/lib/libpixman-1.a
-./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
-./usr/X11R6/lib/libpthread-stubs.so.2.0
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
-./usr/X11R6/lib/libxcb-atom.so.2.0
-./usr/X11R6/lib/libxcb-aux.so.1.0
-./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-damage.so.1.0
-./usr/X11R6/lib/libxcb-dpms.so.1.0
-./usr/X11R6/lib/libxcb-dri2.so.1.0
-./usr/X11R6/lib/libxcb-event.so.2.0
-./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.so.2.0
-./usr/X11R6/lib/libxcb-image.so.1.0
-./usr/X11R6/lib/libxcb-keysyms.so.2.0
-./usr/X11R6/lib/libxcb-property.so.2.0
-./usr/X11R6/lib/libxcb-randr.so.2.0
-./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.so.1.0
-./usr/X11R6/lib/libxcb-render.so.1.0
-./usr/X11R6/lib/libxcb-reply.so.2.0
-./usr/X11R6/lib/libxcb-res.so.1.0
-./usr/X11R6/lib/libxcb-screensaver.so.1.0
-./usr/X11R6/lib/libxcb-shape.so.1.0
-./usr/X11R6/lib/libxcb-shm.so.1.0
-./usr/X11R6/lib/libxcb-sync.so.1.0
-./usr/X11R6/lib/libxcb-xevie.so.1.0
-./usr/X11R6/lib/libxcb-xf86dri.so.2.0
-./usr/X11R6/lib/libxcb-xfixes.so.1.0
-./usr/X11R6/lib/libxcb-xinerama.so.1.0
-./usr/X11R6/lib/libxcb-xprint.so.2.0
-./usr/X11R6/lib/libxcb-xtest.so.1.0
-./usr/X11R6/lib/libxcb-xv.so.1.0
-./usr/X11R6/lib/libxcb-xvmc.so.1.0
-./usr/X11R6/lib/libxcb.so.3.0
-./usr/X11R6/lib/libxkbfile.so.6.0
-./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
-./usr/X11R6/lib/pkgconfig/egl.pc
-./usr/X11R6/lib/pkgconfig/gl.pc
-./usr/X11R6/lib/pkgconfig/glesv1_cm.pc
-./usr/X11R6/lib/pkgconfig/glesv2.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
deleted file mode 100644
index e0199028d..000000000
--- a/distrib/sets/lists/xetc/md.hp300
+++ /dev/null
@@ -1 +0,0 @@
-./etc/X11/fs/config
diff --git a/distrib/sets/lists/xetc/md.mvme68k b/distrib/sets/lists/xetc/md.mvme68k
deleted file mode 100644
index e0199028d..000000000
--- a/distrib/sets/lists/xetc/md.mvme68k
+++ /dev/null
@@ -1 +0,0 @@
-./etc/X11/fs/config
diff --git a/distrib/sets/lists/xetc/md.mvme88k b/distrib/sets/lists/xetc/md.mvme88k
deleted file mode 100644
index e0199028d..000000000
--- a/distrib/sets/lists/xetc/md.mvme88k
+++ /dev/null
@@ -1 +0,0 @@
-./etc/X11/fs/config
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
deleted file mode 100644
index 6d02563b2..000000000
--- a/distrib/sets/lists/xserv/md.hp300
+++ /dev/null
@@ -1,269 +0,0 @@
-./usr/X11R6/bin/X
-./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
-./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/Xvfb
-./usr/X11R6/bin/ucs2any
-./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
-./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/Xprintf.h
-./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/callback.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
-./usr/X11R6/include/xorg/colormapst.h
-./usr/X11R6/include/xorg/compiler.h
-./usr/X11R6/include/xorg/cursor.h
-./usr/X11R6/include/xorg/cursorstr.h
-./usr/X11R6/include/xorg/damage.h
-./usr/X11R6/include/xorg/damagestr.h
-./usr/X11R6/include/xorg/dbestruct.h
-./usr/X11R6/include/xorg/dgaproc.h
-./usr/X11R6/include/xorg/dix.h
-./usr/X11R6/include/xorg/dixevents.h
-./usr/X11R6/include/xorg/dixfont.h
-./usr/X11R6/include/xorg/dixfontstr.h
-./usr/X11R6/include/xorg/dixgrabs.h
-./usr/X11R6/include/xorg/dixstruct.h
-./usr/X11R6/include/xorg/edid.h
-./usr/X11R6/include/xorg/exa.h
-./usr/X11R6/include/xorg/exevents.h
-./usr/X11R6/include/xorg/extension.h
-./usr/X11R6/include/xorg/extinit.h
-./usr/X11R6/include/xorg/extnsionst.h
-./usr/X11R6/include/xorg/fb.h
-./usr/X11R6/include/xorg/fbdevhw.h
-./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbrop.h
-./usr/X11R6/include/xorg/fi1236.h
-./usr/X11R6/include/xorg/fourcc.h
-./usr/X11R6/include/xorg/gc.h
-./usr/X11R6/include/xorg/gcstruct.h
-./usr/X11R6/include/xorg/globals.h
-./usr/X11R6/include/xorg/glx_extinit.h
-./usr/X11R6/include/xorg/glyphstr.h
-./usr/X11R6/include/xorg/hotplug.h
-./usr/X11R6/include/xorg/i2c_def.h
-./usr/X11R6/include/xorg/input.h
-./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/micmap.h
-./usr/X11R6/include/xorg/micoord.h
-./usr/X11R6/include/xorg/mifillarc.h
-./usr/X11R6/include/xorg/mifpoly.h
-./usr/X11R6/include/xorg/migc.h
-./usr/X11R6/include/xorg/miline.h
-./usr/X11R6/include/xorg/mipict.h
-./usr/X11R6/include/xorg/mipointer.h
-./usr/X11R6/include/xorg/mipointrst.h
-./usr/X11R6/include/xorg/misc.h
-./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
-./usr/X11R6/include/xorg/opaque.h
-./usr/X11R6/include/xorg/os.h
-./usr/X11R6/include/xorg/picture.h
-./usr/X11R6/include/xorg/picturestr.h
-./usr/X11R6/include/xorg/pixmap.h
-./usr/X11R6/include/xorg/pixmapstr.h
-./usr/X11R6/include/xorg/property.h
-./usr/X11R6/include/xorg/propertyst.h
-./usr/X11R6/include/xorg/randrstr.h
-./usr/X11R6/include/xorg/region.h
-./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/resource.h
-./usr/X11R6/include/xorg/rgb.h
-./usr/X11R6/include/xorg/screenint.h
-./usr/X11R6/include/xorg/scrnintstr.h
-./usr/X11R6/include/xorg/selection.h
-./usr/X11R6/include/xorg/servermd.h
-./usr/X11R6/include/xorg/shadow.h
-./usr/X11R6/include/xorg/shadowfb.h
-./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
-./usr/X11R6/include/xorg/uda1380.h
-./usr/X11R6/include/xorg/validate.h
-./usr/X11R6/include/xorg/vbe.h
-./usr/X11R6/include/xorg/vbeModes.h
-./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/wfbrename.h
-./usr/X11R6/include/xorg/window.h
-./usr/X11R6/include/xorg/windowstr.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
-./usr/X11R6/include/xorg/xf86DDC.h
-./usr/X11R6/include/xorg/xf86Modes.h
-./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86Opt.h
-./usr/X11R6/include/xorg/xf86Optrec.h
-./usr/X11R6/include/xorg/xf86Parser.h
-./usr/X11R6/include/xorg/xf86Pci.h
-./usr/X11R6/include/xorg/xf86PciInfo.h
-./usr/X11R6/include/xorg/xf86Priv.h
-./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86RandR12.h
-./usr/X11R6/include/xorg/xf86Rename.h
-./usr/X11R6/include/xorg/xf86Xinput.h
-./usr/X11R6/include/xorg/xf86_OSlib.h
-./usr/X11R6/include/xorg/xf86_OSproc.h
-./usr/X11R6/include/xorg/xf86cmap.h
-./usr/X11R6/include/xorg/xf86fbman.h
-./usr/X11R6/include/xorg/xf86i2c.h
-./usr/X11R6/include/xorg/xf86int10.h
-./usr/X11R6/include/xorg/xf86platformBus.h
-./usr/X11R6/include/xorg/xf86sbusBus.h
-./usr/X11R6/include/xorg/xf86str.h
-./usr/X11R6/include/xorg/xf86xv.h
-./usr/X11R6/include/xorg/xf86xvmc.h
-./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xisb.h
-./usr/X11R6/include/xorg/xkbsrv.h
-./usr/X11R6/include/xorg/xorg-server.h
-./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/libglx.la
-./usr/X11R6/lib/modules/extensions/libglx.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
-./usr/X11R6/lib/modules/input/mouse_drv.so
-./usr/X11R6/lib/modules/input/usbtablet_drv.la
-./usr/X11R6/lib/modules/input/usbtablet_drv.so
-./usr/X11R6/lib/modules/input/void_drv.la
-./usr/X11R6/lib/modules/input/void_drv.so
-./usr/X11R6/lib/modules/input/ws_drv.la
-./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libexa.la
-./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
-./usr/X11R6/lib/modules/libfbdevhw.la
-./usr/X11R6/lib/modules/libfbdevhw.so
-./usr/X11R6/lib/modules/libint10.la
-./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libshadow.la
-./usr/X11R6/lib/modules/libshadow.so
-./usr/X11R6/lib/modules/libshadowfb.la
-./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
-./usr/X11R6/lib/modules/libvgahw.la
-./usr/X11R6/lib/modules/libvgahw.so
-./usr/X11R6/lib/modules/libwfb.la
-./usr/X11R6/lib/modules/libwfb.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
-./usr/X11R6/lib/modules/multimedia/fi1236_drv.so
-./usr/X11R6/lib/modules/multimedia/msp3430_drv.la
-./usr/X11R6/lib/modules/multimedia/msp3430_drv.so
-./usr/X11R6/lib/modules/multimedia/tda8425_drv.la
-./usr/X11R6/lib/modules/multimedia/tda8425_drv.so
-./usr/X11R6/lib/modules/multimedia/tda9850_drv.la
-./usr/X11R6/lib/modules/multimedia/tda9850_drv.so
-./usr/X11R6/lib/modules/multimedia/tda9885_drv.la
-./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
-./usr/X11R6/man/man1/Xvfb.1
-./usr/X11R6/man/man1/dga.1
-./usr/X11R6/man/man1/ucs2any.1
-./usr/X11R6/man/man1/xdriinfo.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/man/man4/exa.4
-./usr/X11R6/man/man4/fbdevhw.4
-./usr/X11R6/man/man4/kbd.4
-./usr/X11R6/man/man4/mouse.4
-./usr/X11R6/man/man4/mousedrv.4
-./usr/X11R6/man/man4/usbtablet.4
-./usr/X11R6/man/man4/void.4
-./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
-./var/db/xkb
-./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
deleted file mode 100644
index b6986fa32..000000000
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ /dev/null
@@ -1,64 +0,0 @@
-./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
-./usr/X11R6/bin/Xvfb
-./usr/X11R6/include/xorg
-./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
-./usr/X11R6/man/man1/Xserver.1
-./usr/X11R6/man/man1/Xvfb.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
-./var/db/xkb
-./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
deleted file mode 100644
index 93c6035fa..000000000
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ /dev/null
@@ -1,12 +0,0 @@
-./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.hp300 b/distrib/sets/lists/xshare/md.hp300
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xshare/md.hp300
+++ /dev/null
diff --git a/distrib/sets/lists/xshare/md.mvme68k b/distrib/sets/lists/xshare/md.mvme68k
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xshare/md.mvme68k
+++ /dev/null
diff --git a/distrib/sets/lists/xshare/md.mvme88k b/distrib/sets/lists/xshare/md.mvme88k
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xshare/md.mvme88k
+++ /dev/null
diff --git a/driver/Makefile b/driver/Makefile
index 8d0de1efe..81647c548 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2013/11/17 14:33:05 matthieu Exp $
+# $OpenBSD: Makefile,v 1.59 2014/03/18 22:37:29 miod Exp $
 
 INPUT_DRV_DEFAULT= \
 	xf86-input-keyboard \
@@ -18,8 +18,6 @@ INPUT_DRV_amd64= ${INPUT_DRV_COMMON} xf86-input-synaptics xf86-input-vmmouse
 
 INPUT_DRV_aviion=
 
-INPUT_DRV_hp300= ${INPUT_DRV_DEFAULT}
-
 INPUT_DRV_hppa= ${INPUT_DRV_DEFAULT}
 
 INPUT_DRV_i386= ${INPUT_DRV_COMMON} xf86-input-synaptics xf86-input-vmmouse
@@ -32,9 +30,6 @@ INPUT_DRV_luna88k= ${INPUT_DRV_DEFAULT}
 
 INPUT_DRV_macppc= ${INPUT_DRV_COMMON}
 
-INPUT_DRV_mvme68k=
-INPUT_DRV_mvme88k=
-
 INPUT_DRV_octeon=
 
 INPUT_DRV_sgi= ${INPUT_DRV_DEFAULT}
@@ -70,9 +65,6 @@ VIDEO_DRV_armish= \
 
 VIDEO_DRV_aviion=
 
-VIDEO_DRV_hp300= \
-	xf86-video-wsfb
-
 VIDEO_DRV_hppa= \
 	xf86-video-wsfb \
 	xf86-video-wsudl
@@ -95,9 +87,6 @@ VIDEO_DRV_macppc= \
 	xf86-video-ati xf86-video-mach64 xf86-video-nv xf86-video-r128 \
 	xf86-video-wsfb xf86-video-wsudl
 
-VIDEO_DRV_mvme68k=
-VIDEO_DRV_mvme88k=
-
 VIDEO_DRV_octeon=
 
 VIDEO_DRV_sgi= xf86-video-wsfb
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 3c0460ea9..a93302004 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.50 2013/12/28 16:31:18 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.51 2014/03/18 22:37:29 miod Exp $
 
 .include <bsd.xconf.mk>
 
@@ -6,9 +6,9 @@ DIST= ${.CURDIR}
 
 # Machines for which we don't build the Xorg Xserver
 NO_XORG_MACHINES=	alpha aviion hppa64 landisk  \
-			mvme68k mvme88k octeon solbourne vax
+			octeon solbourne vax
 
-NO_XF86UTIL_MACHINES=	hp300 landisk luna88k mac68k octeon sgi sparc vax
+NO_XF86UTIL_MACHINES=	landisk luna88k mac68k octeon sgi sparc vax
 
 .for M in ${NO_XORG_MACHINES} 
 NO_XORG_${M} = --disable-xorg
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.am b/xserver/hw/xfree86/os-support/bsd/Makefile.am
index bd0ac8e65..09e482522 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.am
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.am
@@ -37,11 +37,6 @@ ARCH_SOURCES = arm_video.c \
 	$(srcdir)/../shared/ioperm_noop.c
 endif
 
-if HP300_VIDEO
-ARCH_SOURCES = hp300_video.c \
-	$(srcdir)/../shared/ioperm_noop.c
-endif 
-
 if HPPA_VIDEO
 ARCH_SOURCES = hppa_video.c\
 	$(srcdir)/../shared/ioperm_noop.c
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in
index 28da9b1d5..82e4ef4ca 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in
@@ -78,26 +78,24 @@ am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/posix_tty.c \
 	$(srcdir)/../shared/sigio.c $(srcdir)/../shared/vidmem.c \
 	bsd_VTsw.c bsd_init.c bsd_bell.c alpha_video.c bsd_ev56.c \
 	bsd_axp.c $(srcdir)/../shared/xf86Axp.c arm_video.c \
-	$(srcdir)/../shared/ioperm_noop.c hp300_video.c hppa_video.c \
+	$(srcdir)/../shared/ioperm_noop.c hppa_video.c \
 	i386_video.c luna88k_video.c ppc_video.c sgi_video.c \
 	sparc64_video.c bsd_sbus.c $(srcdir)/../shared/agp_noop.c \
 	bsd_agp.c $(srcdir)/../shared/pm_noop.c $(srcdir)/bsd_apm.c \
 	$(srcdir)/bsd_kqueue_apm.c $(srcdir)/../shared/kmod_noop.c \
 	bsd_kmod.c
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	bsd_sbus.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_TRUE@am__objects_1 = sgi_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_TRUE@am__objects_1 = luna88k_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@am__objects_1 = hppa_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_TRUE@	ioperm_noop.lo
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@am__objects_1 = hp300_video.lo \
-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	bsd_sbus.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_TRUE@am__objects_1 = sgi_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SGI_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_FALSE@@PPC_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_TRUE@am__objects_1 = luna88k_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@LUNA88K_VIDEO_TRUE@	ioperm_noop.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_TRUE@am__objects_1 = hppa_video.lo \
+@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HPPA_VIDEO_TRUE@	ioperm_noop.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo \
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@	ioperm_noop.lo
 @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
@@ -504,9 +502,6 @@ noinst_LTLIBRARIES = libbsd.la
 @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c \
 @ARM_VIDEO_TRUE@	$(srcdir)/../shared/ioperm_noop.c
 
-@HP300_VIDEO_TRUE@ARCH_SOURCES = hp300_video.c \
-@HP300_VIDEO_TRUE@	$(srcdir)/../shared/ioperm_noop.c
-
 @HPPA_VIDEO_TRUE@ARCH_SOURCES = hppa_video.c\
 @HPPA_VIDEO_TRUE@	$(srcdir)/../shared/ioperm_noop.c
 
@@ -618,7 +613,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kmod.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kqueue_apm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_sbus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp300_video.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hppa_video.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386_video.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioperm_noop.Plo@am__quote@
diff --git a/xserver/hw/xfree86/os-support/bsd/hp300_video.c b/xserver/hw/xfree86/os-support/bsd/hp300_video.c
deleted file mode 100644
index 8850378e6..000000000
--- a/xserver/hw/xfree86/os-support/bsd/hp300_video.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $OpenBSD: hp300_video.c,v 1.5 2013/06/07 17:28:52 matthieu Exp $	*/
-/*
- * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of Rich Murphey and David Wexelblat
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission.  Rich Murphey and
- * David Wexelblat make no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "xf86.h"
-#include "xf86Priv.h"
-
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-
-#ifndef MAP_FAILED
-#define MAP_FAILED ((caddr_t)-1)
-#endif
-
-/***************************************************************************/
-/* Video Memory Mapping section                                            */
-/***************************************************************************/
-
-static pointer hp300MapVidMem(int, unsigned long, unsigned long, int);
-static void hp300UnmapVidMem(int, pointer, unsigned long);
-
-
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
-	pVidMem->linearSupported = TRUE;
-	pVidMem->mapMem = hp300MapVidMem;
-	pVidMem->unmapMem = hp300UnmapVidMem;
-	pVidMem->initialised = TRUE;
-}
-
-
-static pointer
-hp300MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-	int fd = xf86Info.consoleFd;
-	pointer base;
-
-#ifdef DEBUG
-	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d\n",
-	    Base, Size, fd);
-#endif
-
-       base = mmap(0, Size,
-                   (flags & VIDMEM_READONLY) ?
-                    PROT_READ : (PROT_READ | PROT_WRITE),
-                   MAP_SHARED, fd, Base);
-	if (base == MAP_FAILED)
-		FatalError("%s: could not mmap screen [s=%x,a=%x] (%s)",
-			   "xf86MapVidMem", Size, Base, strerror(errno));
-	return base;
-}
-
-static void
-hp300UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-{
-	munmap(Base, Size);
-}
-
-_X_EXPORT int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
-{
-	return 0;
-}
-
-/***************************************************************************/
-/* Interrupt Handling section                                              */
-/***************************************************************************/
-
-_X_EXPORT Bool
-xf86DisableInterrupts()
-{
-
-	return(TRUE);
-}
-
-_X_EXPORT void
-xf86EnableInterrupts()
-{
-
-	return;
-}
-
-#ifdef X_PRIVSEP
-/*
- * Do all initialisation that need root privileges
- */
-_X_EXPORT void
-xf86PrivilegedInit(void)
-{
-	xf86OpenConsole();
-}
-#endif