1. Take out console setup in options now that Joerg has moved it into

   the main menu.
2. Conditionalized a few small things which needed it.
3. Put PC98 X servers in their own menu, there are so many of them now.
4. Rampaged on the menus.c file in general, reformatting and cleaning up.

7 files changed, 1459 insertions, 1502 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 0ad3bec..cac144a 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.56 1996/11/07 16:34:12 jkh Exp $
+ * $Id: config.c,v 1.57 1996/11/08 05:38:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -542,6 +542,7 @@ configPackages(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
 }
 
+#ifdef NETCON_EXTENTIONS
 /* Load novell client/server package */
 int
 configNovell(dialogMenuItem *self)
@@ -561,6 +562,7 @@ configNovell(dialogMenuItem *self)
     }
     return ret | DITEM_RESTORE;
 }
+#endif
 
 /* Load pcnfsd package */
 int
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 47c06f3..ec5fe98 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.94 1996/11/07 18:30:59 jkh Exp $
+ * $Id: menus.c,v 1.95 1996/11/09 16:47:05 joerg Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -207,21 +207,21 @@ DMenu MenuIndex = {
     "Leave the index page by selecting Cancel [TAB-ENTER].",
     "Use PageUp or PageDown to move through this menu faster!",
     NULL,
-    { { "Add User",	"Add users to the system.", NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
-      { "Anon FTP",	"Configure anonymous FTP logins.",	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
-      { "Commit",	"Commit any pending actions (dangerous!)", NULL, installCustomCommit },
-      { "Console settings",	"Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
+    { { "Add User",		"Add users to the system.",		NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
+      { "Anon FTP",		"Configure anonymous FTP logins.",	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
+      { "Commit",		"Commit any pending actions (dangerous!)", NULL, installCustomCommit },
+      { "Console settings",	"Customize system console behavior.",	NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Configure",		"The system configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuConfigure },
       { "Device, Mouse",	"The mouse configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuMouse },
-      { "Dists, All",	"Root of the distribution tree.",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
-      { "Dists, Basic",	"Basic FreeBSD distribution menu.",	NULL, dmenuSubmenu, NULL, &MenuSubDistributions },
-      { "Dists, DES",	"DES distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuDESDistributions },
-      { "Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper },
-      { "Dists, Src",	"Src distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuSrcDistributions },
-      { "Dists, X Developer", "Select X developer's distribution.",	checkDistXDeveloper, distSetXDeveloper },
+      { "Dists, All",		"Root of the distribution tree.",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
+      { "Dists, Basic",		"Basic FreeBSD distribution menu.",	NULL, dmenuSubmenu, NULL, &MenuSubDistributions },
+      { "Dists, DES",		"DES distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuDESDistributions },
+      { "Dists, Developer",	"Select developer's distribution.",	checkDistDeveloper, distSetDeveloper },
+      { "Dists, Src",		"Src distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuSrcDistributions },
+      { "Dists, X Developer",	"Select X developer's distribution.",	checkDistXDeveloper, distSetXDeveloper },
       { "Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper },
-      { "Dists, User",		"Select average user distribution.", checkDistUser, distSetUser },
-      { "Dists, X User",	"Select average X user distribution.", checkDistXUser, distSetXUser },
+      { "Dists, User",		"Select average user distribution.",	checkDistUser, distSetUser },
+      { "Dists, X User",	"Select average X user distribution.",	checkDistXUser, distSetXUser },
       { "Distributions, XFree86","XFree86 distribution menu.",		NULL, distSetXF86 },
       { "Documentation",	"Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
       { "Doc, README",		"The distribution README file.",	NULL, dmenuDisplayFile, NULL, "readme" },
@@ -231,7 +231,7 @@ DMenu MenuIndex = {
       { "Doc, Release",		"The distribution release notes.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
       { "Doc, HTML",		"The HTML documentation menu.",		NULL, docBrowser },
       { "Extract",		"Extract selected distributions from media.",		NULL, distExtractAll },
-      { "Fixit",		"Repair mode with CDROM or floppy.",	NULL, dmenuSubmenu, NULL, &MenuFixit },
+      { "Fixit",		"Repair mode with fixit floppy.",	NULL, installFixitFloppy },
       { "FTP sites",		"The FTP mirror site listing.",		NULL, dmenuSubmenu, NULL, &MenuMediaFTP },
       { "Gateway",		"Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
       { "HTML Docs",		"The HTML documentation menu",		NULL, docBrowser },
@@ -256,25 +256,26 @@ DMenu MenuIndex = {
       { "Options",		"The options editor.",			NULL, optionsEditor },
       { "Packages",		"The packages collection",		NULL, configPackages },
       { "Partition",		"The disk Partition Editor",		NULL, diskPartitionEditor },
-      { "PCNFSD",		"Run authentication server for PC-NFS.",	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
+      { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
-      { "Router",		"Select routing daemon (default: routed)",	dmenuVarCheck, configRouter, NULL, "router" },
+      { "Router",		"Select routing daemon (default: routed)", dmenuVarCheck, configRouter, NULL, "router" },
       { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
-      { "Syscons",		"The system console configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSyscons },
+      { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Syscons, Font",	"The console screen font.",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
-      { "Syscons, Keymap",	"The console keymap configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-      { "Syscons, Keyrate",	"The console key rate configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
+      { "Syscons, Keymap",	"The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "Syscons, Keyrate",	"The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
       { "Syscons, Saver",	"The console screen saver configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-      { "Syscons, Screenmap",	"The console screenmap configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
+      { "Syscons, Screenmap",	"The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
       { "Time Zone",		"Set the system's time zone.",		NULL, dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
       { "Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { "Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { "WEB Server",		"Configure host as a WWW server.",	dmenuVarCheck, configApache, NULL, "apache_httpd" },
       { "XFree86, Fonts",	"XFree86 Font selection menu.",		NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
       { "XFree86, Server",	"XFree86 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
+      { "XFree86, PC98 Server",	"XFree86 PC98 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server },
       { NULL } },
 };
-      
+
 /* The initial installation menu */
 DMenu MenuInitial = {
     DMENU_NORMAL_TYPE,
@@ -287,65 +288,47 @@ DMenu MenuInitial = {
     "install",						/* help file */
     { { "Select" },
       { "Exit Install",	NULL, NULL, dmenuExit },
-      { "1 Usage",	"Quick start - How to use this menu system",		NULL, dmenuDisplayFile, NULL, "usage" },
-      { "2 Doc",	"Installation instructions, README, etc.",		NULL, dmenuSubmenu, NULL, &MenuDocumentation },
-      { "3 Keymap",	"Select a keyboard language.",				NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-      { "4 Options",	"Go to the options editor",				NULL, optionsEditor },
-      { "5 Novice",	"Begin a novice installation (for beginners)",		NULL, installNovice },
-      { "6 Express",	"Begin a quick installation (for the impatient)",	NULL, installExpress },
-      { "7 Custom",	"Begin a custom installation (for experts)",		NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
-      { "8 Fixit",	"Go into repair mode with CDROM or floppy",		NULL, dmenuSubmenu, NULL, &MenuFixit },
+      { "1 Usage",	"Quick start - How to use this menu system",	NULL, dmenuDisplayFile, NULL, "usage" },
+      { "2 Doc",	"Installation instructions, README, etc.",	NULL, dmenuSubmenu, NULL, &MenuDocumentation },
+      { "3 Keymap",	"Select keyboard type",				NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "4 Options",	"View/Set various installation options",	NULL, optionsEditor },
+      { "5 Novice",	"Begin a novice installation (for beginners)",	NULL, installNovice },
+      { "6 Express",	"Begin a quick installation (for the impatient)", NULL, installExpress },
+      { "7 Custom",	"Begin a custom installation (for experts)",	NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
+      { "8 Fixit",	"Go into repair mode with a fixit floppy",	NULL, installFixitFloppy },
       { "9 Upgrade",	"Upgrade an existing system",			NULL, installUpgrade },
-      { "c Configure",	"Do post-install configuration of FreeBSD",		NULL, dmenuSubmenu, NULL, &MenuConfigure },
-      { "0 Index",	"Glossary of functions.",		NULL, dmenuSubmenu, NULL, &MenuIndex },
+      { "c Configure",	"Do post-install configuration of FreeBSD",	NULL, dmenuSubmenu, NULL, &MenuConfigure },
+      { "0 Index",	"Glossary of functions",			NULL, dmenuSubmenu, NULL, &MenuIndex },
       { NULL } },
 };
 
-DMenu MenuFixit = {
-    DMENU_NORMAL_TYPE,
-    "Please choose a fixit option",
-"There are two ways of going into \"fixit\" mode - you may either elect\n\
-to use the 2nd FreeBSD CDROM, in which case there will be full access\n\
-access to the complete set of FreeBSD commands and utilities, or you\n\
-can use the more limited fixit floppy if you don't have a CDROM or are\n\
-somehow faced with a situation where a CDROM is impractical.  The fixit\n\
-floppy has only a minimal subset of commands which we deemed most useful\n\
-for fixing a system in trouble.",
-    "Press F1 for more detailed repair instructions",
-    "fixit",
-{ { "1 CDROM",	"Use the 2nd \"live\" CDROM from the distribution",	NULL, installFixitCDROM },
-  { "2 Floppy",	"Use a floppy generated from the fixit image",		NULL, installFixitFloppy },
-  { NULL } },
-};
-
-
 /* The main documentation menu */
 DMenu MenuDocumentation = {
     DMENU_NORMAL_TYPE,
     "Documentation for FreeBSD " RELEASE_NAME,
-    "If you are at all unsure about the configuration of your hardware\n\
-or are looking to build a system specifically for FreeBSD, read the\n\
-Hardware guide!  New users should also read the Install document for\n\
-a step-by-step tutorial on installing FreeBSD.  For general information,\n\
-consult the README file.",
+    "If you are at all unsure about the configuration of your hardware\n"
+    "or are looking to build a system specifically for FreeBSD, read the\n"
+    "Hardware guide!  New users should also read the Install document for\n"
+    "a step-by-step tutorial on installing FreeBSD.  For general information,\n"
+    "consult the README file.",
     "Confused?  Press F1 for help.",
     "usage",
-{ { "1 README",	"A general description of FreeBSD.  Read this!",	NULL, dmenuDisplayFile, NULL, "readme" },
-  { "2 Hardware","The FreeBSD survival guide for PC hardware.",		NULL, dmenuDisplayFile,	NULL, "hardware" },
-  { "3 Install","A step-by-step guide to installing FreeBSD.",		NULL, dmenuDisplayFile,	NULL, "install" },
-  { "4 Copyright","The FreeBSD Copyright notices.",			NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
-  { "5 Release","The release notes for this version of FreeBSD.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
-  { "6 Shortcuts", "Creating shortcuts to sysinstall.",	NULL, dmenuDisplayFile, NULL, "shortcuts" },
-  { "7 HTML Docs","Go to the HTML documentation menu (post-install).",	NULL, docBrowser },
-  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuExit },
-  { NULL } },
+    { { "1 README",	"A general description of FreeBSD.  Read this!", NULL, dmenuDisplayFile, NULL, "readme" },
+      { "2 Hardware",	"The FreeBSD survival guide for PC hardware.",	NULL, dmenuDisplayFile,	NULL, "hardware" },
+      { "3 Install",	"A step-by-step guide to installing FreeBSD.",	NULL, dmenuDisplayFile,	NULL, "install" },
+      { "4 Copyright",	"The FreeBSD Copyright notices.",		NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
+      { "5 Release"	,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "relnotes" },
+      { "6 Shortcuts",	"Creating shortcuts to sysinstall.",		NULL, dmenuDisplayFile, NULL, "shortcuts" },
+      { "7 HTML Docs",	"Go to the HTML documentation menu (post-install).", NULL, docBrowser },
+      { "0 Exit",	"Exit this menu (returning to previous)",	NULL, dmenuExit },
+      { NULL } },
 };
 
 static int
 whichMouse(dialogMenuItem *self)
 {
     char buf[BUFSIZ];
-
+    
     if (!file_readable("/dev/mouse"))
 	return FALSE;
     if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
@@ -368,37 +351,37 @@ whichMouse(dialogMenuItem *self)
 DMenu MenuMouse = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "Please select your mouse type from the following menu",
-    "There are many different types of mice currently on the market,\n\
-but this configuration menu should at least narrow down the choices\n\
-somewhat.  Once you've selected one of the below, you can specify\n\
-/dev/mouse as your mouse device when running the XFree86 configuration\n\
-utility (see Configuration menu).  Please note that for PS/2 mice,\n\
-a kernel recompile is also required!  See the handbook for more details\n\
-on building a kernel.",
+    "There are many different types of mice currently on the market,\n"
+    "but this configuration menu should at least narrow down the choices\n"
+    "somewhat.  Once you've selected one of the below, you can specify\n"
+    "/dev/mouse as your mouse device when running the XFree86 configuration\n"
+    "utility (see Configuration menu).  Please note that for PS/2 mice,\n"
+    "a kernel recompile is also required!  See the handbook for more details\n"
+    "on building a kernel.",
     "For more information, visit the Documentation menu",
     NULL,
-{ { "COM1",	"Serial mouse on COM1",	whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa0 /dev/mouse", '(', '*', ')', 1 },
-  { "COM2",	"Serial mouse on COM2", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa1 /dev/mouse", '(', '*', ')', 1 },
-  { "COM3",	"Serial mouse on COM3", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
-  { "COM4",	"Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
-  { "BusMouse",	"Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
-  { "PS/2",	"PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
-  { NULL } },
+    { { "COM1",	"Serial mouse on COM1",	whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa0 /dev/mouse", '(', '*', ')', 1 },
+      { "COM2",	"Serial mouse on COM2", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa1 /dev/mouse", '(', '*', ')', 1 },
+      { "COM3",	"Serial mouse on COM3", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
+      { "COM4",	"Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
+      { "BusMouse",	"Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
+      { "PS/2",	"PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
+      { NULL } },
 };
 
 DMenu MenuMediaCDROM = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a CDROM type",
-    "FreeBSD can be installed directly from a CDROM containing a valid\n\
-FreeBSD distribution.  If you are seeing this menu it is because\n\
-more than one CDROM drive was found on your system.  Please select one\n\
-of the following CDROM drives as your installation drive.",
+    "FreeBSD can be installed directly from a CDROM containing a valid\n"
+    "FreeBSD distribution.  If you are seeing this menu it is because\n"
+    "more than one CDROM drive was found on your system.  Please select one\n"
+    "of the following CDROM drives as your installation drive.",
     "Press F1 to read the installation guide",
     "install",
     { { NULL } },
@@ -407,8 +390,8 @@ of the following CDROM drives as your installation drive.",
 DMenu MenuMediaFloppy = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a Floppy drive",
-    "You have more than one floppy drive.  Please chose which drive\n\
-you would like to use.",
+    "You have more than one floppy drive.  Please chose which drive\n"
+    "you would like to use.",
     NULL,
     NULL,
     { { NULL } },
@@ -417,14 +400,14 @@ you would like to use.",
 DMenu MenuMediaDOS = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a DOS partition",
-    "FreeBSD can be installed directly from a DOS partition\n\
-assuming, of course, that you have copied the relevant\n\
-distributions into your DOS partition before starting this\n\
-installation.  If this is not the case then you should reboot\n\
-DOS at this time and copy the distributions you wish to install\n\
-into a \"FREEBSD\" subdirectory on one of your DOS partitions.\n\
-Otherwise, please select the DOS partition containing the FreeBSD\n\
-distribution files.",
+    "FreeBSD can be installed directly from a DOS partition\n"
+    "assuming, of course, that you have copied the relevant\n"
+    "distributions into your DOS partition before starting this\n"
+    "installation.  If this is not the case then you should reboot\n"
+    "DOS at this time and copy the distributions you wish to install\n"
+    "into a \"FREEBSD\" subdirectory on one of your DOS partitions.\n"
+    "Otherwise, please select the DOS partition containing the FreeBSD\n"
+    "distribution files.",
     "Press F1 to read the installation guide",
     "install",
     { { NULL } },
@@ -433,142 +416,142 @@ distribution files.",
 DMenu MenuMediaFTP = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Please select a FreeBSD FTP distribution site",
-    "Please select the site closest to you or \"other\" if you'd like to\n\
-specify a different choice.  Also note that not every site listed here\n\
-carries more than the base distribution kits. Only the Primary site is\n\
-guaranteed to carry the full range of possible distributions.",
+    "Please select the site closest to you or \"other\" if you'd like to\n"
+    "specify a different choice.  Also note that not every site listed here\n"
+    "carries more than the base distribution kits. Only the Primary site is\n"
+    "guaranteed to carry the full range of possible distributions.",
     "Select a site that's close!",
     "install",
-{ { "Primary Site",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
-  { "URL",		"Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=other" },
-  { "Argentina",	"ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
-  { "Australia",	"ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/" },
-  { "Australia #2",	"ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/" },
-  { "Australia #3",	"ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/" },
-  { "Australia #4",	"ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/" },
-  { "Brazil",		"ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #2",	"ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #3",	"ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #4",	"ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #5",	"ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/" },
-  { "Canada",		"ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/" },
-  { "Czech Republic",	"sunsite.mff.cuni.cz", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://sunsite.mff.cuni.cz/OS/FreeBSD/" },
-  { "Estonia",		"ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org/pub/FreeBSD/" },
-  { "Finland",		"nic.funet.fi", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://nic.funet.fi/pub/unix/FreeBSD/" },
-  { "France",		"ftp.ibp.fr", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ibp.fr/pub/FreeBSD/" },
-  { "Germany",		"ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #2",	"ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #3",	"ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #4",	"ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #5",	"ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #6",	"ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #7",	"ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/" },
-  { "Holland",	 	"ftp.nl.freebsd.ort", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org/pub/os/FreeBSD/cdrom/" },
-  { "Hong Kong",	"ftp.hk.super.net", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/" },
-  { "Ireland",		"ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/" },
-  { "Israel",		"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.il.freebsd.org/pub/FreeBSD/" },
-  { "Israel #2",	"ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org/pub/FreeBSD/" },
-  { "Japan",		"ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #2",		"ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #3",		"ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #4",		"ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #5",		"ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #6",		"ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/" },
-  { "Korea",		"ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/" },
-  { "Korea #2",		"ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/" },
-  { "Netherlands",	"ftp.nl.net", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.nl.net/pub/os/FreeBSD/" },
-  { "Poland",		"SunSITE.icm.edu.pl", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://SunSITE.icm.edu.pl/pub/FreeBSD/" },
-  { "Portugal",		"ftp.ua.pt", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ua.pt/pub/misc/FreeBSD/" },
-  { "Russia",		"ftp.kiae.su", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.kiae.su/FreeBSD/" },
-  { "South Africa",	"ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/" },
-  { "South Africa #2",	"ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" },
-  { "South Africa #3",	"ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org/pub/FreeBSD/" },
-  { "Sweden",		"ftp.luth.se", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.luth.se/pub/FreeBSD/" },
-  { "Taiwan",		"ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD" },
-  { "Taiwan #2",	"ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.tw.freebsd.org/pub/FreeBSD" },
-  { "Taiwan #3",	"ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org/pub/FreeBSD/" },
-  { "Thailand",		"ftp.nectec.or.th", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" },
-  { "UK",		"ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/BSD/FreeBSD/" },
-  { "UK #2",		"ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/BSD/FreeBSD/" },
-  { "UK #3",		"ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/BSD/FreeBSD/" },
-  { "USA",		"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
-  { "USA #2",		"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/" },
-  { "USA #3",		"ftp3.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/" },
-  { "USA #4",		"ftp4.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/" },
-  { "USA #5",		"ftp5.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/" },
-  { "USA #6",		"ftp6.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/" },
-  { "USA #7",		"ftp7.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp7.freebsd.org/pub/FreeBSD/" },
-  { NULL } }
+    { { "Primary Site",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
+      { "URL",		"Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=other" },
+      { "Argentina",	"ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
+      { "Australia",	"ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/" },
+      { "Australia #2",	"ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/" },
+      { "Australia #3",	"ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/" },
+      { "Australia #4",	"ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/" },
+      { "Brazil",	"ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #2",	"ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #3",	"ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #4",	"ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #5",	"ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/" },
+      { "Canada",	"ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/" },
+      { "Czech Republic", "sunsite.mff.cuni.cz", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://sunsite.mff.cuni.cz/OS/FreeBSD/" },
+      { "Estonia",	"ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org/pub/FreeBSD/" },
+      { "Finland",	"nic.funet.fi", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://nic.funet.fi/pub/unix/FreeBSD/" },
+      { "France",	"ftp.ibp.fr", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ibp.fr/pub/FreeBSD/" },
+      { "Germany",	"ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #2",	"ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #3",	"ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #4",	"ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #5",	"ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #6",	"ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #7",	"ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/" },
+      { "Holland",	"ftp.nl.freebsd.ort", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org/pub/os/FreeBSD/cdrom/" },
+      { "Hong Kong",	"ftp.hk.super.net", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/" },
+      { "Ireland",	"ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/" },
+      { "Israel",	"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.il.freebsd.org/pub/FreeBSD/" },
+      { "Israel #2",	"ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org/pub/FreeBSD/" },
+      { "Japan",	"ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #2",	"ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #3",	"ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #4",	"ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #5",	"ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #6",	"ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/" },
+      { "Korea",	"ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/" },
+      { "Korea #2",	"ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/" },
+      { "Netherlands",	"ftp.nl.net", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.nl.net/pub/os/FreeBSD/" },
+      { "Poland",	"SunSITE.icm.edu.pl", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://SunSITE.icm.edu.pl/pub/FreeBSD/" },
+      { "Portugal",	"ftp.ua.pt", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ua.pt/pub/misc/FreeBSD/" },
+      { "Russia",	"ftp.kiae.su", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.kiae.su/FreeBSD/" },
+      { "South Africa",	"ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/" },
+      { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" },
+      { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org/pub/FreeBSD/" },
+      { "Sweden",	"ftp.luth.se", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.luth.se/pub/FreeBSD/" },
+      { "Taiwan",	"ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD" },
+      { "Taiwan #2",	"ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.tw.freebsd.org/pub/FreeBSD" },
+      { "Taiwan #3",	"ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org/pub/FreeBSD/" },
+      { "Thailand",	"ftp.nectec.or.th", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" },
+      { "UK",		"ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/BSD/FreeBSD/" },
+      { "UK #2",	"ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/BSD/FreeBSD/" },
+      { "UK #3",	"ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/BSD/FreeBSD/" },
+      { "USA",		"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
+      { "USA #2",	"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/" },
+      { "USA #3",	"ftp3.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/" },
+      { "USA #4",	"ftp4.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/" },
+      { "USA #5",	"ftp5.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/" },
+      { "USA #6",	"ftp6.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/" },
+      { "USA #7",	"ftp7.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.freebsd.org/pub/FreeBSD/" },
+      { NULL } }
 };
 
 DMenu MenuMediaTape = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a tape drive type",
-    "FreeBSD can be installed from tape drive, though this installation\n\
-method requires a certain amount of temporary storage in addition\n\
-to the space required by the distribution itself (tape drives make\n\
-poor random-access devices, so we extract _everything_ on the tape\n\
-in one pass).  If you have sufficient space for this, then you should\n\
-select one of the following tape devices detected on your system.",
+    "FreeBSD can be installed from tape drive, though this installation\n"
+    "method requires a certain amount of temporary storage in addition\n"
+    "to the space required by the distribution itself (tape drives make\n"
+    "poor random-access devices, so we extract _everything_ on the tape\n"
+    "in one pass).  If you have sufficient space for this, then you should\n"
+    "select one of the following tape devices detected on your system.",
     "Press F1 to read the installation guide",
     "install",
     { { NULL } },
@@ -594,250 +577,236 @@ DMenu MenuNetworkDevice = {
 DMenu MenuMedia = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose Installation Media",
-    "FreeBSD can be installed from a variety of different installation\n\
-media, ranging from floppies to an Internet FTP server.  If you're\n\
-installing FreeBSD from a supported CDROM drive then this is generally\n\
-the best media to use if you have no overriding reason for using other\n\
-media.",
+    "FreeBSD can be installed from a variety of different installation\n"
+    "media, ranging from floppies to an Internet FTP server.  If you're\n"
+    "installing FreeBSD from a supported CDROM drive then this is generally\n"
+    "the best media to use if you have no overriding reason for using other\n"
+    "media.",
     "Press F1 for more information on the various media types",
     "media",
-{ { "1 CDROM",		"Install from a FreeBSD CDROM",
-    NULL, mediaSetCDROM },
-  { "2 FTP",		"Install from an FTP server",
-    NULL, mediaSetFTPActive },
-  { "3 FTP Passive",	"Install from an FTP server through a firewall",
-    NULL, mediaSetFTPPassive },
-  { "4 DOS",		"Install from a DOS partition",
-    NULL, mediaSetDOS },
-  { "5 NFS",		"Install over NFS",
-    NULL, mediaSetNFS },
-  { "6 File System",	"Install from an existing filesystem",
-    NULL, mediaSetUFS },
-  { "7 Floppy",		"Install from a floppy disk set",
-    NULL, mediaSetFloppy },
-  { "8 Tape",		"Install from SCSI or QIC tape",
-    NULL, mediaSetTape },
-  { NULL } },
+    { { "1 CDROM",		"Install from a FreeBSD CDROM",		NULL, mediaSetCDROM },
+      { "2 FTP",		"Install from an FTP server",		NULL, mediaSetFTPActive },
+      { "3 FTP Passive",	"Install from an FTP server through a firewall", NULL, mediaSetFTPPassive },
+      { "4 DOS",		"Install from a DOS partition",		NULL, mediaSetDOS },
+      { "5 NFS",		"Install over NFS",			NULL, mediaSetNFS },
+      { "6 File System",	"Install from an existing filesystem",	NULL, mediaSetUFS },
+      { "7 Floppy",		"Install from a floppy disk set",	NULL, mediaSetFloppy },
+      { "8 Tape",		"Install from SCSI or QIC tape",	NULL, mediaSetTape },
+      { NULL } },
 };
 
 /* The distributions menu */
 DMenu MenuDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Choose Distributions",
-    "As a convenience, we provide several \"canned\" distribution sets.\n\
-These select what we consider to be the most reasonable defaults for the\n\
-type of system in question.  If you would prefer to pick and choose the\n\
-list of distributions yourself, simply select \"Custom\".  You can also\n\
-pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
-Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n\
-item or press [ENTER].",
+    "As a convenience, we provide several \"canned\" distribution sets.\n"
+    "These select what we consider to be the most reasonable defaults for the\n"
+    "type of system in question.  If you would prefer to pick and choose the\n"
+    "list of distributions yourself, simply select \"Custom\".  You can also\n"
+    "pick a canned distribution set and then fine-tune it with the Custom item.\n\n"
+    "Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n"
+    "item or press [ENTER].",
     "Press F1 for more information on these options.",
     "distributions",
-{ { "1 Developer",	"Full sources, binaries and doc but no games [180M]",
-    checkDistDeveloper, distSetDeveloper },
-  { "2 X-Developer",	"Same as above, but includes XFree86 [201M]",
-    checkDistXDeveloper, distSetXDeveloper },
-  { "3 Kern-Developer",	"Full binaries and doc, kernel sources only [70M]",
-    checkDistKernDeveloper, distSetKernDeveloper },
-  { "4 User",		"Average user - binaries and doc only [52M]",
-    checkDistUser, distSetUser },
-  { "5 X-User",		"Same as above, but includes XFree86 [52M]",
-    checkDistXUser, distSetXUser },
-  { "6 Minimal",	"The smallest configuration possible [44M]",
-    checkDistMinimum, distSetMinimum },
-  { "7 All",		"All sources, binaries and XFree86 binaries [700M]",
-    checkDistEverything, distSetEverything },
-  { "8 Custom",		"Specify your own distribution set [?]",
-    NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
-  { "9 Clear",		"Reset selected distribution list to nothing [0M]",
-    NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
-  { "0 Exit",		"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "1 Developer",		"Full sources, binaries and doc but no games [180M]", 
+	checkDistDeveloper,	distSetDeveloper },
+      { "2 X-Developer",	"Same as above, but includes XFree86 [201M]",
+	checkDistXDeveloper,	distSetXDeveloper },
+      { "3 Kern-Developer",	"Full binaries and doc, kernel sources only [70M]",
+	checkDistKernDeveloper, distSetKernDeveloper },
+      { "4 User",		"Average user - binaries and doc only [52M]",
+	checkDistUser,		distSetUser },
+      { "5 X-User",		"Same as above, but includes XFree86 [52M]",
+	checkDistXUser,		distSetXUser },
+      { "6 Minimal",		"The smallest configuration possible [44M]",
+	checkDistMinimum,	distSetMinimum },
+      { "7 All",		"All sources, binaries and XFree86 binaries [700M]",
+	checkDistEverything,	distSetEverything },
+      { "8 Custom",		"Specify your own distribution set [?]",
+	NULL,			dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
+      { "9 Clear",		"Reset selected distribution list to nothing [0M]",
+	NULL,			distReset, NULL, NULL, ' ', ' ', ' ' },
+      { "0 Exit",		"Exit this menu (returning to previous)",
+	checkTrue,		dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuSubDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the distributions you wish to install.",
-    "Please check off the distributions you wish to install.  At the\n\
-very minimum, this should be \"bin\".  WARNING:  Do not export the\n\
-DES distribution out of the U.S.!  It is for U.S. customers only.",
+    "Please check off the distributions you wish to install.  At the\n"
+    "very minimum, this should be \"bin\".  WARNING:  Do not export the\n"
+    "DES distribution out of the U.S.!  It is for U.S. customers only.",
     NULL,
     NULL,
-{ { "bin",		"Binary base distribution (required) [36M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
-  { "commerce",		"Commercial and shareware demos [10M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMMERCIAL },
-  { "compat1x",		"FreeBSD 1.x binary compatibility [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
-  { "compat20",		"FreeBSD 2.0 binary compatibility [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
-  { "compat21",		"FreeBSD 2.1 binary compatibility [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
-  { "DES",		"DES encryption code - NOT FOR EXPORT! [.3M]",
-    DESFlagCheck, distSetDES },
-  { "dict",		"Spelling checker dictionary files [4.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
-  { "doc",		"FreeBSD Handbook and other online docs [10M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
-  { "games",		"Games (non-commercial) [6.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
-  { "info",		"GNU info files [4.1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
-  { "man",		"System manual pages - recommended [3.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
-  { "proflibs",		"Profiled versions of the libraries [3.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
-  { "src",		"Sources for everything but DES [120M]",
-    srcFlagCheck, distSetSrc },
-  { "XFree86",		"The XFree86 3.2 distribution",
-    x11FlagCheck, distSetXF86 },
-  { "xperimnt",		"Experimental work in progress!",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
-  { "All",		"All sources, binaries and XFree86 binaries [700M]",
-    NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",		"Reset all of the above [0M]",
-    NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "bin",		"Binary base distribution (required) [36M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
+      { "commerce",	"Commercial and shareware demos [10M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMMERCIAL },
+      { "compat1x",	"FreeBSD 1.x binary compatibility [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
+      { "compat20",	"FreeBSD 2.0 binary compatibility [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
+      { "compat21",	"FreeBSD 2.1 binary compatibility [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
+      { "DES",		"DES encryption code - NOT FOR EXPORT! [.3M]",
+	DESFlagCheck,	distSetDES },
+      { "dict",		"Spelling checker dictionary files [4.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
+      { "doc",		"FreeBSD Handbook and other online docs [10M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
+      { "games",	"Games (non-commercial) [6.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
+      { "info",		"GNU info files [4.1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
+      { "man",		"System manual pages - recommended [3.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
+      { "proflibs",	"Profiled versions of the libraries [3.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
+      { "src",		"Sources for everything but DES [120M]",
+	srcFlagCheck,	distSetSrc },
+      { "XFree86",	"The XFree86 3.2 distribution",
+	x11FlagCheck,	distSetXF86 },
+      { "xperimnt",	"Experimental work in progress!",
+	dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
+      { "All",		"All sources, binaries and XFree86 binaries [700M]",
+	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuDESDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the encryption facilities you wish to install.",
-    "Please check off any special DES-based encryption distributions\n\
-you would like to install.  Please note that these services are NOT FOR\n\
-EXPORT from the United States.  For information on non-U.S. FTP\n\
-distributions of this software, please consult the release notes.",
+    "Please check off any special DES-based encryption distributions\n"
+    "you would like to install.  Please note that these services are NOT FOR\n"
+    "EXPORT from the United States.  For information on non-U.S. FTP\n"
+    "distributions of this software, please consult the release notes.",
     NULL,
     NULL,
-{ { "des",	"Basic DES encryption services [1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-  { "krb",	"Kerberos encryption services [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
-  { "sebones",	"Sources for eBones (Kerberos) [1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
-  { "ssecure",	"Sources for DES [1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "des",		"Basic DES encryption services [1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
+      { "krb",		"Kerberos encryption services [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
+      { "sebones",	"Sources for eBones (Kerberos) [1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
+      { "ssecure",	"Sources for DES [1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuSrcDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS ,
     "Select the sub-components of src you wish to install.",
-    "Please check off those portions of the FreeBSD source tree\n\
-you wish to install.",
+    "Please check off those portions of the FreeBSD source tree\n"
+    "you wish to install.",
     NULL,
     NULL,
-{ { "base",	"top-level files in /usr/src [300K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
-  { "contrib",	"/usr/src/contrib (contributed software) [33M]",
-    dmenuFlagCheck, dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
-  { "gnu",	"/usr/src/gnu (software from the GNU Project) [42M]",
-    dmenuFlagCheck, dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
-  { "etc",	"/usr/src/etc (miscellaneous system files) [460K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
-  { "games",	"/usr/src/games (the obvious!) [7.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
-  { "include",	"/usr/src/include (header files) [467K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
-  { "lib",	"/usr/src/lib (system libraries) [9.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
-  { "libexec",	"/usr/src/libexec (system programs) [1.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
-  { "lkm",	"/usr/src/lkm (Loadable Kernel Modules) [193K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM	},
-  { "release",	"/usr/src/release (release-generation tools) [533K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
-  { "bin",	"/usr/src/bin (system binaries) [2.5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
-  { "sbin",	"/usr/src/sbin (system binaries) [1.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
-  { "share",	"/usr/src/share (documents and shared files) [10M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
-  { "sys",	"/usr/src/sys (FreeBSD kernel) [13M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
-  { "ubin",	"/usr/src/usr.bin (user binaries) [13M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
-  { "usbin",	"/usr/src/usr.sbin (aux system binaries) [14M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
-  { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
-  { "All",	"Select all of the above [120M]",
-    NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0M]",
-    NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "base",		"top-level files in /usr/src [300K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
+      { "contrib",	"/usr/src/contrib (contributed software) [33M]",
+	dmenuFlagCheck,	dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
+      { "gnu",		"/usr/src/gnu (software from the GNU Project) [42M]",
+	dmenuFlagCheck,	dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
+      { "etc",		"/usr/src/etc (miscellaneous system files) [460K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
+      { "games",	"/usr/src/games (the obvious!) [7.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
+      { "include",	"/usr/src/include (header files) [467K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
+      { "lib",		"/usr/src/lib (system libraries) [9.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
+      { "libexec",	"/usr/src/libexec (system programs) [1.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
+      { "lkm",		"/usr/src/lkm (Loadable Kernel Modules) [193K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM	},
+      { "release",	"/usr/src/release (release-generation tools) [533K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
+      { "bin",		"/usr/src/bin (system binaries) [2.5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
+      { "sbin",		"/usr/src/sbin (system binaries) [1.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
+      { "share",	"/usr/src/share (documents and shared files) [10M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
+      { "sys",		"/usr/src/sys (FreeBSD kernel) [13M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
+      { "ubin",		"/usr/src/usr.bin (user binaries) [13M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
+      { "usbin",	"/usr/src/usr.sbin (aux system binaries) [14M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
+      { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
+	dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
+      { "All",		"Select all of the above [120M]",
+	NULL,		setSrc, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL,		clearSrc, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
     "XFree86 3.2 Distribution",
-    "Please select the components you need from the XFree86 3.2\n\
-distribution.  We recommend that you select what you need from the basic\n\
-component set and at least one entry from the Server and Font set menus.",
+    "Please select the components you need from the XFree86 3.2\n"
+    "distribution.  We recommend that you select what you need from the basic\n"
+    "component set and at least one entry from the Server and Font set menus.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "Basic",	"Basic component menu (required)",
-    NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore },
-  { "Server",	"X server menu",
-    NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
-  { "Fonts",	"Font set menu",
-    NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
-  { "All",	"Select the entire XFree86 distribution",
-    NULL, setX11All },
-  { "Clear",	"Reset XFree86 distribution list",
-    NULL, clearX11All },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "Basic",	"Basic component menu (required)",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore },
+      { "Server",	"X server menu",			NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
+      { "Fonts",	"Font set menu",			NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
+      { "All",		"Select the entire XFree86 distribution", NULL, setX11All },
+      { "Clear",	"Reset XFree86 distribution list",	NULL, clearX11All },
+      { "Exit",		"Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "XFree86 3.2 base distribution types",
-    "Please check off the basic XFree86 components you wish to install.\n\
-Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
+    "Please check off the basic XFree86 components you wish to install.\n"
+    "Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "bin",	"Client applications and shared libs [4.1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
-  { "cfg",	"Configuration files [10K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
-  { "doc",	"READMEs and release notes [600K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
-  { "html",	"HTML documentation files [400K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
-  { "lib",	"Data files needed at runtime [750K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
-  { "lk90",	"Server link kit for PC98 machines [8.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
-  { "lkit",	"Server link kit for all other machines [8.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
-  { "man",	"Manual pages [3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
-  { "prog",	"Programmer's header and library files [4.1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
-  { "ps",	"Postscript documentation [5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
-  { "set",	"XFree86 Setup Utility [1.0M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
-  { "sources",	"XFree86 3.2 standard sources [100M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
-  { "csources",	"XFree86 3.2 contrib sources [100M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
-  { "All",	"Select all of the above [20M]",
-    NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0M]",
-    NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "bin",		"Client applications and shared libs [4.1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
+      { "cfg",		"Configuration files [10K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
+      { "doc",		"READMEs and release notes [600K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
+      { "html",		"HTML documentation files [400K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
+      { "lib",		"Data files needed at runtime [750K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
+      { "lk90",		"Server link kit for PC98 machines [8.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
+      { "lkit",		"Server link kit for all other machines [8.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
+      { "man",		"Manual pages [3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
+      { "prog",		"Programmer's header and library files [4.1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
+      { "ps",		"Postscript documentation [5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
+      { "set",		"XFree86 Setup Utility [1.0M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
+      { "sources",	"XFree86 3.2 standard sources [100M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
+      { "csources",	"XFree86 3.2 contrib sources [100M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
+      { "All",		"Select all of the above [20M]",
+	NULL,		setX11Misc, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL,		clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86SelectFonts = {
@@ -849,109 +818,126 @@ install.  At the minimum, you should install the standard\n\
 (these are selected by default).",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "fnts",	"Standard 75 DPI and miscellaneous fonts [3.6M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
-  { "f100",	"100 DPI fonts [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
-  { "fcyr",	"Cyrillic Fonts [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
-  { "fscl",	"Speedo and Type scalable fonts [1.6M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
-  { "non",	"Japanese, Chinese and other non-english fonts [3.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
-  { "server",	"Font server [0.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
-  { "All",	"All fonts [10M]",
-    NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset font selections [0M]",
-    NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "fnts",		"Standard 75 DPI and miscellaneous fonts [3.6M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
+      { "f100",		"100 DPI fonts [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
+      { "fcyr",		"Cyrillic Fonts [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
+      { "fscl",		"Speedo and Type scalable fonts [1.6M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
+      { "non",		"Japanese, Chinese and other non-english fonts [3.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
+      { "server",	"Font server [0.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
+      { "All",		"All fonts [10M]",
+	NULL,		setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset font selections [0M]",
+	NULL,		clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86SelectServer = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "X Server selection.",
-    "Please check off the types of X servers you wish to install.\n\
+    "Please check off the types of X servers you wish to install.\n"
+    "If you are unsure as to which server will work for your graphics card,\n"
+    "it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n"
+    "Mono servers are particularly well-suited to most LCD displays).",
+    "Press F1 to read the XFree86 release notes for FreeBSD",
+    "XF86",
+    { { "SVGA",		"Standard VGA or Super VGA card [2.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
+      { "VGA16",	"Standard 16 color VGA card [1.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
+      { "Mono",		"Standard Monochrome card [1.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
+      { "PC98",		"Select an X server for a NEC PC98 [Submenu]",
+	NULL,		dmenuSubmenu,  NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
+      { "8514",		"8-bit (256 color) IBM 8514 or compatible card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
+      { "AGX",		"8-bit AGX card [2.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
+      { "I128",		"8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
+      { "Ma8",		"8-bit ATI Mach8 card [2.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
+      { "Ma32",		"8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
+      { "Ma64",		"8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
+      { "P9K",		"8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
+      { "S3",		"8, 16 and 24-bit color S3 based boards [2.7M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
+      { "S3V",		"8, 16 and 24-bit color S3 Virge based boards [2.7M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
+      { "W32",		"8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
+      { "nest",		"A nested server for testing purposes [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
+      { "vfb",		"A virtual frame-buffer server [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
+      { "All",		"Select all of the above [25M]",
+	NULL,		setX11Servers, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL,		clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
+};
+
+DMenu MenuXF86SelectPC98Server = {
+    DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
+    "PC98 X Server selection.",
+    "Please check off the types of NEC PC98 X servers you wish to install.\n\
 If you are unsure as to which server will work for your graphics card,\n\
 it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
 Mono servers are particularly well-suited to most LCD displays).",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "SVGA",	"Standard VGA or Super VGA card [2.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
-  { "VGA16",	"Standard 16 color VGA card [1.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
-  { "Mono",	"Standard Monochrome card [1.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
-  { "8514",	"8-bit (256 color) IBM 8514 or compatible card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
-  { "9480",	"PC98 8-bit (256 color) PEGC-480 card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
-  { "9EGC",	"PC98 4-bit (16 color) EGC card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
-  { "9GA9",	"PC98 GA-968V4/PCI (S3 968) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
-  { "9GAN",	"PC98 GANB-WAP (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
-  { "9LPW",	"PC98 PowerWindowLB (S3) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
-  { "9NKV",	"PC98 NKV-NEC (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
-  { "9NS3",	"PC98 NEC (S3) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
-  { "9SPW",	"PC98 SKB-PowerWindow (S3) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
-  { "9TGU",	"PC98 Cyber9320 and TGUI9680 cards [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
-  { "9WEP",	"PC98 WAB-EP (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
-  { "9WS",	"PC98 WABS (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
-  { "9WSN",	"PC98 WSN-A2F (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
-  { "AGX",	"8-bit AGX card [2.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
-  { "I128",	"8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
-  { "Ma8",	"8-bit ATI Mach8 card [2.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
-  { "Ma32",	"8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
-  { "Ma64",	"8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
-  { "P9K",	"8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
-  { "S3",	"8, 16 and 24-bit color S3 based boards [2.7M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
-  { "S3V",	"8, 16 and 24-bit color S3 Virge based boards [2.7M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
-  { "W32",	"8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
-  { "nest",	"A nested server for testing purposes [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
-  { "vfb",	"A virtual frame-buffer server [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
-  { "All",	"Select all of the above [25M]",
-    NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0M]",
-    NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "9480",		"PC98 8-bit (256 color) PEGC-480 card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
+      { "9EGC",		"PC98 4-bit (16 color) EGC card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
+      { "9GA9",		"PC98 GA-968V4/PCI (S3 968) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
+      { "9GAN",		"PC98 GANB-WAP (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
+      { "9LPW",		"PC98 PowerWindowLB (S3) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
+      { "9NKV",		"PC98 NKV-NEC (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
+      { "9NS3",		"PC98 NEC (S3) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
+      { "9SPW",		"PC98 SKB-PowerWindow (S3) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
+      { "9TGU",		"PC98 Cyber9320 and TGUI9680 cards [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
+      { "9WEP",		"PC98 WAB-EP (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
+      { "9WS",		"PC98 WABS (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
+      { "9WSN",		"PC98 WSN-A2F (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } }
 };
 
+
 DMenu MenuDiskDevices = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select Drive(s)",
-    "Please select the drive, or drives, on which you wish to perform\n\
-this operation.  If you are attempting to install a boot partition\n\
-on a drive other than the first one or have multiple operating\n\
-systems on your machine, you will have the option to install a boot\n\
-manager later.  To select a drive, use the arrow keys to move to it\n\
-and press [SPACE].  To de-select it, press [SPACE] again.\n\n\
-Select OK or Cancel to leave this menu.",
+    "Please select the drive, or drives, on which you wish to perform\n"
+    "this operation.  If you are attempting to install a boot partition\n"
+    "on a drive other than the first one or have multiple operating\n"
+    "systems on your machine, you will have the option to install a boot\n"
+    "manager later.  To select a drive, use the arrow keys to move to it\n"
+    "and press [SPACE].  To de-select it, press [SPACE] again.\n\n"
+    "Select OK or Cancel to leave this menu.",
     "Press F1 for important information regarding disk geometry!",
     "drives",
     { { NULL } },
@@ -960,36 +946,36 @@ Select OK or Cancel to leave this menu.",
 DMenu MenuHTMLDoc = {
     DMENU_NORMAL_TYPE,
     "Select HTML Documentation pointer",
-    "Please select the body of documentation you're interested in, the main\n\
-ones right now being the FAQ and the Handbook.  You can also chose \"other\"\n\
-to enter an arbitrary URL for browsing.",
+    "Please select the body of documentation you're interested in, the main\n"
+    "ones right now being the FAQ and the Handbook.  You can also chose \"other\"\n"
+    "to enter an arbitrary URL for browsing.",
     "Press F1 for more help on what you see here.",
     "html",
-{ { "Handbook",	"The FreeBSD Handbook.",				NULL, docShowDocument },
-  { "FAQ",	"The Frequently Asked Questions guide.",		NULL, docShowDocument },
-  { "Home",	"The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument },
-  { "Other",	"Enter a URL.",						NULL, docShowDocument },
-  { NULL } },
+    { { "Handbook",	"The FreeBSD Handbook.",				NULL, docShowDocument },
+      { "FAQ",		"The Frequently Asked Questions guide.",		NULL, docShowDocument },
+      { "Home",		"The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument },
+      { "Other",	"Enter a URL.",						NULL, docShowDocument },
+      { NULL } },
 };
 
 /* The main installation menu */
 DMenu MenuInstallCustom = {
     DMENU_NORMAL_TYPE,
     "Choose Custom Installation Options",
-    "This is the custom installation menu. You may use this menu to specify\n\
-details on the type of distribution you wish to have, where you wish\n\
-to install it from and how you wish to allocate disk storage to FreeBSD.",
+    "This is the custom installation menu. You may use this menu to specify\n"
+    "details on the type of distribution you wish to have, where you wish\n"
+    "to install it from and how you wish to allocate disk storage to FreeBSD.",
     "Press F1 to read the installation guide",
     "install",
-{ { "1 Options",	"Go to Options editor",			NULL, optionsEditor },
-  { "2 Partition",	"Allocate disk space for FreeBSD",	NULL, diskPartitionEditor },
-  { "3 Label",		"Label allocated disk partitions",	NULL, diskLabelEditor },
-  { "4 Distributions",	"Select distribution(s) to extract",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
-  { "5 Media",		"Choose the installation media type",	NULL, dmenuSubmenu, NULL, &MenuMedia },
-  { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
-  { "7 Extract",	"Just do distribution extract step",	NULL, distExtractAll },
-  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
-  { NULL } },
+    { { "1 Options",		"View/Set various installation options", NULL, optionsEditor },
+      { "2 Partition",		"Allocate disk space for FreeBSD",	NULL, diskPartitionEditor },
+      { "3 Label",		"Label allocated disk partitions",	NULL, diskLabelEditor },
+      { "4 Distributions",	"Select distribution(s) to extract",	NULL,	dmenuSubmenu, NULL, &MenuDistributions },
+      { "5 Media",		"Choose the installation media type",	NULL,	dmenuSubmenu, NULL, &MenuMedia },
+      { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
+      { "7 Extract",		"Just do distribution extract step",	NULL, distExtractAll },
+      { "0 Exit",		"Exit this menu (returning to previous)", NULL,	dmenuExit },
+      { NULL } },
 };
 
 /* MBR type menu */
@@ -998,238 +984,240 @@ DMenu MenuMBRType = {
     "overwrite me",		/* will be disk specific label */
     "FreeBSD comes with a boot selector that allows you to easily\n"
     "select between FreeBSD and any other operating systems on your machine\n"
-"at boot time.  If you have more than one drive and want to boot\n"
-"from the second one, the boot selector will also make it possible\n"
-"to do so (limitations in the PC BIOS usually prevent this otherwise).\n"
-"If you do not want a boot selector, or wish to replace an existing\n"
-"one, select \"standard\".  If you would prefer your Master Boot\n"
-"Record to remain untouched then select \"None\".\n\n"
-"  NOTE:  PC-DOS users will almost certainly require \"None\"!",
+    "at boot time.  If you have more than one drive and want to boot\n"
+    "from the second one, the boot selector will also make it possible\n"
+    "to do so (limitations in the PC BIOS usually prevent this otherwise).\n"
+    "If you do not want a boot selector, or wish to replace an existing\n"
+    "one, select \"standard\".  If you would prefer your Master Boot\n"
+    "Record to remain untouched then select \"None\".\n\n"
+    "  NOTE:  PC-DOS users will almost certainly require \"None\"!",
     "Press F1 to read the installation guide",
     "install",
-{ { "BootMgr",	"Install the FreeBSD Boot Manager (\"Booteasy\")",
-    dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr },
-  { "Standard",	"Install a standard MBR (no boot manager)",
-    dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 1 },
-  { "None",	"Leave the Master Boot Record untouched",
-    dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 },
-  { NULL } },
+    { { "BootMgr",	"Install the FreeBSD Boot Manager (\"Booteasy\")",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr },
+      { "Standard",	"Install a standard MBR (no boot manager)",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 1 },
+      { "None",		"Leave the Master Boot Record untouched",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 },
+      { NULL } },
 };
 
 /* Final configuration menu */
 DMenu MenuConfigure = {
     DMENU_NORMAL_TYPE,
     "FreeBSD Configuration Menu",	/* title */
-    "If you've already installed FreeBSD, you may use this menu to customize\n\
-it somewhat to suit your particular configuration.  Most importantly,\n\
-you can use the Packages utility to load extra \"3rd party\"\n\
-software not provided in the base distributions.",
+    "If you've already installed FreeBSD, you may use this menu to customize\n"
+    "it somewhat to suit your particular configuration.  Most importantly,\n"
+    "you can use the Packages utility to load extra \"3rd party\"\n"
+    "software not provided in the base distributions.",
     "Press F1 for more information on these options",
     "configure",
-{ { "1 Add User",	"Add users to the system",
-    NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
-  { "2 Console",	"Customize system console behavior",
-    NULL, dmenuSubmenu, NULL, &MenuSyscons },
-  { "3 Time Zone",	"Set which time zone you're in",
-    NULL, dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
-  { "4 Media",		"Change the installation media type",
-    NULL, dmenuSubmenu, NULL, &MenuMedia	},
-  { "5 Mouse",		"Select the type of mouse you have",
-    NULL, dmenuSubmenu, NULL, &MenuMouse, NULL },
-  { "6 Networking",	"Configure additional network services",
-    NULL, dmenuSubmenu, NULL, &MenuNetworking },
-  { "7 Options",	"Go to options editor",
-    NULL, optionsEditor },
-  { "8 Packages",	"Install pre-packaged software for FreeBSD",
-    NULL, configPackages },
-  { "9 Root Password",	"Set the system manager's password",
-    NULL, dmenuSystemCommand, NULL, "passwd root" },
-  { "A HTML Docs",	"Go to the HTML documentation menu (post-install)",
-    NULL, docBrowser },
-  { "B XFree86",	"Configure XFree86",
-    NULL, configXFree86 },
-  { "Exit",		"Exit this menu (returning to previous)",
-    NULL, dmenuExit },
-  { NULL } },
+    { { "1 Add User",	"Add users to the system",
+	NULL,	dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
+      { "2 Console",	"Customize system console behavior",
+	NULL,	dmenuSubmenu, NULL, &MenuSyscons },
+      { "3 Time Zone",	"Set which time zone you're in",
+	NULL,	dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
+      { "4 Media",	"Change the installation media type",
+	NULL,	dmenuSubmenu, NULL, &MenuMedia	},
+      { "5 Mouse",	"Select the type of mouse you have",
+	NULL,	dmenuSubmenu, NULL, &MenuMouse, NULL },
+      { "6 Networking",	"Configure additional network services",
+	NULL,	dmenuSubmenu, NULL, &MenuNetworking },
+      { "7 Options",	"View/Set various installation options",
+	NULL, optionsEditor },
+      { "8 Packages",	"Install pre-packaged software for FreeBSD",
+	NULL, configPackages },
+      { "9 Root Password", "Set the system manager's password",
+	NULL,	dmenuSystemCommand, NULL, "passwd root" },
+      { "A HTML Docs",	"Go to the HTML documentation menu (post-install)",
+	NULL, docBrowser },
+      { "B XFree86",	"Configure XFree86",
+	NULL, configXFree86 },
+      { "Exit",		"Exit this menu (returning to previous)",
+	NULL,	dmenuExit },
+      { NULL } },
 };
 
 DMenu MenuNetworking = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Network Services Menu",
-    "You may have already configured one network device (and the other\n\
-various hostname/gateway/name server parameters) in the process\n\
-of installing FreeBSD.  This menu allows you to configure other\n\
-aspects of your system's network configuration.",
+    "You may have already configured one network device (and the other\n"
+    "various hostname/gateway/name server parameters) in the process\n"
+    "of installing FreeBSD.  This menu allows you to configure other\n"
+    "aspects of your system's network configuration.",
     NULL,
     NULL,
-{ { "Interfaces",	"Configure additional network interfaces",
-    NULL, tcpMenuSelect },
-  { "NFS client",	"This machine will be an NFS client",
-    dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client=YES" },
-  { "NFS server",	"This machine will be an NFS server",
-    dmenuVarCheck, configNFSServer, NULL, "nfs_server" },
-  { "Gateway",		"This machine will route packets between interfaces",
-    dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
-  { "Netcon",		"Install the Novell client/server demo package",
-    dmenuVarCheck, configNovell, NULL, "novell" },
-  { "Ntpdate",		"Select a clock-syncronization server",
-    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
-  { "router",		"Select routing daemon (default: routed)",
-    dmenuVarCheck, configRouter, NULL, "router" },
-  { "Rwhod",		"This machine wants to run the rwho daemon",
-    dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod=YES" },
-  { "Anon FTP",		"This machine wishes to allow anonymous FTP.",
-    dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
-  { "WEB Server",	"This machine wishes to be a WWW server.",
-    dmenuVarCheck, configApache, NULL, "apache_httpd" },
-  { "Samba",		"Install Samba for LanManager (NETBUI) access.",
-    dmenuVarCheck, configSamba, NULL, "samba" },
-  { "PCNFSD",		"Run authentication server for clients with PC-NFS.",
-    dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "Interfaces",	"Configure additional network interfaces",
+	NULL, tcpMenuSelect },
+      { "NFS client",	"This machine will be an NFS client",
+	dmenuVarCheck,	dmenuToggleVariable, NULL, "nfs_client=YES" },
+      { "NFS server",	"This machine will be an NFS server",
+	dmenuVarCheck, configNFSServer, NULL, "nfs_server" },
+      { "Gateway",	"This machine will route packets between interfaces",
+	dmenuVarCheck,	dmenuToggleVariable, NULL, "gateway=YES" },
+#ifdef NETCON_EXTENTIONS
+      { "Netcon",	"Install the Novell client/server demo package",
+	dmenuVarCheck, configNovell, NULL, "novell" },
+#endif
+      { "Ntpdate",	"Select a clock-syncronization server",
+	dmenuVarCheck,	dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
+      { "router",	"Select routing daemon (default: routed)",
+	dmenuVarCheck, configRouter, NULL, "router" },
+      { "Rwhod",	"This machine wants to run the rwho daemon",
+	dmenuVarCheck,	dmenuToggleVariable, NULL, "rwhod=YES" },
+      { "Anon FTP",	"This machine wishes to allow anonymous FTP.",
+	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
+      { "WEB Server",	"This machine wishes to be a WWW server.",
+	dmenuVarCheck, configApache, NULL, "apache_httpd" },
+      { "Samba",	"Install Samba for LanManager (NETBUI) access.",
+	dmenuVarCheck, configSamba, NULL, "samba" },
+      { "PCNFSD",	"Run authentication server for clients with PC-NFS.",
+	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuNTP = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "NTPDATE Server Selection",
-    "There are a number of time syncronization servers available\n\
-for public use around the Internet.  Please select one reasonably\n\
-close to you to have your system time syncronized accordingly.",
+    "There are a number of time syncronization servers available\n"
+    "for public use around the Internet.  Please select one reasonably\n"
+    "close to you to have your system time syncronized accordingly.",
     "These are the primary open-access NTP servers",
     NULL,
-{ { "Other",			"Select a site not on this list",
-    dmenuVarCheck, configNTP, NULL, NULL },
-  { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
-  { "Canada",			"tick.usask.ca (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
-  { "France",			"canon.inria.fr (TDF clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
-  { "Germany",			"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
-  { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
-  { "Japan",			"clock.nc.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
-  { "Japan #2",			"clock.tl.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
-  { "Netherlands",		"ntp0.nl.net (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
-  { "Norway",			"timer.unik.no (NTP clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
-  { "Sweden",			"Time1.Stupi.SE (Cesium/GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
-  { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
-  { "U.S. East Coast",		"bitsy.mit.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
-  { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
-  { "U.S. West Coast",		"apple.com (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
-  { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
-  { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
-  { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
-  { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
-  { "U.S. Southwest",		"shorty.chpc.utexas.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
-  { NULL } },
+    { { "Other",		"Select a site not on this list",
+	dmenuVarCheck, configNTP, NULL, NULL },
+      { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
+      { "Canada",		"tick.usask.ca (GOES clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
+      { "France",		"canon.inria.fr (TDF clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
+      { "Germany",		"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
+      { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
+      { "Japan",		"clock.nc.fukuoka-u.ac.jp (GPS clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
+      { "Japan #2",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
+      { "Netherlands",		"ntp0.nl.net (GPS clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
+      { "Norway",		"timer.unik.no (NTP clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
+      { "Sweden",		"Time1.Stupi.SE (Cesium/GPS)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
+      { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
+      { "U.S. East Coast",	"bitsy.mit.edu (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
+      { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
+      { "U.S. West Coast",	"apple.com (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
+      { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
+      { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
+      { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
+      { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
+      { "U.S. Southwest",	"shorty.chpc.utexas.edu (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
+      { NULL } },
 };
 
 DMenu MenuSyscons = {
     DMENU_NORMAL_TYPE,
     "System Console Configuration",
-    "The default system console driver for FreeBSD (syscons) has a\n\
-number of configuration options which may be set according to\n\
-your preference.\n\n\
-When you are done setting configuration options, select Cancel.",
+    "The default system console driver for FreeBSD (syscons) has a\n"
+    "number of configuration options which may be set according to\n"
+    "your preference.\n\n"
+    "When you are done setting configuration options, select Cancel.",
     "Configure your system console settings",
     NULL,
-{ { "Font",	"Choose an alternate screen font",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
-  { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-  { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
-  { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-  { "Screenmap",	"Choose an alternate screenmap",	NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
-  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuExit },
-  { NULL } },
+    { { "Font",		"Choose an alternate screen font",	NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
+      { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
+      { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
+      { "Screenmap",	"Choose an alternate screenmap",	NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
+      { "Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
+      { NULL } },
 };
 
 DMenu MenuSysconsKeymap = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keymap",
-    "The default system console driver for FreeBSD (syscons) defaults\n\
-to a standard \"American\" keyboard map.  Users in other countries\n\
-(or with different keyboard preferences) may wish to choose one of\n\
-the other keymaps below.\n\
-Note that sysinstall itself does only guarantee to use the part of\n\
-the keyboard mapping that is required to generate the ANSI character\n\
-subset, but the desired mapping will be remembered later.",
+    "The default system console driver for FreeBSD (syscons) defaults\n"
+    "to a standard \"American\" keyboard map.  Users in other countries\n"
+    "(or with different keyboard preferences) may wish to choose one of\n"
+    "the other keymaps below.\n"
+    "Note that sysinstall itself only uses the part of the keyboard map\n"
+    "which is required to generate the ANSI character subset, but your\n"
+    "choice of keymap will also be saved for later (fuller) use.",
     "Choose a keyboard map",
     NULL,
-{ { "Belgian", "Belgian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" },
-  { "Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" },
-  { "Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" },
-  { "Danish CP865", "Danish Code Page 865 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" },
-  { "Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" },
-  { "French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" },
-  { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850"	},
-  { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" },
-  { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" },
-  { "Japanese 106", "Japanese 106 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" },
-  { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" },
-  { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" },
-  { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
-  { "Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" },
-  { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" },
-  { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" },
-  { "Swiss German", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.kbd" },
-  { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" },
-  { "U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" },
-  { "U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" },
-  { "U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" },
-  { NULL } },
+    { { "Belgian",	"Belgian ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" },
+      { "Brazil CP850",	"Brazil CP850 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" },
+      { "Brazil ISO",	"Brazil ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" },
+      { "Danish CP865",	"Danish Code Page 865 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" },
+      { "Danish ISO",	"Danish ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" },
+      { "French ISO",	"French ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" },
+      { "German CP850",	"German Code Page 850 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850"	},
+      { "German ISO",	"German ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" },
+      { "Italian",	"Italian ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" },
+      { "Japanese 106",	"Japanese 106 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" },
+      { "Norway ISO",	"Norwegian ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" },
+      { "Russia CP866",	"Russian CP866 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" },
+      { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
+      { "Spanish",	"Spanish ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" },
+      { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck,	dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" },
+      { "Swedish ISO",	"Swedish ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" },
+      { "Swiss German",	"Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.kbd" },
+      { "U.K. CP850",	"United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" },
+      { "U.K. ISO",	"United Kingdom ISO keymap", dmenuVarCheck,	dmenuSetKmapVariable, NULL, "keymap=uk.iso" },
+      { "U.S. Dvorak",	"United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" },
+      { "U.S. ISO",	"United States ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" },
+      { NULL } },
 };
 
 DMenu MenuSysconsKeyrate = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keyboard Repeat Rate",
-    "This menu allows you to set the speed at which keys repeat\n\
-when held down.",
+    "This menu allows you to set the speed at which keys repeat\n"
+    "when held down.",
     "Choose a keyboard repeat rate",
     NULL,
-{ { "Slow", "Slow keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=slow" },
-  { "Normal", "\"Normal\" keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=normal" },
-  { "Fast", "Fast keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=fast" },
-  { "Default", "Use default keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=NO" },
-  { NULL } },
+    { { "Slow",	"Slow keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=slow" },
+      { "Normal", "\"Normal\" keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=normal" },
+      { "Fast",	"Fast keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=fast" },
+      { "Default", "Use default keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=NO" },
+      { NULL } },
 };
 
 DMenu MenuSysconsSaver = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Screen Saver",
-    "By default, the console driver will not attempt to do anything\n\
-special with your screen when it's idle.  If you expect to leave your\n\
-monitor switched on and idle for long periods of time then you should\n\
-probably enable one of these screen savers to prevent phosphor burn-in.",
+    "By default, the console driver will not attempt to do anything\n"
+    "special with your screen when it's idle.  If you expect to leave your\n"
+    "monitor switched on and idle for long periods of time then you should\n"
+    "probably enable one of these screen savers to prevent phosphor burn-in.",
     "Choose a nifty-looking screen saver",
     NULL,
-{ { "blank",	"Simply blank the screen",
-    dmenuVarCheck, configSaver, NULL, "saver=blank" },
-  { "Green",	"\"Green\" power saving mode (if supported by monitor)",
-    dmenuVarCheck, configSaver, NULL, "saver=green" },
-  { "Snake",	"Draw a FreeBSD \"snake\" on your screen",
-    dmenuVarCheck, configSaver, NULL, "saver=snake" },
-  { "Star",	"A \"twinkling stars\" effect",
-    dmenuVarCheck, configSaver, NULL, "saver=star" },
-  { "Timeout",	"Set the screen saver timeout interval",
-    NULL, configSaverTimeout, NULL, NULL, ' ', ' ', ' ' },
-  { NULL } },
+    { { "blank",	"Simply blank the screen",
+	dmenuVarCheck, configSaver, NULL, "saver=blank" },
+      { "Green",	"\"Green\" power saving mode (if supported by monitor)",
+	dmenuVarCheck, configSaver, NULL, "saver=green" },
+      { "Snake",	"Draw a FreeBSD \"snake\" on your screen",
+	dmenuVarCheck, configSaver, NULL, "saver=snake" },
+      { "Star",	"A \"twinkling stars\" effect",
+	dmenuVarCheck, configSaver, NULL, "saver=star" },
+      { "Timeout",	"Set the screen saver timeout interval",
+	NULL, configSaverTimeout, NULL, NULL, ' ', ' ', ' ' },
+      { NULL } },
 };
 
 DMenu MenuSysconsScrnmap = {
@@ -1248,10 +1236,10 @@ DMenu MenuSysconsScrnmap = {
     "display at all.",
     "Choose a screen map",
     NULL,
-{ { "None", "No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
-  { "KOI8-R to IBM866", "Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
-  { "ISO 8859-1 to IBM437", "W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
-  { NULL } },
+    { { "None",			"No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
+      { "KOI8-R to IBM866",	"Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
+      { "ISO 8859-1 to IBM437",	"W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
+      { NULL } },
 };
 
 DMenu MenuSysconsFont = {
@@ -1268,20 +1256,19 @@ DMenu MenuSysconsFont = {
     "you can select the appropriate font below.",
     "Choose a font",
     NULL,
-{ { "None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=NO,font8x14=NO,font8x16=NO" },
-  { "IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" },
-  { "IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
-  { "IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
-  { "IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
-  { "ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
-  { "KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
-  { NULL } },
+    { { "None", "Use default font",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=NO,font8x14=NO,font8x16=NO" },
+      { "IBM 437", "English",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" },
+      { "IBM 850", "Western Europe, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
+      { "IBM 865", "Norwegian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
+      { "IBM 866", "Russian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
+      { "ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
+      { "KOI8-R", "Russian, KOI8-R encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
+      { NULL } },
 };
-
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index e8b051f..b242577 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.85 1996/11/07 08:03:28 jkh Exp $
+ * $Id: sysinstall.h,v 1.86 1996/11/09 16:47:08 joerg Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -338,6 +338,7 @@ extern DMenu		MenuXF86;		/* XFree86 main menu				*/
 extern DMenu		MenuXF86Select;		/* XFree86 distribution selection menu		*/
 extern DMenu		MenuXF86SelectCore;	/* XFree86 core distribution menu		*/
 extern DMenu		MenuXF86SelectServer;	/* XFree86 server distribution menu		*/
+extern DMenu		MenuXF86SelectPC98Server; /* XFree86 server distribution menu		*/
 extern DMenu		MenuXF86SelectFonts;	/* XFree86 font selection menu			*/
 extern DMenu		MenuDiskDevices;	/* Disk devices menu				*/
 extern DMenu		MenuHTMLDoc;		/* HTML Documentation menu			*/
@@ -381,8 +382,10 @@ extern int	configRouter(dialogMenuItem *self);
 extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);
 extern int	configNFSServer(dialogMenuItem *self);
-extern int	configNovell(dialogMenuItem *self);
 extern int	configWriteSysconfig(dialogMenuItem *self);
+#ifdef NETCON_EXTENTIONS
+extern int	configNovell(dialogMenuItem *self);
+#endif
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 0ad3bec..cac144a 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.56 1996/11/07 16:34:12 jkh Exp $
+ * $Id: config.c,v 1.57 1996/11/08 05:38:23 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -542,6 +542,7 @@ configPackages(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
 }
 
+#ifdef NETCON_EXTENTIONS
 /* Load novell client/server package */
 int
 configNovell(dialogMenuItem *self)
@@ -561,6 +562,7 @@ configNovell(dialogMenuItem *self)
     }
     return ret | DITEM_RESTORE;
 }
+#endif
 
 /* Load pcnfsd package */
 int
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 47c06f3..ec5fe98 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: menus.c,v 1.94 1996/11/07 18:30:59 jkh Exp $
+ * $Id: menus.c,v 1.95 1996/11/09 16:47:05 joerg Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -207,21 +207,21 @@ DMenu MenuIndex = {
     "Leave the index page by selecting Cancel [TAB-ENTER].",
     "Use PageUp or PageDown to move through this menu faster!",
     NULL,
-    { { "Add User",	"Add users to the system.", NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
-      { "Anon FTP",	"Configure anonymous FTP logins.",	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
-      { "Commit",	"Commit any pending actions (dangerous!)", NULL, installCustomCommit },
-      { "Console settings",	"Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
+    { { "Add User",		"Add users to the system.",		NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
+      { "Anon FTP",		"Configure anonymous FTP logins.",	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
+      { "Commit",		"Commit any pending actions (dangerous!)", NULL, installCustomCommit },
+      { "Console settings",	"Customize system console behavior.",	NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Configure",		"The system configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuConfigure },
       { "Device, Mouse",	"The mouse configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuMouse },
-      { "Dists, All",	"Root of the distribution tree.",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
-      { "Dists, Basic",	"Basic FreeBSD distribution menu.",	NULL, dmenuSubmenu, NULL, &MenuSubDistributions },
-      { "Dists, DES",	"DES distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuDESDistributions },
-      { "Dists, Developer", "Select developer's distribution.", checkDistDeveloper, distSetDeveloper },
-      { "Dists, Src",	"Src distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuSrcDistributions },
-      { "Dists, X Developer", "Select X developer's distribution.",	checkDistXDeveloper, distSetXDeveloper },
+      { "Dists, All",		"Root of the distribution tree.",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
+      { "Dists, Basic",		"Basic FreeBSD distribution menu.",	NULL, dmenuSubmenu, NULL, &MenuSubDistributions },
+      { "Dists, DES",		"DES distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuDESDistributions },
+      { "Dists, Developer",	"Select developer's distribution.",	checkDistDeveloper, distSetDeveloper },
+      { "Dists, Src",		"Src distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuSrcDistributions },
+      { "Dists, X Developer",	"Select X developer's distribution.",	checkDistXDeveloper, distSetXDeveloper },
       { "Dists, Kern Developer", "Select kernel developer's distribution.", checkDistKernDeveloper, distSetKernDeveloper },
-      { "Dists, User",		"Select average user distribution.", checkDistUser, distSetUser },
-      { "Dists, X User",	"Select average X user distribution.", checkDistXUser, distSetXUser },
+      { "Dists, User",		"Select average user distribution.",	checkDistUser, distSetUser },
+      { "Dists, X User",	"Select average X user distribution.",	checkDistXUser, distSetXUser },
       { "Distributions, XFree86","XFree86 distribution menu.",		NULL, distSetXF86 },
       { "Documentation",	"Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
       { "Doc, README",		"The distribution README file.",	NULL, dmenuDisplayFile, NULL, "readme" },
@@ -231,7 +231,7 @@ DMenu MenuIndex = {
       { "Doc, Release",		"The distribution release notes.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
       { "Doc, HTML",		"The HTML documentation menu.",		NULL, docBrowser },
       { "Extract",		"Extract selected distributions from media.",		NULL, distExtractAll },
-      { "Fixit",		"Repair mode with CDROM or floppy.",	NULL, dmenuSubmenu, NULL, &MenuFixit },
+      { "Fixit",		"Repair mode with fixit floppy.",	NULL, installFixitFloppy },
       { "FTP sites",		"The FTP mirror site listing.",		NULL, dmenuSubmenu, NULL, &MenuMediaFTP },
       { "Gateway",		"Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
       { "HTML Docs",		"The HTML documentation menu",		NULL, docBrowser },
@@ -256,25 +256,26 @@ DMenu MenuIndex = {
       { "Options",		"The options editor.",			NULL, optionsEditor },
       { "Packages",		"The packages collection",		NULL, configPackages },
       { "Partition",		"The disk Partition Editor",		NULL, diskPartitionEditor },
-      { "PCNFSD",		"Run authentication server for PC-NFS.",	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
+      { "PCNFSD",		"Run authentication server for PC-NFS.", dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
-      { "Router",		"Select routing daemon (default: routed)",	dmenuVarCheck, configRouter, NULL, "router" },
+      { "Router",		"Select routing daemon (default: routed)", dmenuVarCheck, configRouter, NULL, "router" },
       { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
-      { "Syscons",		"The system console configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSyscons },
+      { "Syscons",		"The system console configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Syscons, Font",	"The console screen font.",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
-      { "Syscons, Keymap",	"The console keymap configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-      { "Syscons, Keyrate",	"The console key rate configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
+      { "Syscons, Keymap",	"The console keymap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "Syscons, Keyrate",	"The console key rate configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
       { "Syscons, Saver",	"The console screen saver configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-      { "Syscons, Screenmap",	"The console screenmap configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
+      { "Syscons, Screenmap",	"The console screenmap configuration menu.", NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
       { "Time Zone",		"Set the system's time zone.",		NULL, dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
       { "Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { "Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { "WEB Server",		"Configure host as a WWW server.",	dmenuVarCheck, configApache, NULL, "apache_httpd" },
       { "XFree86, Fonts",	"XFree86 Font selection menu.",		NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
       { "XFree86, Server",	"XFree86 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
+      { "XFree86, PC98 Server",	"XFree86 PC98 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server },
       { NULL } },
 };
-      
+
 /* The initial installation menu */
 DMenu MenuInitial = {
     DMENU_NORMAL_TYPE,
@@ -287,65 +288,47 @@ DMenu MenuInitial = {
     "install",						/* help file */
     { { "Select" },
       { "Exit Install",	NULL, NULL, dmenuExit },
-      { "1 Usage",	"Quick start - How to use this menu system",		NULL, dmenuDisplayFile, NULL, "usage" },
-      { "2 Doc",	"Installation instructions, README, etc.",		NULL, dmenuSubmenu, NULL, &MenuDocumentation },
-      { "3 Keymap",	"Select a keyboard language.",				NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-      { "4 Options",	"Go to the options editor",				NULL, optionsEditor },
-      { "5 Novice",	"Begin a novice installation (for beginners)",		NULL, installNovice },
-      { "6 Express",	"Begin a quick installation (for the impatient)",	NULL, installExpress },
-      { "7 Custom",	"Begin a custom installation (for experts)",		NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
-      { "8 Fixit",	"Go into repair mode with CDROM or floppy",		NULL, dmenuSubmenu, NULL, &MenuFixit },
+      { "1 Usage",	"Quick start - How to use this menu system",	NULL, dmenuDisplayFile, NULL, "usage" },
+      { "2 Doc",	"Installation instructions, README, etc.",	NULL, dmenuSubmenu, NULL, &MenuDocumentation },
+      { "3 Keymap",	"Select keyboard type",				NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "4 Options",	"View/Set various installation options",	NULL, optionsEditor },
+      { "5 Novice",	"Begin a novice installation (for beginners)",	NULL, installNovice },
+      { "6 Express",	"Begin a quick installation (for the impatient)", NULL, installExpress },
+      { "7 Custom",	"Begin a custom installation (for experts)",	NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
+      { "8 Fixit",	"Go into repair mode with a fixit floppy",	NULL, installFixitFloppy },
       { "9 Upgrade",	"Upgrade an existing system",			NULL, installUpgrade },
-      { "c Configure",	"Do post-install configuration of FreeBSD",		NULL, dmenuSubmenu, NULL, &MenuConfigure },
-      { "0 Index",	"Glossary of functions.",		NULL, dmenuSubmenu, NULL, &MenuIndex },
+      { "c Configure",	"Do post-install configuration of FreeBSD",	NULL, dmenuSubmenu, NULL, &MenuConfigure },
+      { "0 Index",	"Glossary of functions",			NULL, dmenuSubmenu, NULL, &MenuIndex },
       { NULL } },
 };
 
-DMenu MenuFixit = {
-    DMENU_NORMAL_TYPE,
-    "Please choose a fixit option",
-"There are two ways of going into \"fixit\" mode - you may either elect\n\
-to use the 2nd FreeBSD CDROM, in which case there will be full access\n\
-access to the complete set of FreeBSD commands and utilities, or you\n\
-can use the more limited fixit floppy if you don't have a CDROM or are\n\
-somehow faced with a situation where a CDROM is impractical.  The fixit\n\
-floppy has only a minimal subset of commands which we deemed most useful\n\
-for fixing a system in trouble.",
-    "Press F1 for more detailed repair instructions",
-    "fixit",
-{ { "1 CDROM",	"Use the 2nd \"live\" CDROM from the distribution",	NULL, installFixitCDROM },
-  { "2 Floppy",	"Use a floppy generated from the fixit image",		NULL, installFixitFloppy },
-  { NULL } },
-};
-
-
 /* The main documentation menu */
 DMenu MenuDocumentation = {
     DMENU_NORMAL_TYPE,
     "Documentation for FreeBSD " RELEASE_NAME,
-    "If you are at all unsure about the configuration of your hardware\n\
-or are looking to build a system specifically for FreeBSD, read the\n\
-Hardware guide!  New users should also read the Install document for\n\
-a step-by-step tutorial on installing FreeBSD.  For general information,\n\
-consult the README file.",
+    "If you are at all unsure about the configuration of your hardware\n"
+    "or are looking to build a system specifically for FreeBSD, read the\n"
+    "Hardware guide!  New users should also read the Install document for\n"
+    "a step-by-step tutorial on installing FreeBSD.  For general information,\n"
+    "consult the README file.",
     "Confused?  Press F1 for help.",
     "usage",
-{ { "1 README",	"A general description of FreeBSD.  Read this!",	NULL, dmenuDisplayFile, NULL, "readme" },
-  { "2 Hardware","The FreeBSD survival guide for PC hardware.",		NULL, dmenuDisplayFile,	NULL, "hardware" },
-  { "3 Install","A step-by-step guide to installing FreeBSD.",		NULL, dmenuDisplayFile,	NULL, "install" },
-  { "4 Copyright","The FreeBSD Copyright notices.",			NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
-  { "5 Release","The release notes for this version of FreeBSD.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
-  { "6 Shortcuts", "Creating shortcuts to sysinstall.",	NULL, dmenuDisplayFile, NULL, "shortcuts" },
-  { "7 HTML Docs","Go to the HTML documentation menu (post-install).",	NULL, docBrowser },
-  { "0 Exit",	"Exit this menu (returning to previous)",		NULL, dmenuExit },
-  { NULL } },
+    { { "1 README",	"A general description of FreeBSD.  Read this!", NULL, dmenuDisplayFile, NULL, "readme" },
+      { "2 Hardware",	"The FreeBSD survival guide for PC hardware.",	NULL, dmenuDisplayFile,	NULL, "hardware" },
+      { "3 Install",	"A step-by-step guide to installing FreeBSD.",	NULL, dmenuDisplayFile,	NULL, "install" },
+      { "4 Copyright",	"The FreeBSD Copyright notices.",		NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
+      { "5 Release"	,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "relnotes" },
+      { "6 Shortcuts",	"Creating shortcuts to sysinstall.",		NULL, dmenuDisplayFile, NULL, "shortcuts" },
+      { "7 HTML Docs",	"Go to the HTML documentation menu (post-install).", NULL, docBrowser },
+      { "0 Exit",	"Exit this menu (returning to previous)",	NULL, dmenuExit },
+      { NULL } },
 };
 
 static int
 whichMouse(dialogMenuItem *self)
 {
     char buf[BUFSIZ];
-
+    
     if (!file_readable("/dev/mouse"))
 	return FALSE;
     if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
@@ -368,37 +351,37 @@ whichMouse(dialogMenuItem *self)
 DMenu MenuMouse = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "Please select your mouse type from the following menu",
-    "There are many different types of mice currently on the market,\n\
-but this configuration menu should at least narrow down the choices\n\
-somewhat.  Once you've selected one of the below, you can specify\n\
-/dev/mouse as your mouse device when running the XFree86 configuration\n\
-utility (see Configuration menu).  Please note that for PS/2 mice,\n\
-a kernel recompile is also required!  See the handbook for more details\n\
-on building a kernel.",
+    "There are many different types of mice currently on the market,\n"
+    "but this configuration menu should at least narrow down the choices\n"
+    "somewhat.  Once you've selected one of the below, you can specify\n"
+    "/dev/mouse as your mouse device when running the XFree86 configuration\n"
+    "utility (see Configuration menu).  Please note that for PS/2 mice,\n"
+    "a kernel recompile is also required!  See the handbook for more details\n"
+    "on building a kernel.",
     "For more information, visit the Documentation menu",
     NULL,
-{ { "COM1",	"Serial mouse on COM1",	whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa0 /dev/mouse", '(', '*', ')', 1 },
-  { "COM2",	"Serial mouse on COM2", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa1 /dev/mouse", '(', '*', ')', 1 },
-  { "COM3",	"Serial mouse on COM3", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
-  { "COM4",	"Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
-  { "BusMouse",	"Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
-  { "PS/2",	"PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
-    "ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
-  { NULL } },
+    { { "COM1",	"Serial mouse on COM1",	whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa0 /dev/mouse", '(', '*', ')', 1 },
+      { "COM2",	"Serial mouse on COM2", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa1 /dev/mouse", '(', '*', ')', 1 },
+      { "COM3",	"Serial mouse on COM3", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
+      { "COM4",	"Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
+      { "BusMouse",	"Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
+      { "PS/2",	"PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
+	"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
+      { NULL } },
 };
 
 DMenu MenuMediaCDROM = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a CDROM type",
-    "FreeBSD can be installed directly from a CDROM containing a valid\n\
-FreeBSD distribution.  If you are seeing this menu it is because\n\
-more than one CDROM drive was found on your system.  Please select one\n\
-of the following CDROM drives as your installation drive.",
+    "FreeBSD can be installed directly from a CDROM containing a valid\n"
+    "FreeBSD distribution.  If you are seeing this menu it is because\n"
+    "more than one CDROM drive was found on your system.  Please select one\n"
+    "of the following CDROM drives as your installation drive.",
     "Press F1 to read the installation guide",
     "install",
     { { NULL } },
@@ -407,8 +390,8 @@ of the following CDROM drives as your installation drive.",
 DMenu MenuMediaFloppy = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a Floppy drive",
-    "You have more than one floppy drive.  Please chose which drive\n\
-you would like to use.",
+    "You have more than one floppy drive.  Please chose which drive\n"
+    "you would like to use.",
     NULL,
     NULL,
     { { NULL } },
@@ -417,14 +400,14 @@ you would like to use.",
 DMenu MenuMediaDOS = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a DOS partition",
-    "FreeBSD can be installed directly from a DOS partition\n\
-assuming, of course, that you have copied the relevant\n\
-distributions into your DOS partition before starting this\n\
-installation.  If this is not the case then you should reboot\n\
-DOS at this time and copy the distributions you wish to install\n\
-into a \"FREEBSD\" subdirectory on one of your DOS partitions.\n\
-Otherwise, please select the DOS partition containing the FreeBSD\n\
-distribution files.",
+    "FreeBSD can be installed directly from a DOS partition\n"
+    "assuming, of course, that you have copied the relevant\n"
+    "distributions into your DOS partition before starting this\n"
+    "installation.  If this is not the case then you should reboot\n"
+    "DOS at this time and copy the distributions you wish to install\n"
+    "into a \"FREEBSD\" subdirectory on one of your DOS partitions.\n"
+    "Otherwise, please select the DOS partition containing the FreeBSD\n"
+    "distribution files.",
     "Press F1 to read the installation guide",
     "install",
     { { NULL } },
@@ -433,142 +416,142 @@ distribution files.",
 DMenu MenuMediaFTP = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Please select a FreeBSD FTP distribution site",
-    "Please select the site closest to you or \"other\" if you'd like to\n\
-specify a different choice.  Also note that not every site listed here\n\
-carries more than the base distribution kits. Only the Primary site is\n\
-guaranteed to carry the full range of possible distributions.",
+    "Please select the site closest to you or \"other\" if you'd like to\n"
+    "specify a different choice.  Also note that not every site listed here\n"
+    "carries more than the base distribution kits. Only the Primary site is\n"
+    "guaranteed to carry the full range of possible distributions.",
     "Select a site that's close!",
     "install",
-{ { "Primary Site",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
-  { "URL",		"Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=other" },
-  { "Argentina",	"ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
-  { "Australia",	"ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/" },
-  { "Australia #2",	"ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/" },
-  { "Australia #3",	"ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/" },
-  { "Australia #4",	"ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/" },
-  { "Brazil",		"ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #2",	"ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #3",	"ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #4",	"ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/" },
-  { "Brazil #5",	"ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/" },
-  { "Canada",		"ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/" },
-  { "Czech Republic",	"sunsite.mff.cuni.cz", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://sunsite.mff.cuni.cz/OS/FreeBSD/" },
-  { "Estonia",		"ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org/pub/FreeBSD/" },
-  { "Finland",		"nic.funet.fi", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://nic.funet.fi/pub/unix/FreeBSD/" },
-  { "France",		"ftp.ibp.fr", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ibp.fr/pub/FreeBSD/" },
-  { "Germany",		"ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #2",	"ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #3",	"ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #4",	"ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #5",	"ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #6",	"ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/" },
-  { "Germany #7",	"ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/" },
-  { "Holland",	 	"ftp.nl.freebsd.ort", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org/pub/os/FreeBSD/cdrom/" },
-  { "Hong Kong",	"ftp.hk.super.net", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/" },
-  { "Ireland",		"ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/" },
-  { "Israel",		"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.il.freebsd.org/pub/FreeBSD/" },
-  { "Israel #2",	"ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org/pub/FreeBSD/" },
-  { "Japan",		"ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #2",		"ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #3",		"ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #4",		"ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #5",		"ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/" },
-  { "Japan #6",		"ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/" },
-  { "Korea",		"ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/" },
-  { "Korea #2",		"ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/" },
-  { "Netherlands",	"ftp.nl.net", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.nl.net/pub/os/FreeBSD/" },
-  { "Poland",		"SunSITE.icm.edu.pl", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://SunSITE.icm.edu.pl/pub/FreeBSD/" },
-  { "Portugal",		"ftp.ua.pt", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.ua.pt/pub/misc/FreeBSD/" },
-  { "Russia",		"ftp.kiae.su", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.kiae.su/FreeBSD/" },
-  { "South Africa",	"ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/" },
-  { "South Africa #2",	"ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" },
-  { "South Africa #3",	"ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org/pub/FreeBSD/" },
-  { "Sweden",		"ftp.luth.se", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.luth.se/pub/FreeBSD/" },
-  { "Taiwan",		"ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD" },
-  { "Taiwan #2",	"ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.tw.freebsd.org/pub/FreeBSD" },
-  { "Taiwan #3",	"ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org/pub/FreeBSD/" },
-  { "Thailand",		"ftp.nectec.or.th", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" },
-  { "UK",		"ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/BSD/FreeBSD/" },
-  { "UK #2",		"ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/BSD/FreeBSD/" },
-  { "UK #3",		"ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/BSD/FreeBSD/" },
-  { "USA",		"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
-  { "USA #2",		"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/" },
-  { "USA #3",		"ftp3.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/" },
-  { "USA #4",		"ftp4.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/" },
-  { "USA #5",		"ftp5.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/" },
-  { "USA #6",		"ftp6.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/" },
-  { "USA #7",		"ftp7.freebsd.org", NULL, dmenuSetVariable, NULL,
-    VAR_FTP_PATH "=ftp://ftp7.freebsd.org/pub/FreeBSD/" },
-  { NULL } }
+    { { "Primary Site",	"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
+      { "URL",		"Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=other" },
+      { "Argentina",	"ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" },
+      { "Australia",	"ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/" },
+      { "Australia #2",	"ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/" },
+      { "Australia #3",	"ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/" },
+      { "Australia #4",	"ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/" },
+      { "Brazil",	"ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #2",	"ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #3",	"ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #4",	"ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/" },
+      { "Brazil #5",	"ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/" },
+      { "Canada",	"ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/" },
+      { "Czech Republic", "sunsite.mff.cuni.cz", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://sunsite.mff.cuni.cz/OS/FreeBSD/" },
+      { "Estonia",	"ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org/pub/FreeBSD/" },
+      { "Finland",	"nic.funet.fi", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://nic.funet.fi/pub/unix/FreeBSD/" },
+      { "France",	"ftp.ibp.fr", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ibp.fr/pub/FreeBSD/" },
+      { "Germany",	"ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #2",	"ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #3",	"ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #4",	"ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #5",	"ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #6",	"ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/" },
+      { "Germany #7",	"ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/" },
+      { "Holland",	"ftp.nl.freebsd.ort", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org/pub/os/FreeBSD/cdrom/" },
+      { "Hong Kong",	"ftp.hk.super.net", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/" },
+      { "Ireland",	"ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/" },
+      { "Israel",	"ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.il.freebsd.org/pub/FreeBSD/" },
+      { "Israel #2",	"ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org/pub/FreeBSD/" },
+      { "Japan",	"ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #2",	"ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #3",	"ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #4",	"ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #5",	"ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/" },
+      { "Japan #6",	"ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/" },
+      { "Korea",	"ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/" },
+      { "Korea #2",	"ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/" },
+      { "Netherlands",	"ftp.nl.net", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.nl.net/pub/os/FreeBSD/" },
+      { "Poland",	"SunSITE.icm.edu.pl", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://SunSITE.icm.edu.pl/pub/FreeBSD/" },
+      { "Portugal",	"ftp.ua.pt", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.ua.pt/pub/misc/FreeBSD/" },
+      { "Russia",	"ftp.kiae.su", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.kiae.su/FreeBSD/" },
+      { "South Africa",	"ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/" },
+      { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" },
+      { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org/pub/FreeBSD/" },
+      { "Sweden",	"ftp.luth.se", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.luth.se/pub/FreeBSD/" },
+      { "Taiwan",	"ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD" },
+      { "Taiwan #2",	"ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.tw.freebsd.org/pub/FreeBSD" },
+      { "Taiwan #3",	"ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org/pub/FreeBSD/" },
+      { "Thailand",	"ftp.nectec.or.th", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" },
+      { "UK",		"ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/BSD/FreeBSD/" },
+      { "UK #2",	"ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/BSD/FreeBSD/" },
+      { "UK #3",	"ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/BSD/FreeBSD/" },
+      { "USA",		"ftp.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" },
+      { "USA #2",	"ftp2.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/" },
+      { "USA #3",	"ftp3.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/" },
+      { "USA #4",	"ftp4.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/" },
+      { "USA #5",	"ftp5.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/" },
+      { "USA #6",	"ftp6.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/" },
+      { "USA #7",	"ftp7.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.freebsd.org/pub/FreeBSD/" },
+      { NULL } }
 };
 
 DMenu MenuMediaTape = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a tape drive type",
-    "FreeBSD can be installed from tape drive, though this installation\n\
-method requires a certain amount of temporary storage in addition\n\
-to the space required by the distribution itself (tape drives make\n\
-poor random-access devices, so we extract _everything_ on the tape\n\
-in one pass).  If you have sufficient space for this, then you should\n\
-select one of the following tape devices detected on your system.",
+    "FreeBSD can be installed from tape drive, though this installation\n"
+    "method requires a certain amount of temporary storage in addition\n"
+    "to the space required by the distribution itself (tape drives make\n"
+    "poor random-access devices, so we extract _everything_ on the tape\n"
+    "in one pass).  If you have sufficient space for this, then you should\n"
+    "select one of the following tape devices detected on your system.",
     "Press F1 to read the installation guide",
     "install",
     { { NULL } },
@@ -594,250 +577,236 @@ DMenu MenuNetworkDevice = {
 DMenu MenuMedia = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose Installation Media",
-    "FreeBSD can be installed from a variety of different installation\n\
-media, ranging from floppies to an Internet FTP server.  If you're\n\
-installing FreeBSD from a supported CDROM drive then this is generally\n\
-the best media to use if you have no overriding reason for using other\n\
-media.",
+    "FreeBSD can be installed from a variety of different installation\n"
+    "media, ranging from floppies to an Internet FTP server.  If you're\n"
+    "installing FreeBSD from a supported CDROM drive then this is generally\n"
+    "the best media to use if you have no overriding reason for using other\n"
+    "media.",
     "Press F1 for more information on the various media types",
     "media",
-{ { "1 CDROM",		"Install from a FreeBSD CDROM",
-    NULL, mediaSetCDROM },
-  { "2 FTP",		"Install from an FTP server",
-    NULL, mediaSetFTPActive },
-  { "3 FTP Passive",	"Install from an FTP server through a firewall",
-    NULL, mediaSetFTPPassive },
-  { "4 DOS",		"Install from a DOS partition",
-    NULL, mediaSetDOS },
-  { "5 NFS",		"Install over NFS",
-    NULL, mediaSetNFS },
-  { "6 File System",	"Install from an existing filesystem",
-    NULL, mediaSetUFS },
-  { "7 Floppy",		"Install from a floppy disk set",
-    NULL, mediaSetFloppy },
-  { "8 Tape",		"Install from SCSI or QIC tape",
-    NULL, mediaSetTape },
-  { NULL } },
+    { { "1 CDROM",		"Install from a FreeBSD CDROM",		NULL, mediaSetCDROM },
+      { "2 FTP",		"Install from an FTP server",		NULL, mediaSetFTPActive },
+      { "3 FTP Passive",	"Install from an FTP server through a firewall", NULL, mediaSetFTPPassive },
+      { "4 DOS",		"Install from a DOS partition",		NULL, mediaSetDOS },
+      { "5 NFS",		"Install over NFS",			NULL, mediaSetNFS },
+      { "6 File System",	"Install from an existing filesystem",	NULL, mediaSetUFS },
+      { "7 Floppy",		"Install from a floppy disk set",	NULL, mediaSetFloppy },
+      { "8 Tape",		"Install from SCSI or QIC tape",	NULL, mediaSetTape },
+      { NULL } },
 };
 
 /* The distributions menu */
 DMenu MenuDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Choose Distributions",
-    "As a convenience, we provide several \"canned\" distribution sets.\n\
-These select what we consider to be the most reasonable defaults for the\n\
-type of system in question.  If you would prefer to pick and choose the\n\
-list of distributions yourself, simply select \"Custom\".  You can also\n\
-pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
-Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n\
-item or press [ENTER].",
+    "As a convenience, we provide several \"canned\" distribution sets.\n"
+    "These select what we consider to be the most reasonable defaults for the\n"
+    "type of system in question.  If you would prefer to pick and choose the\n"
+    "list of distributions yourself, simply select \"Custom\".  You can also\n"
+    "pick a canned distribution set and then fine-tune it with the Custom item.\n\n"
+    "Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n"
+    "item or press [ENTER].",
     "Press F1 for more information on these options.",
     "distributions",
-{ { "1 Developer",	"Full sources, binaries and doc but no games [180M]",
-    checkDistDeveloper, distSetDeveloper },
-  { "2 X-Developer",	"Same as above, but includes XFree86 [201M]",
-    checkDistXDeveloper, distSetXDeveloper },
-  { "3 Kern-Developer",	"Full binaries and doc, kernel sources only [70M]",
-    checkDistKernDeveloper, distSetKernDeveloper },
-  { "4 User",		"Average user - binaries and doc only [52M]",
-    checkDistUser, distSetUser },
-  { "5 X-User",		"Same as above, but includes XFree86 [52M]",
-    checkDistXUser, distSetXUser },
-  { "6 Minimal",	"The smallest configuration possible [44M]",
-    checkDistMinimum, distSetMinimum },
-  { "7 All",		"All sources, binaries and XFree86 binaries [700M]",
-    checkDistEverything, distSetEverything },
-  { "8 Custom",		"Specify your own distribution set [?]",
-    NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
-  { "9 Clear",		"Reset selected distribution list to nothing [0M]",
-    NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
-  { "0 Exit",		"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "1 Developer",		"Full sources, binaries and doc but no games [180M]", 
+	checkDistDeveloper,	distSetDeveloper },
+      { "2 X-Developer",	"Same as above, but includes XFree86 [201M]",
+	checkDistXDeveloper,	distSetXDeveloper },
+      { "3 Kern-Developer",	"Full binaries and doc, kernel sources only [70M]",
+	checkDistKernDeveloper, distSetKernDeveloper },
+      { "4 User",		"Average user - binaries and doc only [52M]",
+	checkDistUser,		distSetUser },
+      { "5 X-User",		"Same as above, but includes XFree86 [52M]",
+	checkDistXUser,		distSetXUser },
+      { "6 Minimal",		"The smallest configuration possible [44M]",
+	checkDistMinimum,	distSetMinimum },
+      { "7 All",		"All sources, binaries and XFree86 binaries [700M]",
+	checkDistEverything,	distSetEverything },
+      { "8 Custom",		"Specify your own distribution set [?]",
+	NULL,			dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
+      { "9 Clear",		"Reset selected distribution list to nothing [0M]",
+	NULL,			distReset, NULL, NULL, ' ', ' ', ' ' },
+      { "0 Exit",		"Exit this menu (returning to previous)",
+	checkTrue,		dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuSubDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the distributions you wish to install.",
-    "Please check off the distributions you wish to install.  At the\n\
-very minimum, this should be \"bin\".  WARNING:  Do not export the\n\
-DES distribution out of the U.S.!  It is for U.S. customers only.",
+    "Please check off the distributions you wish to install.  At the\n"
+    "very minimum, this should be \"bin\".  WARNING:  Do not export the\n"
+    "DES distribution out of the U.S.!  It is for U.S. customers only.",
     NULL,
     NULL,
-{ { "bin",		"Binary base distribution (required) [36M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
-  { "commerce",		"Commercial and shareware demos [10M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMMERCIAL },
-  { "compat1x",		"FreeBSD 1.x binary compatibility [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
-  { "compat20",		"FreeBSD 2.0 binary compatibility [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
-  { "compat21",		"FreeBSD 2.1 binary compatibility [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
-  { "DES",		"DES encryption code - NOT FOR EXPORT! [.3M]",
-    DESFlagCheck, distSetDES },
-  { "dict",		"Spelling checker dictionary files [4.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
-  { "doc",		"FreeBSD Handbook and other online docs [10M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
-  { "games",		"Games (non-commercial) [6.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
-  { "info",		"GNU info files [4.1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
-  { "man",		"System manual pages - recommended [3.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
-  { "proflibs",		"Profiled versions of the libraries [3.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
-  { "src",		"Sources for everything but DES [120M]",
-    srcFlagCheck, distSetSrc },
-  { "XFree86",		"The XFree86 3.2 distribution",
-    x11FlagCheck, distSetXF86 },
-  { "xperimnt",		"Experimental work in progress!",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
-  { "All",		"All sources, binaries and XFree86 binaries [700M]",
-    NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",		"Reset all of the above [0M]",
-    NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "bin",		"Binary base distribution (required) [36M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
+      { "commerce",	"Commercial and shareware demos [10M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMMERCIAL },
+      { "compat1x",	"FreeBSD 1.x binary compatibility [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
+      { "compat20",	"FreeBSD 2.0 binary compatibility [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
+      { "compat21",	"FreeBSD 2.1 binary compatibility [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
+      { "DES",		"DES encryption code - NOT FOR EXPORT! [.3M]",
+	DESFlagCheck,	distSetDES },
+      { "dict",		"Spelling checker dictionary files [4.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
+      { "doc",		"FreeBSD Handbook and other online docs [10M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
+      { "games",	"Games (non-commercial) [6.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
+      { "info",		"GNU info files [4.1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
+      { "man",		"System manual pages - recommended [3.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
+      { "proflibs",	"Profiled versions of the libraries [3.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
+      { "src",		"Sources for everything but DES [120M]",
+	srcFlagCheck,	distSetSrc },
+      { "XFree86",	"The XFree86 3.2 distribution",
+	x11FlagCheck,	distSetXF86 },
+      { "xperimnt",	"Experimental work in progress!",
+	dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_EXPERIMENTAL },
+      { "All",		"All sources, binaries and XFree86 binaries [700M]",
+	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuDESDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the encryption facilities you wish to install.",
-    "Please check off any special DES-based encryption distributions\n\
-you would like to install.  Please note that these services are NOT FOR\n\
-EXPORT from the United States.  For information on non-U.S. FTP\n\
-distributions of this software, please consult the release notes.",
+    "Please check off any special DES-based encryption distributions\n"
+    "you would like to install.  Please note that these services are NOT FOR\n"
+    "EXPORT from the United States.  For information on non-U.S. FTP\n"
+    "distributions of this software, please consult the release notes.",
     NULL,
     NULL,
-{ { "des",	"Basic DES encryption services [1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-  { "krb",	"Kerberos encryption services [2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
-  { "sebones",	"Sources for eBones (Kerberos) [1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
-  { "ssecure",	"Sources for DES [1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "des",		"Basic DES encryption services [1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
+      { "krb",		"Kerberos encryption services [2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
+      { "sebones",	"Sources for eBones (Kerberos) [1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
+      { "ssecure",	"Sources for DES [1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuSrcDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS ,
     "Select the sub-components of src you wish to install.",
-    "Please check off those portions of the FreeBSD source tree\n\
-you wish to install.",
+    "Please check off those portions of the FreeBSD source tree\n"
+    "you wish to install.",
     NULL,
     NULL,
-{ { "base",	"top-level files in /usr/src [300K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
-  { "contrib",	"/usr/src/contrib (contributed software) [33M]",
-    dmenuFlagCheck, dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
-  { "gnu",	"/usr/src/gnu (software from the GNU Project) [42M]",
-    dmenuFlagCheck, dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
-  { "etc",	"/usr/src/etc (miscellaneous system files) [460K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
-  { "games",	"/usr/src/games (the obvious!) [7.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
-  { "include",	"/usr/src/include (header files) [467K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
-  { "lib",	"/usr/src/lib (system libraries) [9.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
-  { "libexec",	"/usr/src/libexec (system programs) [1.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
-  { "lkm",	"/usr/src/lkm (Loadable Kernel Modules) [193K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM	},
-  { "release",	"/usr/src/release (release-generation tools) [533K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
-  { "bin",	"/usr/src/bin (system binaries) [2.5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
-  { "sbin",	"/usr/src/sbin (system binaries) [1.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
-  { "share",	"/usr/src/share (documents and shared files) [10M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
-  { "sys",	"/usr/src/sys (FreeBSD kernel) [13M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
-  { "ubin",	"/usr/src/usr.bin (user binaries) [13M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
-  { "usbin",	"/usr/src/usr.sbin (aux system binaries) [14M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
-  { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
-  { "All",	"Select all of the above [120M]",
-    NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0M]",
-    NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "base",		"top-level files in /usr/src [300K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
+      { "contrib",	"/usr/src/contrib (contributed software) [33M]",
+	dmenuFlagCheck,	dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
+      { "gnu",		"/usr/src/gnu (software from the GNU Project) [42M]",
+	dmenuFlagCheck,	dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
+      { "etc",		"/usr/src/etc (miscellaneous system files) [460K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
+      { "games",	"/usr/src/games (the obvious!) [7.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
+      { "include",	"/usr/src/include (header files) [467K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
+      { "lib",		"/usr/src/lib (system libraries) [9.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
+      { "libexec",	"/usr/src/libexec (system programs) [1.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
+      { "lkm",		"/usr/src/lkm (Loadable Kernel Modules) [193K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM	},
+      { "release",	"/usr/src/release (release-generation tools) [533K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
+      { "bin",		"/usr/src/bin (system binaries) [2.5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
+      { "sbin",		"/usr/src/sbin (system binaries) [1.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
+      { "share",	"/usr/src/share (documents and shared files) [10M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
+      { "sys",		"/usr/src/sys (FreeBSD kernel) [13M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
+      { "ubin",		"/usr/src/usr.bin (user binaries) [13M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
+      { "usbin",	"/usr/src/usr.sbin (aux system binaries) [14M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
+      { "smailcf",	"/usr/src/usr.sbin (sendmail config macros) [341K]",
+	dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
+      { "All",		"Select all of the above [120M]",
+	NULL,		setSrc, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL,		clearSrc, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
     "XFree86 3.2 Distribution",
-    "Please select the components you need from the XFree86 3.2\n\
-distribution.  We recommend that you select what you need from the basic\n\
-component set and at least one entry from the Server and Font set menus.",
+    "Please select the components you need from the XFree86 3.2\n"
+    "distribution.  We recommend that you select what you need from the basic\n"
+    "component set and at least one entry from the Server and Font set menus.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "Basic",	"Basic component menu (required)",
-    NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore },
-  { "Server",	"X server menu",
-    NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
-  { "Fonts",	"Font set menu",
-    NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
-  { "All",	"Select the entire XFree86 distribution",
-    NULL, setX11All },
-  { "Clear",	"Reset XFree86 distribution list",
-    NULL, clearX11All },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "Basic",	"Basic component menu (required)",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore },
+      { "Server",	"X server menu",			NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
+      { "Fonts",	"Font set menu",			NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
+      { "All",		"Select the entire XFree86 distribution", NULL, setX11All },
+      { "Clear",	"Reset XFree86 distribution list",	NULL, clearX11All },
+      { "Exit",		"Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "XFree86 3.2 base distribution types",
-    "Please check off the basic XFree86 components you wish to install.\n\
-Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
+    "Please check off the basic XFree86 components you wish to install.\n"
+    "Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "bin",	"Client applications and shared libs [4.1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
-  { "cfg",	"Configuration files [10K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
-  { "doc",	"READMEs and release notes [600K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
-  { "html",	"HTML documentation files [400K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
-  { "lib",	"Data files needed at runtime [750K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
-  { "lk90",	"Server link kit for PC98 machines [8.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
-  { "lkit",	"Server link kit for all other machines [8.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
-  { "man",	"Manual pages [3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
-  { "prog",	"Programmer's header and library files [4.1M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
-  { "ps",	"Postscript documentation [5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
-  { "set",	"XFree86 Setup Utility [1.0M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
-  { "sources",	"XFree86 3.2 standard sources [100M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
-  { "csources",	"XFree86 3.2 contrib sources [100M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
-  { "All",	"Select all of the above [20M]",
-    NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0M]",
-    NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "bin",		"Client applications and shared libs [4.1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
+      { "cfg",		"Configuration files [10K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
+      { "doc",		"READMEs and release notes [600K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
+      { "html",		"HTML documentation files [400K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
+      { "lib",		"Data files needed at runtime [750K]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
+      { "lk90",		"Server link kit for PC98 machines [8.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
+      { "lkit",		"Server link kit for all other machines [8.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
+      { "man",		"Manual pages [3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
+      { "prog",		"Programmer's header and library files [4.1M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
+      { "ps",		"Postscript documentation [5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
+      { "set",		"XFree86 Setup Utility [1.0M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
+      { "sources",	"XFree86 3.2 standard sources [100M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
+      { "csources",	"XFree86 3.2 contrib sources [100M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
+      { "All",		"Select all of the above [20M]",
+	NULL,		setX11Misc, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL,		clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86SelectFonts = {
@@ -849,109 +818,126 @@ install.  At the minimum, you should install the standard\n\
 (these are selected by default).",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "fnts",	"Standard 75 DPI and miscellaneous fonts [3.6M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
-  { "f100",	"100 DPI fonts [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
-  { "fcyr",	"Cyrillic Fonts [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
-  { "fscl",	"Speedo and Type scalable fonts [1.6M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
-  { "non",	"Japanese, Chinese and other non-english fonts [3.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
-  { "server",	"Font server [0.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
-  { "All",	"All fonts [10M]",
-    NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset font selections [0M]",
-    NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "fnts",		"Standard 75 DPI and miscellaneous fonts [3.6M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
+      { "f100",		"100 DPI fonts [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
+      { "fcyr",		"Cyrillic Fonts [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
+      { "fscl",		"Speedo and Type scalable fonts [1.6M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
+      { "non",		"Japanese, Chinese and other non-english fonts [3.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
+      { "server",	"Font server [0.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
+      { "All",		"All fonts [10M]",
+	NULL,		setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset font selections [0M]",
+	NULL,		clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuXF86SelectServer = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "X Server selection.",
-    "Please check off the types of X servers you wish to install.\n\
+    "Please check off the types of X servers you wish to install.\n"
+    "If you are unsure as to which server will work for your graphics card,\n"
+    "it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n"
+    "Mono servers are particularly well-suited to most LCD displays).",
+    "Press F1 to read the XFree86 release notes for FreeBSD",
+    "XF86",
+    { { "SVGA",		"Standard VGA or Super VGA card [2.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
+      { "VGA16",	"Standard 16 color VGA card [1.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
+      { "Mono",		"Standard Monochrome card [1.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
+      { "PC98",		"Select an X server for a NEC PC98 [Submenu]",
+	NULL,		dmenuSubmenu,  NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
+      { "8514",		"8-bit (256 color) IBM 8514 or compatible card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
+      { "AGX",		"8-bit AGX card [2.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
+      { "I128",		"8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
+      { "Ma8",		"8-bit ATI Mach8 card [2.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
+      { "Ma32",		"8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
+      { "Ma64",		"8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
+      { "P9K",		"8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
+      { "S3",		"8, 16 and 24-bit color S3 based boards [2.7M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
+      { "S3V",		"8, 16 and 24-bit color S3 Virge based boards [2.7M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
+      { "W32",		"8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
+      { "nest",		"A nested server for testing purposes [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
+      { "vfb",		"A virtual frame-buffer server [1.8M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
+      { "All",		"Select all of the above [25M]",
+	NULL,		setX11Servers, NULL, NULL, ' ', ' ', ' ' },
+      { "Clear",	"Reset all of the above [0M]",
+	NULL,		clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
+};
+
+DMenu MenuXF86SelectPC98Server = {
+    DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
+    "PC98 X Server selection.",
+    "Please check off the types of NEC PC98 X servers you wish to install.\n\
 If you are unsure as to which server will work for your graphics card,\n\
 it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
 Mono servers are particularly well-suited to most LCD displays).",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "SVGA",	"Standard VGA or Super VGA card [2.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
-  { "VGA16",	"Standard 16 color VGA card [1.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
-  { "Mono",	"Standard Monochrome card [1.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
-  { "8514",	"8-bit (256 color) IBM 8514 or compatible card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
-  { "9480",	"PC98 8-bit (256 color) PEGC-480 card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
-  { "9EGC",	"PC98 4-bit (16 color) EGC card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
-  { "9GA9",	"PC98 GA-968V4/PCI (S3 968) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
-  { "9GAN",	"PC98 GANB-WAP (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
-  { "9LPW",	"PC98 PowerWindowLB (S3) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
-  { "9NKV",	"PC98 NKV-NEC (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
-  { "9NS3",	"PC98 NEC (S3) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
-  { "9SPW",	"PC98 SKB-PowerWindow (S3) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
-  { "9TGU",	"PC98 Cyber9320 and TGUI9680 cards [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
-  { "9WEP",	"PC98 WAB-EP (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
-  { "9WS",	"PC98 WABS (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
-  { "9WSN",	"PC98 WSN-A2F (cirrus) card [2.2M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
-  { "AGX",	"8-bit AGX card [2.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
-  { "I128",	"8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
-  { "Ma8",	"8-bit ATI Mach8 card [2.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
-  { "Ma32",	"8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
-  { "Ma64",	"8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
-  { "P9K",	"8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
-  { "S3",	"8, 16 and 24-bit color S3 based boards [2.7M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
-  { "S3V",	"8, 16 and 24-bit color S3 Virge based boards [2.7M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
-  { "W32",	"8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
-  { "nest",	"A nested server for testing purposes [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
-  { "vfb",	"A virtual frame-buffer server [1.8M]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
-  { "All",	"Select all of the above [25M]",
-    NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0M]",
-    NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "9480",		"PC98 8-bit (256 color) PEGC-480 card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
+      { "9EGC",		"PC98 4-bit (16 color) EGC card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
+      { "9GA9",		"PC98 GA-968V4/PCI (S3 968) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
+      { "9GAN",		"PC98 GANB-WAP (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
+      { "9LPW",		"PC98 PowerWindowLB (S3) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
+      { "9NKV",		"PC98 NKV-NEC (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
+      { "9NS3",		"PC98 NEC (S3) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
+      { "9SPW",		"PC98 SKB-PowerWindow (S3) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
+      { "9TGU",		"PC98 Cyber9320 and TGUI9680 cards [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
+      { "9WEP",		"PC98 WAB-EP (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
+      { "9WS",		"PC98 WABS (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
+      { "9WSN",		"PC98 WSN-A2F (cirrus) card [2.2M]",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } }
 };
 
+
 DMenu MenuDiskDevices = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select Drive(s)",
-    "Please select the drive, or drives, on which you wish to perform\n\
-this operation.  If you are attempting to install a boot partition\n\
-on a drive other than the first one or have multiple operating\n\
-systems on your machine, you will have the option to install a boot\n\
-manager later.  To select a drive, use the arrow keys to move to it\n\
-and press [SPACE].  To de-select it, press [SPACE] again.\n\n\
-Select OK or Cancel to leave this menu.",
+    "Please select the drive, or drives, on which you wish to perform\n"
+    "this operation.  If you are attempting to install a boot partition\n"
+    "on a drive other than the first one or have multiple operating\n"
+    "systems on your machine, you will have the option to install a boot\n"
+    "manager later.  To select a drive, use the arrow keys to move to it\n"
+    "and press [SPACE].  To de-select it, press [SPACE] again.\n\n"
+    "Select OK or Cancel to leave this menu.",
     "Press F1 for important information regarding disk geometry!",
     "drives",
     { { NULL } },
@@ -960,36 +946,36 @@ Select OK or Cancel to leave this menu.",
 DMenu MenuHTMLDoc = {
     DMENU_NORMAL_TYPE,
     "Select HTML Documentation pointer",
-    "Please select the body of documentation you're interested in, the main\n\
-ones right now being the FAQ and the Handbook.  You can also chose \"other\"\n\
-to enter an arbitrary URL for browsing.",
+    "Please select the body of documentation you're interested in, the main\n"
+    "ones right now being the FAQ and the Handbook.  You can also chose \"other\"\n"
+    "to enter an arbitrary URL for browsing.",
     "Press F1 for more help on what you see here.",
     "html",
-{ { "Handbook",	"The FreeBSD Handbook.",				NULL, docShowDocument },
-  { "FAQ",	"The Frequently Asked Questions guide.",		NULL, docShowDocument },
-  { "Home",	"The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument },
-  { "Other",	"Enter a URL.",						NULL, docShowDocument },
-  { NULL } },
+    { { "Handbook",	"The FreeBSD Handbook.",				NULL, docShowDocument },
+      { "FAQ",		"The Frequently Asked Questions guide.",		NULL, docShowDocument },
+      { "Home",		"The Home Pages for the FreeBSD Project (requires net)", NULL, docShowDocument },
+      { "Other",	"Enter a URL.",						NULL, docShowDocument },
+      { NULL } },
 };
 
 /* The main installation menu */
 DMenu MenuInstallCustom = {
     DMENU_NORMAL_TYPE,
     "Choose Custom Installation Options",
-    "This is the custom installation menu. You may use this menu to specify\n\
-details on the type of distribution you wish to have, where you wish\n\
-to install it from and how you wish to allocate disk storage to FreeBSD.",
+    "This is the custom installation menu. You may use this menu to specify\n"
+    "details on the type of distribution you wish to have, where you wish\n"
+    "to install it from and how you wish to allocate disk storage to FreeBSD.",
     "Press F1 to read the installation guide",
     "install",
-{ { "1 Options",	"Go to Options editor",			NULL, optionsEditor },
-  { "2 Partition",	"Allocate disk space for FreeBSD",	NULL, diskPartitionEditor },
-  { "3 Label",		"Label allocated disk partitions",	NULL, diskLabelEditor },
-  { "4 Distributions",	"Select distribution(s) to extract",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
-  { "5 Media",		"Choose the installation media type",	NULL, dmenuSubmenu, NULL, &MenuMedia },
-  { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
-  { "7 Extract",	"Just do distribution extract step",	NULL, distExtractAll },
-  { "0 Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
-  { NULL } },
+    { { "1 Options",		"View/Set various installation options", NULL, optionsEditor },
+      { "2 Partition",		"Allocate disk space for FreeBSD",	NULL, diskPartitionEditor },
+      { "3 Label",		"Label allocated disk partitions",	NULL, diskLabelEditor },
+      { "4 Distributions",	"Select distribution(s) to extract",	NULL,	dmenuSubmenu, NULL, &MenuDistributions },
+      { "5 Media",		"Choose the installation media type",	NULL,	dmenuSubmenu, NULL, &MenuMedia },
+      { "6 Commit",		"Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
+      { "7 Extract",		"Just do distribution extract step",	NULL, distExtractAll },
+      { "0 Exit",		"Exit this menu (returning to previous)", NULL,	dmenuExit },
+      { NULL } },
 };
 
 /* MBR type menu */
@@ -998,238 +984,240 @@ DMenu MenuMBRType = {
     "overwrite me",		/* will be disk specific label */
     "FreeBSD comes with a boot selector that allows you to easily\n"
     "select between FreeBSD and any other operating systems on your machine\n"
-"at boot time.  If you have more than one drive and want to boot\n"
-"from the second one, the boot selector will also make it possible\n"
-"to do so (limitations in the PC BIOS usually prevent this otherwise).\n"
-"If you do not want a boot selector, or wish to replace an existing\n"
-"one, select \"standard\".  If you would prefer your Master Boot\n"
-"Record to remain untouched then select \"None\".\n\n"
-"  NOTE:  PC-DOS users will almost certainly require \"None\"!",
+    "at boot time.  If you have more than one drive and want to boot\n"
+    "from the second one, the boot selector will also make it possible\n"
+    "to do so (limitations in the PC BIOS usually prevent this otherwise).\n"
+    "If you do not want a boot selector, or wish to replace an existing\n"
+    "one, select \"standard\".  If you would prefer your Master Boot\n"
+    "Record to remain untouched then select \"None\".\n\n"
+    "  NOTE:  PC-DOS users will almost certainly require \"None\"!",
     "Press F1 to read the installation guide",
     "install",
-{ { "BootMgr",	"Install the FreeBSD Boot Manager (\"Booteasy\")",
-    dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr },
-  { "Standard",	"Install a standard MBR (no boot manager)",
-    dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 1 },
-  { "None",	"Leave the Master Boot Record untouched",
-    dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 },
-  { NULL } },
+    { { "BootMgr",	"Install the FreeBSD Boot Manager (\"Booteasy\")",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr },
+      { "Standard",	"Install a standard MBR (no boot manager)",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 1 },
+      { "None",		"Leave the Master Boot Record untouched",
+	dmenuRadioCheck, dmenuSetValue, NULL, &BootMgr, '(', '*', ')', 2 },
+      { NULL } },
 };
 
 /* Final configuration menu */
 DMenu MenuConfigure = {
     DMENU_NORMAL_TYPE,
     "FreeBSD Configuration Menu",	/* title */
-    "If you've already installed FreeBSD, you may use this menu to customize\n\
-it somewhat to suit your particular configuration.  Most importantly,\n\
-you can use the Packages utility to load extra \"3rd party\"\n\
-software not provided in the base distributions.",
+    "If you've already installed FreeBSD, you may use this menu to customize\n"
+    "it somewhat to suit your particular configuration.  Most importantly,\n"
+    "you can use the Packages utility to load extra \"3rd party\"\n"
+    "software not provided in the base distributions.",
     "Press F1 for more information on these options",
     "configure",
-{ { "1 Add User",	"Add users to the system",
-    NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
-  { "2 Console",	"Customize system console behavior",
-    NULL, dmenuSubmenu, NULL, &MenuSyscons },
-  { "3 Time Zone",	"Set which time zone you're in",
-    NULL, dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
-  { "4 Media",		"Change the installation media type",
-    NULL, dmenuSubmenu, NULL, &MenuMedia	},
-  { "5 Mouse",		"Select the type of mouse you have",
-    NULL, dmenuSubmenu, NULL, &MenuMouse, NULL },
-  { "6 Networking",	"Configure additional network services",
-    NULL, dmenuSubmenu, NULL, &MenuNetworking },
-  { "7 Options",	"Go to options editor",
-    NULL, optionsEditor },
-  { "8 Packages",	"Install pre-packaged software for FreeBSD",
-    NULL, configPackages },
-  { "9 Root Password",	"Set the system manager's password",
-    NULL, dmenuSystemCommand, NULL, "passwd root" },
-  { "A HTML Docs",	"Go to the HTML documentation menu (post-install)",
-    NULL, docBrowser },
-  { "B XFree86",	"Configure XFree86",
-    NULL, configXFree86 },
-  { "Exit",		"Exit this menu (returning to previous)",
-    NULL, dmenuExit },
-  { NULL } },
+    { { "1 Add User",	"Add users to the system",
+	NULL,	dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
+      { "2 Console",	"Customize system console behavior",
+	NULL,	dmenuSubmenu, NULL, &MenuSyscons },
+      { "3 Time Zone",	"Set which time zone you're in",
+	NULL,	dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
+      { "4 Media",	"Change the installation media type",
+	NULL,	dmenuSubmenu, NULL, &MenuMedia	},
+      { "5 Mouse",	"Select the type of mouse you have",
+	NULL,	dmenuSubmenu, NULL, &MenuMouse, NULL },
+      { "6 Networking",	"Configure additional network services",
+	NULL,	dmenuSubmenu, NULL, &MenuNetworking },
+      { "7 Options",	"View/Set various installation options",
+	NULL, optionsEditor },
+      { "8 Packages",	"Install pre-packaged software for FreeBSD",
+	NULL, configPackages },
+      { "9 Root Password", "Set the system manager's password",
+	NULL,	dmenuSystemCommand, NULL, "passwd root" },
+      { "A HTML Docs",	"Go to the HTML documentation menu (post-install)",
+	NULL, docBrowser },
+      { "B XFree86",	"Configure XFree86",
+	NULL, configXFree86 },
+      { "Exit",		"Exit this menu (returning to previous)",
+	NULL,	dmenuExit },
+      { NULL } },
 };
 
 DMenu MenuNetworking = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Network Services Menu",
-    "You may have already configured one network device (and the other\n\
-various hostname/gateway/name server parameters) in the process\n\
-of installing FreeBSD.  This menu allows you to configure other\n\
-aspects of your system's network configuration.",
+    "You may have already configured one network device (and the other\n"
+    "various hostname/gateway/name server parameters) in the process\n"
+    "of installing FreeBSD.  This menu allows you to configure other\n"
+    "aspects of your system's network configuration.",
     NULL,
     NULL,
-{ { "Interfaces",	"Configure additional network interfaces",
-    NULL, tcpMenuSelect },
-  { "NFS client",	"This machine will be an NFS client",
-    dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client=YES" },
-  { "NFS server",	"This machine will be an NFS server",
-    dmenuVarCheck, configNFSServer, NULL, "nfs_server" },
-  { "Gateway",		"This machine will route packets between interfaces",
-    dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
-  { "Netcon",		"Install the Novell client/server demo package",
-    dmenuVarCheck, configNovell, NULL, "novell" },
-  { "Ntpdate",		"Select a clock-syncronization server",
-    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
-  { "router",		"Select routing daemon (default: routed)",
-    dmenuVarCheck, configRouter, NULL, "router" },
-  { "Rwhod",		"This machine wants to run the rwho daemon",
-    dmenuVarCheck, dmenuToggleVariable, NULL, "rwhod=YES" },
-  { "Anon FTP",		"This machine wishes to allow anonymous FTP.",
-    dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
-  { "WEB Server",	"This machine wishes to be a WWW server.",
-    dmenuVarCheck, configApache, NULL, "apache_httpd" },
-  { "Samba",		"Install Samba for LanManager (NETBUI) access.",
-    dmenuVarCheck, configSamba, NULL, "samba" },
-  { "PCNFSD",		"Run authentication server for clients with PC-NFS.",
-    dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
-  { "Exit",	"Exit this menu (returning to previous)",
-    checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-  { NULL } },
+    { { "Interfaces",	"Configure additional network interfaces",
+	NULL, tcpMenuSelect },
+      { "NFS client",	"This machine will be an NFS client",
+	dmenuVarCheck,	dmenuToggleVariable, NULL, "nfs_client=YES" },
+      { "NFS server",	"This machine will be an NFS server",
+	dmenuVarCheck, configNFSServer, NULL, "nfs_server" },
+      { "Gateway",	"This machine will route packets between interfaces",
+	dmenuVarCheck,	dmenuToggleVariable, NULL, "gateway=YES" },
+#ifdef NETCON_EXTENTIONS
+      { "Netcon",	"Install the Novell client/server demo package",
+	dmenuVarCheck, configNovell, NULL, "novell" },
+#endif
+      { "Ntpdate",	"Select a clock-syncronization server",
+	dmenuVarCheck,	dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
+      { "router",	"Select routing daemon (default: routed)",
+	dmenuVarCheck, configRouter, NULL, "router" },
+      { "Rwhod",	"This machine wants to run the rwho daemon",
+	dmenuVarCheck,	dmenuToggleVariable, NULL, "rwhod=YES" },
+      { "Anon FTP",	"This machine wishes to allow anonymous FTP.",
+	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
+      { "WEB Server",	"This machine wishes to be a WWW server.",
+	dmenuVarCheck, configApache, NULL, "apache_httpd" },
+      { "Samba",	"Install Samba for LanManager (NETBUI) access.",
+	dmenuVarCheck, configSamba, NULL, "samba" },
+      { "PCNFSD",	"Run authentication server for clients with PC-NFS.",
+	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
+      { "Exit",		"Exit this menu (returning to previous)",
+	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
+      { NULL } },
 };
 
 DMenu MenuNTP = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "NTPDATE Server Selection",
-    "There are a number of time syncronization servers available\n\
-for public use around the Internet.  Please select one reasonably\n\
-close to you to have your system time syncronized accordingly.",
+    "There are a number of time syncronization servers available\n"
+    "for public use around the Internet.  Please select one reasonably\n"
+    "close to you to have your system time syncronized accordingly.",
     "These are the primary open-access NTP servers",
     NULL,
-{ { "Other",			"Select a site not on this list",
-    dmenuVarCheck, configNTP, NULL, NULL },
-  { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
-  { "Canada",			"tick.usask.ca (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
-  { "France",			"canon.inria.fr (TDF clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
-  { "Germany",			"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
-  { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
-  { "Japan",			"clock.nc.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
-  { "Japan #2",			"clock.tl.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
-  { "Netherlands",		"ntp0.nl.net (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
-  { "Norway",			"timer.unik.no (NTP clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
-  { "Sweden",			"Time1.Stupi.SE (Cesium/GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
-  { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
-  { "U.S. East Coast",		"bitsy.mit.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
-  { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
-  { "U.S. West Coast",		"apple.com (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
-  { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
-  { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
-  { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
-  { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
-  { "U.S. Southwest",		"shorty.chpc.utexas.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
-  { NULL } },
+    { { "Other",		"Select a site not on this list",
+	dmenuVarCheck, configNTP, NULL, NULL },
+      { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
+      { "Canada",		"tick.usask.ca (GOES clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
+      { "France",		"canon.inria.fr (TDF clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
+      { "Germany",		"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
+      { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
+      { "Japan",		"clock.nc.fukuoka-u.ac.jp (GPS clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
+      { "Japan #2",		"clock.tl.fukuoka-u.ac.jp (GPS clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
+      { "Netherlands",		"ntp0.nl.net (GPS clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
+      { "Norway",		"timer.unik.no (NTP clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
+      { "Sweden",		"Time1.Stupi.SE (Cesium/GPS)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
+      { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
+      { "U.S. East Coast",	"bitsy.mit.edu (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
+      { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
+      { "U.S. West Coast",	"apple.com (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
+      { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
+      { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
+      { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
+      { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
+      { "U.S. Southwest",	"shorty.chpc.utexas.edu (WWV clock)",
+	dmenuVarCheck,	dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
+      { NULL } },
 };
 
 DMenu MenuSyscons = {
     DMENU_NORMAL_TYPE,
     "System Console Configuration",
-    "The default system console driver for FreeBSD (syscons) has a\n\
-number of configuration options which may be set according to\n\
-your preference.\n\n\
-When you are done setting configuration options, select Cancel.",
+    "The default system console driver for FreeBSD (syscons) has a\n"
+    "number of configuration options which may be set according to\n"
+    "your preference.\n\n"
+    "When you are done setting configuration options, select Cancel.",
     "Configure your system console settings",
     NULL,
-{ { "Font",	"Choose an alternate screen font",	  NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
-  { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-  { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
-  { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
-  { "Screenmap",	"Choose an alternate screenmap",	NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
-  { "Exit",	"Exit this menu (returning to previous)", NULL, dmenuExit },
-  { NULL } },
+    { { "Font",		"Choose an alternate screen font",	NULL, dmenuSubmenu, NULL, &MenuSysconsFont },
+      { "Keymap",	"Choose an alternate keyboard map",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "Repeat",	"Set the rate at which keys repeat",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
+      { "Saver",	"Configure the screen saver",		NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
+      { "Screenmap",	"Choose an alternate screenmap",	NULL, dmenuSubmenu, NULL, &MenuSysconsScrnmap },
+      { "Exit",		"Exit this menu (returning to previous)", NULL, dmenuExit },
+      { NULL } },
 };
 
 DMenu MenuSysconsKeymap = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keymap",
-    "The default system console driver for FreeBSD (syscons) defaults\n\
-to a standard \"American\" keyboard map.  Users in other countries\n\
-(or with different keyboard preferences) may wish to choose one of\n\
-the other keymaps below.\n\
-Note that sysinstall itself does only guarantee to use the part of\n\
-the keyboard mapping that is required to generate the ANSI character\n\
-subset, but the desired mapping will be remembered later.",
+    "The default system console driver for FreeBSD (syscons) defaults\n"
+    "to a standard \"American\" keyboard map.  Users in other countries\n"
+    "(or with different keyboard preferences) may wish to choose one of\n"
+    "the other keymaps below.\n"
+    "Note that sysinstall itself only uses the part of the keyboard map\n"
+    "which is required to generate the ANSI character subset, but your\n"
+    "choice of keymap will also be saved for later (fuller) use.",
     "Choose a keyboard map",
     NULL,
-{ { "Belgian", "Belgian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" },
-  { "Brazil CP850", "Brazil CP850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" },
-  { "Brazil ISO", "Brazil ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" },
-  { "Danish CP865", "Danish Code Page 865 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" },
-  { "Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" },
-  { "French ISO", "French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" },
-  { "German CP850", "German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850"	},
-  { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" },
-  { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" },
-  { "Japanese 106", "Japanese 106 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" },
-  { "Norway ISO", "Norwegian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" },
-  { "Russia CP866", "Russian CP866 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" },
-  { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
-  { "Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" },
-  { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" },
-  { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" },
-  { "Swiss German", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.kbd" },
-  { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" },
-  { "U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" },
-  { "U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" },
-  { "U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" },
-  { NULL } },
+    { { "Belgian",	"Belgian ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=be.iso" },
+      { "Brazil CP850",	"Brazil CP850 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.cp850" },
+      { "Brazil ISO",	"Brazil ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=br275.iso" },
+      { "Danish CP865",	"Danish Code Page 865 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" },
+      { "Danish ISO",	"Danish ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" },
+      { "French ISO",	"French ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso" },
+      { "German CP850",	"German Code Page 850 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.cp850"	},
+      { "German ISO",	"German ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=german.iso" },
+      { "Italian",	"Italian ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=it.iso" },
+      { "Japanese 106",	"Japanese 106 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.106" },
+      { "Norway ISO",	"Norwegian ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=norwegian.iso" },
+      { "Russia CP866",	"Russian CP866 keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.cp866" },
+      { "Russia KOI8-R", "Russian KOI8-R keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=ru.koi8-r" },
+      { "Spanish",	"Spanish ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" },
+      { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck,	dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" },
+      { "Swedish ISO",	"Swedish ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" },
+      { "Swiss German",	"Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.kbd" },
+      { "U.K. CP850",	"United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" },
+      { "U.K. ISO",	"United Kingdom ISO keymap", dmenuVarCheck,	dmenuSetKmapVariable, NULL, "keymap=uk.iso" },
+      { "U.S. Dvorak",	"United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" },
+      { "U.S. ISO",	"United States ISO keymap",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" },
+      { NULL } },
 };
 
 DMenu MenuSysconsKeyrate = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keyboard Repeat Rate",
-    "This menu allows you to set the speed at which keys repeat\n\
-when held down.",
+    "This menu allows you to set the speed at which keys repeat\n"
+    "when held down.",
     "Choose a keyboard repeat rate",
     NULL,
-{ { "Slow", "Slow keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=slow" },
-  { "Normal", "\"Normal\" keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=normal" },
-  { "Fast", "Fast keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=fast" },
-  { "Default", "Use default keyboard repeat rate", dmenuVarCheck, dmenuSetVariable, NULL, "keyrate=NO" },
-  { NULL } },
+    { { "Slow",	"Slow keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=slow" },
+      { "Normal", "\"Normal\" keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=normal" },
+      { "Fast",	"Fast keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=fast" },
+      { "Default", "Use default keyboard repeat rate",	dmenuVarCheck,	dmenuSetVariable, NULL, "keyrate=NO" },
+      { NULL } },
 };
 
 DMenu MenuSysconsSaver = {
     DMENU_RADIO_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Screen Saver",
-    "By default, the console driver will not attempt to do anything\n\
-special with your screen when it's idle.  If you expect to leave your\n\
-monitor switched on and idle for long periods of time then you should\n\
-probably enable one of these screen savers to prevent phosphor burn-in.",
+    "By default, the console driver will not attempt to do anything\n"
+    "special with your screen when it's idle.  If you expect to leave your\n"
+    "monitor switched on and idle for long periods of time then you should\n"
+    "probably enable one of these screen savers to prevent phosphor burn-in.",
     "Choose a nifty-looking screen saver",
     NULL,
-{ { "blank",	"Simply blank the screen",
-    dmenuVarCheck, configSaver, NULL, "saver=blank" },
-  { "Green",	"\"Green\" power saving mode (if supported by monitor)",
-    dmenuVarCheck, configSaver, NULL, "saver=green" },
-  { "Snake",	"Draw a FreeBSD \"snake\" on your screen",
-    dmenuVarCheck, configSaver, NULL, "saver=snake" },
-  { "Star",	"A \"twinkling stars\" effect",
-    dmenuVarCheck, configSaver, NULL, "saver=star" },
-  { "Timeout",	"Set the screen saver timeout interval",
-    NULL, configSaverTimeout, NULL, NULL, ' ', ' ', ' ' },
-  { NULL } },
+    { { "blank",	"Simply blank the screen",
+	dmenuVarCheck, configSaver, NULL, "saver=blank" },
+      { "Green",	"\"Green\" power saving mode (if supported by monitor)",
+	dmenuVarCheck, configSaver, NULL, "saver=green" },
+      { "Snake",	"Draw a FreeBSD \"snake\" on your screen",
+	dmenuVarCheck, configSaver, NULL, "saver=snake" },
+      { "Star",	"A \"twinkling stars\" effect",
+	dmenuVarCheck, configSaver, NULL, "saver=star" },
+      { "Timeout",	"Set the screen saver timeout interval",
+	NULL, configSaverTimeout, NULL, NULL, ' ', ' ', ' ' },
+      { NULL } },
 };
 
 DMenu MenuSysconsScrnmap = {
@@ -1248,10 +1236,10 @@ DMenu MenuSysconsScrnmap = {
     "display at all.",
     "Choose a screen map",
     NULL,
-{ { "None", "No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
-  { "KOI8-R to IBM866", "Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
-  { "ISO 8859-1 to IBM437", "W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
-  { NULL } },
+    { { "None",			"No screenmap, use default font", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=NO" },
+      { "KOI8-R to IBM866",	"Russian KOI8-R to IBM 866 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=koi8-r2cp866" },
+      { "ISO 8859-1 to IBM437",	"W-Europe ISO 8859-1 to IBM 437 screenmap", dmenuVarCheck, dmenuSetVariable, NULL, "scrnmap=iso-8859-1_to_cp437" },
+      { NULL } },
 };
 
 DMenu MenuSysconsFont = {
@@ -1268,20 +1256,19 @@ DMenu MenuSysconsFont = {
     "you can select the appropriate font below.",
     "Choose a font",
     NULL,
-{ { "None", "Use default font", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=NO,font8x14=NO,font8x16=NO" },
-  { "IBM 437", "English", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" },
-  { "IBM 850", "Western Europe, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
-  { "IBM 865", "Norwegian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
-  { "IBM 866", "Russian, IBM encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
-  { "ISO 8859-1", "Western Europe, ISO encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
-  { "KOI8-R", "Russian, KOI8-R encoding", dmenuVarCheck, dmenuSetVariables, NULL,
-    "font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
-  { NULL } },
+    { { "None", "Use default font",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=NO,font8x14=NO,font8x16=NO" },
+      { "IBM 437", "English",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp437-8x8,font8x14=cp437-8x14,font8x16=cp437-8x16" },
+      { "IBM 850", "Western Europe, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp850-8x8,font8x14=cp850-8x14,font8x16=cp850-8x16" },
+      { "IBM 865", "Norwegian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp865-8x8,font8x14=cp865-8x14,font8x16=cp865-8x16" },
+      { "IBM 866", "Russian, IBM encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=cp866-8x8,font8x14=cp866-8x14,font8x16=cp866-8x16" },
+      { "ISO 8859-1", "Western Europe, ISO encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=iso-8x8,font8x14=iso-8x14,font8x16=iso-8x16" },
+      { "KOI8-R", "Russian, KOI8-R encoding",	dmenuVarCheck,	dmenuSetVariables, NULL,
+	"font8x8=koi8-r-8x8,font8x14=koi8-r-8x14,font8x16=koi8-r-8x16" },
+      { NULL } },
 };
-
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index e9336dd..c5465a7 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: options.c,v 1.44 1996/10/02 01:30:37 jkh Exp $
+ * $Id: options.c,v 1.45 1996/11/07 08:03:27 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -93,31 +93,6 @@ mediaCheck(Option opt)
     return "<not yet set>";
 }
 
-static char *
-consoleCheck(Option opt)
-{
-    static char opts[40];
-    char *cp;
-
-    opts[0] = '\0';
-    cp = variable_get("saver");
-    sprintf(&opts[strlen(opts)], "%s/", cp ?: "std");
-    cp = variable_get("scrnmap");
-    sprintf(&opts[strlen(opts)], "%s/", cp ?: "std");
-    cp = variable_get("font8x8");
-    sprintf(&opts[strlen(opts)], "%s", cp ?: "std");
-    return opts;
-}
-
-static int
-consoleGetType(dialogMenuItem *self)
-{
-    int i;
-
-    i = dmenuOpenSimple(&MenuSyscons, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE;
-    return i | DITEM_RECREATE;
-}
-
 #define TAPE_PROMPT	"Please enter the tape block size in 512 byte blocks:"
 #define RELNAME_PROMPT	"Please specify the release you wish to load or\n\"none\" for a generic release install:"
 #define BPKG_PROMPT	"Please specify the name of the HTML browser package:"
@@ -153,8 +128,6 @@ static Option Options[] = {
       OPT_IS_VAR,	BBIN_PROMPT,		VAR_BROWSER_BINARY,	varCheck	},
 { "Media Type",		"The current installation media type.",
       OPT_IS_FUNC,	mediaGetType,		VAR_MEDIA_TYPE,		mediaCheck	},
-{ "Console Config",	"Keyboard and font configuration.",
-      OPT_IS_FUNC,	consoleGetType,		"System console",	consoleCheck	},
 { "Package Temp",	"The directory where package temporary files should go",
       OPT_IS_VAR,	PKG_PROMPT,		VAR_PKG_TMPDIR,		varCheck	},
 { "Use Defaults",	"Reset all values to startup defaults",
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index e8b051f..b242577 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: sysinstall.h,v 1.85 1996/11/07 08:03:28 jkh Exp $
+ * $Id: sysinstall.h,v 1.86 1996/11/09 16:47:08 joerg Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -338,6 +338,7 @@ extern DMenu		MenuXF86;		/* XFree86 main menu				*/
 extern DMenu		MenuXF86Select;		/* XFree86 distribution selection menu		*/
 extern DMenu		MenuXF86SelectCore;	/* XFree86 core distribution menu		*/
 extern DMenu		MenuXF86SelectServer;	/* XFree86 server distribution menu		*/
+extern DMenu		MenuXF86SelectPC98Server; /* XFree86 server distribution menu		*/
 extern DMenu		MenuXF86SelectFonts;	/* XFree86 font selection menu			*/
 extern DMenu		MenuDiskDevices;	/* Disk devices menu				*/
 extern DMenu		MenuHTMLDoc;		/* HTML Documentation menu			*/
@@ -381,8 +382,10 @@ extern int	configRouter(dialogMenuItem *self);
 extern int	configSamba(dialogMenuItem *self);
 extern int	configPCNFSD(dialogMenuItem *self);
 extern int	configNFSServer(dialogMenuItem *self);
-extern int	configNovell(dialogMenuItem *self);
 extern int	configWriteSysconfig(dialogMenuItem *self);
+#ifdef NETCON_EXTENTIONS
+extern int	configNovell(dialogMenuItem *self);
+#endif
 
 /* crc.c */
 extern int	crc(int, unsigned long *, unsigned long *);