Prepare for the removal of amiga and sun3 platforms from the tree.

There has not been enough activity and interest towards these platform
to keep them lying in the tree.

23 files changed, 49 insertions, 199 deletions

diff --git a/distrib/Makefile b/distrib/Makefile
index c0f8ac8192a..8d804896226 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.20 2001/09/18 14:31:45 jason Exp $
+#	$OpenBSD: Makefile,v 1.21 2002/12/31 16:22:22 miod Exp $
 
 .if	make(obj)
-SUBDIR= special alpha amiga crunch hp300 i386 mac68k macppc mvme68k \
-	mvme88k mvmeppc sparc sparc64 sun3 vax
+SUBDIR= special alpha crunch hp300 i386 mac68k macppc mvme68k \
+	mvme88k mvmeppc sparc sparc64 vax
 .elif	!make(install)
 SUBDIR= special
 .endif
diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index 7771c0e9469..27167dbe7f9 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2002/12/19 01:00:11 miod Exp $
+#	$OpenBSD: Makefile,v 1.18 2002/12/31 16:22:24 miod Exp $
 
 NOPROG=
 NOMAN=
@@ -16,8 +16,8 @@ all:	$(TARG)
 
 allarchs:
 	@cd $(.CURDIR); \
-	for arch in alpha amiga hp300 hppa i386 mac68k macppc mvme68k sparc \
-	    sparc64 sun3 vax ; do ${MAKE} M=$$arch; done;
+	for arch in alpha hp300 hppa i386 mac68k macppc mvme68k sparc \
+	    sparc64 vax ; do ${MAKE} M=$$arch; done;
 
 $(TARG): $(DEP)
 	m4 -DOSREV=$(OSREV) -DOSrev=$(OSrev) -DINCLUDE=$(.CURDIR)/$M \
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index b9a0ad799eb..e20d055c674 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1728,8 +1728,6 @@
 ./usr/libdata/lint/llib-lstdc.ln
 ./usr/libexec/lint1
 ./usr/libexec/lint2
-./usr/sbin/gspa
-./usr/sbin/gspahextoc
 ./usr/sbin/kgmon
 ./usr/share/lkm/README
 ./usr/share/lkm/misc/Makefile
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 83cdaee36db..7d3d9abdc1e 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -172,7 +172,6 @@
 ./usr/share/man/cat1/afslog.0
 ./usr/share/man/cat1/alias.0
 ./usr/share/man/cat1/alpha
-./usr/share/man/cat1/amiga
 ./usr/share/man/cat1/apply.0
 ./usr/share/man/cat1/apropos.0
 ./usr/share/man/cat1/arch.0
@@ -286,8 +285,6 @@
 ./usr/share/man/cat1/grops.0
 ./usr/share/man/cat1/grotty.0
 ./usr/share/man/cat1/groups.0
-./usr/share/man/cat1/gspa.0
-./usr/share/man/cat1/gspahextoc.0
 ./usr/share/man/cat1/gunzip.0
 ./usr/share/man/cat1/gzcat.0
 ./usr/share/man/cat1/gzexe.0
@@ -594,8 +591,6 @@
 ./usr/share/man/cat1/stty.0
 ./usr/share/man/cat1/su.0
 ./usr/share/man/cat1/sum.0
-./usr/share/man/cat1/sun3
-./usr/share/man/cat1/sun3/screenblank.0
 ./usr/share/man/cat1/sup.0
 ./usr/share/man/cat1/suspend.0
 ./usr/share/man/cat1/systat.0
@@ -682,7 +677,6 @@
 ./usr/share/man/cat2/i386
 ./usr/share/man/cat3
 ./usr/share/man/cat3/alpha
-./usr/share/man/cat3/amiga
 ./usr/share/man/cat3/hp300
 ./usr/share/man/cat3/hppa
 ./usr/share/man/cat3/i386
@@ -693,7 +687,6 @@
 ./usr/share/man/cat3/mvmeppc
 ./usr/share/man/cat3/sparc
 ./usr/share/man/cat3/sparc64
-./usr/share/man/cat3/sun3
 ./usr/share/man/cat3/vax
 ./usr/share/man/cat3p
 ./usr/share/man/cat3p/AnyDBM_File.0
@@ -1022,29 +1015,6 @@
 ./usr/share/man/cat4/alpha/tga.0
 ./usr/share/man/cat4/amdpm.0
 ./usr/share/man/cat4/ami.0
-./usr/share/man/cat4/amiga
-./usr/share/man/cat4/amiga/ae.0
-./usr/share/man/cat4/amiga/afsc.0
-./usr/share/man/cat4/amiga/ahsc.0
-./usr/share/man/cat4/amiga/atzsc.0
-./usr/share/man/cat4/amiga/autoconf.0
-./usr/share/man/cat4/amiga/bah.0
-./usr/share/man/cat4/amiga/console.0
-./usr/share/man/cat4/amiga/ed.0
-./usr/share/man/cat4/amiga/es.0
-./usr/share/man/cat4/amiga/gtsc.0
-./usr/share/man/cat4/amiga/intro.0
-./usr/share/man/cat4/amiga/ite.0
-./usr/share/man/cat4/amiga/joy.0
-./usr/share/man/cat4/amiga/kmem.0
-./usr/share/man/cat4/amiga/le.0
-./usr/share/man/cat4/amiga/mem.0
-./usr/share/man/cat4/amiga/mfcs.0
-./usr/share/man/cat4/amiga/mgnsc.0
-./usr/share/man/cat4/amiga/qn.0
-./usr/share/man/cat4/amiga/ser.0
-./usr/share/man/cat4/amiga/wesc.0
-./usr/share/man/cat4/amiga/zssc.0
 ./usr/share/man/cat4/amphy.0
 ./usr/share/man/cat4/an.0
 ./usr/share/man/cat4/arandom.0
@@ -1418,16 +1388,6 @@
 ./usr/share/man/cat4/stge.0
 ./usr/share/man/cat4/sti.0
 ./usr/share/man/cat4/stp.0
-./usr/share/man/cat4/sun3
-./usr/share/man/cat4/sun3/bwtwo.0
-./usr/share/man/cat4/sun3/cgfour.0
-./usr/share/man/cat4/sun3/cgtwo.0
-./usr/share/man/cat4/sun3/ie.0
-./usr/share/man/cat4/sun3/intro.0
-./usr/share/man/cat4/sun3/kmem.0
-./usr/share/man/cat4/sun3/le.0
-./usr/share/man/cat4/sun3/leds.0
-./usr/share/man/cat4/sun3/mem.0
 ./usr/share/man/cat4/sv.0
 ./usr/share/man/cat4/svnd.0
 ./usr/share/man/cat4/systrace.0
@@ -1530,7 +1490,6 @@
 ./usr/share/man/cat5/afsd.conf.0
 ./usr/share/man/cat5/aliases.0
 ./usr/share/man/cat5/alpha
-./usr/share/man/cat5/amiga
 ./usr/share/man/cat5/bootparams.0
 ./usr/share/man/cat5/bootptab.0
 ./usr/share/man/cat5/bridgename.if.0
@@ -1627,7 +1586,6 @@
 ./usr/share/man/cat5/sshd_config.0
 ./usr/share/man/cat5/stab.0
 ./usr/share/man/cat5/sudoers.0
-./usr/share/man/cat5/sun3
 ./usr/share/man/cat5/sysctl.conf.0
 ./usr/share/man/cat5/syslog.conf.0
 ./usr/share/man/cat5/term.0
@@ -1702,15 +1660,6 @@
 ./usr/share/man/cat8/alpha/wsfontload.0
 ./usr/share/man/cat8/alpha/wsmoused.0
 ./usr/share/man/cat8/amd.0
-./usr/share/man/cat8/amiga
-./usr/share/man/cat8/amiga/MAKEDEV.0
-./usr/share/man/cat8/amiga/binpatch.0
-./usr/share/man/cat8/amiga/boot_amiga.0
-./usr/share/man/cat8/amiga/grfconfig.0
-./usr/share/man/cat8/amiga/installboot.0
-./usr/share/man/cat8/amiga/iteconfig.0
-./usr/share/man/cat8/amiga/loadbsd.0
-./usr/share/man/cat8/amiga/loadkmap.0
 ./usr/share/man/cat8/amq.0
 ./usr/share/man/cat8/ancontrol.0
 ./usr/share/man/cat8/apachectl.0
@@ -2056,11 +2005,6 @@
 ./usr/share/man/cat8/string2key.0
 ./usr/share/man/cat8/sudo.0
 ./usr/share/man/cat8/suexec.0
-./usr/share/man/cat8/sun3
-./usr/share/man/cat8/sun3/MAKEDEV.0
-./usr/share/man/cat8/sun3/boot_sun3.0
-./usr/share/man/cat8/sun3/eeprom.0
-./usr/share/man/cat8/sun3/installboot.0
 ./usr/share/man/cat8/supfilesrv.0
 ./usr/share/man/cat8/supscan.0
 ./usr/share/man/cat8/supservers.0
@@ -2120,7 +2064,6 @@
 ./usr/share/man/cat8/zic.0
 ./usr/share/man/cat9
 ./usr/share/man/cat9/alpha
-./usr/share/man/cat9/amiga
 ./usr/share/man/cat9/hp300
 ./usr/share/man/cat9/hppa
 ./usr/share/man/cat9/i386
@@ -2131,11 +2074,9 @@
 ./usr/share/man/cat9/mvmeppc
 ./usr/share/man/cat9/sparc
 ./usr/share/man/cat9/sparc64
-./usr/share/man/cat9/sun3
 ./usr/share/man/cat9/vax
 ./usr/share/man/man1
 ./usr/share/man/man1/alpha
-./usr/share/man/man1/amiga
 ./usr/share/man/man1/hp300
 ./usr/share/man/man1/hppa
 ./usr/share/man/man1/i386
@@ -2146,14 +2087,12 @@
 ./usr/share/man/man1/mvmeppc
 ./usr/share/man/man1/sparc
 ./usr/share/man/man1/sparc64
-./usr/share/man/man1/sun3
 ./usr/share/man/man1/vax
 ./usr/share/man/man2
 ./usr/share/man/man3
 ./usr/share/man/man3p
 ./usr/share/man/man4
 ./usr/share/man/man4/alpha
-./usr/share/man/man4/amiga
 ./usr/share/man/man4/hp300
 ./usr/share/man/man4/hppa
 ./usr/share/man/man4/i386
@@ -2164,14 +2103,12 @@
 ./usr/share/man/man4/mvmeppc
 ./usr/share/man/man4/sparc
 ./usr/share/man/man4/sparc64
-./usr/share/man/man4/sun3
 ./usr/share/man/man4/vax
 ./usr/share/man/man5
 ./usr/share/man/man6
 ./usr/share/man/man7
 ./usr/share/man/man8
 ./usr/share/man/man8/alpha
-./usr/share/man/man8/amiga
 ./usr/share/man/man8/hp300
 ./usr/share/man/man8/hppa
 ./usr/share/man/man8/i386
@@ -2182,12 +2119,10 @@
 ./usr/share/man/man8/mvmeppc
 ./usr/share/man/man8/sparc
 ./usr/share/man/man8/sparc64
-./usr/share/man/man8/sun3
 ./usr/share/man/man8/vax
 ./usr/share/man/man9
 ./usr/share/man/ps1
 ./usr/share/man/ps1/alpha
-./usr/share/man/ps1/amiga
 ./usr/share/man/ps1/hp300
 ./usr/share/man/ps1/hppa
 ./usr/share/man/ps1/i386
@@ -2198,13 +2133,11 @@
 ./usr/share/man/ps1/mvmeppc
 ./usr/share/man/ps1/sparc
 ./usr/share/man/ps1/sparc64
-./usr/share/man/ps1/sun3
 ./usr/share/man/ps1/vax
 ./usr/share/man/ps2
 ./usr/share/man/ps2/i386
 ./usr/share/man/ps3
 ./usr/share/man/ps3/alpha
-./usr/share/man/ps3/amiga
 ./usr/share/man/ps3/hp300
 ./usr/share/man/ps3/hppa
 ./usr/share/man/ps3/i386
@@ -2215,12 +2148,10 @@
 ./usr/share/man/ps3/mvmeppc
 ./usr/share/man/ps3/sparc
 ./usr/share/man/ps3/sparc64
-./usr/share/man/ps3/sun3
 ./usr/share/man/ps3/vax
 ./usr/share/man/ps3p
 ./usr/share/man/ps4
 ./usr/share/man/ps4/alpha
-./usr/share/man/ps4/amiga
 ./usr/share/man/ps4/hp300
 ./usr/share/man/ps4/hppa
 ./usr/share/man/ps4/i386
@@ -2231,11 +2162,9 @@
 ./usr/share/man/ps4/mvmeppc
 ./usr/share/man/ps4/sparc
 ./usr/share/man/ps4/sparc64
-./usr/share/man/ps4/sun3
 ./usr/share/man/ps4/vax
 ./usr/share/man/ps5
 ./usr/share/man/ps5/alpha
-./usr/share/man/ps5/amiga
 ./usr/share/man/ps5/hp300
 ./usr/share/man/ps5/hppa
 ./usr/share/man/ps5/i386
@@ -2246,13 +2175,11 @@
 ./usr/share/man/ps5/mvmeppc
 ./usr/share/man/ps5/sparc
 ./usr/share/man/ps5/sparc64
-./usr/share/man/ps5/sun3
 ./usr/share/man/ps5/vax
 ./usr/share/man/ps6
 ./usr/share/man/ps7
 ./usr/share/man/ps8
 ./usr/share/man/ps8/alpha
-./usr/share/man/ps8/amiga
 ./usr/share/man/ps8/hp300
 ./usr/share/man/ps8/hppa
 ./usr/share/man/ps8/i386
@@ -2263,11 +2190,9 @@
 ./usr/share/man/ps8/mvmeppc
 ./usr/share/man/ps8/sparc
 ./usr/share/man/ps8/sparc64
-./usr/share/man/ps8/sun3
 ./usr/share/man/ps8/vax
 ./usr/share/man/ps9
 ./usr/share/man/ps9/alpha
-./usr/share/man/ps9/amiga
 ./usr/share/man/ps9/hp300
 ./usr/share/man/ps9/hppa
 ./usr/share/man/ps9/i386
@@ -2278,7 +2203,6 @@
 ./usr/share/man/ps9/mvmeppc
 ./usr/share/man/ps9/sparc
 ./usr/share/man/ps9/sparc64
-./usr/share/man/ps9/sun3
 ./usr/share/man/ps9/vax
 ./usr/share/texinfo
 ./usr/share/texinfo/texinfo.dtd
diff --git a/etc/MAKEDEV.mi b/etc/MAKEDEV.mi
index 8e9909b8d9e..0b6c3825974 100644
--- a/etc/MAKEDEV.mi
+++ b/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.53 2002/12/05 04:30:21 kjc Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.54 2002/12/31 16:22:25 miod Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -196,7 +196,6 @@ twrget(all, ceg, cgeight, 0)dnl
 twrget(all, cfo, cgfourteen, 0)dnl
 target(all, tcx, 0)dnl
 twrget(all, grf_mac, grf, 0, 1, 2, 3)dnl
-twrget(all, grf_amiga, grf, 0, 1, 2, 3, 4, 5, 6)dnl
 target(all, par, 0)dnl
 twrget(all, amouse, mouse, 0, 1)dnl
 twrget(all, akbd, kbd)dnl
@@ -513,7 +512,6 @@ __devitem(arm_tty, tty*, {-alias for PC COM ports{-,-} this is what the system r
 __devitem(tty0, tty00, standard serial port)dnl
 __devitem(mac_tty0, tty00, standard serial port)dnl
 __devitem(ttyA, ttyA*, mfc serial ports)dnl
-__devitem(attyB, ttyB*, ISA COM ports)dnl  amiga
 __devitem(ttyz, tty[a-d], onboard zs serial ports)dnl
 __devitem(cuaz, cua[a-d], onboard zs serial ports)dnl
 __devitem(ttyB, ttyB?, DEC 3000 ZS8530 ("scc") serial ports)dnl
@@ -560,7 +558,6 @@ __devtitle(graph, Graphics devices)dnl
 __devitem(grf_mac, grf*, {-custom chip (grf0){-,-} Retina Z2/Z3 (grf1/grf2){-,-}
 {-#-}		Cirrus boards (grf3){-,-} A2410 (grf4) video or
 {-#-}		CyberVision 64 (grf5)-})dnl
-__devitem(grf_amiga, grf*, {-Motherboard bitmapped video.-})dnl
 __devitem(ite, ite*, terminal emulator interface to HP300 graphics devices)dnl
 __devitem({-hil-}, {-hil-}, HP300 HIL input devices)dnl
 __devitem(oppr, openprom)dnl
diff --git a/etc/Makefile b/etc/Makefile
index cdc0f0714e5..66120ab5325 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.173 2002/12/15 15:39:49 fgsch Exp $
+#	$OpenBSD: Makefile,v 1.174 2002/12/31 16:22:25 miod Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -321,7 +321,6 @@ snap_md:
 .endif	# DESTDIR check
 
 MAKEDEVARCHS+= alpha
-MAKEDEVARCHS+= amiga
 MAKEDEVARCHS+= hp300
 MAKEDEVARCHS+= hppa
 MAKEDEVARCHS+= i386
@@ -332,7 +331,6 @@ MAKEDEVARCHS+= mvme88k
 #MAKEDEVARCHS+= mvmeppc
 MAKEDEVARCHS+= sparc
 MAKEDEVARCHS+= sparc64
-MAKEDEVARCHS+= sun3
 #MAKEDEVARCHS+= vax
 
 clean:
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index acd66e01f0e..f8e0febda3a 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.139 2002/11/23 18:43:20 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.140 2002/12/31 16:22:25 miod Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1056,8 +1056,6 @@ cat1
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1078,8 +1076,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1107,8 +1103,6 @@ cat3
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1129,8 +1123,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1147,8 +1139,6 @@ cat4
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1169,8 +1159,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1182,8 +1170,6 @@ cat5
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1204,8 +1190,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1227,8 +1211,6 @@ cat8
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1249,8 +1231,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1262,8 +1242,6 @@ cat9
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1284,8 +1262,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1297,8 +1273,6 @@ ps1
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1319,8 +1293,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1344,8 +1316,6 @@ ps3
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1366,8 +1336,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1384,8 +1352,6 @@ ps4
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1406,8 +1372,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1419,8 +1383,6 @@ ps5
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1441,8 +1403,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1464,8 +1424,6 @@ ps8
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1486,8 +1444,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1499,8 +1455,6 @@ ps9
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1521,8 +1475,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1534,8 +1486,6 @@ man1
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1556,8 +1506,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1584,8 +1532,6 @@ man4
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1606,8 +1552,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
@@ -1634,8 +1578,6 @@ man8
 
 alpha
 ..
-amiga
-..
 hp300
 ..
 hppa
@@ -1656,8 +1598,6 @@ sparc
 ..
 sparc64
 ..
-sun3
-..
 vax
 ..
 
diff --git a/etc/remote b/etc/remote
index b50813d6af4..9fe30440d72 100644
--- a/etc/remote
+++ b/etc/remote
@@ -61,15 +61,15 @@ unixhost:\
 # Sample directly connected lines. Directly connected lines are
 # most commonly used for serial consoles.
 #
-tty00|For amiga,hp300,i386,mac68k,macppc,mvmeppc,vax:\
+tty00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\
 	:dv=/dev/tty00:tc=direct:tc=unixhost:
 
-ttya|For sun3,sparc,mvme68k:\
+ttya|For sparc,mvme68k:\
 	:dv=/dev/ttya:tc=direct:tc=unixhost:
 
 # Sample dial out lines.
 #
-cua00|For amiga,hp300,i386,mac68k,macppc,mvmeppc,vax:\
+cua00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\
 	:dv=/dev/cua00:tc=dialup:tc=unixhost:
-cuaa|For sun3,sparc,mvme68k:\
+cuaa|For sparc,mvme68k:\
 	:dv=/dev/cuaa:tc=dialup:tc=unixhost:
diff --git a/regress/etc/MAKEDEV/Makefile b/regress/etc/MAKEDEV/Makefile
index c3900717a13..fe3ebd5207a 100644
--- a/regress/etc/MAKEDEV/Makefile
+++ b/regress/etc/MAKEDEV/Makefile
@@ -1,8 +1,8 @@
 
-# $OpenBSD: Makefile,v 1.13 2002/09/02 20:01:43 avsm Exp $
+# $OpenBSD: Makefile,v 1.14 2002/12/31 16:22:25 miod Exp $
 
-MAKEDEVARCHS+=alpha amiga hp300 hppa i386 mac68k macppc mvme68k mvme88k
-MAKEDEVARCHS+=mvmeppc sparc sparc64 sun3 vax
+MAKEDEVARCHS+=alpha hp300 hppa i386 mac68k macppc mvme68k mvme88k
+MAKEDEVARCHS+=mvmeppc sparc sparc64 vax
 
 MAKEDEVTARGS?=all ramdisk
 
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 27fb9320342..47053ab80a9 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.46 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: disklabel.8,v 1.47 2002/12/31 16:22:25 miod Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -619,7 +619,7 @@ option to
 can still be used to install old style boot code,
 but this usage is deprecated.
 .Pp
-On some machines, such as the sparc and amiga, partition tables
+On some machines, such as the sparc, partition tables
 may not exhibit the full functionality that is described above.
 .Sh BUGS
 When a disk name is given without a full pathname, the constructed
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 189596b9de7..eab17332974 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.75 2002/06/09 08:13:05 todd Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.76 2002/12/31 16:22:25 miod Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -43,7 +43,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.75 2002/06/09 08:13:05 todd Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.76 2002/12/31 16:22:25 miod Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1166,7 +1166,7 @@ edit(lp, f)
 "# disk. Any other partition is free for any use.  'size' and 'offset' are\n"
 "# in 512-byte blocks. fstype should be '4.2BSD', 'swap', or 'none' or some\n"
 "# other values.  fsize/bsize/cpg should typically be '1024 8192 16' for a\n"
-"# 4.2BSD filesystem (or '512 4096 16' except on alpha, sun4, amiga, sun3...)\n");
+"# 4.2BSD filesystem (or '512 4096 16' except on alpha, sun4, ...)\n");
 	fclose(fp);
 	for (;;) {
 		if (!editit())
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index 3a1c5c7a135..531ebe9495b 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: reboot.8,v 1.24 2001/10/27 04:32:51 pvalchev Exp $
+.\"	$OpenBSD: reboot.8,v 1.25 2002/12/31 16:22:26 miod Exp $
 .\"	$NetBSD: reboot.8,v 1.3 1995/10/05 05:36:21 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -95,7 +95,6 @@ script which is run at shutdown time
 .Xr utmp 5 ,
 .\" .Xr boot 8 ,
 .Xr boot_alpha 8 ,
-.Xr boot_amiga 8 ,
 .Xr boot_hp300 8 ,
 .Xr boot_i386 8 ,
 .Xr boot_mac68k 8 ,
@@ -104,7 +103,6 @@ script which is run at shutdown time
 .\" .Xr boot_mvmeppc 8 ,
 .Xr boot_sparc 8 ,
 .\" .Xr boot_sparc64 8 ,
-.Xr boot_sun3 8 ,
 .Xr boot_vax 8 ,
 .Xr rc.shutdown 8 ,
 .Xr savecore 8 ,
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 7a212db2dad..0404cdb78ab 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.227 2002/11/30 19:30:33 nate Exp $
+#	$OpenBSD: Makefile,v 1.228 2002/12/31 16:22:26 miod Exp $
 
 MAN=	aac.4 ac97.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 \
 	ami.4 amdpm.4 amphy.4 an.4 aria.4 ast.4 atalk.4 atapiscsi.4 \
@@ -56,9 +56,9 @@ MLINKS+=adv.4 advansys.4
 MLINKS+=pcmcia.4 pcic.4
 MLINKS+=usb.4 uhub.4
 MLINKS+=pms.4 pmsi.4
-SUBDIR=	man4.alpha man4.amiga man4.hp300 man4.hppa \
+SUBDIR=	man4.alpha man4.hp300 man4.hppa \
 	man4.i386 man4.mac68k man4.mvme68k man4.macppc man4.sparc man4.sparc64 \
-	man4.sun3 man4.vax
+	man4.vax
 
 # i386 specific
 MLINKS+= com.4 pccom.4
diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4
index 5fc47de6489..4617c8db144 100644
--- a/share/man/man4/isa.4
+++ b/share/man/man4/isa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isa.4,v 1.20 2002/11/29 07:44:56 mickey Exp $
+.\"	$OpenBSD: isa.4,v 1.21 2002/12/31 16:22:26 miod Exp $
 .\"	$NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -46,10 +46,6 @@
 .Cd "isa* at pceb?"
 .Cd "isa* at sio?"
 .Pp
-.Cd "# amiga:"
-.Cd "isa* at ggbus?"
-.Cd "isa* at cross?"
-.Pp
 Attachments are machine-dependent and depend on the bus topology and
 .Tn ISA
 bus interface of your system.
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index 3145ab2584a..dfb610bcb35 100644
--- a/share/man/man4/lpt.4
+++ b/share/man/man4/lpt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpt.4,v 1.4 2002/09/26 07:55:40 miod Exp $
+.\"	$OpenBSD: lpt.4,v 1.5 2002/12/31 16:22:26 miod Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .Nm lpt
 .Nd parallel port driver
 .Sh SYNOPSIS
-.Cd "# alpha/amiga/i386"
+.Cd "# alpha/i386"
 .Cd "lpt0 at isa? port 0x378 irq 7"
 .Cd "lpt1 at isa? port 0x278"
 .Cd "lpt2 at isa? port 0x3bc"
diff --git a/share/man/man4/pcmcia.4 b/share/man/man4/pcmcia.4
index 268bad49a2d..99fe156ad83 100644
--- a/share/man/man4/pcmcia.4
+++ b/share/man/man4/pcmcia.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcmcia.4,v 1.26 2002/09/27 22:40:28 millert Exp $
+.\"	$OpenBSD: pcmcia.4,v 1.27 2002/12/31 16:22:26 miod Exp $
 .\"	$NetBSD: pcmcia.4,v 1.4 1998/06/07 09:10:30 enami Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 .Nm pcmcia
 .Nd introduction to PCMCIA (PC Card) support
 .Sh SYNOPSIS
-.Cd "# amiga/i386"
+.Cd "# i386"
 .Cd "pcic0   at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000"
 .Cd "pcic1   at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000"
 .Cd "pcic2   at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000"
diff --git a/share/man/man4/wdc.4 b/share/man/man4/wdc.4
index ca1f8f92eb6..03f9811c53a 100644
--- a/share/man/man4/wdc.4
+++ b/share/man/man4/wdc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wdc.4,v 1.7 2002/09/26 22:09:53 miod Exp $
+.\"	$OpenBSD: wdc.4,v 1.8 2002/12/31 16:22:26 miod Exp $
 .\"	$NetBSD: wdc.4,v 1.4 1999/05/19 14:44:02 bouyer Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -39,7 +39,7 @@
 .Nm wdc
 .Nd WD100x compatible hard disk controller driver
 .Sh SYNOPSIS
-.Cd "# alpha/amiga/i386"
+.Cd "# alpha/i386"
 .Cd "wdc0 at isa? port 0x1f0 irq 14 flags 0x00"
 .Cd "wdc1 at isa? port 0x170 irq 15 flags 0x00"
 .Cd "wdc* at isapnp?"
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 0aa1e173776..3a2cebe8e1f 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.80 2002/12/31 08:33:52 pvalchev Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.81 2002/12/31 16:22:26 miod Exp $
 .\"
 .\" Copyright (c) 2000 Marc Espie
 .\"
@@ -821,7 +821,7 @@ if neither PFRAG.shared nor CONFIGURE_SHARED are enough.
 .It Ev ONLY_FOR_ARCHS
 List of architectures on which this port builds.
 Can hold both processor-specific information (e.g., m68k), and more
-specific model information (e.g., amiga).
+specific model information (e.g., hp300).
 .It Ev OPSYS
 Always
 .Ox
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index a5514dbe2b1..2fdc4d4d98d 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.40 2002/10/04 16:32:55 mickey Exp $
+#	$OpenBSD: Makefile,v 1.41 2002/12/31 16:22:26 miod Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
@@ -7,9 +7,9 @@ MAN=	afterboot.8 boot_config.8 compat_bsdos.8 compat_freebsd.8 \
 	compat_sunos.8 compat_svr4.8 compat_ultrix.8 crash.8 dhcp.8 diskless.8 \
 	genassym.sh.8 intro.8 netstart.8 rc.8 rc.conf.8 rc.shutdown.8 \
 	release.8 security.8 ssl.8 starttls.8 sticky.8 update.8 vpn.8 yp.8
-SUBDIR=	man8.alpha man8.amiga man8.hp300 man8.hppa man8.i386 \
+SUBDIR=	man8.alpha man8.hp300 man8.hppa man8.i386 \
 	man8.mac68k man8.mvme68k \
-	man8.macppc man8.sparc man8.sparc64 man8.sun3 man8.vax
+	man8.macppc man8.sparc man8.sparc64 man8.vax
 
 MLINKS=	afterboot.8 faq.8 \
 	boot_config.8 UKC.8 \
diff --git a/sys/Makefile b/sys/Makefile
index 4e4af6d0435..05c05dbb4b4 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.15 2002/11/08 21:04:17 mickey Exp $
+#	$OpenBSD: Makefile,v 1.16 2002/12/31 16:22:26 miod Exp $
 #	$NetBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $
 
-SUBDIR=	arch/alpha arch/amiga arch/hp300 arch/hppa arch/i386 arch/m68k \
+SUBDIR=	arch/alpha arch/hp300 arch/hppa arch/i386 arch/m68k \
 	arch/mac68k arch/macppc arch/mvme68k arch/mvme88k \
-	arch/mvmeppc arch/sparc arch/sparc64 arch/sun3 arch/vax
+	arch/mvmeppc arch/sparc arch/sparc64 arch/vax
 
 .include <bsd.subdir.mk>
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index ec6e05ceaac..b3f83b7e6c4 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.9 2002/07/15 21:29:16 mickey Exp $
+#	$OpenBSD: Makefile,v 1.10 2002/12/31 16:22:26 miod Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
-ARCH=	alpha amiga hp300 hppa i386 m68k mac68k mvme68k mvme88k \
-	mvmeppc powerpc sparc sparc64 sun3 vax
+ARCH=	alpha hp300 hppa i386 m68k mac68k mvme68k mvme88k \
+	mvmeppc powerpc sparc sparc64 vax
 
 all:	init_sysent.c vnode_if.c
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 9bb3bc91609..03f2addee2d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.91 2002/11/23 18:47:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.92 2002/12/31 16:22:26 miod Exp $
 
 # not yet done: catman
 
@@ -7,7 +7,7 @@
 SUBDIR=	ac accton adduser amd arp authpf \
 	bootpd bootpgw bootpef bootptest \
 	chroot config cron dev_mkdb dhcp \
-	edquota gspa httpd inetd iostat \
+	edquota httpd inetd iostat \
 	kgmon kvm_mkdb lpr \
 	mailwrapper mopd mtree named \
 	netgroup_mkdb openssl pkg pkg_install popa3d portmap ppp pppd pppoe \
@@ -24,9 +24,8 @@ SUBDIR=	ac accton adduser amd arp authpf \
 SUBDIR+=faithd ndp rip6query route6d rtadvd rtsold traceroute6
 
 # Arch dependent tools, with manpages
-SUBDIR+=iteconfig grfconfig videomode
 SUBDIR+=bad144 apm apmd fdformat memconfig
-SUBDIR+=eeprom screenblank grfinfo hilinfo
+SUBDIR+=eeprom grfinfo hilinfo
 SUBDIR+=wsconscfg wsfontload
 
 # Extended Attribute tools
diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile
index 4515add6374..76b385eba42 100644
--- a/usr.sbin/eeprom/Makefile
+++ b/usr.sbin/eeprom/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.8 2002/06/14 04:21:54 art Exp $
+#	$OpenBSD: Makefile,v 1.9 2002/12/31 16:22:26 miod Exp $
 
-.if ${MACHINE} == "sparc" || ${MACHINE} == "sun3" || ${MACHINE} == "sparc64"
+.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 PROG=	eeprom
 
 BINGRP=	kmem
@@ -18,6 +18,6 @@ NOPROG=yes
 .endif
 
 MAN=	eeprom.8
-MANSUBDIR=sparc sparc64 sun3
+MANSUBDIR=sparc sparc64
 
 .include <bsd.prog.mk>