From f28633b0b2f8f4aadadfe0023a5051386f0bb4c7 Mon Sep 17 00:00:00 2001
From: matthew <>
Date: Wed, 20 Jun 2012 19:03:06 +0000
Subject: [PATCH] yet more mac68k goop...

---
 src/etc/etc.mac68k/MAKEDEV      | 425 --------------------------------
 src/etc/etc.mac68k/MAKEDEV.md   | 120 ---------
 src/etc/etc.mac68k/Makefile     |   5 -
 src/etc/etc.mac68k/Makefile.inc |   6 -
 src/etc/etc.mac68k/disktab      |   6 -
 src/etc/etc.mac68k/fbtab        |   2 -
 src/etc/etc.mac68k/sysctl.conf  |   0
 src/etc/etc.mac68k/ttys         |  11 -
 src/etc/mtree/4.4BSD.dist       |   6 +-
 9 files changed, 1 insertion(+), 580 deletions(-)
 delete mode 100644 src/etc/etc.mac68k/MAKEDEV
 delete mode 100644 src/etc/etc.mac68k/MAKEDEV.md
 delete mode 100644 src/etc/etc.mac68k/Makefile
 delete mode 100644 src/etc/etc.mac68k/Makefile.inc
 delete mode 100644 src/etc/etc.mac68k/disktab
 delete mode 100644 src/etc/etc.mac68k/fbtab
 delete mode 100644 src/etc/etc.mac68k/sysctl.conf
 delete mode 100644 src/etc/etc.mac68k/ttys

diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
deleted file mode 100644
index a14b8cb9..00000000
--- a/src/etc/etc.mac68k/MAKEDEV
+++ /dev/null
@@ -1,425 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
-#
-#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.36 2011/10/06 20:49:27 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib 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
-#	rd*	"rd" pseudo-disks
-#	sd*	SCSI disks, including flopticals
-#	vnd*	"file" pseudo-disk devices
-# Tapes:
-#	ch*	SCSI media changers
-#	st*	SCSI tape drives
-# Terminal ports:
-#	tty00	Standard serial port
-# 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
-#	wsmux	wscons keyboard/mouse mux devices
-# Pointing devices:
-#	wsmouse*	wscons mice
-# Special purpose devices:
-#	asc*	ASC Audio device
-#	bio	ioctl tunnel pseudo-device
-#	bpf*	Berkeley Packet Filter
-#	diskmap	Disk mapper
-#	fd	fd/* nodes
-#	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
-#	pf*	Packet Filter
-#	pppx*	PPP Multiplexer
-#	*random	In-kernel random data source
-#	systrace*	System call tracing device
-#	tun*	Network 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
-std)
-	M console	c 0 0 600
-	M tty		c 1 0
-	M mem		c 2 0 640 kmem
-	M kmem		c 2 1 640 kmem
-	M null		c 2 2
-	M zero		c 2 12
-	M stdin		c 21 0
-	M stdout	c 21 1
-	M stderr	c 21 2
-	M ksyms		c 37 0 640 kmem
-	M klog		c 6 0 600
-	;;
-
-tty0*)
-	case $U in
-	00|01)
-		M tty$U c 12 $U 660 dialer uucp
-		;;
-	*)
-		echo bad unit for serial tty in: $i
-		;;
-	esac
-	;;
-
-ttye*)
-	case $U in
-	0|1)
-		M ttye$U c 11 $U 600
-		;;
-	*)
-		echo bad unit for ttye in: $i
-		;;
-	esac
-	;;
-
-asc*)
-	M asc$U c 36 $U
-	;;
-
-vscsi*)
-	M vscsi$U c 53 $U 600
-	;;
-
-uk*)
-	M uk$U c 34 $U 640 operator
-	;;
-
-tun*)
-	M tun$U c 24 $U 600
-	;;
-
-systrace)
-	M systrace c 50 0 644
-	;;
-
-*random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 32 $n 644
-		n=$(($n+1))
-	done
-	;;
-
-pppx*)
-	M pppx$U c 55 $U 600
-	;;
-
-pf*)
-	M pf c 35 0 600
-	;;
-
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
-lkm)
-	M lkm c 25 0 640 _lkm
-	;;
-
-fd)
-	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
-	while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
-	MKlist[${#MKlist[*]}]=";chmod 555 fd"
-	;;
-
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
-bpf*)
-	M bpf$U c 22 $U 600
-	;;
-
-bio)
-	M bio c 49 0 600
-	;;
-
-asc*)
-	M asc$U 36 0
-	;;
-
-wsmouse[0-9]*)
-	M wsmouse$U c 40 $U 600
-	;;
-
-wsmux|wsmouse|wskbd)
-	M wsmouse c 41 0 600
-	M wskbd c 41 1 600
-	;;
-
-wskbd[0-9]*)
-	M wskbd$U c 39 $U 600
-	;;
-
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 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 38 $((16#$U+$m)) 600;;
-	cfg) M tty${n}cfg c 38 $((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 4 $(($off+$n))
-		M pty$nam c 5 $(($off+$n))
-		n=$(($n+1))
-	done
-	;;
-
-ptm)
-	M ptm c 52 0 666
-	;;
-
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 5 $n 660 operator
-		M ${pre}rst$U	c 14 $n 660 operator
-		n=$(($n+1))
-	done
-	;;
-
-ch*)
-	M ch$U c 17 $U 660 operator
-	;;
-
-vnd*)
-	dodisk vnd $U 8 19 $U 0
-	;;
-
-rd*)
-	dodisk2 rd $U 13 18 $U 0
-	;;
-
-cd*)
-	dodisk2 cd $U 6 15 $U 0
-	;;
-
-local)
-	test -s $T.local && sh $T.local
-	;;
-
-ramdisk)
-	R diskmap bio pty0 tty00 tty01 asc0 rd0 cd0 cd1 st0 st1 sd0
-	R sd1 sd2 sd3 sd4 bpf0 std
-	;;
-
-all)
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 vnd0
-	R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 bio ptm local wscons asc0
-	R uk0 random lkm tty00 tty01 pf systrace std st0 st1 fd
-	;;
-
-sd*)
-	case $i in
-	sd*) dodisk sd $U 4 13 $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.mac68k/MAKEDEV.md b/src/etc/etc.mac68k/MAKEDEV.md
deleted file mode 100644
index cd044303..00000000
--- a/src/etc/etc.mac68k/MAKEDEV.md
+++ /dev/null
@@ -1,120 +0,0 @@
-define(MACHINE,mac68k)dnl
-vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.36 2011/10/06 20:49:27 deraadt 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 *** mac68k specific definitions
-dnl
-__devitem(ttye, ttye*, ITE bitmapped consoles,ite)dnl
-dnl
-_TITLE(make)
-_DEV(all)
-_DEV(ramd)
-_DEV(std)
-_DEV(local)
-_TITLE(dis)
-_DEV(cd, 15, 6)
-_DEV(rd, 18, 13)
-_DEV(sd, 13, 4)
-_DEV(vnd, 19, 8)
-_TITLE(tap)
-_DEV(ch, 17)
-_DEV(st, 14, 5)
-_TITLE(term)
-_DEV(mac_tty0)
-dnl _TITLE(call)
-_TITLE(pty)
-_DEV(ptm, 52)
-_DEV(pty, 5)
-_DEV(tty, 4)
-_TITLE(cons)
-_DEV(wsdisp, 38)
-_DEV(wscons)
-_DEV(wskbd, 39)
-_DEV(wsmux, 41)
-_TITLE(point)
-_DEV(wsmouse, 40)
-_TITLE(spec)
-_DEV(asc, 36)
-_DEV(bio, 49)
-_DEV(bpf, 22)
-_DEV(diskmap, 54)
-_DEV(fdesc, 21)
-_DEV(lkm, 25)
-_DEV(nnpfs, 51)
-_DEV(pf, 35)
-_DEV(pppx, 55)
-_DEV(rnd, 32)
-_DEV(systrace, 50)
-_DEV(tun, 24)
-_DEV(uk, 34)
-_DEV(vscsi, 53)
-dnl
-divert(__mddivert)dnl
-dnl
-_std(1, 2, 37, 6)
-	;;
-
-tty0*)
-	case $U in
-	00|01)
-		M tty$U c 12 $U 660 dialer uucp
-		;;
-	*)
-		echo bad unit for serial tty in: $i
-		;;
-	esac
-	;;
-
-ttye*)
-	case $U in
-	0|1)
-		M ttye$U c 11 $U 600
-		;;
-	*)
-		echo bad unit for ttye in: $i
-		;;
-	esac
-	;;
-
-asc*)
-	M asc$U c 36 $U
-	;;
-dnl
-dnl *** mac68k specific targets
-dnl
-target(all, bio)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, nnpfs, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)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)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(ramd, asc, 0)dnl
-twrget(ramd, mac_tty0, tty0, 0, 1)dnl
-target(ramd, pty, 0)dnl
-target(ramd, bio)dnl
-target(ramd, diskmap)dnl
diff --git a/src/etc/etc.mac68k/Makefile b/src/etc/etc.mac68k/Makefile
deleted file mode 100644
index 324bc976..00000000
--- a/src/etc/etc.mac68k/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.mac68k/Makefile.inc b/src/etc/etc.mac68k/Makefile.inc
deleted file mode 100644
index 9186d561..00000000
--- a/src/etc/etc.mac68k/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.15 2011/07/22 09:30:54 espie Exp $
-
-bootblocks:
-	# XXX no bootblocks ?
-
-MDEXT=	bsd.rd 				# utils??
diff --git a/src/etc/etc.mac68k/disktab b/src/etc/etc.mac68k/disktab
deleted file mode 100644
index 93bb0659..00000000
--- a/src/etc/etc.mac68k/disktab
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: disktab,v 1.7 2010/07/02 20:33:54 tedu Exp $
-
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#45:nt#2:ns#32:\
-	:ta=4.2BSD:oa#0:pa#2880:fa#512:ba#4096:\
-	:ob#0:pb#0:oc#0:pc#2880:
diff --git a/src/etc/etc.mac68k/fbtab b/src/etc/etc.mac68k/fbtab
deleted file mode 100644
index 6b2ed2c1..00000000
--- a/src/etc/etc.mac68k/fbtab
+++ /dev/null
@@ -1,2 +0,0 @@
-/dev/ttyC0	0600	/dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
-/dev/X0		0600	/dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0
diff --git a/src/etc/etc.mac68k/sysctl.conf b/src/etc/etc.mac68k/sysctl.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/etc/etc.mac68k/ttys b/src/etc/etc.mac68k/ttys
deleted file mode 100644
index cc2de7be..00000000
--- a/src/etc/etc.mac68k/ttys
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.10 2008/01/09 17:39:42 miod Exp $
-#
-# name	getty				type	status		comments
-#
-console "/usr/libexec/getty std.9600"	vt220	on  secure
-# graphics 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
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 3aec39f3..997bf00a 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.222 2012/04/08 15:56:28 jsg Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.223 2012/06/20 19:03:06 matthew Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1227,8 +1227,6 @@ loongson
 ..
 luna88k
 ..
-mac68k
-..
 macppc
 ..
 mvme68k
@@ -1309,8 +1307,6 @@ loongson
 ..
 luna88k
 ..
-mac68k
-..
 macppc
 ..
 mvme68k