- Convert the installation of the X package to using installPackage()

  rather than installX11package().
- Add a perl psuedo-dist that installs the perl package.  The perl
  distribution is selected by default when a User distribution set is
  selected.  It is not selected when a Minimal distribution set is
  selected.  The perl distribution may be toggled manually in the
  custom menu just as other distributions.

Approved by:	re

1 files changed, 9 insertions, 1 deletions

diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 3e58408..ed761b1 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -907,6 +907,7 @@ distExtractAll(dialogMenuItem *self)
     int old_dists, retries = 0, status = DITEM_SUCCESS;
     char buf[512];
     WINDOW *w;
+    int want_perl_package = 0;
 #ifdef X_AS_PKG
     int want_x_package = 0;
 #endif
@@ -927,6 +928,11 @@ distExtractAll(dialogMenuItem *self)
     w = savescr();
     msgNotify("Attempting to install all selected distributions..");
 
+    /* Clear perl dist flag, but remember it was present. */
+    if (Dists & DIST_PERL) {
+	want_perl_package = 1;
+	Dists &= ~DIST_PERL;
+    }
 #ifdef X_AS_PKG
     /* Clear any XFree86 dist flags, but remember they were present. */
     if(Dists & DIST_XF86)
@@ -938,9 +944,11 @@ distExtractAll(dialogMenuItem *self)
     while (Dists && ++retries < 3)
 	distExtract(NULL, DistTable);
 
+    if (want_perl_package)
+	status |= installPackage(NULL, "Perl", "perl");
 #ifdef X_AS_PKG
     if (want_x_package)
-	status |= installX11package(NULL);
+	status |= installPackage(NULL, "XFree86", "XFree86-4");
 #endif
 
     dialog_clear_norefresh();