From 22b6c0cd79c01b257f69e8ece97344c15f826291 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Fri, 16 Jul 1999 22:03:27 +0000
Subject: Don't offer compat dists on alpha since it makes no sense to do so.

Suggested by:	msmith
---
 usr.sbin/sysinstall/dist.c  | 10 ++++++++--
 usr.sbin/sysinstall/dist.h  |  4 +++-
 usr.sbin/sysinstall/menus.c |  4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'usr.sbin/sysinstall')

diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index fa48e55..4b47f1e 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.140 1999/05/14 07:15:03 jkh Exp $
+ * $Id: dist.c,v 1.141 1999/06/23 08:40:56 brian Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -73,6 +73,7 @@ static Distribution DistTable[] = {
 { "info",	"/",			&Dists,		DIST_INFO,		NULL		},
 { "src",	"/",			&Dists,		DIST_SRC,		SrcDistTable	},
 { "des",	"/",			&Dists,		DIST_DES,		DESDistTable	},
+#ifdef __i386__
 { "compat1x",	"/",			&Dists,		DIST_COMPAT1X,		NULL		},
 { "compat20",	"/",			&Dists,		DIST_COMPAT20,		NULL		},
 { "compat21",	"/",			&Dists,		DIST_COMPAT21,		NULL		},
@@ -80,6 +81,7 @@ static Distribution DistTable[] = {
 #if __FreeBSD__ > 3
 { "compat3x",	"/",			&Dists,		DIST_COMPAT3X,		NULL		},
 #endif
+#endif
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
 { "XF86333",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
 { NULL },
@@ -200,8 +202,12 @@ distVerifyFlags(void)
 	XF86Dists |= DIST_XF86_SERVER;
     if (XF86FontDists)
 	XF86Dists |= DIST_XF86_FONTS;
-    if (XF86Dists || XF86ServerDists || XF86FontDists)
+    if (XF86Dists || XF86ServerDists || XF86FontDists) {
 	Dists |= DIST_XF86;
+#ifdef __i386__
+	Dists |= DIST_COMPAT22;	/* For certain old X applications */
+#endif
+    }
     if (isDebug())
 	msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
 		 Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 581eb65..480fda6 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -1,4 +1,4 @@
-/*  $Id: dist.h,v 1.35 1999/05/14 07:15:04 jkh Exp $  */
+/*  $Id: dist.h,v 1.36 1999/07/02 02:00:23 jkh Exp $  */
 
 #ifndef _DIST_H_INCLUDE
 #define _DIST_H_INCLUDE
@@ -12,11 +12,13 @@
 #define DIST_SRC		0x00020
 #define DIST_DOC		0x00040
 #define DIST_INFO		0x00080
+#ifdef __i386__			/* only applicable on x86 */
 #define DIST_COMPAT1X		0x00100
 #define DIST_COMPAT20		0x00200
 #define DIST_COMPAT21		0x00400
 #define DIST_COMPAT22		0x00800
 #define DIST_COMPAT3X		0x01000
+#endif
 #define DIST_XF86		0x02000
 #define DIST_DES		0x04000
 #define DIST_CATPAGES		0x08000
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index db7c4bd..bacea54 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.209 1999/07/06 08:45:38 jkh Exp $
+ * $Id: menus.c,v 1.210 1999/07/06 09:19:36 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -788,6 +788,7 @@ DMenu MenuSubDistributions = {
     NULL,
     { { "bin",		"Binary base distribution (required)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
+#ifdef __i386__
       { "compat1x",	"FreeBSD 1.x binary compatibility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
       { "compat20",	"FreeBSD 2.0 binary compatibility",
@@ -800,6 +801,7 @@ DMenu MenuSubDistributions = {
       { "compat3x",	"FreeBSD 3.x binary compatibility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X },
 #endif
+#endif
       { "DES",		"DES encryption code - NOT FOR EXPORT!",
 	DESFlagCheck,	distSetDES },
       { "dict",		"Spelling checker dictionary files",
-- 
cgit v1.1