From 7766679fe46ad710d1688db18df3f0cfa8c9bf3b Mon Sep 17 00:00:00 2001
From: miod <>
Date: Tue, 18 Mar 2014 22:36:29 +0000
Subject: [PATCH] Retire hp300, mvme68k and mvme88k ports. These ports have no
 users, keeping this hardware alive is becoming increasingly difficult, and I
 should heed the message sent by the three disks which have died on me over
 the last few days.

Noone sane will mourn these ports anyway. So long, and thanks for the fish.
---
 src/etc/Makefile                 |   9 +-
 src/etc/etc.aviion/MAKEDEV.md    |   4 +-
 src/etc/etc.hp300/MAKEDEV        | 507 -------------------------------
 src/etc/etc.hp300/MAKEDEV.md     | 198 ------------
 src/etc/etc.hp300/Makefile       |   5 -
 src/etc/etc.hp300/Makefile.inc   |   7 -
 src/etc/etc.hp300/disktab        |   7 -
 src/etc/etc.hp300/fbtab          |   1 -
 src/etc/etc.hp300/sysctl.conf    |   0
 src/etc/etc.hp300/ttys           |  34 ---
 src/etc/etc.mvme68k/MAKEDEV      | 456 ---------------------------
 src/etc/etc.mvme68k/MAKEDEV.md   | 183 -----------
 src/etc/etc.mvme68k/Makefile     |   5 -
 src/etc/etc.mvme68k/Makefile.inc |   7 -
 src/etc/etc.mvme68k/disktab      |  13 -
 src/etc/etc.mvme68k/fbtab        |   2 -
 src/etc/etc.mvme68k/sysctl.conf  |   0
 src/etc/etc.mvme68k/ttys         |  18 --
 src/etc/etc.mvme88k/MAKEDEV      | 411 -------------------------
 src/etc/etc.mvme88k/MAKEDEV.md   | 143 ---------
 src/etc/etc.mvme88k/Makefile     |   5 -
 src/etc/etc.mvme88k/Makefile.inc |   9 -
 src/etc/etc.mvme88k/disktab      |  13 -
 src/etc/etc.mvme88k/fbtab        |   2 -
 src/etc/etc.mvme88k/sysctl.conf  |   0
 src/etc/etc.mvme88k/ttys         |  30 --
 src/etc/mtree/4.4BSD.dist        |  14 +-
 src/etc/mtree/4.4BSD.usr         |  16 +-
 src/etc/remote                   |   8 +-
 src/lib/libc/stdlib/Makefile.inc |   8 +-
 30 files changed, 15 insertions(+), 2100 deletions(-)
 delete mode 100644 src/etc/etc.hp300/MAKEDEV
 delete mode 100644 src/etc/etc.hp300/MAKEDEV.md
 delete mode 100644 src/etc/etc.hp300/Makefile
 delete mode 100644 src/etc/etc.hp300/Makefile.inc
 delete mode 100644 src/etc/etc.hp300/disktab
 delete mode 100644 src/etc/etc.hp300/fbtab
 delete mode 100644 src/etc/etc.hp300/sysctl.conf
 delete mode 100644 src/etc/etc.hp300/ttys
 delete mode 100644 src/etc/etc.mvme68k/MAKEDEV
 delete mode 100644 src/etc/etc.mvme68k/MAKEDEV.md
 delete mode 100644 src/etc/etc.mvme68k/Makefile
 delete mode 100644 src/etc/etc.mvme68k/Makefile.inc
 delete mode 100644 src/etc/etc.mvme68k/disktab
 delete mode 100644 src/etc/etc.mvme68k/fbtab
 delete mode 100644 src/etc/etc.mvme68k/sysctl.conf
 delete mode 100644 src/etc/etc.mvme68k/ttys
 delete mode 100644 src/etc/etc.mvme88k/MAKEDEV
 delete mode 100644 src/etc/etc.mvme88k/MAKEDEV.md
 delete mode 100644 src/etc/etc.mvme88k/Makefile
 delete mode 100644 src/etc/etc.mvme88k/Makefile.inc
 delete mode 100644 src/etc/etc.mvme88k/disktab
 delete mode 100644 src/etc/etc.mvme88k/fbtab
 delete mode 100644 src/etc/etc.mvme88k/sysctl.conf
 delete mode 100644 src/etc/etc.mvme88k/ttys

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 47a7f03b..efd9bc6b 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.348 2014/03/17 17:07:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.349 2014/03/18 22:36:29 miod Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -39,8 +39,7 @@ BIN1=	changelist csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
 	moduli pf.os sensorsd.conf ifstated.conf mixerctl.conf
 
-.if ${MACHINE} != "aviion" && ${MACHINE} != "mvme68k" && \
-    ${MACHINE} != "mvme88k"
+.if ${MACHINE} != "aviion" 
 BIN1+=	wsconsctl.conf
 .endif
 
@@ -320,9 +319,9 @@ distrib:
 	release allarchs kernels release-sets m4 install-mtree \
 	bootblocks ${ALL_KERNELS}
 
-SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7 etc.aviion etc.hp300
+SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7 etc.aviion
 SUBDIR+= etc.hppa etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k
-SUBDIR+= etc.macppc etc.mvme68k etc.mvme88k etc.octeon
+SUBDIR+= etc.macppc etc.octeon
 SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.vax etc.zaurus
 
 .include <bsd.subdir.mk>
diff --git a/src/etc/etc.aviion/MAKEDEV.md b/src/etc/etc.aviion/MAKEDEV.md
index 1632be64..3393403c 100644
--- a/src/etc/etc.aviion/MAKEDEV.md
+++ b/src/etc/etc.aviion/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,aviion)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.18 2014/01/05 01:16:52 deraadt Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.19 2014/03/18 22:36:29 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -18,7 +18,7 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl
-dnl *** mvme88k-specific devices
+dnl *** aviion-specific devices
 dnl
 __devitem(dart, ttya-c, on-board serial and mouse ports)dnl
 _mkdev(dart, {-tty[a-c]-}, {-u=${i#tty*}
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
deleted file mode 100644
index 230349aa..00000000
--- a/src/etc/etc.hp300/MAKEDEV
+++ /dev/null
@@ -1,507 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
-#
-#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.47 2014/01/05 01:16:52 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.73 2013/11/21 11:04:44 kettenis Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
-#
-#
-# Copyright (c) 2001-2004 Todd T. Fries <todd@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.
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	ramdisk	Ramdisk kernel devices
-#	std	Standard devices
-#	local	Configuration specific devices
-# Disks:
-#	cd*	ATAPI and SCSI CD-ROM drives
-#	hd*	HP300 HP-IB disks
-#	rd*	"rd" pseudo-disks
-#	sd*	SCSI disks, including flopticals
-#	vnd*	"file" pseudo-disk devices
-# Tapes:
-#	ch*	SCSI media changers
-#	ct*	HP300 HP-IB cartridge tape drives
-#	mt*	(Magnetic) 9-track reel tape drives
-#	st*	SCSI tape drives
-# Terminal ports:
-#	apci*	HP400 4 port serial mux interface
-#	dca*	HP200/300 single port serial interface
-#	dcm*	HP200/300 4 port serial mux interface
-# Pseudo terminals:
-#	ptm	pty master device
-#	pty*	Set of 62 master pseudo terminals
-#	tty*	Set of 62 slave pseudo terminals
-# Console ports:
-#	ttyC-J*	wscons display devices
-#	wscons	Minimal wscons devices
-#	wskbd*	wscons keyboards
-#	wsmux	wscons keyboard/mouse mux devices
-# Pointing devices:
-#	wsmouse*	wscons mice
-# Printers:
-#	ppi*	HP-IB plotters
-# Special purpose devices:
-#	audio*	Audio devices
-#	bio	ioctl tunnel pseudo-device
-#	bpf*	Berkeley Packet Filter
-#	diskmap	Disk mapper
-#	fd	fd/* nodes
-#	fuse	Userland Filesystem
-#	hotplug	devices hot plugging
-#	lkm	Loadable kernel modules interface
-#	pf*	Packet Filter
-#	pppx*	PPP Multiplexer
-#	*random	In-kernel random data source
-#	systrace*	System call tracing device
-#	tun*	Network tunnel driver
-#	uk*	Unknown SCSI devices
-#	vscsi*	Virtual SCSI controller
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	10) echo -n a;;
-	11) echo -n b;;
-	12) echo -n c;;
-	13) echo -n d;;
-	14) echo -n e;;
-	15) echo -n f;;
-	esac
-}
-
-alph2d()
-{
-	local t="$1"
-	local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	local sub=${p%${t}*}
-	echo ${#sub}
-}
-
-h2d()
-{
-	local s="$1"
-	local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*}
-
-	echo $(($(_h2d $f)*16+ $(_h2d $n) ))
-}
-
-_h2d()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	a) echo -n 10;;
-	b) echo -n 11;;
-	c) echo -n 12;;
-	d) echo -n 13;;
-	e) echo -n 14;;
-	f) echo -n 15;;
-	esac
-}
-
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg="$1"
-	tmp="${arg#[a-zA-Z]*}"
-	tmp="${tmp%*[a-zA-Z]}"
-	while [ "$tmp" != "$arg" ]
-	do
-		arg=$tmp
-		tmp="${arg#[a-zA-Z]*}"
-		tmp="${tmp%*[a-zA-Z]}"
-	done
-	echo $arg
-}
-
-dodisk()
-{
-	[ "$DEBUG" ] && set -x
-	n=$(($((${5}*${7:-16}))+${6})) count=0
-	[ 0$7 -ne 8 ] && l="i j k l m n o p"
-	for d in a b c d e f g h $l
-	do
-		M $1$2$d	b $3 $(($n+$count)) 640 operator
-		M r$1$2$d	c $4 $(($n+$count)) 640 operator
-		let count=count+1
-	done
-}
-
-dodisk2()
-{
-	n=$(($(($5*${7:-16}))+$6))
-	M $1$2a b $3 $n 640 operator
-	M r$1$2a c $4 $n 640 operator
-	n=$(($n+2))
-	M $1$2c b $3 $n 640 operator
-	M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist[0]="rm -f"
-
-mkl() {
-	mklist[${#mklist[*]}]=";mknod -m $1 $2 $3 $4 $5"
-}
-
-M() {
-	RMlist[${#RMlist[*]}]=$1
-	mkl ${5-666} $1 $2 $3 $4
-	G=${6:-wheel}
-	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
-	} || {
-		case $G in
-		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
-			whlist[${#whlist[*]}]="$1"
-		;;
-		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
-			oplist[${#oplist[*]}]="$1"
-		;;
-		*)
-			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
-		esac
-	}
-	return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
-do
-U=`unt $i`
-[ "$U" ] || U=0
-
-case $i in
-ramdisk)
-	R std ct0 ct1 st0 st1 hd0 hd1 hd2 hd3 hd4
-	R sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 pty0
-	R apci0 dca0 dcm0 dcm1 bio diskmap random
-	R bpf0 bpf1 tun0 tun1
-	;;
-
-std)
-	M console	c 0 0 600
-	M tty		c 1 0
-	M mem		c 2 0 640 kmem
-	M kmem		c 2 1 640 kmem
-	M null		c 2 2
-	M zero		c 2 12
-	M stdin		c 21 0
-	M stdout	c 21 1
-	M stderr	c 21 2
-	M ksyms		c 36 0 640 kmem
-	M klog		c 6 0 600
-	;;
-
-dca*)
-	case $U in
-	0|1|2|3)
-		M tty$U c 12 $U 660 dialer uucp
-		M cua$U c 12 $(($U+128)) 660 dialer uucp
-		;;
-	*)
-		echo bad unit for dca in: $i
-		;;
-	esac
-	;;
-
-dcm*)
-	case $U in
-	0|1|2|3)
-		u="$(( $U * 4 ))"
-		i=0
-		while [ $i -lt 4 ]
-		do
-			n="$(( $u + $i ))"
-			ext=`hex $n`
-
-			M tty0${ext} c 15 ${n} 660 dialer uucp
-			M cua0${ext} c 15 "$(( $n + 128 ))" 660 dialer uucp
-
-			i="$(( $i + 1 ))"
-		done
-		;;
-	*)
-		echo bad unit for dcm in: $i
-		;;
-	esac
-	;;
-
-apci*)
-	# There exists only one Frodo ASIC per HP9000/400 SPU.
-	case $U in
-	0)
-		for i in 0 1 2 3; do
-			M ttya${i} c 35 ${i} 660 dialer uucp
-			M cuaa${i} c 35 $(($i+128)) 660 dialer uucp
-		done
-		;;
-	*)
-		echo bad unit for apci in: $i
-		;;
-	esac
-	;;
-
-ppi*)
-	case $U in
-	0|1|2|3)
-		M ppi$U c 11 $U 600
-		;;
-	*)
-		echo bad unit for ppi in: $i
-		;;
-	esac
-	;;
-
-
-
-vscsi*)
-	M vscsi$U c 53 $U 600
-	;;
-
-uk*)
-	M uk$U c 37 $U 640 operator
-	;;
-
-tun*)
-	M tun$U c 23 $U 600
-	;;
-
-systrace)
-	M systrace c 50 0 644
-	;;
-
-*random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 32 $n 644
-		n=$(($n+1))
-	done
-	;;
-
-pppx*)
-	M pppx$U c 55 $U 600
-	;;
-
-pf*)
-	M pf c 33 0 600
-	;;
-
-lkm)
-	M lkm c 24 0 640 _lkm
-	;;
-
-hotplug)
-	M hotplug c 56 $U 400
-	;;
-
-fuse)
-	M fuse$U c 57 $U 600
-	;;
-
-fd)
-	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
-	while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
-	MKlist[${#MKlist[*]}]=";chmod 555 fd"
-	;;
-
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
-bpf*)
-	M bpf$U c 22 $U 600
-	;;
-
-bio)
-	M bio c 49 0 600
-	;;
-
-audio*)
-	M sound$U	c 44 $U
-	M mixer$U	c 44 $(($U+16))
-	M audio$U	c 44 $(($U+128))
-	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
-	;;
-
-wsmouse[0-9]*)
-	M wsmouse$U c 42 $U 600
-	;;
-
-wsmux|wsmouse|wskbd)
-	M wsmouse c 43 0 600
-	M wskbd c 43 1 600
-	;;
-
-wskbd[0-9]*)
-	M wskbd$U c 41 $U 600
-	;;
-
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
-tty[C-J]*)
-	U=${i##tty[C-J]}
-	case $i in
-	ttyC*) n=C m=0;;
-	ttyD*) n=D m=256;;
-	ttyE*) n=E m=512;;
-	ttyF*) n=F m=768;;
-	ttyG*) n=G m=1024;;
-	ttyH*) n=H m=1280;;
-	ttyI*) n=I m=1536;;
-	ttyJ*) n=J m=1792;;
-	esac
-	case $U in
-	[0-9a-f]) M tty$n$U c 40 $((16#$U+$m)) 600;;
-	cfg) M tty${n}cfg c 40 $((255+$m)) 600;;
-	*) echo bad unit $U for $i; exit 1;;
-	esac
-	;;
-
-pty*)
-	if [ $U -gt 15 ]; then
-		echo bad unit for pty in: $i
-		continue
-	fi
-	set -A letters p q r s t u v w x y z P Q R S T
-	set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \
-	    r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \
-	    Y Z
-
-	name=${letters[$U]}
-	n=0
-	while [ $n -lt 62 ]
-	do
-		nam=$name${suffixes[$n]}
-		off=$(($U*62))
-		M tty$nam c 4 $(($off+$n))
-		M pty$nam c 5 $(($off+$n))
-		n=$(($n+1))
-	done
-	;;
-
-ptm)
-	M ptm c 52 0 666
-	;;
-
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 7 $n 660 operator
-		M ${pre}rst$U	c 20 $n 660 operator
-		n=$(($n+1))
-	done
-	;;
-
-ct*|mt*)
-	case $i in
-	ct*) name=ct blk=0 chr=7;;
-	mt*) name=mt blk=1 chr=16;;
-	esac
-	case $U in
-	[0-7])
-		four=$(($U+4)) eight=$(($U+8))
-		twelve=$(($U+12)) twenty=$(($U+20))
-		M r$name$U	c $chr $U 660 operator
-		M r$name$four	c $chr $four 660 operator
-		M r$name$eight	c $chr $eight 660 operator
-		M r$name$twelve	c $chr $twelve 660 operator
-		MKlist[${#MKlist[*]}]=";ln r$name$four nr$name$U";: sanity w/pdp11 v7
-		MKlist[${#MKlist[*]}]=";ln r$name$twelve nr$name$eight";: ditto
-		RMlist[${#RMlist[*]}]="nr$name$U nr$name$eight"
-		;;
-	*)
-		echo bad unit for tape in: 
-		;;
-	esac
-	;;
-
-ch*)
-	M ch$U c 39 $U 660 operator
-	;;
-
-vnd*)
-	dodisk vnd $U 6 19 $U 0
-	;;
-
-rd*)
-	dodisk2 rd $U 8 34 $U 0
-	;;
-
-cd*)
-	dodisk2 cd $U 9 18 $U 0
-	;;
-
-local)
-	test -s $T.local && sh $T.local
-	;;
-
-all)
-	R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 vnd0 vnd1
-	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2
-	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R pty0 diskmap vscsi0 ch0 audio0 fuse pppx hotplug ptm local
-	R ppi0 apci0 wscons uk0 random lkm pf systrace std st0 st1 fd
-	;;
-
-sd*|hd*)
-	case $i in
-	sd*) dodisk sd $U 4 8 $U 0;;
-	hd*) dodisk hd $U 2 9 $U 0;;
-	esac
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
-}
-R "$@"
-{
-echo -n ${RMlist[*]}
-echo -n ${mklist[*]}
-echo -n ${MKlist[*]}
-echo -n ${whlist[*]}
-echo ${oplist[*]}
-} | if [ "$eo" = "echo" ]; then
-        cat
-else
-	sh
-fi
diff --git a/src/etc/etc.hp300/MAKEDEV.md b/src/etc/etc.hp300/MAKEDEV.md
deleted file mode 100644
index ca5920b3..00000000
--- a/src/etc/etc.hp300/MAKEDEV.md
+++ /dev/null
@@ -1,198 +0,0 @@
-define(MACHINE,hp300)dnl
-vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.47 2014/01/05 01:16:52 deraadt Exp $-},
-etc.MACHINE)dnl
-dnl
-dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any
-dnl purpose with or without fee is hereby granted, provided that the above
-dnl copyright notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl *** hp300 specific device scripts/descriptions
-dnl
-__devitem(ct, ct*, HP300 HP-IB cartridge tape drives,{-\&ct-})dnl
-__devitem(hd, {-hd*-}, HP300 HP-IB disks)dnl
-_mkdev(ct, ct*|mt*,
-{-case $i in
-	ct*) name=ct blk=major_ct_b chr=major_ct_c;;
-	mt*) name=mt blk=major_mt_b chr=major_mt_c;;
-	esac
-	case $U in
-	[0-7])
-		four=Add($U, 4) eight=Add($U, 8)
-		twelve=Add($U, 12) twenty=Add($U, 20)
-		M r$name$U	c $chr $U 660 operator
-		M r$name$four	c $chr $four 660 operator
-		M r$name$eight	c $chr $eight 660 operator
-		M r$name$twelve	c $chr $twelve 660 operator
-		MKlist[${#MKlist[*]}]=";ln r$name$four nr$name$U";: sanity w/pdp11 v7
-		MKlist[${#MKlist[*]}]=";ln r$name$twelve nr$name$eight";: ditto
-		RMlist[${#RMlist[*]}]="nr$name$U nr$name$eight"
-		;;
-	*)
-		echo bad unit for tape in: $1
-		;;
-	esac-})dnl
-dnl
-dnl
-_TITLE(make)
-_DEV(all)
-_DEV(ramdisk)
-_DEV(std)
-_DEV(local)
-_TITLE(dis)
-_DEV(cd, 18, 9)
-_DEV(hd, 9, 2)
-_DEV(rd, 34, 8)
-_DEV(sd, 8, 4)
-_DEV(vnd, 19, 6)
-_TITLE(tap)
-_DEV(ch, 39)
-_DEV(ct, 7, 0)
-_DEV(mt, 16, 1)
-_DEV(st, 20, 7)
-_TITLE(term)
-_DEV(apci)
-_DEV(dca, 12)
-_DEV(dcm, 15)
-dnl _TITLE(call)
-_TITLE(pty)
-_DEV(ptm, 52)
-_DEV(pty, 5)
-_DEV(tty, 4)
-_TITLE(cons)
-_DEV(wsdisp, 40)
-_DEV(wscons)
-_DEV(wskbd, 41)
-_DEV(wsmux, 43)
-_TITLE(point)
-_DEV(wsmouse, 42)
-_TITLE(prn)
-_DEV(ppi, 11)
-_TITLE(spec)
-_DEV(au, 44)
-_DEV(bio, 49)
-_DEV(bpf, 22)
-_DEV(diskmap, 54)
-_DEV(fdesc, 21)
-_DEV(fuse, 57)
-_DEV(hotplug, 56)
-_DEV(lkm, 24)
-_DEV(pf, 33)
-_DEV(pppx, 55)
-_DEV(rnd, 32)
-_DEV(systrace, 50)
-_DEV(tun, 23)
-_DEV(uk, 37)
-_DEV(vscsi, 53)
-dnl
-divert(__mddivert)dnl
-dnl
-ramdisk)
-	_recurse std ct0 ct1 st0 st1 hd0 hd1 hd2 hd3 hd4
-	_recurse sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 pty0
-	_recurse apci0 dca0 dcm0 dcm1 bio diskmap random
-	_recurse bpf0 bpf1 tun0 tun1
-	;;
-
-_std(1, 2, 36, 6)
-	;;
-
-dca*)
-	case $U in
-	0|1|2|3)
-		M tty$U c major_dca_c $U 660 dialer uucp
-		M cua$U c major_dca_c Add($U, 128) 660 dialer uucp
-		;;
-	*)
-		echo bad unit for dca in: $i
-		;;
-	esac
-	;;
-
-dcm*)
-	case $U in
-	0|1|2|3)
-		u="$(( $U * 4 ))"
-		i=0
-		while [ $i -lt 4 ]
-		do
-			n="$(( $u + $i ))"
-			ext=`hex $n`
-
-			M tty0${ext} c 15 ${n} 660 dialer uucp
-			M cua0${ext} c 15 "$(( $n + 128 ))" 660 dialer uucp
-
-			i="$(( $i + 1 ))"
-		done
-		;;
-	*)
-		echo bad unit for dcm in: $i
-		;;
-	esac
-	;;
-
-apci*)
-	# There exists only one Frodo ASIC per HP9000/400 SPU.
-	case $U in
-	0)
-		for i in 0 1 2 3; do
-			M ttya${i} c 35 ${i} 660 dialer uucp
-			M cuaa${i} c 35 Add($i, 128) 660 dialer uucp
-		done
-		;;
-	*)
-		echo bad unit for apci in: $i
-		;;
-	esac
-	;;
-
-ppi*)
-	case $U in
-	0|1|2|3)
-		M ppi$U c major_ppi_c $U 600
-		;;
-	*)
-		echo bad unit for ppi in: $i
-		;;
-	esac
-	;;
-
-dnl
-twrget(all, au, audio, 0)
-target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, bio)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, st, 0, 1)dnl
-target(all, uk, 0)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, dca, 0, 1)dnl
-target(all, dcm, 0, 1, 2, 3)dnl
-target(all, hd, 0, 1, 2)dnl
-target(all, ct, 0, 1)dnl
-target(ramd, ct, 0, 1)dnl
-target(ramd, hd, 0, 1, 2)dnl
-target(ramd, pty, 0)dnl
-target(ramd, apci, 0)dnl
-target(ramd, dca, 0)dnl
-target(ramd, dcm, 0, 1)dnl
-target(ramd, tun, 0, 1)dnl
diff --git a/src/etc/etc.hp300/Makefile b/src/etc/etc.hp300/Makefile
deleted file mode 100644
index 324bc976..00000000
--- a/src/etc/etc.hp300/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
-
-all: MAKEDEV
-
-.include <bsd.prog.mk>
diff --git a/src/etc/etc.hp300/Makefile.inc b/src/etc/etc.hp300/Makefile.inc
deleted file mode 100644
index d410ec5f..00000000
--- a/src/etc/etc.hp300/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.23 2011/07/22 09:30:54 espie Exp $
-
-bootblocks:
-	cp ${DESTDIR}/usr/mdec/uboot.lif ${RELEASEDIR}/SYS_UBOOT
-	cp ${DESTDIR}/usr/mdec/cdboot.lif ${RELEASEDIR}/SYS_CDBOOT
-
-MDEXT=	bsd.rd SYS_UBOOT SYS_CDBOOT
diff --git a/src/etc/etc.hp300/disktab b/src/etc/etc.hp300/disktab
deleted file mode 100644
index 3002ba80..00000000
--- a/src/etc/etc.hp300/disktab
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: disktab,v 1.8 2010/07/02 20:33:54 tedu Exp $
-
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
-	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096\
-	:ob#0:pb#0:oc#0:pc#4096:
-
diff --git a/src/etc/etc.hp300/fbtab b/src/etc/etc.hp300/fbtab
deleted file mode 100644
index d0c58313..00000000
--- a/src/etc/etc.hp300/fbtab
+++ /dev/null
@@ -1 +0,0 @@
-/dev/console	0600	/dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
diff --git a/src/etc/etc.hp300/sysctl.conf b/src/etc/etc.hp300/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.hp300/ttys b/src/etc/etc.hp300/ttys
deleted file mode 100644
index fb8b8086..00000000
--- a/src/etc/etc.hp300/ttys
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.9 2012/01/09 18:54:12 miod Exp $
-#
-# name	getty				type	status		comments
-#
-console "/usr/libexec/getty std.9600"	vt220	on  secure
-# graphics console
-ttyC0	"/usr/libexec/getty std.9600"	vt220	off secure
-# apci(4) serial lines
-ttya0	"/usr/libexec/getty std.9600"	unknown off secure
-ttya1	"/usr/libexec/getty std.9600"	unknown off secure
-ttya2	"/usr/libexec/getty std.9600"	unknown off secure
-# dca(4) serial lines
-tty0	"/usr/libexec/getty std.9600"	unknown off secure
-tty1	"/usr/libexec/getty std.9600"	unknown off secure
-tty2	"/usr/libexec/getty std.9600"	unknown off secure
-tty3	"/usr/libexec/getty std.9600"	unknown off secure
-# dcm(4) serial lines
-tty00	"/usr/libexec/getty std.9600"	unknown off secure
-tty01	"/usr/libexec/getty std.9600"	unknown off secure
-tty02	"/usr/libexec/getty std.9600"	unknown off secure
-tty03	"/usr/libexec/getty std.9600"	unknown off secure
-tty04	"/usr/libexec/getty std.9600"	unknown off secure
-tty05	"/usr/libexec/getty std.9600"	unknown off secure
-tty06	"/usr/libexec/getty std.9600"	unknown off secure
-tty07	"/usr/libexec/getty std.9600"	unknown off secure
-tty08	"/usr/libexec/getty std.9600"	unknown off secure
-tty09	"/usr/libexec/getty std.9600"	unknown off secure
-tty0a	"/usr/libexec/getty std.9600"	unknown off secure
-tty0b	"/usr/libexec/getty std.9600"	unknown off secure
-tty0c	"/usr/libexec/getty std.9600"	unknown off secure
-tty0d	"/usr/libexec/getty std.9600"	unknown off secure
-tty0e	"/usr/libexec/getty std.9600"	unknown off secure
-tty0f	"/usr/libexec/getty std.9600"	unknown off secure
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
deleted file mode 100644
index c4867cc3..00000000
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ /dev/null
@@ -1,456 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
-#
-#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.34 2014/01/05 01:16:52 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.73 2013/11/21 11:04:44 kettenis Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
-#
-#
-# Copyright (c) 2001-2004 Todd T. Fries <todd@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.
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	ramdisk	Ramdisk kernel devices
-#	std	Standard devices
-#	local	Configuration specific devices
-# Disks:
-#	cd*	ATAPI and SCSI CD-ROM drives
-#	rd*	"rd" pseudo-disks
-#	sd*	SCSI disks, including flopticals
-#	vnd*	"file" pseudo-disk devices
-# Tapes:
-#	ch*	SCSI media changers
-#	st*	SCSI tape drives
-# Terminal ports:
-#	cuaa-d	On-board call-up devices
-#	tty0*	CL-CD2400 serial ports
-#	ttya-d	On-board serial ports
-#	ttyd*	MC68681 serial ports
-#	ttyw*	WG CL-CD2400 serial ports
-# Pseudo terminals:
-#	ptm	pty master device
-#	pty*	Set of 62 master pseudo terminals
-#	tty*	Set of 62 slave pseudo terminals
-# Printers:
-#	par0	On-board printer port
-# Special purpose devices:
-#	bio	ioctl tunnel pseudo-device
-#	bpf*	Berkeley Packet Filter
-#	diskmap	Disk mapper
-#	fd	fd/* nodes
-#	fuse	Userland Filesystem
-#	flash0	On-board flash memory
-#	lkm	Loadable kernel modules interface
-#	nvram0	On-board non-volatile memory
-#	pf*	Packet Filter
-#	pppx*	PPP Multiplexer
-#	*random	In-kernel random data source
-#	sram0	On-board static memory
-#	systrace*	System call tracing device
-#	tun*	Network tunnel driver
-#	uk*	Unknown SCSI devices
-#	vmel0	VMEbus D32 space
-#	vmes0	VMEbus D16 space
-#	vscsi*	Virtual SCSI controller
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	10) echo -n a;;
-	11) echo -n b;;
-	12) echo -n c;;
-	13) echo -n d;;
-	14) echo -n e;;
-	15) echo -n f;;
-	esac
-}
-
-alph2d()
-{
-	local t="$1"
-	local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	local sub=${p%${t}*}
-	echo ${#sub}
-}
-
-h2d()
-{
-	local s="$1"
-	local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*}
-
-	echo $(($(_h2d $f)*16+ $(_h2d $n) ))
-}
-
-_h2d()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	a) echo -n 10;;
-	b) echo -n 11;;
-	c) echo -n 12;;
-	d) echo -n 13;;
-	e) echo -n 14;;
-	f) echo -n 15;;
-	esac
-}
-
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg="$1"
-	tmp="${arg#[a-zA-Z]*}"
-	tmp="${tmp%*[a-zA-Z]}"
-	while [ "$tmp" != "$arg" ]
-	do
-		arg=$tmp
-		tmp="${arg#[a-zA-Z]*}"
-		tmp="${tmp%*[a-zA-Z]}"
-	done
-	echo $arg
-}
-
-dodisk()
-{
-	[ "$DEBUG" ] && set -x
-	n=$(($((${5}*${7:-16}))+${6})) count=0
-	[ 0$7 -ne 8 ] && l="i j k l m n o p"
-	for d in a b c d e f g h $l
-	do
-		M $1$2$d	b $3 $(($n+$count)) 640 operator
-		M r$1$2$d	c $4 $(($n+$count)) 640 operator
-		let count=count+1
-	done
-}
-
-dodisk2()
-{
-	n=$(($(($5*${7:-16}))+$6))
-	M $1$2a b $3 $n 640 operator
-	M r$1$2a c $4 $n 640 operator
-	n=$(($n+2))
-	M $1$2c b $3 $n 640 operator
-	M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist[0]="rm -f"
-
-mkl() {
-	mklist[${#mklist[*]}]=";mknod -m $1 $2 $3 $4 $5"
-}
-
-M() {
-	RMlist[${#RMlist[*]}]=$1
-	mkl ${5-666} $1 $2 $3 $4
-	G=${6:-wheel}
-	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
-	} || {
-		case $G in
-		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
-			whlist[${#whlist[*]}]="$1"
-		;;
-		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
-			oplist[${#oplist[*]}]="$1"
-		;;
-		*)
-			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
-		esac
-	}
-	return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
-do
-U=`unt $i`
-[ "$U" ] || U=0
-
-case $i in
-std)
-	M console	c 0 0 600
-	M tty		c 1 0
-	M mem		c 2 0 640 kmem
-	M kmem		c 2 1 640 kmem
-	M null		c 2 2
-	M zero		c 2 12
-	M stdin		c 21 0
-	M stdout	c 21 1
-	M stderr	c 21 2
-	M ksyms		c 43 0 640 kmem
-	M klog		c 6 0 600
-	;;
-
-
-vscsi*)
-	M vscsi$U c 53 $U 600
-	;;
-
-vmes0)
-	M vmes0 c 32 0 640 kmem
-	;;
-
-vmel0)
-	M vmel0 c 31 0 640 kmem
-	;;
-
-uk*)
-	M uk$U c 41 $U 640 operator
-	;;
-
-tun*)
-	M tun$U c 23 $U 600
-	;;
-
-systrace)
-	M systrace c 50 0 644
-	;;
-
-sram0)
-	M sram0 c 7 0 640 kmem
-	;;
-
-*random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
-	;;
-
-pppx*)
-	M pppx$U c 55 $U 600
-	;;
-
-pf*)
-	M pf c 39 0 600
-	;;
-
-nvram0)
-	M nvram0 c 10 0 640 kmem
-	;;
-
-lkm)
-	M lkm c 24 0 640 _lkm
-	;;
-
-flash0)
-	M flash0 c 11 0 640 kmem
-	;;
-
-fuse)
-	M fuse$U c 57 $U 600
-	;;
-
-fd)
-	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
-	while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
-	MKlist[${#MKlist[*]}]=";chmod 555 fd"
-	;;
-
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
-bpf*)
-	M bpf$U c 22 $U 600
-	;;
-
-bio)
-	M bio c 27 0 600
-	;;
-
-lp*)
-	u=${i#lp*}
-	case $u in
-	0) M par$u c 28 $u 600;;
-	*) echo unknown lp device $i ;;
-	esac
-	;;
-
-pty*)
-	if [ $U -gt 15 ]; then
-		echo bad unit for pty in: $i
-		continue
-	fi
-	set -A letters p q r s t u v w x y z P Q R S T
-	set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \
-	    r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \
-	    Y Z
-
-	name=${letters[$U]}
-	n=0
-	while [ $n -lt 62 ]
-	do
-		nam=$name${suffixes[$n]}
-		off=$(($U*62))
-		M tty$nam c 4 $(($off+$n))
-		M pty$nam c 5 $(($off+$n))
-		n=$(($n+1))
-	done
-	;;
-
-ptm)
-	M ptm c 52 0 666
-	;;
-
-ttyw*)
-	u=${i#ttyw*}
-	case $u in
-	0|1|2|3)
-		M ttyw$u c 30 $u 660 dialer uucp
-		M cuaw$u c 30 $(($u+128)) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac
-	;;
-
-ttyd[01])
-	u=${i#ttyd*}
-	case $u in
-	0|1)
-		M ttyd$u c 14 $u 660 dialer uucp
-		M cuad$u c 14 $(($u+128)) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac
-	;;
-
-tty[a-z])
-	u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown tty device $i ;;
-	esac
-	case $u in
-	a|b|c|d)
-		M tty$u c 12 $n 660 dialer uucp
-		;;
-	esac
-	;;
-
-tty0*)
-	u=${i#tty0*}
-	case $u in
-	0|1|2|3)
-		M tty0$u c 13 $u 660 dialer uucp
-		M cua0$u c 13 $(($u+128)) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac
-	;;
-
-cua[a-z])
-	u=${i#cua*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown cua device $i ;;
-	esac
-	case $u in
-	a|b|c|d)
-		M cua$u c 12 $(($n+128)) 660 dialer uucp
-		;;
-	esac
-	;;
-
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 7 $n 660 operator
-		M ${pre}rst$U	c 20 $n 660 operator
-		n=$(($n+1))
-	done
-	;;
-
-ch*)
-	M ch$U c 44 $U 660 operator
-	;;
-
-vnd*)
-	dodisk vnd $U 6 19 $U 0
-	;;
-
-rd*)
-	dodisk2 rd $U 9 18 $U 0
-	;;
-
-cd*)
-	dodisk2 cd $U 8 9 $U 0
-	;;
-
-local)
-	test -s $T.local && sh $T.local
-	;;
-
-ramdisk)
-	R diskmap bio pty0 ttya rd0 cd0 cd1 st0 st1 sd0 sd1 sd2 sd3
-	R sd4 bpf0 std
-	;;
-
-all)
-	R ttyw0 ttyw1 ttyw2 ttyw3 ttyd0 ttyd1 tty00 tty01 tty02 tty03
-	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd vnd0 vnd1 vnd2 vnd3
-	R sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
-	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
-	R vscsi0 ch0 vmel0 vmes0 flash0 nvram0 sram0 fuse pppx ptm
-	R local uk0 random lkm pf systrace std st0 st1 fd
-	;;
-
-sd*)
-	case $i in
-	sd*) dodisk sd $U 4 8 $U 0;;
-	esac
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
-}
-R "$@"
-{
-echo -n ${RMlist[*]}
-echo -n ${mklist[*]}
-echo -n ${MKlist[*]}
-echo -n ${whlist[*]}
-echo ${oplist[*]}
-} | if [ "$eo" = "echo" ]; then
-        cat
-else
-	sh
-fi
diff --git a/src/etc/etc.mvme68k/MAKEDEV.md b/src/etc/etc.mvme68k/MAKEDEV.md
deleted file mode 100644
index 9d556185..00000000
--- a/src/etc/etc.mvme68k/MAKEDEV.md
+++ /dev/null
@@ -1,183 +0,0 @@
-define(MACHINE,mvme68k)dnl
-vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.34 2014/01/05 01:16:52 deraadt Exp $-},
-etc.MACHINE)dnl
-dnl
-dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any
-dnl purpose with or without fee is hereby granted, provided that the above
-dnl copyright notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl
-dnl *** mvme68k-specific devices
-dnl
-__devitem(mvme_tzs, ttya-d, On-board serial ports,zs)dnl
-__devitem(mvme_czs, cuaa-d, On-board call-up devices,zs)dnl
-_mkdev(mvme_tzs, {-tty[a-z]-}, {-u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown tty device $i ;;
-	esac
-	case $u in
-	a|b|c|d)
-		M tty$u c major_mvme_tzs_c $n 660 dialer uucp
-		;;
-	esac-})dnl
-_mkdev(mvme_czs, cua[a-z], {-u=${i#cua*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown cua device $i ;;
-	esac
-	case $u in
-	a|b|c|d)
-		M cua$u c major_mvme_czs_c Add($n, 128) 660 dialer uucp
-		;;
-	esac-})dnl
-__devitem(cl, tty0*, CL-CD2400 serial ports)dnl
-_mkdev(cl, {-tty0*-}, {-u=${i#tty0*}
-	case $u in
-	0|1|2|3)
-		M tty0$u c major_cl_c $u 660 dialer uucp
-		M cua0$u c major_cl_c Add($u, 128) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac-})dnl
-__devitem(ttyd, ttyd*, MC68681 serial ports,nothing)dnl
-_mkdev(ttyd, {-ttyd[01]-}, {-u=${i#ttyd*}
-	case $u in
-	0|1)
-		M ttyd$u c major_ttyd_c $u 660 dialer uucp
-		M cuad$u c major_ttyd_c Add($u, 128) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac-})dnl
-__devitem(ttyw, ttyw*, WG CL-CD2400 serial ports,nothing)dnl
-_mkdev(ttyw, {-ttyw*-}, {-u=${i#ttyw*}
-	case $u in
-	0|1|2|3)
-		M ttyw$u c major_ttyw_c $u 660 dialer uucp
-		M cuaw$u c major_ttyw_c Add($u, 128) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac-})dnl
-__devitem(lp, par0, On-board printer port,nothing)dnl
-_mkdev(lp, {-lp*-}, {-u=${i#lp*}
-	case $u in
-	0) M par$u c major_lp_c $u 600;;
-	*) echo unknown lp device $i ;;
-	esac-})dnl
-__devitem(sram, sram0, On-board static memory)dnl
-_mkdev(sram, sram0, {-M sram0 c major_sram_c 0 640 kmem-})dnl
-__devitem(nvram, nvram0, On-board non-volatile memory)dnl
-_mkdev(nvram, nvram0, {-M nvram0 c major_nvram_c 0 640 kmem-})dnl
-__devitem(flash, flash0, On-board flash memory)dnl
-_mkdev(flash, flash0, {-M flash0 c major_flash_c 0 640 kmem-})dnl
-__devitem(vmes, vmes0, VMEbus D16 space)dnl
-_mkdev(vmes, vmes0, {-M vmes0 c major_vmes_c 0 640 kmem-})dnl
-__devitem(vmel, vmel0, VMEbus D32 space)dnl
-_mkdev(vmel, vmel0, {-M vmel0 c major_vmel_c 0 640 kmem-})dnl
-dnl
-dnl *** MAKEDEV itself
-dnl
-_TITLE(make)
-dnl
-dnl all)
-dnl
-target(all, sram, 0)dnl
-target(all, nvram, 0)dnl
-target(all, flash, 0)dnl
-target(all, vmes, 0)dnl
-target(all, vmel, 0)dnl
-dnl
-target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)dnl
-target(all, pty, 0)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, bio)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, uk, 0)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-twrget(all, mvme_tzs, tty, a, b, c, d)dnl
-twrget(all, mvme_czs, cua, a, b, c, d)dnl
-twrget(all, cl, tty0, 0, 1, 2, 3)dnl
-target(all, ttyd, 0, 1)dnl
-target(all, ttyw, 0, 1, 2, 3)dnl
-dnl target(all, lp, 0)dnl
-_DEV(all)
-dnl
-dnl ramdisk)
-dnl
-twrget(ramd, mvme_tzs, tty, a)dnl
-target(ramd, pty, 0)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
-_DEV(ramd)
-dnl
-_DEV(std)
-_DEV(local)
-dnl
-_TITLE(dis)
-_DEV(cd, 9, 8)
-_DEV(rd, 18, 9)
-_DEV(sd, 8, 4)
-_DEV(vnd, 19, 6)
-_TITLE(tap)
-_DEV(ch, 44)
-_DEV(st, 20, 7)
-_TITLE(term)
-_DEV(mvme_czs, 12)
-_DEV(cl, 13)
-_DEV(mvme_tzs, 12)
-_DEV(ttyd, 14)
-_DEV(ttyw, 30)
-_TITLE(pty)
-_DEV(ptm, 52)
-_DEV(pty, 5)
-_DEV(tty, 4)
-_TITLE(prn)
-_DEV(lp, 28)
-_TITLE(spec)
-_DEV(bio, 27)
-_DEV(bpf, 22)
-_DEV(diskmap, 54)
-_DEV(fdesc, 21)
-_DEV(fuse, 57)
-_DEV(flash, 11)
-_DEV(lkm, 24)
-_DEV(nvram, 10)
-_DEV(pf, 39)
-_DEV(pppx, 55)
-_DEV(rnd, 40)
-_DEV(sram, 7)
-_DEV(systrace, 50)
-_DEV(tun, 23)
-_DEV(uk, 41)
-_DEV(vmel, 31)
-_DEV(vmes, 32)
-_DEV(vscsi, 53)
-dnl
-divert(__mddivert)dnl
-dnl
-_std(1, 2, 43, 6)
-	;;
-
diff --git a/src/etc/etc.mvme68k/Makefile b/src/etc/etc.mvme68k/Makefile
deleted file mode 100644
index 324bc976..00000000
--- a/src/etc/etc.mvme68k/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
-
-all: MAKEDEV
-
-.include <bsd.prog.mk>
diff --git a/src/etc/etc.mvme68k/Makefile.inc b/src/etc/etc.mvme68k/Makefile.inc
deleted file mode 100644
index 9d1ecd66..00000000
--- a/src/etc/etc.mvme68k/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.14 2011/07/22 09:30:54 espie Exp $
-
-bootblocks:
-	cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
-
-MDEXT=	bsd.rd \
-	installboot netboot rboot sboot stboot bootsd bootst bootxx
diff --git a/src/etc/etc.mvme68k/disktab b/src/etc/etc.mvme68k/disktab
deleted file mode 100644
index dc0247c8..00000000
--- a/src/etc/etc.mvme68k/disktab
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: disktab,v 1.8 2010/07/02 20:33:54 tedu Exp $
-
-# XXX - Would like :ba#4096:fa#512: but that panics...
-# Leave nc=16; adjust size using: ns
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
-	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096\
-	:ob#0:pb#0:oc#0:pc#4096:
-miniroot|Installation root-on-swap FS image:\
-	:ty=simulated:se#512:ns#32:nt#8:nc#64:\
-	:ta=4.2BSD:oa#0:pa#16384:\
-	:ob#0:pb#0:oc#0:pc#16384:
-
diff --git a/src/etc/etc.mvme68k/fbtab b/src/etc/etc.mvme68k/fbtab
deleted file mode 100644
index 82cc8e0e..00000000
--- a/src/etc/etc.mvme68k/fbtab
+++ /dev/null
@@ -1,2 +0,0 @@
-/dev/ttya	0600	/dev/console
-/dev/tty00	0600	/dev/console
diff --git a/src/etc/etc.mvme68k/sysctl.conf b/src/etc/etc.mvme68k/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.mvme68k/ttys b/src/etc/etc.mvme68k/ttys
deleted file mode 100644
index ea5d5f98..00000000
--- a/src/etc/etc.mvme68k/ttys
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.11 2010/03/07 21:10:22 miod Exp $
-#
-# name	getty				type	status		comments
-#
-# If the console is marked insecure, single-user requires
-# the root password.
-console	"/usr/libexec/getty std.9600"	vt220	on   secure
-ttya	"/usr/libexec/getty std.9600"	unknown	off  secure	# 147/162 console
-ttyb	"/usr/libexec/getty std.9600"	unknown	off
-ttyc	"/usr/libexec/getty std.9600"	unknown	off
-ttyd	"/usr/libexec/getty std.9600"	unknown	off
-tty00	"/usr/libexec/getty std.9600"	unknown off  secure	# 167/17x console
-tty01	"/usr/libexec/getty std.9600"	unknown off
-tty02	"/usr/libexec/getty std.9600"	unknown off
-tty03	"/usr/libexec/getty std.9600"	unknown off
-ttyd0	"/usr/libexec/getty std.9600"	unknown off  secure	# 141/165 console
-ttyd1	"/usr/libexec/getty std.9600"	unknown off
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
deleted file mode 100644
index 6c44ba0d..00000000
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ /dev/null
@@ -1,411 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
-#
-#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.33 2014/01/05 01:16:52 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.73 2013/11/21 11:04:44 kettenis Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
-#
-#
-# Copyright (c) 2001-2004 Todd T. Fries <todd@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.
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	ramdisk	Ramdisk kernel devices
-#	std	Standard devices
-#	local	Configuration specific devices
-# Disks:
-#	cd*	ATAPI and SCSI CD-ROM drives
-#	rd*	"rd" pseudo-disks
-#	sd*	SCSI disks, including flopticals
-#	vnd*	"file" pseudo-disk devices
-# Tapes:
-#	ch*	SCSI media changers
-#	st*	SCSI tape drives
-# Terminal ports:
-#	tty0*	MVME1x7 CL-CD2400 serial ports
-#	ttya-b	MVME188 serial ports
-#	ttyv*	MVME332XT serial ports
-# Pseudo terminals:
-#	ptm	pty master device
-#	pty*	Set of 62 master pseudo terminals
-#	tty*	Set of 62 slave pseudo terminals
-# Special purpose devices:
-#	bio	ioctl tunnel pseudo-device
-#	bpf*	Berkeley Packet Filter
-#	diskmap	Disk mapper
-#	fd	fd/* nodes
-#	fuse	Userland Filesystem
-#	lkm	Loadable kernel modules interface
-#	nvram0	On-board non-volatile memory
-#	pf*	Packet Filter
-#	pppx*	PPP Multiplexer
-#	*random	In-kernel random data source
-#	sram0	On-board static memory
-#	systrace*	System call tracing device
-#	tun*	Network tunnel driver
-#	uk*	Unknown SCSI devices
-#	vmel0	VMEbus D32 space
-#	vmes0	VMEbus D16 space
-#	vscsi*	Virtual SCSI controller
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	10) echo -n a;;
-	11) echo -n b;;
-	12) echo -n c;;
-	13) echo -n d;;
-	14) echo -n e;;
-	15) echo -n f;;
-	esac
-}
-
-alph2d()
-{
-	local t="$1"
-	local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	local sub=${p%${t}*}
-	echo ${#sub}
-}
-
-h2d()
-{
-	local s="$1"
-	local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*}
-
-	echo $(($(_h2d $f)*16+ $(_h2d $n) ))
-}
-
-_h2d()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	a) echo -n 10;;
-	b) echo -n 11;;
-	c) echo -n 12;;
-	d) echo -n 13;;
-	e) echo -n 14;;
-	f) echo -n 15;;
-	esac
-}
-
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg="$1"
-	tmp="${arg#[a-zA-Z]*}"
-	tmp="${tmp%*[a-zA-Z]}"
-	while [ "$tmp" != "$arg" ]
-	do
-		arg=$tmp
-		tmp="${arg#[a-zA-Z]*}"
-		tmp="${tmp%*[a-zA-Z]}"
-	done
-	echo $arg
-}
-
-dodisk()
-{
-	[ "$DEBUG" ] && set -x
-	n=$(($((${5}*${7:-16}))+${6})) count=0
-	[ 0$7 -ne 8 ] && l="i j k l m n o p"
-	for d in a b c d e f g h $l
-	do
-		M $1$2$d	b $3 $(($n+$count)) 640 operator
-		M r$1$2$d	c $4 $(($n+$count)) 640 operator
-		let count=count+1
-	done
-}
-
-dodisk2()
-{
-	n=$(($(($5*${7:-16}))+$6))
-	M $1$2a b $3 $n 640 operator
-	M r$1$2a c $4 $n 640 operator
-	n=$(($n+2))
-	M $1$2c b $3 $n 640 operator
-	M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist[0]="rm -f"
-
-mkl() {
-	mklist[${#mklist[*]}]=";mknod -m $1 $2 $3 $4 $5"
-}
-
-M() {
-	RMlist[${#RMlist[*]}]=$1
-	mkl ${5-666} $1 $2 $3 $4
-	G=${6:-wheel}
-	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
-	} || {
-		case $G in
-		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
-			whlist[${#whlist[*]}]="$1"
-		;;
-		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
-			oplist[${#oplist[*]}]="$1"
-		;;
-		*)
-			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
-		esac
-	}
-	return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
-do
-U=`unt $i`
-[ "$U" ] || U=0
-
-case $i in
-std)
-	M console	c 0 0 600
-	M tty		c 1 0
-	M mem		c 2 0 640 kmem
-	M kmem		c 2 1 640 kmem
-	M null		c 2 2
-	M zero		c 2 12
-	M stdin		c 21 0
-	M stdout	c 21 1
-	M stderr	c 21 2
-	M ksyms		c 43 0 640 kmem
-	M klog		c 6 0 600
-	;;
-
-
-vscsi*)
-	M vscsi$U c 53 $U 600
-	;;
-
-vmes0)
-	M vmes0 c 32 0 640 kmem
-	;;
-
-vmel0)
-	M vmel0 c 31 0 640 kmem
-	;;
-
-uk*)
-	M uk$U c 41 $U 640 operator
-	;;
-
-tun*)
-	M tun$U c 23 $U 600
-	;;
-
-systrace)
-	M systrace c 50 0 644
-	;;
-
-sram0)
-	M sram0 c 7 0 640 kmem
-	;;
-
-*random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
-	;;
-
-pppx*)
-	M pppx$U c 55 $U 600
-	;;
-
-pf*)
-	M pf c 39 0 600
-	;;
-
-nvram0)
-	M nvram0 c 10 0 640 kmem
-	;;
-
-lkm)
-	M lkm c 24 0 640 _lkm
-	;;
-
-fuse)
-	M fuse$U c 45 $U 600
-	;;
-
-fd)
-	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
-	while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
-	MKlist[${#MKlist[*]}]=";chmod 555 fd"
-	;;
-
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
-bpf*)
-	M bpf$U c 22 $U 600
-	;;
-
-bio)
-	M bio c 49 0 600
-	;;
-
-pty*)
-	if [ $U -gt 15 ]; then
-		echo bad unit for pty in: $i
-		continue
-	fi
-	set -A letters p q r s t u v w x y z P Q R S T
-	set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \
-	    r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \
-	    Y Z
-
-	name=${letters[$U]}
-	n=0
-	while [ $n -lt 62 ]
-	do
-		nam=$name${suffixes[$n]}
-		off=$(($U*62))
-		M tty$nam c 4 $(($off+$n))
-		M pty$nam c 5 $(($off+$n))
-		n=$(($n+1))
-	done
-	;;
-
-ptm)
-	M ptm c 52 0 666
-	;;
-
-ttyv*)
-	u=${i#ttyv*}
-	case $u in
-	0|1|2|3|4|5|6|7)
-		M ttyv$u c 15 $u 660 dialer uucp
-		M cuav$u c 15 $(($u+128)) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac
-	;;
-
-tty[a-z])
-	u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	*) echo unknown tty device $i ;;
-	esac
-	case $u in
-	a|b|c|d)
-		M tty$u c 12 $n 660 dialer uucp
-		M cua$u c 12 $(($n+128)) 660 dialer uucp
-		;;
-	esac
-	;;
-
-tty0*)
-	u=${i#tty0*}
-	case $u in
-	0|1|2|3|4|5|6|7)
-		M tty0$u c 13 $u 660 dialer uucp
-		M cua0$u c 13 $(($u+128)) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac
-	;;
-
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 5 $n 660 operator
-		M ${pre}rst$U	c 20 $n 660 operator
-		n=$(($n+1))
-	done
-	;;
-
-ch*)
-	M ch$U c 44 $U 660 operator
-	;;
-
-vnd*)
-	dodisk vnd $U 8 19 $U 0
-	;;
-
-rd*)
-	dodisk2 rd $U 7 18 $U 0
-	;;
-
-cd*)
-	dodisk2 cd $U 6 9 $U 0
-	;;
-
-local)
-	test -s $T.local && sh $T.local
-	;;
-
-ramdisk)
-	R diskmap bio pty0 tty00 ttya rd0 cd0 cd1 st0 st1 sd0 sd1 sd2
-	R sd3 sd4 bpf0 std
-	;;
-
-all)
-	R ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7 tty00 tty01
-	R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb vnd0 vnd1 vnd2
-	R vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
-	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
-	R diskmap vscsi0 ch0 vmel0 vmes0 nvram0 sram0 fuse pppx ptm
-	R local uk0 random lkm pf systrace std st0 st1 fd
-	;;
-
-sd*)
-	case $i in
-	sd*) dodisk sd $U 4 8 $U 0;;
-	esac
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
-}
-R "$@"
-{
-echo -n ${RMlist[*]}
-echo -n ${mklist[*]}
-echo -n ${MKlist[*]}
-echo -n ${whlist[*]}
-echo ${oplist[*]}
-} | if [ "$eo" = "echo" ]; then
-        cat
-else
-	sh
-fi
diff --git a/src/etc/etc.mvme88k/MAKEDEV.md b/src/etc/etc.mvme88k/MAKEDEV.md
deleted file mode 100644
index d86a127f..00000000
--- a/src/etc/etc.mvme88k/MAKEDEV.md
+++ /dev/null
@@ -1,143 +0,0 @@
-define(MACHINE,mvme88k)dnl
-vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.33 2014/01/05 01:16:52 deraadt Exp $-},
-etc.MACHINE)dnl
-dnl
-dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any
-dnl purpose with or without fee is hereby granted, provided that the above
-dnl copyright notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl
-dnl *** mvme88k-specific devices
-dnl
-__devitem(dart, ttya-b, MVME188 serial ports)dnl
-_mkdev(dart, {-tty[a-z]-}, {-u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	*) echo unknown tty device $i ;;
-	esac
-	case $u in
-	a|b|c|d)
-		M tty$u c major_dart_c $n 660 dialer uucp
-		M cua$u c major_dart_c Add($n, 128) 660 dialer uucp
-		;;
-	esac-})dnl
-__devitem(cl, tty0*, MVME1x7 CL-CD2400 serial ports)dnl
-_mkdev(cl, {-tty0*-}, {-u=${i#tty0*}
-	case $u in
-	0|1|2|3|4|5|6|7)
-		M tty0$u c major_cl_c $u 660 dialer uucp
-		M cua0$u c major_cl_c Add($u, 128) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac-})dnl
-__devitem(vx, ttyv*, MVME332XT serial ports)dnl
-_mkdev(vx, {-ttyv*-}, {-u=${i#ttyv*}
-	case $u in
-	0|1|2|3|4|5|6|7)
-		M ttyv$u c major_vx_c $u 660 dialer uucp
-		M cuav$u c major_vx_c Add($u, 128) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac-})dnl
-__devitem(sram, sram0, On-board static memory)dnl
-_mkdev(sram, sram0, {-M sram0 c major_sram_c 0 640 kmem-})dnl
-__devitem(nvram, nvram0, On-board non-volatile memory)dnl
-_mkdev(nvram, nvram0, {-M nvram0 c major_nvram_c 0 640 kmem-})dnl
-__devitem(vmes, vmes0, VMEbus D16 space)dnl
-_mkdev(vmes, vmes0, {-M vmes0 c major_vmes_c 0 640 kmem-})dnl
-__devitem(vmel, vmel0, VMEbus D32 space)dnl
-_mkdev(vmel, vmel0, {-M vmel0 c major_vmel_c 0 640 kmem-})dnl
-dnl
-dnl *** MAKEDEV itself
-dnl
-_TITLE(make)
-dnl
-dnl all)
-dnl
-target(all, sram, 0)dnl
-target(all, nvram, 0)dnl
-target(all, vmes, 0)dnl
-target(all, vmel, 0)dnl
-dnl
-target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)dnl
-target(all, pty, 0)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, bio)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, uk, 0)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-twrget(all, dart, tty, a, b)dnl
-twrget(all, cl, tty0, 0, 1, 2, 3, 4, 5, 6, 7)dnl
-twrget(all, vx, ttyv, 0, 1, 2, 3, 4, 5, 6, 7)dnl
-_DEV(all)
-dnl
-dnl ramdisk)
-dnl
-twrget(ramd, dart, tty, a)dnl
-twrget(ramd, cl, tty0, 0)dnl
-target(ramd, pty, 0)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
-target(ramd, random)dnl
-_DEV(ramd)
-dnl
-_DEV(std)
-_DEV(local)
-dnl
-_TITLE(dis)
-_DEV(cd, 9, 6)
-_DEV(rd, 18, 7)
-_DEV(sd, 8, 4)
-_DEV(vnd, 19, 8)
-_TITLE(tap)
-_DEV(ch, 44)
-_DEV(st, 20, 5)
-_TITLE(term)
-_DEV(cl, 13)
-_DEV(dart, 12)
-_DEV(vx, 15)
-_TITLE(pty)
-_DEV(ptm, 52)
-_DEV(pty, 5)
-_DEV(tty, 4)
-_TITLE(spec)
-_DEV(bio, 49)
-_DEV(bpf, 22)
-_DEV(diskmap, 54)
-_DEV(fdesc, 21)
-_DEV(fuse, 45)
-_DEV(lkm, 24)
-_DEV(nvram, 10)
-_DEV(pf, 39)
-_DEV(pppx, 55)
-_DEV(rnd, 40)
-_DEV(sram, 7)
-_DEV(systrace, 50)
-_DEV(tun, 23)
-_DEV(uk, 41)
-_DEV(vmel, 31)
-_DEV(vmes, 32)
-_DEV(vscsi, 53)
-dnl
-divert(__mddivert)dnl
-dnl
-_std(1, 2, 43, 6)
-	;;
-
diff --git a/src/etc/etc.mvme88k/Makefile b/src/etc/etc.mvme88k/Makefile
deleted file mode 100644
index 324bc976..00000000
--- a/src/etc/etc.mvme88k/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
-
-all: MAKEDEV
-
-.include <bsd.prog.mk>
diff --git a/src/etc/etc.mvme88k/Makefile.inc b/src/etc/etc.mvme88k/Makefile.inc
deleted file mode 100644
index f6a699e7..00000000
--- a/src/etc/etc.mvme88k/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.16 2013/05/12 12:15:59 miod Exp $
-
-KERNELS += GENERIC.MP bsd.mp
-
-bootblocks:
-	cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
-
-MDEXT=	bsd.rd \
-	bootsd bootst bootxx installboot netboot sboot stboot tftpboot
diff --git a/src/etc/etc.mvme88k/disktab b/src/etc/etc.mvme88k/disktab
deleted file mode 100644
index 453aecc2..00000000
--- a/src/etc/etc.mvme88k/disktab
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: disktab,v 1.6 2010/07/02 20:33:54 tedu Exp $
-
-# XXX - Would like :ba#4096:fa#512: but that panics...
-# Leave nc=16; adjust size using: ns
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
-	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096\
-	:ob#0:pb#0:oc#0:pc#4096:
-miniroot|Installation root-on-swap FS image:\
-	:ty=simulated:se#512:ns#32:nt#8:nc#64:\
-	:ta=4.2BSD:oa#0:pa#16384:\
-	:ob#0:pb#0:oc#0:pc#16384:
-
diff --git a/src/etc/etc.mvme88k/fbtab b/src/etc/etc.mvme88k/fbtab
deleted file mode 100644
index 82cc8e0e..00000000
--- a/src/etc/etc.mvme88k/fbtab
+++ /dev/null
@@ -1,2 +0,0 @@
-/dev/ttya	0600	/dev/console
-/dev/tty00	0600	/dev/console
diff --git a/src/etc/etc.mvme88k/sysctl.conf b/src/etc/etc.mvme88k/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.mvme88k/ttys b/src/etc/etc.mvme88k/ttys
deleted file mode 100644
index 1f32ec2f..00000000
--- a/src/etc/etc.mvme88k/ttys
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.10 2010/03/07 21:10:22 miod Exp $
-#
-# name	getty				type	status		comments
-#
-# If the console is marked insecure, single-user requires
-# the root password.
-console	"/usr/libexec/getty std.9600"	vt220	on   secure
-# MVME188 dart(4) serial ports
-ttya	"/usr/libexec/getty std.9600"	unknown	off  secure	# console
-ttyb	"/usr/libexec/getty std.9600"	unknown	off
-# MVME1x7 cl(4) serial ports
-tty00	"/usr/libexec/getty std.9600"	unknown off  secure	# console
-tty01	"/usr/libexec/getty std.9600"	unknown off
-tty02	"/usr/libexec/getty std.9600"	unknown off
-tty03	"/usr/libexec/getty std.9600"	unknown off
-# M8120 remaining cl(4) serial ports
-tty04	"/usr/libexec/getty std.9600"	unknown off
-tty05	"/usr/libexec/getty std.9600"	unknown off
-tty06	"/usr/libexec/getty std.9600"	unknown off
-tty07	"/usr/libexec/getty std.9600"	unknown off
-# MVME332 vx(4) serial ports
-ttyv0	"/usr/libexec/getty std.9600"	unknown off
-ttyv1	"/usr/libexec/getty std.9600"	unknown off
-ttyv2	"/usr/libexec/getty std.9600"	unknown off
-ttyv3	"/usr/libexec/getty std.9600"	unknown off
-ttyv4	"/usr/libexec/getty std.9600"	unknown off
-ttyv5	"/usr/libexec/getty std.9600"	unknown off
-ttyv6	"/usr/libexec/getty std.9600"	unknown off
-ttyv7	"/usr/libexec/getty std.9600"	unknown off
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 5379cf0c..77985853 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.243 2014/03/15 22:13:36 sthen Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.244 2014/03/18 22:36:29 miod Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -783,8 +783,6 @@ armv7
 ..
 aviion
 ..
-hp300
-..
 hppa
 ..
 i386
@@ -797,10 +795,6 @@ luna88k
 ..
 macppc
 ..
-mvme68k
-..
-mvme88k
-..
 octeon
 ..
 sgi
@@ -867,8 +861,6 @@ armv7
 ..
 aviion
 ..
-hp300
-..
 hppa
 ..
 hppa64
@@ -883,10 +875,6 @@ luna88k
 ..
 macppc
 ..
-mvme68k
-..
-mvme88k
-..
 octeon
 ..
 sgi
diff --git a/src/etc/mtree/4.4BSD.usr b/src/etc/mtree/4.4BSD.usr
index 81c69ca5..6b000f14 100644
--- a/src/etc/mtree/4.4BSD.usr
+++ b/src/etc/mtree/4.4BSD.usr
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.usr,v 1.27 2010/10/18 20:52:43 deraadt Exp $
+#	$OpenBSD: 4.4BSD.usr,v 1.28 2014/03/18 22:36:29 miod Exp $
 #	$NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $
 #
 #	   user: bostic
@@ -739,13 +739,6 @@ cat3            type=dir uname=root gname=wheel mode=0755
 /set type=file gname=bin uname=root mode=0444
 cat4            type=dir uname=root gname=wheel mode=0755
 
-# ./share/man/cat4/hp300
-/set type=file gname=bin uname=root mode=0444
-hp300           type=dir uname=root gname=wheel mode=0755
-# ./share/man/cat4/hp300
-..
-
-
 # ./share/man/cat4/i386
 /set type=file gname=bin uname=root mode=0444
 i386            type=dir uname=root gname=wheel mode=0755
@@ -809,13 +802,6 @@ cat7            type=dir uname=root gname=wheel mode=0755
 /set type=file gname=bin uname=root mode=0444
 cat8            type=dir uname=root gname=wheel mode=0755
 
-# ./share/man/cat8/hp300
-/set type=file gname=bin uname=root mode=0444
-hp300           type=dir uname=root gname=wheel mode=0755
-# ./share/man/cat8/hp300
-..
-
-
 # ./share/man/cat8/i386
 /set type=file gname=bin uname=root mode=0444
 i386            type=dir uname=root gname=wheel mode=0755
diff --git a/src/etc/remote b/src/etc/remote
index 04456ed0..598866c4 100644
--- a/src/etc/remote
+++ b/src/etc/remote
@@ -1,4 +1,4 @@
-#	$OpenBSD: remote,v 1.14 2012/06/21 01:00:36 deraadt Exp $
+#	$OpenBSD: remote,v 1.15 2014/03/18 22:36:29 miod Exp $
 #	from: @(#)remote	8.1 (Berkeley) 6/10/93
 #
 # remote -- remote host description database
@@ -20,7 +20,7 @@
 # /dev/ttya, /dev/cuaa, etc. The samples provide descriptions
 # for the first serial port in each style.
 #
-# A few architectures such as the Alpha, HPPA, or mvme88k either
+# A few architectures such as the Alpha or HPPA either
 # don't provide a serial port by default or have more complex
 # naming conventions.
 #
@@ -53,8 +53,8 @@ doshost:\
 unixhost:\
 	:pa=none:br#9600:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:
 
-tty00|For hp300,i386,macppc,vax:\
+tty00|For i386,macppc,vax:\
 	:dv=/dev/tty00:tc=direct:tc=unixhost:
 
-ttya|For sparc,mvme68k:\
+ttya|For sparc:\
 	:dv=/dev/ttya:tc=direct:tc=unixhost:
diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
index d75fe5f7..953c5338 100644
--- a/src/lib/libc/stdlib/Makefile.inc
+++ b/src/lib/libc/stdlib/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.48 2013/06/05 04:06:08 guenther Exp $
+#	$OpenBSD: Makefile.inc,v 1.49 2014/03/18 22:36:29 miod Exp $
 
 # stdlib sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib
@@ -12,9 +12,7 @@ SRCS+=	a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \
 	tfind.c tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c \
 	lrand48.c mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c _Exit.c
 
-.if   (${MACHINE_CPU} == "m68k")
-SRCS+=	abs.S div.c labs.c ldiv.c
-.elif (${MACHINE_CPU} == "i386")
+.if (${MACHINE_CPU} == "i386")
 SRCS+=	abs.S div.S labs.S ldiv.S
 .elif (${MACHINE_CPU} == "vax")
 SRCS+=	abs.c div.c labs.c ldiv.c
@@ -25,7 +23,7 @@ SRCS+=	abs.c div.c labs.c ldiv.c
 SRCS+=	abs.c div.c labs.c ldiv.c
 .endif
 
-.if (${MACHINE_CPU} == "vax") || (${MACHINE_CPU} == "m68k")
+.if (${MACHINE_CPU} == "vax")
 SRCS+=	insque.S remque.S
 .else
 SRCS+=	insque.c remque.c