Retire zaurus, as it hasn't made the EABI jump and will be permanently broken

shortly when we use the hardware thread register in userland

9 files changed, 12 insertions, 530 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 4a3e6607ac3..219eb0a2390 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.193 2016/08/31 22:24:44 florian Exp $
+#	$OpenBSD: Makefile,v 1.194 2016/09/03 13:37:46 guenther Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,7 @@ SUBDIR=	ac accton acme-client acpidump adduser amd apm apmd arp \
 	snmpctl snmpd spamdb syslogc syslogd sysmerge tcpdrop tcpdump \
 	tftp-proxy tftpd tokenadm tokeninit traceroute trpt \
 	unbound usbdevs user vmd vmctl vipw watchdogd wsconscfg \
-	wsfontload wsmoused zdump zic ztsscale
+	wsfontload wsmoused zdump zic
 
 .if (${YP:L} == "yes")
 SUBDIR+=ypbind ypldap yppoll ypset ypserv
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 6abc167465b..88e6d996929 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.16 2016/09/01 09:59:40 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2016/09/03 13:37:46 guenther Exp $
 
 
 .if (${MACHINE} == "amd64") || (${MACHINE} == "i386") || \
     (${MACHINE} == "loongson") || (${MACHINE} == "macppc") || \
-    (${MACHINE} == "sparc64") || (${MACHINE} == "zaurus")
+    (${MACHINE} == "sparc64")
 
 SRCS=	apm.c apmsubr.c
 
@@ -18,6 +18,6 @@ NOPROG=yes
 .endif
 
 MAN=	apm.8
-MANSUBDIR=amd64 i386 loongson macppc sparc64 zaurus
+MANSUBDIR=amd64 i386 loongson macppc sparc64
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index c68f009dd2c..f5aa15cbad6 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.12 2016/09/01 10:14:42 tedu Exp $
+#	$OpenBSD: Makefile,v 1.13 2016/09/03 13:37:46 guenther Exp $
 
 .if (${MACHINE} == "amd64") || (${MACHINE} == "i386") || \
     (${MACHINE} == "loongson") || (${MACHINE} == "macppc") || \
-    (${MACHINE} == "sparc64") || \
-    (${MACHINE} == "zaurus")
+    (${MACHINE} == "sparc64")
 
 SRCS=	apmd.c apmsubr.c
 
@@ -13,6 +12,6 @@ NOPROG=yes
 .endif
 
 MAN=	apmd.8
-MANSUBDIR=amd64 i386 loongson macppc sparc64 zaurus
+MANSUBDIR=amd64 i386 loongson macppc sparc64
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/hotplugd/Makefile b/usr.sbin/hotplugd/Makefile
index 718660209b8..33dac9a622c 100644
--- a/usr.sbin/hotplugd/Makefile
+++ b/usr.sbin/hotplugd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2016/08/10 14:27:17 deraadt Exp $
+# $OpenBSD: Makefile,v 1.19 2016/09/03 13:37:46 guenther Exp $
 
 .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
     ${MACHINE} == "armv7" || ${MACHINE} == "hppa" || \
     ${MACHINE} == "i386" || ${MACHINE} == "landisk" || \
     ${MACHINE} == "loongson" || ${MACHINE} == "macppc" || \
     ${MACHINE} == "sgi" || ${MACHINE} == "socppc" || \
-    ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus"
+    ${MACHINE} == "sparc64"
 
 PROG=	hotplugd
 SRCS=	hotplugd.c
diff --git a/usr.sbin/wsfontload/Makefile b/usr.sbin/wsfontload/Makefile
index 30c3ac8e6c7..9e5c4d706ff 100644
--- a/usr.sbin/wsfontload/Makefile
+++ b/usr.sbin/wsfontload/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.14 2013/03/25 17:22:12 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.15 2016/09/03 13:37:46 guenther Exp $
 
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
-    ${MACHINE} == "zaurus"
+    ${MACHINE} == "alpha" || ${MACHINE} == "hppa"
 
 PROG=	wsfontload
 SRCS=	wsfontload.c
diff --git a/usr.sbin/ztsscale/Makefile b/usr.sbin/ztsscale/Makefile
deleted file mode 100644
index 06136fadfb6..00000000000
--- a/usr.sbin/ztsscale/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$OpenBSD: Makefile,v 1.4 2011/07/08 22:34:05 martynas Exp $
-
-.if ${MACHINE} == "zaurus"
-SRCS=	ztsscale.c
-
-PROG=	ztsscale
-.else
-NOPROG=yes
-.endif
-
-MAN=	ztsscale.8
-MANSUBDIR=zaurus
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/ztsscale/message.xbm b/usr.sbin/ztsscale/message.xbm
deleted file mode 100644
index 3e87c9d9a75..00000000000
--- a/usr.sbin/ztsscale/message.xbm
+++ /dev/null
@@ -1,136 +0,0 @@
-/*	$OpenBSD: message.xbm,v 1.5 2005/04/28 17:01:40 uwe Exp $	*/
-
-/* This file is placed in the public domain.  */
-
-/* "TOUCH SCREEN CALIBRATION" */
-#define title_width 342
-#define title_height 14
-static unsigned char title_bits[] = {
-   0xff, 0x0f, 0x7c, 0xf0, 0xf1, 0x81, 0x6f, 0x7e, 0x1f, 0x00, 0x00, 0xbe,
-   0x01, 0xbf, 0xfc, 0x0f, 0xfe, 0x8f, 0xff, 0xe7, 0xe1, 0x03, 0x00, 0xc0,
-   0x2f, 0xfe, 0x80, 0x7f, 0x80, 0xff, 0xf8, 0x1f, 0xfc, 0x07, 0xfe, 0xc0,
-   0xff, 0xc7, 0xff, 0x80, 0x0f, 0x1e, 0x3e, 0xff, 0x0f, 0xfe, 0xf1, 0xf1,
-   0xe1, 0x7f, 0x7e, 0x1f, 0x00, 0x00, 0xff, 0x81, 0xff, 0xfc, 0x3f, 0xfe,
-   0x8f, 0xff, 0xe7, 0xe1, 0x03, 0x00, 0xe0, 0x3f, 0xfe, 0x80, 0x7f, 0x80,
-   0xff, 0xf8, 0x7f, 0xfc, 0x1f, 0xfe, 0xc0, 0xff, 0xc7, 0xff, 0xc0, 0x3f,
-   0x1e, 0x3e, 0x63, 0x8c, 0x83, 0x63, 0xc0, 0x70, 0x70, 0x18, 0x0c, 0x00,
-   0xc0, 0xe1, 0xe1, 0xe1, 0x60, 0x38, 0x18, 0x0c, 0x06, 0xc7, 0x83, 0x01,
-   0x00, 0x78, 0x38, 0xb0, 0x01, 0x0c, 0x00, 0x0c, 0xc0, 0xe0, 0x30, 0x38,
-   0xb0, 0xc1, 0x39, 0x06, 0x0c, 0x70, 0x70, 0x3c, 0x18, 0x63, 0x8c, 0x01,
-   0x63, 0xc0, 0x38, 0x60, 0x18, 0x0c, 0x00, 0xc0, 0xc1, 0x61, 0xc0, 0x60,
-   0x70, 0x18, 0x0c, 0x06, 0xc7, 0x83, 0x01, 0x00, 0x18, 0x30, 0xb0, 0x01,
-   0x0c, 0x00, 0x0c, 0xc0, 0xc0, 0x30, 0x30, 0xb0, 0xc1, 0x39, 0x06, 0x0c,
-   0x30, 0x60, 0x3c, 0x18, 0x63, 0xcc, 0x01, 0x67, 0xc0, 0x38, 0x60, 0x18,
-   0x0c, 0x00, 0xc0, 0xc1, 0x71, 0xc0, 0x60, 0x60, 0x18, 0x0d, 0x46, 0xc7,
-   0x87, 0x01, 0x00, 0x1c, 0x30, 0xb0, 0x01, 0x0c, 0x00, 0x0c, 0xc0, 0xc0,
-   0x30, 0x30, 0x98, 0xc1, 0x39, 0x06, 0x0c, 0x38, 0xe0, 0x7c, 0x18, 0x63,
-   0xcc, 0x00, 0x66, 0xc0, 0x18, 0x00, 0x18, 0x0e, 0x00, 0x80, 0x03, 0x30,
-   0x00, 0x60, 0x38, 0x98, 0x01, 0xee, 0xc0, 0x8e, 0x01, 0x00, 0x0c, 0x00,
-   0x18, 0x03, 0x0c, 0x00, 0x0c, 0xc0, 0x70, 0x30, 0x38, 0x98, 0xc1, 0x39,
-   0x06, 0x0c, 0x18, 0xc0, 0xec, 0x18, 0x60, 0xc0, 0x00, 0x66, 0xc0, 0x18,
-   0x00, 0xf8, 0x0f, 0x00, 0x00, 0x3f, 0x30, 0x00, 0xe0, 0x3f, 0xf8, 0x01,
-   0xfe, 0xc0, 0x8c, 0x01, 0x00, 0x0c, 0x00, 0x18, 0x03, 0x0c, 0x00, 0x0c,
-   0xc0, 0x3f, 0xf0, 0x1f, 0x18, 0x03, 0x38, 0x00, 0x0c, 0x18, 0xc0, 0xcc,
-   0x18, 0x60, 0xc0, 0x00, 0x66, 0xc0, 0x18, 0x00, 0xf8, 0x0f, 0x00, 0x00,
-   0xfc, 0x30, 0x00, 0xe0, 0x0f, 0xf8, 0x01, 0xfe, 0xc0, 0x98, 0x01, 0x00,
-   0x0c, 0x00, 0x18, 0x07, 0x0c, 0x00, 0x0c, 0xc0, 0x7f, 0xf0, 0x0f, 0x0c,
-   0x03, 0x38, 0x00, 0x0c, 0x18, 0xc0, 0x8c, 0x19, 0x60, 0xc0, 0x00, 0x66,
-   0xc0, 0x18, 0x00, 0x18, 0x0c, 0x00, 0x00, 0xf0, 0x31, 0x00, 0xe0, 0x0f,
-   0x98, 0x01, 0xc6, 0xc0, 0xb8, 0x01, 0x00, 0x0c, 0x00, 0x1c, 0x07, 0x0c,
-   0x06, 0x0c, 0xc0, 0xf0, 0xf0, 0x07, 0x1c, 0x07, 0x38, 0x00, 0x0c, 0x18,
-   0xc0, 0x8c, 0x1b, 0x60, 0xc0, 0x01, 0x66, 0xc0, 0x18, 0x00, 0x18, 0x0c,
-   0x00, 0x80, 0xc0, 0x31, 0x00, 0x60, 0x1c, 0x18, 0x18, 0x06, 0xc4, 0xb0,
-   0x01, 0x00, 0x0c, 0x00, 0xfc, 0x07, 0x0c, 0x06, 0x0c, 0xc0, 0xc0, 0x30,
-   0x0e, 0xfc, 0x07, 0x38, 0x00, 0x0c, 0x38, 0xc0, 0x0c, 0x1b, 0x60, 0x80,
-   0x01, 0xe3, 0xe0, 0x38, 0x00, 0x18, 0x0c, 0x00, 0xc0, 0x81, 0x71, 0x00,
-   0x60, 0x38, 0x18, 0x18, 0x06, 0xc6, 0xe0, 0x01, 0x00, 0x1c, 0x00, 0xfe,
-   0x0f, 0x0c, 0x06, 0x0c, 0xc0, 0xc0, 0x30, 0x38, 0xfe, 0x0f, 0x38, 0x00,
-   0x0c, 0x30, 0x60, 0x0c, 0x1e, 0x60, 0x80, 0x83, 0xc3, 0x71, 0x78, 0x70,
-   0x18, 0x0c, 0x00, 0xc0, 0x81, 0xe1, 0xc0, 0x61, 0x70, 0x18, 0x18, 0x06,
-   0xc6, 0xe0, 0x01, 0x00, 0x38, 0x70, 0x06, 0x0c, 0x0c, 0x06, 0x0c, 0xc0,
-   0xc0, 0x30, 0x30, 0x06, 0x0e, 0x38, 0x00, 0x0c, 0x70, 0x70, 0x0c, 0x1e,
-   0xfe, 0x07, 0xff, 0x81, 0x7f, 0xf0, 0x7f, 0x7e, 0x1f, 0x00, 0xc0, 0xff,
-   0xc1, 0xff, 0xfc, 0xe1, 0xff, 0x9f, 0xff, 0xe7, 0xc3, 0x01, 0x00, 0xf0,
-   0xbf, 0x1f, 0xbf, 0xff, 0x87, 0xff, 0xf8, 0xff, 0xfc, 0xf0, 0x9f, 0x3f,
-   0xff, 0xc1, 0xff, 0xe0, 0x3f, 0x3e, 0x1c, 0xfe, 0x07, 0xfe, 0x00, 0x1f,
-   0xe0, 0x3f, 0x7e, 0x1f, 0x00, 0xc0, 0xff, 0x80, 0x7f, 0xfc, 0xe1, 0xff,
-   0x9f, 0xff, 0xe7, 0xc3, 0x01, 0x00, 0xe0, 0x9f, 0x1f, 0xbf, 0xff, 0x87,
-   0xff, 0xf8, 0x7f, 0xfc, 0xe0, 0x9f, 0x3f, 0xff, 0xc1, 0xff, 0xc0, 0x1f,
-   0x3e, 0x1c };
-
-/* "Press on the cross hairs please..." */
-#define message_width 280
-#define message_height 12
-static unsigned char message_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x0c, 0x00, 0x00,
-   0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0xec, 0x78,
-   0xf8, 0xf0, 0x00, 0xf0, 0xf8, 0x01, 0xf0, 0xe3, 0xc3, 0x03, 0x80, 0xc7,
-   0x8e, 0x07, 0x0f, 0x1f, 0x00, 0x1f, 0x1f, 0x0e, 0x76, 0x7c, 0x00, 0x77,
-   0x30, 0x78, 0x78, 0xf0, 0xf1, 0x00, 0x00, 0x00, 0x44, 0x5c, 0xcc, 0xc8,
-   0xd8, 0x00, 0x98, 0x31, 0x01, 0x60, 0x60, 0x62, 0x06, 0xc0, 0x86, 0xcb,
-   0x8c, 0x8d, 0x09, 0x00, 0x13, 0x19, 0x0a, 0x2e, 0x26, 0x00, 0xce, 0x10,
-   0xcc, 0xc8, 0x98, 0x98, 0x01, 0x00, 0x00, 0x7c, 0x08, 0x94, 0x18, 0x18,
-   0x00, 0x18, 0x13, 0x01, 0x60, 0x60, 0xa4, 0x04, 0x20, 0x0c, 0xc1, 0x98,
-   0x81, 0x03, 0x00, 0x13, 0x10, 0x08, 0x04, 0x0e, 0x00, 0x84, 0x30, 0x94,
-   0xd1, 0x30, 0x28, 0x03, 0x00, 0x00, 0x06, 0x08, 0xee, 0xf4, 0xe8, 0x01,
-   0x08, 0x12, 0x01, 0x20, 0x20, 0x72, 0x07, 0x20, 0x80, 0x40, 0x90, 0x1e,
-   0x1d, 0x00, 0x11, 0x1f, 0x0c, 0x04, 0x74, 0x00, 0x84, 0x10, 0xee, 0xd8,
-   0xe8, 0xdd, 0x02, 0x00, 0x00, 0x04, 0x08, 0x0c, 0x8c, 0x89, 0x01, 0x18,
-   0x13, 0x01, 0x60, 0x22, 0x62, 0x00, 0x60, 0x84, 0xc0, 0x98, 0x98, 0x11,
-   0x00, 0x31, 0x31, 0x08, 0x04, 0x46, 0x00, 0xc4, 0x30, 0x0c, 0x88, 0x08,
-   0x19, 0x00, 0x00, 0x00, 0x1f, 0x7e, 0xfc, 0xfd, 0xf8, 0x00, 0xf0, 0xb9,
-   0x03, 0xc0, 0x73, 0xe7, 0x0f, 0xc0, 0xc7, 0x87, 0x8f, 0x8f, 0x1f, 0x80,
-   0x3b, 0x3f, 0x7f, 0x3f, 0x7e, 0x00, 0x7e, 0xfc, 0xf8, 0xfd, 0xf9, 0xf1,
-   0x63, 0xc0, 0xc0, 0x04, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
-   0x80, 0x00, 0x04, 0x00, 0x80, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20,
-   0x10, 0x08, 0x08, 0x00, 0x00, 0x04, 0x80, 0x20, 0x10, 0x00, 0x40, 0x40,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-/* "Not accurate enough. Try again..." */
-#define error_width 272
-#define error_height 11
-static unsigned char error_bits[] = {
-   0xe3, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x3f, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
-   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x6d, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x38, 0x7c, 0x00,
-   0x78, 0x60, 0x61, 0x99, 0x31, 0xe3, 0xe0, 0x83, 0x01, 0x80, 0x43, 0x07,
-   0xc7, 0x0c, 0x1b, 0x0d, 0x00, 0x80, 0x6d, 0x76, 0xe7, 0x00, 0x3c, 0xd8,
-   0x38, 0x38, 0xe8, 0x00, 0x00, 0x00, 0x4a, 0xfc, 0x7c, 0x00, 0xf8, 0xf8,
-   0xf1, 0x99, 0xf3, 0xf3, 0xe3, 0xe3, 0x03, 0xc0, 0xc7, 0x87, 0xcf, 0x9c,
-   0x1f, 0x1f, 0x00, 0x80, 0x6d, 0x7e, 0xe7, 0x00, 0x7c, 0xfc, 0xfc, 0x38,
-   0xf8, 0x00, 0x00, 0x00, 0x5a, 0x86, 0x08, 0x00, 0x80, 0x08, 0x09, 0x11,
-   0x63, 0x00, 0x63, 0x20, 0x04, 0x60, 0xc8, 0xc8, 0x98, 0xd8, 0x08, 0x11,
-   0x00, 0x00, 0x0c, 0x0c, 0x46, 0x00, 0x40, 0x46, 0xc0, 0x20, 0x18, 0x01,
-   0x00, 0x00, 0x52, 0x82, 0x08, 0x00, 0xf8, 0x08, 0x08, 0x10, 0x23, 0xe0,
-   0x63, 0xf0, 0x07, 0xe0, 0xcf, 0x48, 0x90, 0x58, 0x08, 0x11, 0x00, 0x00,
-   0x0c, 0x04, 0x24, 0x00, 0x7c, 0x42, 0xf8, 0x20, 0x18, 0x01, 0x00, 0x00,
-   0x62, 0x86, 0x08, 0x00, 0x8c, 0x08, 0x08, 0x10, 0x23, 0x10, 0x63, 0x30,
-   0x00, 0x60, 0xc0, 0xc8, 0x98, 0xd8, 0x08, 0x11, 0x00, 0x00, 0x0c, 0x04,
-   0x2c, 0x00, 0x46, 0x46, 0xc4, 0x20, 0x18, 0x01, 0x00, 0x00, 0x67, 0xfc,
-   0xf8, 0x00, 0xfc, 0xf9, 0xf9, 0xf1, 0xf3, 0xf1, 0xc3, 0xe7, 0x07, 0xc0,
-   0xcf, 0x8c, 0x8f, 0x9f, 0x8f, 0x39, 0x06, 0x00, 0x1e, 0x3e, 0x18, 0x00,
-   0xfe, 0x7c, 0xfc, 0xf8, 0x99, 0x61, 0x60, 0xc0, 0x47, 0x38, 0x70, 0x00,
-   0xb8, 0xf1, 0xe0, 0xe0, 0xf3, 0xe1, 0x82, 0xc1, 0x03, 0x80, 0xc7, 0x0c,
-   0x07, 0x1f, 0x8b, 0x39, 0x04, 0x00, 0x1e, 0x3e, 0x18, 0x00, 0xdc, 0x58,
-   0xb8, 0xf8, 0x99, 0x61, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x40, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00 };
diff --git a/usr.sbin/ztsscale/ztsscale.8 b/usr.sbin/ztsscale/ztsscale.8
deleted file mode 100644
index 6a3eac87615..00000000000
--- a/usr.sbin/ztsscale/ztsscale.8
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"	$OpenBSD: ztsscale.8,v 1.6 2007/05/31 19:20:31 jmc Exp $
-.\"
-.\" Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, 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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt ZTSSCALE 8 zaurus
-.Os
-.Sh NAME
-.Nm ztsscale
-.Nd Zaurus touch screen calibration tool
-.Sh SYNOPSIS
-.Nm ztsscale
-.Sh DESCRIPTION
-The Zaurus
-.Xr lcd 4
-screen and
-.Xr zts 4
-touch point scanning logic is poorly
-aligned and requires calibration.
-.Nm
-is used interactively (and at installation time) to calculate both
-the scaling and offset values which will make the pointer act at
-the indicated location on the screen.
-.Pp
-When run as root from the raw console,
-.Nm
-temporarily takes over the Zaurus
-.Xr wsdisplay 4
-attached to the
-.Xr lcd 4 ,
-and prompts for five crosshairs to be touched.
-.Pp
-When good deviations are calculated from the selections made at these
-points,
-.Nm
-will exit and provide on standard output
-a result like the following:
-.Pp
-.Dl mouse.scale=200,3400,312,3672,0,640,480
-.Pp
-This result should be placed into
-.Pa /etc/wsconsctl.conf
-for future use, or can be immediately applied using:
-.Pp
-.Dl # wsconsctl mouse.scale=200,3400,312,3672,0,640,480
-.Sh SEE ALSO
-.Xr lcd 4 ,
-.Xr zts 4 ,
-.Xr wsconsctl.conf 5 ,
-.Xr wsconsctl 8
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Ox 3.8 .
diff --git a/usr.sbin/ztsscale/ztsscale.c b/usr.sbin/ztsscale/ztsscale.c
deleted file mode 100644
index ef5e268fbe5..00000000000
--- a/usr.sbin/ztsscale/ztsscale.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*	$OpenBSD: ztsscale.c,v 1.19 2015/08/20 22:39:30 deraadt Exp $	*/
-
-/*
- * Copyright (c) 2005 Matthieu Herrb
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, 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.
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <machine/cpu.h>
-#include <dev/wscons/wsconsio.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <math.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "message.xbm"
-
-#define TITLE_Y		64
-#define MESSAGE_Y	128
-
-#define WIDTH	640
-#define HEIGHT	480
-#define BLACK	0x0
-#define RED	0xf000
-#define WHITE	0xffff
-
-#define ADDR(x,y) (HEIGHT*(x)+(y))
-
-u_short		*mapaddr, *save;
-int		 orawmode = -1;
-int		 fd, mfd;
-int		 xc[] = { 25, 25, 320, 615, 615 };
-int		 yc[] = { 25, 455, 240, 25, 455 };
-
-struct wsmouse_calibcoords wmcoords;
-
-void		bitmap(u_short *, u_short, u_char[], int, int, int);
-void		cross(u_short *, int, int);
-void		wait_event(int, int *, int *);
-void		save_screen(void);
-void		restore_screen(void);
-void		cleanup(void);
-void		sighandler(int);
-int		main(int, char *[]);
-__dead void	usage(void);
-
-void
-bitmap(u_short *fb, u_short pixel, u_char bits[], int width, int height,
-    int y)
-{
-	int i, j;
-	int x;
-
-#define BITADDR(x, y)	((width + 7)/8*(y) + (x)/8)
-#define BITMASK(x)	(1 << ((x) % 8))
-
-	for (i = 0; i < height; i++) {
-		x = (WIDTH - width)/2;
-		for (j = 0; j < width; j++)
-			if (bits[BITADDR(j, i)] & BITMASK(j))
-				fb[ADDR(x + j, HEIGHT - y - i)] = pixel;
-	}
-}
-
-void
-cross(u_short *fb, int x, int y)
-{
-	int i;
-
-	y = HEIGHT - y;
-	for (i = x - 20; i <= x + 20; i++)
-		fb[ADDR(i, y)] = BLACK;
-	for (i = y - 20; i <= y + 20; i++)
-		fb[ADDR(x, i)] = BLACK;
-}
-
-void
-wait_event(int mfd, int *x, int *y)
-{
-	int down;
-	ssize_t len;
-	struct wscons_event evbuf;
-
-	down = 0;
-	*x = *y = -1;
-	while (down || *x == -1 || *y == -1) {
-		len = read(mfd, &evbuf, sizeof(evbuf));
-		if (len != sizeof(evbuf))
-			break;
-		switch (evbuf.type) {
-		case WSCONS_EVENT_MOUSE_DOWN:
-			down = 1;
-			break;
-		case WSCONS_EVENT_MOUSE_UP:
-			down = 0;
-			break;
-		case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
-			if (down)
-				*x = evbuf.value;
-			break;
-		case WSCONS_EVENT_MOUSE_ABSOLUTE_Y:
-			if (down)
-				*y = evbuf.value;
-			break;
-		}
-	}
-}
-
-void
-save_screen(void)
-{
-	int mode = WSDISPLAYIO_MODE_DUMBFB;
-
-	if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) == -1)
-		warn("ioctl SMODE");
-	mapaddr = mmap(0, WIDTH*HEIGHT*sizeof(short),
-	    PROT_READ|PROT_WRITE, MAP_SHARED, fd, (off_t)0);
-	if (mapaddr == MAP_FAILED)
-		err(2, "mmap");
-	save = malloc(WIDTH*HEIGHT*sizeof(u_short));
-	if (save == NULL)
-		err(2, "malloc");
-	memcpy(save, mapaddr, WIDTH*HEIGHT*sizeof(u_short));
-}
-
-void
-restore_screen(void)
-{
-	int mode = WSDISPLAYIO_MODE_EMUL;
-
-	memcpy(mapaddr, save, WIDTH*HEIGHT*sizeof(u_short));
-	if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) == -1)
-		warn("ioctl SMODE");
-}
-
-void
-cleanup(void)
-{
-
-	restore_screen();
-
-	wmcoords.samplelen = orawmode;
-	if (wmcoords.samplelen != -1 &&
-	    ioctl(mfd, WSMOUSEIO_SCALIBCOORDS, &wmcoords) < 0)
-		err(1, "WSMOUSEIO_SCALIBCOORDS");
-
-	close(mfd);
-}
-
-/* ARGSUSED */
-void
-sighandler(int sig)
-{
-
-	cleanup();
-	_exit(2);
-}
-
-/*ARGSUSED*/
-int
-main(int argc, char *argv[])
-{
-	int i, x[5], y[5];
-	double a, a1, a2, b, b1, b2, xerr, yerr;
-	struct ztsscale {
-		int ts_minx;
-		int ts_maxx;
-		int ts_miny;
-		int ts_maxy;
-		int ts_swapxy;
-	} ts;
-
-	if (argc != 1)
-		usage();
-
-	fd = open("/dev/ttyC0", O_RDWR);
-	if (fd < 0)
-		err(2, "open /dev/ttyC0");
-	save_screen();
-
-	mfd = open("/dev/wsmouse", O_RDWR);
-	if (mfd < 0) {
-		restore_screen();
-		err(2, "open /dev/wsmouse");
-	}
-
-	if (ioctl(mfd, WSMOUSEIO_GCALIBCOORDS, &wmcoords) < 0) {
-		restore_screen();
-                err(1, "WSMOUSEIO_GCALIBCOORDS");
-	}
-
-	/* Save the old rawmode value then switch rawmode on */ 
-	orawmode = wmcoords.samplelen;
-	wmcoords.samplelen = 1;
-
-	if (ioctl(mfd, WSMOUSEIO_SCALIBCOORDS, &wmcoords) < 0) {
-		restore_screen();
-		err(1, "WSMOUSEIO_SCALIBCOORDS");
-	}
-
-again:
-	signal(SIGINT, sighandler);
-	for (i = 0; i < 5; i++) {
-		memset(mapaddr, WHITE, WIDTH*HEIGHT*sizeof(u_short));
-		bitmap(mapaddr, BLACK, title_bits, title_width,
-		    title_height, TITLE_Y);
-		bitmap(mapaddr, BLACK, message_bits, message_width,
-		    message_height, MESSAGE_Y);
-		cross(mapaddr, xc[i], yc[i]);
-		/* printf("waiting for event\n"); */
-		wait_event(mfd, &x[i], &y[i]);
-	}
-
-	bzero(&ts, sizeof(ts));
-
-	/* get touch pad resolution to screen resolution ratio */
-	a1 = (double)(x[4] - x[0])/(double)(xc[4] - xc[0]);
-	a2 = (double)(x[3] - x[1])/(double)(xc[3] - xc[1]);
-	/* get the minimum pad position on the X-axis */
-	b1 = x[0] - a1*xc[0];
-	b2 = x[1] - a2*xc[1];
-	/* use the average ratio and average minimum position */
-	a = (a1+a2)/2.0;
-	b = (b1+b2)/2.0;
-	xerr = a*WIDTH/2+b - x[2];
-	if (fabs(xerr) > (a*WIDTH+b)*.01) {
-#ifdef DEBUG
-		fprintf(stderr, "X error (%.2f) too high, try again\n",
-		    fabs(xerr));
-#endif
-		goto err;
-	}
-
-	ts.ts_minx = (int)(b+0.5);
-	ts.ts_maxx = (int)(a*WIDTH+b+0.5);
-
-	/* get touch pad resolution to screen resolution ratio */
-	a1 = (double)(y[4] - y[0])/(double)(yc[4] - yc[0]);
-	a2 = (double)(y[3] - y[1])/(double)(yc[3] - yc[1]);
-	/* get the minimum pad position on the Y-axis */
-	b1 = y[0] - a1*yc[0];
-	b2 = y[1] - a2*yc[1];
-	/* use the average ratio and average minimum position */
-	a = (a1+a2)/2.0;
-	b = (b1+b2)/2.0;
-	yerr = a*HEIGHT/2+b - y[2];
-	if (fabs(yerr) > (a*HEIGHT+b)*.01) {
-#ifdef DEBUG
-		fprintf(stderr, "Y error (%.2f) too high, try again\n",
-		    fabs(yerr));
-#endif
-		goto err;
-	}
-
-	ts.ts_miny = (int)(b+0.5);
-	ts.ts_maxy = (int)(a*HEIGHT+b+0.5);
-
-	cleanup();
-
-	(void)printf("mouse.scale=%d,%d,%d,%d,%d,%d,%d\n", ts.ts_minx, ts.ts_maxx,
-	    ts.ts_miny, ts.ts_maxy, ts.ts_swapxy, WIDTH, HEIGHT);
-	return 0;
-
-err:
-	memset(mapaddr, WHITE, WIDTH*HEIGHT*sizeof(u_short));
-	bitmap(mapaddr, BLACK, title_bits, title_width, title_height,
-	    TITLE_Y);
-	bitmap(mapaddr, RED, error_bits, error_width, error_height,
-	    MESSAGE_Y);
-	sleep(2);
-	goto again;
-}
-
-__dead void
-usage(void)
-{
-	extern char *__progname;
-
-	(void)fprintf(stderr, "usage: %s\n", __progname);
-	exit(2);
-}