diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
deleted file mode 100644
index 6bccf9bf..00000000
--- a/src/etc/etc.arc/MAKEDEV
+++ /dev/null
@@ -1,478 +0,0 @@
-#!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.36 2001/06/24 23:35:58 kjell Exp $
-#	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
-#
-
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	ramdisk	makes all devices for a ramdisk kernel
-#	std	standard devices
-#	local	configuration specific devices
-#
-# Tapes:
-#	st*	SCSI tapes
-#
-# Disks:
-#	fd*	Floppy disk drives (3 1/2", 5 1/4")
-#	sd*	SCSI disks
-#	wd*	ISA "winchester" disk drives (ST506,IDE,ESDI,RLL,...)
-#	cd*	SCSI cdrom drives
-#	vnd*	"file" pseudo-disks
-#	rd*	"ramdisk" pseudo-disks
-#	ccd*	concatenated disk devices
-#
-# Console ports:
-#	ttyC0	pccons
-#
-# Pointing devices:
-#	pms*	PS/2 compatible mouse
-#
-# Terminal ports:
-#	tty*	tty ports
-#
-# Pseudo terminals:
-#	pty*	set of 16 master and slave pseudo terminals
-#
-# Printers:
-#	lpt*	stock lp
-#
-# Call units:
-#
-# Special purpose devices:
-#	ch*	SCSI media changer
-#	bpf*	Berkeley Packet Filter
-#	lkm	loadable kernel modules interface
-#	tun*	network tunnel driver
-#	joy*	joystick driver
-#	*random	inkernal random data source
-#
-# Platform-specific devices:
-#
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
-this=$0
-umask 77
-
-# default shell support functions
-add ()
-{
-	tmp=0
-	while [ "$1" ]
-	do
-		tmp=$(( $1 + $tmp ))
-		shift
-	done
-	echo $tmp
-}
-mult ()
-{
-	echo "$(( $1 * $2 ))"
-}
-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
-}
-trunc ()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg1="$1"
-	arg2="$2"
-	echo ${arg1#$arg2}
-}
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg1="$1"
-	tmp="${arg1#[a-z]*}"
-	while [ "$tmp" != "$arg1" ]
-	do
-		arg1=$tmp
-		tmp="${arg1#[a-z]*}"
-	done
-	tmp="${arg1%*[a-z]}"
-	while [ "$tmp" != "$arg1" ]
-	do
-		arg1=$tmp
-		tmp="${arg1%*[a-z]}"
-	done
-	echo $arg1
-}
-
-for i
-do
-
-unit=`unt $i`
-[ "$unit" ] || unit=0
-
-case $i in
-
-all)
-	sh $this std fd fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 cd0 ss0
-	sh $this ccd0 ccd1 ccd2 xfs0
-	sh $this vnd0 vnd1 vnd2 vnd3 tty00 tty01 tty02 tty03 pty0 pty1
-	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	sh $this pf tun0 tun1 tun2
-	sh $this ttyC0 lpt0 pms0 random uk0 uk1 local joy0 joy1
-	;;
-
-joy*)
-	unit=`expr $i : 'joy\(.*\)'`
-	rm -f joy$unit
-	mknod joy$unit c 26 $unit
-	chown root.wheel joy$unit
-	chmod 666 joy$unit
-	;;
-
-ramdisk)
-	sh $this std fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 cd0 
-	sh $this tty00 tty01 ttyC0 lpt0 random rd0
-	;;
-
-std)
-	mknod console		c 0 0
-	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
-	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
-	mknod null		c 3 2	; chmod 666 null
-	mknod zero		c 3 12  ; chmod 666 zero
-	mknod tty		c 2 0	; chmod 666 tty
-	mknod klog		c 6 0	; chmod 600 klog
-	mknod stdin		c 7 0	; chmod 666 stdin
-	mknod stdout		c 7 1	; chmod 666 stdout
-	mknod stderr		c 7 2	; chmod 666 stderr
-	mknod ksyms		c 35 0  ; chmod 640 ksyms ; chown root.kmem ksyms
-	;;
-
-ttyC*)
-	unit=`expr $i : 'ttyC\(.*\)'`
-	rm -f ttyC$unit
-	mknod ttyC$unit c 14 $unit
-	chown root.wheel ttyC$unit
-	case $unit in
-	0)
-		rm -f pccons
-		ln -s ttyC0 pccons
-		;;
-	esac
-	;;
-
-pms*)
-	unit=`expr $i : '.ms\(.*\)'`
-	unit=`expr $unit \* 2 + 1`
-	case $i in
-	pms*) name=pms; chr=15;;
-	esac
-	rm -f $name$unit
-	mknod $name$unit c $chr $unit
-	chown root.wheel $name$unit
-	;;
-
-fd)
-	rm -rf fd/*
-	mkdir fd > /dev/null 2>&1
-	n=0
-	(cd fd && while [ $n -lt 64 ]; do mknod $n c 7 $n; n="$(( $n + 1 ))"; done)
-	chown -R root.wheel fd
-	chmod 555 fd
-	chmod 666 fd/*
-	;;
-
-st*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	st*) name=st; chr=10;;
-	esac
-	case $unit in
-	0|1|2|3|4|5|6)
-		unit0=`expr $unit \* 16`
-		unit1=`expr $unit \* 16 + 1`
-		unit2=`expr $unit \* 16 + 4`
-		unit3=`expr $unit \* 16 + 5`
-		mknod r${name}${unit} c $chr $unit0
-		mknod nr${name}${unit} c $chr $unit1
-		mknod r${name}h${unit} c $chr $unit2
-		mknod nr${name}h${unit} c $chr $unit3
-		chown root.operator r${name}${unit} nr${name}${unit} \
-			r${name}h${unit} nr${name}h${unit}
-		chmod 660 r${name}${unit} nr${name}${unit} \
-			r${name}h${unit} nr${name}h${unit}
-		;;
-	*)
-		echo bad unit for tape in: $1
-		;;
-	esac
-	umask 77
-	;;
-
-ch*)
-	umask 2
-	name=ch; chr=36
-	rm -f $name$unit
-	mknod ${name}${unit}	c $chr $unit
-	chown root.operator ${name}${unit}
-	chmod 660 ${name}${unit}
-	umask 77
-	;;
-
-bpf*|tun*)
-	unit=`expr $i : '...\(.*\)'`
-	case $i in
-	bpf*) name=bpf; chr=12;;
-	tun*) name=tun; chr=40;;
-	esac
-	rm -f $name$unit
-	mknod $name$unit c $chr $unit
-	chown root.wheel $name$unit
-	;;
-
-pf)
-	rm -f pf
-	mknod pf c 73 0
-	chown root.wheel pf
-	chmod 600 pf
-	;;
-
-rd*)
-	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
-	mknod rd${unit}a b 8 `expr $unit '*' 16 + 0`
-	mknod rd${unit}c b 8 `expr $unit '*' 16 + 2`
-	mknod rrd${unit}a c 22 `expr $unit '*' 16 + 0`
-	mknod rrd${unit}c c 22 `expr $unit '*' 16 + 2`
-	chown root.operator rd${unit}[ac] rrd${unit}[ac]
-	chmod 640 rd${unit}[ac] rrd${unit}[ac]
-	umask 77
-	;;
-
-#lkm)
-#	rm -f lkm
-#	mknod lkm c 112 0
-#	chown root.kmem lkm
-#	chmod 640 lkm
-#	;;
-
-ccd*|fd*|sd*|wd*)
-	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
-	case $i in
-	ccd*) name=ccd; blk=6; chr=23;;
-	sd*) name=sd; blk=0; chr=9;;
-	fd*) name=fd; blk=7; chr=13;;
-	wd*) name=wd; blk=4; chr=18;;
-	esac
-	rm -f $name$unit r$name$unit
-	case $unit in
-	0|1|2|3|4|5|6)
-	    mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
-	    mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
-	    mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
-	    mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + 15`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + 1`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-	    chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-	    chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	    ;;
-	*)
-		echo bad unit for disk in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-vnd*)
-	umask 2 ; unit=`expr $i : 'vnd\(.*\)'`
-	for name in vnd svnd; do
-		blk=2; chr=11;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + $off + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + $off + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + $off + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + $off + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + $off + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + $off + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + $off + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + $off + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + $off + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + $off + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + $off + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + $off + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + $off + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + $off + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + $off + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + $off + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + $off + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + $off + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + $off + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + $off + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + $off + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + $off + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + $off + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + $off + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + $off + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + $off + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + $off + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + $off + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + $off + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + $off + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + $off + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + $off + 15`
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	done
-	umask 77
-	;;
-
-cd*)
-	umask 2 ; unit=`expr $i : '.*cd\(.*\)'`
-	case $i in
-	cd*) name=cd; blk=3; chr=8;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a   b $blk `expr $unit '*' 16 + 0`
-	mknod ${name}${unit}c   b $blk `expr $unit '*' 16 + 2`
-	mknod r${name}${unit}a  c $chr `expr $unit '*' 16 + 0`
-	mknod r${name}${unit}c  c $chr `expr $unit '*' 16 + 2`
-	chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-	chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	umask 77
-	;;
-
-uk*)
-	unit=`expr $i : 'uk\(.*\)'`
-	rm -f uk$unit
-	mknod uk$unit c 32 $unit
-	chown root.operator uk$unit
-	chmod 640 uk$unit
-	;;
-
-ss*)
-	unit=`expr $i : 'ss\(.*\)'`
-	rm -f ss$unit
-	mknod ss$unit c 34 $unit
-	chown root.operator ss$unit
-	chmod 440 ss$unit
-#	backwards compatibility with older PINTs
-	rm -f scan$unit
-	ln -s ss$unit scan$unit
-	;;
-
-lpt*)
-	unit=`expr $i : 'lpt\(.*\)'`
-	rm -f lpt$unit
-	mknod lpt$unit c 16 $unit
-	chown root.wheel lpt$unit
-	;;
-
-tty*)
-	unit=`expr $i : '...\(.*\)'`
-	rm -f tty$unit cua$unit
-	mknod tty$unit c 17 $unit
-	mknod cua$unit c 17 `expr $unit + 128`
-	chown uucp.dialer tty$unit cua$unit
-	chmod 660 tty$unit cua$unit
-	;;
-
-pty*)
-	class=`expr $i : 'pty\(.*\)'`
-	case $class in
-	0) offset=0 name=p;;
-	1) offset=16 name=q;;
-	2) offset=32 name=r;;
-	3) offset=48 name=s;;
-	4) offset=64 name=t;;
-	5) offset=80 name=u;;
-	6) offset=96 name=v;;
-	7) offset=112 name=w;;
-	8) offset=128 name=x;;
-	9) offset=144 name=y;;
-	10) offset=160 name=z;;
-	11) offset=176 name=P;;
-	12) offset=192 name=Q;;
-	13) offset=208 name=R;;
-	14) offset=224 name=S;;
-	15) offset=240 name=T;;
-	*) echo bad unit for pty in: $i;;
-	esac
-	case $class in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		umask 0
-		n=0
-		while [ $n -lt 16 ]
-		do
-			nam=$name`hex $n`
-			rm -f {tty,pty}$nam
-			mknod tty$nam c 4 "$(( $offset + $n ))"
-			mknod pty$nam c 5 "$(( $offset + $n ))"
-			n="$(( $n + 1 ))"
-		done
-		umask 77
-		;;
-	esac
-	;;
-
-random|srandom|urandom|prandom|arandom)
-	rm -f random urandom srandom prandom arandom
-	mknod  random c 32 0
-	mknod srandom c 32 1
-	mknod urandom c 32 2
-	mknod prandom c 32 3
-	mknod arandom c 32 4
-	chown root.wheel random srandom urandom prandom arandom
-	chmod 644 random srandom urandom prandom arandom
-	;;
-xfs*)
-	rm -f xfs$unit
-	mknod xfs$unit c 51 $unit 
-	chmod 600 xfs$unit 
-	chown root.wheel xfs$unit
-	;;
-
-local)
-	umask 0
-	test -s MAKEDEV.local && sh $this.local
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
diff --git a/src/etc/etc.arc/Makefile.inc b/src/etc/etc.arc/Makefile.inc
deleted file mode 100644
index cf4e7579..00000000
--- a/src/etc/etc.arc/Makefile.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1997/09/21 11:50:17 deraadt Exp $
-#	etc.arc/Makefile.inc -- arc-specific etc Makefile targets
-
-.ifdef DESTDIR
-
-snap_md: binutils bsd distrib
-
-binutils:
-	cd ${DESTDIR} && tar cf - usr/*openbsd* \
-	    | ${GZIP} ${GZIPFLAGS} > snapshot/usr.binutils.tar${GZIPEXT}
-
-bsd:
-	cd ${.CURDIR}/../sys/arch/arc/conf && config GENERIC
-	cd ${.CURDIR}/../sys/arch/arc/compile/GENERIC && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/arc/compile/GENERIC/bsd \
-	    ${DESTDIR}/snapshot/bsd
-	cp ${.CURDIR}/../sys/arch/arc/compile/GENERIC/bsd.ecoff \
-	    ${DESTDIR}/snapshot/bsd.ecoff
-
-distrib:
-	cd ${.CURDIR}/../distrib && make cleandir && \
-	    make && make install
-
-.endif
diff --git a/src/etc/etc.arc/disktab b/src/etc/etc.arc/disktab
deleted file mode 100644
index 2e21272b..00000000
--- a/src/etc/etc.arc/disktab
+++ /dev/null
@@ -1,108 +0,0 @@
-#	$OpenBSD: disktab,v 1.8 2001/01/28 23:31:27 niklas Exp $
-
-# Disk geometry and partition layout tables. 
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-p]	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#	t[a-p]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
-
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#4:ns#128:\
-	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
-	:ob#0:pb#0:oc#0:pc#8192:
-	
-# Seagate ST31200N
-ST31200N-MBR:\
-        :ty=winchester:ns#84:nt#9:nc#2700:\
-	:pa#65536:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#69632:bb#8192:fb#1024:tb=swap:\
-        :pc#2037104:oc#4096:bc#8192:fc#1024:\
-	:pd#2041200:od#0:bd#8192:fd#1024:\
-	:pe#4064:oe#32:be#8192:fe#1024:te=msdos:\
-        :pg#619200:og#200704:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#1221296:oh#819904:bh#8192:fh#1024:th=4.2bsd:
-
-# QUANTUM, Trailblazer 850 with MBR boot.
-TRB850S-MBR:\
-        :ty=winchester:ns#113:nt#4:nc#3653:\
-	:pa#88096:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-        :pc#1647060:oc#0:bc#8192:fc#1024:\
-        :pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-        :pe#586000:oe#229408:be#8192:fe#1024:te=4.2bsd:\
-        :pf#415826:of#815408:bf#8192:ff#1024:tf=4.2bsd:\
-        :pg#415826:og#1231234:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#831652:oh#815408:bh#8192:fh#1024:th=4.2bsd:
-
-#QUANTUM, FIREBALL1080S
-FIREBALL1080S-MBR:\
-        :ty=winchester:ns#139:nt#4:nc#3835:\
-	:pa#120832:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-        :pc#2132260:oc#0:bc#8192:fc#1024:\
-        :pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-        :pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
-        :pf#544433:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
-        :pg#544433:og#1587827:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#1088866:oh#1043394:bh#8192:fh#1024:th=4.2bsd:
-
-#QUANTUM, FIREBALL_TM3200S
-FIREBALL_TM3200S-MBR:\
-        :ty=winchester:ns#184:nt#5:nc#6810:\
-	:pa#120832:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-        :pc#6265200:oc#0:bc#8192:fc#1024:\
-        :pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-        :pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
-        :pf#1205000:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
-        :pg#2008403:og#2248394:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#2008403:oh#4256797:bh#8192:fh#1024:th=4.2bsd:
-
-# QUANTUM ATLAS, XP34300
-XP34300:\
-	:ty=winchester:ns#107:nt#20:nc#3907:\
-	:pa#131072:oa#0:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-	:pc#8360980:oc#0:bc#8192:fc#1024:\
-	:pd#1024000:od#262144:bd#8192:fd#1024:td=4.2bsd:\
-	:pe#1024000:oe#1286144:be#8192:fe#1024:te=4.2bsd:\
-	:pf#2048000:of#2310144:bf#8192:ff#1024:tf=4.2bsd:\
-	:pg#2048000:og#4358144:bg#8192:fg#1024:tg=4.2bsd:\
-	:ph#1954836:oh#6406144:bh#8192:fh#1024:th=4.2bsd:\
-	:pi#2712458:oi#262144:bi#8192:fi#1024:ti=4.2bsd:\
-	:pj#2712458:oj#2974602:bj#8192:fj#1024:tj=4.2bsd:\
-	:pk#2673920:ok#5687060:bk#8192:fk#1024:tk=4.2bsd:\
-	:pl#4068688:ol#262144:bl#8192:fl#1024:tl=4.2bsd:\
-	:pm#4030148:om#4330832:bm#8192:fm#1024:tm=4.2bsd:\
-	:pn#8098836:on#262144:bn#8192:fn#1024:tn=4.2bsd:
-
-#iomega ZIP with MBR boot partition
-ZIP-MBR:\
-	:ty=zip:ns#32:nt#64:nc#96:\
-	:pa#188416:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
-	:pc#192512:oc#4096:bc#8192:fc#1024:\
-        :pd#4064:od#32:bd#8192:fd#1024:td=msdos:\
diff --git a/src/etc/etc.arc/fbtab b/src/etc/etc.arc/fbtab
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.arc/ld.so.conf b/src/etc/etc.arc/ld.so.conf
deleted file mode 100644
index e8e4bdcd..00000000
--- a/src/etc/etc.arc/ld.so.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib
diff --git a/src/etc/etc.arc/sysctl.conf b/src/etc/etc.arc/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.arc/ttys b/src/etc/etc.arc/ttys
deleted file mode 100644
index a86c4723..00000000
--- a/src/etc/etc.arc/ttys
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.4 1998/06/28 03:26:53 todd Exp $
-#
-# name	getty				type	status		comments
-#
-console	"/usr/libexec/getty Pc"		pc3	off secure
-ttyC0	"/usr/libexec/getty Pc"		pc3	on  secure
-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
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
deleted file mode 100644
index 172d4013..00000000
--- a/src/etc/etc.arm32/MAKEDEV
+++ /dev/null
@@ -1,428 +0,0 @@
-#!/bin/sh -
-#
-#	$OpenBSD: MAKEDEV,v 1.18 2001/06/24 23:35:59 kjell Exp $
-#	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
-#
-# Copyright (c) 1990 The Regents of the University of California.
-# All rights reserved.
-#
-# Updated by Mark Brinicombe
-# Created by Scott Stevens
-#
-# Redistribution and use in source and binary forms are permitted provided
-# that: (1) source distributions retain this entire copyright notice and
-# comment, and (2) distributions including binaries display the following
-# acknowledgement:  ``This product includes software developed by the
-# University of California, Berkeley and its contributors'' in the
-# documentation or other materials provided with the distribution and in
-# all advertising materials mentioning features or use of this software.
-# Neither the name of the University nor the names of its contributors may
-# be used to endorse or promote products derived from this software without
-# specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	floppy	devices needed for install floppies
-#	std	standard devices
-#	local	configuration specific devices
-#
-# Tapes:
-#	st*	SCSI tapes
-#
-# Disks:
-#	wd*	ISA "winchester" disk drives (ST506,IDE,ESDI,RLL,...)
-#	fd*	Floppy disk drives (3 1/2", 5 1/4")
-#	sd*	SCSI disks
-#	cd*	SCSI cdrom drives
-#	vnd*	"file" pseudo-disks
-#
-# Console ports:
-#	ttyv0	pccons or pcvt screen 0
-#	ttyv*	pcvt
-#
-# Pointing devices:
-#	quadmouse	"quadrature mouse"
-# 
-# Terminal ports:
-#	com*	standard PC COM ports			(XXX)
-#	tty*	alias for PC COM ports, this is what the system really wants
-#
-# Pseudo terminals:
-#	pty*	set of 16 master and slave pseudo terminals
-#
-# Printers:
-#	lpt*	stock lp
-#	lpa*	interruptless lp
-#
-# Cpus:
-#	cpu*	cpus
-#
-# Call units:
-#
-# Special purpose devices:
-#	rd*	"ramdisk" pseudo-disks
-#	kbd	raw keyboard
-#	kbdctl	keyboard control
-#	fd	makes fd/* for the fdescfs.
-#	bpf*	Berkeley Packet Filter
-#	beep	riscpc speaker
-#	lkm	loadable kernel modules interface
-#	tun*	network tunnel driver
-#	ch*	SCSI media changer
-#	uk*	SCSI Unknown device
-#	ss*	SCSI scanners
-#	iic*	IIC bus device
-#	rtc*	RTC device
-#	*random	inkernal random data source
-#
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
-this=$0
-umask 77
-
-for i
-do
-
-unit=`unt $i`
-[ "$unit" ] || unit=0
-
-case $i in
-
-all)
-	sh $this std fd fd0 fd1 wd0 wd1 rd0 rd1 sd0 sd1 sd2 tty0 tty1 pty0 pty1
-	sh $this st0 st1 ch0 cd0 cd1 vnd0 vnd1 ccd0 ccd1 uk0 uk1 ss0 xfs0
-	sh $this ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7 ttyv8 ttyv9
-	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	sh $this lpa0 lpt0 pf tun0 tun1 tun2 random
-	sh $this beep lkm quadmouse local cpu0 cpu1 cpu2 cpu3 cpu4 cpu5
-	;;
-
-floppy)
-	sh $this std fd0 fd1 wd0 wd1 rd0 rd1 sd0 sd1 sd2 tty0 tty1
-	sh $this ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5
-	sh $this st0 st1 cd0 cd1
-	;;
-
-std)
-	rm -f console drum mem kmem null zero tty klog stdin stdout stderr kbd
-	rm -f kbdctl vidcvideo0 vidc iic rtc0
-	mknod mem		c 0 0	; chmod 640 mem	; chown root.kmem mem
-	mknod kmem		c 0 1	; chmod 640 kmem ; chown root.kmem kmem
-	mknod null		c 0 2	; chmod 666 null
-	mknod zero		c 0 3	; chmod 666 zero
-	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
-	mknod console		c 2 0
-	mknod tty		c 3 0	; chmod 666 tty
-	mknod klog		c 5 0	; chmod 600 klog
-	mknod kbd		c 11 0	; chmod 666 kbd
-	mknod kbdctl		c 11 1	; chmod 666 kbdctl
-	mknod stdin		c 34 0	; chmod 666 stdin
-	mknod stdout		c 34 1	; chmod 666 stdout
-	mknod stderr		c 34 2	; chmod 666 stderr
-	mknod vidcvideo0	c 37 0	; chmod 640 vidcvideo0
-	ln -s vidcvideo0 vidc
-	mknod iic		c 42 0	; chmod 600 iic
-	mknod rtc0		c 43 0	; chmod 644 rtc0
-	;;
-
-ttyv*)
-	unit=`expr $i : 'ttyv\(.*\)'`
-	rm -f ttyv$unit
-	mknod ttyv$unit c 4 $unit
-	chown root.wheel ttyv$unit
-	;;
-
-fd)
-	rm -f fd/*
-	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-	 		printf("mknod %d c 34 %d;", i, i)}'`)
-	chown -R root.wheel fd
-	chmod 555 fd
-	chmod 666 fd/*
-	;;
-
-fd*|sd*|wd*|ccd*)
-	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
-	case $i in
-	fd*) name=fd; blk=17; chr=17;;
-	sd*) name=sd; blk=24; chr=24;;
-	wd*) name=wd; blk=16; chr=16;;
-	ccd*) name=ccd; blk=21; chr=21;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
-	mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + 4`
-	mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + 5`
-	mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + 6`
-	mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + 7`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + 1`
-	mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + 4`
-	mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
-	mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
-	mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	umask 77
-	;;
-
-vnd*)
-	umask 2 ; unit=`expr $i : 'vnd\(.*\)'`
-	for name in vnd svnd; do
-		blk=19; chr=19;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + $off + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + $off + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + $off + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + $off + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + $off + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + $off + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + $off + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + $off + 7`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + $off + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + $off + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + $off + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + $off + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + $off + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + $off + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + $off + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + $off + 7`
-		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	done
-	umask 77
-	;;
-
-com*|tty*)					# (XXX -- com should die)
-	unit=`expr $i : '...\(.*\)'`
-	rm -f com$unit tty0$unit
-	mknod tty0$unit c 12 $unit
-	chown uucp.dialer tty0$unit
-	chmod 660 tty0$unit
-	;;
-
-pty*)
-	class=`expr $i : 'pty\(.*\)'`
-	case $class in
-	0) offset=0 name=p;;
-	1) offset=16 name=q;;
-	2) offset=32 name=r;;
-	3) offset=48 name=s;;
-	4) offset=64 name=t;;
-	5) offset=80 name=u;;
-	6) offset=96 name=v;;
-	7) offset=112 name=w;;
-	8) offset=128 name=x;;
-	9) offset=144 name=y;;
-	10) offset=160 name=z;;
-	11) offset=176 name=P;;
-	12) offset=192 name=Q;;
-	13) offset=208 name=R;;
-	14) offset=224 name=S;;
-	15) offset=240 name=T;;
-	*) echo bad unit for pty in: $i;;
-	esac
-	case $class in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		umask 0
-		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
-			for (i = 0; i < 16; i++)
-				printf("rm -f tty%s%x; mknod tty%s%x c 7 %d;" \
-				    "rm -f pty%s%x; mknod pty%s%x c 6 %d; ", \
-				    n, i, n, i, b+i, n, i, n, i, b+i); }'`
-		umask 77
-		;;
-	esac
-	;;
-
-st*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	st*) name=st;  chr=25; blk=25;;
-	esac
-	rm -f $name$unit n$name$unit e$name$unit en$name$unit \
-		r$name$unit nr$name$unit er$name$unit enr$name$unit 
-	mknod ${name}${unit}	b $blk `expr $unit '*' 16 + 0`
-	mknod n${name}${unit}	b $blk `expr $unit '*' 16 + 1`
-	mknod e${name}${unit}	b $blk `expr $unit '*' 16 + 2`
-	mknod en${name}${unit}	b $blk `expr $unit '*' 16 + 3`
-	mknod r${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
-	mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
-	mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-	chown root.operator ${name}${unit} n${name}${unit} \
-		e$name$unit en$name$unit \
-		r${name}${unit} nr${name}${unit} \
-		er${name}${unit} enr${name}${unit} 
-	chmod 660 ${name}${unit} n${name}${unit} \
-		e$name$unit en$name$unit \
-		r${name}${unit} nr${name}${unit} \
-		er${name}${unit} enr${name}${unit} 
-	umask 77
-	;;
-
-ch*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	ch*) name=ch;  chr=27;;
-	esac
-	rm -f $name$unit
-	mknod ${name}${unit}	c $chr $unit
-	chown root.operator ${name}${unit}
-	chmod 660 ${name}${unit}
-	umask 77
-	;;
-
-uk*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	uk*) name=uk;  chr=28;;
-	esac
-	rm -f $name$unit
-	mknod ${name}${unit}	c $chr $unit
-	chown root.operator ${name}${unit}
-	chmod 640 ${name}${unit}
-	umask 77
-	;;
-
-ss*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	ss*) name=ss;  chr=29;;
-	esac
-	rm -f $name$unit
-	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chown root.operator ${name}${unit}
-	chmod 640 ${name}${unit}
-	umask 77
-	;;
-
-cd*)
-	umask 2 ; unit=`expr $i : '.*cd\(.*\)'`
-	case $i in
-	cd*) name=cd; blk=26; chr=26;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	umask 77
-	;;
-
-rd*)
-	unit=`expr $i : 'rd\(.*\)'`
-	rm -f rd${unit}
-	rm -f rd${unit}c
-	mknod rd${unit} b 18 ${unit}
-	mknod rd${unit}c c 18 `expr ${unit} + 16`
-	chown root.wheel rd${unit}
-	chown root.wheel rd${unit}c
-	;;
-
-lpa*)
-	unit=`expr $i : 'lpa\(.*\)'`
-	rm -f lpa$unit
-	mknod lpa$unit c 8 `expr $unit + 128`
-	chown root.wheel lpa$unit
-	;;
-
-lpt*)
-	unit=`expr $i : 'lpt\(.*\)'`
-	rm -f lpt$unit
-	mknod lpt$unit c 8 $unit
-	chown root.wheel lpt$unit
-	;;
-
-bpf*)
-	unit=`expr $i : 'bpf\(.*\)'`
-	rm -f bpf$unit
-	mknod bpf$unit c 32 $unit
-	chown root.wheel bpf$unit
-	;;
-
-pf)
-	rm -f pf
-	mknod pf c 73 0
-	chown root.wheel pf
-	chmod 600 pf
-	;;
-
-tun*)
-	unit=`expr $i : 'tun\(.*\)'`
-	rm -f tun$unit
-	mknod tun$unit c 33 $unit
-	chmod 600 tun$unit
-	chown root.wheel tun$unit
-	;;
-
-beep)
-	rm -f beep
-	mknod beep c 10 0
-	chown root.wheel beep
-	;;
-
-lkm)
-	rm -f lkm
-	mknod lkm c 35 0
-	chown root.kmem lkm
-	chmod 640 lkm
-	;;
-
-quadmouse)
-	mknod quadmouse c 9 0
-	rm -f mouse
-	ln -s quadmouse mouse
-	;;
-
-cpu*)
-	unit=`expr $i : 'cpu\(.*\)'`
-	rm -f cpu$unit
-	mknod cpu$unit c 38 $unit
-	chown root.wheel cpu$unit
-	;;
-
-
-random|srandom|urandom|prandom|arandom)
-	rm -f random urandom srandom prandom arandom
-	mknod  random c 44 0
-	mknod srandom c 44 1
-	mknod urandom c 44 2
-	mknod prandom c 44 3
-	mknod arandom c 44 4
-	chown root.wheel random srandom urandom prandom arandom
-	chmod 644 random srandom urandom prandom arandom
-	;;
-xfs*)
-	rm -f xfs$unit
-	mknod xfs$unit c 51 $unit 
-	chmod 600 xfs$unit 
-	chown root.wheel xfs$unit
-	;;
-
-local)
-	umask 0
-	test -s MAKEDEV.local && sh $this.local
-	;;
-
-esac
-done
diff --git a/src/etc/etc.arm32/Makefile.inc b/src/etc/etc.arm32/Makefile.inc
deleted file mode 100644
index fe18b7a8..00000000
--- a/src/etc/etc.arm32/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1997/09/21 11:50:19 deraadt Exp $
-#	etc.arm32/Makefile.inc -- arm32-specific etc Makefile targets
-
-.ifdef DESTDIR
-snap_md: netbsd-gen
-
-netbsd-gen:
-	cd ${.CURDIR}/../sys/arch/arm32/conf && config GENERIC
-	cd ${.CURDIR}/../sys/arch/arm32/compile/GENERIC && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/arm32/compile/GENERIC/netbsd \
-	    ${DESTDIR}/snapshot/netbsd-gen
-
-.endif	# DESTDIR check
diff --git a/src/etc/etc.arm32/disktab b/src/etc/etc.arm32/disktab
deleted file mode 100644
index a49040b4..00000000
--- a/src/etc/etc.arm32/disktab
+++ /dev/null
@@ -1,86 +0,0 @@
-# $OpenBSD: disktab,v 1.3 2001/01/28 23:31:28 niklas Exp $
-# $NetBSD: disktab,v 1.2 1996/05/07 20:33:54 mark Exp $
-#
-# Disk geometry and partition layout tables. 
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-h]	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#	t[a-h]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
-
-# a == root
-# b == swap
-# c == whole disk
-# d == scratch
-# e == /var
-# f == scratch
-# h == /usr
-
-cfs420a|Conner Peripherals 420MB IDE:\
-	:dt=ESDI:ty=winchester:se#512:nt#16:ns#63:nc#826: \
-	:pa#20160:oa#416304:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#17136:ob#436464:tb=swap: \
-	:pc#832608:oc#0: \
-	:pd#416304:od#0:td=adfs:bd#512: \
-	:pe#379008:oe#453600:te=4.2BSD:be#4096:fe#512:
-
-disk4|Seagate ST3491A:\
-	:dt=ESDI:ty=winchester:se#512:nt#15:ns#62:nc#899: \
-	:pa#46500:oa#46500:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#46500:ob#93000:tb=swap:bb#4096:fb#512: \
-	:pc#836070:oc#0: \
-	:pd#46500:od#0:td=adfs:bd#512: \
-	:pe#46500:oe#139500:te=4.2BSD:be#512: \
-	:pf#650070:of#186000:tf=4.2BSD:bf#4096:ff#512:
-
-cfs425a|Conner Peripherals 425MB IDE:\
-	:dt=ESDI:ty=winchester:se#512:nt#16:ns#62:nc#839: \
-	:pa#49600:oa#49600:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#49600:ob#99200:tb=swap: \
-	:pc#832288:oc#0: \
-	:pd#49600:od#0:td=adfs:bd#512: \
-	:pe#49600:oe#148800:te=4.2BSD:be#4096:fe#512: \
-	:pf#633888:of#198400:tf=4.2BSD:bf#4096:ff#512:
-
-cfa850|Conner Peripherals 850MB IDE:\
-	:dt=ESDI:ty=winchester:\
-	:nc#1651:ns#63:nt#16:se#512:\
-	:pa#60480:oa#50400:ta=4.2BSD:\
-	:pb#129024:ob#110880:tb=swap:\
-	:pc#1664208:oc#0:\
-	:pd#50400:od#0:\
-	:pe#1424304:oe#239904:te=4.2BSD:
-
-floppy|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-	:pa#2880:oa#0:ba#4096:fa#512:\
-	:pb#2880:ob#0:\
-	:pc#2880:oc#0:
-
-LMR650E|pd650|PD650|650MB PD Cartridge:\
-	:dt=SCSI::ty=removable:se#512:nt#64:ns#32:nc#634: \
-	:pa#1298432:oa#0:ta=4.2BSD:ba#4096:fa#512:\
-	:pc#1298432:oc#0:
diff --git a/src/etc/etc.arm32/fbtab b/src/etc/etc.arm32/fbtab
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.arm32/sysctl.conf b/src/etc/etc.arm32/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.arm32/ttys b/src/etc/etc.arm32/ttys
deleted file mode 100644
index 4a72e274..00000000
--- a/src/etc/etc.arm32/ttys
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.4 1998/06/28 03:26:54 todd Exp $
-#
-# name	getty				type	status		comments
-#
-console	"/usr/libexec/getty RPC"	vt100	off secure
-ttyv0	"/usr/libexec/getty RPC"	vt100	on  secure
-ttyv1	"/usr/libexec/getty RPC"	vt100	on  secure
-ttyv2	"/usr/libexec/getty RPC"	vt100	on  secure
-ttyv3	"/usr/libexec/getty RPC"	vt100	on  secure
-ttyv4	"/usr/libexec/getty RPC"	vt100	on  secure
-ttyv5	"/usr/libexec/getty RPC"	vt100	on  secure
-ttyv6	"/usr/libexec/getty RPC"	vt100	off secure
-ttyv7	"/usr/libexec/getty RPC"	vt100	off secure
-ttyv8	"/usr/libexec/getty RPC"	vt100	off secure
-ttyv9	"/usr/libexec/getty RPC"	vt100	off secure
-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
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
deleted file mode 100644
index 16f71808..00000000
--- a/src/etc/etc.atari/MAKEDEV
+++ /dev/null
@@ -1,516 +0,0 @@
-#!/bin/sh -
-#
-#	$OpenBSD: MAKEDEV,v 1.22 2001/06/24 23:36:00 kjell Exp $
-#	$NetBSD: MAKEDEV,v 1.8 1996/03/27 14:27:53 leo Exp $
-#
-# Copyright (c) 1990 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	from:
-#	hp300/MAKEDEV (1/15/94), from:
-#	@(#)MAKEDEV	5.5 (Berkeley) 5/28/91
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices,
-#		Tries to make the ``standard'' number of each.
-#	fd	makes fd/* for the fdescfs.
-#	floppy	devices needed for install floppies
-#	std	standard devices
-#	local	configuration specific devices
-#
-# Tapes:
-#	st*	SCSI tapes
-#
-# Disks:
-#	fd*	Floppy disks (fdxa: 360Kb, fdxb: 720Kb, fdxc: 1.44Mb)
-#	sd*	SCSI disks, includes flopticals
-#	cd*	SCSI cdrom discs
-#	vnd*	"file" pseudo-disks
-#	ccd*	concatedated disk driver
-#
-# Console ports:
-#	ttye*	ite bitmapped consoles
-#
-# Pointing devices:
-#	mouse*	Atari mice
-#
-# Printer:
-#	lpt0	centronics printer
-#
-# Terminal ports:
-#	ser02	serial2 port (channel A on 8530)
-#	mdm02	modem2 port (channel B on 8530)
-#
-# Pseudo terminals:
-#	pty*	set of 16 master and slave pseudo terminals
-#
-# Special purpose devices:
-#	ch*	SCSI media changer
-#	grf*	Motherboard bitmapped video.
-#	kbd	Atari keyboard.
-#	view*	generic interface to graphic displays.
-#	aconf	autoconfig information (not yet)
-#	lkm	loadable kernel modules interface.
-#	bpf*	Berkeley Packet Filter
-#	tun*	network tunnel driver
-#	*random	random data source
-#	uk*	unknown SCSI
-#	ss*	SCSI scanners
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-umask 77
-for i
-do
-case $i in
-all)
-	sh MAKEDEV std fd st0 ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 grf0 grf1
-	sh MAKEDEV grf2 grf3 grf4 grf5 mouse0 mouse1
-	sh MAKEDEV kbd sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 vnd0 vnd1 vnd2
-	sh MAKEDEV vnd3 vnd4 view00 view01 view02 view03 view04 view05 pty0 
-	sh MAKEDEV vnd5 vnd6 cd0 fd0 fd1 fd2 fd3 ccd0 ccd1 ccd2 ccd3
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	sh MAKEDEV pf tun0 tun1 lkm ser02 mdm02 lpt0 random uk0 uk1 ss0 local
-	;;
-
-floppy)
-	sh MAKEDEV std st0 ttye0 ttye1 ttye2 grf0 grf1 grf2 kbd tun0 tun1
-	sh MAKEDEV sd0 sd1 sd2 sd3 sd4 sd5 sd6 cd0 fd0 fd1 rd0
-	;;
-
-std)
-	rm -f console drum kmem mem nvram reload null zero tty
-	rm -f klog stdin stdout stderr
-	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
-	mknod nvram		c 2 11	; chmod 640 nvram ; chown root.kmem nvram
-	mknod reload		c 2 20	; chmod 640 reload ; chown root.kmem reload
-	mknod zero		c 2 12	; chmod 666 zero
-	mknod null		c 2 2	; chmod 666 null
-	mknod tty		c 1 0	; chmod 666 tty
-	mknod klog		c 6 0	; chmod 600 klog
-	mknod stdin		c 18 0	; chmod 666 stdin
-	mknod stdout		c 18 1	; chmod 666 stdout
-	mknod stderr		c 18 2	; chmod 666 stderr
-	;;
-
-fd)
-	rm -f fd/*
-	mkdir fd > /dev/null 2>&1
-	(cd fd && i=0 && while [ $i -lt 64 ]; do
-		mknod $i c 18 $i
-		i=$(($i+1))
-		done)
-	chown -R root.wheel fd
-	chmod 555 fd
-	chmod 666 fd/*
-	;;
-
-ser02)
-	rm -f ser02
-	mknod ser02 c 7 0
-	chown uucp.dialer ser02
-	chmod 660 ser02
-	;;
-
-mdm02)
-	rm -f mdm02
-	mknod mdm02 c 7 16
-	chown uucp.dialer mdm02
-	chmod 660 mdm02
-	;;
-
-st*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	st*) name=st; blk=5; chr=10;;
-	esac
-	rm -f $name$unit n$name$unit e$name$unit en$name$unit \
-		r$name$unit nr$name$unit er$name$unit enr$name$unit 
-	case $unit in
-	0|1|2|3|4|5|6)
-		mknod ${name}${unit}	b $blk `expr $unit '*' 16 + 0`
-		mknod n${name}${unit}	b $blk `expr $unit '*' 16 + 1`
-		mknod e${name}${unit}	b $blk `expr $unit '*' 16 + 2`
-		mknod en${name}${unit}	b $blk `expr $unit '*' 16 + 3`
-		mknod r${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
-		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
-		mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-		chown root.operator ${name}${unit} n${name}${unit} \
-			e$name$unit en$name$unit \
-			r${name}${unit} nr${name}${unit} \
-			er${name}${unit} enr${name}${unit} 
-		chmod 660 ${name}${unit} n${name}${unit} \
-			e$name$unit en$name$unit \
-			r${name}${unit} nr${name}${unit} \
-			er${name}${unit} enr${name}${unit} 
-		;;
-	*)
-		echo bad unit for tape in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-ch*)
-	umask 2
-	name=ch; chr=33
-	rm -f $name$unit
-	mknod ${name}${unit}	c $chr $unit
-	chown root.operator ${name}${unit}
-	chmod 660 ${name}${unit}
-	umask 77
-	;;
-
-fd*)
-	umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'`
-	rm -f fd$unit? rfd$unit?
-	case $unit in
-	0|1|2|3)
-		mknod fd${unit}a b 2 `expr $unit '*' 16`
-		mknod fd${unit}b b 2 `expr $unit '*' 16 + 1`
-		mknod fd${unit}c b 2 `expr $unit '*' 16 + 2`
-		mknod rfd${unit}a c 16 `expr $unit '*' 16`
-		mknod rfd${unit}b c 16 `expr $unit '*' 16 + 1`
-		mknod rfd${unit}c c 16 `expr $unit '*' 16 + 2`
-		chown root.operator fd$unit? rfd$unit?
-		chmod 640 fd$unit? rfd$unit?
-		;;
-	*)
-		echo bad unit for floppy disk in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-rd0)	# Ramdisk, only useful for boot-floppy
-	umask 2; rm -f rd0
-	mknod rd0 b 1 0
-	umask 77
-	;;
-
-sd*|ccd*)
-	umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'`
-	case $i in
-	sd*) name=sd; blk=4; chr=8;;
-	ccd*) name=ccd; blk=13; chr=27;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	case $unit in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + 1`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-		;;
-	*)
-		echo bad unit for disk in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-vnd*)
-	umask 2 ; unit=`expr $i : 'vnd\(.*\)'`
-	for name in vnd svnd; do
-		blk=0; chr=17;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + $off + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + $off + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + $off + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + $off + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + $off + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + $off + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + $off + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + $off + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + $off + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + $off + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + $off + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + $off + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + $off + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + $off + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + $off + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + $off + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + $off + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + $off + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + $off + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + $off + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + $off + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + $off + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + $off + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + $off + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + $off + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + $off + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + $off + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + $off + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + $off + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + $off + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + $off + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + $off + 15`
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	done
-	umask 77
-	;;
-
-cd*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	cd*) name=cd; blk=6; chr=9;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	case $unit in
-	0|1|2|3|4|5|6)
-		mknod ${name}${unit}a   b $blk `expr $unit '*' 8 + 0`
-		mknod ${name}${unit}d   b $blk `expr $unit '*' 8 + 3`
-		mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
-		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-		;;
-	*)
-		echo bad unit for disk in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-ttye*)
-	unit=`expr $i : 'ttye\(.*\)'`
-	rm -f ttye${unit}
-	rm -f ite*
-	case $unit in
-	0|1|2|3|4|5|6|7|8|9)
-		mknod ttye${unit} c 12 ${unit}
-		;;
-	*)
-		echo bad unit for ttye in: $i
-		;;
-	esac
-	;;
-
-grf*)
-	unit=`expr $i : 'grf\(.*\)'`
-	rm -f grf${unit}
-	case $unit in
-	0|1|2|3|4|5|6|7|8|9)
-		mknod grf${unit} c 11 ${unit}; chmod 666 grf${unit}
-		;;
-	*)
-		echo bad unit for grf in: $i
-		;;
-	esac
-	;;
-
-mouse*)
-	unit=`expr $i : 'mouse\(.*\)'`
-	rm -f mouse${unit}
-	case $unit in
-	0|1)
-		mknod mouse${unit} c 15 ${unit}; chmod 666 mouse${unit}
-		if [ $unit = 0 ]
-		then 
-			rm -f mouse; ln -s mouse${unit} mouse
-		fi
-		;;
-	*)
-		echo bad unit for mouse in: $i
-		;;
-	esac
-	;;
-
-kbd)
-	rm -f kbd
-	mknod kbd c 14 0
-	;;
-
-
-view*)
-	unit=`expr $i : 'view\(.*\)'`
-	rm -f view${unit}
-	case $unit in
-	00|01|02|03|04|05|06|07|08|09)
-		mknod view${unit} c 13 ${unit}; chmod 666 view${unit}
-		;;
-	*)
-		echo bad unit for view in: $i
-		;;
-	esac
-	;;
-
-pty*)
-	class=`expr $i : 'pty\(.*\)'`
-	case $class in
-	0) offset=0 name=p;;
-	1) offset=16 name=q;;
-	2) offset=32 name=r;;
-	3) offset=48 name=s;;
-	4) offset=64 name=t;;
-	5) offset=80 name=u;;
-	6) offset=96 name=v;;
-	7) offset=112 name=w;;
-	8) offset=128 name=x;;
-	9) offset=144 name=y;;
-	10) offset=160 name=z;;
-	11) offset=176 name=P;;
-	12) offset=192 name=Q;;
-	13) offset=208 name=R;;
-	14) offset=224 name=S;;
-	15) offset=240 name=T;;
-	*) echo bad unit for pty in: $i;;
-	esac
-	case $class in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		umask 0
-		(i=0; while [ $i -lt 16 ]; do
-			eval `printf "rm -f tty%s%x; mknod tty%s%x c 4 %d; \
-			    rm -f pty%s%x; mknod pty%s%x c 5 %d" $name $i \
-			    $name $i $offset $name $i $name $i $offset`
-			offset=$(($offset+1))
-			i=$(($i+1))
-			done)
-		umask 77
-		;;
-	esac
-	;;
-
-lpt*)
-	unit=`expr $i : 'lpt\(.*\)'`
-	rm -f lpt$unit
-	mknod lpt$unit c 29 $unit
-	chown root.wheel lpt$unit
-	;;
-
-bpf*)
-	unit=`expr $i : 'bpf\(.*\)'`
-	rm -f bpf$unit
-	mknod bpf$unit c 19 $unit
-	chown root.wheel bpf$unit
-	;;
-
-pf)
-	rm -f pf
-	mknod pf c 73 0
-	chown root.wheel pf
-	chmod 600 pf
-	;;
-
-tun*)
-	unit=`expr $i : 'tun\(.*\)'`
-	rm -f tun$unit
-	mknod tun$unit c 28 $unit
-	chmod 600 tun$unit
-	chown root.wheel tun$unit
-	;;
-
-lkm)
-        rm -f lkm
-        mknod lkm c 20 0
-        chown root.kmem lkm
-        chmod 640 lkm
-        ;;
-
-random|srandom|urandom|prandom|arandom)
-	rm -f random urandom srandom prandom arandom
-	mknod  random c 30 0
-	mknod srandom c 30 1
-	mknod urandom c 30 2
-	mknod prandom c 30 3
-	mknod arandom c 30 4
-	chown root.wheel random srandom urandom prandom arandom
-	chmod 644 random srandom urandom prandom arandom
-	;;
-
-uk*)
-	unit=`expr $i : 'uk\(.*\)'`
-	rm -f uk$unit
-	mknod uk$unit c 31 $unit
-	chown root.operator uk$unit
-	chmod 640 uk$unit
-	;;
-
-ss*)
-	unit=`expr $i : 'ss\(.*\)'`
-	rm -f ss$unit
-	mknod ss$unit c 32 $unit
-	chown root.operator ss$unit
-	chmod 440 ss$unit
-#	backwards compatibility with older PINTs
-	rm -f scan$unit
-	ln -s ss$unit scan$unit
-	;;
-
-local)
-	umask 0
-	test -s MAKEDEV.local && sh MAKEDEV.local
-	umask 77
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
diff --git a/src/etc/etc.atari/Makefile.inc b/src/etc/etc.atari/Makefile.inc
deleted file mode 100644
index 92819d4d..00000000
--- a/src/etc/etc.atari/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1997/09/21 11:50:21 deraadt Exp $
-#	etc.atari/Makefile.inc -- atari-specific etc Makefile targets
-
-.ifdef DESTDIR
-snap_md: netbsd-generic netbsd-ataritt
-	cp ${.CURDIR}/../sys/arch/atari/compile/GENERIC/netbsd.gz \
-	    ${DESTDIR}/snapshot/netbsd-generic.gz
-	cp ${.CURDIR}/../sys/arch/atari/compile/ATARITT/netbsd.gz \
-	    ${DESTDIR}/snapshot/netbsd-ataritt.gz
-netbsd-generic:
-	cd ${.CURDIR}/../sys/arch/atari/conf && config.new GENERIC
-	cd ${.CURDIR}/../sys/arch/atari/compile/GENERIC && \
-	    make clean && make depend && make && gzip -9 netbsd
-
-netbsd-ataritt:
-	cd ${.CURDIR}/../sys/arch/atari/conf && config.new ATARITT
-	cd ${.CURDIR}/../sys/arch/atari/compile/ATARITT && \
-	    make clean && make depend && make && gzip -9 netbsd
-.endif	# DESTDIR check
diff --git a/src/etc/etc.atari/disktab b/src/etc/etc.atari/disktab
deleted file mode 100644
index 5a5bada0..00000000
--- a/src/etc/etc.atari/disktab
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-#	$OpenBSD: disktab,v 1.4 2001/01/28 23:31:28 niklas Exp $
-#	$NetBSD: disktab,v 1.1.1.1.6.1 1996/05/30 13:51:13 leo Exp $
-#
-# Disk geometry and partition layout tables. 
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-h]	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#	t[a-h]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
-floppy|floppy3|3in|Atari 3.5in Double Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#9:nc#80:\
-	:ts#3500:\
-	:ta=4.2BSD:pa#1440:oa#0:ba#4096:fa#512:\
-	:pb#0:ob#0:\
-	:pc#1440:oc#0:
-
-floppyhd|floppy3hd|3inhd|Atari 3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-	:ts=3500:\
-	:pa#2880:oa#0:ba#4096:fa#512:\
-	:pb#0:ob#0:\
-	:pc#2880:oc#0:
-floppybt|miniroot|Atari 3.5in Boot Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#60:\
-	:ts=3500:\
-	:ta=4.2BSD:pa#2160:oa#0:ba#4096:fa#512:\
-	:pb#0:ob#0:\
-	:pc#2160:oc#0:
diff --git a/src/etc/etc.atari/fbtab b/src/etc/etc.atari/fbtab
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.atari/sysctl.conf b/src/etc/etc.atari/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.atari/ttys b/src/etc/etc.atari/ttys
deleted file mode 100644
index 7c322ea5..00000000
--- a/src/etc/etc.atari/ttys
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.6 1998/06/28 03:26:56 todd Exp $
-#
-# name	getty				type	status		comments
-#
-# If the console is marked insecure, single-user requires
-# the root password.
-console	"/usr/libexec/getty Pc"		vt220	off secure 
-ttye0	"/usr/libexec/getty Pc"		vt220	on  secure 	# ite0 console
-ttye1	"/usr/libexec/getty Pc"		vt220	on  secure 	# ite1
diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV
deleted file mode 100644
index f738a559..00000000
--- a/src/etc/etc.pc532/MAKEDEV
+++ /dev/null
@@ -1,343 +0,0 @@
-#!/bin/sh -
-#
-#	$OpenBSD: MAKEDEV,v 1.21 2001/06/24 23:36:07 kjell Exp $
-#
-# Copyright (c) 1990 The Regents of the University of California.
-# All rights reserved.
-#
-# Written and contributed by W. Jolitz 12/90
-#
-# Redistribution and use in source and binary forms are permitted provided
-# that: (1) source distributions retain this entire copyright notice and
-# comment, and (2) distributions including binaries display the following
-# acknowledgement:  ``This product includes software developed by the
-# University of California, Berkeley and its contributors'' in the
-# documentation or other materials provided with the distribution and in
-# all advertising materials mentioning features or use of this software.
-# Neither the name of the University nor the names of its contributors may
-# be used to endorse or promote products derived from this software without
-# specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-#	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the 'standard' number of each type.
-#	floppy	devices to be put on install floppies
-#	std	standard devices
-#	local	configuration specific devices
-#
-# Tapes:
-#	st*	SCSI tapes
-#
-# Disks:
-#	sd*	SCSI disks
-#	cd*	SCSI CD-ROM
-#	vnd*	"file" pseudo-disks
-#	ccd*	concatenated disk driver
-#
-# Terminal ports:
-#	tty*	rs232 devices
-#
-# Pseudo terminals:
-#	pty*	set of 16 master and slave pseudo terminals
-#
-# Printers:
-#	lpt*	Matthias's lp interface
-#
-# Special purpose devices:
-#	ch*	SCSI media changer
-#	fd	file descriptors
-#	bpf*	packet filter
-#	lkm	loadable kernel modules interface
-#	tun*	network tunnel driver
-#	*random	random data source
-#	uk*	unknown SCSI
-#	ss*	SCSI scanners
-#
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-umask 77
-for i
-do
-case $i in
-
-all)
-	sh MAKEDEV std fd sd0 sd1 sd2 st0 st1 cd0 cd1
-	sh MAKEDEV tty0 tty1 tty2 tty3 tty4 tty5 tty6 tty7
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	sh MAKEDEV pf tun0 tun1 tun2 lkm random
-	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
-	sh MAKEDEV uk0 uk1
-	sh MAKEDEV ss0
-	;;
-
-floppy)
-	sh MAKEDEV std sd0 sd1 sd2 tty0 tty1 tty2 tty3
-	sh MAKEDEV st0 st1 cd0 cd1 rd0
-	;;
-
-std)
-	rm -f console drum mem kmem null zero io tty klog stdin stdout stderr
-	mknod console		c 0 0
-	mknod drum		c 4 0	; chmod 640 drum ; chown root.kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem	; chown root.kmem mem
-	mknod null		c 2 2	; chmod 666 null
-	mknod zero		c 2 12	; chmod 666 zero
-	mknod tty		c 1 0	; chmod 666 tty
-	mknod klog		c 7 0	; chmod 600 klog
-	mknod stdin		c 11 0	; chmod 666 stdin
-	mknod stdout		c 11 1	; chmod 666 stdout
-	mknod stderr		c 11 2	; chmod 666 stderr
-	;;
-
-fd)
-	rm -f fd/*
-	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-	 		printf("mknod %d c 11 %d;", i, i)}'`)
-	chown -R root.wheel fd
-	chmod 555 fd
-	chmod 666 fd/*
-	;;
-
-rd*)
-	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
-	mknod rd${unit} b 3 $unit
-	mknod rrd${unit} c 9 $unit
-	chown root.operator rd${unit} rrd${unit}
-	chmod 640 rd${unit} rrd${unit}
-	umask 77
-	;;
-	
-sd*|ccd*)
-	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
-	case $i in
-	sd*) name=sd; blk=0; chr=3;;
-	ccd*) name=ccd; blk=6; chr=18;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + 1`
-	mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + 2`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + 4`
-	mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + 5`
-	mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + 6`
-	mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + 7`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + 1`
-	mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + 4`
-	mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
-	mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
-	mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	umask 77
-	;;
-
-vnd*)
-	umask 2 ; unit=`expr $i : 'vnd\(.*\)'`
-	for name in vnd svnd; do
-		blk=5; chr=13;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + $off + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 8 + $off + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 8 + $off + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + $off + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 8 + $off + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 8 + $off + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 8 + $off + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 8 + $off + 7`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + $off + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 8 + $off + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + $off + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + $off + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 8 + $off + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + $off + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + $off + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + $off + 7`
-		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	done
-	umask 77
-	;;
-
-tty*)
-	unit=`expr $i : '...\(.*\)'`
-	mknod tty0$unit c 8 $unit
-	chown uucp.dialer tty0$unit
-	chmod 660 tty0$unit
-	;;
-
-pty*)
-	class=`expr $i : 'pty\(.*\)'`
-	case $class in
-	0) offset=0 name=p;;
-	1) offset=16 name=q;;
-	2) offset=32 name=r;;
-	3) offset=48 name=s;;
-	4) offset=64 name=t;;
-	5) offset=80 name=u;;
-	6) offset=96 name=v;;
-	7) offset=112 name=w;;
-	8) offset=128 name=x;;
-	9) offset=144 name=y;;
-	10) offset=160 name=z;;
-	11) offset=176 name=P;;
-	12) offset=192 name=Q;;
-	13) offset=208 name=R;;
-	14) offset=224 name=S;;
-	15) offset=240 name=T;;
-	*) echo bad unit for pty in: $i;;
-	esac
-	case $class in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		umask 0
-		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
-			for (i = 0; i < 16; i++)
-				printf("rm -f tty%s%x; mknod tty%s%x c 5 %d;" \
-				    "rm -f pty%s%x; mknod pty%s%x c 6 %d; ", \
-				    n, i, n, i, b+i, n, i, n, i, b+i); }'`
-		umask 77
-		;;
-	esac
-	;;
-
-st*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	st*) name=st;  chr=10; blk=2;;
-	esac
-	rm -f $name$unit n$name$unit e$name$unit en$name$unit \
-		r$name$unit nr$name$unit er$name$unit enr$name$unit 
-	mknod ${name}${unit}	b $blk `expr $unit '*' 16 + 0`
-	mknod n${name}${unit}	b $blk `expr $unit '*' 16 + 1`
-	mknod e${name}${unit}	b $blk `expr $unit '*' 16 + 2`
-	mknod en${name}${unit}	b $blk `expr $unit '*' 16 + 3`
-	mknod r${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
-	mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
-	mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-	chown root.operator ${name}${unit} n${name}${unit} \
-		e$name$unit en$name$unit \
-		r${name}${unit} nr${name}${unit} \
-		er${name}${unit} enr${name}${unit} 
-	chmod 660 ${name}${unit} n${name}${unit} \
-		e$name$unit en$name$unit \
-		r${name}${unit} nr${name}${unit} \
-		er${name}${unit} enr${name}${unit} 
-	umask 77
-	;;
-
-ch*)
-	umask 2
-	name=ch; chr=16
-	rm -f $name$unit
-	mknod ${name}${unit}	c $chr $unit
-	chown root.operator ${name}${unit}
-	chmod 660 ${name}${unit}
-	umask 77
-	;;
-
-cd*)
-	umask 2 ; unit=`expr $i : '.*cd\(.*\)'`
-	case $i in
-        cd*) name=cd; blk=4; chr=12;;
-	esac
-	rm -f $name$unit? r$name$unit?
-	mknod ${name}${unit}a	b $blk `expr $unit '*' 8 + 0`
-	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
-	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
-	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
-	umask 77
-	;;
-
-lpt*)
-	unit=`expr $i : 'lpt\(.*\)'`
-	rm -f lpt${unit} lpt${unit}p
-	mknod lpt${unit}  c 17 `expr $unit + 64`
-	mknod lpt${unit}p c 17 $unit
-	chmod 0220 lpt${unit} lpt${unit}p
-	chown root.wheel lpt$unit
-	;;
-
-bpf*)
-	unit=`expr $i : 'bpf\(.*\)'`
-	rm -f bpf$unit
-	mknod bpf$unit c 14 $unit
-	chown root.wheel bpf$unit
-	;;
-
-pf)
-	rm -f pf
-	mknod pf c 73 0
-	chown root.wheel pf
-	chmod 600 pf
-	;;
-
-tun*)
-	unit=`expr $i : 'tun\(.*\)'`
-	rm -f tun$unit
-	mknod tun$unit c 15 $unit
-	chmod 600 tun$unit
-	chown root.wheel tun$unit
-	;;
-
-lkm)
-	rm -f lkm
-	mknod lkm c 18 0
-	chown root.kmem lkm
-	chmod 640 lkm
-	;;
-
-random|srandom|urandom|prandom|arandom)
-	rm -f random urandom srandom prandom arandom
-	mknod  random c 20 0
-	mknod srandom c 20 1
-	mknod urandom c 20 2
-	mknod prandom c 20 3
-	mknod arandom c 20 4
-	chown root.wheel random srandom urandom prandom arandom
-	chmod 644 random srandom urandom prandom arandom
-	;;
-
-uk*)
-	unit=`expr $i : 'uk\(.*\)'`
-	rm -f uk$unit
-	mknod uk$unit c 21 $unit
-	chown root.operator uk$unit
-	chmod 640 uk$unit
-	;;
-
-ss*)
-	unit=`expr $i : 'ss\(.*\)'`
-	rm -f ss$unit
-	mknod ss$unit c 22 $unit
-	chown root.operator ss$unit
-	chmod 440 ss$unit
-#	backwards compatibility with older PINTs
-	rm -f scan$unit
-	ln -s ss$unit scan$unit
-	;;
-
-local)
-	umask 0
-	test -s MAKEDEV.local && sh MAKEDEV.local
-	;;
-
-esac
-done
diff --git a/src/etc/etc.pc532/disktab b/src/etc/etc.pc532/disktab
deleted file mode 100644
index 5281cf9a..00000000
--- a/src/etc/etc.pc532/disktab
+++ /dev/null
@@ -1,70 +0,0 @@
-# $OpenBSD: disktab,v 1.4 1998/09/23 07:30:57 todd Exp $
-#
-# PC532 version.
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-h]	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#	t[a-h]	partition types (filesystem, swap, etc)
-
-#
-# Floppy and boot disk support
-#
-
-floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-	:pa#2880:oa#0:ba#4096:fa#512:\
-	:pc#2880:oc#0:
-
-floppy5|5in|5.25in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#15:nc#80:\
-	:pa#2400:oa#0:ba#4096:fa#512:\
-	:pc#2400:oc#0:
-
-boot3|3.5in High Density Boot Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-	:ta=4.2BSD:pa#2820:oa#0:ba#4096:fa#512:\
-	:tc=unused:pc#2880:oc#0:\
-	:th=boot:ph#60:oh#2820:
-
-rd|2mb ramdisk:\
-	:ty=floppy:se#512:nt#1:rm#8000:ns#256:nc#16:\
-	:ta=4.2BSD:pa#4096:oa#0:ba#4096:fa#512:\
-	:tc=unused:pc#4096:oc#0:
-
-#
-# Others
-#
-
-m2614esa|Fujitsu M2614 ESA 180Mb:\
-	:ty=winchester:dt=SCSI:\
-	:ns#34:nt#8:nc#1336:\
-	:sc#267:su#356178::se#512:\
-	:rm#3490:sk#12:cs#16:hs#5000:ts#8000:il#1:\
-	:ta=4.2BSD:oa#267:pa#16554:ba#8192:fa#1024:\
-	:tb=swap:ob#16821:pb#32841:\
-	:tc=unused:oc#0:pc#356178:\
-	:td=4.2BSD:od#49662:pd#16554:bd#8192:fd#1024:\
-	:te=4.2BSD:oe#66216:pe#289962:be#8192:fe#1024:\
-	:tg=boot:og#2:pg#265:
diff --git a/src/etc/etc.pc532/fbtab b/src/etc/etc.pc532/fbtab
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.pc532/sysctl.conf b/src/etc/etc.pc532/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.pc532/ttys b/src/etc/etc.pc532/ttys
deleted file mode 100644
index ee686412..00000000
--- a/src/etc/etc.pc532/ttys
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.4 1998/06/28 03:27:05 todd Exp $
-#
-# name	getty				type	status		comments
-#
-console	"/usr/libexec/getty std.9600"	unknown	on  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
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
deleted file mode 100644
index 18bc1fbb..00000000
--- a/src/etc/etc.pmax/MAKEDEV
+++ /dev/null
@@ -1,430 +0,0 @@
-#!/bin/sh -
-#
-#	$OpenBSD: MAKEDEV,v 1.37 2001/06/24 23:36:07 kjell Exp $
-#	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
-#
-
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	std	standard devices
-#	local	configuration specific devices
-#
-# Tapes:
-#	tz*	SCSI tapes, DEC TK50 cartridge tape
-#
-# Disks:
-#	rz*	SCSI disks
-#	vnd*	"file" pseudo-disks
-#	ccd*	concatenated disk devices
-#
-# Terminal ports:
-#	dc*	4 channel serial interface (keyboard, mouse,modem, printer)
-#	scc*	82530 serial interface
-#
-# Pseudo terminals:
-#	pty*	set of 16 master and slave pseudo terminals
-#
-# Printers:
-#
-# Call units:
-#
-# Special purpose devices:
-#	bpf*	Berkeley Packet Filter
-#	lkm	loadable kernel modules interface
-#	tun*	network tunnel driver
-#	uk*	SCSI Unknown device
-#	ss*	SCSI scanners
-#
-# Platform-specific devices:
-#	NOTE: /dev/mouse should be a link to one of the fb*'s.
-#	fb*	framebuffer device
-#	*random	inkernal random data source
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
-this=$0
-umask 77
-
-# default shell support functions
-add ()
-{
-	tmp=0
-	while [ "$1" ]
-	do
-		tmp=$(( $1 + $tmp ))
-		shift
-	done
-	echo $tmp
-}
-mult ()
-{
-	echo "$(( $1 * $2 ))"
-}
-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
-}
-trunc ()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg1="$1"
-	arg2="$2"
-	echo ${arg1#$arg2}
-}
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg1="$1"
-	tmp="${arg1#[a-z]*}"
-	while [ "$tmp" != "$arg1" ]
-	do
-		arg1=$tmp
-		tmp="${arg1#[a-z]*}"
-	done
-	tmp="${arg1%*[a-z]}"
-	while [ "$tmp" != "$arg1" ]
-	do
-		arg1=$tmp
-		tmp="${arg1%*[a-z]}"
-	done
-	echo $arg1
-}
-
-for i
-do
-
-unit=`unt $1`
-[ "$unit" ] || unit=0
-
-case $i in
-
-all)
-	sh $this std rz0 rz1 rz2 rz3 rz4 rz5 rz6 tz0 tz1
-	sh $this rz8 rz9 rz10 rz11 rz12 rz13 rz14 tz2 tz3
-	sh $this pty0 vnd0 vnd1 vnd2 vnd3 ccd0 ccd1 ccd2 ccd3
-#	sh $this tun0 tun1 tun2 tun3
-	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pf
-#	sh $this lkm local
-	sh $this xfs0
-	sh $this fb0 fb1 fb2
-	sh $this random
-       ;;
-
-raminst)
-	sh $this std
-	sh $this rz0 rz1 rz2 rz3 rz4 tz0 tz1 rd0 pty0
-	sh $this fb0 fb1 fb2
-	sh $this random
-	;;
-
-std)
-	mknod console		c 0 0
-	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
-	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
-	mknod null		c 3 2	; chmod 666 null
-	mknod zero              c 3 12  ; chmod 666 zero
-	mknod tty		c 2 0	; chmod 666 tty
-	mknod klog		c 6 0	; chmod 600 klog
-	mknod stdin		c 7 0	; chmod 666 stdin
-	mknod stdout		c 7 1	; chmod 666 stdout
-	mknod stderr		c 7 2	; chmod 666 stderr
-	mkdir fd > /dev/null 2>&1
-	n=0
-	(cd fd && while [ $n -lt 64 ]; do mknod $n c 7 $n; n="$(( $n + 1 ))"; done)
-	chown -R root.wheel fd
-	chmod 555 fd
-	chmod 666 fd/*
-	;;
-
-tz*)
-	umask 0 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	tz*) chr=10;;
-	esac
-	case $unit in
-	0|1|2|3|4|5|6)
-		unit0=`expr $unit \* 16`
-		unit1=`expr $unit \* 16 + 1`
-		unit2=`expr $unit \* 16 + 2`
-		unit3=`expr $unit \* 16 + 3`
-		mknod rmt$unit c $chr $unit0
-		mknod nrmt$unit c $chr $unit1
-		mknod rmth$unit c $chr $unit2
-		mknod nrmth$unit c $chr $unit3
-		chown root.operator rmt$unit nrmt$unit rmth$unit nrmth$unit
-		chmod 660 rmt$unit nrmt$unit rmth$unit nrmth$unit
-		;;
-	*)
-		echo bad unit for tape in: $1
-		;;
-	esac
-	umask 77
-	;;
-
-pf)
-	rm -f pf
-	mknod pf c 73 0
-	chown root.wheel pf
-	chmod 600 pf
-	;;
-
-bpf*)
-	unit=`expr $i : 'bpf\(.*\)'`
-	rm -f bpf$unit
-	mknod bpf$unit c 12 $unit
-	chmod 600 bpf$unit
-	chown root.wheel bpf$unit
-	;;
-
-#tun*)
-#	unit=`expr $i : 'tun\(.*\)'`
-#	rm -f tun$unit
-#	mknod tun$unit c 111 $unit
-#	chmod 600 tun$unit
-#	chown root.wheel tun$unit
-#	;;
-#lkm)
-#	rm -f lkm
-#	mknod lkm c 112 0
-#	chown root.kmem lkm
-#	chmod 640 lkm
-#	;;
-
-rz*|ccd*)
-	umask 2 ; unit=`expr $i : '.*[dz]\(.*\)'`
-	case $i in
-	rz*) name=rz; blk=21; chr=56;;
-	ccd*) name=ccd; blk=24; chr=87;;
-	esac
-	case $unit in
-	0|1|2|3|4|5|6|8|9|10|11|12|13|14)
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-		;;
-	*)
-		echo bad unit for disk in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-vnd*)
-	umask 2 ; unit=`expr $i : 'vnd\(.*\)'`
-	for name in vnd svnd; do
-		blk=2; chr=11;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + $off + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + $off + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + $off + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + $off + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + $off + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + $off + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + $off + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + $off + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + $off + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + $off + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + $off + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + $off + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + $off + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + $off + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + $off + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + $off + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + $off + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + $off + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + $off + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + $off + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + $off + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + $off + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + $off + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + $off + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + $off + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + $off + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + $off + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + $off + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + $off + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + $off + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + $off + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + $off + 15`
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	done
-	umask 77
-	;;
-
-rd*)
-	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
-	mknod rd${unit}a b 25 `expr $unit '*' 16 + 0`
-	mknod rd${unit}c b 25 `expr $unit '*' 16 + 2`
-	mknod rrd${unit}a c 92 `expr $unit '*' 16 + 0`
-	mknod rrd${unit}c c 92 `expr $unit '*' 16 + 2`
-	chown root.operator rd${unit}[ac] rrd${unit}[ac]
-	chmod 640 rd${unit}[ac] rrd${unit}[ac]
-	umask 77
-	;;
-
-dc*)
-	unit=`expr $i : 'dc\(.*\)'`
-	case $unit in
-	0)
-		mknod tty00 c 16 2
-		mknod tty01 c 16 3
-		chown uucp.dialer tty00 tty01
-		chmod 660 tty00 tty01
-		;;
-	*)
-		echo bad unit for dc in: $i
-		;;
-	esac
-	;;
-
-scc*)
-	unit=`expr $i : 'scc\(.*\)'`
-	case $unit in
-	0)
-		mknod tty00 c 17 0
-		mknod tty01 c 17 2
-		chown uucp.dialer tty00 tty01
-		chmod 660 tty00 tty01
-		;;
-	*)
-		echo bad unit for scc in: $i
-		;;
-	esac
-	;;
-
-fb*)
-	unit=`expr $i : 'fb\(.*\)'`
-	mknod fb$unit c 86 $unit ; chmod 666 fb$unit
-	;;
-
-pty*)
-	class=`expr $i : 'pty\(.*\)'`
-	case $class in
-	0) offset=0 name=p;;
-	1) offset=16 name=q;;
-	2) offset=32 name=r;;
-	3) offset=48 name=s;;
-	4) offset=64 name=t;;
-	5) offset=80 name=u;;
-	6) offset=96 name=v;;
-	7) offset=112 name=w;;
-	8) offset=128 name=x;;
-	9) offset=144 name=y;;
-	10) offset=160 name=z;;
-	11) offset=176 name=P;;
-	12) offset=192 name=Q;;
-	13) offset=208 name=R;;
-	14) offset=224 name=S;;
-	15) offset=240 name=T;;
-	*) echo bad unit for pty in: $i;;
-	esac
-	case $class in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		umask 0
-		n=0
-		while [ $n -lt 16 ]
-		do
-			nam=$name`hex $n`
-			rm -f {tty,pty}$nam
-			mknod tty$nam c 4 "$(( $offset + $n ))"
-			mknod pty$nam c 5 "$(( $offset + $n ))"
-			n="$(( $n + 1 ))"
-		done
-		umask 77
-		;;
-	esac
-	;;
-
-random|srandom|urandom|prandom|arandom)
-	rm -f random urandom srandom prandom arandom
-	mknod  random c 88 0
-	mknod srandom c 88 1
-	mknod urandom c 88 2
-	mknod prandom c 88 3
-	mknod arandom c 88 4
-	chown root.wheel random srandom urandom prandom arandom
-	chmod 644 random srandom urandom prandom arandom
-	;;
-
-uk*)
-	unit=`expr $i : 'uk\(.*\)'`
-	rm -f uk$unit
-	mknod uk$unit c 98 $unit
-	chown root.operator uk$unit
-	chmod 640 uk$unit
-	;;
-
-ss*)
-	unit=`expr $i : 'ss\(.*\)'`
-	rm -f ss$unit
-	mknod ss$unit c 99 $unit
-	chown root.operator ss$unit
-	chmod 440 ss$unit
-#	backwards compatibility with older PINTs
-	rm -f scan$unit
-	ln -s ss$unit scan$unit
-	;;
-xfs*)
-	rm -f xfs$unit
-	mknod xfs$unit c 51 $unit 
-	chmod 600 xfs$unit 
-	chown root.wheel xfs$unit
-	;;
-
-local)
-	umask 0
-	test -s MAKEDEV.local && sh $this.local
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
diff --git a/src/etc/etc.pmax/Makefile.inc b/src/etc/etc.pmax/Makefile.inc
deleted file mode 100644
index c88559f4..00000000
--- a/src/etc/etc.pmax/Makefile.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.16 1998/04/08 18:39:30 maja Exp $
-#	etc.pmax/Makefile.inc -- pmax-specific etc Makefile targets
-
-.ifdef DESTDIR
-
-snap_md: binutils bsd bsd.nfs bsd.rz0 distrib
-
-binutils:
-	cd ${DESTDIR} && tar cf - usr/*openbsd* \
-	    | ${GZIP} ${GZIPFLAGS} > snapshot/usr.binutils.tar${GZIPEXT}
-
-bsd:
-	cd ${.CURDIR}/../sys/arch/pmax/conf && config GENERIC
-	cd ${.CURDIR}/../sys/arch/pmax/compile/GENERIC && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/pmax/compile/GENERIC/bsd \
-	    ${DESTDIR}/snapshot/bsd
-	cp ${.CURDIR}/../sys/arch/pmax/compile/GENERIC/bsd \
-	    ${DESTDIR}/bsd
-
-bsd.nfs:
-	cd ${.CURDIR}/../sys/arch/pmax/conf && config GENERIC.NFS
-	cd ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.NFS && \
-	    make clean && make depend && make
-	elf2ecoff ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.NFS/bsd.elf \
-	    ${DESTDIR}/snapshot/bsd.nfs
-	elf2ecoff ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.NFS/bsd.elf \
-	    ${DESTDIR}/bsd.nfs
-
-bsd.rz0:
-	cd ${.CURDIR}/../sys/arch/pmax/conf && config GENERIC.rz0
-	cd ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.rz0 && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.rz0/bsd \
-	    ${DESTDIR}/snapshot/bsd.rz0
-	cp ${.CURDIR}/../sys/arch/pmax/compile/GENERIC.rz0/bsd \
-	    ${DESTDIR}/bsd.rz0
-
-distrib:
-	cd ${.CURDIR}/../distrib && make cleandir && \
-	    make && make install
-
-.endif	# DESTDIR check
diff --git a/src/etc/etc.pmax/disktab b/src/etc/etc.pmax/disktab
deleted file mode 100644
index c60c333e..00000000
--- a/src/etc/etc.pmax/disktab
+++ /dev/null
@@ -1,252 +0,0 @@
-#	$OpenBSD: disktab,v 1.7 2001/01/28 23:31:29 niklas Exp $
-
-#
-#	@(#)disktab	8.1 (Berkeley) 6/9/93
-#
-
-# Disk geometry and partition layout tables. 
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, nc*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-h]	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#	t[a-h]	partition types (filesystem, swap, etc)
-#	b[0-1]	primary and secondary bootstraps, optional
-#
-# All partition sizes contain space for bad sector tables unless
-# the device drivers fail to support this. Smaller disks may
-# not have all partitions and all disks have no defaults for
-# the `h' partition. The strategy here is that `a' always
-# has the same amount for all disks. The `b' partition is
-# four times `a' while `c' is always the entire disk. The
-# sum of `d', `e', and `f' is equal to `g' which is everything else.
-
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#24:nt#2:ns#128:\
-	:ta=4.2BSD:oa#0:pa#6144:fa#512:ba#4096\
-	:ob#0:pb#0:oc#0:pc#6144:
-
-simpleroot:\
-	:ty=winchester:\
-	:dt=SCSI:\
-	:ns#32:\
-	:nt#64:\
-	:nc#104:\
-	:pa#81920:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
-	:pb#131072:ob#81920:tb=swap:\
-	:pc#212992:oc#0:
-
-rz22|RZ22|DEC RZ22 Winchester:\
-	:dt=SCSI:ty=winchester:ns#33:nt#4:nc#776:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#69664:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#102432:oc#0:bc#8192:fc#1024:
-
-rz23|RZ23|DEC RZ23 Winchester:\
-	:dt=SCSI:ty=winchester:ns#33:nt#8:nc#776:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#204864:oc#0:bc#8192:fc#1024:\
-	:pd#13674:od#163840:bd#8192:fd#1024:\
-	:pe#13674:oe#177514:be#8192:fe#1024:\
-	:pf#13676:of#191188:bf#8192:ff#1024:\
-	:pg#41024:og#163840:bg#8192:fg#1024:
-
-rz23l|RZ23L|DEC RZ23L Winchester:\
-	:dt=SCSI:ty=winchester:ns#39:nt#4:nc#1524:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#66690:ob#32768:bb#4096:fb#1024:tb=swap\
-	:pc#237588:oc#0:bc#8192:fc#1024:\
-	:pd#35135:od#99458:bd#8192:fd#1024:\
-	:pe#35135:oe#134593:be#8192:fe#1024:\
-	:pf#67860:of#169728:bf#8192:ff#1024:\
-	:pg#138130:og#99458:bg#8192:fg#1024:
-
-rz24|RZ24|DEC RZ24 Winchester:\
-	:dt=SCSI:ty=winchester:ns#38:nt#8:nc#1348:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#4096:fb#1024:tb=swap:\
-	:pc#409792:oc#0:bc#8192:fc#1024:\
-	:pd#81984:od#163840:bd#8192:fd#1024:\
-	:pe#81984:oe#245824:be#8192:fe#1024:\
-	:pf#81984:of#327808:bf#8192:ff#1024:\
-	:pg#245952:og#163840:bg#8192:fg#1024:
-
-#
-# The RZ24L uses ZBR, so (pc = #_logical_blocks) > ns * nt * nc.
-# #_logical_blocks was obtained from the 'scu' "show pages" command.
-#
-rz24l|RZ24L|DEC RZ24L Winchester:\
-	:dt=SCSI:ty=winchester:ns#65:nt#4:nc#1818:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#4096:fb#1024:tb=swap:\
-	:pc#479350:oc#0:bc#8192:fc#1024:\
-	:pd#105170:od#163840:bd#8192:fd#1024:\
-	:pe#105170:oe#269010:be#8192:fe#1024:\
-	:pf#105170:of#374180:bf#8192:ff#1024:\
-	:pg#315510:og#163840:bg#8192:fg#1024:
-
-# A DEC RZ25, configured so that all of the free partition IDs are at
-# the end, etc.  A good setup to make a disk image from...
-rz25|RZ25|DEC RZ25 SCSI:\
-	:dt=SCSI::ty=winchester:ns#62:nt#9:nc#1476:\
-	:pa#32768:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#823608:oc#0:\
-	:pd#600408:od#223200:bd#8192:fd#1024:td=4.2BSD:
-
-# a DEC RZ25, as configured for 4.4BSD/pmax.
-# larger than at least some real RZ25s, may be an RZ25l.
-rz25x|RZ25x|4.4BSD DEC RZ25 Winchester:\
-	:dt=SCSI:ty=winchester:ns#62:nt#9:nc#1476:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#832527:oc#0:bc#8192:fc#1024:\
-	:pd#222896:od#163840:bd#8192:fd#1024:\
-	:pe#222896:oe#386736:be#8192:fe#1024:\
-	:pf#222895:of#609632:bf#8192:ff#1024:\
-	:pg#668687:og#163840:bg#8192:fg#1024:
-
-# a DEC RZ26,as configured for 4.4BSD/pmax.
-# may be larger than your RZ26; add :su#: as appropriate.
-rz26|RZ26|DEC RZ26 Winchester:\
-	:dt=SCSI:ty=winchester:ns#57:nt#14:nc#2570:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#2050860:oc#0:bc#8192:fc#1024:\
-	:pd#629006:od#163840:bd#8192:fd#1024:\
-	:pe#629006:oe#792846:be#8192:fe#1024:\
-	:pf#629008:of#1421852:bf#8192:ff#1024:\
-	:pg#819200:og#163840:bg#8192:fg#1024:\
-	:ph#1067820:oh#983040:bh#8192:fh#1024:
-
-rz55|RZ55|DEC RZ55 Winchester:\
-	:dt=SCSI:ty=winchester:ns#36:nt#15:nc#1224:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#649040:oc#0:bc#8192:fc#1024:\
-	:pd#152446:od#163840:bd#8192:fd#1024:\
-	:pe#152446:oe#316286:be#8192:fe#1024:\
-	:pf#180308:of#468732:bf#8192:ff#1024:\
-	:pg#485200:og#163840:bg#8192:fg#1024:
-
-rz56|RZ56|DEC RZ56 Winchester:\
-	:dt=SCSI:ty=winchester:ns#54:nt#15:nc#1632:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#4096:fb#1024:tb=swap:\
-	:pc#1299174:oc#0:bc#8192:fc#1024:\
-	:pd#292530:od#163840:bd#8192:fd#1024:\
-	:pe#292530:oe#456370:be#8192:fe#1024:\
-	:pf#550274:of#748900:bf#8192:ff#1024:\
-	:pg#567666:og#163840:bg#8192:fg#1024:\
-	:ph#567668:oh#731506:bh#8192:fh#1024:
-
-#rz57|RZ57|DEC RZ57 Winchester:\
-#	:dt=SCSI:ty=winchester:ns#71:nt#15:nc#1854:\
-#	:pa#32768:ba#8192:fa#1024:\
-#	:pb#184320:bb#4096:fb#1024:tb=swap:\
-#	:pc#1954050:bc#8192:fc#1024:\
-#	:pd#299008:bd#8192:fd#1024:\
-#	:pe#299008:be#8192:fe#1024:\
-#	:pf#524546:bf#8192:ff#1024:\
-#	:pg#614400:bg#8192:fg#1024:\
-#	:ph#1122562:bh#8192:fh#1024:
-
-rz57|RZ57|DEC RZ57 Winchester:\
-	:dt=SCSI:ty=winchester:ns#70:nt#15:nc#1861:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#184320:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#1954050:oc#0:bc#8192:fc#1024:\
-	:pd#299008:od#831488:bd#8192:fd#1024:\
-	:pe#299008:oe#1130496:be#8192:fe#1024:\
-	:pf#524546:of#1429504:bf#8192:ff#1024:\
-	:pg#614400:og#217088:bg#8192:fg#1024:\
-	:ph#1122562:oh#831488:bh#8192:fh#1024:
-
-# NOTE: The RZ58 uses a recording technique called zoned recording.
-#   Using this technique, the number of sectors per track will vary
-#   depending on what zone of the disk is in use (simply multiplying 
-#   ns*nt*nc does not give true capacity of the drive).  The ns (number
-#   of sectors per track) is calculated by "ns = total sectors/(nt*nc)"
-#   and is a rounded value.  Therefore, the value "ns" is an approximation,
-#   not a true representation, of what is stored on disk. 
-#
-#   The 'c' partition listed below gives the true size of the RZ58
-#   (this information can be obtained by use of the DEVGETGEOM ioctl). 
-#
-#   The NetBSD :su#: entry is derived from the 'c' partition size.
-#    
-
-rz58|RZ58|DEC RZ58 Winchester:\
-	:ty=winchester:ns#85:nt#15:nc#2112:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:su#2698061:\
-	:pb#131072:ob#32768:bb#4096:fb#1024:tb=swap:\
-	:pc#2698061:oc#0:bc#8192:fc#1024:\
-	:pd#844800:od#163840:bd#8192:fd#1024:\
-	:pe#844800:oe#1008640:be#8192:fe#1024:\
-	:pf#844620:of#1853440:bf#8192:ff#1024:\
-	:pg#819200:og#163840:bg#8192:fg#1024:\
-	:ph#1715019:oh#983040:bh#8192:fh#1024:
-
-xt8760|XT8760|Maxtor XT8760 Winchester:\
-	:dt=SCSI:ty=winchester:ns#54:nt#15:nc#1616:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#1308930:oc#0:bc#8192:fc#1024:\
-	:pd#152446:od#163840:bd#8192:fd#1024:\
-	:pe#152446:oe#316286:be#8192:fe#1024:\
-	:pf#840198:of#468732:bf#8192:ff#1024:\
-	:pg#1145090:og#163840:bg#8192:fg#1024:
-
-ep976|EP976|EPSON HMD-976 Winchester:\
-	:dt=SCSI:ty=winchester:ns#34:nt#6:nc#670:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#69664:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#136680:oc#0:bc#8192:fc#1024:\
-	:pg#34248:og#102432:bg#8192:fg#1024:
-
-# entry for a Fujitsu fu2263sa half-height drive using ZBR. (UNTESTED)
-#
-# Note again (ns * nt * nc) > (actual drive size), so we need
-# an "su#" entry with the actual size.
-#
-#
-fu2263sa|FU2263SA|Fujitsu 2263SA:\
-	:dt=SCSI:ty=winchester:ns#53:nt#15:nc#1648:\
-	:su#1312344:\
-	:pa#32768:oa#0:ba#8192:fa#1024:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#1312344:oc#0:bc#8192:fc#1024:\
-	:pd#1148504:od#163840:bb#8192:fb#1024:ta=4.2bsd:\
-
-# A Fujitsu fu2524fa full-height drive using ZBR.
-fu2624fa|FU2624FA|Fujitsu 2624FA:\
-        :dt=SCSI:ty=winchester:ns#63:nt#11:nc#1429:\
-        :su#1015812:\
-        :pa#32768:oa#0:ba#4096:fa#512:ta=4.2bsd:\
-        :pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-        :pc#1015812:oc#0::bc#8192:fc#1024:\
-        :pd#10240:od#163840:bd#4096:fd#512:\
-        :pe#409600:oe#174080:be#8192:fe#1024:\
-        :pf#432132:of#583680:bf#8192:ff#1024:\
-        :pg#851972:og#163840:bg#8192:fg#1024:\
-        :ph#0:oh#0:bh#8192:fh#1024:
diff --git a/src/etc/etc.pmax/fbtab b/src/etc/etc.pmax/fbtab
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.pmax/ld.so.conf b/src/etc/etc.pmax/ld.so.conf
deleted file mode 100644
index e8e4bdcd..00000000
--- a/src/etc/etc.pmax/ld.so.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib
diff --git a/src/etc/etc.pmax/sysctl.conf b/src/etc/etc.pmax/sysctl.conf
deleted file mode 100644
index 9307aa7d..00000000
--- a/src/etc/etc.pmax/sysctl.conf
+++ /dev/null
@@ -1 +0,0 @@
-#machdep.led_blink=1		# 1=On pmax ([23]100), make led(s) blink
diff --git a/src/etc/etc.pmax/ttys b/src/etc/etc.pmax/ttys
deleted file mode 100644
index 83dd4216..00000000
--- a/src/etc/etc.pmax/ttys
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.5 1998/06/28 03:27:06 todd Exp $
-#
-# name	getty				type	status		comments
-#
-console	"/usr/libexec/getty std.9600"	unknown	on  secure
-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
diff --git a/src/etc/etc.wgrisc/MAKEDEV b/src/etc/etc.wgrisc/MAKEDEV
deleted file mode 100644
index ce607467..00000000
--- a/src/etc/etc.wgrisc/MAKEDEV
+++ /dev/null
@@ -1,284 +0,0 @@
-#!/bin/sh -
-#
-#	$OpenBSD: MAKEDEV,v 1.11 2001/06/24 23:36:12 kjell Exp $
-#	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
-#
-
-# Device "make" file.  Valid arguments:
-#	std	standard devices
-#	local	configuration specific devices
-#
-# Tapes:
-#	st*	SCSI tapes
-#
-# Disks:
-#	fd*	floppy disk drives
-#	sd*	SCSI disks
-#	cd*	SCSI CD rom
-#	vnd*	"file" pseudo-disks
-#	rd*	"ramdisk" pseudo-disks
-#	ccd*	contatenated disk devices
-#
-# Terminal multiplexors:
-#	tty*	tty ports
-#
-# Pseudo terminals:
-#	pty*	set of 16 master and slave pseudo terminals
-#
-# Call units:
-#
-# Special purpose devices:
-#	bpf*	packet filter
-#	lkm	loadable kernel modules interface
-#	tun*	network tunnel driver
-#	*random	random data source
-#
-# Platform-specific devices:
-#
-
-PATH=/sbin:/bin/:/usr/bin:/usr/sbin
-umask 77
-for i
-do
-case $i in
-
-all)        
-	sh MAKEDEV std fd sd0 sd1 sd2 st0 cd0 tty00 tty01 pty0 pty1
-	sh MAKEEDV pf bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	sh MAKEDEV pms0 random local
-	;;
-
-std)
-	mknod console		c 0 0
-	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
-	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
-	mknod null		c 3 2	; chmod 666 null
-	mknod zero              c 3 12  ; chmod 666 zero
-	mknod tty		c 2 0	; chmod 666 tty
-	mknod klog		c 6 0	; chmod 600 klog
-	mknod stdin		c 7 0	; chmod 666 stdin
-	mknod stdout		c 7 1	; chmod 666 stdout
-	mknod stderr		c 7 2	; chmod 666 stderr
-	;;
-
-fd)
-	rm -rf fd/*
-	mkdir fd > /dev/null 2>&1
-	(cd fd && eval `echo "" | awk ' BEGIN { \
-		for (i = 0; i < 64; i++) \
-			printf("mknod %d c 7 %d;", i, i)}'`)
-	chown -R root.wheel fd
-	chmod 555 fd
-	chmod 666 fd/*
-	;;
-
-st*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	st*) name=st; chr=10;;
-	esac
-	case $unit in
-	0|1|2|3|4|5|6)
-		unit0=`expr $unit \* 16`
-		unit1=`expr $unit \* 16 + 1`
-		unit2=`expr $unit \* 16 + 4`
-		unit3=`expr $unit \* 16 + 5`
-		mknod r${name}${unit} c $chr $unit0
-		mknod nr${name}${unit} c $chr $unit1
-		mknod r${name}h${unit} c $chr $unit2
-		mknod nr${name}h${unit} c $chr $unit3
-		chown root.operator r${name}${unit} nr${name}${unit} \
-			r${name}h${unit} nr${name}h${unit}
-		chmod 660 r${name}${unit} nr${name}${unit} \
-			r${name}h${unit} nr${name}h${unit}
-		;;
-	*)
-		echo bad unit for tape in: $1
-		;;
-	esac
-	umask 77
-	;;
-
-pf)
-	rm -f pf
-	mknod pf c 73 0
-	chown root.wheel pf
-	chmod 600 pf
-	;;
-
-bpf*|tun*)
-	unit=`expr $i : '...\(.*\)'`
-	case $i in
-	bpf*) name=bpf; chr=12;;
-	tun*) name=tun; chr=40;;
-	esac
-	rm -f $name$unit
-	mknod $name$unit c $chr $unit
-	chown root.wheel $name$unit
-	;;
-
-
-cd*|sd*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	cd*) name=cd; blk=3; chr=8;;
-	sd*) name=sd; blk=0; chr=9;;
-	fd*) name=fd; blk=7; chr=13;;
-	esac
-	rm -f $name$unit r$name$unit
-	case $unit in
-	0|1|2|3|4|5|6)
-	    mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
-	    mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + 2`
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + 1`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-	    chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-	    chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	    ;;
-	*)
-		echo bad unit for disk in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-vnd*)
-	umask 2 ; unit=`expr $i : 'vnd\(.*\)'`
-	for name in vnd svnd; do
-		blk=2; chr=11;
-		case $name in
-		vnd)	off=0;;
-		svnd)	off=128;;
-		esac
-		rm -f $name$unit? r$name$unit?
-		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + $off + 0`
-		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + $off + 1`
-		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + $off + 2`
-		mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + $off + 3`
-		mknod ${name}${unit}e	b $blk `expr $unit '*' 16 + $off + 4`
-		mknod ${name}${unit}f	b $blk `expr $unit '*' 16 + $off + 5`
-		mknod ${name}${unit}g	b $blk `expr $unit '*' 16 + $off + 6`
-		mknod ${name}${unit}h	b $blk `expr $unit '*' 16 + $off + 7`
-		mknod ${name}${unit}i	b $blk `expr $unit '*' 16 + $off + 8`
-		mknod ${name}${unit}j	b $blk `expr $unit '*' 16 + $off + 9`
-		mknod ${name}${unit}k	b $blk `expr $unit '*' 16 + $off + 10`
-		mknod ${name}${unit}l	b $blk `expr $unit '*' 16 + $off + 11`
-		mknod ${name}${unit}m	b $blk `expr $unit '*' 16 + $off + 12`
-		mknod ${name}${unit}n	b $blk `expr $unit '*' 16 + $off + 13`
-		mknod ${name}${unit}o	b $blk `expr $unit '*' 16 + $off + 14`
-		mknod ${name}${unit}p	b $blk `expr $unit '*' 16 + $off + 15`
-		mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + $off + 0`
-		mknod r${name}${unit}b	c $chr `expr $unit '*' 16 + $off + 1`
-		mknod r${name}${unit}c	c $chr `expr $unit '*' 16 + $off + 2`
-		mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + $off + 3`
-		mknod r${name}${unit}e	c $chr `expr $unit '*' 16 + $off + 4`
-		mknod r${name}${unit}f	c $chr `expr $unit '*' 16 + $off + 5`
-		mknod r${name}${unit}g	c $chr `expr $unit '*' 16 + $off + 6`
-		mknod r${name}${unit}h	c $chr `expr $unit '*' 16 + $off + 7`
-		mknod r${name}${unit}i	c $chr `expr $unit '*' 16 + $off + 8`
-		mknod r${name}${unit}j	c $chr `expr $unit '*' 16 + $off + 9`
-		mknod r${name}${unit}k	c $chr `expr $unit '*' 16 + $off + 10`
-		mknod r${name}${unit}l	c $chr `expr $unit '*' 16 + $off + 11`
-		mknod r${name}${unit}m	c $chr `expr $unit '*' 16 + $off + 12`
-		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + $off + 13`
-		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + $off + 14`
-		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + $off + 15`
-		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
-		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
-	done
-	umask 77
-	;;
-
-tty*)
-	unit=`expr $i : '...\(.*\)'`
-	rm -f tty$unit cua$unit
-	mknod tty$unit c 17 $unit
-	mknod cua$unit c 17 `expr $unit + 128`
-	chown uucp.dialer tty$unit cua$unit
-	chmod 660 tty$unit cua$unit
-	;;
-
-pty*)
-	class=`expr $i : 'pty\(.*\)'`
-	case $class in
-	0) offset=0 name=p;;
-	1) offset=16 name=q;;
-	2) offset=32 name=r;;
-	3) offset=48 name=s;;
-	4) offset=64 name=t;;
-	5) offset=80 name=u;;
-	6) offset=96 name=v;;
-	7) offset=112 name=w;;
-	8) offset=128 name=x;;
-	9) offset=144 name=y;;
-	10) offset=160 name=z;;
-	11) offset=176 name=P;;
-	12) offset=192 name=Q;;
-	13) offset=208 name=R;;
-	14) offset=224 name=S;;
-	15) offset=240 name=T;;
-	*) echo bad unit for pty in: $i;;
-	esac
-	case $class in
-	0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15)
-		umask 0
-		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
-	                for (i = 0; i < 16; i++)
-	                        printf("rm -f tty%s%x; mknod tty%s%x c 4 %d;" \
-	                            "rm -f pty%s%x; mknod pty%s%x c 5 %d; ", \
-	                            n, i, n, i, b+i, n, i, n, i, b+i); }'`
-		umask 77
-		;;
-	esac
-	;;
-
-random|srandom|urandom|prandom|arandom)
-	rm -f random urandom srandom prandom arandom
-	mknod  random c 32 0
-	mknod srandom c 32 1
-	mknod urandom c 32 2
-	mknod prandom c 32 3
-	mknod arandom c 32 4
-	chown root.wheel random srandom urandom prandom arandom
-	chmod 644 random srandom urandom prandom arandom
-	;;
-
-local)
-	umask 0
-	test -s MAKEDEV.local && sh MAKEDEV.local
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
diff --git a/src/etc/etc.wgrisc/Makefile.inc b/src/etc/etc.wgrisc/Makefile.inc
deleted file mode 100644
index 3f1e43b0..00000000
--- a/src/etc/etc.wgrisc/Makefile.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1997/09/21 11:50:45 deraadt Exp $
-#
-#	etc.wgrisc/Makefile.inc -- wgrisc-specific etc Makefile targets
-
-.ifdef DESTDIR
-
-snap_md: binutils bsd
-
-binutils:
-	cd ${DESTDIR} && tar cf - usr/*openbsd* \
-	    | ${GZIP} ${GZIPFLAGS} > snapshot/usr.binutils.tar${GZIPEXT}
-
-bsd:
-	cd ${.CURDIR}/../sys/arch/wgrisc/conf && config GENERIC
-	cd ${.CURDIR}/../sys/arch/wgrisc/compile/GENERIC && \
-	    make clean && make depend && make
-	cp ${.CURDIR}/../sys/arch/wgrisc/compile/GENERIC/bsd \
-	    ${DESTDIR}/snapshot/bsd
-
-.endif
diff --git a/src/etc/etc.wgrisc/disktab b/src/etc/etc.wgrisc/disktab
deleted file mode 100644
index acf2b220..00000000
--- a/src/etc/etc.wgrisc/disktab
+++ /dev/null
@@ -1,691 +0,0 @@
-#	$OpenBSD: disktab,v 1.3 2001/01/28 23:31:29 niklas Exp $
-
-# "@(#)disktab	5.2	(ULTRIX)	8/7/91"
-#
-#	disktab	from 4.5  4.2 BSD 83/07/30
-# Disk geometry and partition layout tables. 
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space for bad sector tables unless
-# the device drivers fail to support this.
-#
-# Beginning with the RZ58, the following formula will be used to
-# determine partition sizes:
-#
-#	   a  is 16MB in size
-#	   b  is 64MB in size 
-#	   c  is the whole disk
-#	d,e,f is 1/3 of partitions g and h (with partition f for growth)
-#	   g  is 400MB (or rest of disk)
-#	   h  is rest of disk (or zero) 
-#
-
-#
-# Drives on hp
-#
-rm03|RM03|DEC RM03:\
-	:ty=removable:ns#32:nt#5:nc#823:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#131680:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#10080:bf#4096:ff#1024:\
-	:pg#82080:bg#4096:fg#512:
-rm05|RM05|DEC RM05:\
-	:ty=removable:ns#32:nt#19:nc#823:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#66880:bb#4096:fb#512:\
-	:pc#500384:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#86048:bf#4096:ff#1024:\
-	:pg#158528:bg#4096:fg#512:\
-	:ph#241984:bh#4096:fh#1024:
-rp06|RP06|DEC RP06:\
-	:ty=removable:ns#22:nt#19:nc#815:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#340670:bc#4096:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#219296:bf#4096:ff#1024:\
-	:pg#291192:bg#4096:fg#512:
-rm80|RM80|DEC RM80:\
-	:ty=winchester:ns#31:nt#14:nc#559:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#242606:bc#4096:fc#512:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#120466:bf#4096:ff#1024:\
-	:pg#192510:bg#4096:fg#512:
-rp05|RP05|DEC RP05:\
-	:ty=removable:ns#22:nt#19:nc#411:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#171798:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#50424:bf#4096:ff#1024:\
-	:pg#122320:bg#4096:fg#512:
-rp07|RP07|DEC RP07:\
-	:ty=winchester:ns#50:nt#32:nc#630:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#66880:bb#4096:fb#512:\
-	:pc#1008000:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#307200:be#4096:fe#1024:\
-	:pf#308600:bf#4096:ff#1024:\
-	:pg#631800:bg#4096:fg#1024:\
-	:ph#291346:bh#4096:fh#1024:
-ml11|ml11a|ml11b|ML11A|ML11B|DEC disk emulator:\
-	:ty=simulated:ns#1:nt#1:nc#1:
-9775|CDC 9775:\
-	:ty=winchester:ns#32:nt#40:nc#843:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#66880:bb#4096:fb#512:\
-	:pc#1079040:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#307200:be#4096:fe#512:\
-	:pf#378720:bf#4096:ff#1024:\
-	:pg#702560:bg#4096:fg#512:\
-	:ph#291346:bh#4096:fh#1024:
-9730|CDC 9730:\
-	:ty=removable:ns#32:nt#10:nc#823:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:
-	:pc#263360:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#141600:bf#4096:ff#1024:\
-	:pg#213600:bg#4096:fg#512:
-330|capricorn|Capricorn|Ampex Capricorn:\
-	:ty=winchester:ns#32:nt#16:nc#1024:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#524288:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#109408:bf#4096:ff#1024:\
-	:pg#182112:bg#4096:fg#512:\
-	:ph#291346:bh#4096:fh#1024:
-eagle|Eagle|Fujitsu Eagle (48 sectors):\
-	:ty=winchester:ns#48:nt#20:nc#842:rm#3900:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#66880:bb#4096:fb#512:\
-	:pc#808320:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#307200:be#4096:fe#512:\
-	:pf#109248:bf#4096:ff#1024:\
-	:pg#432768:bg#4096:fg#1024:\
-	:ph#291346:bh#4096:fh#512:
-#
-# IDC disks (and RL02 on RL11)
-#
-rb02|RB02|rl02|RL02|DEC RL02 drives on 730 IDC or the RL11:\
-	:ty=removable:se#256:ns#40:nt#2:nc#512:\
-	:pa#15884:ba#4096:fa#1024:\
-	:pb#4520:bb#4096:fb#512:\
-	:pc#20480:bc#4096:fc#512:
-rb80|RB80|R80|r80|DEC R80 on 730 IDC:\
-	:ty=winchester:ns#31:nt#14:nc#559:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#242606:bc#8192:fc#1024:\
-	:pg#82080:bg#4096:fg#512:\
-	:ph#110143:bh#4096:fh#1024:
-#
-# Disks for rk
-#
-rk06|RK06|DEC RK06:\
-	:ty=removable:ns#22:nt#3:nc#411:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#11154:bb#4096:fb#512:\
-	:pc#27126:bc#4096:fc#512:
-rk07|RK07|DEC RK07:\
-	:ty=removable:ns#22:nt#3:nc#815:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#10032:bb#4096:fb#512:\
-	:pc#53790:bc#4096:fc#512:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pf#11880:bf#4096:ff#1024:\
-	:pg#27786:bg#4096:fg#512:
-#
-# Disks normally on up
-#
-160|fuji|fuji160|Fujitsu 160:\
-	:ty=winchester:ns#32:nt#10:nc#823:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#263360:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#141600:bf#4096:ff#1024:\
-	:pg#213600:bg#4096:fg#512:
-9300|Ampex 9300:\
-	:ty=removable:ns#32:nt#19:nc#815:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#495520:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#81312:bf#4096:ff#1024:\
-	:pg#153664:bg#4096:fg#512:\
-	:ph#291346:bh#4096:fh#1024:
-9766|CDC 9766:\
-	:ty=removable:ns#32:nt#19:nc#823:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#500384:bc#8192:fc#1024:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#86176:bf#4096:ff#1024:\
-	:pg#158528:bg#4096:fg#512:\
-	:ph#291346:bh#4096:fh#1024:
-980|AMPEX DM980:\
-	:ty=removable:ns#32:nt#5:nc#823:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#512:\
-	:pc#131680:bc#4096:fc#512:\
-	:pd#15884:bd#8192:fd#1024:\
-	:pe#55936:be#4096:fe#512:\
-	:pf#10080:bf#4096:ff#1024:\
-	:pg#82080:bg#4096:fg#1024:
-#
-# Disk on a UDA50
-# NOTE: the space normally reserved for the bad sector
-# table is used in the f and g partitions because the UDA50
-# does its own bad sector forwarding.  The partitions are
-# not rounded to cylinder boundaries since we use the same
-# partition tables in the driver for all drives.
-#
-rd31|RD31|DEC RD31 Winchester:\
-	:ty=winchester:ns#17:nt#4:nc#615:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#10024:bb#4096:fb#1024:\
-	:pc#41560:bc#8192:fc#1024:\
-	:pg#15652:bg#8192:fg#1024:
-
-rd32|RD32|DEC RD32 Winchester:\
-	:ty=winchester:ns#17:nt#6:nc#820:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#15625:bb#4096:fb#1024:\
-	:pc#83236:bc#8192:fc#1024:\
-	:pd#25863:bd#8192:fd#1024:\
-	:pe#25864:be#8192:fe#1024:\
-	:pg#51727:bg#8192:fg#1024:
-
-rd51|RD51|DEC RD51 Winchester:\
-	:ty=winchester:ns#18:nt#4:nc#300:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#5716:bb#4096:fb#1024:\
-	:pc#21600:bc#8192:fc#1024:
-
-rd52|RD52|DEC RD52 Winchester:\
-	:ty=winchester:ns#18:nt#7:nc#480:\
-	:pa#15884:ba#4096:fa#1024:\
-	:pb#9766:bb#4096:fb#1024:\
-	:pc#60480:bc#8192:fc#1024:\
-	:pe#50714:be#8192:fe#1024:\
-        :pf#9766:bf#8192:ff#1024:\
-        :ph#44596:bh#8192:fh#1024:\
-	:pg#34830:bg#8192:fg#1024:
-
-rd33|RD33|DEC RD33 Winchester:\
-	:ty=winchester:ns#17:nt#7:nc#1170:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#33440:bb#4096:fb#1024:\
-	:pc#138565:bc#8192:fc#1024:\
-	:pe#50714:be#8192:fe#1024:\
-	:pf#87852:bf#8192:ff#1024:\
-	:ph#122682:bh#8192:fh#1024:\
-	:pg#89332:bg#8192:fg#1024:
-
-ese20|ESE20|DEC ESE20 Electronic:\
-	:ty=winchester:ns#4:nt#128:nc#480:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#50160:bb#4096:fb#1024:\
-	:pc#245757:bc#8192:fc#1024:\
-	:pd#81416:bd#8192:fd#1024:\
-	:pe#81413:be#8192:fe#1024:\
-	:pg#162829:bg#8192:fg#1024:
-
-rz22|RZ22|DEC RZ22 Winchester:\
-	:ty=winchester:ns#33:nt#4:nc#776:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#69664:bb#8192:fb#1024:\
-	:pc#102432:bc#8192:fc#1024:
-
-rz23|RZ23|DEC RZ23 Winchester:\
-	:ty=winchester:ns#33:nt#8:nc#776:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#66690:bb#4096:fb#1024:\
-	:pc#204864:bc#8192:fc#1024:\
-	:pd#35135:bd#8192:fd#1024:\
-	:pe#35135:be#8192:fe#1024:\
-	:pf#35136:bf#8192:ff#1024:\
-	:pg#105406:bg#8192:fg#1024:\
-	:ph#70271:bh#8192:fh#1024:
-
-rz23l|RZ23L|DEC RZ23L Winchester:\
-	:ty=winchester:ns#39:nt#4:nc#1524:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#66690:bb#4096:fb#1024:\
-	:pc#237588:bc#8192:fc#1024:\
-	:pd#35135:bd#8192:fd#1024:\
-	:pe#35135:be#8192:fe#1024:\
-	:pf#67860:bf#8192:ff#1024:\
-	:pg#138130:bg#8192:fg#1024:\
-	:ph#102995:bh#8192:fh#1024:
-
-rd53|RD53|DEC RD53 Winchester:\
-	:ty=winchester:ns#17:nt#8:nc#1024:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#50160:bb#4096:fb#1024:\
-	:pc#138672:bc#8192:fc#1024:\
-	:pg#55744:bg#8192:fg#1024:\
-	:ph#105904:bh#8192:fh#1024:
-
-rd54|RD54|DEC RD54 Winchester:\
-	:ty=winchester:ns#17:nt#15:nc#1221:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#50160:bb#4096:fb#1024:\
-	:pc#311200:bc#8192:fc#1024:\
-	:pd#130938:bd#8192:fd#1024:\
-	:pe#97334:be#8192:fe#1024:\
-	:pg#228272:bg#8192:fg#1024:
-
-
-#
-# rf disks
-#
-rf30|RF30|DEC RF30 Winchester:\
-	:ty=winchester:ns#37:nt#6:nc#1320:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#50160:bb#4096:fb#1024:\
-	:pc#293040:bc#8192:fc#1024:\
-	:pd#130938:bd#8192:fd#1024:\
-	:pe#79173:be#8192:fe#1024:\
-	:pg#210112:bg#8192:fg#1024:
-
-rf31|RF31|DEC RF31 Winchester:\
-        :ty=winchester:ns#50:nt#8:nc#1861:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#4096:fb#1024:\
-        :pc#744400:bc#8192:fc#1024:\
-        :pd#163840:bd#8192:fd#1024:\
-        :pe#471040:be#8192:fe#1024:\
-        :pf#273360:bf#8192:ff#1024:\
-        :pg#580560:bg#8192:fg#1024:
-
-rf71|RF71|DEC RF71 Winchester:\
-	:ty=winchester:ns#37:nt#16:nc#1320:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#131072:bb#4096:fb#1024:\
-	:pc#781440:bc#8192:fc#1024:\
-	:pd#163840:bd#8192:fd#1024:\
-	:pe#471040:be#8192:fe#1024:\
-        :pf#310400:bf#8192:ff#1024:\
-	:pg#617600:bg#8192:fg#1024:
-
-rf72|RF72|DEC RF72 Winchester:\
-	:ty=winchester:ns#50:nt#21:nc#1861:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#190608:bb#4096:fb#1024:\
-	:pc#1954050:bc#8192:fc#1024:\
-	:pd#300708:bd#8192:fd#1024:\
-	:pe#300708:be#8192:fe#1024:\
-	:pf#207658:bf#8192:ff#1024:\
-	:pg#921600:bg#8192:fg#1024:\
-	:ph#809074:bh#8192:fh#1024:
-
-rx50|RX50|DEC RX50:\
-	:ty=removable:ns#10:nt#1:nc#80:\
-	:pa#800:ba#4096:fa#512:\
-	:pc#800:bc#4096:fc#512:
-
-rx33|RX33|DEC RX33:\
-	:ty=removable:ns#15:nt#2:nc#80:\
-	:pa#2400:ba#4096:fa#512:\
-	:pc#2400:bc#4096:fc#512:
-
-rx23|RX23|DEC RX23:\
-	:ty=removable:ns#18:nt#2:nc#80:\
-	:pa#2880:ba#4096:fa#512:\
-	:pc#2880:bc#4096:fc#512:
-
-rx26|RX26|DEC RX26:\
-	:ty=removable:ns#36:nt#2:nc#80:\
-	:pa#5760:ba#4096:fa#512:\
-	:pc#5760:bc#4096:fc#512:
-
-rx35|RX35|DEC RX35:\
-        :ty=removable:ns#16:nt#1:nc#80:\
-        :ba#4096:fa#512:\
-        :bc#4096:fc#512:
-
-rc25|RC25|DEC RC25 Removable and fixed|rcf25|RCF25:\
-	:ty=removable:ns#42:nt#4:nc#2382:\
-	:pa#15884:ba#8192:fa#1024:\
-	:pb#10032:bb#4096:fb#1024:\
-	:pc#50902:bc#8192:fc#1024:\
-	:pg#24986:bg#8192:fg#1024:
-
-#
-# ra disks
-#
-ra60|RA60|DEC RA60 Removable:\
-	:ty=removable:ns#42:nt#4:nc#2382:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#50160:bb#4096:fb#1024:\
-	:pc#400176:bc#8192:fc#1024:\
-	:pd#52416:bd#8192:fd#1024:\
-	:pe#52416:be#8192:fe#1024:\
-	:pf#52416:bf#8192:ff#1024:\
-	:pg#160000:bg#8192:fg#1024:\
-	:ph#157248:bh#8192:fh#1024:
-
-ra70|RA70|DEC RA70 Winchester:\
-        :ty=winchester:ns#33:nt#11:nc#1507:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#4096:fb#1024:\
-        :pc#547041:bc#8192:fc#1024:\
-        :pd#163840:bd#8192:fd#1024:\
-        :pe#471040:be#8192:fe#1024:\
-        :pf#76001:bf#8192:ff#1024:\
-        :pg#383201:bg#8192:fg#1024:
-
-ra71|RA71|DEC RA71 Winchester:\
-        :ty=winchester:ns#51:nt#14:nc#1915:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#4096:fb#1024:\
-        :pc#1367310:bc#8192:fc#1024:\
-        :pd#204800:bd#8192:fd#1024:\
-        :pe#204800:be#8192:fe#1024:\
-        :pf#179470:bf#8192:ff#1024:\
-        :pg#614400:bg#8192:fg#1024:\
-        :ph#589070:bh#8192:fh#1024:
-
-ra72|RA72|DEC RA72 Winchester:\
-        :ty=winchester:ns#51:nt#20:nc#1915:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#190464:bb#4096:fb#1024:\
-        :pc#1953300:bc#8192:fc#1024:\
-        :pd#299008:bd#8192:fd#1024:\
-        :pe#299008:be#8192:fe#1024:\
-        :pf#210452:bf#8192:ff#1024:\
-        :pg#921600:bg#8192:fg#1024:\
-        :ph#808468:bh#8192:fh#1024:
-
-ra80|RA80|DEC RA80 Winchester:\
-	:ty=winchester:ns#31:nt#14:nc#546:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#50160:bb#4096:fb#1024:\
-	:pc#237212:bc#8192:fc#1024:\
-	:pd#51428:bd#8192:fd#1024:\
-	:pe#51428:be#8192:fe#1024:\
-	:pf#51428:bf#8192:ff#1024:\
-	:pg#154284:bg#8192:fg#1024:
-
-ra81|RA81|DEC RA81 Winchester:\
-	:ty=winchester:ns#51:nt#14:nc#1248:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#66690:bb#4096:fb#1024:\
-	:pc#891072:bc#8192:fc#1024:\
-	:pd#210538:bd#8192:fd#1024:\
-	:pe#210538:be#8192:fe#1024:\
-	:pf#210538:bf#8192:ff#1024:\
-	:pg#160000:bg#8192:fg#1024:\
-	:ph#631614:bh#8192:fh#1024:
-
-ra82|RA82|DEC RA82 Winchester:\
-	:ty=winchester:ns#57:nt#15:nc#1423:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#66690:bb#4096:fb#1024:\
-	:pc#1216665:bc#8192:fc#1024:\
-	:pd#220096:bd#8192:fd#1024:\
-	:pe#219735:be#8192:fe#1024:\
-	:pf#437760:bf#8192:ff#1024:\
-	:pg#877591:bg#8192:fg#1024:\
-	:ph#239616:bh#8192:fh#1024:
-
-ra90|RA90|DEC RA90 Winchester:\
-	:ty=winchester:ns#69:nt#13:nc#2649:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#127072:bb#4096:fb#1024:\
-	:pc#2376153:bc#8192:fc#1024:\
-	:pd#420197:bd#8192:fd#1024:\
-	:pe#420197:be#8192:fe#1024:\
-	:pf#840393:bf#8192:ff#1024:\
-	:pg#1680787:bg#8192:fg#1024:\
-	:ph#535526:bh#8192:fh#1024:
-
-ra92|RA92|DEC RA92 Winchester:\
-	:ty=winchester:ns#69:nt#13:nc#3279:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#127072:bb#4096:fb#1024:\
-	:pc#2940951:bc#8192:fc#1024:\
-	:pd#420197:bd#8192:fd#1024:\
-	:pe#420197:be#8192:fe#1024:\
-	:pf#840393:bf#8192:ff#1024:\
-	:pg#1680787:bg#8192:fg#1024:\
-	:ph#1100324:bh#8192:fh#1024:
-#
-# rz disks
-#
-rz24|RZ24|DEC RZ24 Winchester:\
-        :ty=winchester:ns#38:nt#8:nc#1348:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#4096:fb#1024:\
-        :pc#409792:bc#8192:fc#1024:\
-        :pd#81984:bd#8192:fd#1024:\
-        :pe#81984:be#8192:fe#1024:\
-        :pf#81984:bf#8192:ff#1024:\
-        :pg#245952:bg#8192:fg#1024:
-
-rz25|RZ25|DEC RZ25 Winchester:\
-        :ty=winchester:ns#62:nt#9:nc#1476:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#8192:fb#1024:\
-        :pc#832527:bc#8192:fc#1024:\
-        :pd#222896:bd#8192:fd#1024:\
-        :pe#222896:be#8192:fe#1024:\
-        :pf#222895:bf#8192:ff#1024:\
-        :pg#668687:bg#8192:fg#1024:\
-	:ph#0:bh#8192:fh#1024:
-
-rz55|RZ55|DEC RZ55 Winchester:\
-        :ty=winchester:ns#36:nt#15:nc#1224:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#8192:fb#1024:\
-        :pc#649040:bc#8192:fc#1024:\
-        :pd#152446:bd#8192:fd#1024:\
-        :pe#152446:be#8192:fe#1024:\
-        :pf#180308:bf#8192:ff#1024:\
-        :pg#485200:bg#8192:fg#1024:\
-	:ph#0:bh#8192:fh#1024:
-
-rz56|RZ56|DEC RZ56 Winchester:\
-        :ty=winchester:ns#54:nt#15:nc#1632:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#4096:fb#1024:\
-        :pc#1299174:bc#8192:fc#1024:\
-        :pd#292530:bd#8192:fd#1024:\
-        :pe#292530:be#8192:fe#1024:\
-        :pf#550274:bf#8192:ff#1024:\
-        :pg#567666:bg#8192:fg#1024:\
-        :ph#567668:bh#8192:fh#1024:
-
-rz57|RZ57|DEC RZ57 Winchester:\
-        :ty=winchester:ns#71:nt#15:nc#1925:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#184320:bb#4096:fb#1024:\
-        :pc#2025788:bc#8192:fc#1024:\
-        :pd#299008:bd#8192:fd#1024:\
-        :pe#299008:be#8192:fe#1024:\
-        :pf#596284:bf#8192:ff#1024:\
-        :pg#614400:bg#8192:fg#1024:\
-        :ph#1194300:bh#8192:fh#1024:
-
-# NOTE: The RZ58 uses a recording technique called zoned recording.
-#   Using this technique, the number of sectors per track will vary
-#   depending on what zone of the disk is in use (simply multiplying 
-#   ns*nt*nc does not give true capacity of the drive).  The ns (number
-#   of sectors per track) is calculated by "ns = total sectors/(nt*nc)"
-#   and is a rounded value.  Therefore, the value "ns" is an approximation,
-#   not a true representation, of what is stored on disk. 
-#    
-#   The 'c' partition listed below gives the true size of the RZ58
-#   (this information can be obtained by use of the DEVGETGEOM ioctl). 
-# 
-
-rz58|RZ58|DEC RZ58 Winchester:\
-        :ty=winchester:ns#85:nt#15:nc#2112:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#4096:fb#1024:\
-        :pc#2698061:bc#8192:fc#1024:\
-        :pd#844740:bd#8192:fd#1024:\
-        :pe#844740:be#8192:fe#1024:\
-        :pf#844741:bf#8192:ff#1024:\
-        :pg#819200:bg#8192:fg#1024:\
-        :ph#1715021:bh#8192:fh#1024:
-
-#
-# RX02 floppy disk drives
-#
-rx02|RX02|DEC RX02:\
-	:ty=removable:ns#13:nt#1:nc#77:\
-	:pa#1001:ba#4096:fa#512:
-
-
-213s|LXT-213S| MAXTOR 213:\
- :ty=winchester:ns#42:nt#7:nc#1310:\
- :pa#32768:ba#8192:fa#1024:\
- :pb#0:bb#8192:fb#1024:\
- :pc#415436:bc#8192:fc#1024:\
- :pd#0:bd#8192:fd#1024:\
- :pe#0:be#8192:fe#1024:\
- :pf#0:bf#8192:ff#1024:\
- :pg#0:bg#8192:fg#1024:\
- :ph#0:bh#8192:fh#1024:
-
-#
-# local modifications
-#
-
-# noisy Coperico and Highland disks (hobo, dagwood, huey, pogo)
-94181-15|cdc 94181:really 94181-702:\
-        :ty=winchester:ns#48:nt#15:nc#1545:\
-        pa#32768:ba#8192:fa#1024:\
-        pb#131072:bb#8192:fb#1024:\
-        pc#1173930:bc#8192:fc#1024:\
-        pd#152446:bd#8192:fd#1024:\
-        pe#152446:be#8192:fe#1024:\
-        pf#705198:bf#8192:ff#1024:\
-        pg#1010090:bg#8192:fg#1024:\
-        ph#1010090:bh#8192:fh#1024:
-
-# R Squared disks (minnie, mickey)
-fu2263sa|FU2263SA|Fujitsu 2263SA:\
-	:ty=winchester:ns#53:nt#15:nc#1648:\
-	pa#32768:ba#8192:fa#1024:\
-        pb#131072:bb#8192:fb#1024:\
-        pc#1312344:bc#8192:fc#1024:\
-        pd#0:bd#8192:fd#1024:\
-        pe#0:be#8192:fe#1024:\
-        pf#0:bf#8192:ff#1024:\
-        pg#1148504:bg#8192:fg#1024:\
-	ph#1148504:bh#8192:fh#1024:
-
-# R Squared disks (pescadero)
-wren7|CDC Wren 7:\
-        :ty=winchester:ns#69:nt#15:nc#1963:\
-	:pa#32768:oa#0:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-        :pc#2025788:oc#0:bc#8192:fc#1024:\
-        :pd#299008:bd#8192:fd#1024:\
-        :pe#299008:be#8192:fe#1024:\
-        :pf#596284:bf#8192:ff#1024:\
-        :pg#619200:og#163840:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#1042748:oh#783040:bh#8192:fh#1024:th=4.2bsd:
-
-# R Squared disks (greyhawk)
-wren8|CDC Wren 8:\
-        :ty=winchester:ns#89:nt#15:nc#2107:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#184320:bb#8192:fb#1024:\
-        :pc#2765294:bc#8192:fc#1024:\
-        :pd#299008:bd#8192:fd#1024:\
-        :pe#299008:be#8192:fe#1024:\
-	:pf#596284:bf#8192:ff#1024:\
-        :pg#614400:bg#8192:fg#1024:\
-        :ph#1194300:bh#8192:fh#1024:
-
-# R Squared disks (madmax, reno)
-fu2624fa|FU2624FA|Fujitsu 2624FA:\
-        :ty=winchester:ns#63:nt#11:nc#1429:\
-        :pa#32768:ba#8192:fa#1024:\
-        :pb#131072:bb#8192:fb#1024:\
-        :pc#1015812:bc#8192:fc#1024:\
-        :pd#0:bd#8192:fd#1024:\
-        :pe#0:be#8192:fe#1024:\
-        :pf#0:bf#8192:ff#1024:\
-        :pg#851972:bg#8192:fg#1024:\
-        :ph#0:bh#8192:fh#1024:
-
-# R Squared disks (lahaina)
-17s|P1-17S|Maxtor P1-17S:\
-	:ty=winchester:ns#87:nt#19:nc#1778:\
-	:pa#32768:ba#8192:fa#1024:\
-	:pb#0:bb#8192:fb#1024:\
-	:pc#2936592:bc#8192:fc#1024:\
-	:pd#0:bd#8192:fd#1024:\
-	:pe#0:be#8192:fe#1024:\
-	:pf#0:bf#8192:ff#1024:\
-	:pg#0:bg#8192:fg#1024:\
-	:ph#0:bh#8192:fh#1024:
-
-# Micropolis 300m disk (from sun3)
-#sd1: <Micropolis 1578-15 cyl 1218 alt 2 hd 15 sec 35>
-mi1578:Micropolis 1578-15:\
-	:ty=winchester:ns#35:nt#15:nc#1218:\
-	:su#640500:\
-	:pa#32768:oa#0:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-	:pc#640500:oc#0:bc#8192:fc#1024:\
-	:pg#476660:og#163840:bg#8192:fg#1024:tg=4.2bsd:
-
-
-#PEFOS Disks.
-
-#sd0: Seagate 510 Meg
-st3610n:seagate st3610n:\
-	:ty=winchester:ns#79:nt#7:nc#1872:\
-	:su#1046176:\
-	:pa#32768:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#36864:bb#8192:fb#1024:tb=swap:\
-	:pc#1042080:oc#4096:bc#8192:fc#1024:\
-	:pd#1046176:od#0:bd#8192:fd#1024:\
-	:pe#4064:oe#32:be#8192:fe#1024:te=msdos:\
-	:pg#878240:og#167936:bg#8192:fg#1024:tg=4.2bsd:
-
-#QUANTUM, FIREBALL1080S, 1Q09
-FIREBALL1080S:\
-        :ty=winchester:ns#139:nt#4:nc#3835:\
-	:pa#32768:oa#0:ba#8192:fa#1024:ta=4.2bsd:\
-        :pb#131072:ob#32768:bb#8192:fb#1024:tb=swap:\
-        :pc#2132260:oc#0:bc#8192:fc#1024:\
-        :pd#656140:bd#8192:fd#1024:\
-        :pe#656140:be#8192:fe#1024:\
-        :pf#656140:bf#8192:ff#1024:\
-        :pg#619200:og#163840:bg#8192:fg#1024:tg=4.2bsd:\
-        :ph#1149220:oh#783040:bh#8192:fh#1024:th=4.2bsd:
-
diff --git a/src/etc/etc.wgrisc/fbtab b/src/etc/etc.wgrisc/fbtab
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.wgrisc/ld.so.conf b/src/etc/etc.wgrisc/ld.so.conf
deleted file mode 100644
index e8e4bdcd..00000000
--- a/src/etc/etc.wgrisc/ld.so.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib
diff --git a/src/etc/etc.wgrisc/sysctl.conf b/src/etc/etc.wgrisc/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.wgrisc/ttys b/src/etc/etc.wgrisc/ttys
deleted file mode 100644
index fd365c5b..00000000
--- a/src/etc/etc.wgrisc/ttys
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.2 1997/10/11 21:22:22 deraadt Exp $
-#
-# name	getty				type	status		comments
-#
-console	"/usr/libexec/getty std.9600"	unknown	off secure
-tty00	"/usr/libexec/getty std.9600"	unknown	on  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