diff options
| author | jkh <jkh@FreeBSD.org> | 1996-05-16 13:39:08 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-05-16 13:39:08 +0000 |
| commit | 7cd1713b42a333755b98e37244731eb13622fa21 (patch) | |
| tree | 47b7ea19243eb00b0869d23e297611a1a087e28e /usr.sbin | |
| parent | 9a98e874982036a7da66d099584e6449a0f1076b (diff) | |
| download | FreeBSD-src-7cd1713b42a333755b98e37244731eb13622fa21.zip FreeBSD-src-7cd1713b42a333755b98e37244731eb13622fa21.tar.gz | |
Rethink the previous X distribution change. Including COMPAT_21 is just
bogus, and I think I'll simply see that the X distribtion is rebuilt for
-current before doing another snapshot for it. :-)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/menus.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 11989a0..f5f149e 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.61 1996/05/16 11:47:38 jkh Exp $ + * $Id: menus.c,v 1.62 1996/05/16 13:30:24 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,7 +131,7 @@ checkDistDeveloper(dialogMenuItem *self) static int checkDistXDeveloper(dialogMenuItem *self) { - return (Dists == (_DIST_DEVELOPER | DIST_XF86 | DIST_COMPAT21 ) && SrcDists == DIST_SRC_ALL); + return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL); } static int @@ -149,7 +149,7 @@ checkDistUser(dialogMenuItem *self) static int checkDistXUser(dialogMenuItem *self) { - return (Dists == (_DIST_USER | DIST_XF86 | DIST_COMPAT21)); + return (Dists == (_DIST_USER | DIST_XF86)); } static int diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index a596501..8b9ec23 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.50 1996/05/01 08:50:00 jkh Exp $ + * $Id: dist.c,v 1.51 1996/05/16 13:30:22 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -283,7 +283,7 @@ distSetXF86(dialogMenuItem *self) if (XF86FontDists) XF86Dists |= DIST_XF86_FONTS; if (XF86Dists) - Dists |= (DIST_XF86 | DIST_COMPAT21); /* XXX for now we need compat21 for X to work XXX */ + Dists |= DIST_XF86; msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n", XF86ServerDists, XF86FontDists, XF86Dists, Dists); } diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 11989a0..f5f149e 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.61 1996/05/16 11:47:38 jkh Exp $ + * $Id: menus.c,v 1.62 1996/05/16 13:30:24 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,7 +131,7 @@ checkDistDeveloper(dialogMenuItem *self) static int checkDistXDeveloper(dialogMenuItem *self) { - return (Dists == (_DIST_DEVELOPER | DIST_XF86 | DIST_COMPAT21 ) && SrcDists == DIST_SRC_ALL); + return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL); } static int @@ -149,7 +149,7 @@ checkDistUser(dialogMenuItem *self) static int checkDistXUser(dialogMenuItem *self) { - return (Dists == (_DIST_USER | DIST_XF86 | DIST_COMPAT21)); + return (Dists == (_DIST_USER | DIST_XF86)); } static int |
