MAKEDEV.8 improvement pack:

- refer to the section 4 manual page for every device target, whenever
possible
- repair a few minor quoting errors
- repair a few sorting errors
- fix a few device descriptions (ideally they would be synched with the
  .Nd line of their manpages, but we are not there... yet)
- minor mdoc fixes

Thanks to jmc@ for review and a lot of constructive criticism.

10 files changed, 80 insertions, 78 deletions

diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index 4ba7bee5e2f..f90ae1302ec 100644
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.2 2004/02/17 11:18:03 miod Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.3 2004/02/20 19:13:01 miod Exp $-})dnl
 divert(1)dnl
 dnl
 dnl Common device definitions.
@@ -172,7 +172,7 @@ show_target(all)dnl
 -})dnl
 dnl
 dnl XXX some arches use ramd, others ramdisk - needs to be fixed eventually
-__devitem(ramdisk, ramdisk, Ramdisk kernel devices)dnl
+__devitem(ramdisk, ramdisk, Ramdisk kernel devices,nothing)dnl
 dnl
 target(usb, usb, 0, 1)dnl
 target(usb, urio, 0)dnl
@@ -182,12 +182,12 @@ target(usb, ulpt, 0, 1)dnl
 target(usb, ugen, 0, 1)dnl
 target(usb, ttyU, 0, 1)dnl
 dnl
-__devitem({-usbs-}, usbs, All USB devices)dnl
+__devitem({-usbs-}, usbs, All USB devices,usb)dnl
 _mkdev(usbs, usbs, {-dnl
 show_target({-usb-})dnl
 -})dnl
 __devtitle(tap, Tapes)dnl
-__devitem(wt, {-wt*	-}, Archive/Wangtek QIC-cartridge tape drives)dnl
+__devitem(wt, {-wt*-}, Archive/Wangtek QIC-cartridge tape drives)dnl
 _mkdev(wt, wt*,
 {-name=wt
 	n=Mult($U, 8) m=Add($n, 4)
@@ -211,12 +211,10 @@ __devitem(tm, tm*, UNIBUS TM11 and TE10 emulations (e.g. Emulex TC-11))dnl
 __devitem(ts, ts*, UNIBUS TS11)dnl
 __devitem(ut, ut*, UNIBUS TU45 emulations (e.g. 9700))dnl
 __devtitle(dis, Disks)dnl
-dnl REMOVE __devitem(rz, rz*, SCSI disks)dnl
-__devitem(sd, {-sd*-}, {-SCSI disks, includes flopticals-})dnl
-__devitem(cd, {-cd*-}, SCSI cdrom drives)dnl
-__devitem(acd, acd*, ATAPI cdrom drives)dnl
+__devitem(sd, {-sd*-}, {-SCSI disks{-,-} including flopticals-})dnl
+__devitem(cd, {-cd*-}, ATAPI and SCSI CD-ROM drives)dnl
 _mkdev(cd, cd*, {-dodisk2 cd $U major_cd_b major_cd_c $U 0{--}ifstep(cd)-})dnl
-__devitem(mcd, mcd*, Mitsumi cdrom drives)dnl
+__devitem(mcd, mcd*, Mitsumi CD-ROM drives)dnl
 _mkdev(mcd, mcd*, {-dodisk2 mcd $U major_mcd_b major_mcd_c $U 0{--}ifstep(mcd)dnl
 -})dnl
 __devitem(ch, {-ch*-}, SCSI media changers)dnl
@@ -232,7 +230,7 @@ _mkdev(ss, ss*, {-M ss$U c major_ss_c Mult($U,16) 640 operator
 __devitem(ses, ses*, SES/SAF-TE SCSI devices)dnl
 _mkdev(ses, ses*, {-M ses$U c major_ses_c $U 640 operator-})dnl
 dnl XXX see ramdisk above
-__devitem(ramd, ramdisk, Ramdisk kernel devices)dnl
+__devitem(ramd, ramdisk, Ramdisk kernel devices,nothing)dnl
 _mkdev(ramd, ramdisk, {-dnl
 show_target(ramd)dnl
 -})dnl
@@ -243,7 +241,7 @@ __devitem(rd, {-rd*-}, quote(rd)pseudo-disks)dnl
 _mkdev(rd, rd*, {-dodisk2 rd $U major_rd_b major_rd_c $U 0{--}ifstep(rd)-})dnl
 __devitem(xd, xd*, Xylogic 753/7053 disks)dnl
 __devitem(xy, xy*, {-	Xylogic 450/451 disks-})dnl
-__devitem(flo, {-fd*-}, {-Floppy disk drives (3 1/2"{-,-} 5 1/4")-})dnl
+__devitem(flo, {-fd*-}, {-Floppy disk drives (3 1/2"{-,-} 5 1/4")-},fd)dnl
 _mkdev(flo, fd*,
 {-typnam=$U${i#fd[01]*}
 	case $typnam in
@@ -274,7 +272,7 @@ __devitem(iop, iop*, I2O controller devices)dnl
 _mcdev(iop, iop*, iop, {-major_iop_c-}, 660)dnl
 __devitem(wdt, wdt0, Watchdog timer)dnl
 _mcdev(wdt, wdt0, wdt, {-major_wdt_c-}, 440, operator)dnl
-__devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506, IDE, ESDI, RLL, ...)-})dnl
+__devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{-,-} RLL{-,-} ...)-})dnl
 __devitem(ccd, ccd*, Concatenated disk devices)dnl
 __devitem(raid, raid*, RAIDframe disk devices)dnl
 __devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl
@@ -321,7 +319,7 @@ target(wscons, wsmouse, 0, 1, 2, 3)dnl
 _mkdev({-wscons-}, {-wscons-}, {-dnl
 show_target(wscons)dnl
 -})dnl
-__devitem(wsdisp, ttyC-F*, wscons display devices)dnl
+__devitem(wsdisp, ttyC-F*, wscons display devices,wsdisplay)dnl
 _mkdev({-wsdisp-}, tty[C-F]*, {-U=${i##tty[C-F]}
 	case $i in
 	ttyC*) n=C m=expr(0*256);;
@@ -365,7 +363,6 @@ _mkdev(pty, pty*, {-if [ $U -gt 15 ]; then
 	done-})dnl
 __devitem(dc, dc*, {-4 channel serial interface (keyboard{-,-} mouse{-,-}modem{-,-} printer)-})dnl
 __devtitle(prn, Printers)dnl
-__devitem(par, par*, On-board parallel port)dnl
 __devitem(lpt, lpt*, IEEE 1284 centronics printer)dnl
 _mkdev(lpt, lpt*|lpa*,
 {-case $i in
@@ -373,7 +370,7 @@ _mkdev(lpt, lpt*|lpa*,
 	lpa*) n=lpa f=128;;
 	esac
 	M $n$U c major_lpt_c Add($U, $f) 600-})dnl
-__devitem(lpa, lpa*, Polled printer port)dnl
+__devitem(lpa, lpa*, Polled printer port,lpt)dnl
 __devitem(ppi, ppi*, HP-IB plotters)dnl
 __devtitle({-usb-}, USB devices)dnl
 __devitem({-usb-}, usb*, Bus control devices used by usbd for attach/detach)dnl
@@ -383,13 +380,13 @@ __devitem(uhid, uhid*, Generic HID devices)dnl
 _mcdev({-uhid-}, uhid*, {-uhid-}, {-major_uhid_c-}, 660)dnl
 __devitem(ulpt, ulpt*, Printer devices)dnl
 _mcdev({-ulpt-}, ulpt*, {-ulpt-}, {-major_ulpt_c-}, 660)dnl
-__devitem(ttyU, ttyU*, USB serial ports)dnl
+__devitem(ttyU, ttyU*, USB serial ports,ucom)dnl
 _mkdev({-ttyU-}, {-ttyU[0-9a-zA-Z]-}, {-U=${i#ttyU*}
 	o=$(alph2d $U)
 	M ttyU$U c major_ttyU_c $o 660 dialer uucp-})dnl
 __devitem(urio, urio*, Diamond Multimedia Rio 500)dnl
 _mcdev({-urio-}, urio*, {-urio-}, {-major_urio_c-}, 660)dnl
-__devitem(uscan, uscanner*, Scanners)dnl
+__devitem(uscan, uscanner*, Scanners,uscanner)dnl
 _mcdev({-uscan-}, uscanner*, {-uscanner-}, {-major_uscan_c-}, 660)dnl
 __devitem(ugen, ugen*, Generic USB devices)dnl
 _mkdev(ugen, ugen*, {-n=Mult($U, 16)
@@ -407,8 +404,8 @@ _mkdev(com, {-tty[0-7][0-9a-f]-}, {-U=${i#tty*}
 	o=$(h2d $U)
 	M tty$U c major_com_c $o 660 dialer uucp
 	M cua$U c major_com_c Add($o, 128) 660 dialer uucp-})dnl
-__devitem(ttyc, ttyc*, Cyclades serial ports)dnl
-__devitem(tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
+__devitem(ttyc, ttyc*, Cyclades serial ports,cy)dnl
+__devitem(tzs, tty[a-z]*, Zilog 8530 Serial Port,zs)dnl
 _mkdev(tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
@@ -418,9 +415,9 @@ _mkdev(tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	*) echo unknown tty device $i ;;
 	esac
 	M tty$u c major_tzs_c $n 660 dialer uucp-})dnl
-__devitem(tth, ttyh*, Sab82532 serial devices)dnl
+__devitem(tth, ttyh*, Sab82532 serial devices,sab)dnl
 _mkdev(tth, ttyh*, {-M ttyh$U c major_tth_c $U 660 dialer uucp-})dnl
-__devitem(czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
+__devitem(czs, cua[a-z]*, Zilog 8530 Serial Port,zs)dnl
 _mkdev(czs, cua[a-z], {-u=${i#cua*}
 	case $u in
 	a) n=0 ;;
@@ -430,12 +427,12 @@ _mkdev(czs, cua[a-z], {-u=${i#cua*}
 	*) echo unknown cua device $i ;;
 	esac
 	M cua$u c major_czs_c Add($n, 128) 660 dialer uucp-})dnl
-__devitem(tty0, tty00, Standard serial port)dnl
-__devitem(mac_tty0, tty00, Standard serial port)dnl
-__devitem(ttyz, tty[a-d], On-board zs serial ports)dnl
-__devitem(cuaz, cua[a-d], On-board zs serial ports)dnl
-__devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports)dnl
-__devitem(scc, scc*, 82530 serial interface)dnl
+__devitem(tty0, tty00, Standard serial port,com)dnl
+__devitem(mac_tty0, tty00, Standard serial port,zsc)dnl
+__devitem(ttyz, tty[a-d], On-board zs serial ports,zs)dnl
+__devitem(cuaz, cua[a-d], On-board zs serial ports,zs)dnl
+__devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports,scc)dnl
+__devitem(scc, scc*, 82530 serial interface,scc)dnl
 __devtitle(spec, Special purpose devices)dnl
 __devitem(apm, apm, Power management device)dnl
 _mkdev(apm, apm*, {-M apm	c major_apm_c 0 644
@@ -444,7 +441,7 @@ __devitem(pctr, pctr*, PC Performance Tuning Register access device)dnl
 _mkdev(pctr, pctr, {-M pctr c major_pctr_c 0 644-})dnl
 __devitem(systrace, systrace*, System call tracing device)dnl
 _mkdev(systrace, systrace, {-M systrace c major_systrace_c 0 644-})dnl
-__devitem(au, audio*, Audio devices)dnl
+__devitem(au, audio*, Audio devices,audio)dnl
 _mkdev(au, audio*, {-M sound$U	c major_au_c $U
 	M mixer$U	c major_au_c Add($U, 16)
 	M audio$U	c major_au_c Add($U, 128)
@@ -455,7 +452,7 @@ _mkdev(au, audio*, {-M sound$U	c major_au_c $U
 	MKlist="$MKlist;[ -e audioctl ] || ln -s audioctl$U audioctl"-})dnl
 __devitem(asc, asc*, ASC Audio device)dnl
 _mkdev(asc, asc*, {-M asc$U major_asc_c 0-})dnl
-__devitem(music, music*, MIDI devices)dnl
+__devitem(music, music*, MIDI devices,midi)dnl
 _mkdev(music, music*, {-M music$U     c major_music_c $U
 	M sequencer$U c major_music_c Add($U, 128)
 	MKlist="$MKlist;[ -e music ] || ln -s music$U music"
@@ -463,29 +460,28 @@ _mkdev(music, music*, {-M music$U     c major_music_c $U
 __devitem(radio, radio*, FM tuner devices)dnl
 _mkdev(radio, radio*, {-M radio$U     c major_radio_c $U
 	MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"-})dnl
-__devitem(fdesc, fd, fd/* nodes for fdescfs)dnl
+__devitem(fdesc, fd, fd/* nodes for fdescfs,mount_fdesc 8)dnl
 _mkdev(fdesc, fd, {-RMlist="mkdir -p fd;$RMlist" n=0
 	while [ $n -lt 64 ];do M fd/$n c major_fdesc_c $n;n=Add($n, 1);done
 	MKlist="$MKlist;chmod 555 fd"-})dnl
-__devitem(grf_mac, grf*, Raw interface to the mac68k graphics devices)dnl
+__devitem(grf_mac, grf*, Raw interface to the mac68k graphics devices,grf)dnl
 __devitem(ite, ite*, Terminal emulator interface to HP300 graphics devices)dnl
 __devitem({-hil-}, {-hil-}, HP-HIL input devices)dnl
-__devitem(oppr, openprom)dnl
+__devitem(oppr, openprom,,openprom)dnl
 _cdev(oppr, openprom, 70, 0)dnl
-__devitem(cry, crypto, Hardware crypto access driver)dnl
+__devitem(cry, crypto, Hardware crypto access driver,crypto)dnl
 _mkdev(cry, crypto, {-M crypto c major_cry_c-} 0)dnl
 __devitem(pf, pf*, Packet Filter)dnl
 _mkdev(pf, {-pf*-}, {-M pf c major_pf_c 0 600-})dnl
 __devitem(bpf, bpf*, Berkeley Packet Filter)dnl
 _mkdev(bpf, {-bpf*-}, {-M bpf$U c major_bpf_c $U 600-}, 600)dnl
 _mkdev(tun, {-tun*-}, {-M tun$U c major_tun_c $U 600-}, 600)dnl
-__devitem(speak, speaker, PC speaker)dnl
+__devitem(speak, speaker, PC speaker,spkr)dnl
 _mkdev(speak, speaker, {-M speaker c major_speak_c 0 600-})dnl
 __devitem(lkm, lkm, Loadable kernel modules interface)dnl
 _cdev(lkm, lkm, {-major_lkm_c-}, 0, 640, _lkm)dnl
-__devitem(mmcl, mmclock, Memory mapped clock)dnl
 __devitem(tun, tun*, Network tunnel driver)dnl
-__devitem(rnd, *random, In-kernel random data source)dnl
+__devitem(rnd, *random, In-kernel random data source,random)dnl
 _mkdev(rnd, *random, {-n=0
 	for pre in " " s u p a
 	do
@@ -494,10 +490,10 @@ _mkdev(rnd, *random, {-n=0
 	done-}, 644)dnl
 __devitem(joy, joy*, Joystick driver)dnl
 _mcdev(joy, joy*, joy, {-major_joy_c-}, 666)dnl
-__devitem(mag, magma*, Magma multiport cards)dnl
-__devitem(bppmag, bppmag[mno], Magma parallel port)dnl
+__devitem(mag, magma*, Magma multiport cards,magma)dnl
+__devitem(bppmag, bppmag[mno], Magma parallel port,magma)dnl
 __devitem(spif, spif*, quote(spif)multiport cards)dnl
-__devitem(bppsp, bpp[jkl], quote(spif)parallel port)dnl
+__devitem(bppsp, bpp[jkl], quote(spif)parallel port,spif)dnl
 _mkdev(mag, magma*, {-case $U in
 	0)	offset=0  nam=m;;
 	1)	offset=16 nam=n;;
@@ -531,10 +527,10 @@ _mkdev(spif, spif*, {-case $U in
 	M bpp${nam}0 c major_bppsp_c Add($offset, 0) 600-})dnl
 __devitem(bpp, bpp*, Parallel port)dnl
 _mkdev(bpp, {-bpp*-}, {-M bpp$U c major_bpp_c $U 600-}, 600)dnl
-__devitem(xfs, xfs*, XFS filesystem node)dnl
+__devitem(xfs, xfs*, XFS filesystem node, mount_xfs 8)dnl
 _mcdev(xfs, xfs*, xfs, {-major_xfs_c-}, 600)dnl
 __devitem(hil, hil, HP-HIL input devices)dnl
-__devitem(rmidi, rmidi*, Raw MIDI devices)dnl
+__devitem(rmidi, rmidi*, Raw MIDI devices,midi)dnl
 _mcdev(rmidi, rmidi*, rmidi, {-major_rmidi_c-}, 666)dnl
 __devtitle(plat, Platform-specific devices)dnl
 __devitem(bktr, bktr*, Video frame grabbers)dnl
diff --git a/etc/MAKEDEV.man b/etc/MAKEDEV.man
index 2dd59dbfacc..a54fb0de6fe 100644
--- a/etc/MAKEDEV.man
+++ b/etc/MAKEDEV.man
@@ -1,7 +1,7 @@
 define(COMM,`.\"')dnl
 include(MAKEDEV.mansub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.man,v 1.1 2004/02/16 19:03:30 miod Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.man,v 1.2 2004/02/20 19:13:01 miod Exp $-})dnl
 dnl
 define(quote,{-.Dq $1
 -})dnl
@@ -9,16 +9,16 @@ include(MAKEDEV.common)dnl
 dnl
 __devtitle(make,{-Special device names-})dnl
 __devitem({-all-},{-all-},dnl
-{-Creates special files for all devices on MACHINE-})dnl
+{-Creates special files for all devices on MACHINE-},nothing)dnl
 __devitem(std,{-std-},dnl
 {-Creates the
 .Sq standard
 devices (console, drum, klog, kmem, ksyms, mem, null,
 stderr, stdin, stdout, tty, zero)
-which are absolutely necessary for the system to function properly-})dnl
+which are absolutely necessary for the system to function properly-},nothing)dnl
 __devitem(local,local,dnl
-{-Creates configuration-specific devices, by invoking the shell file
-.Pa MAKEDEV.local .-})dnl
+{-Creates configuration-specific devices{-,-} by invoking the shell file
+.Pa MAKEDEV.local -},nothing)dnl
 define({-_std-},)dnl
 divert(1)dnl
 dnl send md shell fragments to the bit bucket...
@@ -81,7 +81,6 @@ If units are expected for a device but not provided,
 will supply the standard numbers in most cases.
 .Pp
 The MACHINE supports the following devices:
-.Pp
 divert(9)dnl
 .Sh FILES
 .Bl -tag -width /dev -compact
diff --git a/etc/MAKEDEV.mansub b/etc/MAKEDEV.mansub
index 535a6edee4b..5c4627c01b8 100644
--- a/etc/MAKEDEV.mansub
+++ b/etc/MAKEDEV.mansub
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp $
+dnl	$OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp $
 dnl
 dnl Copyright (c) 2004, Miodrag Vallat
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -66,8 +66,8 @@ dnl store a version string for 'this' file
 dnl
 dnl vers ( uniqueidstring, versionstring, subdir )
 dnl
-dnl example1: vers(__file__, {-$OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp $-})
-dnl example2: vers(__file__, {-$OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp $-}, etc.MACHINE)
+dnl example1: vers(__file__, {-$OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp $-})
+dnl example2: vers(__file__, {-$OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp $-}, etc.MACHINE)
 dnl
 dnl if subdir is defined, prepend it to the filename in the version string
 dnl
@@ -78,7 +78,7 @@ define({-vers-},
 dnl
 dnl Version info for this file:
 dnl
-vers(__file__, {-$OpenBSD: MAKEDEV.mansub,v 1.1 2004/02/16 19:03:30 miod Exp $-})dnl
+vers(__file__, {-$OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp $-})dnl
 dnl
 dnl
 define({-_addsubdir-},
@@ -98,11 +98,16 @@ popdef({-_m4_cvs_ver-})dnl
 show_vers()dnl
 -})-})dnl
 dnl
+dnl _devxr(name,optional different xr name)
+dnl
+define({-_devxr-},{-.Xr $1 ifelse(index($1,{- -}),-1,{-4 -})-})dnl
 dnl
 dnl _devitem(pattern, description)
 dnl
-define({-_devitem-},{-.It Ar $1
-$2.-})dnl
+define({-_devitem-},{-.It Ar $2
+$3{--}ifelse($4,nothing,,{-, see
+_devxr({-ifelse($4,,$1,$4)-})-})dnl
+.-})dnl
 dnl
 dnl _devtitle(name,description)
 dnl
@@ -118,7 +123,9 @@ define({-$1__DEV-}, {-Y-})-})dnl
 dnl
 define({-_MKDEV-}, {-$1_mkdev-})dnl
 define({-_TITLE-}, {-$1_title-})dnl
-define({-__devitem-}, {-define($1_dev, {-_devitem($2,$3)-})$4-})dnl
+dnl
+define({-__devitem-}, {-define($1_dev, {-_devitem($1,$2,$3,$4)-})-})dnl
+dnl
 define({-__devtitle-}, {-define($1_title, {-_devtitle($1,$2)-})-})dnl
 define({-_mkdev-})dnl
 define({-_mcdev-})dnl
diff --git a/etc/MAKEDEV.sub b/etc/MAKEDEV.sub
index 6462ea1b789..46f37cf55f3 100644
--- a/etc/MAKEDEV.sub
+++ b/etc/MAKEDEV.sub
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp $
+dnl	$OpenBSD: MAKEDEV.sub,v 1.12 2004/02/20 19:13:01 miod Exp $
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -66,8 +66,8 @@ dnl store a version string for 'this' file
 dnl
 dnl vers ( uniqueidstring, versionstring, subdir )
 dnl
-dnl example1: vers(__file__, {-$OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp $-})
-dnl example2: vers(__file__, {-$OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp $-}, etc.MACHINE)
+dnl example1: vers(__file__, {-$OpenBSD: MAKEDEV.sub,v 1.12 2004/02/20 19:13:01 miod Exp $-})
+dnl example2: vers(__file__, {-$OpenBSD: MAKEDEV.sub,v 1.12 2004/02/20 19:13:01 miod Exp $-}, etc.MACHINE)
 dnl
 dnl if subdir is defined, prepend it to the filename in the version string
 dnl
@@ -78,7 +78,7 @@ define({-vers-},
 dnl
 dnl Version info for this file:
 dnl
-vers(__file__, {-$OpenBSD: MAKEDEV.sub,v 1.11 2004/02/16 18:58:53 miod Exp $-})dnl
+vers(__file__, {-$OpenBSD: MAKEDEV.sub,v 1.12 2004/02/20 19:13:01 miod Exp $-})dnl
 dnl
 dnl
 define({-_addsubdir-},
@@ -202,7 +202,7 @@ define({-ifdev-}, {-ifelse($1__DEV, Y, {-$2-})-})dnl
 dnl
 define({-_MKDEV-}, {-$1_mkdev-})dnl
 define({-_TITLE-}, {-$1_title-})dnl
-define({-__devitem-}, {-define($1_dev, {-_devitem($2, $3)-})$4-})dnl
+define({-__devitem-}, {-define($1_dev, {-_devitem($2, $3)-})-})dnl
 define({-__devtitle-}, {-define($1_title, {-_devtitle($2)-})-})dnl
 dnl
 dnl Beginning and ending of case entries, just incase we change in the
diff --git a/etc/etc.hp300/MAKEDEV.md b/etc/etc.hp300/MAKEDEV.md
index f7bdd9759b3..2f86e130a3c 100644
--- a/etc/etc.hp300/MAKEDEV.md
+++ b/etc/etc.hp300/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.18 2004/02/17 11:18:06 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.19 2004/02/20 19:13:08 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -41,7 +41,7 @@ _mkdev(st_hp300, ct*|mt*|st*,
 		echo bad unit for tape in: $1
 		;;
 	esac-})dnl
-__devitem(st_hp300, st*, Exabyte tape)dnl
+__devitem(st_hp300, st*, Exabyte tape,st)dnl
 __devitem(grf, grf*, Raw interface to HP300 graphics devices)dnl
 dnl
 dnl
diff --git a/etc/etc.mac68k/MAKEDEV.md b/etc/etc.mac68k/MAKEDEV.md
index 8f6694cd726..14e16f8d2c4 100644
--- a/etc/etc.mac68k/MAKEDEV.md
+++ b/etc/etc.mac68k/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.15 2004/02/16 19:01:01 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.16 2004/02/20 19:13:08 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -19,7 +19,7 @@ dnl
 dnl
 dnl *** mac68k specific defintions
 dnl
-__devitem(ttye, ttye*, ITE bitmapped consoles)dnl
+__devitem(ttye, ttye*, ITE bitmapped consoles,ite)dnl
 dnl
 _TITLE(make)
 _DEV(all)
diff --git a/etc/etc.mvme68k/MAKEDEV.md b/etc/etc.mvme68k/MAKEDEV.md
index 4656e41e608..272c21b286a 100644
--- a/etc/etc.mvme68k/MAKEDEV.md
+++ b/etc/etc.mvme68k/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.12 2004/02/16 19:01:02 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.13 2004/02/20 19:13:08 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -19,8 +19,8 @@ dnl
 dnl
 dnl *** mvme68k-specific devices
 dnl
-__devitem(mvme_tzs, ttya-d, On-board serial ports)dnl
-__devitem(mvme_czs, cuaa-d, On-board call-up devices)dnl
+__devitem(mvme_tzs, ttya-d, On-board serial ports,zs)dnl
+__devitem(mvme_czs, cuaa-d, On-board call-up devices,zs)dnl
 _mkdev(mvme_tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
@@ -56,7 +56,7 @@ _mkdev(cl, {-tty0*-}, {-u=${i#tty0*}
 		;;
 	*) echo unknown tty device $i ;;
 	esac-})dnl
-__devitem(ttyw, ttyw*, WG CL-CD2400 serial ports)dnl
+__devitem(ttyw, ttyw*, WG CL-CD2400 serial ports,nothing)dnl
 _mkdev(ttyw, {-ttyw*-}, {-u=${i#ttyw*}
 	case $u in
 	0|1|2|3)
@@ -65,7 +65,7 @@ _mkdev(ttyw, {-ttyw*-}, {-u=${i#ttyw*}
 		;;
 	*) echo unknown tty device $i ;;
 	esac-})dnl
-__devitem(lp, par0, On-board printer port)dnl
+__devitem(lp, par0, On-board printer port,nothing)dnl
 _mkdev(lp, {-lp*-}, {-u=${i#lp*}
 	case $u in
 	0) M par$u c major_lp_c $u 600;;
diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md
index 26b268ef201..bbbef4592da 100644
--- a/etc/etc.sparc/MAKEDEV.md
+++ b/etc/etc.sparc/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.22 2004/02/16 19:01:02 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.23 2004/02/20 19:13:08 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -20,8 +20,8 @@ dnl
 dnl
 dnl *** some sparc-specific devices
 dnl
-__devitem(s64_tzs, tty[a-z]*, Zilog 8530 Serial Port)dnl
-__devitem(s64_czs, cua[a-z]*, Zilog 8530 Serial Port)dnl
+__devitem(s64_tzs, tty[a-z]*, Zilog 8530 serial ports,zs)dnl
+__devitem(s64_czs, cua[a-z]*, Zilog 8530 serial ports,zs)dnl
 _mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
@@ -60,6 +60,7 @@ _DEV(cd, 58, 18)
 _DEV(flo, 54, 16)
 _DEV(presto, 25, 26)
 _DEV(sd, 17, 7)
+_DEV(raid, 123, 25)
 _DEV(rd, 106, 17)
 _DEV(vnd, 110, 8)
 _DEV(xd, 42, 10)
@@ -93,7 +94,6 @@ _DEV(lkm, 112)
 _DEV(oppr)
 _DEV(mag, 100)
 _DEV(pf, 59)
-_DEV(raid, 123, 25)
 _DEV(rnd, 119)
 _DEV(spif, 102)
 _DEV(ses, 124)
diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md
index 626819d6bd4..8efda98edf9 100644
--- a/etc/etc.sparc64/MAKEDEV.md
+++ b/etc/etc.sparc64/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.31 2004/02/16 19:01:02 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.32 2004/02/20 19:13:08 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -18,8 +18,8 @@ dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 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
+__devitem(s64_tzs, tty[a-z]*, Zilog 8530 serial port,zs)dnl
+__devitem(s64_czs, cua[a-z]*, Zilog 8530 serial port,zs)dnl
 _mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
 	a) n=0 ;;
diff --git a/etc/etc.vax/MAKEDEV.md b/etc/etc.vax/MAKEDEV.md
index 024cd2316c0..e21e845b34e 100644
--- a/etc/etc.vax/MAKEDEV.md
+++ b/etc/etc.vax/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.17 2004/02/17 11:18:08 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.18 2004/02/20 19:13:08 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -23,7 +23,7 @@ __devitem(hd, hd*, {-HDC9224 disks-})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)-})dnl
+__devitem(dh, dh*, {-UNIBUS DH11 and emulations (e.g. Able dmax{-,-} Emulex CS-11)-})dnl
 __devitem(vt, vt*, {-console-})dnl
 __devitem(dz, dz*, UNIBUS DZ11 and DZ32)dnl
 __devitem(dl, dl*, UNIBUS DL11)dnl
@@ -112,6 +112,7 @@ _DEV(hk, 11, 3)
 _DEV(hd, 58, 19)
 _DEV(hp, 4, 0)
 _DEV(ra, 9, 9)
+_DEV(raid, 73, 25)
 _DEV(rb, 23, 11)
 _DEV(rd, 62, 23)
 _DEV(rl, 32, 14)
@@ -145,7 +146,6 @@ _DEV(bpf, 56)
 _DEV(fdesc, 53)
 _DEV(lkm, 28)
 _DEV(pf, 42)
-_DEV(raid, 73, 25)
 _DEV(rnd, 67)
 _DEV(ses, 124)
 _DEV(ss, 64)