Teach sysinstall about the `compat4x' distribution.

Approved by:	jkh

6 files changed, 33 insertions, 6 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 9626fe6..018684d 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -764,6 +764,10 @@ DMenu MenuSubDistributions = {
       { " compat3x",	"FreeBSD 3.x binary compatibility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X },
 #endif
+#if __FreeBSD__ > 4
+      { " compat4x",	"FreeBSD 4.x binary compatibility",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X },
+#endif
 #endif
       { " crypto",	"Basic encryption services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index af72e4c..2cf6fca 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -412,6 +412,13 @@ Compatibility with
 (available for
 .Fx 4.0
 systems only)
+.It Li compat4x
+Compatibility with
+.Fx
+4.x
+(available for
+.Fx 5.0
+systems only)
 .It Li ports
 The ports collection.
 .It Li krb4
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index d564618..bb00b9a 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -79,6 +79,7 @@ static Distribution DistTable[] = {
 { "compat21",	"/",			&Dists,		DIST_COMPAT21,		NULL		},
 { "compat22",	"/",			&Dists,		DIST_COMPAT22,		NULL		},
 { "compat3x",	"/",			&Dists,		DIST_COMPAT3X,		NULL		},
+{ "compat4x",	"/",			&Dists,		DIST_COMPAT4X,		NULL		},
 #endif
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
 { "local",	"/",			&Dists,		DIST_LOCAL,		NULL		},
@@ -224,6 +225,9 @@ distVerifyFlags(void)
 #if __FreeBSD__ > 3
 	Dists |= DIST_COMPAT3X;
 #endif
+#if __FreeBSD__ > 4
+	Dists |= DIST_COMPAT4X;
+#endif
 #endif
     }
     if (isDebug())
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index e939ea5..c3b0a26 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -18,13 +18,14 @@
 #define DIST_COMPAT21		0x00400
 #define DIST_COMPAT22		0x00800
 #define DIST_COMPAT3X		0x01000
+#define DIST_COMPAT4X		0x02000
 #endif
-#define DIST_XF86		0x02000
-#define DIST_CRYPTO		0x04000
-#define DIST_CATPAGES		0x08000
-#define DIST_PORTS		0x10000
-#define DIST_LOCAL		0x20000
-#define DIST_ALL		0x3FFFF
+#define DIST_XF86		0x04000
+#define DIST_CRYPTO		0x08000
+#define DIST_CATPAGES		0x10000
+#define DIST_PORTS		0x20000
+#define DIST_LOCAL		0x40000
+#define DIST_ALL		0x7FFFF
 
 /* Subtypes for CRYPTO distribution */
 #define DIST_CRYPTO_CRYPTO	0x0001
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 9626fe6..018684d 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -764,6 +764,10 @@ DMenu MenuSubDistributions = {
       { " compat3x",	"FreeBSD 3.x binary compatibility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X },
 #endif
+#if __FreeBSD__ > 4
+      { " compat4x",	"FreeBSD 4.x binary compatibility",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X },
+#endif
 #endif
       { " crypto",	"Basic encryption services",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index af72e4c..2cf6fca 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -412,6 +412,13 @@ Compatibility with
 (available for
 .Fx 4.0
 systems only)
+.It Li compat4x
+Compatibility with
+.Fx
+4.x
+(available for
+.Fx 5.0
+systems only)
 .It Li ports
 The ports collection.
 .It Li krb4