Update to XFree86 3.2

3 files changed, 212 insertions, 155 deletions

diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 6112686..742b323 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.73 1996/10/10 09:22:27 jkh Exp $
+ * $Id: dist.c,v 1.74 1996/11/02 19:50:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -112,51 +112,64 @@ static Distribution SrcDistTable[] = {
 
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
-{ "X312bin",	"/usr",			&XF86Dists,	DIST_XF86_BIN,		NULL		},
-{ "X312lib",	"/usr",			&XF86Dists,	DIST_XF86_LIB,		NULL		},
-{ "X312doc",	"/usr",			&XF86Dists,	DIST_XF86_DOC,		NULL		},
-{ "X312etc",	"/usr",			&XF86Dists,	DIST_XF86_ETC,		NULL		},
-{ "XF86312",	"/usr",			&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
-{ "X312man",	"/usr",			&XF86Dists,	DIST_XF86_MAN,		NULL		},
-{ "X312ctrb",	"/usr",			&XF86Dists,	DIST_XF86_CTRB,		NULL		},
-{ "X312prog",	"/usr",			&XF86Dists,	DIST_XF86_PROG,		NULL		},
-{ "X312link",	"/usr",			&XF86Dists,	DIST_XF86_LINK,		NULL		},
-{ "X312pex",	"/usr",			&XF86Dists,	DIST_XF86_PEX,		NULL		},
-{ "X312lbx",	"/usr",			&XF86Dists,	DIST_XF86_LBX,		NULL		},
-{ "X312ubin",	"/usr",			&XF86Dists,	DIST_XF86_UBIN,		NULL		},
-{ "X312xicf",	"/usr",			&XF86Dists,	DIST_XF86_XINIT,	NULL		},
-{ "X312xdcf",	"/usr",			&XF86Dists,	DIST_XF86_XDMCF,	NULL		},
-{ "XF86312",	"/usr",			&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
+{ "XF8632",	"/usr",			&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
+{ "XF8632",	"/usr",			&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
 { "XF86-xc",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_SRC,		NULL		},
-{ "XF86-co",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_SRC,		NULL		},
+{ "XF86-co",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_CSRC,		NULL		},
+{ "X32bin",	"/usr",			&XF86Dists,	DIST_XF86_BIN,		NULL		},
+{ "X32cfg",	"/usr",			&XF86Dists,	DIST_XF86_CFG,		NULL		},
+{ "X32doc",	"/usr",			&XF86Dists,	DIST_XF86_DOC,		NULL		},
+{ "X32html",	"/usr",			&XF86Dists,	DIST_XF86_HTML,		NULL		},
+{ "X32lib",	"/usr",			&XF86Dists,	DIST_XF86_LIB,		NULL		},
+{ "X32lk98",	"/usr",			&XF86Dists,	DIST_XF86_LKIT98,	NULL		},
+{ "X32lkit",	"/usr",			&XF86Dists,	DIST_XF86_LKIT,		NULL		},
+{ "X32man",	"/usr",			&XF86Dists,	DIST_XF86_MAN,		NULL		},
+{ "X32prog",	"/usr",			&XF86Dists,	DIST_XF86_PROG,		NULL		},
+{ "X32ps",	"/usr",			&XF86Dists,	DIST_XF86_PS,		NULL		},
+{ "X32set",	"/usr",			&XF86Dists,	DIST_XF86_SET,		NULL		},
 { NULL },
 };
 
 /* The XFree86 server distribution */
 static Distribution XF86ServerDistTable[] = {
-{ "X3128514",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_8514,	NULL		},
-{ "X312AGX",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_AGX,	NULL		},
-{ "X312Ma8",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH8,	NULL		},
-{ "X312Ma32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH32,NULL		},
-{ "X312Ma64",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH64,NULL		},
-{ "X312Mono",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MONO,	NULL		},
-{ "X312P9K",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_P9000,	NULL		},
-{ "X312S3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3,	NULL		},
-{ "X312SVGA",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_SVGA,	NULL		},
-{ "X312VG16",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VGA16,	NULL		},
-{ "X312W32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_W32,	NULL		},
-{ "X312nest",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_NEST,	NULL		},
+{ "X328514",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_8514,	NULL		},
+{ "X329480",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9480,	NULL		},
+{ "X329EGC",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9EGC,	NULL		},
+{ "X329GA9",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9GA9,	NULL		},
+{ "X329GAN",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9GAN,	NULL		},
+{ "X329LPW",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9LPW,	NULL		},
+{ "X329NKV",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9NKV,	NULL		},
+{ "X329NS3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9NS3,	NULL		},
+{ "X329SPW",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9SPW,	NULL		},
+{ "X329TGU",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9TGU,	NULL		},
+{ "X329WEP",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9WEP,	NULL		},
+{ "X329WS",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9WS,	NULL		},
+{ "X329WSN",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_9WSN,	NULL		},
+{ "X32AGX",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_AGX,	NULL		},
+{ "X32I128",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_I128,	NULL		},
+{ "X32Ma8",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH8,	NULL		},
+{ "X32Ma32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH32,NULL		},
+{ "X32Ma64",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MACH64,NULL		},
+{ "X32Mono",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_MONO,	NULL		},
+{ "X32P9K",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_P9000,	NULL		},
+{ "X32S3",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3,	NULL		},
+{ "X32S3V",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_S3V,	NULL		},
+{ "X32SVGA",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_SVGA,	NULL		},
+{ "X32VG16",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VGA16,	NULL		},
+{ "X32W32",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_W32,	NULL		},
+{ "X32nest",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_NEST,	NULL		},
+{ "X32vfb",	"/usr",		&XF86ServerDists,	DIST_XF86_SERVER_VFB,	NULL		},
 { NULL },
 };
 
 /* The XFree86 font distribution */
 static Distribution XF86FontDistTable[] = {
-{ "X312fnts",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_MISC,	NULL		},
-{ "X312f100",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_100,	NULL		},
-{ "X312fcyr",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_CYR,	NULL		},
-{ "X312fscl",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SCALE,	NULL		},
-{ "X312fnon",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_NON,	NULL		},
-{ "X312fsrv",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
+{ "X32fnts",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_MISC,	NULL		},
+{ "X32f100",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_100,	NULL		},
+{ "X32fcyr",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_CYR,	NULL		},
+{ "X32fscl",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SCALE,	NULL		},
+{ "X32fnon",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_NON,	NULL		},
+{ "X32fsrv",	"/usr",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
 { NULL },
 };
 
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index a2b3fec..cc268f7 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -27,7 +27,7 @@
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
 
 #define _DIST_XDEV \
-	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)
+	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
 
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001
@@ -57,35 +57,49 @@
 
 /* Subtypes for XFree86 distribution */
 #define DIST_XF86_BIN		0x0001
-#define DIST_XF86_LIB		0x0002
+#define DIST_XF86_CFG		0x0002
 #define DIST_XF86_DOC		0x0004
-#define DIST_XF86_ETC		0x0008
-#define DIST_XF86_MAN		0x0010
-#define DIST_XF86_CTRB		0x0020
-#define DIST_XF86_PROG		0x0040
-#define DIST_XF86_LINK		0x0080
-#define DIST_XF86_UBIN		0x0100
-#define DIST_XF86_PEX		0x0200
-#define DIST_XF86_LBX		0x0400
-#define DIST_XF86_XINIT		0x0800
-#define DIST_XF86_XDMCF		0x1000
-#define DIST_XF86_SRC		0x2000
-#define DIST_XF86_MISC_ALL	0x3FFF
-#define DIST_XF86_SERVER	0x4000
-#define DIST_XF86_SERVER_8514		0x0001
-#define DIST_XF86_SERVER_AGX		0x0002
-#define DIST_XF86_SERVER_MACH8		0x0004
-#define DIST_XF86_SERVER_MACH32		0x0008
-#define DIST_XF86_SERVER_MACH64		0x0010
-#define DIST_XF86_SERVER_MONO		0x0020
-#define DIST_XF86_SERVER_P9000		0x0040
-#define DIST_XF86_SERVER_S3		0x0080
-#define DIST_XF86_SERVER_SVGA		0x0100
-#define DIST_XF86_SERVER_VGA16		0x0200
-#define DIST_XF86_SERVER_W32		0x0400
-#define DIST_XF86_SERVER_NEST		0x0800
-#define DIST_XF86_SERVER_ALL		0x0FFF
-#define DIST_XF86_FONTS		0x8000
+#define DIST_XF86_HTML		0x0008
+#define DIST_XF86_LIB		0x0010
+#define DIST_XF86_LKIT98	0x0020
+#define DIST_XF86_LKIT		0x0040
+#define DIST_XF86_MAN		0x0080
+#define DIST_XF86_PROG		0x0100
+#define DIST_XF86_PS		0x0200
+#define DIST_XF86_SET		0x0400
+#define DIST_XF86_SRC		0x0800
+#define DIST_XF86_CSRC		0x1000
+#define DIST_XF86_MISC_ALL	0x1FFF
+#define DIST_XF86_SERVER	0x8000
+#define DIST_XF86_SERVER_8514		0x0000001
+#define DIST_XF86_SERVER_9480		0x0000002
+#define DIST_XF86_SERVER_9EGC		0x0000004
+#define DIST_XF86_SERVER_9GA9		0x0000008
+#define DIST_XF86_SERVER_9GAN		0x0000010
+#define DIST_XF86_SERVER_9LPW		0x0000020
+#define DIST_XF86_SERVER_9NKV		0x0000040
+#define DIST_XF86_SERVER_9NS3		0x0000080
+#define DIST_XF86_SERVER_9SPW		0x0000100
+#define DIST_XF86_SERVER_9TGU		0x0000200
+#define DIST_XF86_SERVER_9WEP		0x0000400
+#define DIST_XF86_SERVER_9WS		0x0000800
+#define DIST_XF86_SERVER_9WSN		0x0001000
+#define DIST_XF86_SERVER_AGX		0x0002000
+#define DIST_XF86_SERVER_I128		0x0004000
+#define DIST_XF86_SERVER_MACH8		0x0008000
+#define DIST_XF86_SERVER_MACH32		0x0010000
+#define DIST_XF86_SERVER_MACH64		0x0020000
+#define DIST_XF86_SERVER_MONO		0x0040000
+#define DIST_XF86_SERVER_P9000		0x0080000
+#define DIST_XF86_SERVER_S3		0x0100000
+#define DIST_XF86_SERVER_S3V		0x0200000
+#define DIST_XF86_SERVER_SVGA		0x0400000
+#define DIST_XF86_SERVER_VGA16		0x0800000
+#define DIST_XF86_SERVER_W32		0x1000000
+#define DIST_XF86_SERVER_NEST		0x2000000
+#define DIST_XF86_SERVER_VFB		0x4000000
+#define DIST_XF86_SERVER_ALL		0x7FFFFFF
+#define DIST_XF86_FONTS		0x10000
 #define DIST_XF86_FONTS_MISC		0x0001
 #define DIST_XF86_FONTS_100		0x0002
 #define DIST_XF86_FONTS_CYR		0x0004
@@ -93,7 +107,7 @@
 #define DIST_XF86_FONTS_NON		0x0010
 #define DIST_XF86_FONTS_SERVER		0x0020
 #define DIST_XF86_FONTS_ALL		0x003F
-#define DIST_XF86_ALL		0xFFFF
+#define DIST_XF86_ALL		0x1FFFF
 
 #endif
 /* _DIST_H_INCLUDE */
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 41f3e92..7e962b6 100644
--- a/release/sysinstall/menus.c
+++ b/release/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.90 1996/11/04 12:56:26 jkh Exp $
+ * $Id: menus.c,v 1.91 1996/11/04 17:42:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -630,23 +630,23 @@ 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 [180MB]",
+{ { "1 Developer",	"Full sources, binaries and doc but no games [180M]",
     checkDistDeveloper, distSetDeveloper },
-  { "2 X-Developer",	"Same as above, but includes XFree86 [201MB]",
+  { "2 X-Developer",	"Same as above, but includes XFree86 [201M]",
     checkDistXDeveloper, distSetXDeveloper },
-  { "3 Kern-Developer",	"Full binaries and doc, kernel sources only [70MB]",
+  { "3 Kern-Developer",	"Full binaries and doc, kernel sources only [70M]",
     checkDistKernDeveloper, distSetKernDeveloper },
-  { "4 User",		"Average user - binaries and doc only [52MB]",
+  { "4 User",		"Average user - binaries and doc only [52M]",
     checkDistUser, distSetUser },
-  { "5 X-User",		"Same as above, but includes XFree86 [52MB]",
+  { "5 X-User",		"Same as above, but includes XFree86 [52M]",
     checkDistXUser, distSetXUser },
-  { "6 Minimal",	"The smallest configuration possible [44MB]",
+  { "6 Minimal",	"The smallest configuration possible [44M]",
     checkDistMinimum, distSetMinimum },
-  { "7 All",		"All sources, binaries and XFree86 binaries [700MB]",
+  { "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 [0MB]",
+    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, '<', '<', '<' },
@@ -661,39 +661,39 @@ 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) [36MB]",
+{ { "bin",		"Binary base distribution (required) [36M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
-  { "commerce",		"Commercial and shareware demos [10MB]",
+  { "commerce",		"Commercial and shareware demos [10M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMMERCIAL },
-  { "compat1x",		"FreeBSD 1.x binary compatibility [2MB]",
+  { "compat1x",		"FreeBSD 1.x binary compatibility [2M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
-  { "compat20",		"FreeBSD 2.0 binary compatibility [2MB]",
+  { "compat20",		"FreeBSD 2.0 binary compatibility [2M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
-  { "compat21",		"FreeBSD 2.1 binary compatibility [2MB]",
+  { "compat21",		"FreeBSD 2.1 binary compatibility [2M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
-  { "DES",		"DES encryption code - NOT FOR EXPORT! [.3MB]",
+  { "DES",		"DES encryption code - NOT FOR EXPORT! [.3M]",
     DESFlagCheck, distSetDES },
-  { "dict",		"Spelling checker dictionary files [4.2MB]",
+  { "dict",		"Spelling checker dictionary files [4.2M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
-  { "doc",		"FreeBSD Handbook and other online docs [10MB]",
+  { "doc",		"FreeBSD Handbook and other online docs [10M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
-  { "games",		"Games (non-commercial) [6.4MB]",
+  { "games",		"Games (non-commercial) [6.4M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
-  { "info",		"GNU info files [4.1MB]",
+  { "info",		"GNU info files [4.1M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
-  { "man",		"System manual pages - recommended [3.3MB]",
+  { "man",		"System manual pages - recommended [3.3M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
-  { "proflibs",		"Profiled versions of the libraries [3.3MB]",
+  { "proflibs",		"Profiled versions of the libraries [3.3M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
-  { "src",		"Sources for everything but DES [120MB]",
+  { "src",		"Sources for everything but DES [120M]",
     srcFlagCheck, distSetSrc },
-  { "XFree86",		"The XFree86 3.1.2-S distribution",
+  { "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 [700MB]",
+  { "All",		"All sources, binaries and XFree86 binaries [700M]",
     NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",		"Reset all of the above [0MB]",
+  { "Clear",		"Reset all of the above [0M]",
     NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
     checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -709,13 +709,13 @@ 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 [1MB]",
+{ { "des",	"Basic DES encryption services [1M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-  { "krb",	"Kerberos encryption services [2MB]",
+  { "krb",	"Kerberos encryption services [2M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
-  { "sebones",	"Sources for eBones (Kerberos) [1MB]",
+  { "sebones",	"Sources for eBones (Kerberos) [1M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
-  { "ssecure",	"Sources for DES [1MB]",
+  { "ssecure",	"Sources for DES [1M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
   { "Exit",	"Exit this menu (returning to previous)",
     checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -731,41 +731,41 @@ you wish to install.",
     NULL,
 { { "base",	"top-level files in /usr/src [300K]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
-  { "contrib",	"/usr/src/contrib (contributed software) [33MB]",
+  { "contrib",	"/usr/src/contrib (contributed software) [33M]",
     dmenuFlagCheck, dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
-  { "gnu",	"/usr/src/gnu (software from the GNU Project) [42MB]",
+  { "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.8MB]",
+  { "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.2MB]",
+  { "lib",	"/usr/src/lib (system libraries) [9.2M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
-  { "libexec",	"/usr/src/libexec (system programs) [1.2MB]",
+  { "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.5MB]",
+  { "bin",	"/usr/src/bin (system binaries) [2.5M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
-  { "sbin",	"/usr/src/sbin (system binaries) [1.3MB]",
+  { "sbin",	"/usr/src/sbin (system binaries) [1.3M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
-  { "share",	"/usr/src/share (documents and shared files) [10MB]",
+  { "share",	"/usr/src/share (documents and shared files) [10M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
-  { "sys",	"/usr/src/sys (FreeBSD kernel) [13MB]",
+  { "sys",	"/usr/src/sys (FreeBSD kernel) [13M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
-  { "ubin",	"/usr/src/usr.bin (user binaries) [13MB]",
+  { "ubin",	"/usr/src/usr.bin (user binaries) [13M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
-  { "usbin",	"/usr/src/usr.sbin (aux system binaries) [14MB]",
+  { "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 [120MB]",
+  { "All",	"Select all of the above [120M]",
     NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset all of the above [0MB]",
+  { "Clear",	"Reset all of the above [0M]",
     NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
     checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -774,8 +774,8 @@ you wish to install.",
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
-    "XFree86 3.1.2-S Distribution",
-    "Please select the components you need from the XFree86 3.1.2-S\n\
+    "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.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
@@ -797,40 +797,40 @@ component set and at least one entry from the Server and Font set menus.",
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
-    "XFree86 3.1.2-S base distribution types",
+    "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.",
     "Press F1 to read the XFree86 release notes for FreeBSD",
     "XF86",
-{ { "bin",	"Client applications and shared libs [4.1MB].",
+{ { "bin",	"Client applications and shared libs [4.1M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
-  { "lib",	"Data files needed at runtime [750K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
-  { "xicf",	"Customizable xinit runtime configuration file [10K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_XINIT },
-  { "xdcf",	"Customizable xdm runtime configuration file [20K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_XDMCF },
-  { "etc",	"Clock setting and diagnostic source codes [70K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_ETC },
+  { "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 },
-  { "man",	"Manual pages [1.7MB]",
+  { "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 },
-  { "ctrb",	"Various contributed binaries (ico, xman, etc) [550K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CTRB },
-  { "prog",	"Programmer's header and library files [4.1MB]",
+  { "prog",	"Programmer's header and library files [4.1M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
-  { "link",	"Kit to reconfigure/rebuild X Servers [8.8MB]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LINK },
-  { "ubin",	"rstart daemon [2K]",
-    dmenuFlagCheck, dmenuSetFlag,	NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_UBIN },
-  { "pex",	"PEX fonts and libs needed by PEX apps [290K]",
-    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PEX },
-  { "sources",	"XFree86 3.1.2-S standard + contrib sources [200MB]",
+  { "ps",	"Postscript documentation [5M]",
+    dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
+  { "set",	"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 },
-  { "All",	"Select all of the above [20MB]",
+  { "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 [0MB]",
+  { "Clear",	"Reset all of the above [0M]",
     NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
     checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -846,21 +846,21 @@ 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.6MB]",
+{ { "fnts",	"Standard 75 DPI and miscellaneous fonts [3.6M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
-  { "f100",	"100 DPI fonts [1.8MB]",
+  { "f100",	"100 DPI fonts [1.8M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
-  { "fcyr",	"Cyrillic Fonts [1.8MB]",
+  { "fcyr",	"Cyrillic Fonts [1.8M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
-  { "fscl",	"Speedo and Type scalable fonts [1.6MB]",
+  { "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.3MB]",
+  { "non",	"Japanese, Chinese and other non-english fonts [3.3M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
-  { "server",	"Font server [0.3MB]",
+  { "server",	"Font server [0.3M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
-  { "All",	"All fonts [10MB]",
+  { "All",	"All fonts [10M]",
     NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
-  { "Clear",	"Reset font selections [0MB]",
+  { "Clear",	"Reset font selections [0M]",
     NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
     checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -876,33 +876,63 @@ 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 display [2.8MB]",
+{ { "SVGA",	"Standard VGA or Super VGA card [2.8M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
-  { "VGA16",	"Standard 16 color VGA display [1.3MB]",
+  { "VGA16",	"Standard 16 color VGA card [1.3M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
-  { "Mono",	"Standard Monochrome display [1.3MB]",
+  { "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.2MB]",
+  { "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.4MB]",
+  { "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 },
-  { "Ma8",	"8-bit ATI Mach8 card [2.3MB]",
+  { "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) for ATI Mach32 card [2.4MB]",
+  { "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) for ATI Mach64 card [2.5MB]",
+  { "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 for Weitek P9000 based boards [2.5MB]",
+  { "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 for S3 based boards [2.7MB]",
+  { "S3",	"8, 16 and 24-bit color S3 based boards [2.7M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
-  { "W32",	"8-bit Color for ET4000/W32, /W32i and /W32p cards [2.3MB]",
+  { "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.8MB]",
+  { "nest",	"A nested server for testing purposes [1.8M]",
     dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
-  { "All",	"Select all of the above [25MB]",
+  { "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 [0MB]",
+  { "Clear",	"Reset all of the above [0M]",
     NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
   { "Exit",	"Exit this menu (returning to previous)",
     checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },