Try to catch up with installer changes in the installation notes.

Also, the per-platform features are moved to a common place, which makes
the MD layout easier to work on. m4.common is still a tangled mess of subtly
placed dnl, though...

3 files changed, 50 insertions, 22 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 6097c73c9f1..3afcd1a66bd 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.60 2009/02/28 20:53:00 miod Exp $
+dnl	$OpenBSD: contents,v 1.61 2009/05/12 21:06:51 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -39,9 +39,9 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(eleven)
 
-OpenBSDbase(43840925,131855274,shared)
+OpenBSDbase(43840925,131855274)
 
-OpenBSDcomp(71104591,261759062,shared)
+OpenBSDcomp(71104591,261759062)
 
 OpenBSDetc(517053,1543992)
 
diff --git a/distrib/notes/sparc/features b/distrib/notes/sparc/features
new file mode 100644
index 00000000000..8b2a85ee94b
--- /dev/null
+++ b/distrib/notes/sparc/features
@@ -0,0 +1,40 @@
+dnl	$OpenBSD: features,v 1.1 2009/05/12 21:06:51 miod 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/{miniroot,ramdisk}/list
+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/install b/distrib/notes/sparc/install
index a3140f6f976..0caf9ed1ae7 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.67 2008/08/05 22:58:01 miod Exp $
+dnl	$OpenBSD: install,v 1.68 2009/05/12 21:06:51 miod Exp $
 OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -172,41 +172,29 @@ OpenBSDInstallPart2
 	is bad, your diskless setup isn't correct, or you may have
 	a hardware or configuration problem.
 
-OpenBSDBootMsgs(SMD drives are noisy and weight a ton per kilobyte and scare
+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-:})
 
-	You will next be asked for your terminal type.  If you are
-	installing from a non-serial console, the default of "vt220"
-	is correct.  If you are installing from a serial console
-	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt220.)
-
-OpenBSDInstallPart3
-
 OpenBSDInstallPart4
 
-OpenBSDInstallPart5(sd0)
+OpenBSDInstallPart5
 
-OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
-OpenBSDTAPEInstall(2)
-
 OpenBSDCDROMInstall
 		
 OpenBSDDISKInstall(,{:-only -:})
 
-OpenBSDCommonFS
-		
-OpenBSDCommonURL
+OpenBSDCommonInstall
 
-OpenBSDInstallWrapup
+OpenBSDTAPEInstall(2)
 
-OpenBSDInstallWrapupPart2
+OpenBSDInstallWrapup
 
 After completing an installation: