diff options
| author | obrien <obrien@FreeBSD.org> | 2004-08-25 03:38:05 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2004-08-25 03:38:05 +0000 |
| commit | a2bb055310854876373f4978c9077436ae388a9b (patch) | |
| tree | fdf98ff602d3f53ab1b92e0ee730132b82d68ae0 /usr.sbin/sysinstall | |
| parent | 3de2c5e7d88738ed4df45cd50dabd8c58988bd9b (diff) | |
| download | FreeBSD-src-a2bb055310854876373f4978c9077436ae388a9b.zip FreeBSD-src-a2bb055310854876373f4978c9077436ae388a9b.tar.gz | |
No longer do special handling of Perl. FreeBSD users have all of 5.x
to get used to the fact that Perl is no longer part of the base system.
It is practically impossible to install any useful package and not get
Perl automatically pulled in as a dependency. So the typical user will
get their Perl.
This change greatly reduces the amount of manual labor in building the
miniinst.iso in release building.
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index da39774..764919a 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 08cb30283..7734234 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 13b812b..bd2b2a0 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 } }, |
