summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2004-08-25 03:38:05 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2004-08-25 03:38:05 +0000
commitbd3be3789f5528a670f339a12b745ae22f857cb4 (patch)
treefdf98ff602d3f53ab1b92e0ee730132b82d68ae0
parent5162f7de6fcfd69aaebe7e883fc22ca192213fa0 (diff)
Notes
-rw-r--r--usr.sbin/sade/menus.c2
-rw-r--r--usr.sbin/sysinstall/dist.c1
-rw-r--r--usr.sbin/sysinstall/dist.h3
-rw-r--r--usr.sbin/sysinstall/menus.c2
4 files changed, 1 insertions, 7 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 13b812b3e548..bd2b2a022181 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -997,8 +997,6 @@ DMenu MenuSubDistributions = {
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
{ " local", "Local additions collection",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
- { " perl", "The Perl distribution",
- dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PERL },
{ " X.Org", "The X.Org distribution",
x11FlagCheck, distSetXOrg },
{ NULL } },
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index da39774f2938..764919ab5bd3 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -95,7 +95,6 @@ static Distribution DistTable[] = {
#endif
DTE_TARBALL("ports", &Dists, PORTS, "/usr"),
DTE_TARBALL("local", &Dists, LOCAL, "/"),
- DTE_PACKAGE("perl", &Dists, PERL, "perl"),
DTE_SUBDIST("X.Org", &Dists, XORG, XOrgDistTable),
{ NULL },
};
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 08cb30283125..773423416431 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -26,7 +26,6 @@
#define DIST_CATPAGES 0x10000
#define DIST_PORTS 0x20000
#define DIST_LOCAL 0x40000
-#define DIST_PERL 0x80000
#define DIST_ALL 0xFFFFF
/* Subtypes for SRC distribution */
@@ -85,7 +84,7 @@
DIST_XORG_FONTS_TT)
#define _DIST_USER \
- ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PERL )
+ ( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT )
#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 13b812b3e548..bd2b2a022181 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -997,8 +997,6 @@ DMenu MenuSubDistributions = {
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
{ " local", "Local additions collection",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
- { " perl", "The Perl distribution",
- dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PERL },
{ " X.Org", "The X.Org distribution",
x11FlagCheck, distSetXOrg },
{ NULL } },