7 files changed, 4 insertions, 473 deletions
diff --git a/distrib/notes/README.mac68k b/distrib/notes/README.mac68k
deleted file mode 100644
index 4c3276f68..000000000
--- a/distrib/notes/README.mac68k
+++ /dev/null
@@ -1,8 +0,0 @@
-Post-installation instructions for X.Org on OpenBSD/mac68k
-----------------------------------------------------------
-
-There is no X server for mac68k.  Only userland X.
-
-problem_blurb
-
-$OpenBSD: README.mac68k,v 1.3 2012/02/07 19:53:13 matthieu Exp $
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
deleted file mode 100644
index 1d3d4edef..000000000
--- a/distrib/sets/lists/xbase/md.mac68k
+++ /dev/null
@@ -1,199 +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/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/osmesa.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/xf86drmMode.h
-./usr/X11R6/include/xorg/compositeext.h
-./usr/X11R6/include/xorg/dixaccess.h
-./usr/X11R6/include/xorg/dri2.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/hotplug.h
-./usr/X11R6/include/xorg/list.h
-./usr/X11R6/include/xorg/mioverlay.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/shmint.h
-./usr/X11R6/include/xorg/vidmodeproc.h
-./usr/X11R6/include/xorg/wfbrename.h
-./usr/X11R6/include/xorg/ws-properties.h
-./usr/X11R6/include/xorg/xf86Crtc.h
-./usr/X11R6/include/xorg/xf86Modes.h
-./usr/X11R6/include/xorg/xf86Optrec.h
-./usr/X11R6/include/xorg/xf86Parser.h
-./usr/X11R6/include/xorg/xf86RandR12.h
-./usr/X11R6/include/xorg/xf86Rename.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/xkbsrv.h
-./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/include/xorg/xserver-properties.h
-./usr/X11R6/lib/libFS.so.9.0
-./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.12.0
-./usr/X11R6/lib/libGLU.a
-./usr/X11R6/lib/libGLU.so.7.0
-./usr/X11R6/lib/libGLU_pic.a
-./usr/X11R6/lib/libGL_pic.a
-./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.5.1
-./usr/X11R6/lib/libGLw_pic.a
-./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_pic.a
-./usr/X11R6/lib/libfontconfig.so.7.0
-./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.18.2
-./usr/X11R6/lib/libfreetype_pic.a
-./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.24.4
-./usr/X11R6/lib/libpthread-stubs.so.1.0
-./usr/X11R6/lib/libpthread-stubs_pic.a
-./usr/X11R6/lib/libxcb-atom.so.1.0
-./usr/X11R6/lib/libxcb-atom_pic.a
-./usr/X11R6/lib/libxcb-aux.so.0.0
-./usr/X11R6/lib/libxcb-aux_pic.a
-./usr/X11R6/lib/libxcb-composite.so.0.0
-./usr/X11R6/lib/libxcb-composite_pic.a
-./usr/X11R6/lib/libxcb-damage.so.0.0
-./usr/X11R6/lib/libxcb-damage_pic.a
-./usr/X11R6/lib/libxcb-dpms.so.0.0
-./usr/X11R6/lib/libxcb-dpms_pic.a
-./usr/X11R6/lib/libxcb-dri2.so.0.1
-./usr/X11R6/lib/libxcb-dri2_pic.a
-./usr/X11R6/lib/libxcb-event.so.1.0
-./usr/X11R6/lib/libxcb-event_pic.a
-./usr/X11R6/lib/libxcb-glx.so.0.1
-./usr/X11R6/lib/libxcb-glx_pic.a
-./usr/X11R6/lib/libxcb-icccm.so.1.1
-./usr/X11R6/lib/libxcb-icccm_pic.a
-./usr/X11R6/lib/libxcb-image.so.0.0
-./usr/X11R6/lib/libxcb-image_pic.a
-./usr/X11R6/lib/libxcb-keysyms.so.1.0
-./usr/X11R6/lib/libxcb-keysyms_pic.a
-./usr/X11R6/lib/libxcb-property.so.1.0
-./usr/X11R6/lib/libxcb-property_pic.a
-./usr/X11R6/lib/libxcb-randr.so.1.0
-./usr/X11R6/lib/libxcb-randr_pic.a
-./usr/X11R6/lib/libxcb-record.so.0.0
-./usr/X11R6/lib/libxcb-record_pic.a
-./usr/X11R6/lib/libxcb-render-util.so.0.0
-./usr/X11R6/lib/libxcb-render-util_pic.a
-./usr/X11R6/lib/libxcb-render.so.0.0
-./usr/X11R6/lib/libxcb-render_pic.a
-./usr/X11R6/lib/libxcb-reply.so.1.0
-./usr/X11R6/lib/libxcb-reply_pic.a
-./usr/X11R6/lib/libxcb-res.so.0.0
-./usr/X11R6/lib/libxcb-res_pic.a
-./usr/X11R6/lib/libxcb-screensaver.so.0.0
-./usr/X11R6/lib/libxcb-screensaver_pic.a
-./usr/X11R6/lib/libxcb-shape.so.0.0
-./usr/X11R6/lib/libxcb-shape_pic.a
-./usr/X11R6/lib/libxcb-shm.so.0.0
-./usr/X11R6/lib/libxcb-shm_pic.a
-./usr/X11R6/lib/libxcb-sync.so.0.1
-./usr/X11R6/lib/libxcb-sync_pic.a
-./usr/X11R6/lib/libxcb-xevie.so.0.0
-./usr/X11R6/lib/libxcb-xevie_pic.a
-./usr/X11R6/lib/libxcb-xf86dri.so.1.1
-./usr/X11R6/lib/libxcb-xf86dri_pic.a
-./usr/X11R6/lib/libxcb-xfixes.so.0.0
-./usr/X11R6/lib/libxcb-xfixes_pic.a
-./usr/X11R6/lib/libxcb-xinerama.so.0.0
-./usr/X11R6/lib/libxcb-xinerama_pic.a
-./usr/X11R6/lib/libxcb-xprint.so.0.0
-./usr/X11R6/lib/libxcb-xprint_pic.a
-./usr/X11R6/lib/libxcb-xtest.so.0.0
-./usr/X11R6/lib/libxcb-xtest_pic.a
-./usr/X11R6/lib/libxcb-xv.so.0.0
-./usr/X11R6/lib/libxcb-xv_pic.a
-./usr/X11R6/lib/libxcb-xvmc.so.0.0
-./usr/X11R6/lib/libxcb-xvmc_pic.a
-./usr/X11R6/lib/libxcb.so.2.3
-./usr/X11R6/lib/libxcb_pic.a
-./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/pixman-1.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
-./usr/X11R6/share/xcb/xkb.xml
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32.cache-3
diff --git a/distrib/sets/lists/xetc/md.mac68k b/distrib/sets/lists/xetc/md.mac68k
deleted file mode 100644
index 7aa8b58b2..000000000
--- a/distrib/sets/lists/xetc/md.mac68k
+++ /dev/null
@@ -1,2 +0,0 @@
-./etc/X11/fs/config
-./etc/X11/xorg.conf
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
deleted file mode 100644
index 385903504..000000000
--- a/distrib/sets/lists/xserv/md.mac68k
+++ /dev/null
@@ -1,256 +0,0 @@
-./usr/X11R6/bin/X
-./usr/X11R6/bin/Xnest
-./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/Xvfb
-./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/glyphstr.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/mibstore.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/window.h
-./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.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.h
-./usr/X11R6/include/xorg/xf86Cursor.h
-./usr/X11R6/include/xorg/xf86DDC.h
-./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86Opt.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/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/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/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/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/libextmod.la
-./usr/X11R6/lib/modules/extensions/libextmod.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/libxaa.la
-./usr/X11R6/lib/modules/libxaa.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-server.pc
-./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/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/xshare/md.mac68k b/distrib/sets/lists/xshare/md.mac68k
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xshare/md.mac68k
+++ /dev/null
diff --git a/driver/Makefile b/driver/Makefile
index d7ebe19c2..3051231a5 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2012/06/02 23:23:12 matthieu Exp $
+# $OpenBSD: Makefile,v 1.51 2012/06/20 19:56:34 matthieu Exp $
 
 # Check for Xserver 1.12 or later
 USING_XSERVER_112 != if pkg-config --atleast-version 1.10 xorg-server; then \
@@ -33,8 +33,6 @@ INPUT_DRV_landisk=
 
 INPUT_DRV_loongson= ${INPUT_DRV_DEFAULT}
 
-INPUT_DRV_mac68k=
-
 INPUT_DRV_macppc= ${INPUT_DRV_COMMON}
 
 INPUT_DRV_mvme68k=
@@ -95,8 +93,6 @@ VIDEO_DRV_landisk=
 VIDEO_DRV_loongson= \
 	xf86-video-wsfb
 
-VIDEO_DRV_mac68k=
-
 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/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 9db2956e1..4bfb09b36 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.42 2012/03/10 18:35:56 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.43 2012/06/20 19:56:34 matthieu 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 hp300 hppa64 landisk \
 			mvme68k mvme88k mvmeppc solbourne vax
 
-NO_XF86UTIL_MACHINES=	hp300 landisk mac68k sgi sparc vax
+NO_XF86UTIL_MACHINES=	hp300 landisk sgi sparc vax
 
 .for M in ${NO_XORG_MACHINES} 
 NO_XORG_${M} = --disable-xorg