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/hppa/contents b/distrib/notes/hppa/contents
index 038a9ba460e..93d3ce59c42 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.20 2009/02/28 20:53:00 miod Exp $
+dnl	$OpenBSD: contents,v 1.21 2009/05/12 21:06:50 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -18,9 +18,9 @@ OpenBSDcd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(49379319,134401253,shared)
+OpenBSDbase(49379319,134401253)
 
-OpenBSDcomp(75933635,267477556,shared)
+OpenBSDcomp(75933635,267477556)
 
 OpenBSDetc(511529,1523414)
 
diff --git a/distrib/notes/hppa/features b/distrib/notes/hppa/features
new file mode 100644
index 00000000000..9e1ba4df590
--- /dev/null
+++ b/distrib/notes/hppa/features
@@ -0,0 +1,40 @@
+dnl	$OpenBSD: features,v 1.1 2009/05/12 21:06:50 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/hppa/install.md
+dnl and the list files in
+dnl	src/distrib/hppa/{,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-:},)dnl
diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install
index 3cf0a220f4d..acfa40548a2 100644
--- a/distrib/notes/hppa/install
+++ b/distrib/notes/hppa/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.16 2008/08/05 22:58:01 miod Exp $
+dnl	$OpenBSD: install,v 1.17 2009/05/12 21:06:50 miod Exp $
 dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially
 OpenBSDInstallPrelude
 
@@ -118,18 +118,12 @@ OpenBSDInstallPart2
 	media is bad, your diskless setup is incorrect, or you may have
 	a hardware or configuration problem.
 
-OpenBSDBootMsgs(,"sd0")
-
-	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
+OpenBSDInstallPart3(,"sd0")
 
 OpenBSDInstallPart4
 
+OpenBSDInstallPart5
+
 	Since the target disk will become the boot disk for your new
 	OpenBSD/MACHINE installation, the disklabel program will restrict
 	the available disk area to keep the first cylinder, which will
@@ -137,28 +131,22 @@ OpenBSDInstallPart4
 	plan to install a bootblock on this disk, you can reclaim this
 	space with the 'b' command.
 
-OpenBSDInstallPart5(sd0)
-
-OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDCDROMInstall
 
 OpenBSDNFSInstall
 
 OpenBSDDISKInstall(,{:-only -:})
 
-OpenBSDCommonFS
+OpenBSDCommonInstall
 
-OpenBSDCommonURL
+OpenBSDTAPEInstall
 
 OpenBSDInstallWrapup
 
-OpenBSDInstallWrapupPart2
-
 OpenBSDCongratulations