I should back out the base files too

7 files changed, 24 insertions, 42 deletions

diff --git a/etc/MAKEDEV.mi b/etc/MAKEDEV.mi
index 74ce20d8040..3f63ad8c417 100644
--- a/etc/MAKEDEV.mi
+++ b/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.39 2002/02/21 15:06:39 todd Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.40 2002/02/21 18:36:54 deraadt Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -135,6 +135,7 @@ target(all, apm)dnl
 twrget(all, tth, ttyh, 0, 1)dnl
 target(all, ttyA, 0, 1)dnl
 target(all, ttyB, 0, 1, 2, 3, 4, 5)dnl
+twrget(all, attyB, ttyB, 0, 1, 2, 3, 4)dnl
 target(all, tty0, 0, 1, 2, 3)dnl
 twrget(all, mac_tty0, tty0, 0, 1)dnl
 twrget(all, tzs, tty, a, b, c, d)dnl
@@ -148,7 +149,7 @@ twrget(all, mmcl, mmclock)dnl
 target(all, lpt, 0, 1, 2)dnl
 twrget(all, lpt, lpa, 0, 1, 2)dnl
 target(all, joy, 0, 1)dnl
-twrget(all, rnd, random)dnl
+target(all, rnd, random)dnl
 target(all, uk, 0)dnl
 target(all, st, 0)dnl
 target(all, wt, 0)dnl
@@ -173,6 +174,7 @@ twrget(all, csx, cgsix, 0)dnl
 twrget(all, ceg, cgeight, 0)dnl
 twrget(all, cfo, cgfourteen, 0)dnl
 target(all, tcx, 0)dnl
+twrget(all, grf_mac, grf, 0, 1, 2, 3)dnl
 twrget(all, grf_amiga, grf, 0, 1, 2, 3, 4, 5, 6)dnl
 target(all, par, 0)dnl
 twrget(all, amouse, mouse, 0, 1)dnl
@@ -303,7 +305,6 @@ target(ramd, bpf, 0)dnl
 target(ramd, rd, 0)dnl
 -})dnl
 ifelse(MACHINE, sparc, {-dnl
-target(all, uk, 1)dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
@@ -324,10 +325,8 @@ 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, st, 0)dnl
 -})dnl
 ifelse(MACHINE, sparc64, {-dnl
-target(all, uk, 1)dnl
 twrget(wscons, wscons, ttyD, 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
@@ -375,8 +374,6 @@ _mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
 -})dnl
 ifelse(MACHINE, i386, {-dnl
-target(all, bktr, 0)dnl
-target(all, uk, 1)dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
@@ -393,18 +390,17 @@ 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
-target(ramd, wd, 0, 1, 2, 3)dnl
-target(ramd, sd, 0, 1, 2, 3)dnl
-target(ramd, mcd, 0)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, uk, 1)dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
@@ -429,8 +425,6 @@ target(ramd, ttyB, 0, 1)dnl
 target(ramd, ttyE, 0, 1)dnl
 -})dnl
 ifelse(MACHINE, amiga, {-dnl
-target(all, cuaB, 5, 6, 7, 8, 9)dnl
-target(all, uk, 1)dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
@@ -446,9 +440,6 @@ 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(all, tty0, 1, 2, 3)dnl
-target(all, view, 00, 01, 02, 03, 04, 05)dnl
-twrget(all, attyB, ttyB, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
 target(ramd, kbd)dnl
 target(ramd, pty, 0)dnl
 target(ramd, tty0, 0)dnl
@@ -551,8 +542,6 @@ target(ramd, bpf, 0, 1)dnl
 target(ramd, tun, 0, 1)dnl
 -})dnl
 ifelse(MACHINE, mac68k, {-dnl
-twrget(all, grf_mac, grf, 0, 1, 2, 3)dnl
-target(all, uk, 1)dnl
 target(all, ses, 0)dnl
 target(all, sd, 0, 1, 2, 3, 4)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
@@ -568,14 +557,12 @@ 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
-twrget(all, grf_mac, grf, 0, 1)dnl
-twrget(ramd, mac_ttye, ttye, 0)dnl
-target(ramd, cd, 0, 1)dnl
 target(ramd, sd, 0, 1, 2, 3)dnl
 target(ramd, st, 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
@@ -595,18 +582,16 @@ 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, wd, 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
-twrget(ramd, rnd, random)dnl
 -})dnl
 ifelse(MACHINE, sun3, {-
-target(all, uk, 1)dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
 target(all, ss, 0, 1)dnl
@@ -1231,7 +1216,6 @@ dnl
 dnl non multi mknod
 dnl
 	[ "${mklist[{-$-}1]}" ] && {
-dnl		[ "$DEBUG" ] && echo "mknod -m {-$-}1 {-$-}2 {-$-}3 {-$-}4 {-$-}5"
 		mklist[{-$-}1]="${mklist[{-$-}1]};mknod -m {-$-}1 {-$-}2 {-$-}3 {-$-}4 {-$-}5"
 	} || {
 		mklist[{-$-}1]="mknod -m {-$-}1 {-$-}2 {-$-}3 {-$-}4 {-$-}5"
diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md
index 8f0e0c8729e..907a0d06995 100644
--- a/etc/etc.alpha/MAKEDEV.md
+++ b/etc/etc.alpha/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/02/21 13:03:50 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.10 2002/02/21 18:36:55 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -89,7 +89,7 @@ dnl
 divert(7)dnl
 dnl
 ramdisk)
-	_recurse std fd0 wd0 sd0 sd1 sd2
+	_recurse std fd0 wd0 wd1 sd0 sd1
 	_recurse st0 cd0 ttyC0 random rd0
 	;;
 
diff --git a/etc/etc.amiga/MAKEDEV.md b/etc/etc.amiga/MAKEDEV.md
index cec518f9f27..3e607a644d0 100644
--- a/etc/etc.amiga/MAKEDEV.md
+++ b/etc/etc.amiga/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.6 2002/02/21 13:04:18 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.7 2002/02/21 18:36:55 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -73,7 +73,6 @@ _DEV(xfs, 51)
 _DEV(ch, 40)
 _DEV(altq, 52)
 _DEV(fdesc, 21)
-_DEV(view, 16)
 dnl
 divert(7)dnl
 dnl
diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md
index 5c657e09844..ea3431b776d 100644
--- a/etc/etc.hppa/MAKEDEV.md
+++ b/etc/etc.hppa/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.5 2002/02/21 13:06:48 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.6 2002/02/21 18:36:55 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -47,6 +47,7 @@ _TITLE(prn)
 _DEV(lpt, 30)
 _TITLE(call)
 _TITLE(spec)
+_DEV(hil)
 _DEV(fdesc, 16)
 _DEV(bpf, 17)
 _DEV(tun, 18)
@@ -65,7 +66,8 @@ divert(7)dnl
 dnl
 ramdisk)
 	_recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0
-	_recurse pty0 bpf0 bpf1 tun0 tun1 lkm random
+	_recurse pty0 hil com0 com1
+	_recurse bpf0 bpf1 tun0 tun1 lkm random
 	;;
 
 _std(1, 2, 29, 3, 6)
diff --git a/etc/etc.i386/MAKEDEV.md b/etc/etc.i386/MAKEDEV.md
index e32ffe0bc0b..1efe4319b20 100644
--- a/etc/etc.i386/MAKEDEV.md
+++ b/etc/etc.i386/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.8 2002/02/21 15:02:33 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/02/21 18:36:55 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -41,7 +41,7 @@ _DEV(sd, 13, 4)
 _DEV(cd, 15, 6)
 _DEV(mcd, 39, 7)
 _DEV(vnd, 41, 14)
-_DEV(rd, 47, 17)
+_DEV(rd, 17, 17)
 _DEV(ccd, 18, 16)
 _DEV(raid, 54, 19)
 _TITLE(cons)
@@ -103,8 +103,8 @@ dnl
 divert(7)dnl
 dnl
 ramdisk)
-	_recurse std bpf0 fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 random
-	_recurse tty00 tty01 rd0 st0 st1 cd0 cd1 ttyC0
+	_recurse std bpf0 fd0 wd0 wd1 sd0 sd1 tty00 tty01 rd0
+	_recurse st0 cd0 ttyC0 random
 	;;
 
 _std(1, 2, 50, 4, 7)
diff --git a/etc/etc.sun3/MAKEDEV.md b/etc/etc.sun3/MAKEDEV.md
index 1986b47b1ef..ee989d571bc 100644
--- a/etc/etc.sun3/MAKEDEV.md
+++ b/etc/etc.sun3/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.3 2002/02/21 13:09:03 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.4 2002/02/21 18:36:55 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -69,9 +69,6 @@ test -d /usr/etc && PATH=$PATH:/usr/etc
 dnl
 divert(7)dnl
 dnl
-ramdisk)
-	R std random bpf0 sd0 sd1 rd0
-	;;
 _std(2, 3, 37, 7, 16)
 	M kd		c 1 0 600
 	M eeprom	c 3 11 640 kmem
diff --git a/etc/etc.vax/MAKEDEV.md b/etc/etc.vax/MAKEDEV.md
index 10a5e4ac33c..f2baf5d87b0 100644
--- a/etc/etc.vax/MAKEDEV.md
+++ b/etc/etc.vax/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.8 2002/02/21 13:17:30 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.9 2002/02/21 18:36:55 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -83,8 +83,8 @@ dnl
 divert(7)dnl
 dnl
 ramdisk)
-	_recurse std random st0 st1 rx0 bpf0 rd0
-	_recurse sd0 sd1 sd2 sd3 cd0 ra0 ra1 ra2
+	_recurse std random
+	_recurse fd0 sd0 sd1 rd0
 	;;
 
 _std(2, 3, 50, 7, 33)