- 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

4 files changed, 16 insertions, 3 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 1af79d1..b8aef0f 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -999,6 +999,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
       { " local",	"Local additions collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
+      { " perl",	"Perl",
+	dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PERL },
       { " XFree86",	"The XFree86 distribution",
 #ifdef X_AS_PKG
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 },
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();
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 4847977..b63ffa6 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -27,7 +27,8 @@
 #define DIST_CATPAGES		0x10000
 #define DIST_PORTS		0x20000
 #define DIST_LOCAL		0x40000
-#define DIST_ALL		0x7FFFF
+#define DIST_PERL		0x80000
+#define DIST_ALL		0xFFFFF
 
 /* Subtypes for CRYPTO distribution */
 #define DIST_CRYPTO_CRYPTO	0x0001
@@ -124,7 +125,7 @@
 
 /* Canned distribution sets */
 #define _DIST_USER \
-	( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
+	( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO | DIST_PERL )
 
 #define _DIST_DEVELOPER \
 	( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 1af79d1..b8aef0f 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -999,6 +999,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
       { " local",	"Local additions collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
+      { " perl",	"Perl",
+	dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PERL },
       { " XFree86",	"The XFree86 distribution",
 #ifdef X_AS_PKG
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 },