more mac68k bits for the attic

29 files changed, 10 insertions, 1747 deletions

diff --git a/Makefile.cross b/Makefile.cross
index 18516b17741..c01d6cd316a 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.51 2012/04/06 14:55:51 jsing Exp $
+# $OpenBSD: Makefile.cross,v 1.52 2012/06/20 18:45:44 matthew Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -10,8 +10,7 @@ cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
 	 ${TARGET} == "gumstix" || ${TARGET} == "palm" || \
 	 ${TARGET} == "zaurus")
 TARGET_ARCH=	arm
-.elif	(${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
-	 ${TARGET} == "mvme68k")
+.elif	(${TARGET} == "hp300" || ${TARGET} == "mvme68k")
 TARGET_ARCH=	m68k
 .elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k" || \
 	 ${TARGET} == "mvme88k")
diff --git a/distrib/mac68k/Makefile b/distrib/mac68k/Makefile
deleted file mode 100644
index 9eacda0c9bc..00000000000
--- a/distrib/mac68k/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 1999/06/13 10:33:30 downsj Exp $
-
-SUBDIR= ramdisk
-
-.include <bsd.subdir.mk>
diff --git a/distrib/mac68k/Makefile.inc b/distrib/mac68k/Makefile.inc
deleted file mode 100644
index 5a785b766c3..00000000000
--- a/distrib/mac68k/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1999/06/13 10:33:30 downsj Exp $
-
-REV=${OSrev}
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile
deleted file mode 100644
index a5afb7721fd..00000000000
--- a/distrib/mac68k/ramdisk/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#	$OpenBSD: Makefile,v 1.16 2011/04/18 16:52:09 thib Exp $
-
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-BSD_RD=		bsd.rd
-BSDSBC_RD=	bsdsbc.rd
-IMAGE=		mr.fs
-CBIN?=		instbin
-LISTS=		${.CURDIR}/list
-UTILS?=		${.CURDIR}/../../miniroot
-
-MOUNT_POINT=	/mnt
-MTREE=		${UTILS}/mtree.conf
-
-VND?=		vnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-
-DISKTYPE=	rdroot
-NBLKS=		2880
-NEWFSARGS= -t ffs -m 0 -o space -b 4096
-
-all:	${BSD_RD}
-
-${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
-	cp bsd ${BSD_RD}
-	${.OBJDIR}/rdsetroot ${BSD_RD} ${IMAGE}
-
-${IMAGE}: rd_setup do_files rd_teardown
-
-bsd:
-.ifndef(NOBUILD)
-	cd ${.CURDIR}/../../../sys/arch/mac68k/conf && config RAMDISK
-	cd ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISK && \
-	    ${MAKE} clean && exec ${MAKE}
-.endif
-	cp ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISK/bsd bsd
-
-rd_setup:
-	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c ${VND} ${IMAGE}
-	disklabel -w ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-
-rd_teardown:
-	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-rdsetroot:	${TOP}/../common/rdsetroot.c
-	${HOSTCC} -o rdsetroot ${TOP}/../common/rdsetroot.c
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-.PRECIOUS:	${IMAGE}
-
-.ifdef RELEASEDIR
-install:
-	cp ${BSD_RD} ${RELEASEDIR}/${BSD_RD}
-	printf "disable ncrscsi\nenable sbc\nquit" | config -e \
-	    -o ${RELEASEDIR}/${BSDSBC_RD} ${RELEASEDIR}/${BSD_RD}
-.endif
-
-${CBIN}.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
-	crunchgen -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	${MAKE} -f ${CBIN}.mk all
-
-do_files:
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
-	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
-	rm ${MOUNT_POINT}/${CBIN}
-
-clean cleandir:
-	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \
-	    *.o *.lo *.c bsd ${BSD_RD} rdsetroot
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/mac68k/ramdisk/Makefile.inc b/distrib/mac68k/ramdisk/Makefile.inc
deleted file mode 100644
index b40168b6fe6..00000000000
--- a/distrib/mac68k/ramdisk/Makefile.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#	$OpenBSD: Makefile.inc,v 1.7 2009/04/17 03:58:54 deraadt Exp $
-#	$NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $
-#
-
-# TOP is assumed to be defined by Makefile including this one.
-
-CBIN?=		instbin
-LISTS=		${.CURDIR}/list
-UTILS?=		${.CURDIR}/../../miniroot
-
-COMMONDIR=	${TOP}/ramdisk
-MOUNT_POINT?=	${TOP}/${BASE}/fs
-
-CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${UTILS}/mtree.conf
-
-${CBIN}.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
-	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	${MAKE} -f ${CBIN}.mk all
-
-#${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-#	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
-
-#${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-#	${MAKE} -f ${CBIN}.mk all
-
-do_files:
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
-	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
-	rm ${MOUNT_POINT}/${CBIN}
-
-clean cleandir:
-	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
deleted file mode 100644
index 0378cd247f9..00000000000
--- a/distrib/mac68k/ramdisk/install.md
+++ /dev/null
@@ -1,106 +0,0 @@
-#       $OpenBSD: install.md,v 1.37 2011/04/17 20:57:10 krw Exp $
-#
-# Copyright (c) 2002, Miodrag Vallat.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY ITS AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-# EVENT SHALL ITS AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Copyright (c) 1996 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Jason R. Thorpe.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-#
-# machine dependent section of installation/upgrade script.
-#
-#
-
-# Machine-dependent install sets
-MDSETS="bsdsbc bsdsbc.rd"
-
-md_installboot() {
-}
-
-md_prep_disklabel() {
-	local _disk=$1 _f _op
- 
-	disklabel -W $_disk >/dev/null 2>&1
-	if [[ -n $(disklabel -c $_disk 2>/dev/null | grep ' HFS ') ]]; then
-		cat <<__EOT
-This disk has been setup under MacOS. You will now edit a MacOS partition
-table. Be careful not to remove the MacOS partitions in use.
-__EOT
-		pdisk /dev/${_disk}c
-	fi
-
-	_f=/tmp/fstab.$_disk
-	if [[ $_disk == $ROOTDISK ]]; then
-		while :; do
-			echo "The auto-allocated layout for $_disk is:"
-			disklabel -h -A $_disk | egrep "^#  |^  [a-p]:"
-			ask "Use (A)uto layout, (E)dit auto layout, or create (C)ustom layout?" a
-			case $resp in
-			a*|A*)	_op=-w ; AUTOROOT=y ;;
-			e*|E*)	_op=-E ;;
-			c*|C*)	break ;;
-			*)	continue ;;
-			esac
-			disklabel $FSTABFLAG $_f $_op -A $_disk
-			return
-		done
- 	fi
-	cat <<__EOT
-You will now create a OpenBSD disklabel on the disk.  The disklabel defines
-how OpenBSD splits up the disk into OpenBSD partitions in which filesystems
-and swap space are created.  You must provide each filesystem's mountpoint
-in this program.
-
-__EOT
-	disklabel $FSTABFLAG $_f -E $_disk
-}
-
-md_congrats() {
-}
-
-md_consoleinfo() {
-}
diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list
deleted file mode 100644
index fa4030962cd..00000000000
--- a/distrib/mac68k/ramdisk/list
+++ /dev/null
@@ -1,84 +0,0 @@
-#	$OpenBSD: list,v 1.35 2010/10/18 04:07:51 deraadt Exp $
-
-SRCDIRS distrib/special
-SRCDIRS bin sbin usr.bin usr.sbin
-
-# copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/instbin			instbin
-LINK	instbin					bin/arch
-LINK	instbin					bin/cat
-LINK	instbin					bin/date
-LINK	instbin					bin/chmod bin/chgrp sbin/chown
-LINK	instbin					bin/cp
-LINK	instbin					bin/dd
-LINK	instbin					bin/df
-LINK	instbin					bin/ed
-LINK	instbin					bin/expr
-LINK	instbin					bin/hostname
-LINK	instbin					bin/ksh bin/sh
-ARGVLINK ksh					-sh
-LINK	instbin					bin/ln
-LINK	instbin					bin/ls
-LINK	instbin					bin/mkdir
-LINK	instbin					bin/mt bin/eject
-LINK	instbin					bin/mv
-LINK	instbin					bin/pax bin/tar bin/cpio
-LINK	instbin					bin/rm
-LINK	instbin					bin/sha256
-LINK	instbin					bin/sleep
-LINK	instbin					bin/stty
-LINK	instbin					bin/sync
-LINK	instbin					sbin/dhclient
-LINK	instbin					sbin/disklabel
-LINK	instbin					sbin/dmesg
-LINK	instbin					sbin/fsck
-LINK	instbin					sbin/fsck_ffs
-LINK	instbin					sbin/ifconfig
-LINK	instbin					sbin/init
-LINK	instbin					sbin/mknod
-LINK	instbin					sbin/mount
-LINK	instbin					sbin/mount_cd9660
-LINK	instbin					sbin/mount_ffs
-LINK	instbin					sbin/mount_nfs
-LINK	instbin					sbin/newfs
-LINK	instbin					sbin/pdisk
-LINK	instbin					sbin/ping
-LINK	instbin					sbin/ping6
-LINK	instbin					sbin/reboot sbin/halt
-LINK	instbin					sbin/route
-LINK	instbin					sbin/rtsol
-LINK	instbin					sbin/umount
-LINK	instbin					usr/bin/ftp
-LINK	instbin					usr/bin/grep usr/bin/fgrep usr/bin/egrep
-LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
-LINK	instbin					usr/bin/less usr/bin/more
-LINK	instbin					usr/bin/sed
-LINK	instbin					sbin/sysctl
-
-# copy the MAKEDEV script and make some devices
-SCRIPT	${DESTDIR}/dev/MAKEDEV			dev/MAKEDEV
-SPECIAL	cd dev; sh MAKEDEV ramdisk
-
-# various files that we need in /etc for the install
-COPY	${DESTDIR}/etc/group			etc/group
-COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
-COPY	${CURDIR}/../../miniroot/services	etc/services
-COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
-SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-SYMLINK	/tmp/fstab.shadow			etc/fstab
-SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
-SYMLINK	/tmp/hosts				etc/hosts
-TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
-
-# dhcp things
-SCRIPT	${DESTDIR}/sbin/dhclient-script		sbin/dhclient-script
-
-# and the installation tools
-SCRIPT	${CURDIR}/../../miniroot/dot.profile	.profile
-SCRIPT	${CURDIR}/install.md			install.md
-SCRIPT	${CURDIR}/../../miniroot/install.sh	install
-SCRIPT	${CURDIR}/../../miniroot/upgrade.sh	upgrade
-SCRIPT	${CURDIR}/../../miniroot/install.sub	install.sub
-SPECIAL	chmod 755 install upgrade sbin/dhclient-script
-
-HASH	var/hash
diff --git a/regress/etc/MAKEDEV/Makefile b/regress/etc/MAKEDEV/Makefile
index 662acbf090e..656c17ebdb6 100644
--- a/regress/etc/MAKEDEV/Makefile
+++ b/regress/etc/MAKEDEV/Makefile
@@ -1,8 +1,8 @@
 
-# $OpenBSD: Makefile,v 1.26 2011/07/07 19:39:23 deraadt Exp $
+# $OpenBSD: Makefile,v 1.27 2012/06/20 18:45:44 matthew Exp $
 
 MAKEDEVARCHS+=alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk
-MAKEDEVARCHS+=loongson luna88k mac68k macppc mvme68k
+MAKEDEVARCHS+=loongson luna88k macppc mvme68k
 MAKEDEVARCHS+=mvme88k sgi socppc sparc sparc64 vax zaurus
 
 MAKEDEVTARGS?=all ramdisk
diff --git a/sbin/pdisk/Makefile b/sbin/pdisk/Makefile
index 1ad5f216668..e332732fb66 100644
--- a/sbin/pdisk/Makefile
+++ b/sbin/pdisk/Makefile
@@ -1,6 +1,6 @@
-#	$Id: Makefile,v 1.10 2012/06/20 18:33:59 matthew Exp $
+#	$Id: Makefile,v 1.11 2012/06/20 18:45:44 matthew Exp $
 
-.if ${MACHINE} == "macppc" || ${MACHINE} == "mac68k"
+.if ${MACHINE} == "macppc"
 PROG=	pdisk
 LDADD=  -lutil
 DPADD=  ${LIBUTIL}
diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile
index 748de7343a3..985083deb1d 100644
--- a/sbin/wsconsctl/Makefile
+++ b/sbin/wsconsctl/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.34 2010/01/30 20:48:50 miod Exp $
+#	$OpenBSD: Makefile,v 1.35 2012/06/20 18:45:44 matthew Exp $
 
 .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
     ${MACHINE} == "armish" || ${MACHINE} == "hp300" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "hppa64" || \
     ${MACHINE} == "i386" || ${MACHINE} == "landisk" || \
     ${MACHINE} == "loongson" || ${MACHINE} == "luna88k" || \
-    ${MACHINE} == "mac68k" || ${MACHINE} == "macppc" || \
+    ${MACHINE} == "macppc" || \
     ${MACHINE} == "palm" || ${MACHINE} == "sgi" || \
     ${MACHINE} == "socppc" || ${MACHINE} == "sparc" || \
     ${MACHINE} == "sparc64" || ${MACHINE} == "vax" || \
diff --git a/share/man/man4/man4.mac68k/Makefile b/share/man/man4/man4.mac68k/Makefile
deleted file mode 100644
index 477b4429990..00000000000
--- a/share/man/man4/man4.mac68k/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
-#	$OpenBSD: Makefile,v 1.15 2008/05/20 04:33:20 miod Exp $
-
-MAN=	adb.4 ae.4 asc.4 autoconf.4 esp.4 intro.4 \
-	macfb.4 mc.4 mem.4 ncrscsi.4 nubus.4 obio.4 sn.4 zsc.4
-MLINKS=	mem.4 kmem.4 \
-	ncrscsi.4 sbc.4 \
-	zsc.4 zstty.4
-
-MANSUBDIR=mac68k
-
-.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.mac68k/adb.4 b/share/man/man4/man4.mac68k/adb.4
deleted file mode 100644
index 07c0bfc38a1..00000000000
--- a/share/man/man4/man4.mac68k/adb.4
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Colin Wood
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Colin Wood
-.\"      for the NetBSD Project.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$OpenBSD: adb.4,v 1.12 2007/05/31 19:19:55 jmc Exp $
-.\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt ADB 4 mac68k
-.Os
-.Sh NAME
-.Nm adb
-.Nd Apple Desktop Bus driver
-.Sh SYNOPSIS
-.Cd "adb0 at obio?"
-.Cd "akbd* at adb?"
-.Cd "ams* at adb?"
-.Sh DESCRIPTION
-The Apple Desktop Bus
-.Pq Tn ADB
-is the single-master, multiple-slave, low-speed serial bus
-interface used by Macintosh computers to connect input devices
-such as keyboards, mice, trackballs, and graphics tablets
-to the machine.
-.Pp
-.Ox
-provides support for the following devices:
-.Pp
-.Bl -tag -width 12n -offset indent -compact
-.It Xr akbd 4
-Apple Keyboard Device
-.It Xr ams 4
-Apple Mouse Support
-.El
-.Sh SEE ALSO
-.Xr intro 4
-.Sh HISTORY
-The
-.Nm
-interface first appeared in
-.Nx 0.9 .
-.Sh AUTHORS
-Bradley A. Grantham wrote the original
-.Nm
-driver, including the
-.Tn MRG
-support.
-The hardware direct interface was written by
-John P. Wittkowski.
-The PowerManager interface was written by Takashi Hamada.
-.Sh BUGS
-.Bl -bullet -compact
-.It
-Not every class of
-.Tn ADB
-hardware is supported yet.
-.It
-The talk command is currently unimplemented.
-.It
-The listen command is not implemented yet.
-.El
diff --git a/share/man/man4/man4.mac68k/ae.4 b/share/man/man4/man4.mac68k/ae.4
deleted file mode 100644
index cee44ac4aae..00000000000
--- a/share/man/man4/man4.mac68k/ae.4
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Colin Wood
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Colin Wood.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$OpenBSD: ae.4,v 1.12 2007/05/31 19:19:55 jmc Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt AE 4 mac68k
-.Os
-.Sh NAME
-.Nm ae
-.Nd DP8390-based NuBus Ethernet device
-.Sh SYNOPSIS
-.Cd "ae* at nubus?"
-.Sh DESCRIPTION
-The
-.Nm
-interface provides access to a 10 Mb/s Ethernet network via the
-National Semiconductor DP8390 Ethernet chip set.
-This set includes the DP83902.
-.Sh HARDWARE
-The
-.Nm
-interface is currently known to support the following NuBus cards:
-.Bd -filled -offset indent
-.Bl -item -compact
-.It
-3Com EtherLink NB
-.It
-Apple EtherTalk NB
-.It
-Asante MacCon Series
-.It
-Asante MacCon-i Series
-.It
-Farallon EtherMac Series
-.It
-Farallon EtherWave Series
-.El
-.Ed
-.Sh SEE ALSO
-.Xr arp 4 ,
-.Xr ifmedia 4 ,
-.Xr inet 4 ,
-.Xr intro 4 ,
-.Xr mc 4 ,
-.Xr netintro 4 ,
-.Xr sn 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-interface first appeared in
-.Nx 1.0 .
-.Sh CAVEATS
-Some Asante
-.Nm
-cards are not designed to auto negotiate with 100 Mb/s devices.
diff --git a/share/man/man4/man4.mac68k/asc.4 b/share/man/man4/man4.mac68k/asc.4
deleted file mode 100644
index ba90042285b..00000000000
--- a/share/man/man4/man4.mac68k/asc.4
+++ /dev/null
@@ -1,43 +0,0 @@
-.\"	$OpenBSD: asc.4,v 1.2 2007/05/31 19:19:55 jmc Exp $
-.\"
-.\" Copyright (c) 2005 Martin Reindl <martin@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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt ASC 4 mac68k
-.Os
-.Sh NAME
-.Nm asc
-.Nd Apple Sound Chip on-board audio device
-.Sh SYNOPSIS
-.Cd "asc0 at obio?"
-.Sh DESCRIPTION
-The
-.Nm
-is an on-board audio device found on numerous mac68k machines.
-.Sh SEE ALSO
-.Xr obio 4
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 2.0 .
-.Sh BUGS
-The driver is currently only capable of working as an interface for the console
-bell.
-It is not possible for
-.Xr audio 4
-to attach to the
-.Nm
-device.
diff --git a/share/man/man4/man4.mac68k/autoconf.4 b/share/man/man4/man4.mac68k/autoconf.4
deleted file mode 100644
index 267cef58c13..00000000000
--- a/share/man/man4/man4.mac68k/autoconf.4
+++ /dev/null
@@ -1,64 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Colin Wood
-.\" Copyright (c) 1995 Mark Brinicombe
-.\" Copyright (c) 1994 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$OpenBSD: autoconf.4,v 1.5 2007/05/31 19:19:55 jmc Exp $
-.\"	$NetBSD: autoconf.4,v 1.2 1997/10/13 11:23:30 lukem Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt AUTOCONF 4 mac68k
-.Os
-.Sh NAME
-.Nm autoconf
-.Nd diagnostics from the autoconfiguration code
-.Sh DESCRIPTION
-When
-.Ox
-bootstraps it probes the innards of the machine
-on which it is running
-and locates controllers, drives, and other devices, printing out
-what it finds on the console.
-This procedure is driven by a system configuration table which is processed by
-.Xr config 8
-and compiled into each kernel.
-Devices which exist in the machine but are not configured into the
-kernel are usually not detected.
-The exception to this is the case of
-.Tn NuBus
-expansion boards.
-All
-.Tn NuBus
-slots are probed,
-and information about any cards found is reported even if the card
-is not currently configured.
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr boot_mac68k 8 ,
-.Xr config 8
diff --git a/share/man/man4/man4.mac68k/esp.4 b/share/man/man4/man4.mac68k/esp.4
deleted file mode 100644
index 723d717f015..00000000000
--- a/share/man/man4/man4.mac68k/esp.4
+++ /dev/null
@@ -1,49 +0,0 @@
-.\"	$OpenBSD: esp.4,v 1.3 2007/05/31 19:19:55 jmc Exp $
-.\"
-.\" Copyright (c) 2004 Martin Reindl <martin@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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt ESP 4 mac68k
-.Os
-.Sh NAME
-.Nm esp
-.Nd ESP NCR 53c96 on-board SCSI interface
-.Sh SYNOPSIS
-.Cd "esp0 at obio?"
-.Cd "esp1 at obio?"
-.Sh DESCRIPTION
-The
-.Nm
-is an on-board SCSI controller based on the NCR 53c96 chip, found
-on Apple Quadra/Centris machines.
-.Pp
-Tape devices should be allowed to disconnect for the SCSI bus to operate
-acceptably.
-.Sh SEE ALSO
-.Xr cd 4 ,
-.Xr ch 4 ,
-.Xr intro 4 ,
-.Xr obio 4 ,
-.Xr scsi 4 ,
-.Xr sd 4 ,
-.Xr st 4 ,
-.Xr uk 4
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Nx 1.3 .
-.Sh BUGS
-The pseudo-DMA mode only works on non-AV Quadra/Centris machines at this time.
diff --git a/share/man/man4/man4.mac68k/intro.4 b/share/man/man4/man4.mac68k/intro.4
deleted file mode 100644
index dc30cd2ebf5..00000000000
--- a/share/man/man4/man4.mac68k/intro.4
+++ /dev/null
@@ -1,137 +0,0 @@
-.\"	$OpenBSD: intro.4,v 1.23 2007/06/21 10:51:49 jmc Exp $
-.\"	$NetBSD: intro.4,v 1.4 1997/03/28 00:29:35 veego Exp $
-.\"
-.\" Copyright (c) 1990, 1991 Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     from: @(#)intro.4	5.2 (Berkeley) 3/27/91
-.\"
-.Dd $Mdocdate: June 21 2007 $
-.Dt INTRO 4 mac68k
-.Os
-.Sh NAME
-.Nm intro
-.Nd introduction to special files and hardware support
-.Sh DESCRIPTION
-The manual pages in section 4 describe the special files,
-related driver functions, and networking support
-available in the system.
-In this part of the manual, the
-.Sx SYNOPSIS
-section of
-each configurable device gives a sample specification
-for use in constructing a system description for the
-.Xr config 8
-program.
-The
-.Sx DIAGNOSTICS
-section lists messages which may appear on the console
-and/or in the system error log
-.Pa /var/log/messages
-due to errors in device operation;
-see
-.Xr syslogd 8
-for more information.
-.Pp
-This section contains both devices
-which may be configured into the system
-and network related information.
-The networking support is introduced in
-.Xr netintro 4 .
-.Sh DEVICE SUPPORT
-This section describes the hardware supported on the
-.Tn Mac .
-Software support for these devices comes in two forms.
-A hardware device may be supported with a character or block
-.Em device driver ,
-or it may be used within the networking subsystem and have a
-.Em network interface driver .
-Block and character devices are accessed through files in the file
-system of a special type; see
-.Xr mknod 8 .
-Network interfaces are indirectly accessed through the interprocess
-communication facilities provided by the system; see
-.Xr socket 2 .
-.Pp
-A hardware device is identified to the system at configuration time
-and the appropriate device or network interface driver is then compiled
-into the system.
-When the resultant system is booted, the autoconfiguration facilities
-in the system probe for the device and, if found, enable the software
-support for it.
-If a device does not respond at autoconfiguration
-time it is not accessible at any time afterwards.
-To enable a device which did not autoconfigure,
-the system will have to be rebooted.
-.Pp
-The autoconfiguration system is described in
-.Xr autoconf 4 .
-A list of the supported devices is given below.
-.Sh LIST OF DEVICES
-The devices listed below are supported in this incarnation of
-the system.
-Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
-Not all supported devices are listed.
-.Pp
-.Bl -tag -width ncrscsi(4) -compact -offset indent
-.It Xr adb 4
-Apple Desktop Bus driver
-.It Xr ae 4
-DP8390-based NuBus Ethernet device
-.It Xr akbd 4
-Apple Keyboard Device
-.It Xr ams 4
-Apple Mouse Support
-.It Xr asc 4
-Apple Sound Chip on-board audio device
-.It Xr esp 4
-ESP NCR 53c96 on-board SCSI interface
-.It Xr macfb 4
-Macintosh frame buffers
-.It Xr mc 4
-Am79C940 (MACE) on-board Ethernet device
-.It Xr ncrscsi 4
-NCR 5380 on-board SCSI interface
-.It Xr sbc 4
-NCR 5380 on-board SCSI interface
-.It Xr sm 4
-SMC91C9x and SMC91C1xx-based 10/100 Ethernet device
-.It Xr sn 4
-SONIC-based Ethernet device
-.It Xr zsc 4
-Zilog 8530 (ZSCC) serial communications driver
-.El
-.Sh SEE ALSO
-.Xr autoconf 4 ,
-.Xr config 8
-.Sh HISTORY
-The
-.Tn Mac68k
-.Nm intro
-first appeared in
-.Nx 1.2 .
diff --git a/share/man/man4/man4.mac68k/macfb.4 b/share/man/man4/man4.mac68k/macfb.4
deleted file mode 100644
index 15717d74d9b..00000000000
--- a/share/man/man4/man4.mac68k/macfb.4
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"	$OpenBSD: macfb.4,v 1.3 2007/05/31 19:19:55 jmc Exp $
-.\"
-.\" Copyright (c) 2006, Miodrag Vallat
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt MACFB 4 mac68k
-.Os
-.Sh NAME
-.Nm macfb
-.Nd Macintosh frame buffers
-.Sh SYNOPSIS
-.Cd "macfb* at obio?"
-.Cd "macfb* at nubus?"
-.Cd "wsdisplay* at macfb?"
-.Sh DESCRIPTION
-The
-.Nm
-driver handles on-board and
-.Tn Nubus
-video frame buffers within the
-.Xr wscons 4
-console framework.
-.Pp
-All possible video modes are supported, but it is not possible to change
-resolution or color depth on the fly under
-.Ox .
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr nubus 4 ,
-.Xr wscons 4 ,
-.Xr wsdisplay 4
diff --git a/share/man/man4/man4.mac68k/mc.4 b/share/man/man4/man4.mac68k/mc.4
deleted file mode 100644
index 90160956873..00000000000
--- a/share/man/man4/man4.mac68k/mc.4
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"	$OpenBSD: mc.4,v 1.10 2007/05/31 19:19:55 jmc Exp $
-.\"	$NetBSD: mc.4,v 1.1 1997/12/18 06:22:45 ender Exp $
-.\"
-.\" Copyright (c) 1997 David Huang <khym@bga.com>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt MC 4 mac68k
-.Os
-.Sh NAME
-.Nm mc
-.Nd Am79C940 (MACE) on-board Ethernet device
-.Sh SYNOPSIS
-.Cd "mc* at obio?"
-.Sh DESCRIPTION
-The
-.Nm
-interface provides access to a 10 Mb/s Ethernet network via the AMD Am79C940
-(MACE) Ethernet chip set.
-.Sh HARDWARE
-The
-.Nm
-interface supports the on-board Ethernet of the following machines:
-.Bd -filled -offset indent
-.Bl -item -compact
-.It
-Centris 660AV
-.It
-Quadra 660AV
-.It
-Quadra 840AV
-.El
-.Ed
-.Sh SEE ALSO
-.Xr ae 4 ,
-.Xr arp 4 ,
-.Xr ifmedia 4 ,
-.Xr inet 4 ,
-.Xr intro 4 ,
-.Xr netintro 4 ,
-.Xr sn 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-interface first appeared in
-.Nx 1.3 .
-.Sh AUTHORS
-The
-.Nm
-Ethernet driver was written by Dave Huang.
diff --git a/share/man/man4/man4.mac68k/mem.4 b/share/man/man4/man4.mac68k/mem.4
deleted file mode 100644
index 9931213b4f0..00000000000
--- a/share/man/man4/man4.mac68k/mem.4
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This software was developed by the Computer Systems Engineering group
-.\" at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
-.\" contributed to Berkeley.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     from: @(#)mem.4	8.1 (Berkeley) 6/5/93
-.\"	$OpenBSD: mem.4,v 1.5 2007/05/31 19:19:55 jmc Exp $
-.\"	$NetBSD: mem.4,v 1.1 1997/06/08 17:40:57 ender Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt MEM 4 mac68k
-.Os
-.Sh NAME
-.Nm mem ,
-.Nm kmem
-.Nd memory files
-.Sh DESCRIPTION
-The file
-.Pa /dev/mem
-is an interface to the physical memory of the computer.
-Byte offsets in this file are interpreted as physical memory addresses.
-Reading and writing this file is equivalent to reading and writing
-memory itself.
-An error will be returned if an attempt is made to reference
-an offset outside of
-.Pa /dev/mem .
-.Pp
-Kernel virtual memory is accessed via the file
-.Pa /dev/kmem
-in the same manner as
-.Pa /dev/mem .
-Only kernel virtual addresses that are currently mapped to memory are allowed.
-.Pp
-On the
-.Tn Macintosh ,
-physical memory may be discontiguous;
-kernel virtual memory begins at
-.Ad 0x00000000 .
-.Pp
-Writeability of these devices is controlled by the system
-.Xr securelevel 7 .
-.Sh FILES
-.Bl -tag -width /dev/kmem -compact
-.It /dev/mem
-.It /dev/kmem
-.El
-.Sh SEE ALSO
-.Xr securelevel 7
-.Sh HISTORY
-The
-.Pa /dev/mem
-and
-.Pa /dev/kmem
-files appeared in
-.At v6 .
diff --git a/share/man/man4/man4.mac68k/ncrscsi.4 b/share/man/man4/man4.mac68k/ncrscsi.4
deleted file mode 100644
index e4c1de08e66..00000000000
--- a/share/man/man4/man4.mac68k/ncrscsi.4
+++ /dev/null
@@ -1,59 +0,0 @@
-.\"	$OpenBSD: ncrscsi.4,v 1.3 2007/05/31 19:19:55 jmc Exp $
-.\"
-.\" Copyright (c) 2005 Martin Reindl <martin@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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt NCRSCSI 4 mac68k
-.Os
-.Sh NAME
-.Nm ncrscsi ,
-.Nm sbc
-.Nd NCR 5380 on-board SCSI interface
-.Sh SYNOPSIS
-.Cd "ncrscsi0 at obio?"
-.Cd "sbc0 at obio?"
-.Sh DESCRIPTION
-The
-.Nm ncrscsi
-and
-.Nm sbc
-support on-board SCSI controllers based on the NCR 5380 chip, found
-on Apple Macintosh II-series, Performa, and LC-series machines.
-Only one of
-.Nm ncrscsi
-or
-.Nm sbc
-should be enabled in the kernel via
-.Xr config 8 .
-.Pp
-Tape devices should be allowed to disconnect for the SCSI bus to operate
-acceptably.
-.Sh SEE ALSO
-.Xr cd 4 ,
-.Xr ch 4 ,
-.Xr intro 4 ,
-.Xr obio 4 ,
-.Xr scsi 4 ,
-.Xr sd 4 ,
-.Xr st 4 ,
-.Xr uk 4 ,
-.Xr config 8
-.Sh HISTORY
-The
-.Nm ncrscsi
-and
-.Nm sbc
-drivers first appeared in
-.Ox 2.0 .
diff --git a/share/man/man4/man4.mac68k/nubus.4 b/share/man/man4/man4.mac68k/nubus.4
deleted file mode 100644
index 667bb1d6377..00000000000
--- a/share/man/man4/man4.mac68k/nubus.4
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"	$OpenBSD: nubus.4,v 1.3 2007/05/31 19:19:55 jmc Exp $
-.\"
-.\" Copyright (c) 2004 Martin Reindl <martin@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.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt NUBUS 4 mac68k
-.Os
-.Sh NAME
-.Nm nubus
-.Nd Mac68k nubus support and drivers
-.Sh SYNOPSIS
-.Cd "nubus0 at mainbus?"
-.Sh DESCRIPTION
-The
-.Nm
-is a simple backplane bus found on numerous mac68k machines.
-Only extension boards are supported.
-The
-.Nm
-90 IEEE Std 1196-1987 defines the bus protocol as well as the electrical and
-mechanical properties of the extension slots.
-.Sh SEE ALSO
-.Xr ae 4 ,
-.Xr macfb 4 ,
-.Xr sn 4
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Ox 1.2 .
diff --git a/share/man/man4/man4.mac68k/obio.4 b/share/man/man4/man4.mac68k/obio.4
deleted file mode 100644
index 2ab89f182cb..00000000000
--- a/share/man/man4/man4.mac68k/obio.4
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Colin Wood
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Colin Wood
-.\"      for the NetBSD Project.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$OpenBSD: obio.4,v 1.17 2007/05/31 19:19:55 jmc Exp $
-.\"	$NetBSD: obio.4,v 1.1 1997/07/18 02:13:40 ender Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt OBIO 4 mac68k
-.Os
-.Sh NAME
-.Nm obio
-.Nd Mac68k onboard I/O bus device
-.Sh SYNOPSIS
-.Cd "obio0 at mainbus?"
-.Sh DESCRIPTION
-The
-.Nm
-interface serves as an abstraction used by the autoconfiguration
-system to help find and attach devices
-.Pq e.g. the Ethernet or Tn SCSI controllers
-connected to the
-.Tn Macintosh
-onboard I/O bus.
-.Pp
-.Ox
-provides support for the following devices:
-.Pp
-.Bl -tag -width 12n -offset indent -compact
-.It Xr asc 4
-Apple Sound Chip on-board audio device
-.It Xr esp 4
-ESP NCR 53c96 on-board SCSI interface
-.It Xr macfb 4
-Macintosh frame buffers
-.It Xr mc 4
-Am79C940 (MACE) on-board Ethernet device
-.It Xr ncrscsi 4
-NCR 5380 on-board SCSI interface
-.It Xr sbc 4
-NCR 5380 on-board SCSI interface
-.It Xr sn 4
-SONIC-based Ethernet device
-.It Xr zsc 4
-Zilog 8530 (ZSCC) serial communications driver
-.El
-.Sh SEE ALSO
-.Xr adb 4 ,
-.Xr intro 4 ,
-.Xr mainbus 4
-.Sh HISTORY
-The
-.Nm
-first appeared in
-.Ox 2.0 .
diff --git a/share/man/man4/man4.mac68k/sn.4 b/share/man/man4/man4.mac68k/sn.4
deleted file mode 100644
index 8570c727a57..00000000000
--- a/share/man/man4/man4.mac68k/sn.4
+++ /dev/null
@@ -1,77 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Colin Wood
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Colin Wood.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$OpenBSD: sn.4,v 1.8 2007/05/31 19:19:55 jmc Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt SN 4 mac68k
-.Os
-.Sh NAME
-.Nm sn
-.Nd SONIC-based Ethernet device
-.Sh SYNOPSIS
-.Cd "sn* at obio?"
-.Cd "sn* at nubus?"
-.Sh DESCRIPTION
-The
-.Nm
-interface provides access to a 10 Mb/s Ethernet network via the
-National Semiconductor DP83932 (SONIC) Ethernet chip set.
-.Sh HARDWARE
-The
-.Nm
-interface is currently known to support the following NuBus cards:
-.Bd -filled -offset indent
-.Bl -item -compact
-.It
-Cayman Gatorcard PDS
-.It
-Dayna DaynaPort/E30
-.El
-.Ed
-.Pp
-In addition, the
-.Nm
-interface supports on-board Ethernet for 500-series PowerBooks and
-non-AV Quadras.
-.Sh SEE ALSO
-.Xr ae 4 ,
-.Xr arp 4 ,
-.Xr ifmedia 4 ,
-.Xr inet 4 ,
-.Xr intro 4 ,
-.Xr mc 4 ,
-.Xr netintro 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-interface first appeared in
-.Ox 2.1 .
diff --git a/share/man/man4/man4.mac68k/zsc.4 b/share/man/man4/man4.mac68k/zsc.4
deleted file mode 100644
index f524480870d..00000000000
--- a/share/man/man4/man4.mac68k/zsc.4
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$OpenBSD: zsc.4,v 1.6 2008/06/26 05:42:07 ray Exp $
-.\"	$NetBSD: zstty.4,v 1.7 2003/05/06 08:15:04 wiz Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Gordon W. Ross.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Systems Programming Group of the University of Utah Computer
-.\" Science Department.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     from: @(#)dca.4	5.2 (Berkeley) 3/27/91
-.\"	$NetBSD: zsc.4,v 1.5 2003/08/07 10:31:07 agc Exp $
-.\"
-.Dd $Mdocdate: June 26 2008 $
-.Dt ZSC 4 mac68k
-.Os
-.Sh NAME
-.Nm zsc
-.Nd
-.Tn Zilog
-8530 (ZSCC) serial communications driver
-.Sh SYNOPSIS
-.Cd "zsc0 at obio?"
-.Cd "zstty* at zsc?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for Z8530- and Z85230-compatible
-.Tn EIA
-.Tn RS-232C
-.Pf ( Tn CCITT
-.Tn V.28 )
-Dual
-.Tn UART
-chips.
-The Z8530 has a 3 character buffer, while the Z85230 has an 8 character buffer.
-However, due to limitations in the design of the Z85230, the driver is unable
-to distinguish it from the Z8530 and will not enable any enhanced features of
-the device.
-.Pp
-Input and output for each line may be set to any baud rate in the
-range from 50 to 115200 (though some machines will not support more than
-38400 reliably).
-.Pp
-The
-.Nm zstty
-driver provides a terminal interface, supporting all the standard
-.Xr tty 4
-ioctl calls.
-.Sh FILES
-.Bl -tag -width /dev/ttya -compact
-.It Pa /dev/ttya
-.It Pa /dev/ttyb
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr intro 4 ,
-.Xr obio 4 ,
-.Xr tty 4
-.Sh BUGS
-Due to the small character buffer on the
-.Tn Zilog
-8530 chip, the driver has very strict latency requirements for its interrupt
-service routine.
-As a result, data loss may occur when using high speeds, particularly on older
-(68020 or 68030) Macintosh models and on busy systems.
diff --git a/share/man/man8/man8.mac68k/MAKEDEV.8 b/share/man/man8/man8.mac68k/MAKEDEV.8
deleted file mode 100644
index 28599d032cc..00000000000
--- a/share/man/man8/man8.mac68k/MAKEDEV.8
+++ /dev/null
@@ -1,199 +0,0 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.44 2012/04/06 15:32:57 jsing Exp $
-.\"
-.\" 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.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
-.\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
-.\"
-.\" Copyright (c) 2004, Miodrag Vallat
-.\" 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.
-.\"
-.Dd $Mdocdate: April 6 2012 $
-.Dt MAKEDEV 8 mac68k
-.Os
-.Sh NAME
-.Nm MAKEDEV
-.Nd create system and device special files
-.Sh SYNOPSIS
-.Nm MAKEDEV
-.Ar name ...
-.Sh DESCRIPTION
-The shell script
-.Nm ,
-found in the
-.Pa /dev
-directory, is used to create various special files.
-See
-.Xr intro 4
-for a more complete discussion of special files.
-.Pp
-.Nm
-takes any number of device names as arguments, where the names are
-the common abbreviation for the device or group of devices.
-.Pp
-Where a device name is followed by a star
-.Sq * ,
-the star must be replaced by a unit number.
-If units are expected for a device but not provided,
-.Nm
-will supply the standard numbers in most cases.
-.Pp
-The mac68k supports the following devices:
-.Pp
-.Sy Special device names
-.Bl -tag -width tenletters -compact
-.It Ar all
-Creates special files for all devices on mac68k.
-.It Ar ramdisk
-Ramdisk kernel devices.
-.It Ar std
-Creates the
-.Sq standard
-devices (console, klog, kmem, ksyms, mem, null,
-stderr, stdin, stdout, tty, zero)
-which are absolutely necessary for the system to function properly.
-.It Ar local
-Creates configuration-specific devices, by invoking the shell file
-.Pa MAKEDEV.local .
-.El
-.Pp
-.Sy Disks
-.Bl -tag -width tenletters -compact
-.It Ar cd*
-ATAPI and SCSI CD-ROM drives, see
-.Xr cd 4 .
-.It Ar rd*
-.Dq rd
-pseudo-disks, see
-.Xr rd 4 .
-.It Ar sd*
-SCSI disks, including flopticals, see
-.Xr sd 4 .
-.It Ar vnd*
-.Dq file
-pseudo-disk devices, see
-.Xr vnd 4 .
-.El
-.Pp
-.Sy Tapes
-.Bl -tag -width tenletters -compact
-.It Ar ch*
-SCSI media changers, see
-.Xr ch 4 .
-.It Ar st*
-SCSI tape drives, see
-.Xr st 4 .
-.El
-.Pp
-.Sy Terminal ports
-.Bl -tag -width tenletters -compact
-.It Ar tty00
-Standard serial port, see
-.Xr zsc 4 .
-.El
-.Pp
-.Sy Pseudo terminals
-.Bl -tag -width tenletters -compact
-.It Ar ptm
-pty master device, see
-.Xr ptm 4 .
-.It Ar pty*
-Set of 62 master pseudo terminals, see
-.Xr pty 4 .
-.It Ar tty*
-Set of 62 slave pseudo terminals, see
-.Xr tty 4 .
-.El
-.Pp
-.Sy Console ports
-.Bl -tag -width tenletters -compact
-.It Ar ttyC-J*
-wscons display devices, see
-.Xr wsdisplay 4 .
-.It Ar wscons
-Minimal wscons devices, see
-.Xr wscons 4 .
-.It Ar wskbd*
-wscons keyboards, see
-.Xr wskbd 4 .
-.It Ar wsmux
-wscons keyboard/mouse mux devices, see
-.Xr wsmux 4 .
-.El
-.Pp
-.Sy Pointing devices
-.Bl -tag -width tenletters -compact
-.It Ar wsmouse*
-wscons mice, see
-.Xr wsmouse 4 .
-.El
-.Pp
-.Sy Special purpose devices
-.Bl -tag -width tenletters -compact
-.It Ar asc*
-ASC Audio device, see
-.Xr asc 4 .
-.It Ar bio
-ioctl tunnel pseudo-device, see
-.Xr bio 4 .
-.It Ar bpf*
-Berkeley Packet Filter, see
-.Xr bpf 4 .
-.It Ar diskmap
-Disk mapper, see
-.Xr diskmap 4 .
-.It Ar fd
-fd/* nodes, see
-.Xr fd 4 .
-.It Ar lkm
-Loadable kernel modules interface, see
-.Xr lkm 4 .
-.It Ar nnpfs*
-NNPFS filesystem node, see
-.Xr mount_nnpfs 8 .
-.It Ar pf*
-Packet Filter, see
-.Xr pf 4 .
-.It Ar pppx*
-PPP Multiplexer, see
-.Xr pppx 4 .
-.It Ar *random
-In-kernel random data source, see
-.Xr random 4 .
-.It Ar systrace*
-System call tracing device, see
-.Xr systrace 4 .
-.It Ar tun*
-Network tunnel driver, see
-.Xr tun 4 .
-.It Ar uk*
-Unknown SCSI devices, see
-.Xr uk 4 .
-.It Ar vscsi*
-Virtual SCSI controller, see
-.Xr vscsi 8 .
-.El
-.Sh FILES
-.Bl -tag -width /dev -compact
-.It Pa /dev
-The special file directory.
-.El
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr config 8 ,
-.Xr mknod 8
diff --git a/share/man/man8/man8.mac68k/Makefile b/share/man/man8/man8.mac68k/Makefile
deleted file mode 100644
index 3dfc5b7e51c..00000000000
--- a/share/man/man8/man8.mac68k/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.5 2002/04/09 17:29:23 deraadt Exp $
-#	$NetBSD: Makefile,v 1.3 1995/09/06 21:36:37 jtc Exp $
-
-MAN=	MAKEDEV.8 boot_mac68k.8
-MANSUBDIR=mac68k
-
-.include <bsd.prog.mk>
diff --git a/share/man/man8/man8.mac68k/boot_mac68k.8 b/share/man/man8/man8.mac68k/boot_mac68k.8
deleted file mode 100644
index 3bb0d665d36..00000000000
--- a/share/man/man8/man8.mac68k/boot_mac68k.8
+++ /dev/null
@@ -1,141 +0,0 @@
-.\"	$OpenBSD: boot_mac68k.8,v 1.9 2007/05/31 19:19:59 jmc Exp $
-.\"	$NetBSD: boot_mac68k.8,v 1.1 1995/07/02 02:09:52 briggs Exp $
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Systems Programming Group of the University of Utah Computer
-.\" Science Department.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	From:
-.\"	@(#)boot_hp300.8	8.2 (Berkeley) 4/19/94
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt BOOT_MAC68K 8 mac68k
-.Os
-.Sh NAME
-.Nm boot_mac68k
-.Nd
-.Tn mac68k-specific
-system bootstrapping procedures
-.Sh DESCRIPTION
-.Ss Power fail and crash recovery
-Normally, the
-.Ox
-kernel on the mac68k architecture is booted from the native operating
-system by means of an application program.
-When the kernel takes over,
-it initializes itself and proceeds to boot the system.
-An automatic
-consistency check of the file systems takes place, and unless this
-fails, the system comes up to multi-user operations.
-The proper way to shut the system down is with the
-.Xr shutdown 8
-command.
-.Pp
-If the system crashes, it will enter the kernel debugger,
-.Xr ddb 4 ,
-if it is configured in the kernel.
-If the debugger is not present
-or has exited, the system will attempt a dump to the
-configured dump device (which will be automatically recovered with
-.Xr savecore 8
-during the next boot cycle).
-After the dump completes (successful
-or not), the system will attempt a reboot.
-.Pp
-On most mac68k machines with
-.Dq soft-power
-after the IIcx, the power
-switch can be physically rotated and locked in the
-.Dq on
-position.
-The native OS can be configured to automatically start the
-.Ox
-boot program.
-Additionally, the
-.Ox
-boot program can be configured to boot
-.Ox
-without intervention.
-When a system is so configured, it can crash
-or lose power and reboot back to a fully multi-user state without
-any intervention.
-.Ss The boot application
-The boot application runs in the native OS on the system.
-It has a
-dialog where booting preferences may be changed and an option whereby
-these options may be saved.
-The preferences are stored in the program
-itself, not in a preferences folder, thus allowing two separate copies
-of the program to be configured differently (e.g., to boot different
-bsd or bsd.test, or to boot from two different drives).
-.Pp
-One option that may be specified is a boot to single-user mode.
-This stops the boot process very early on and allows system maintenance.
-If one wishes to provide some security at this phase of the boot, remove
-the
-.Dq secure
-option from ttye0 in the
-.Xr ttys 5
-file.
-.Pp
-Another useful option that may be specified is the
-.Dq serial console
-option.
-This will allow a serial device (terminal or computer) to
-act as a console for the system.
-This device must be configured to
-use 9600 baud, eight bits, no parity, and one stop bit (9600-8N1).
-Either the printer port or the modem port (tty01 and tty00,
-respectively) may be used for this.
-.Pp
-It is sometimes useful to boot a kernel that resides in a folder
-in native OS rather than from the usual location in the
-.Ox
-file system.
-A radio button is supplied for this purpose.
-The kernel may be compressed using
-.Xr gzip 1 .
-Note that some programs will not run properly if the kernel is not found as
-.Pa /bsd
-within the
-.Ox
-file system.
-.Sh FILES
-.Bl -tag -width /bsd.rd -compact
-.It Pa /bsd
-system kernel
-.It Pa /bsd.rd
-standalone installation kernel, suitable for disaster recovery
-.El
-.Sh SEE ALSO
-.Xr ddb 4 ,
-.Xr ttys 5 ,
-.Xr savecore 8 ,
-.Xr shutdown 8
diff --git a/usr.sbin/wsconscfg/Makefile b/usr.sbin/wsconscfg/Makefile
index a12df77a5d8..3072e2fb7d6 100644
--- a/usr.sbin/wsconscfg/Makefile
+++ b/usr.sbin/wsconscfg/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.31 2010/01/30 20:48:53 miod Exp $
+#	$OpenBSD: Makefile,v 1.32 2012/06/20 18:45:44 matthew Exp $
 
 .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
     ${MACHINE} == "armish" || ${MACHINE} == "hp300" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "hppa64" || \
     ${MACHINE} == "i386" || ${MACHINE} == "landisk" || \
     ${MACHINE} == "loongson" || ${MACHINE} == "luna88k" || \
-    ${MACHINE} == "mac68k" || ${MACHINE} == "macppc" || \
+    ${MACHINE} == "macppc" || \
     ${MACHINE} == "palm" || ${MACHINE} == "sgi" || \
     ${MACHINE} == "socppc" || ${MACHINE} == "sparc" || \
     ${MACHINE} == "sparc64" || ${MACHINE} == "vax" || \