From 47b96f90c086096cb12e76442461d4da895e207b Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 21 Apr 1999 07:22:37 +0000 Subject: Add compat3x to the mix. Reviewed by: jkh --- release/sysinstall/dist.c | 5 ++++- release/sysinstall/dist.h | 35 ++++++++++++++++++----------------- release/sysinstall/menus.c | 6 +++++- 3 files changed, 27 insertions(+), 19 deletions(-) (limited to 'release/sysinstall') diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 31451a8..dae0240 100644 --- a/release/sysinstall/dist.c +++ b/release/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.136 1999/02/14 18:53:17 jkh Exp $ + * $Id: dist.c,v 1.137 1999/03/19 10:54:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -77,6 +77,9 @@ static Distribution DistTable[] = { { "compat20", "/", &Dists, DIST_COMPAT20, NULL }, { "compat21", "/", &Dists, DIST_COMPAT21, NULL }, { "compat22", "/", &Dists, DIST_COMPAT22, NULL }, +#if __FreeBSD__ > 3 +{ "compat3x", "/", &Dists, DIST_COMPAT3X, NULL }, +#endif { "ports", "/usr", &Dists, DIST_PORTS, NULL }, { "XF86333", "/usr", &Dists, DIST_XF86, XF86DistTable }, { NULL }, diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index ae38850..411e40e 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -2,23 +2,24 @@ #define _DIST_H_INCLUDE /* Bitfields for distributions - hope we never have more than 32! :-) */ -#define DIST_BIN 0x0001 -#define DIST_GAMES 0x0002 -#define DIST_MANPAGES 0x0004 -#define DIST_PROFLIBS 0x0008 -#define DIST_DICT 0x0010 -#define DIST_SRC 0x0020 -#define DIST_DOC 0x0040 -#define DIST_INFO 0x0080 -#define DIST_COMPAT1X 0x0100 -#define DIST_COMPAT20 0x0200 -#define DIST_COMPAT21 0x0400 -#define DIST_COMPAT22 0x0800 -#define DIST_XF86 0x1000 -#define DIST_DES 0x2000 -#define DIST_CATPAGES 0x4000 -#define DIST_PORTS 0x8000 -#define DIST_ALL 0xFFFF +#define DIST_BIN 0x00001 +#define DIST_GAMES 0x00002 +#define DIST_MANPAGES 0x00004 +#define DIST_PROFLIBS 0x00008 +#define DIST_DICT 0x00010 +#define DIST_SRC 0x00020 +#define DIST_DOC 0x00040 +#define DIST_INFO 0x00080 +#define DIST_COMPAT1X 0x00100 +#define DIST_COMPAT20 0x00200 +#define DIST_COMPAT21 0x00400 +#define DIST_COMPAT22 0x00800 +#define DIST_COMPAT3X 0x01000 +#define DIST_XF86 0x02000 +#define DIST_DES 0x04000 +#define DIST_CATPAGES 0x08000 +#define DIST_PORTS 0x10000 +#define DIST_ALL 0xFFFFF /* Canned distribution sets */ #define _DIST_DEVELOPER \ diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index c0a5bd5..d03b76d 100644 --- a/release/sysinstall/menus.c +++ b/release/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.192 1999/03/09 12:36:28 jkh Exp $ + * $Id: menus.c,v 1.193 1999/03/19 10:54:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -764,6 +764,10 @@ DMenu MenuSubDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 }, { "compat22", "FreeBSD 2.2.x and 3.0 a.out binary compatibility", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT22 }, +#if __FreeBSD__ > 3 + { "compat3x", "FreeBSD 3.x binary compatibility", + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X }, +#endif { "DES", "DES encryption code - NOT FOR EXPORT!", DESFlagCheck, distSetDES }, { "dict", "Spelling checker dictionary files", -- cgit v1.1