From 4a20554783f05ce278cf3a9a84ede9d36edef71a Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 9 Mar 2016 16:28:46 +0000
Subject: [PATCH] We are done providing support for the vax. lots of agreement.

---
 src/etc/Makefile             |   4 +-
 src/etc/etc.vax/MAKEDEV      | 507 -----------------------------------
 src/etc/etc.vax/MAKEDEV.md   | 197 --------------
 src/etc/etc.vax/Makefile     |   5 -
 src/etc/etc.vax/Makefile.inc |   6 -
 src/etc/etc.vax/disktab      |  29 --
 src/etc/etc.vax/fbtab        |   1 -
 src/etc/etc.vax/login.conf   | 107 --------
 src/etc/etc.vax/sysctl.conf  |   1 -
 src/etc/etc.vax/ttys         |  17 --
 src/etc/examples/remote      |   4 +-
 src/etc/mtree/4.4BSD.dist    |   8 +-
 src/include/Makefile         |  25 +-
 13 files changed, 14 insertions(+), 897 deletions(-)
 delete mode 100644 src/etc/etc.vax/MAKEDEV
 delete mode 100644 src/etc/etc.vax/MAKEDEV.md
 delete mode 100644 src/etc/etc.vax/Makefile
 delete mode 100644 src/etc/etc.vax/Makefile.inc
 delete mode 100644 src/etc/etc.vax/disktab
 delete mode 100644 src/etc/etc.vax/fbtab
 delete mode 100644 src/etc/etc.vax/login.conf
 delete mode 100644 src/etc/etc.vax/sysctl.conf
 delete mode 100644 src/etc/etc.vax/ttys

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 04cc0dc2..6caba685 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.420 2016/02/15 17:19:56 millert Exp $
+#	$OpenBSD: Makefile,v 1.421 2016/03/09 16:28:46 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -274,7 +274,7 @@ distrib:
 SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7
 SUBDIR+= etc.hppa etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k
 SUBDIR+= etc.macppc etc.octeon
-SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.vax etc.zaurus
+SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.zaurus
 
 .include <bsd.subdir.mk>
 .include <bsd.prog.mk>
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
deleted file mode 100644
index d234654e..00000000
--- a/src/etc/etc.vax/MAKEDEV
+++ /dev/null
@@ -1,507 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
-#
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.54 2015/10/23 15:14:12 claudio Exp 
-#	OpenBSD: MAKEDEV.common,v 1.81 2015/11/10 21:49:18 sthen Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
-#
-#
-# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	ramdisk	Ramdisk kernel devices
-#	std	Standard devices
-#	local	Configuration specific devices
-# Disks:
-#	cd*	ATAPI and SCSI CD-ROM drives
-#	hd*	HDC9224 disks
-#	ra*	MSCP disks
-#	rd*	"rd" pseudo-disks
-#	rx*	RX02 floppy disks
-#	sd*	SCSI disks, including flopticals
-#	vnd*	"file" pseudo-disk devices
-# Tapes:
-#	ch*	SCSI media changers
-#	mt*	(Magnetic) 9-track reel tape drives
-#	st*	SCSI tape drives
-# Terminal ports:
-#	dhu*	UNIBUS DHU11
-#	dl*	UNIBUS DL11
-#	dz*	UNIBUS DZ11 and DZ32
-#	qsc*	VXT2000 serial ports
-# Pseudo terminals:
-#	ptm	pty master device
-#	pty*	Set of 62 master pseudo terminals
-#	tty*	Set of 62 slave pseudo terminals
-# Console ports:
-#	ttyC-J*	wscons display devices
-#	wscons	Minimal wscons devices
-#	wskbd*	wscons keyboards
-# Pointing devices:
-#	wsmouse*	wscons mice
-# Special purpose devices:
-#	audio*	Audio devices
-#	bio	ioctl tunnel pseudo-device
-#	bpf*	Berkeley Packet Filter
-#	diskmap	Disk mapper
-#	fd	fd/* nodes
-#	fuse	Userland Filesystem
-#	pf*	Packet Filter
-#	pppx*	PPP Multiplexer
-#	*random	In-kernel random data source
-#	systrace*	System call tracing device
-#	tun*	Network tunnel driver
-#	tap*	Ethernet tunnel driver
-#	uk*	Unknown SCSI devices
-#	vscsi*	Virtual SCSI controller
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	10) echo -n a;;
-	11) echo -n b;;
-	12) echo -n c;;
-	13) echo -n d;;
-	14) echo -n e;;
-	15) echo -n f;;
-	esac
-}
-
-alph2d()
-{
-	local t="$1"
-	local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	local sub=${p%${t}*}
-	echo ${#sub}
-}
-
-h2d()
-{
-	local s="$1"
-	local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*}
-
-	echo $(($(_h2d $f)*16+ $(_h2d $n) ))
-}
-
-_h2d()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	a) echo -n 10;;
-	b) echo -n 11;;
-	c) echo -n 12;;
-	d) echo -n 13;;
-	e) echo -n 14;;
-	f) echo -n 15;;
-	esac
-}
-
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg="$1"
-	tmp="${arg#[a-zA-Z]*}"
-	tmp="${tmp%*[a-zA-Z]}"
-	while [ "$tmp" != "$arg" ]
-	do
-		arg=$tmp
-		tmp="${arg#[a-zA-Z]*}"
-		tmp="${tmp%*[a-zA-Z]}"
-	done
-	echo $arg
-}
-
-dodisk()
-{
-	[ "$DEBUG" ] && set -x
-	n=$(($((${5}*${7:-16}))+${6})) count=0
-	[ 0$7 -ne 8 ] && l="i j k l m n o p"
-	for d in a b c d e f g h $l
-	do
-		M $1$2$d	b $3 $(($n+$count)) 640 operator
-		M r$1$2$d	c $4 $(($n+$count)) 640 operator
-		let count=count+1
-	done
-}
-
-dodisk2()
-{
-	n=$(($(($5*${7:-16}))+$6))
-	M $1$2a b $3 $n 640 operator
-	M r$1$2a c $4 $n 640 operator
-	n=$(($n+2))
-	M $1$2c b $3 $n 640 operator
-	M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist[0]="rm -f"
-
-mkl() {
-	mklist[${#mklist[*]}]=";mknod -m $1 $2 $3 $4 $5"
-}
-
-M() {
-	RMlist[${#RMlist[*]}]=$1
-	mkl ${5-666} $1 $2 $3 $4
-	G=${6:-wheel}
-	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
-	} || {
-		case $G in
-		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
-			whlist[${#whlist[*]}]="$1"
-		;;
-		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
-			oplist[${#oplist[*]}]="$1"
-		;;
-		*)
-			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
-		esac
-	}
-	return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
-do
-U=`unt $i`
-[ "$U" ] || U=0
-
-case $i in
-ramdisk)
-	R std bpf0 bio diskmap
-	R fd0 sd0 sd1 rd0 random
-	;;
-
-std)
-	M console	c 0 0 600
-	M tty		c 2 0
-	M mem		c 3 0 640 kmem
-	M kmem		c 3 1 640 kmem
-	M null		c 3 2
-	M zero		c 3 12
-	M stdin		c 53 0
-	M stdout	c 53 1
-	M stderr	c 53 2
-	M ksyms		c 50 0 640 kmem
-	M klog		c 33 0 600
-	M ttyg0		c 25 0 600
-	M ttyg1		c 25 1 600
-	M ttyg2		c 25 2 600
-	M ttyg3		c 25 3 600
-	;;
-
-mt*)
-	case $U in
-	[0-7])
-		four=$(($U+4))
-		eight=$(($U+8))
-		twelve=$(($U+12))
-		twenty=$(($U+20))
-		M mt$U		b 15 $U	660 operator
-		M mt$four	b 15 $four	660 operator
-		M mt$eight	b 15 $eight	660 operator
-		M mt$twelve	b 15 $twelve	660 operator
-		M nmt$U		b 15 $four	660 operator;: sanity w/pdp11 v7
-		M nmt$eight	b 15 $twelve	660 operator;: ditto
-		M nrmt$U	c 38 $four	660 operator;: ditto
-		M nrmt$eight	c 38 $twelve	660 operator;: ditto
-		M rmt$U		c 38 $U		660 operator
-		M rmt$four	c 38 $four	660 operator
-		M rmt$eight	c 38 $eight	660 operator
-		M rmt$twelve	c 38 $twelve	660 operator
-		;;
-	*)
-		echo bad unit for tape in: $i
-		;;
-	esac
-	umask 77
-	;;
-
-
-vscsi*)
-	M vscsi$U c 78 $U 600
-	;;
-
-uk*)
-	M uk$U c 65 $U 640 operator
-	;;
-
-tap*)
-	M tap$U c 83 $U 600
-	;;
-
-tun*)
-	M tun$U c 57 $U 600
-	;;
-
-systrace)
-	M systrace c 49 0 644
-	;;
-
-*random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 67 $n 644
-		n=$(($n+1))
-	done
-	;;
-
-pppx*)
-	M pppx$U c 80 $U 600
-	;;
-
-pf*)
-	M pf c 42 0 600
-	;;
-
-fuse)
-	M fuse$U c 82 $U 600
-	;;
-
-fd)
-	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
-	while [ $n -lt 64 ];do M fd/$n c 53 $n;n=$(($n+1));done
-	MKlist[${#MKlist[*]}]=";chmod 555 fd"
-	;;
-
-diskmap)
-	M diskmap c 79 0 640 operator
-	;;
-
-bpf*)
-	M bpf$U c 56 $U 600
-	;;
-
-bio)
-	M bio c 72 0 600
-	;;
-
-audio*)
-	M sound$U	c 81 $U
-	M mixer$U	c 81 $(($U+16))
-	M audio$U	c 81 $(($U+128))
-	M audioctl$U	c 81 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
-	;;
-
-wsmouse[0-9]*)
-	M wsmouse$U c 70 $U 600
-	;;
-
-wskbd[0-9]*)
-	M wskbd$U c 69 $U 600
-	;;
-
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6
-	R ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
-tty[C-J]*)
-	U=${i##tty[C-J]}
-	case $i in
-	ttyC*) n=C m=0;;
-	ttyD*) n=D m=256;;
-	ttyE*) n=E m=512;;
-	ttyF*) n=F m=768;;
-	ttyG*) n=G m=1024;;
-	ttyH*) n=H m=1280;;
-	ttyI*) n=I m=1536;;
-	ttyJ*) n=J m=1792;;
-	esac
-	case $U in
-	[0-9a-f]) M tty$n$U c 68 $((16#$U+$m)) 600;;
-	cfg) M tty${n}cfg c 68 $((255+$m)) 600;;
-	*) echo bad unit $U for $i; exit 1;;
-	esac
-	;;
-
-pty*)
-	if [ $U -gt 15 ]; then
-		echo bad unit for pty in: $i
-		continue
-	fi
-	set -A letters p q r s t u v w x y z P Q R S T
-	set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \
-	    r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \
-	    Y Z
-
-	name=${letters[$U]}
-	n=0
-	while [ $n -lt 62 ]
-	do
-		nam=$name${suffixes[$n]}
-		off=$(($U*62))
-		M tty$nam c 20 $(($off+$n))
-		M pty$nam c 21 $(($off+$n))
-		n=$(($n+1))
-	done
-	;;
-
-ptm)
-	M ptm c 75 0 666
-	;;
-
-qsc*)
-	
-	case $U in
-	0)
-		for i in 0 1 2 3; do
-			M ttyb${i} c 48 ${i} 600
-		done
-	;;
-	*)
-		echo bad unit for qsc in: $i
-	;;
-	esac
-	;;
-
-dz*)
-	case $U in
-	[0-7])
-		i=0
-		while [ $i -lt 8 ]; do
-			no=$(($(($U*8))+$i))
-			if [ $no -lt 10 ]; then
-				no="0${no}"
-			fi
-			M tty${no} c 1 $no 600
-			i="$(( $i + 1 ))"
-		done
-	;;
-	*)
-		echo bad unit for dz in: $i
-		;;
-	esac
-	;;
-
-dl*)
-	set -A cnvtbl 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
-	let=${cnvtbl[$U]}
-	if [ -n "$let" ] ;then
-		M ttyJ${let} c 66 $U 600
-	else
-		echo bad unit for dl in: $i
-	fi
-	;;
-
-dhu*)
-	set -A cnvtbl 0 1 2 3 4 5 6 7 8 9 a b c d e f
-	case $U in
-	[0-7])
-		case $U in
-		0) ch=S ;; 1) ch=T ;; 2) ch=U ;; 3) ch=V ;;
-		4) ch=W ;; 5) ch=X ;; 6) ch=Y ;; 7) ch=Z ;;
-		esac
-		i=0
-		while [ $i -lt 16 ]; do
-			let=${cnvtbl[$i]}
-			M tty${ch}${let} c 34 $(($(($U*16))+$i)) 600
-			i="$(( $i + 1 ))"
-		done
-	;;
-	*)
-		echo bad unit for dhu in: $i
-	;;
-	esac
-	;;
-
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 21 $n 660 operator
-		M ${pre}rst$U	c 60 $n 660 operator
-		n=$(($n+1))
-	done
-	;;
-
-ch*)
-	M ch$U c 63 $U 660 operator
-	;;
-
-vnd*)
-	dodisk vnd $U 18 55 $U 0
-	;;
-
-rd*)
-	dodisk2 rd $U 23 62 $U 0
-	;;
-
-cd*)
-	dodisk2 cd $U 22 61 $U 0
-	;;
-
-local)
-	test -s $T.local && sh $T.local
-	;;
-
-all)
-	R qsc0 dl0 dz0 dhu0 mt0 mt1 hd0 hd1 hd2 vnd0 sd0 sd1 sd2 sd3
-	R cd0 tap0 tap1 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
-	R bpf6 bpf7 pty0 diskmap vscsi0 ch0 audio0 fuse pppx ptm local
-	R wscons uk0 random pf systrace rx0 rx1 ra0 ra1 ra2 ra3 std
-	R st0 st1 fd
-	;;
-
-sd*|rx*|ra*|hd*)
-	case $i in
-	sd*) dodisk sd $U 20 59 $U 0;;
-	rx*) dodisk rx $U 12 30 $U 0;;
-	ra*) dodisk ra $U 9 9 $U 0;;
-	hd*) dodisk hd $U 19 58 $U 0;;
-	esac
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
-}
-R "$@"
-{
-echo -n ${RMlist[*]}
-echo -n ${mklist[*]}
-echo -n ${MKlist[*]}
-echo -n ${whlist[*]}
-echo ${oplist[*]}
-} | if [ "$eo" = "echo" ]; then
-        cat
-else
-	sh
-fi
diff --git a/src/etc/etc.vax/MAKEDEV.md b/src/etc/etc.vax/MAKEDEV.md
deleted file mode 100644
index be49e550..00000000
--- a/src/etc/etc.vax/MAKEDEV.md
+++ /dev/null
@@ -1,197 +0,0 @@
-define(MACHINE,vax)dnl
-vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.54 2015/10/23 15:14:12 claudio Exp $-},
-etc.MACHINE)dnl
-dnl
-dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any
-dnl purpose with or without fee is hereby granted, provided that the above
-dnl copyright notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl
-dnl *** vax specific definitions
-dnl
-__devitem(hd, hd*, {-HDC9224 disks-}, nothing)dnl
-__devitem(dz, dz*, UNIBUS DZ11 and DZ32)dnl
-_mkdev(dz, dz*,
-{-case $U in
-	[0-7])
-		i=0
-		while [ $i -lt 8 ]; do
-			no=Add(Mult($U, 8), $i)
-			if [ $no -lt 10 ]; then
-				no="0${no}"
-			fi
-			M tty${no} c 1 $no 600
-			i="$(( $i + 1 ))"
-		done
-	;;
-	*)
-		echo bad unit for dz in: $i
-		;;
-	esac-})dnl
-__devitem(dhu, dhu*, UNIBUS DHU11)dnl
-_mkdev(dhu, dhu*,
-{-set -A cnvtbl 0 1 2 3 4 5 6 7 8 9 a b c d e f
-	case $U in
-	[0-7])
-		case $U in
-		0) ch=S ;; 1) ch=T ;; 2) ch=U ;; 3) ch=V ;;
-		4) ch=W ;; 5) ch=X ;; 6) ch=Y ;; 7) ch=Z ;;
-		esac
-		i=0
-		while [ $i -lt 16 ]; do
-			let=${cnvtbl[$i]}
-			M tty${ch}${let} c major_dhu_c Add(Mult($U, 16), $i) 600
-			i="$(( $i + 1 ))"
-		done
-	;;
-	*)
-		echo bad unit for dhu in: $i
-	;;
-	esac-})dnl
-__devitem(dl, dl*, UNIBUS DL11)dnl
-_mkdev(dl, dl*,
-{-set -A cnvtbl 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
-	let=${cnvtbl[$U]}
-	if [ -n "$let" ] ;then
-		M ttyJ${let} c major_dl_c $U 600
-	else
-		echo bad unit for dl in: $i
-	fi-})dnl
-__devitem(qsc, qsc*, VXT2000 serial ports)dnl
-_mkdev(qsc, qsc*,
-{-
-	case $U in
-	0)
-		for i in 0 1 2 3; do
-			M ttyb${i} c major_qsc_c ${i} 600
-		done
-	;;
-	*)
-		echo bad unit for qsc in: $i
-	;;
-	esac-})dnl
-dnl
-dnl
-_TITLE(make)
-_DEV(all)
-_DEV(ramdisk)
-_DEV(std)
-_DEV(local)
-_TITLE(dis)
-_DEV(cd, 61, 22)
-_DEV(hd, 58, 19)
-_DEV(ra, 9, 9)
-_DEV(rd, 62, 23)
-_DEV(rx, 30, 12)
-_DEV(sd, 59, 20)
-_DEV(vnd, 55, 18)
-_TITLE(tap)
-_DEV(ch, 63)
-_DEV(mt, 38, 15)
-_DEV(st, 60, 21)
-_TITLE(term)
-_DEV(dhu, 34)
-_DEV(dl, 66)
-_DEV(dz, 1)
-_DEV(qsc, 48)
-_TITLE(pty)
-_DEV(ptm, 75)
-_DEV(pty, 21)
-_DEV(tty, 20)
-dnl _TITLE(prn)
-_TITLE(cons)
-_DEV(wsdisp, 68)
-_DEV(wscons)
-_DEV(wskbd, 69)
-_TITLE(point)
-_DEV(wsmouse, 70)
-_TITLE(spec)
-_DEV(au, 81)
-_DEV(bio, 72)
-_DEV(bpf, 56)
-_DEV(diskmap, 79)
-_DEV(fdesc, 53)
-_DEV(fuse, 82)
-_DEV(pf, 42)
-_DEV(pppx, 80)
-_DEV(rnd, 67)
-_DEV(systrace, 49)
-_DEV(tun, 57)
-_DEV(tap, 83)
-_DEV(uk, 65)
-_DEV(vscsi, 78)
-dnl
-divert(__mddivert)dnl
-dnl
-ramdisk)
-	_recurse std bpf0 bio diskmap
-	_recurse fd0 sd0 sd1 rd0 random
-	;;
-
-_std(2, 3, 50, 33)
-	M ttyg0		c 25 0 600
-	M ttyg1		c 25 1 600
-	M ttyg2		c 25 2 600
-	M ttyg3		c 25 3 600
-	;;
-
-mt*)
-	case $U in
-	[0-7])
-		four=Add($U, 4)
-		eight=Add($U, 8)
-		twelve=Add($U, 12)
-		twenty=Add($U, 20)
-		M mt$U		b 15 $U	660 operator
-		M mt$four	b 15 $four	660 operator
-		M mt$eight	b 15 $eight	660 operator
-		M mt$twelve	b 15 $twelve	660 operator
-		M nmt$U		b 15 $four	660 operator;: sanity w/pdp11 v7
-		M nmt$eight	b 15 $twelve	660 operator;: ditto
-		M nrmt$U	c 38 $four	660 operator;: ditto
-		M nrmt$eight	c 38 $twelve	660 operator;: ditto
-		M rmt$U		c 38 $U		660 operator
-		M rmt$four	c 38 $four	660 operator
-		M rmt$eight	c 38 $eight	660 operator
-		M rmt$twelve	c 38 $twelve	660 operator
-		;;
-	*)
-		echo bad unit for tape in: $i
-		;;
-	esac
-	umask 77
-	;;
-dnl
-dnl *** vax specific targets
-dnl
-twrget(all, au, audio, 0)
-target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)dnl
-target(all, pty, 0)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl
-target(all, bio)dnl
-target(all, tun, 0, 1)dnl
-target(all, tap, 0, 1)dnl
-dnl target(all, rd, 0)dnl
-target(all, cd, 0)dnl
-target(all, sd, 0, 1, 2, 3)dnl
-target(all, vnd, 0)dnl
-target(all, hd, 0, 1, 2)dnl
-target(all, mt, 0, 1)dnl
-target(all, st, 0, 1)dnl
-target(all, dhu, 0)dnl
-target(all, dz, 0)dnl
-target(all, dl, 0)dnl
-target(all, qsc, 0)dnl
diff --git a/src/etc/etc.vax/Makefile b/src/etc/etc.vax/Makefile
deleted file mode 100644
index 324bc976..00000000
--- a/src/etc/etc.vax/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
-
-all: MAKEDEV
-
-.include <bsd.prog.mk>
diff --git a/src/etc/etc.vax/Makefile.inc b/src/etc/etc.vax/Makefile.inc
deleted file mode 100644
index 83dc0236..00000000
--- a/src/etc/etc.vax/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.12 2011/07/22 09:30:54 espie Exp $
-
-bootblocks:
-	mopa.out ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot.mop
-
-MDEXT=	bsd.rd boot.mop cd${OSrev}.iso floppy${OSrev}.fs
diff --git a/src/etc/etc.vax/disktab b/src/etc/etc.vax/disktab
deleted file mode 100644
index a67955a7..00000000
--- a/src/etc/etc.vax/disktab
+++ /dev/null
@@ -1,29 +0,0 @@
-#	$OpenBSD: disktab,v 1.18 2015/08/14 23:45:56 krw Exp $
-
-bootroot|fake-type used in install boot:\
-	:dt=rdroot:se#512:nt#1:ns#512:nc#1:\
-	:pa#512:oa#0:ba#4096:fa#512:\
-	:pb#512:ob#0:bb#4096:fb#512:\
-	:pc#512:oc#0:bc#4096:fc#512:
-
-miniroot|fake-type used when installation:\
-	:dt=rdroot:se#512:nt#1:ns#2048:nc#1:\
-	:pa#4096:oa#0:ba#4096:fa#512:ta=4.2BSD:ba#4096: \
-	:pb#4096:ob#0:bb#4096:fb#512:\
-	:pc#4096:oc#0:bc#4096:fc#512:
-
-rdroot:\
-	:dt=rdroot:se#512:nt#2:ns#8:nc#192:\
-	:pa#3072:oa#0:ta=4.2BSD:ba#4096:fa#1024:\
-	:pc#3072:oc#0:
-
-floppy|floppy3|3in|3.5in High Density Floppy:\
-	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
-	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
-	:pb#2880:ob#0:\
-	:pc#2880:oc#0:
-
-isoroot:\
-	:dt=rdroot:se#512:nt#11:ns#33:nc#2200:\
-	:pa#798600:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
-	:pc#798600:oc#0:
diff --git a/src/etc/etc.vax/fbtab b/src/etc/etc.vax/fbtab
deleted file mode 100644
index d0c58313..00000000
--- a/src/etc/etc.vax/fbtab
+++ /dev/null
@@ -1 +0,0 @@
-/dev/console	0600	/dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
diff --git a/src/etc/etc.vax/login.conf b/src/etc/etc.vax/login.conf
deleted file mode 100644
index 0f98caeb..00000000
--- a/src/etc/etc.vax/login.conf
+++ /dev/null
@@ -1,107 +0,0 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
-
-#
-# Sample login.conf file.  See login.conf(5) for details.
-#
-
-#
-# Standard authentication styles:
-#
-# passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
-#		the YP password if the user has one, else change the
-#		local password)
-# lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
-# reject	Use rejected authentication
-# skey		Use S/Key authentication
-# activ		ActivCard X9.9 token authentication
-# crypto	CRYPTOCard X9.9 token authentication
-# snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
-# token		Generic X9.9 token authentication
-# yubikey	YubiKey authentication
-#
-
-# Default allowed authentication styles
-auth-defaults:auth=passwd,skey:
-
-# Default allowed authentication styles for authentication type ftp
-auth-ftp-defaults:auth-ftp=passwd:
-
-#
-# The default values
-# To alter the default authentication types change the line:
-#	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
-#	:auth=passwd,myauth,activ:\
-# Any value changed in the daemon class should be reset in default
-# class.
-#
-default:\
-	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\
-	:umask=022:\
-	:datasize-max=512M:\
-	:datasize-cur=512M:\
-	:maxproc-max=256:\
-	:maxproc-cur=128:\
-	:openfiles-cur=512:\
-	:stacksize-cur=4M:\
-	:localcipher=blowfish,8:\
-	:tc=auth-defaults:\
-	:tc=auth-ftp-defaults:
-
-#
-# Settings used by /etc/rc and root
-# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
-#
-daemon:\
-	:ignorenologin:\
-	:datasize=infinity:\
-	:maxproc=infinity:\
-	:openfiles-cur=128:\
-	:stacksize-cur=8M:\
-	:localcipher=blowfish,9:\
-	:tc=default:
-
-#
-# Staff have fewer restrictions and can login even when nologins are set.
-#
-staff:\
-	:datasize-cur=512M:\
-	:datasize-max=infinity:\
-	:maxproc-max=512:\
-	:maxproc-cur=128:\
-	:ignorenologin:\
-	:requirehome@:\
-	:tc=default:
-
-#
-# Authpf accounts get a special motd and shell
-#
-authpf:\
-	:welcome=/etc/motd.authpf:\
-	:shell=/usr/sbin/authpf:\
-	:tc=default:
-
-#
-# Building ports with DPB uses raised limits
-#
-pbuild:\
-	:datasize-max=infinity:\
-	:datasize-cur=1024M:\
-	:maxproc-max=1024:\
-	:maxproc-cur=256:\
-	:tc=default:
-
-#
-# Override resource limits for certain daemons started by rc.d(8)
-#
-bgpd:\
-	:openfiles-cur=512:\
-	:tc=daemon:
-
-unbound:\
-	:openfiles-cur=512:\
-	:tc=daemon:
diff --git a/src/etc/etc.vax/sysctl.conf b/src/etc/etc.vax/sysctl.conf
deleted file mode 100644
index 6c7da808..00000000
--- a/src/etc/etc.vax/sysctl.conf
+++ /dev/null
@@ -1 +0,0 @@
-#machdep.led_blink=1		# display a moving pattern on the machine leds
diff --git a/src/etc/etc.vax/ttys b/src/etc/etc.vax/ttys
deleted file mode 100644
index 127fffee..00000000
--- a/src/etc/etc.vax/ttys
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.6 2008/01/09 17:39:42 miod Exp $
-#
-# name	getty				type	status		comments
-#
-console	"/usr/libexec/getty std.9600"	vt220	on  secure
-# glass console
-ttyC0	"/usr/libexec/getty std.9600"	vt220	off secure
-# serial lines
-tty00	"/usr/libexec/getty std.9600"	unknown	off secure
-tty01	"/usr/libexec/getty std.9600"	unknown	off secure
-tty02	"/usr/libexec/getty std.9600"	unknown	off secure
-tty03	"/usr/libexec/getty std.9600"	unknown	off secure
-tty04	"/usr/libexec/getty std.9600"	unknown	off secure
-tty05	"/usr/libexec/getty std.9600"	unknown	off secure
-tty06	"/usr/libexec/getty std.9600"	unknown	off secure
-tty07	"/usr/libexec/getty std.9600"	unknown	off secure
diff --git a/src/etc/examples/remote b/src/etc/examples/remote
index 4fc481da..0878934a 100644
--- a/src/etc/examples/remote
+++ b/src/etc/examples/remote
@@ -1,4 +1,4 @@
-#	$OpenBSD: remote,v 1.2 2015/04/27 19:12:27 nicm Exp $
+#	$OpenBSD: remote,v 1.3 2016/03/09 16:28:46 deraadt Exp $
 #
 # Remote host descriptions -- see cu(1), cgetcap(3), tty(4), remote(5)
 #
@@ -10,7 +10,7 @@
 unixhost:\
 	:br#9600:
 
-cua00|For i386,macppc,vax:\
+cua00|For i386,macppc:\
 	:dv=/dev/cua00:tc=unixhost:
 
 cuaa|For sparc:\
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 0e10cf41..fbf2e86d 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.279 2016/03/05 16:24:56 ajacoutot Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.280 2016/03/09 16:28:46 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -483,8 +483,6 @@ usr
                 ..
                 sgi
                 ..
-                vax
-                ..
             ..
 
             # ./usr/share/man/man3p
@@ -523,8 +521,6 @@ usr
                 ..
                 sparc64
                 ..
-                vax
-                ..
                 zaurus
                 ..
             ..
@@ -591,8 +587,6 @@ usr
                 ..
                 sparc64
                 ..
-                vax
-                ..
                 zaurus
                 ..
             ..
diff --git a/src/include/Makefile b/src/include/Makefile
index a2efc56c..72a1af0d 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.209 2016/01/20 19:09:52 jasper Exp $
+#	$OpenBSD: Makefile,v 1.210 2016/03/09 16:28:46 deraadt Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -12,21 +12,14 @@
 FILES=	a.out.h ar.h asr.h assert.h bitstring.h blf.h bsd_auth.h \
 	complex.h cpio.h ctype.h curses.h db.h dbm.h dirent.h disktab.h \
 	dlfcn.h elf_abi.h err.h errno.h fenv.h float.h fnmatch.h fstab.h fts.h \
-	ftw.h getopt.h glob.h grp.h icdb.h ifaddrs.h inttypes.h iso646.h kvm.h \
-	langinfo.h libgen.h limits.h locale.h login_cap.h math.h \
-	md5.h memory.h ndbm.h netdb.h netgroup.h nlist.h nl_types.h \
-	paths.h poll.h pwd.h ranlib.h readpassphrase.h regex.h \
-	resolv.h rmd160.h search.h setjmp.h sha1.h sha2.h signal.h siphash.h \
-	sndio.h \
-	spawn.h stdbool.h stddef.h stdio.h stdlib.h string.h strings.h struct.h \
-	sysexits.h tar.h tgmath.h time.h ttyent.h unistd.h utime.h \
-	utmp.h uuid.h vis.h wchar.h wctype.h
-
-FILES+=	link.h link_elf.h
-
-.if (${MACHINE_ARCH} != "vax")
-FILES+= ieeefp.h
-.endif
+	ftw.h getopt.h glob.h grp.h icdb.h ieeefp.h ifaddrs.h inttypes.h \
+	iso646.h kvm.h langinfo.h libgen.h limits.h link.h link_elf.h \
+	locale.h login_cap.h math.h md5.h memory.h ndbm.h netdb.h netgroup.h \
+	nlist.h nl_types.h paths.h poll.h pwd.h ranlib.h readpassphrase.h \
+	regex.h resolv.h rmd160.h search.h setjmp.h sha1.h sha2.h signal.h \
+	siphash.h sndio.h spawn.h stdbool.h stddef.h stdio.h stdlib.h \
+	string.h strings.h struct.h sysexits.h tar.h tgmath.h time.h \
+	ttyent.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h
 
 MFILES=	frame.h
 LFILES=	endian.h fcntl.h syslog.h termios.h stdarg.h stdint.h varargs.h