Offer an X Kern Developer collection, by user request (it's also more

orthogonal to the other entries).

Clean up X selection code a bit.

Choose proper architecture subdirectories on mirror sites now that we've
gone fully to the new multi-arch directory scheme.

1 files changed, 24 insertions, 11 deletions

diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 1fc1f97..31451a8 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.135 1999/02/07 12:57:04 jkh Exp $
+ * $Id: dist.c,v 1.136 1999/02/14 18:53:17 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -246,6 +246,16 @@ distConfig(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
+static int
+distSetX(void)
+{
+    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;
+    return distSetXF86(NULL);
+}
+
 int
 distSetDeveloper(dialogMenuItem *self)
 {
@@ -265,11 +275,7 @@ distSetXDeveloper(dialogMenuItem *self)
     int i;
 
     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);
+    i |= distSetX();
     distVerifyFlags();
     return i;
 }
@@ -288,6 +294,17 @@ distSetKernDeveloper(dialogMenuItem *self)
 }
 
 int
+distSetXKernDeveloper(dialogMenuItem *self)
+{
+    int i;
+
+    i = distSetKernDeveloper(self);
+    i |= distSetX();
+    distVerifyFlags();
+    return i;
+}
+
+int
 distSetUser(dialogMenuItem *self)
 {
     int i;
@@ -305,11 +322,7 @@ distSetXUser(dialogMenuItem *self)
     int i;
 
     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);
+    i |= distSetX();
     distVerifyFlags();
     return i;
 }