remove sparc media building goop

26 files changed, 17 insertions, 1275 deletions

diff --git a/distrib/Makefile b/distrib/Makefile
index a546e41f603..54fd3e4ab1a 100644
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.48 2016/08/10 14:27:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.49 2016/09/01 10:08:28 deraadt Exp $
 
 SUBDIR=	special notes
 
 .if	make(obj)
 SUBDIR+=alpha amd64 armv7 hppa i386 \
 	landisk loongson luna88k macppc \
-	octeon sgi socppc sparc sparc64 zaurus
+	octeon sgi socppc sparc64 zaurus
 .elif exists(${MACHINE})
 SUBDIR+=${MACHINE}
 .endif
diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index cf909438ea8..158ca1bd7b8 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.44 2016/08/10 14:27:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.45 2016/09/01 10:08:28 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -20,7 +20,7 @@ allarchs:
 	@cd $(.CURDIR); \
 	for arch in alpha amd64 armv7 hppa i386 landisk \
 	    loongson luna88k macppc octeon sgi socppc \
-	    sparc sparc64 zaurus; \
+	    sparc64 zaurus; \
 	do ${MAKE} M=$$arch; done
 
 $(TARG): $(DEP)
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
deleted file mode 100644
index 92de41f0a70..00000000000
--- a/distrib/notes/sparc/contents
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl	$OpenBSD: contents,v 1.72 2015/12/30 23:49:00 rpe Exp $
-TopPart
-
-OpenBSDminiroot
-			It can be copied to the swap partition of an existing
-			OpenBSD, NetBSD, Linux, SunOS, or Solaris installation
-			to allow installing or upgrading to OpenBSD OSREV.
-
-OpenBSDfloppy
-
-OpenBSDdistsets
-
-OpenBSDbsd
-
-OpenBSDrd
-
-OpenBSDinstalliso
-
-OpenBSDcd
-
-	installboot	The OpenBSD/MACHINE boot loader installation program.
-	bootxx		The OpenBSD/MACHINE boot block.
-	boot		The OpenBSD/MACHINE secondary boot loader.
-	boot.net	The OpenBSD/MACHINE network boot loader.
-
-
-Please note that there are multiple bootable images and kernels, intended
-to allow installing OpenBSD/MACHINE in a variety of situations without
-requiring a pre-existing working operating system.
-
-The kernel and boot images are provided for net booting installations.
-While the OpenBSD bootblocks will work with the provided miniroot images,
-Sun bootblocks require a separate kernel image and root filesystem.
-
-OpenBSDfloppydesc(single,The)
-
-DistributionDescription(eight)
-
-OpenBSDbase(56009365,161293549)
-
-OpenBSDcomp(42919601,132504981)
-
-OpenBSDgame(2697983,6086265)
-
-OpenBSDman(9187776,35912571)
-
-OpenBSDxbase(14932963,41369459)
-
-OpenBSDxfont(39938194,52169245)
-
-OpenBSDxserv(6022126,15447957)
-
-OpenBSDxshare(4562285,25735496)
diff --git a/distrib/notes/sparc/features b/distrib/notes/sparc/features
deleted file mode 100644
index 8c2eec5596a..00000000000
--- a/distrib/notes/sparc/features
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl	$OpenBSD: features,v 1.3 2016/02/11 13:06:23 rpe Exp $
-dnl
-dnl This file lists almost all the conditional features of this port,
-dnl which are used to provide accurate installation notes.
-dnl
-dnl Information about the installer script features should be in sync with
-dnl	src/distrib/sparc/install.md
-dnl and the list files in
-dnl	src/distrib/sparc/ramdisk/list.local
-dnl
-dnl ====
-dnl
-dnl architecture name (for the packages directory)
-define({:-MACHINE_ARCH-:},MACHINE)dnl
-dnl
-dnl define if /sbin/kbd exists on the media
-define({:-MDKBD-:},)dnl
-dnl
-dnl define if serial consoles needs to be enabled in /etc/ttys
-dnl (i.e. md_consoleinfo is not empty)
-define({:-MDSERCONS-:},)dnl
-dnl
-dnl define if SMP kernels are provided
-define({:-MDSMP-:},)dnl
-dnl
-dnl define if shared libraries are provided
-define({:-MDSO-:},1)dnl
-dnl
-dnl define if some media have timezone information (TZ in their list)
-define({:-MDTZ-:},)dnl
-dnl
-dnl define if glass console is possible
-dnl (XXX does not imply availablity of X servers though)
-define({:-MDX-:},1)dnl
-dnl
-dnl define if the X server can't start until machdep.allow_aperture is set
-define({:-MDXAPERTURE-:},)dnl
-dnl
-dnl define if the X server can start without a configuration file
-define({:-MDXDM-:},1)dnl
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
deleted file mode 100644
index b61b9348a0e..00000000000
--- a/distrib/notes/sparc/hardware
+++ /dev/null
@@ -1,200 +0,0 @@
-dnl	$OpenBSD: hardware,v 1.82 2015/01/11 21:02:55 miod Exp $
-OpenBSD/MACHINE OSREV runs on the following classes of machines:
-    * sun4: the VME series
-	- 4/100: Original SPARC with VME. Many hardware bugs.
-	- 4/200: A fairly decent VME-only machine
-	- 4/300: a 25MHz VME machine with many devices built onto the main
-	  board. In other respects, it is quite similar to the SS1+.
-
-    * sun4c:
-    	- SS1: the original 20MHz sun4c. Hardware limitations prevent SBus
-	  DMA peripherals from working in some of the slots.
-	- SS1+: 25MHz version of the above. Hardware limitations prevent
-	  SBus DMA peripherals from working in some of the slots.
-	- IPC: SS1+ in a cube, with bwtwo graphics builtin
-	- SLC: SS1+ built into a B&W monitor
-	- SS2: 40MHz version of the SS1
-	- IPX: SS2 in a cube, with cgsix graphics builtin
-	- ELC: SS2-performance built into a B&W monitor
-
-    * sun4e:
-	- SPARCengine 1E: a 6U VME cross between a sun4 and a sun4c,
-	  similar to a Sun 4/300 with an OpenPROM interface.
-
-    * sun4m:
-	- 600MP: The original Sun4m machine. This is an mbus machine with
-	  SBus and VME busses.
-	- LC: 50MHz MicroSPARC-1 based machines (aka Classic)
-	- LX: LC with a few more devices
-	- SS4: Reduced cost version of the SS5, available at 70MHz and
-	  110MHz
-	- SS5: MicroSPARC-2 based machines available in 60, 70, 85, and 110
-	  MHz versions
-	- SS5: TurboSPARC cpus in accelerated SS5 machines, running at
-	  170MHz
-	- SS10: Pizzabox mbus-based machine
-	- SS20: Improved pizzabox mbus-based machine
-	- Sun Voyager
-
-    * As well as faithful clones of the above Sun systems, such as:
-	- Aries Research Inc, Parrot II (SS2 clone)
-	- Axil 243 and 245 (and possibly other models) (SS5 clones)
-	- Axil 320 (SS20 clone)
-	- CPU5V: VME card by Force Computer (sun4m)
-	- DTKstation/Classic+
-	- Fujitsu S-4/Leia2 (MicroSPARC-2 laptop)
-	- Goldstar GWS-40 (SS2 clone)
-	- Opus 5000 (SS1 clone)
-	- Opus 5250 (SS1 clone)
-	- RDI,PowerLite: sun4m models, available in 50MHz, 85MHz, and 110MHz
-	- RDI,BrigeLite
-	- Solair WS19L (SS10 clone)
-	- SPARCbook 3, 3GS, 3GX, 3TX and 3XP by Tadpole (MicroSPARC-2 laptops)
-	- Tatung micro COMPstation 5 (SS5 clone)
-	- Tatung micro COMPstation LX (LX clone)
-	- Tatung TWS,SuperCOMPstation-20S (SS20 clone)
-	- Transtec SS5/170
-
-For sun4m machines, the following mbus CPU modules are supported:
-	- SM30: 30 or 36 MHz SuperSPARC with no secondary cache
-	- SM40: 40 MHz SuperSPARC with no secondary cache
-	- SM41: 40 MHz SuperSPARC with 1MB of secondary cache
-	- SM50: 50 MHz SuperSPARC with no secondary cache
-	- SM51: 50 MHz SuperSPARC with 1MB of secondary cache
-	- SM51-2: 50 MHz SuperSPARC with 2MB of secondary cache
-	- SM61: 60 MHz SuperSPARC with 1MB of secondary cache
-	- SM61-2: 60 MHz SuperSPARC with 2MB of secondary cache
-	- SM71: 75 MHz SuperSPARC with 1MB of secondary cache
-	- SM81: 85 MHz SuperSPARC with 1MB of secondary cache
-	- SM81-2: 85 MHz SuperSPARC with 2MB of secondary cache
-	- SM100: dual 40 MHz Cypress 7C601 with 64KB of primary cache
-	- Ross HyperSPARC RT620/625 at 90 MHz, with 256KB of primary cache
-	- Ross HyperSPARC RT620/625 at 125 MHz, with 256KB of primary cache
-	- Ross HyperSPARC RT620/625 at 150 MHz, with 512KB of primary cache
-	- Ross HyperSPARC RT620/625 at 166 MHz, with 512KB of primary cache
-	- Ross HyperSPARC RT620/625 at 180 MHz, with 512KB of primary cache
-
-24MB of RAM should be sufficient to boot and a minimal system can probably
-be squeezed onto a 250MB disk by installing only the `base' set.
-However, a minimum of 32MB is recommended for serious usage of the system.
-Note that until you have at least 32MB of RAM, getting more RAM is more
-important than getting a faster CPU board.
-
-Supported devices {:-include-:}:
-    * Sun keyboard and mouse
-    	- Type 2, 3, 4, and 5 keyboards with several layouts
-
-    * Floppy drives:
-	- sun4c and sun4m floppy disk drive
-
-    * Serial ports:
-	- ttya and ttyb on-board serial ports (can be used as console if
-	  needed)
-	- 4/300 ttyc and ttyd on-board serial ports
-	- SBus magma serial port cards, including: 4Sp, 8Sp, 12Sp, 16Sp,
-	  LC2+1Sp, 2+1Sp, 4+1Sp, 8+2Sp, and 2+1HS Sp.
-	- SBus Serial Parallel Interface (SUNW,spif, 501-1931)
-
-    * Audio support:
-	- on-board audio support for systems with AMD79C30 8-bit audio chips
-	  (this includes sun4c models, SPARCclassic, and 600MP)
-	- SUNW,CS4231 16-bit audio chips found on SPARCstation 4/5
-
-    * Framebuffers:
-	- SBus and sun4c/sun4m on-board video:
-	  + bwtwo - black and white
-	  + cgthree - 8-bit color, unaccelerated
-	    The cgthree driver also supports the cgRDI, an onboard
-	    cgthree-like framebuffer found in some laptops.
-	  + cgsix - 8-bit color, accelerated (GX, GX+, TGX, TGX+)
-	    This driver should also work with faithful emulations or clones
-	    of the SBus cgsix.
-	  + cgtwelve - 24-bit color, 1-bit overlay, accelerated (but the
-	    driver does not support hardware acceleration)
-	  + cgfourteen - 8/24-bit color, accelerated (but the driver does
-	    not support hardware acceleration)
-	  + Fujitsu AG-10e (agten) - 24-bit color, accelerated (currently
-	    only supported in 8-bit unaccelerated mode)
-	  + Parallax XVideo and PowerVideo (tvtwo) - 24-bit color,
-	    accelerated (but the driver does not support hardware
-	    acceleration)
-	  + RasterFlex series (rfx) - 8/24-bit color, accelerated (currently
-	    only supported in 8-bit unaccelerated mode)
-	  + Southland Media Systems MGX and MGXPlus (mgx) - 24-bit color,
-	    accelerated (currently only supported in 8-bit accelerated mode)
-	  + TCX - 8/24-bit color
-	  + Vigra VS10, VS11 and VS12 framebuffers (8-bit color, selectable
-	    VGA-compatible modes and connector)
-	  + Weitek Power9000 (pninek) framebuffer found in Tadpole SPARCbook 3
-	    (8 bit accelerated)
-	  + Weitek Power9100 (pnozz) framebuffer found in Tadpole SPARCbook
-	    3GS, 3GX, 3TX and 3XP (8, 16 or 32-bit accelerated)
-	  + ZX (aka Leo) - 8/24-bit color, overlay planes, double-buffered,
-	    3-D acceleration
-	- 4/200 on-board bwtwo
-	- P4 video (4/100 and 4/300):
-	  + bwtwo - black and white
-	  + cgthree - 8-bit color, unaccelerated
-	  + cgfour - 8-bit color, 1-bit overlay, unaccelerated
-	  + cgsix - 8-bit color, accelerated
-	  + cgeight - 24-bit color, 1-bit overlay, unaccelerated
-	- VME video (sun4):
-	  + cgtwo - 8-bit color, unaccelerated
-	  + cgthree - 8-bit color, unaccelerated
-	  + cgsix - 8-bit color, accelerated
-
-    * Ethernet adapters:
-	- on-board AMD Lance Ethernet (le)
-	- SBus AMD Lance Ethernet cards (le)
-	- SBus cards containing both AMD Lance le and esp SCSI (le)
-	- on-board Intel 82586 Ethernet on 4/100 and 4/200 (ie)
-	- VME Intel 82586 Ethernet cards (ie)
-	- SBus 10/100Mbit qec+be found on Sun FastEthernet cards
-	  (SUNW,501-2450) (be)
-	- SBus Quad 10/100Mbit qec+qe found on Sun Quad Ethernet cards
-	  (SUNW,501-2062) (qe)
-	- SBus 10/100MBit hme Ethernet cards (hme) [*]
-	- SBus 10/100MBit SunSwift SUNW,fas Ethernet+SCSI cards (hme) [*]
-	- SBus Quad 10/100MBit hme and qfe Ethernet cards (hme) [*]
-	[*] Not supported in sun4c and sun4e machines due to PROM limitations.
-
-    * SCSI controllers:
-	- on-board SCSI controller (sun4c, sun4e, sun4m, and 4/300) (esp)
-	- SBus SCSI controllers (including 3rd party compatible boards) (esp)
-	- SBus cards containing both AMD Lance le and esp SCSI (esp)
-	- SBus SUNW,fas Ethernet+SCSI cards (esp) [*]
-	- VME "SUN-3"/"si" SCSI controller (interrupt driven DMA) (si)
-	- 4/110 "SCSI weird" on-board controller (polled DMA) (sw)
-	- QSP/ISP SCSI controllers (i.e. "PTI,ptisp", "ptisp", "SUNW,isp"
-	  and "QLGC,isp") (isp)
-	[*] Not supported in sun4c and sun4e machines due to PROM limitations.
-
-    * SMD and other disk controllers:
-	- Xylogics 7053 VME SMD disk controller (xd)
-	- Xylogics 450/451 VME SMD disk controller (xy)
-
-    * PC Cards (PCMCIA):
-	- PCMCIA Controllers:
-	  + Sun SBus PCMCIA bridge (stp)
-	  + Tadpole PCMCIA controller (tslot)
-    * Miscellaneous:
-	- SBus Expansion Subsystem (SUNW,xbox) (xbox)
-	- Force FGA5000 VME/SBus bridge (fga)
-	- Force system configuration registers (scf)
-	- Force flash memory (flash)
-	- Tadpole microcontroller (power/system control) (tctrl)
-	- Prestoserve NVRAM Sbus cards and NVSIMM (limited support) (presto)
-
-OpenBSD/MACHINE OSREV does NOT run on these machines (yet):
-	- Sun 4/400
-		Lacking support for the I/O cache, and related
-		Ethernet problems.
-	- sun4d -- SPARCcenter 2000, SPARCserver 1000
-		XDBus and multiprocessor support issues.
-	- sun4u (UltraSPARCs)
-		These machines are supported by the OpenBSD/sparc64 port.
-	- clones that are significantly different from the Sun systems
-		(e.g. K-Bus based Solbourne)
-
-The supplied GENERIC kernel is the best attempt at a configuration that
-works on the widest range of machines (sun4, sun4c, sun4e and sun4m).
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
deleted file mode 100644
index 17c281794bf..00000000000
--- a/distrib/notes/sparc/install
+++ /dev/null
@@ -1,277 +0,0 @@
-dnl	$OpenBSD: install,v 1.79 2015/03/27 20:55:56 miod Exp $
-OpenBSDInstallPrelude({:-SMD disks-:})
-
-There are several ways to install OpenBSD onto a disk.  The normal way
-is to use the OpenBSD CD-ROM, or the bootable CD-ROM mini image, or an
-installation floppy, depending on your hardware.
-Alternatively, if you already have an operating system installed and
-do not wish to change the existing partition layout, it is simpler to
-use the OpenBSD miniroot that can be booted off your local disk's swap
-partition.
-
-If your SPARC is hooked up to a network, try and find a server to
-arrange for a diskless setup. This is a convenient way to install on a
-machine whose disk does not currently hold a usable operating system.
-This is difficult to get set up correctly the first time, but easy to
-use afterwards.  (See ``Installing using a diskless setup'' below.)
-
-
-Booting from the Installation Media:
-
-Prior to attempting an installation, you should make sure that everything
-of value on the target system has been backed up.  While installing OpenBSD
-does not necessarily wipe out all the partitions on the hard disk, errors
-during the install process can have unforeseen consequences and you will
-probably render the system unbootable if you start, but do not complete
-the installation.  Having the installation media for the prior installation,
-be it a SunOS or OpenBSD CD-ROM or OpenBSD install diskettes, is good
-insurance if you want to be able to "go back" for some reason.
-
-After taking care of all that, bring your system down gracefully using
-the shutdown(8) and/or halt(8) commands.  This will get you to the monitor
-prompt.  Sun PROM monitor commands and setup differ considerably depending
-on the system architecture and age; you may needed to reference the PROM
-monitor manual for your system for details.
-
-There are four main cases:
-
-	sun4 (older servers, deskside workstations):
-		prompt is a ">", boot command is "b", uses sd(c,s,p) syntax
-		with s defined as scsi-unit*8+lun in hex
-	OpenBoot Version 1 (newer servers, desktop workstations):
-		prompt is "ok", boot command is "boot" uses sd(c,s,p) syntax
-		with s defined as scsi-unit.
-	OpenBoot Version 2 (newer servers, desktop workstations):
-		prompt is "ok", boot command is "boot" uses diskn:p syntax.
-        OpenBoot Version 2 (certain newer desktop workstations):
-		prompt is "ok", boot command is "boot" uses diskn syntax
-		unless booting from a non-standard partition, in which case:
-		boot /sbus/esp/sd@t,0:p bsd  (where "t" is the scsi target,
-		and "p" is the partition.  examples would be t="3" and p="b")
-
-	
-If you expect your workstation to have an OpenBoot Prom but get a ">",
-enter the "n" command to enter the "new command mode".  You can set this
-as the default by doing a "setenv sunmon-compat? false" command, followed
-by a "reset" command.
-
-Note that OpenBoot Proms also do the Sun SCSI-ID shuffle for disks; this
-is described elsewhere in some detail.  For the purposes of this section,
-drive 0 refers to the internal or first SCSI drive, which usually has a
-SCSI-ID of 3.
-
-
-Booting from Floppy Disk installation media:
-
-        ok boot fd()bsd         # for version 1 OpenBOOT ROMs
-        ok boot floppy bsd      # for version 2 OpenBOOT ROMs
-
-This will cause the kernel contained in the floppy to be booted.
-
-
-Booting from CD-ROM installation media:
-
-	> b sd(,30,0)OSREV/MACHINE/bsd.rd		# for Sun4 monitors*
-						# (not working currently)
-	ok boot sd(,6,0)OSREV/MACHINE/bsd.rd	# for version 1 OpenBOOT ROMs
-	ok boot cdrom OSREV/MACHINE/bsd.rd	# for version 2 OpenBOOT ROMs
-
-If the boot is successful, you will get a loader version message,
-executable sizes, and then the kernel copyright and device probe
-messages.  Boot failure modes are typically a lot of CD-ROM drive
-activity, but no messages or complaints about magic numbers,
-checksums or formats.
-
-Not all MACHINE systems support bootable CD-ROM and the current
-boot image is only known to work on sun4c and sun4m architectures.
-If it does not work, you'll have to create a boot floppy or bootable
-hard disk using the instructions under preparing boot media.
-
-Note that older SPARC machines will not boot from CD-ROM drives
-unless the drive is set to use 512-byte blocks instead of the usual
-2048-byte blocks. Sun-provided CD-ROM drives from that era are OK;
-some third-party drives have a dip-switch or jumper setting.
-
-Booting from SCSI disk (miniroot or floppy image):
-
-Boot the miniroot by typing the appropriate command at the PROM:
-
-	> b sd(,,1)bsd 			# for sun4 monitors*
-	ok boot sd(,,1)bsd 		# for version 1 OpenBOOT ROMs
-	ok boot disk:b bsd 		# for version 2 OpenBOOT ROMs
-	ok boot /sbus/esp/sd@3,0:b bsd  # for version 2 OpenBOOT ROMs
-					# that won't take disk:p syntax.
-
-If you've loaded the miniroot onto some other disk than the default
-drive 0, modify the boot specifier accordingly, keeping in mind the
-drive vs. SCSI-ID shuffling and partition a=0, b=1...
-
-        > b sd(0,10,1)bsd       # example - scsi target 2 on sun4 monitors*
-	ok boot sd(0,3,1)bsd	# example - scsi target 0 on v1 OpenBOOT ROM
-	ok boot disk3:b bsd     # example - scsi target 0 on v2 OpenBOOT ROM
-	ok boot /sbus/esp/sd@0,0:b bsd  # example - scsi target 0 on v2
-					# OpenBOOT ROM that won't take
-					# disk:p syntax.
-
-(*) for sun4 this is scsi-target*8+scsi-lun (usually 0) expressed in hex...
-
-
-Installing using a diskless setup:
-
-First, you must set up a diskless client configuration on a server. If
-you are using an OpenBSD system as the boot-server, have a look at the
-diskless(8) manual page for guidelines on how to proceed with this.
-If the server runs another operating system, you'll have to consult
-documentation that came with it (on SunOS systems, add_client(8) and
-the Sun System/Networks administrators guide constitute a good start;
-on Solaris systems, share(1M) is a good starting point as well).
-
-
-Boot your workstation from the server by entering the appropriate `boot'
-command at the monitor prompt. Depending on the PROM version in your machine,
-this command takes one of the following forms:
-
-	> b le()bsd.rd		# for sun4 monitors
-	ok boot le()bsd.rd	# for version 1 OpenBOOT ROMs
-	ok boot net bsd.rd	# for version 2 OpenBOOT ROMs
-
-
-Installing using the Floppy, CD-ROM, miniroot or netboot procedure:
-
-OpenBSDInstallPart2
-
-	Boot your machine from the installation media as described above.
-
-	It will take a while to load the kernel especially from a floppy
-	or slow network connection, most likely more than a minute.  If
-	some action doesn't eventually happen, or the spinning cursor has
-	stopped and nothing further has happened, either your boot media
-	is bad, your diskless setup isn't correct, or you may have
-	a hardware or configuration problem.
-
-OpenBSDInstallPart3(SMD drives are noisy and weight a ton per kilobyte and scare
-		cats,"sd0" for SCSI drives,{:-and "xd0" or "xy0"
-	for SMD drives-:})
-
-OpenBSDInstallPart4
-
-OpenBSDInstallPart5
-
-OpenBSDInstallPart6({:-CD-ROM, -:})
-
-OpenBSDURLInstall
-
-OpenBSDCDROMInstall
-		
-OpenBSDDISKInstall({:-"xdN", "xyN" or -:},{:-only -:})
-
-OpenBSDCommonInstall
-
-OpenBSDInstallWrapup
-
-After completing an installation:
-
-Now try a reboot.  (If needed, swap your SCSI IDs first.)
-The Sun monitor normally tries to load a file called "vmunix".
-On OpenBOOT ROM systems you can change it to load OpenBSD instead using
-the following commands:
-
-On version 1 OpenBOOT ROMs:
-    >n
-    ok setenv boot-from sd(0,0,0)bsd
-    ok
-
-On version 2 OpenBOOT ROMs:
-    ok setenv boot-file bsd
-    ok setenv boot-device /sbus/esp/sd@0,0
-
-On sun4 systems, you may not need to specify the boot file, as
-the OpenBSD boot blocks will look for "bsd" on the boot device by default.
-
-OpenBSDCongratulations
-
-
-Net Boot or Diskless Setup Information:
-
-The set up is similar to SunOS diskless setup, but not identical, because
-the Sun setup assumes that the bootblocks load a kernel image, which then
-uses NFS to access the exported root partition, while the OpenBSD bootblocks
-use internal NFS routines to load the kernel image directly from the
-exported root partition.
-
-Please understand that no one gets this right the first try, since
-there is a lot of setup and all the host daemons must be running and
-configured correctly.  If you have problems, extract the diskless(8)
-manpage, find someone who's been through it before and use the host
-syslog and tcpdump(8) to get visibility of what's happening (or not).
-
-Your SPARCstation expects to be able to download a second stage bootstrap
-program via TFTP after having acquired its IP address through RevARP when
-instructed to boot "over the net". It will look for a filename composed of
-the machine's IP address followed by the machine's architecture, separated
-by a period. For example, a sun4c machine which has been assigned IP
-address 130.115.144.11, will make a TFTP request for `8273900B.SUN4C'.
-Normally, this file is a symbolic link to an appropriate second-stage
-boot program, which should be located in a place where the TFTP daemon
-can find it (remember, many TFTP daemons run in a chroot'ed environment).
-
-As an exception to the above rule, sun4e systems make a request for
-`/tftpboot/IP_IN_HEX.SUN4E', i.e. the TFTP filename is in a subdirectory.
-
-You can find the boot program as `boot.net' in the OpenBSD/MACHINE
-distribution. Unfortunately, many, if not all, sun4e PROM have a bug and
-fail to load a file which size is a multiple of 512 bytes. If you are
-trying to netboot a sun4e system, simply append some bytes to the
-file, like this:
-	dd if=/dev/zero bs=32 count=1 >> boot.net
-
-After the boot program has been loaded into memory and given control by
-the PROM, it starts locating the machine's remote root directory through
-the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
-on the local net. The answer to this request (if it comes in) contains
-the client's name. This name is used in the next step, a BOOTPARAM GETFILE
-request -- sent to the server that responded to the WHOAMI request --
-requesting the name and address of the machine that will serve the client's
-root directory, as well as the path of the client's root on that server.
-
-Finally, this information (if it comes in) is used to issue a REMOTE MOUNT
-request to the client's root filesystem server, asking for an NFS file
-handle corresponding to the root filesystem. If successful, the boot
-program starts reading from the remote root filesystem in search of the
-kernel which is then read into memory.
-
-You will want export the miniroot{:--:}OSrev.fs filesystem to the client.  You
-can dd this filesystem image to some spare partition, mount and export
-that partition, or use tar to copy the contents to a more convenient spot.
-
-Alternatively you can build a bootable partition from the distribution sets
-as follows:
-
-Unpack `base{:--:}OSrev.tgz' on the server in the root directory for your
-target machine. If you elect to use a separately NFS-mounted filesystem for
-`/usr' with your diskless setup, make sure the "./usr" base files in
-base{:--:}OSrev.tgz end up in the correct location. One way to do this is
-to temporarily use a loopback mount on the server, re-routing <root>/usr to
-your server's exported OpenBSD "/usr" directory. Also put the kernel and
-the install/upgrade scripts into the root directory.
-
-A few configuration files need to be edited:
-
-	<root>/etc/hosts
-		Add the IP addresses of both server and client.
-
-	<root>/etc/myname
-		This files contains the client's hostname; use the same
-		name as in <root>/etc/hosts.
-
-	<root>/etc/fstab
-		Enter the entries for the remotely mounted filesystems.
-		For example:
-			server:/export/root/client       /     nfs  rw 0 0
-			server:/export/exec/sun4.OpenBSD /usr  nfs  rw 0 0
-
-OpenBSDInstNFS
-
-
-
-OpenBSDUnattendedInstallation
diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep
deleted file mode 100644
index 9849a6ab983..00000000000
--- a/distrib/notes/sparc/prep
+++ /dev/null
@@ -1,69 +0,0 @@
-Before you start you might need to consider your disk configuration
-to sort out a quirk in SCSI-ID to SD-UNIT mapping that exists on
-Sun SPARCstations.
-
-Upon leaving the factory, SunOS and the OpenBOOT ROM map according to
-this table:
-
-    SCSI-ID ->	SunOS SD-UNIT
-    0		sd3
-    1		sd1
-    2		sd2
-    3		sd0
-    4		sd4
-    5		sd5
-    6		sd6
-
-Unlike SunOS and the OpenBOOT ROM, a generic OpenBSD kernel numbers
-SCSI drives sequentially as it finds them.  The drive with the
-lowest SCSI-ID will be called sd0, the next one sd1, etc.
-
-This is mostly a non-issue if you have only one drive on your system,
-but can get confusing if you have multiple drives (unless you choose
-to use DUIDs to access partitions).  If you plan to eliminate SunOS
-altogether it may be best to correct the SCSI-IDs of your drives,
-while if you plan to leave SunOS installed, it may be better to
-install OpenBSD on a drive with SCSI-ID 1 or 0.
-
-Older OpenBoot proms (versions 1.x) provide an environment variable,
-sd-targets, that controls the drive<->SCSI-ID mapping; you can change
-this to reflect the natural ordering or just set the boot related
-variables to boot from the correct drive, whatever the numbering. Its
-default-value is ``31204567'', which means unit 0 and 3 are exchanged.
-To revert to the ``normal'' behaviour, enter the following command:
-
-    ok setenv sd-targets 01234567
-
-Your OpenBOOT ROM may need some setup.  If you are running OpenBSD on
-a sun4c, sun4e or sun4m system, the ROM must be set to "new" command
-mode.  If your machine comes up and gives you a `>' prompt instead of
-`ok', type:
-
-    > n
-    ok setenv sunmon-compat? false
-    ok
-
-This is needed because OpenBSD relies on the behaviour of the "new" command
-mode.  OpenBSD will not boot correctly on sun4c, sun4e or sun4m systems that
-are not running in "new" command mode.  The sun4 systems such as the 4/110,
-4/200, and 4/300 system do not have a "new" command mode, and will work
-fine as-is.
-
-
-Also, you cannot use the security modes of the SPARC OpenBOOT ROM.
-Make sure that the ROM security modes are disabled:
-
-    ok setenv security-mode none
-
-To disable automatic boot use the following command:
-
-    ok setenv auto-boot? false
-
-and then to enable it later use:
-
-    ok setenv auto-boot? true
-
-or on an installed system use the eeprom(8) command:
-
-    # eeprom 'auto-boot?=true'
-
diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade
deleted file mode 100644
index 11da08e83de..00000000000
--- a/distrib/notes/sparc/upgrade
+++ /dev/null
@@ -1,2 +0,0 @@
-dnl	$OpenBSD: upgrade,v 1.17 2013/02/09 19:48:37 miod Exp $
-OpenBSDUpgrade({:-the CD-ROM, bsd.rd, the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis
deleted file mode 100644
index e219e90c468..00000000000
--- a/distrib/notes/sparc/whatis
+++ /dev/null
@@ -1,4 +0,0 @@
-dnl	$OpenBSD: whatis,v 1.16 2005/03/18 13:29:46 miod Exp $
-
-OpenBSD/MACHINE runs on 32 bit SPARC-based machines, including most of
-Sun Microsystems workstations and their clones.
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
deleted file mode 100644
index 994b45004ba..00000000000
--- a/distrib/notes/sparc/xfer
+++ /dev/null
@@ -1,131 +0,0 @@
-dnl	$OpenBSD: xfer,v 1.49 2016/01/01 15:58:28 rpe Exp $
-Installation is supported from several media types, including:
-
-	CD-ROM
-	FFS partitions
-	HTTP
-
-Not all methods are supported on all SPARC Systems and some of them
-work only with the floppy or the miniroot installation.
-
-If you have the OpenBSD CD-ROM distribution (and a CD-ROM drive), you may be
-able to boot from it, or from the supplied bootable CD-ROM mini image.
-However, not all SPARC systems support booting from CD-ROM, and the current
-boot image is only known to work on sun4c and sun4m architecture workstations.
-If you can boot from the CD-ROM, you are home free and can proceed to the
-installation steps.  If not, you will need to do some setup work to prepare
-a bootable image: either a floppy, hard drive, or compatible net boot
-server.
-
-In addition to the bootable image, you also need to consider how to
-access the binary distribution sets to actually install the system.
-
-Although you can access the distribution sets directly from the CD-ROM or
-from one of the OpenBSD mirrors over the internet, you may wish to transfer
-the sets to a local HTTP server, or copy them to a partition on the target
-system's disk.
-
-OpenBSDXferCDROM
-
-OpenBSDXferFloppyFromDOS
-
-OpenBSDXferFloppyFromUNIX
-
-Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system:
-
-	If you don't have a floppy drive you can copy the floppy
-	installation image "floppy{:--:}OSrev.fs" or the miniroot "miniroot{:--:}OSrev.fs"
-	onto the hard disk you intend to boot on.  Traditionally, the
-	way to do this is to use dd(1) to place the bootable filesystem
-	image in the "swap" partition of the disk (while running in
-	single user mode), and then booting from that partition.
-
-	Using the "b" partition allows you to boot without overwriting
-	any useful parts of the disk; you can also use another partition,
-	but don't use the "a" or "c" partition without understanding
-	the disk label issues described below under "incompatible systems".
-
-	This requires that you be running SunOS, Solaris, OpenBSD, or NetBSD,
-	which have a compatible view of SunOS disk labels and partitions.
-
-	Use the dd(1) utility to copy the file to the hard drive.
-	The command would likely be, under SunOS:
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
-				- or -
-		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
-	and under Solaris:
-		dd if=floppy{:--:}OSrev.fs of=/dev/rdsk/c0t0d0s1 bs=36b
-				- or -
-		dd if=miniroot{:--:}OSrev.fs of=/dev/rdsk/c0t0d0s1 bs=36b
-
-	The blocksize is arbitrary as long as it's a multiple of 512 bytes
-	and within the maximum supported by the driver, i.e. bs=126b may
-	not work for all cases.  Again, device/partition names may vary,
-	depending on the OS involved.
-
-	If you are preparing the hard drive on an incompatible system or
-	don't care about the hard disk contents, you can also install the
-	bootable image starting at the beginning of the disk. This lets
-	you prepare a bootable hard-drive even if don't have a working
-	operating system on your SPARC, but it is important to understand
-	that the bootable image installed this way includes a "disk label"
-	which can wipe out any pre-existing disk labels or partitioning for
-	the drive.
-
-	The floppy image is used only for booting, and can be placed in
-	a partition that will be overwritten during the install process,
-	since it actually runs off a ram-disk image in the kernel.  In
-	contrast the miniroot is a normal unix root filesystem and you
-	must place it in a partition that WILL NOT BE OVERWRITTEN until
-	you've completed the installation process.
-
-	To copy the floppy image to the whole disk, overwriting labels:
-	Under SunOS:
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
-	and under Solaris:
-		dd if=floppy{:--:}OSrev.fs of=/dev/rdsk/c0tXd0s2 bs=36b
-
-	Two notes - X should be replaced by the unit number of the target
-	disk, which is most likely *not* the disk/partition that's your
-	current root partition.  Again names may vary depending on the
-	OS involved.  Second, after doing this, the disklabel will be one
-	that would be appropriate for a floppy, i.e. one partition of 2880
-	blocks, and you'll probably want to change that later on.
-
-	To copy the floppy image to the hard disk, preserving SunOS,
-	Solaris, NetBSD or OpenBSD labels:
-	Under SunOS:
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=1b skip=1 seek=1
-	and Solaris:
-		dd if=floppy{:--:}OSrev.fs of=/dev/rdsk/c0tXd0s2 \
-		    bs=1b skip=1 seek=1
-
-	You need to be sure that your version of dd(1) supports the
-	skip and seek operands, otherwise you can try a technique like:
-
-		dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
-		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
-		dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
-
-	In either case, you've created a situation where the disk label
-	and the filesystem information don't agree about the partition
-	size and geometry, however the results will be usable.
-
-Creating a network bootable setup using SunOS or other Un*x-like system:
-
-	The details of setting up a network bootable environment vary
-	considerably, depending on the network's host.  Extract the
-	OpenBSD diskless(8) man page from the man{:--:}OSrev.tgz distribution
-	set or see the copy on the OpenBSD web page.  You will also
-	need to reference the relevant man pages or administrators guide
-	for the host system.
-	
-	Basically, you will need to set up reverse-arp (rarpd) and boot
-	parameter (rpc.bootparamd) information and make the OpenBSD
-	bootblock, kernel/miniroot partition, and a swap file available
-	as required by the netboot setup.
-
-
-OpenBSDXferPrelude
-
-OpenBSDXferFFS
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 5029115fd78..433d68bbdec 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.45 2015/10/20 16:22:47 miod Exp $
+#	$OpenBSD: Makefile,v 1.46 2016/09/01 10:08:29 deraadt Exp $
 
 REV=		${OSrev}
 
@@ -62,16 +62,8 @@ ${FLOPPY}:	bsd.gz ${BOOT} ${BOOTXX}
 	disklabel -w ${VND} ${FLOPPYTYPE}
 	newfs ${NEWFSOPTS_FD} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
-.if ${MACHINE} == "sparc"
-	cp ${BOOT} ${MOUNT_POINT}/
-.endif
 	cp bsd.gz ${MOUNT_POINT}/bsd
-.if ${MACHINE} == "sparc"
-	${INSTALLBOOT} -v ${BOOTIN} ${BOOTXX} \
-	    `echo ${VND_RDEV} | sed -e 's/a$$/c/'`
-.else
 	${INSTALLBOOT} -v -r ${MOUNT_POINT} ${VND} ${BOOTXX} ${BOOT}
-.endif
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index c22ee5c352e..95cee19334e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1389,63 +1389,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sndio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/soundcard.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/_float.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/_types.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/apmvar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/asm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/atomic.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/autoconf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/bppioctl.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/bsd_openprom.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/bus.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/cdefs.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/conf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/cpu.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ctlreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/daadioio.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/db_machdep.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/disklabel.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/eeprom.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/endian.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/exec.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/fbvar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/fenv.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/fgaio.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/frame.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/fsr.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/idprom.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ieee.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ieeefp.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/instr.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/intr.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ioctl_fd.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/kcore.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/limits.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/loadfile_machdep.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/lock.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/mutex.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/oldmon.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/openpromio.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/param.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/pcb.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/pmap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/proc.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/profile.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/psl.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/pte.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ptrace.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/reloc.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/scfio.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/setjmp.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/signal.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/spinlock.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/stdarg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/tcb.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/trap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/varargs.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/vmparam.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/z8530var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/spawn.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sqlite3.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sqlite3ext.ph
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 930278c94f2..13b9a094590 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -547,63 +547,6 @@
 ./usr/include/objc/objc-decls.h
 ./usr/include/objc/runtime.h
 ./usr/include/sparc
-./usr/include/sparc/_float.h
-./usr/include/sparc/_types.h
-./usr/include/sparc/apmvar.h
-./usr/include/sparc/asm.h
-./usr/include/sparc/atomic.h
-./usr/include/sparc/autoconf.h
-./usr/include/sparc/bppioctl.h
-./usr/include/sparc/bsd_openprom.h
-./usr/include/sparc/bus.h
-./usr/include/sparc/cdefs.h
-./usr/include/sparc/conf.h
-./usr/include/sparc/cpu.h
-./usr/include/sparc/ctlreg.h
-./usr/include/sparc/daadioio.h
-./usr/include/sparc/db_machdep.h
-./usr/include/sparc/disklabel.h
-./usr/include/sparc/eeprom.h
-./usr/include/sparc/endian.h
-./usr/include/sparc/exec.h
-./usr/include/sparc/fbvar.h
-./usr/include/sparc/fenv.h
-./usr/include/sparc/fgaio.h
-./usr/include/sparc/frame.h
-./usr/include/sparc/fsr.h
-./usr/include/sparc/idprom.h
-./usr/include/sparc/ieee.h
-./usr/include/sparc/ieeefp.h
-./usr/include/sparc/instr.h
-./usr/include/sparc/intr.h
-./usr/include/sparc/ioctl_fd.h
-./usr/include/sparc/kcore.h
-./usr/include/sparc/limits.h
-./usr/include/sparc/loadfile_machdep.h
-./usr/include/sparc/lock.h
-./usr/include/sparc/mutex.h
-./usr/include/sparc/oldmon.h
-./usr/include/sparc/openpromio.h
-./usr/include/sparc/param.h
-./usr/include/sparc/pcb.h
-./usr/include/sparc/pmap.h
-./usr/include/sparc/proc.h
-./usr/include/sparc/profile.h
-./usr/include/sparc/psl.h
-./usr/include/sparc/pte.h
-./usr/include/sparc/ptrace.h
-./usr/include/sparc/reg.h
-./usr/include/sparc/reloc.h
-./usr/include/sparc/scfio.h
-./usr/include/sparc/setjmp.h
-./usr/include/sparc/signal.h
-./usr/include/sparc/spinlock.h
-./usr/include/sparc/stdarg.h
-./usr/include/sparc/tcb.h
-./usr/include/sparc/trap.h
-./usr/include/sparc/varargs.h
-./usr/include/sparc/vmparam.h
-./usr/include/sparc/z8530var.h
 ./usr/include/unwind.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index eb23fde8bcf..96f33e1ae6c 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -421,7 +421,6 @@
 ./usr/share/man/man1/sleep.1
 ./usr/share/man/man1/sort.1
 ./usr/share/man/man1/sparc
-./usr/share/man/man1/sparc/fdformat.1
 ./usr/share/man/man1/sparc64
 ./usr/share/man/man1/sparc64/fdformat.1
 ./usr/share/man/man1/sparc64/mksuncd.1
@@ -1688,56 +1687,6 @@
 ./usr/share/man/man4/socppc/tsec.4
 ./usr/share/man/man4/softraid.4
 ./usr/share/man/man4/sparc
-./usr/share/man/man4/sparc/agten.4
-./usr/share/man/man4/sparc/audioamd.4
-./usr/share/man/man4/sparc/audiocs.4
-./usr/share/man/man4/sparc/autoconf.4
-./usr/share/man/man4/sparc/auxreg.4
-./usr/share/man/man4/sparc/be.4
-./usr/share/man/man4/sparc/bpp.4
-./usr/share/man/man4/sparc/bwtwo.4
-./usr/share/man/man4/sparc/cgeight.4
-./usr/share/man/man4/sparc/cgfour.4
-./usr/share/man/man4/sparc/cgfourteen.4
-./usr/share/man/man4/sparc/cgsix.4
-./usr/share/man/man4/sparc/cgthree.4
-./usr/share/man/man4/sparc/cgtwelve.4
-./usr/share/man/man4/sparc/cgtwo.4
-./usr/share/man/man4/sparc/clock.4
-./usr/share/man/man4/sparc/daadio.4
-./usr/share/man/man4/sparc/eccmemctl.4
-./usr/share/man/man4/sparc/esp.4
-./usr/share/man/man4/sparc/fga.4
-./usr/share/man/man4/sparc/ie.4
-./usr/share/man/man4/sparc/intro.4
-./usr/share/man/man4/sparc/le.4
-./usr/share/man/man4/sparc/led.4
-./usr/share/man/man4/sparc/magma.4
-./usr/share/man/man4/sparc/mem.4
-./usr/share/man/man4/sparc/memreg.4
-./usr/share/man/man4/sparc/mgx.4
-./usr/share/man/man4/sparc/openprom.4
-./usr/share/man/man4/sparc/pninek.4
-./usr/share/man/man4/sparc/pnozz.4
-./usr/share/man/man4/sparc/presto.4
-./usr/share/man/man4/sparc/qe.4
-./usr/share/man/man4/sparc/qec.4
-./usr/share/man/man4/sparc/rfx.4
-./usr/share/man/man4/sparc/scf.4
-./usr/share/man/man4/sparc/si.4
-./usr/share/man/man4/sparc/spif.4
-./usr/share/man/man4/sparc/sw.4
-./usr/share/man/man4/sparc/tctrl.4
-./usr/share/man/man4/sparc/tcx.4
-./usr/share/man/man4/sparc/timer.4
-./usr/share/man/man4/sparc/tslot.4
-./usr/share/man/man4/sparc/tvtwo.4
-./usr/share/man/man4/sparc/vigra.4
-./usr/share/man/man4/sparc/xbox.4
-./usr/share/man/man4/sparc/xd.4
-./usr/share/man/man4/sparc/xy.4
-./usr/share/man/man4/sparc/zs.4
-./usr/share/man/man4/sparc/zx.4
 ./usr/share/man/man4/sparc64
 ./usr/share/man/man4/sparc64/agten.4
 ./usr/share/man/man4/sparc64/apio.4
@@ -2435,12 +2384,6 @@
 ./usr/share/man/man8/spamdb.8
 ./usr/share/man/man8/spamlogd.8
 ./usr/share/man/man8/sparc
-./usr/share/man/man8/sparc/MAKEDEV.8
-./usr/share/man/man8/sparc/apm.8
-./usr/share/man/man8/sparc/apmd.8
-./usr/share/man/man8/sparc/boot_sparc.8
-./usr/share/man/man8/sparc/eeprom.8
-./usr/share/man/man8/sparc/installboot.8
 ./usr/share/man/man8/sparc64
 ./usr/share/man/man8/sparc64/MAKEDEV.8
 ./usr/share/man/man8/sparc64/apm.8
diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile
deleted file mode 100644
index 82b8207f789..00000000000
--- a/distrib/sparc/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#	$OpenBSD: Makefile,v 1.10 2012/09/10 22:21:03 deraadt Exp $
-
-# preserve order: 'miniroot' and 'cdfs' depend on 'ramdisk'
-SUBDIR+= ../ramdisk miniroot cdfs
-
-.if	make(obj) || make(cleandir) || make(clean)
-SUBDIR+= iso
-.endif
-
-unconfig:
-	cd ../ramdisk; ${MAKE} unconfig
-
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/Makefile.inc b/distrib/sparc/Makefile.inc
deleted file mode 100644
index 4d42dbfe34d..00000000000
--- a/distrib/sparc/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2012/09/10 22:21:03 deraadt Exp $
-
-REV=	${OSrev}
diff --git a/distrib/sparc/cdfs/Makefile b/distrib/sparc/cdfs/Makefile
deleted file mode 100644
index 371e3605ad1..00000000000
--- a/distrib/sparc/cdfs/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#	$OpenBSD: Makefile,v 1.9 2011/06/08 19:16:19 krw Exp $
-
-TOP=	${.CURDIR}/..
-
-CDROM=	cd${OSrev}.iso
-
-all: ${CDROM}
-
-${CDROM}:
-	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc
-	cp ${.OBJDIR}/../../ramdisk/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/sparc
-	ln ${.OBJDIR}/cd-dir/${OSREV}/sparc/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
-	ln ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
-	ln ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/vmunix # for kicks
-	cp ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/cd-dir/${OSREV}/sparc
-	cp ${DESTDIR}/usr/mdec/bootxx ${.OBJDIR}/cd-dir/${OSREV}/sparc
-	(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} sparc bootonly CD" \
-	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/sparc   ${OSREV} boot-only CD" \
-	    ${.OBJDIR}/cd-dir 2>&1) | tee log
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	mount -t cd9660 /dev/vnd0a /mnt
-	/usr/mdec/installboot -v \
-	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f1` \
-	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f2` \
-	    /mnt/${OSREV}/sparc/boot /usr/mdec/bootxx /dev/rvnd0c
-	disklabel -w vnd0 fakecdrom "OpenBSD/sparc   "
-	umount /mnt
-	vnconfig -u vnd0
-	# XXX Some sparc machines fail to load the kernel correctly if the
-	# XXX cd image is truncated.  It is not yet known why this happens.
-	# XXX For now we pad the image.
-	dd if=/dev/zero bs=2k count=200 >> ${.OBJDIR}/${CDROM}
-
-.ifdef RELEASEDIR
-install:
-	cp ${CDROM} ${RELEASEDIR}
-.endif
-
-clean cleandir:
-	/bin/rm -f ${CDROM}
-	rm -rf cd-dir log
-
-unconfig:
-	-umount /mnt
-	-vnconfig -u vnd0
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
deleted file mode 100644
index a0798cdf384..00000000000
--- a/distrib/sparc/install.md
+++ /dev/null
@@ -1,62 +0,0 @@
-#	$OpenBSD: install.md,v 1.74 2016/02/08 17:28:09 krw Exp $
-#	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
-#
-#
-# 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.
-#
-
-MDTERM=sun
-MDXDM=y
-MDDKDEVS='/^sd[0-9] /s/ .*//p;/^x[dy][0-9] /s/ .*//p'
-
-md_installboot() {
-	# Use cat to avoid holes created by cp(1)
-	cat /mnt/usr/mdec/boot > /mnt/boot
-	sync; sleep 3
-	/mnt/usr/mdec/installboot /mnt/boot /mnt/usr/mdec/bootxx /dev/r${1}c
-}
-
-md_prep_disklabel() {
-	local _disk=$1 _f=/tmp/fstab.$1
-
-	disklabel_autolayout $_disk $_f || return
-	[[ -s $_f ]] && return
-
-	# Edit disklabel manually.
-	# Abandon all hope, ye who enter here.
-	disklabel -F $_f -E $_disk
-}
-
-md_congrats() {
-}
-
-md_consoleinfo() {
-}
diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile
deleted file mode 100644
index dd3ae4046d5..00000000000
--- a/distrib/sparc/iso/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#	$OpenBSD: Makefile,v 1.14 2014/09/21 13:44:45 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-#.include "${TOP}/Makefile.inc"
-
-CDROM=	install${OSrev}.iso
-RELXDIR?=	/home/relx-${MACHINE}
-RELDIR?=	/home/rel-${MACHINE}
-
-BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
-		${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
-		${RELDIR}/bsd ${RELDIR}/bsd.rd \
-		${RELDIR}/INSTALL.${MACHINE}
-XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
-		${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
-
-all: ${CDROM}
-
-${CDROM}: ${BASE} ${XBASE}
-	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
-	cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
-	    ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
-	# XXX no SHA256.sig
-
-	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
-	ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
-	ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/vmunix # for kicks
-
-	cp ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-	cp ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
-
-	(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/${MACHINE}   ${OSREV} Install CD" \
-	    ${.OBJDIR}/cd-dir 2>&1) | tee log
-	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	mount -t cd9660 /dev/vnd0a /mnt
-	/usr/mdec/installboot -v \
-	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
-	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
-	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rvnd0c
-	disklabel -w vnd0 fakecdrom "OpenBSD/${MACHINE}   "
-	umount /mnt
-	vnconfig -u vnd0
-	# XXX Some ${MACHINE} machines fail to load the kernel correctly if the
-	# XXX cd image is truncated.  It is not yet known why this happens.
-	# XXX For now we pad the image.
-	dd if=/dev/zero bs=2k count=200 >> ${.OBJDIR}/${CDROM}
-
-install:
-	cp ${CDROM} ${RELDIR}/
-
-clean cleandir:
-	/bin/rm -f ${CDROM}
-	rm -rf cd-dir log
-
-unconfig:
-	-umount /mnt
-	-vnconfig -u vnd0
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/miniroot/Makefile b/distrib/sparc/miniroot/Makefile
deleted file mode 100644
index 1428e0413a5..00000000000
--- a/distrib/sparc/miniroot/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2012/09/10 22:21:03 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-
-TARGET=miniroot${REV}.fs
-
-.ifndef DESTDIR
-all ${TARGET}:
-	@echo setenv DESTDIR before making a ramdisk!
-	@false
-.else
-
-all: ${TARGET}
-
-${TARGET}: vn_up install_files installboot showit vn_down
-
-vn_up: blank_filesystem
-	vnconfig vnd0 ${TARGET}
-	disklabel -w vnd0 fakeramdisk
-	newfs -m 0 /dev/rvnd0a
-	mount /dev/vnd0a /mnt
-
-showit:
-	df -ki /mnt
-
-vn_down:
-	-umount /mnt
-	-vnconfig -u vnd0
-
-install_files: bsd.rd ofwboot
-
-bsd.rd:
-	install -c -m 555 -o root -g wheel \
-	    ${.OBJDIR}/../../ramdisk/bsd.rd /mnt/bsd
-
-ofwboot:
-	install -c -m 555 -o root -g wheel \
-	    ${DESTDIR}/usr/mdec/boot /mnt/boot
-
-installboot:
-	/usr/mdec/binstall -v ffs /mnt
-
-blank_filesystem:
-	dd if=/dev/zero of=${TARGET} bs=512 count=12288
-
-.endif
-
-unconfig:
-	-umount -f /mnt
-	-vnconfig -u /dev/vnd0a
-
-.ifdef RELEASEDIR
-install:
-	cp ${TARGET} ${RELEASEDIR}
-.endif
-
-clean:
-	rm -f ${TARGET}
-
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/sparc/ramdisk/Makefile.inc b/distrib/sparc/ramdisk/Makefile.inc
deleted file mode 100644
index 6c54f990148..00000000000
--- a/distrib/sparc/ramdisk/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.18 2008/03/06 08:23:49 deraadt Exp $
-
-IMAGESIZE?=		4000
-GZIPCMD?=		gzip
-GZIPFLAGS?=		-9nv
-GZIPEXT?=		.gz
-MAKEFLOPPY=		1
-BOOT=			${DESTDIR}/usr/mdec/boot
-INSTALLBOOT=		${DESTDIR}/usr/mdec/installboot
diff --git a/distrib/sparc/ramdisk/list.local b/distrib/sparc/ramdisk/list.local
deleted file mode 100644
index f8562b21cc0..00000000000
--- a/distrib/sparc/ramdisk/list.local
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$OpenBSD: list.local,v 1.8 2015/04/02 20:51:04 deraadt Exp $
-#	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
-
-# Sparc extra's
-LINK	instbin					sbin/disklabel
-#LINK	instbin					sbin/restore
-LINK	instbin					usr/bin/grep usr/bin/egrep usr/bin/fgrep
-LINK	instbin					usr/bin/more usr/bin/less
-LINK	instbin					usr/sbin/eeprom
-
-SYMLINK	/tmp	var/tmp
-
-# 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
-SYMLINK	/tmp/fstab.shadow			etc/fstab
-SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
-SYMLINK	/tmp/hosts				etc/hosts
-TERMCAP	vt100,vt220,dumb,sun			usr/share/misc/termcap
-
-# and the installation tools
-SCRIPT	${ARCHDIR}/../install.md		install.md
-
-#SPECIAL	rm -rf usr/share/zoneinfo/*
diff --git a/distrib/special/Makefile.inc b/distrib/special/Makefile.inc
index 8a8fb56df3c..1851decc282 100644
--- a/distrib/special/Makefile.inc
+++ b/distrib/special/Makefile.inc
@@ -1,7 +1,12 @@
 # options for all the directories below
 
-COPTS+=-Os -fno-stack-protector
+COPTS+= -Os
 MAN=
-LDSTATIC=-static
+LDSTATIC=${STATIC}
 NOPIE=
 NOMAN=1
+
+# Architectures which are tight for space on some media
+.if (${MACHINE} == "i386") || (${MACHINE} == "alpha") || (${MACHINE} == "sparc64")
+COPTS+= -fno-stack-protector
+.endif
diff --git a/distrib/special/disklabel/Makefile b/distrib/special/disklabel/Makefile
index 5e794dbe0c7..a2a12b8ec79 100644
--- a/distrib/special/disklabel/Makefile
+++ b/distrib/special/disklabel/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2016/08/10 14:27:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2016/09/01 10:08:29 deraadt Exp $
 
 PROG=	disklabel
 SRCS=	disklabel.c dkcksum.c editor.c manual.c
@@ -45,7 +45,7 @@ CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\""
 CFLAGS+= -DSEEALSO="\"fdisk(8), pdisk(8)\""
 .endif
 
-.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64")
+.if (${MACHINE} == "sparc64")
 CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DSUN_CYLCHECK -DSUN_AAT0
 .endif
 
diff --git a/distrib/special/eeprom/Makefile b/distrib/special/eeprom/Makefile
index f256ac10cb3..0fef085ca8a 100644
--- a/distrib/special/eeprom/Makefile
+++ b/distrib/special/eeprom/Makefile
@@ -1,17 +1,13 @@
-#	$OpenBSD: Makefile,v 1.1 2014/07/24 19:21:06 miod Exp $
+#	$OpenBSD: Makefile,v 1.2 2016/09/01 10:08:29 deraadt Exp $
 
 .PATH: ${.CURDIR}/../../../usr.sbin/eeprom
 
-.if ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "sparc64"
 PROG=	eeprom
 
 SRCS=	main.c
 SRCS+=	ophandlers.c optree.c
 
-.  if ${MACHINE} == "sparc"
-SRCS+=	eehandlers.c
-.  endif
-
 CFLAGS+=	-DSMALL
 .else
 NOPROG=yes
diff --git a/distrib/special/installboot/Makefile b/distrib/special/installboot/Makefile
index 148657ae01d..6cf8a66a68b 100644
--- a/distrib/special/installboot/Makefile
+++ b/distrib/special/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2016/08/10 14:27:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2016/09/01 10:08:29 deraadt Exp $
 
 .PATH: ${.CURDIR}/../../../usr.sbin/installboot
 
@@ -65,10 +65,6 @@ SRCS += stubs.c
 SRCS += stubs.c
 .endif
 
-.if ${MACHINE} == "sparc"
-SRCS += stubs.c
-.endif
-
 .if ${MACHINE} == "sparc64"
 CFLAGS += -DSOFTRAID
 SRCS += sparc64_installboot.c