Remove zaurus support

9 files changed, 2 insertions, 431 deletions

diff --git a/Makefile b/Makefile
index c0c8e0c7e..bccaaf921 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.71 2016/07/30 12:18:35 matthieu Exp $
+# $OpenBSD: Makefile,v 1.72 2016/09/03 13:57:18 matthieu Exp $
 .include <bsd.own.mk>
 .include <bsd.xconf.mk>
 
 LOCALAPPD=/usr/local/lib/X11/app-defaults
 LOCALAPPX=/usr/local/lib/X11
 REALAPPD=/etc/X11/app-defaults
-XCONFIG=${XSRCDIR}/etc/X11.${MACHINE}/xorg.conf
 RM?=rm
 
 XSERVER= xserver
@@ -101,14 +100,6 @@ release-clean:
 
 release-install:
 	@exec ${MAKE} bootstrap-root
-.if ${MACHINE} == zaurus
-	@if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \
-	 echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \
-	else set -x; \
-	 ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 \
-		${XCONFIG} ${DESTDIR}/etc/X11 ; \
-	fi
-.endif
 	@exec ${MAKE} install
 
 dist-rel:
diff --git a/distrib/notes/README.zaurus b/distrib/notes/README.zaurus
deleted file mode 100644
index 5a1929cdb..000000000
--- a/distrib/notes/README.zaurus
+++ /dev/null
@@ -1,11 +0,0 @@
-Post-installation instructions for X.Org on OpenBSD/zaurus
-----------------------------------------------------------
-
-OpenBSD uses the X.Org X server on zaurus.
-
-A default /etc/X11/xorg.conf is installed so you can just use
-'startx' or xdm to start X without further configuration.
-
-problem_blurb
-
-$OpenBSD: README.zaurus,v 1.3 2012/02/07 19:53:13 matthieu Exp $
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
deleted file mode 100644
index 1fe058047..000000000
--- a/distrib/sets/lists/xbase/md.zaurus
+++ /dev/null
@@ -1,337 +0,0 @@
-./usr/X11R6/bin/glxgears
-./usr/X11R6/bin/glxinfo
-./usr/X11R6/bin/ucs2any
-./usr/X11R6/bin/xdriinfo
-./usr/X11R6/include/EGL/egl.h
-./usr/X11R6/include/EGL/eglext.h
-./usr/X11R6/include/EGL/eglextchromium.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/gl_mangle.h
-./usr/X11R6/include/GL/glcorearb.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/glx_mangle.h
-./usr/X11R6/include/GL/glxext.h
-./usr/X11R6/include/GL/internal/dri_interface.h
-./usr/X11R6/include/GL/osmesa.h
-./usr/X11R6/include/GL/wglext.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/gl31.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/epoxy/egl.h
-./usr/X11R6/include/epoxy/egl_generated.h
-./usr/X11R6/include/epoxy/gl.h
-./usr/X11R6/include/epoxy/gl_generated.h
-./usr/X11R6/include/epoxy/glx.h
-./usr/X11R6/include/epoxy/glx_generated.h
-./usr/X11R6/include/gbm.h
-./usr/X11R6/include/libdrm/amdgpu_drm.h
-./usr/X11R6/include/libdrm/drm.h
-./usr/X11R6/include/libdrm/drm_fourcc.h
-./usr/X11R6/include/libdrm/drm_mode.h
-./usr/X11R6/include/libdrm/drm_sarea.h
-./usr/X11R6/include/libdrm/i915_drm.h
-./usr/X11R6/include/libdrm/mach64_drm.h
-./usr/X11R6/include/libdrm/mga_drm.h
-./usr/X11R6/include/libdrm/nouveau_drm.h
-./usr/X11R6/include/libdrm/qxl_drm.h
-./usr/X11R6/include/libdrm/r128_drm.h
-./usr/X11R6/include/libdrm/radeon_drm.h
-./usr/X11R6/include/libdrm/savage_drm.h
-./usr/X11R6/include/libdrm/sis_drm.h
-./usr/X11R6/include/libdrm/tegra_drm.h
-./usr/X11R6/include/libdrm/vc4_drm.h
-./usr/X11R6/include/libdrm/via_drm.h
-./usr/X11R6/include/libdrm/vmwgfx_drm.h
-./usr/X11R6/include/txc_dxtn.h
-./usr/X11R6/include/xf86drm.h
-./usr/X11R6/include/xf86drmMode.h
-./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/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/compositeext.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/displaymode.h
-./usr/X11R6/include/xorg/dix.h
-./usr/X11R6/include/xorg/dixaccess.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/dri.h
-./usr/X11R6/include/xorg/dri2.h
-./usr/X11R6/include/xorg/dristruct.h
-./usr/X11R6/include/xorg/edid.h
-./usr/X11R6/include/xorg/events.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/fbpict.h
-./usr/X11R6/include/xorg/fbrop.h
-./usr/X11R6/include/xorg/fourcc.h
-./usr/X11R6/include/xorg/gc.h
-./usr/X11R6/include/xorg/gcstruct.h
-./usr/X11R6/include/xorg/geext.h
-./usr/X11R6/include/xorg/geint.h
-./usr/X11R6/include/xorg/glamor.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/list.h
-./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/micmap.h
-./usr/X11R6/include/xorg/micoord.h
-./usr/X11R6/include/xorg/migc.h
-./usr/X11R6/include/xorg/miline.h
-./usr/X11R6/include/xorg/mioverlay.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/mistruct.h
-./usr/X11R6/include/xorg/misync.h
-./usr/X11R6/include/xorg/misyncfd.h
-./usr/X11R6/include/xorg/misyncshm.h
-./usr/X11R6/include/xorg/misyncstr.h
-./usr/X11R6/include/xorg/mizerarc.h
-./usr/X11R6/include/xorg/nonsdk_extinit.h
-./usr/X11R6/include/xorg/opaque.h
-./usr/X11R6/include/xorg/optionstr.h
-./usr/X11R6/include/xorg/os.h
-./usr/X11R6/include/xorg/panoramiX.h
-./usr/X11R6/include/xorg/panoramiXsrv.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/present.h
-./usr/X11R6/include/xorg/presentext.h
-./usr/X11R6/include/xorg/privates.h
-./usr/X11R6/include/xorg/property.h
-./usr/X11R6/include/xorg/propertyst.h
-./usr/X11R6/include/xorg/ptrveloc.h
-./usr/X11R6/include/xorg/randrstr.h
-./usr/X11R6/include/xorg/region.h
-./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/registry.h
-./usr/X11R6/include/xorg/resource.h
-./usr/X11R6/include/xorg/rgb.h
-./usr/X11R6/include/xorg/rrtransform.h
-./usr/X11R6/include/xorg/sarea.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/shmint.h
-./usr/X11R6/include/xorg/site.h
-./usr/X11R6/include/xorg/syncsdk.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/ws-properties.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/xf86Optionstr.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/xf86VGAarbiter.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/xkbfile.h
-./usr/X11R6/include/xorg/xkbrules.h
-./usr/X11R6/include/xorg/xkbsrv.h
-./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/include/xorg/xorg-server.h
-./usr/X11R6/include/xorg/xorgVersion.h
-./usr/X11R6/include/xorg/xserver-properties.h
-./usr/X11R6/include/xorg/xvdix.h
-./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/libEGL.la
-./usr/X11R6/lib/libEGL.so.1.0
-./usr/X11R6/lib/libGL.la
-./usr/X11R6/lib/libGL.so.17.0
-./usr/X11R6/lib/libGLESv1_CM.la
-./usr/X11R6/lib/libGLESv1_CM.so.1.0
-./usr/X11R6/lib/libGLESv2.la
-./usr/X11R6/lib/libGLESv2.so.1.1
-./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/libOSMesa.la
-./usr/X11R6/lib/libOSMesa.so.10.0
-./usr/X11R6/lib/libdrm.la
-./usr/X11R6/lib/libdrm.so.7.1
-./usr/X11R6/lib/libepoxy.a
-./usr/X11R6/lib/libepoxy.so.2.0
-./usr/X11R6/lib/libgbm.la
-./usr/X11R6/lib/libgbm.so.0.0
-./usr/X11R6/lib/libglapi.la
-./usr/X11R6/lib/libglapi.so.0.2
-./usr/X11R6/lib/libtxc_dxtn.a
-./usr/X11R6/lib/libtxc_dxtn.so.0.0
-./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
-./usr/X11R6/lib/pkgconfig/egl.pc
-./usr/X11R6/lib/pkgconfig/epoxy.pc
-./usr/X11R6/lib/pkgconfig/gbm.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/osmesa.pc
-./usr/X11R6/lib/pkgconfig/xf86driproto.pc
-./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/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/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7
-./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7
-./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-7
-./var/cache/fontconfig/558352270fb122ca08359d23b5a778d4-le32d8.cache-7
-./var/cache/fontconfig/5dc9fcf026e07a49c5f91c19054b9930-le32d8.cache-7
-./var/cache/fontconfig/79652363633577d7d713baab7f54ad8c-le32d8.cache-7
-./var/cache/fontconfig/a1a78d9c18cd095d3829c724810e6ffb-le32d8.cache-7
-./var/cache/fontconfig/ba022efc551c75e21c690774bbcf5304-le32d8.cache-7
-./var/cache/fontconfig/bc06c1eea3e636f72101cafc3fb39508-le32d8.cache-7
-./var/cache/fontconfig/c5f5d66d15c24edc3e863c27139db87e-le32d8.cache-7
-./var/cache/fontconfig/f22309b238134d3cca63435f528976cd-le32d8.cache-7
diff --git a/distrib/sets/lists/xetc/md.zaurus b/distrib/sets/lists/xetc/md.zaurus
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xetc/md.zaurus
+++ /dev/null
diff --git a/distrib/sets/lists/xfont/md.zaurus b/distrib/sets/lists/xfont/md.zaurus
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xfont/md.zaurus
+++ /dev/null
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
deleted file mode 100644
index a3d9b4e1d..000000000
--- a/distrib/sets/lists/xserv/md.zaurus
+++ /dev/null
@@ -1,61 +0,0 @@
-./etc/X11/xorg.conf
-./usr/X11R6/bin/X
-./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
-./usr/X11R6/bin/gtf
-./usr/X11R6/lib/modules/dri/kms_swrast_dri.so
-./usr/X11R6/lib/modules/dri/swrast_dri.so
-./usr/X11R6/lib/modules/drivers/modesetting_drv.la
-./usr/X11R6/lib/modules/drivers/modesetting_drv.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/libglamoregl.la
-./usr/X11R6/lib/modules/libglamoregl.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/pkgconfig/xorg-mouse.pc
-./usr/X11R6/lib/pkgconfig/xorg-server.pc
-./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
-./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man4/exa.4
-./usr/X11R6/man/man4/fbdevhw.4
-./usr/X11R6/man/man4/kbd.4
-./usr/X11R6/man/man4/modesetting.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
diff --git a/distrib/sets/lists/xshare/md.zaurus b/distrib/sets/lists/xshare/md.zaurus
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/lists/xshare/md.zaurus
+++ /dev/null
diff --git a/driver/Makefile b/driver/Makefile
index 5ce594489..00081fe73 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2016/08/10 18:58:25 matthieu Exp $
+# $OpenBSD: Makefile,v 1.68 2016/09/03 13:57:18 matthieu Exp $
 
 INPUT_DRV_DEFAULT= \
 	xf86-input-keyboard \
@@ -34,8 +34,6 @@ INPUT_DRV_sgi= ${INPUT_DRV_DEFAULT}
 
 INPUT_DRV_sparc64= ${INPUT_DRV_COMMON}
 
-INPUT_DRV_zaurus= ${INPUT_DRV_DEFAULT}
-
 .if defined(INPUT_DRV_${MACHINE})
 INPUT_DRV= ${INPUT_DRV_${MACHINE}}
 .else
diff --git a/etc/X11.zaurus/xorg.conf b/etc/X11.zaurus/xorg.conf
deleted file mode 100644
index eafa1c5f6..000000000
--- a/etc/X11.zaurus/xorg.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# $OpenBSD: xorg.conf,v 1.5 2012/01/29 11:20:33 matthieu Exp $
-
-Section "Device"
-	Identifier	"Wsdisplay0"
-	Driver		"wsfb"
-	Option		"device" "/dev/ttyC1"
-	# Comment out to use the screen in vertical mode
-	Option		"rotate" "CW"
-EndSection