MF22: Important fixes for loading XFree86 distributions I forgot to

merge after 2.2.7 (I was wondering why that bug looked so familiar!).
Also update some docs accordingly.

1 files changed, 13 insertions, 11 deletions

diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 9d75fa355a3b..19647a9e4dcf 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/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.124 1998/06/10 01:15:46 jkh Exp $
+ * $Id: dist.c,v 1.125 1998/07/21 06:44:38 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -117,7 +117,7 @@ static Distribution XF86DistTable[] = {
 { "XF86332",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
 { "XF86332",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
 { "X332src-1",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_SRC,		NULL		},
-{ "X332contrib", "/usr/X11R6/src",	&XF86Dists,	DIST_XF86_CSRC,		NULL		},
+{ "X332ctrb",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_CSRC,		NULL		},
 { "X332bin",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_BIN,		NULL		},
 { "X332cfg",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_CFG,		NULL		},
 { "X332doc",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_DOC,		NULL		},
@@ -197,6 +197,8 @@ distVerifyFlags(void)
 	XF86Dists |= DIST_XF86_SERVER;
     if (XF86FontDists)
 	XF86Dists |= DIST_XF86_FONTS;
+    if (XF86Dists || XF86ServerDists || XF86FontDists)
+	Dists |= DIST_XF86;
     if (isDebug())
 	msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
 		 Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
@@ -260,13 +262,12 @@ distSetXDeveloper(dialogMenuItem *self)
 {
     int i;
 
-    distReset(NULL);
-    Dists = _DIST_DEVELOPER | DIST_XF86;
-    SrcDists = DIST_SRC_ALL;
+    i = distSetDeveloper(self);
+    Dists |= DIST_XF86;
     XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
     XF86FontDists = DIST_XF86_FONTS_MISC;
-    i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
+    i |= distSetXF86(NULL);
     distVerifyFlags();
     return i;
 }
@@ -301,12 +302,12 @@ distSetXUser(dialogMenuItem *self)
 {
     int i;
 
-    distReset(NULL);
-    Dists = _DIST_USER | DIST_XF86;
+    i = distSetUser(self);
+    Dists |= DIST_XF86;
     XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
     XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86FontDists = DIST_XF86_FONTS_MISC;
-    i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
+    i |= distSetXF86(NULL);
     distVerifyFlags();
     return i;
 }
@@ -324,7 +325,7 @@ distSetEverything(dialogMenuItem *self)
 {
     int i;
 
-    Dists = DIST_ALL;
+    Dists = DIST_ALL | DIST_XF86;
     SrcDists = DIST_SRC_ALL;
     XF86Dists = DIST_XF86_ALL;
     XF86ServerDists = DIST_XF86_SERVER_ALL;
@@ -379,7 +380,7 @@ distMaybeSetPorts(dialogMenuItem *self)
 		  "This will give you ready access to over 1000 ported software packages,\n"
 		  "though at a cost of around 35MB of disk space when \"clean\" and possibly\n"
 		  "much more than that if a lot of the distribution tarballs are loaded\n"
-		  "(unless you have the 2nd CD from a FreeBSD CDROM distribution available\n"
+		  "(unless you have the 4th CD from a FreeBSD CDROM distribution available\n"
 		  "and can mount it on /cdrom, in which case this is far less of a problem).\n\n"
 		  "The ports collection is a very valuable resource and, if you have at least\n"
 		  "100MB to spare in your /usr partition, well worth having around.\n\n"
@@ -774,6 +775,7 @@ distExtractAll(dialogMenuItem *self)
     if (!mediaVerify() || !mediaDevice->init(mediaDevice))
 	return DITEM_FAILURE;
 
+    distVerifyFlags();
     dialog_clear_norefresh();
     msgNotify("Attempting to install all selected distributions..");
     /* Try for 3 times around the loop, then give up. */