diff --git a/src/etc/MAKEDEV.mi b/src/etc/MAKEDEV.mi
index b3cd75d0..f92487e3 100644
--- a/src/etc/MAKEDEV.mi
+++ b/src/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.51 2002/08/29 23:43:16 todd Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.52 2002/10/16 15:48:31 todd Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -301,457 +301,6 @@ __devitem(ramd, ramdisk, makes all devices for a ramdisk kernel)dnl arc
 _mkdev(ramd, ramdisk, {-dnl
 show_target(ramd)dnl
 -})dnl
-ifelse(MACHINE, mvmeppc, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, tty0, 0, 1, 2, 3)dnl
-twrget(ramd, wsdisp, ttyC, 0)dnl
-target(ramd, rd, 0)dnl
-target(ramd, wd, 0, 1, 2, 3)dnl
-target(ramd, sd, 0, 1, 2, 3, 4)dnl
-target(ramd, cd, 0, 1)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, bpf, 0)dnl
-target(ramd, rd, 0)dnl
--})dnl
-ifelse(MACHINE, sparc, {-dnl
-twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, hk, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, fd, 0)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, rd, 0)dnl
-target(ramd, cd, 0)dnl
--})dnl
-ifelse(MACHINE, sparc64, {-dnl
-twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(ramd, fd, 0)dnl
-target(ramd, rd, 0)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, wd, 0, 1, 2, 3)dnl
-target(ramd, cd, 0, 1)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, bpf, 0)dnl
-twrget(all, s64_tzs, tty, a, b, c, d)dnl
-twrget(all, s64_czs, cua, a, b, c, d)dnl
-__devitem(s64_tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
-__devitem(s64_czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
-_mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown tty device $i ;;
-	esac
-	M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl
-_mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown cua device $i ;;
-	esac
-	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
--})dnl
-ifelse(MACHINE, i386, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(all, bktr, 0)dnl
-target(ramd, tty0, 0, 1, 2, 3)dnl
-twrget(ramd, wsdisp, ttyC, 0)dnl
-target(ramd, wt, 0)dnl
-target(ramd, fd, 0)dnl
-target(ramd, rd, 0)dnl
-target(ramd, wd, 0, 1, 2, 3)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, cd, 0, 1)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, mcd, 0)dnl
--})dnl
-ifelse(MACHINE, alpha, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, sd, 0, 1, 2)dnl
-target(ramd, wd, 0)dnl
-target(ramd, tty0, 0, 1)dnl
-target(ramd, st, 0)dnl
-target(ramd, cd, 0)dnl
-target(ramd, ttyB, 0, 1)dnl
-target(ramd, ttyE, 0, 1)dnl
--})dnl
-ifelse(MACHINE, amiga, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, kbd)dnl
-target(ramd, pty, 0)dnl
-target(ramd, tty0, 0)dnl
-target(ramd, ttyA, 0, 1)dnl
-target(ramd, ttyB, 0, 1)dnl
-target(ramd, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
-target(ramd, cd, 0, 1)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, fd, 0, 1)dnl
-target(ramd, wd, 0, 1)dnl
-target(ramd, rd, 0)dnl
--})dnl
-ifelse(MACHINE, hp300, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-_mkdev(st_hp300, ct*|mt*|st*,
-{-case $i in
-	ct*) name=ct blk=major_ct_b chr=major_ct_c;;
-	mt*) name=mt blk=major_mt_b chr=major_mt_c;;
-	st*) name=st blk=major_st_hp300_b chr=major_st_hp300_c;;
-	esac
-	case $U in
-	[0-7])
-		four=Add($U, 4) eight=Add($U, 8)
-		twelve=Add($U, 12) twenty=Add($U, 20)
-		M r$name$U	c $chr $U 660 operator
-		M r$name$four	c $chr $four 660 operator
-		M r$name$eight	c $chr $eight 660 operator
-		M r$name$twelve	c $chr $twelve 660 operator
-		MKlist="$MKlist;ln r$name$four nr$name$U";: sanity w/pdp11 v7
-		MKlist="$MKlist;ln r$name$twelve nr$name$eight";: ditto
-		RMlist="$RMlist nr$name$U nr$name$eight"
-		;;
-	*)
-		echo bad unit for tape in: $1
-		;;
-	esac-})dnl
-__devitem(st_hp300, st*, Exabyte tape)dnl
-__devitem(grf, grf*, raw interface to HP300 graphics devices)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target( all, grf, 0)dnl
-dnl XXX target( all, hil, 0, 1, 2, 3, 4, 5, 6, 7)dnl
-target( all, hil, )dnl
-twrget( all, st_hp300, st, 0, 1)dnl
-target( all, dca, 0, 1)dnl
-target( all, dcm, 0, 1, 2, 3)dnl
-target( all, hd, 0, 1, 2)dnl
-target( all, ct, 0, 1)dnl
-target( all, ite, 0)dnl
-target(ramd, ct, 0, 1)dnl
-target(ramd, hd, 0, 1, 2)dnl
-target(ramd, sd, 0, 1, 2)dnl
-target(ramd, rd, 0, 1)dnl
-target(ramd, pty, 0)dnl
-target(ramd, hil, )dnl
-target(ramd, grf, 0)dnl
-target(ramd, apci, 0)dnl
-target(ramd, ite, 0)dnl
-target(ramd, dca, 0)dnl
-target(ramd, dcm, 0, 1)dnl
-target(ramd, bpf, 0, 1)dnl
-target(ramd, tun, 0, 1)dnl
--})dnl
-ifelse(MACHINE, hppa, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, rd, 0, 1)dnl
-target(ramd, pty, 0)dnl
-target(ramd, hil)dnl
-target(ramd, com, 0, 1)dnl
-target(ramd, bpf, 0, 1)dnl
-target(ramd, tun, 0, 1)dnl
--})dnl
-ifelse(MACHINE, mac68k, {-dnl
-target(all, ses, 0)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, rd, 0, 1)dnl
-target(ramd, adb)dnl
-target(ramd, asc, 0)dnl
-target(ramd, grf, 0, 1)dnl
-target(ramd, ttye, 0)dnl
-twrget(ramd, mac_tty0, tty0, 0, 1)dnl
-target(ramd, pty, 0)dnl
--})dnl
-ifelse(MACHINE, macppc, {-dnl
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
-target(ramd, sd, 0, 1, 2, 3, 4)dnl
-target(ramd, wd, 0, 1, 2, 3, 4)dnl
-target(ramd, st, 0, 1)dnl
-target(ramd, cd, 0, 1)dnl)dnl
-target(ramd, rd, 0)dnl
-target(ramd, ttyE, 0)dnl
-target(ramd, tty0, 0, 1)dnl
-target(ramd, pty, 0)dnl
--})dnl
-ifelse(MACHINE, sun3, {-
-target(all, ses, 0)dnl
-target(all, ch, 0)dnl
-target(all, ss, 0, 1)dnl
-target(all, xfs, 0)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0, 1, 2)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, hk, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
--})dnl
-ifelse(MACHINE, vax, {-
-dnl target(all, ses, 0)dnl
-dnl target(all, ut, 0)dnl
-dnl target(all, ch, 0)dnl
-target(all, ss, 0)dnl
-dnl target(all, xfs, 0)dnl
-target(all, pty, 0, 1)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl
-target(all, tun, 0, 1)dnl
-dnl target(all, xy, 0, 1, 2, 3)dnl
-dnl target(all, hk, 0, 1, 2, 3)dnl
-dnl target(all, up, 0, 1, 2, 3)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
-__devitem(dhu, dhu*, unibus dhu11)dnl
-__devitem(dmz, dmz*, unibus dmz32)dnl
-__devitem(dmf, dmf*, unibus dmf32)dnl
-__devitem(dh, dh*, {-unibus dh11 and emulations (e.g. Able dmax, Emulex cs-11)-})
-__devitem(vt, vt*, {-console-})dnl
-__devitem(dz, dz*, unibus dz11 and dz32)dnl
-__devitem(dl, dl*, unibus dl11)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
-		       let i=i+1
-	       done
-	       ;;
-	*)
-	       echo bad unit for dz in: $i
-	       ;;
-       esac-})dnl
-dnl XXX split this up abit?
-_mkdev(dhu, dhu*|dmz*|dmf*|dh*|vt*,
-{-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
-	case $i in
-	vt*)    name=vt; major=68; count=8;
-		case $U in
-		0) ch=w ;;
-		*) echo bad unit for $name in: $i ;;
-		esac;;
-	dmz*)   name=dmz; major=37; count=24;
-		case $U in
-		0) ch=a ;; 1) ch=b ;; 2) ch=c ;; 3) ch=e ;; 4) ch=f ;;
-		*) echo bad unit for $name in: $i ;;
-		esac;;
-	dmf*)   name=dmf; major=22; count=8;
-		case $U in
-		0) ch=A ;; 1) ch=B ;; 2) ch=C ;; 3) ch=E ;;
-		4) ch=F ;; 5) ch=G ;; 6) ch=H ;; 7) ch=I ;;
-		*) echo bad unit for $name in: $i ;;
-		esac;;
-	dhu*)   name=dhu; major=34; count=16;
-		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 ;;
-		*) echo bad unit for $name in: $i ;;
-		esac;;
-	dh*)    name=dh; major=12; count=16;
-		case $U in
-		0) ch=h ;; 1) ch=i ;; 2) ch=j ;; 3) ch=k ;;
-		4) ch=l ;; 5) ch=m ;; 6) ch=n ;; 7) ch=o ;;
-		*) echo bad unit for $name in: $i ;;
-		esac;;
-	esac
-	i=0
-	while [ $i -lt $count ]; do
-		let=${cnvtbl[$i]}
-		if [ -n "$let" ] ;then
-			M tty${ch}${let} c $major Add(Mult($U, $count), $i) 600
-		else
-			echo bad count for ${name}: $U, $count, $i
-		fi
-		let i=i+1
-	done
-	;;
-
-dl*)
-	major=66
-	let=${cnvtbl[$U]}
-	if [ -n "$let" ] ;then
-		M ttyJ${let} c $major $U 600
-	else
-		echo bad number for ${name}: $U
-	fi-})dnl
-dnl
-target( all, ccd, 0)dnl
-target( all, hd, 0, 1, 2)dnl
-target( all, mt, 0, 1)dnl
-target( all, ts, 0, 1)dnl
-target( all, uu, 0)dnl
-target( all, st, 0, 1)dnl
-target( all, dhu, 0)dnl
-dnl target( all, dmz, 0)dnl
-dnl target( all, dmf, 0)dnl
-dnl target( all, dh, 0)dnl
-target( all, dz, 0)dnl
-target( all, dl, 0)dnl
-target( all, vt, 0)dnl
-target(ramd, fd, 0)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, rd, 0)dnl
-target(ramd, cd, 0)dnl
-target(ramd, bpf, 0)dnl
--})dnl
 target(ramd, std)dnl
 target(ramd, random)dnl
 target(ramd, bpf, 0)dnl
diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md
index b4926313..1000dcd7 100644
--- a/src/etc/etc.alpha/MAKEDEV.md
+++ b/src/etc/etc.alpha/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.13 2002/08/24 17:21:44 matthieu Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.14 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -111,3 +111,28 @@ ttyB*|ttyc*)
 mmclock)
 	M mmclock c 28 0 444
 	;;
+dnl
+dnl *** alpha specific targets
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2)dnl
+target(ramd, wd, 0)dnl
+target(ramd, tty0, 0, 1)dnl
+target(ramd, st, 0)dnl
+target(ramd, cd, 0)dnl
+target(ramd, ttyB, 0, 1)dnl
+target(ramd, ttyE, 0, 1)dnl
diff --git a/src/etc/etc.amiga/MAKEDEV.md b/src/etc/etc.amiga/MAKEDEV.md
index daa725da..46bd321e 100644
--- a/src/etc/etc.amiga/MAKEDEV.md
+++ b/src/etc/etc.amiga/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/06/09 06:15:14 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.10 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -163,3 +163,33 @@ ttyB*)
 	M ttyB$U c 32 $U 660 dialer uucp
 	M cuaB$U c 32 Add($U, 128) 660 dialer uucp
 	;;
+dnl
+dnl *** amiga specific device targets
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, kbd)dnl
+target(ramd, pty, 0)dnl
+target(ramd, tty0, 0)dnl
+target(ramd, ttyA, 0, 1)dnl
+target(ramd, ttyB, 0, 1)dnl
+target(ramd, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, fd, 0, 1)dnl
+target(ramd, wd, 0, 1)dnl
+target(ramd, rd, 0)dnl
diff --git a/src/etc/etc.hp300/MAKEDEV.md b/src/etc/etc.hp300/MAKEDEV.md
index c3708e32..c600e924 100644
--- a/src/etc/etc.hp300/MAKEDEV.md
+++ b/src/etc/etc.hp300/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/09/06 21:48:34 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.10 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -24,6 +24,33 @@ dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 dnl
+dnl *** hp300 specific device scripts/descriptions
+dnl
+_mkdev(st_hp300, ct*|mt*|st*,
+{-case $i in
+	ct*) name=ct blk=major_ct_b chr=major_ct_c;;
+	mt*) name=mt blk=major_mt_b chr=major_mt_c;;
+	st*) name=st blk=major_st_hp300_b chr=major_st_hp300_c;;
+	esac
+	case $U in
+	[0-7])
+		four=Add($U, 4) eight=Add($U, 8)
+		twelve=Add($U, 12) twenty=Add($U, 20)
+		M r$name$U	c $chr $U 660 operator
+		M r$name$four	c $chr $four 660 operator
+		M r$name$eight	c $chr $eight 660 operator
+		M r$name$twelve	c $chr $twelve 660 operator
+		MKlist="$MKlist;ln r$name$four nr$name$U";: sanity w/pdp11 v7
+		MKlist="$MKlist;ln r$name$twelve nr$name$eight";: ditto
+		RMlist="$RMlist nr$name$U nr$name$eight"
+		;;
+	*)
+		echo bad unit for tape in: $1
+		;;
+	esac-})dnl
+__devitem(st_hp300, st*, Exabyte tape)dnl
+__devitem(grf, grf*, raw interface to HP300 graphics devices)dnl
+dnl
 dnl
 _TITLE(make)
 _DEV(all)
@@ -166,3 +193,41 @@ hil)
 	MKlist="$MKlist;ln hil3 locator"
 	RMlist="$RMlist keyboard locator"
 	;;
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target( all, grf, 0)dnl
+dnl XXX target( all, hil, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+target( all, hil, )dnl
+twrget( all, st_hp300, st, 0, 1)dnl
+target( all, dca, 0, 1)dnl
+target( all, dcm, 0, 1, 2, 3)dnl
+target( all, hd, 0, 1, 2)dnl
+target( all, ct, 0, 1)dnl
+target( all, ite, 0)dnl
+target(ramd, ct, 0, 1)dnl
+target(ramd, hd, 0, 1, 2)dnl
+target(ramd, sd, 0, 1, 2)dnl
+target(ramd, rd, 0, 1)dnl
+target(ramd, pty, 0)dnl
+target(ramd, hil, )dnl
+target(ramd, grf, 0)dnl
+target(ramd, apci, 0)dnl
+target(ramd, ite, 0)dnl
+target(ramd, dca, 0)dnl
+target(ramd, dcm, 0, 1)dnl
+target(ramd, bpf, 0, 1)dnl
+target(ramd, tun, 0, 1)dnl
diff --git a/src/etc/etc.hppa/MAKEDEV.md b/src/etc/etc.hppa/MAKEDEV.md
index a0e89e3e..70689349 100644
--- a/src/etc/etc.hppa/MAKEDEV.md
+++ b/src/etc/etc.hppa/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/10/01 21:10:43 mickey Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.10 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -74,3 +74,29 @@ ramdisk)
 
 _std(1, 2, 29, 3, 6)
 	;;
+dnl
+dnl *** hppa specific devices
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0, 1)dnl
+target(ramd, pty, 0)dnl
+target(ramd, hil)dnl
+target(ramd, com, 0, 1)dnl
+target(ramd, bpf, 0, 1)dnl
+target(ramd, tun, 0, 1)dnl
diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md
index 66eaad9e..162bccf4 100644
--- a/src/etc/etc.i386/MAKEDEV.md
+++ b/src/etc/etc.i386/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.14 2002/06/18 00:33:00 fgsch Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.15 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -126,3 +126,32 @@ mouse*)
 	RMlist="$RMlist mouse"
 	MKlist="$MKlist;ln -s $name mouse"
 	;;
+dnl
+dnl i386 specific targets
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(all, bktr, 0)dnl
+target(ramd, tty0, 0, 1, 2, 3)dnl
+twrget(ramd, wsdisp, ttyC, 0)dnl
+target(ramd, wt, 0)dnl
+target(ramd, fd, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, mcd, 0)dnl
diff --git a/src/etc/etc.mac68k/MAKEDEV.md b/src/etc/etc.mac68k/MAKEDEV.md
index 19d33e17..2eff2c08 100644
--- a/src/etc/etc.mac68k/MAKEDEV.md
+++ b/src/etc/etc.mac68k/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.8 2002/05/16 21:11:20 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -105,3 +105,30 @@ adb)
 asc*)
         M asc$U c 36 $U
         ;;
+dnl
+dnl *** mac68k specific targets
+dnl
+target(all, ses, 0)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, rd, 0, 1)dnl
+target(ramd, adb)dnl
+target(ramd, asc, 0)dnl
+target(ramd, grf, 0, 1)dnl
+target(ramd, ttye, 0)dnl
+twrget(ramd, mac_tty0, tty0, 0, 1)dnl
+target(ramd, pty, 0)dnl
diff --git a/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md
index 4438a7ef..c5214fe6 100644
--- a/src/etc/etc.macppc/MAKEDEV.md
+++ b/src/etc/etc.macppc/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.7 2002/05/16 21:11:20 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.8 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -94,3 +94,29 @@ ttyE*)
 	esac
 	M tty$type$unit c $major $minor 660
 	;;
+dnl
+dnl *** macppc specific targets
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3, 4)dnl
+target(ramd, wd, 0, 1, 2, 3, 4)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, cd, 0, 1)dnl)dnl
+target(ramd, rd, 0)dnl
+target(ramd, ttyE, 0)dnl
+target(ramd, tty0, 0, 1)dnl
+target(ramd, pty, 0)dnl
diff --git a/src/etc/etc.mvmeppc/MAKEDEV.md b/src/etc/etc.mvmeppc/MAKEDEV.md
index 7bfcedb9..c246a88e 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV.md
+++ b/src/etc/etc.mvmeppc/MAKEDEV.md
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV.md,v 1.7 2002/06/09 06:15:14 todd Exp $
+#	$OpenBSD: MAKEDEV.md,v 1.8 2002/10/16 15:48:31 todd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -514,4 +514,30 @@ altq)
 	echo $i: unknown device
 esac
 done
-
+dnl
+dnl *** mvmeppc specific devices
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, tty0, 0, 1, 2, 3)dnl
+twrget(ramd, wsdisp, ttyC, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3, 4)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, bpf, 0)dnl
+target(ramd, rd, 0)dnl
diff --git a/src/etc/etc.sparc/MAKEDEV.md b/src/etc/etc.sparc/MAKEDEV.md
index b15a38a2..ea33666a 100644
--- a/src/etc/etc.sparc/MAKEDEV.md
+++ b/src/etc/etc.sparc/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.14 2002/08/12 10:45:06 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.15 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -28,8 +28,6 @@ dnl
 dnl
 dnl *** some sparc-specific devices
 dnl
-twrget(all, s64_tzs, tty, a, b, c, d)dnl
-twrget(all, s64_czs, cua, a, b, c, d)dnl
 __devitem(s64_tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
 __devitem(s64_czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
 _mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
@@ -119,3 +117,31 @@ _std(2, 3, 122, 7, 16)
 	M eeprom	c 3 11	640 kmem
 	M openprom	c 70 0	640 kmem
 	;;
+dnl
+dnl *** some sparc-specific targets
+dnl
+twrget(all, s64_tzs, tty, a, b, c, d)dnl
+twrget(all, s64_czs, cua, a, b, c, d)dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, hk, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, fd, 0)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0)dnl
+target(ramd, cd, 0)dnl
+twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
diff --git a/src/etc/etc.sparc64/MAKEDEV.md b/src/etc/etc.sparc64/MAKEDEV.md
index 0ed41153..30ea93e7 100644
--- a/src/etc/etc.sparc64/MAKEDEV.md
+++ b/src/etc/etc.sparc64/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.23 2002/07/31 16:47:50 jason Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.24 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -24,6 +24,28 @@ dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 dnl
+dnl *** sparc64 specific definitions
+dnl
+__devitem(s64_tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
+__devitem(s64_czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
+_mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
+	case $u in
+	a) n=0 ;;
+	b) n=1 ;;
+	c) n=2 ;;
+	d) n=3 ;;
+	*) echo unknown tty device $i ;;
+	esac
+	M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl
+_mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
+	case $u in
+	a) n=0 ;;
+	b) n=1 ;;
+	c) n=2 ;;
+	d) n=3 ;;
+	*) echo unknown cua device $i ;;
+	esac
+	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
 dnl
 _TITLE(make)
 __devitem(uperf, uperf, performance counters)dnl
@@ -117,3 +139,33 @@ mouse*)
 	RMlist="$RMlist mouse"
 	MKlist="$MKlist;ln -s $name mouse"
 	;;
+dnl
+dnl *** sparc64 specific targets
+dnl
+twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+twrget(wscons, wscons, ttyE, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+twrget(wscons, wscons, ttyF, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(ramd, fd, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, bpf, 0)dnl
+twrget(all, s64_tzs, tty, a, b, c, d)dnl
+twrget(all, s64_czs, cua, a, b, c, d)dnl
diff --git a/src/etc/etc.sun3/MAKEDEV.md b/src/etc/etc.sun3/MAKEDEV.md
index e61b6a32..b3d184a8 100644
--- a/src/etc/etc.sun3/MAKEDEV.md
+++ b/src/etc/etc.sun3/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.8 2002/06/09 06:15:15 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -89,3 +89,22 @@ _std(2, 3, 37, 7, 16)
 	M vme32d32	c 3 10 600; MKlist="$MKlist;ln -s vme32d32 vme32"
 	RMlist="$RMlist vme16 vme24 vme32"
 	;;
+dnl
+dnl *** sun3 specific targets
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, hk, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
diff --git a/src/etc/etc.vax/MAKEDEV.md b/src/etc/etc.vax/MAKEDEV.md
index 080bc871..4245d4a7 100644
--- a/src/etc/etc.vax/MAKEDEV.md
+++ b/src/etc/etc.vax/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.10 2002/05/16 21:11:21 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.11 2002/10/16 15:48:31 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -25,6 +25,87 @@ dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 dnl
 dnl
+dnl *** vax specific definitions
+dnl
+__devitem(dhu, dhu*, unibus dhu11)dnl
+__devitem(dmz, dmz*, unibus dmz32)dnl
+__devitem(dmf, dmf*, unibus dmf32)dnl
+__devitem(dh, dh*, {-unibus dh11 and emulations (e.g. Able dmax, Emulex cs-11)-})
+__devitem(vt, vt*, {-console-})dnl
+__devitem(dz, dz*, unibus dz11 and dz32)dnl
+__devitem(dl, dl*, unibus dl11)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
+		       let i=i+1
+	       done
+	       ;;
+	*)
+	       echo bad unit for dz in: $i
+	       ;;
+       esac-})dnl
+dnl XXX split this up abit?
+_mkdev(dhu, dhu*|dmz*|dmf*|dh*|vt*,
+{-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
+	case $i in
+	vt*)    name=vt; major=68; count=8;
+		case $U in
+		0) ch=w ;;
+		*) echo bad unit for $name in: $i ;;
+		esac;;
+	dmz*)   name=dmz; major=37; count=24;
+		case $U in
+		0) ch=a ;; 1) ch=b ;; 2) ch=c ;; 3) ch=e ;; 4) ch=f ;;
+		*) echo bad unit for $name in: $i ;;
+		esac;;
+	dmf*)   name=dmf; major=22; count=8;
+		case $U in
+		0) ch=A ;; 1) ch=B ;; 2) ch=C ;; 3) ch=E ;;
+		4) ch=F ;; 5) ch=G ;; 6) ch=H ;; 7) ch=I ;;
+		*) echo bad unit for $name in: $i ;;
+		esac;;
+	dhu*)   name=dhu; major=34; count=16;
+		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 ;;
+		*) echo bad unit for $name in: $i ;;
+		esac;;
+	dh*)    name=dh; major=12; count=16;
+		case $U in
+		0) ch=h ;; 1) ch=i ;; 2) ch=j ;; 3) ch=k ;;
+		4) ch=l ;; 5) ch=m ;; 6) ch=n ;; 7) ch=o ;;
+		*) echo bad unit for $name in: $i ;;
+		esac;;
+	esac
+	i=0
+	while [ $i -lt $count ]; do
+		let=${cnvtbl[$i]}
+		if [ -n "$let" ] ;then
+			M tty${ch}${let} c $major Add(Mult($U, $count), $i) 600
+		else
+			echo bad count for ${name}: $U, $count, $i
+		fi
+		let i=i+1
+	done
+	;;
+
+dl*)
+	major=66
+	let=${cnvtbl[$U]}
+	if [ -n "$let" ] ;then
+		M ttyJ${let} c $major $U 600
+	else
+		echo bad number for ${name}: $U
+	fi-})dnl
+dnl
+dnl
 _TITLE(make)
 _DEV(all)
 _DEV(std)
@@ -140,3 +221,39 @@ ht*|tm*|mt*|ts*|ut*)
 	esac
 	umask 77
 	;;
+dnl
+dnl *** vax specific targets
+dnl
+dnl target(all, ses, 0)dnl
+dnl target(all, ut, 0)dnl
+dnl target(all, ch, 0)dnl
+target(all, ss, 0)dnl
+dnl target(all, xfs, 0)dnl
+target(all, pty, 0, 1)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+target(all, tun, 0, 1)dnl
+dnl target(all, xy, 0, 1, 2, 3)dnl
+dnl target(all, hk, 0, 1, 2, 3)dnl
+dnl target(all, up, 0, 1, 2, 3)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, ccd, 0)dnl
+target( all, hd, 0, 1, 2)dnl
+target( all, mt, 0, 1)dnl
+target( all, ts, 0, 1)dnl
+target( all, uu, 0)dnl
+target( all, st, 0, 1)dnl
+target( all, dhu, 0)dnl
+dnl target( all, dmz, 0)dnl
+dnl target( all, dmf, 0)dnl
+dnl target( all, dh, 0)dnl
+target( all, dz, 0)dnl
+target( all, dl, 0)dnl
+target( all, vt, 0)dnl
+target(ramd, fd, 0)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0)dnl
+target(ramd, cd, 0)dnl
+target(ramd, bpf, 0)dnl