diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index 561244fac15e..a939db5a960c 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -19,7 +19,6 @@ SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
-#CFLAGS+= -DUSE_XIG_ENVIRONMENT
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 3272f5a847b9..e7a07bbe2de5 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.105 1998/03/07 08:59:22 jkh Exp $
+ * $Id: config.c,v 1.106 1998/03/09 08:39:46 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -503,7 +503,6 @@ configUsers(dialogMenuItem *self)
 int
 configXEnvironment(dialogMenuItem *self)
 {
-#ifndef USE_XIG_ENVIRONMENT
     char *config, *execfile;
     char *moused;
 
@@ -544,83 +543,6 @@ configXEnvironment(dialogMenuItem *self)
 		   "The XFree86 distribution before attempting to configure it.");
 	return DITEM_FAILURE | DITEM_RESTORE;
     }
-
-#else	/* USE_XIG_ENVIRONMENT */
-    int i;
-
-    /* Make sure we're sane first */
-    if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") ||
-	!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) {
-	dialog_clear_norefresh();
-	msgConfirm("Hmmm!  It looks like you elected not to install the AccelleratedX\n"
-		   "server package (or the installation failed somehow).  If this was\n"
-		   "an omission rather than an error, please go to the Distributions\n"
-		   "menu, select the Custom distribution options and then choose your X11\n"
-		   "distribution components from the XFree86 menu.  AccelX will be selected\n"
-		   "as the default server automatically.");
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-
-    if (mediaDevice && mediaDevice->type != DEVICE_TYPE_CDROM) {
-	if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
-	    msgConfirm("I can't mount the CDE distribution from CDROM, sorry.\n"
-		       "Please make sure you have the 1st CD of your FreeBSD Desktop/Pro\n"
-		       "distribution in the drive before trying this operation.");
-	    return DITEM_FAILURE | DITEM_RESTORE;
-	}
-    }
-
-    if (!directory_exists("/dist/CDE/")) {
-	msgConfirm("Hmmm!  I can't find the CDE distribution.  Please place the 1st CD of your\n"
-		   "FreeBSD Desktop/Pro distribution in the drive and try this operation again.");
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-
-    /* Pre-extract base sets in kludge to work around chicken-and-egg problem with CDE and Xaccel */
-    if (directory_exists("/dist/CDE/") && !file_readable("/usr/X11R6/bin/xterm")) {
-	msgNotify("Installing bootstrap X11 tools from CDE distribution.");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-RUN/archive -C /");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-PRG/archive -C /");
-    }
-    systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/dt/lib /usr/local/lib /usr/lib/compat");
-
-    dialog_clear_norefresh();
-    msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
-    if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
-	dialog_clear_norefresh();
-	msgConfirm("Installation procedure failed, error code %d!  Please report\n"
-		   "error to Walnut Creek CDROM tech support (either send email\n"
-		   "to support@cdrom.com or call +1 510 603 1234).  Thank you!", i);
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-    else {
-	dialog_clear();
-	systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup");
-    }
-    if (directory_exists("/dist/CDE")) {
-	dialog_clear_norefresh();
-	msgNotify("Running CDE installation - please wait (this may take awhile!).");
-	dialog_clear();
-	clear();
-	refresh();
-	i = systemExecute("(cd /dist/CDE; sh Install)");
-	dialog_clear();
-	if (i) {
-	    msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n"
-		       "To try again, you should run this command manually after the system\n"
-		       "is up (and if your CDROM is mounted in the standard location, the path\n"
-		       "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
-	}
-	else {
-	    if (file_readable("/dist/CDE/post-install"))
-		systemExecute("/dist/CDE/post-install");
-	    /* Repair the damage done by the CDE installation */
-	    msgNotify("Doing final adjustments to Xaccel distribution...");
-	    systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall");
-	}
-    }
-    return DITEM_SUCCESS | DITEM_RESTORE;
-#endif	/* USE_XIG_ENVIRONMENT */
 }
 
 void
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 9a7f686a5708..a60ddf374186 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.120 1997/10/13 12:12:14 jkh Exp $
+ * $Id: dist.c,v 1.121 1998/01/23 07:53:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -41,11 +41,9 @@
 unsigned int Dists;
 unsigned int DESDists;
 unsigned int SrcDists;
-#ifndef USE_XIG_ENVIRONMENT
 unsigned int XF86Dists;
 unsigned int XF86ServerDists;
 unsigned int XF86FontDists;
-#endif
 
 typedef struct _dist {
     char *my_name;
@@ -58,11 +56,9 @@ typedef struct _dist {
 extern Distribution DistTable[];
 extern Distribution DESDistTable[];
 extern Distribution SrcDistTable[];
-#ifndef USE_XIG_ENVIRONMENT
 extern Distribution XF86DistTable[];
 extern Distribution XF86FontDistTable[];
 extern Distribution XF86ServerDistTable[];
-#endif
 
 /* The top-level distribution categories */
 static Distribution DistTable[] = {
@@ -80,11 +76,7 @@ static Distribution DistTable[] = {
 { "compat20",	"/",			&Dists,		DIST_COMPAT20,		NULL		},
 { "compat21",	"/",			&Dists,		DIST_COMPAT21,		NULL		},
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
-#ifdef USE_XIG_ENVIRONMENT
-{ "accelx",	"/usr/X11R6/lib/X11",	&Dists,		DIST_XIG_SERVER,	NULL		},
-#else
 { "XF86331",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
-#endif
 { NULL },
 };
 
@@ -120,7 +112,6 @@ static Distribution SrcDistTable[] = {
 { NULL },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
 { "XF86331",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
@@ -183,7 +174,6 @@ static Distribution XF86FontDistTable[] = {
 { "X331fsrv",	"/usr/X11R6",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
 { NULL },
 };
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 static int	distMaybeSetDES(dialogMenuItem *self);
 static int	distMaybeSetPorts(dialogMenuItem *self);
@@ -199,7 +189,6 @@ distVerifyFlags(void)
 	    DESDists |= DIST_DES_DES;
 	Dists |= DIST_DES;
     }
-#ifndef USE_XIG_ENVIRONMENT
     if (XF86Dists & DIST_XF86_SET)
 	XF86ServerDists |= DIST_XF86_SERVER_VGA16;
     if (XF86ServerDists)
@@ -208,7 +197,6 @@ distVerifyFlags(void)
 	XF86Dists |= DIST_XF86_FONTS;
     if (XF86Dists)
 	Dists |= (DIST_XF86 | DIST_COMPAT21);
-#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);
@@ -220,11 +208,9 @@ distReset(dialogMenuItem *self)
     Dists = 0;
     DESDists = 0;
     SrcDists = 0;
-#ifndef USE_XIG_ENVIRONMENT
     XF86Dists = 0;
     XF86ServerDists = 0;
     XF86FontDists = 0;
-#endif
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -244,7 +230,6 @@ distConfig(dialogMenuItem *self)
     if ((cp = variable_get(VAR_DIST_SRC)) != NULL)
 	SrcDists = atoi(cp);
 
-#ifndef	USE_XIG_ENVIRONMENT
     if ((cp = variable_get(VAR_DIST_X11)) != NULL)
 	XF86Dists = atoi(cp);
 
@@ -253,7 +238,6 @@ distConfig(dialogMenuItem *self)
 
     if ((cp = variable_get(VAR_DIST_XFONTS)) != NULL)
 	XF86FontDists = atoi(cp);
-#endif
     distVerifyFlags();
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
@@ -279,13 +263,9 @@ distSetXDeveloper(dialogMenuItem *self)
     distReset(NULL);
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_ALL;
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
     XF86FontDists = DIST_XF86_FONTS_MISC;
-#endif
     i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
@@ -323,13 +303,9 @@ distSetXUser(dialogMenuItem *self)
 
     distReset(NULL);
     Dists = _DIST_USER;
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
     XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86FontDists = DIST_XF86_FONTS_MISC;
-#endif
     i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
@@ -350,13 +326,9 @@ distSetEverything(dialogMenuItem *self)
 
     Dists = DIST_ALL;
     SrcDists = DIST_SRC_ALL;
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     XF86Dists = DIST_XF86_ALL;
     XF86ServerDists = DIST_XF86_SERVER_ALL;
     XF86FontDists = DIST_XF86_FONTS_ALL;
-#endif
     i = distMaybeSetDES(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
@@ -487,12 +459,8 @@ distSetXF86(dialogMenuItem *self)
 {
     int i = DITEM_SUCCESS;
 
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     if (!dmenuOpenSimple(&MenuXF86Select, FALSE))
 	i = DITEM_FAILURE;
-#endif
     distVerifyFlags();
     return i | DITEM_RESTORE;
 }
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index 2da05df31135..bdecdbd98a75 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -17,11 +17,7 @@
 #define DIST_DES		0x1000
 #define DIST_CATPAGES		0x2000
 #define DIST_PORTS		0x4000
-#ifdef USE_XIG_ENVIRONMENT
-#define DIST_XIG_SERVER		0x8000
-#else
 #define DIST_USR1		0x8000
-#endif
 #define DIST_ALL		0x7FFF
 
 /* Canned distribution sets */
@@ -58,7 +54,6 @@
 #define DIST_SRC_SMAILCF	0x10000
 #define DIST_SRC_ALL		0xFFFF	/* no SMAILCF, it's part of USBIN */
 
-#ifndef USE_XIG_ENVIRONMENT
 /* Subtypes for XFree86 distribution */
 #define DIST_XF86_BIN		0x0001
 #define DIST_XF86_CFG		0x0002
@@ -112,6 +107,5 @@
 #define DIST_XF86_FONTS_SERVER		0x0020
 #define DIST_XF86_FONTS_ALL		0x003F
 #define DIST_XF86_ALL		0x1FFFF
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 #endif	/* _DIST_H_INCLUDE */
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 6c989f9d0b0c..c51e10ca7065 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.204 1998/01/16 15:07:55 jkh Exp $
+ * $Id: install.c,v 1.205 1998/02/10 18:31:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -573,13 +573,11 @@ nodisks:
     configRC_conf("/etc/rc.conf");
     sync();
 
-#ifndef USE_XIG_ENVIRONMENT
     if (directory_exists("/usr/X11R6")) {
 	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
 	    configXEnvironment(self);
     }
-#endif
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
@@ -708,11 +706,6 @@ try_media:
     }
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
 
-    /* We always try to install X with the XiG product */
-#ifdef USE_XIG_ENVIRONMENT
-    if (directory_exists("/usr/X11R6"))
-	configXEnvironment(self);
-#endif
     return i | DITEM_RESTORE;
 }
 
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index d69c4bf5fe73..94f6232602eb 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.155 1998/03/07 08:59:27 jkh Exp $
+ * $Id: menus.c,v 1.156 1998/03/09 14:24:21 ache Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -53,7 +53,6 @@ clearSrc(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
-#ifndef USE_XIG_ENVIRONMENT
 static int
 setX11All(dialogMenuItem *self)
 {
@@ -122,7 +121,6 @@ clearX11Fonts(dialogMenuItem *self)
     XF86FontDists = 0;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 #define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
 				   (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
@@ -168,12 +166,8 @@ checkDistMinimum(dialogMenuItem *self)
 static int
 checkDistEverything(dialogMenuItem *self)
 {
-#ifdef USE_XIG_ENVIRONMENT
-    return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL);
-#else
     return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
 	    XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
-#endif
 }
 
 static int
@@ -188,13 +182,11 @@ srcFlagCheck(dialogMenuItem *item)
     return SrcDists;
 }
 
-#ifndef USE_XIG_ENVIRONMENT
 static int
 x11FlagCheck(dialogMenuItem *item)
 {
     return XF86Dists;
 }
-#endif
 
 static int
 checkTrue(dialogMenuItem *item)
@@ -233,9 +225,7 @@ DMenu MenuIndex = {
       { "Dists, User",		"Select average user distribution.",	checkDistUser, distSetUser },
       { "Dists, X User",	"Select average X user distribution.",	checkDistXUser, distSetXUser },
       { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll },
-#ifndef USE_XIG_ENVIRONMENT
       { "Distributions, XFree86","XFree86 distribution menu.",		NULL, distSetXF86 },
-#endif
       { "Documentation",	"Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
       { "Doc, README",		"The distribution README file.",	NULL, dmenuDisplayFile, NULL, "readme" },
       { "Doc, Hardware",	"The distribution hardware guide.",	NULL, dmenuDisplayFile,	NULL, "hardware" },
@@ -284,11 +274,9 @@ DMenu MenuIndex = {
       { "Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { "Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { "User Management",	"Add user and group information.",	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
-#ifndef USE_XIG_ENVIRONMENT
       { "XFree86, Fonts",	"XFree86 Font selection menu.",		NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
       { "XFree86, Server",	"XFree86 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
       { "XFree86, PC98 Server",	"XFree86 PC98 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server },
-#endif
       { NULL } },
 };
 
@@ -438,7 +426,6 @@ DMenu MenuMouse = {
       { NULL } },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 DMenu MenuXF86Config = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Please select the XFree86 configuration tool you want to use.",
@@ -457,7 +444,6 @@ DMenu MenuXF86Config = {
 	NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
       { NULL } },
 };
-#endif
 
 DMenu MenuMediaCDROM = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
@@ -778,13 +764,8 @@ DMenu MenuSubDistributions = {
 	srcFlagCheck,	distSetSrc },
       { "ports",	"The FreeBSD Ports collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
-#ifdef USE_XIG_ENVIRONMENT
-      { "Xaccel",	"The XiG AcceleratedX 3.1 distribution",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XIG_SERVER },
-#else
       { "XFree86",	"The XFree86 3.3.1 distribution",
 	x11FlagCheck,	distSetXF86 },
-#endif
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
       { "Clear",	"Reset all of the above",
@@ -868,7 +849,6 @@ DMenu MenuSrcDistributions = {
       { NULL } },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
     "XFree86 3.3.1 Distribution",
@@ -902,22 +882,18 @@ DMenu MenuXF86SelectCore = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
       { "lib",		"Data files needed at runtime",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
-#ifndef USE_XIG_ENVIRONMENT
       { "lk98",		"Server link kit for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
       { "lkit",		"Server link kit for all other machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
-#endif
       { "man",		"Manual pages",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
       { "prog",		"Programmer's header and library files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
       { "ps",		"Postscript documentation",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
-#ifndef USE_XIG_ENVIRONMENT
       { "set",		"XFree86 Setup Utility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
-#endif
       { "sources",	"XFree86 3.3.1 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
       { "csources",	"XFree86 3.3.1 contrib sources",
@@ -1048,7 +1024,6 @@ Mono servers are particularly well-suited to most LCD displays).",
 	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
       { NULL } }
 };
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 DMenu MenuDiskDevices = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
@@ -1155,11 +1130,7 @@ DMenu MenuConfigure = {
 	NULL,	dmenuSystemCommand, NULL, "passwd root" },
       { "B HTML Docs",	"Go to the HTML documentation menu (post-install)",
 	NULL, docBrowser },
-#ifdef USE_XIG_ENVIRONMENT
-      { "X X + CDE",	"Configure X Window system & CDE environment",
-#else
       { "X XFree86",	"Configure XFree86",
-#endif
 	NULL, configXEnvironment },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 561244fac15e..a939db5a960c 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -19,7 +19,6 @@ SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
-#CFLAGS+= -DUSE_XIG_ENVIRONMENT
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 3272f5a847b9..e7a07bbe2de5 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.105 1998/03/07 08:59:22 jkh Exp $
+ * $Id: config.c,v 1.106 1998/03/09 08:39:46 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -503,7 +503,6 @@ configUsers(dialogMenuItem *self)
 int
 configXEnvironment(dialogMenuItem *self)
 {
-#ifndef USE_XIG_ENVIRONMENT
     char *config, *execfile;
     char *moused;
 
@@ -544,83 +543,6 @@ configXEnvironment(dialogMenuItem *self)
 		   "The XFree86 distribution before attempting to configure it.");
 	return DITEM_FAILURE | DITEM_RESTORE;
     }
-
-#else	/* USE_XIG_ENVIRONMENT */
-    int i;
-
-    /* Make sure we're sane first */
-    if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") ||
-	!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) {
-	dialog_clear_norefresh();
-	msgConfirm("Hmmm!  It looks like you elected not to install the AccelleratedX\n"
-		   "server package (or the installation failed somehow).  If this was\n"
-		   "an omission rather than an error, please go to the Distributions\n"
-		   "menu, select the Custom distribution options and then choose your X11\n"
-		   "distribution components from the XFree86 menu.  AccelX will be selected\n"
-		   "as the default server automatically.");
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-
-    if (mediaDevice && mediaDevice->type != DEVICE_TYPE_CDROM) {
-	if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
-	    msgConfirm("I can't mount the CDE distribution from CDROM, sorry.\n"
-		       "Please make sure you have the 1st CD of your FreeBSD Desktop/Pro\n"
-		       "distribution in the drive before trying this operation.");
-	    return DITEM_FAILURE | DITEM_RESTORE;
-	}
-    }
-
-    if (!directory_exists("/dist/CDE/")) {
-	msgConfirm("Hmmm!  I can't find the CDE distribution.  Please place the 1st CD of your\n"
-		   "FreeBSD Desktop/Pro distribution in the drive and try this operation again.");
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-
-    /* Pre-extract base sets in kludge to work around chicken-and-egg problem with CDE and Xaccel */
-    if (directory_exists("/dist/CDE/") && !file_readable("/usr/X11R6/bin/xterm")) {
-	msgNotify("Installing bootstrap X11 tools from CDE distribution.");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-RUN/archive -C /");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-PRG/archive -C /");
-    }
-    systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/dt/lib /usr/local/lib /usr/lib/compat");
-
-    dialog_clear_norefresh();
-    msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
-    if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
-	dialog_clear_norefresh();
-	msgConfirm("Installation procedure failed, error code %d!  Please report\n"
-		   "error to Walnut Creek CDROM tech support (either send email\n"
-		   "to support@cdrom.com or call +1 510 603 1234).  Thank you!", i);
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-    else {
-	dialog_clear();
-	systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup");
-    }
-    if (directory_exists("/dist/CDE")) {
-	dialog_clear_norefresh();
-	msgNotify("Running CDE installation - please wait (this may take awhile!).");
-	dialog_clear();
-	clear();
-	refresh();
-	i = systemExecute("(cd /dist/CDE; sh Install)");
-	dialog_clear();
-	if (i) {
-	    msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n"
-		       "To try again, you should run this command manually after the system\n"
-		       "is up (and if your CDROM is mounted in the standard location, the path\n"
-		       "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
-	}
-	else {
-	    if (file_readable("/dist/CDE/post-install"))
-		systemExecute("/dist/CDE/post-install");
-	    /* Repair the damage done by the CDE installation */
-	    msgNotify("Doing final adjustments to Xaccel distribution...");
-	    systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall");
-	}
-    }
-    return DITEM_SUCCESS | DITEM_RESTORE;
-#endif	/* USE_XIG_ENVIRONMENT */
 }
 
 void
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 6c989f9d0b0c..c51e10ca7065 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.204 1998/01/16 15:07:55 jkh Exp $
+ * $Id: install.c,v 1.205 1998/02/10 18:31:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -573,13 +573,11 @@ nodisks:
     configRC_conf("/etc/rc.conf");
     sync();
 
-#ifndef USE_XIG_ENVIRONMENT
     if (directory_exists("/usr/X11R6")) {
 	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
 	    configXEnvironment(self);
     }
-#endif
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
@@ -708,11 +706,6 @@ try_media:
     }
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
 
-    /* We always try to install X with the XiG product */
-#ifdef USE_XIG_ENVIRONMENT
-    if (directory_exists("/usr/X11R6"))
-	configXEnvironment(self);
-#endif
     return i | DITEM_RESTORE;
 }
 
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index d69c4bf5fe73..94f6232602eb 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.155 1998/03/07 08:59:27 jkh Exp $
+ * $Id: menus.c,v 1.156 1998/03/09 14:24:21 ache Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -53,7 +53,6 @@ clearSrc(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
-#ifndef USE_XIG_ENVIRONMENT
 static int
 setX11All(dialogMenuItem *self)
 {
@@ -122,7 +121,6 @@ clearX11Fonts(dialogMenuItem *self)
     XF86FontDists = 0;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 #define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
 				   (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
@@ -168,12 +166,8 @@ checkDistMinimum(dialogMenuItem *self)
 static int
 checkDistEverything(dialogMenuItem *self)
 {
-#ifdef USE_XIG_ENVIRONMENT
-    return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL);
-#else
     return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
 	    XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
-#endif
 }
 
 static int
@@ -188,13 +182,11 @@ srcFlagCheck(dialogMenuItem *item)
     return SrcDists;
 }
 
-#ifndef USE_XIG_ENVIRONMENT
 static int
 x11FlagCheck(dialogMenuItem *item)
 {
     return XF86Dists;
 }
-#endif
 
 static int
 checkTrue(dialogMenuItem *item)
@@ -233,9 +225,7 @@ DMenu MenuIndex = {
       { "Dists, User",		"Select average user distribution.",	checkDistUser, distSetUser },
       { "Dists, X User",	"Select average X user distribution.",	checkDistXUser, distSetXUser },
       { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll },
-#ifndef USE_XIG_ENVIRONMENT
       { "Distributions, XFree86","XFree86 distribution menu.",		NULL, distSetXF86 },
-#endif
       { "Documentation",	"Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
       { "Doc, README",		"The distribution README file.",	NULL, dmenuDisplayFile, NULL, "readme" },
       { "Doc, Hardware",	"The distribution hardware guide.",	NULL, dmenuDisplayFile,	NULL, "hardware" },
@@ -284,11 +274,9 @@ DMenu MenuIndex = {
       { "Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { "Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { "User Management",	"Add user and group information.",	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
-#ifndef USE_XIG_ENVIRONMENT
       { "XFree86, Fonts",	"XFree86 Font selection menu.",		NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
       { "XFree86, Server",	"XFree86 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
       { "XFree86, PC98 Server",	"XFree86 PC98 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server },
-#endif
       { NULL } },
 };
 
@@ -438,7 +426,6 @@ DMenu MenuMouse = {
       { NULL } },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 DMenu MenuXF86Config = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Please select the XFree86 configuration tool you want to use.",
@@ -457,7 +444,6 @@ DMenu MenuXF86Config = {
 	NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
       { NULL } },
 };
-#endif
 
 DMenu MenuMediaCDROM = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
@@ -778,13 +764,8 @@ DMenu MenuSubDistributions = {
 	srcFlagCheck,	distSetSrc },
       { "ports",	"The FreeBSD Ports collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
-#ifdef USE_XIG_ENVIRONMENT
-      { "Xaccel",	"The XiG AcceleratedX 3.1 distribution",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XIG_SERVER },
-#else
       { "XFree86",	"The XFree86 3.3.1 distribution",
 	x11FlagCheck,	distSetXF86 },
-#endif
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
       { "Clear",	"Reset all of the above",
@@ -868,7 +849,6 @@ DMenu MenuSrcDistributions = {
       { NULL } },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
     "XFree86 3.3.1 Distribution",
@@ -902,22 +882,18 @@ DMenu MenuXF86SelectCore = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
       { "lib",		"Data files needed at runtime",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
-#ifndef USE_XIG_ENVIRONMENT
       { "lk98",		"Server link kit for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
       { "lkit",		"Server link kit for all other machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
-#endif
       { "man",		"Manual pages",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
       { "prog",		"Programmer's header and library files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
       { "ps",		"Postscript documentation",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
-#ifndef USE_XIG_ENVIRONMENT
       { "set",		"XFree86 Setup Utility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
-#endif
       { "sources",	"XFree86 3.3.1 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
       { "csources",	"XFree86 3.3.1 contrib sources",
@@ -1048,7 +1024,6 @@ Mono servers are particularly well-suited to most LCD displays).",
 	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
       { NULL } }
 };
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 DMenu MenuDiskDevices = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
@@ -1155,11 +1130,7 @@ DMenu MenuConfigure = {
 	NULL,	dmenuSystemCommand, NULL, "passwd root" },
       { "B HTML Docs",	"Go to the HTML documentation menu (post-install)",
 	NULL, docBrowser },
-#ifdef USE_XIG_ENVIRONMENT
-      { "X X + CDE",	"Configure X Window system & CDE environment",
-#else
       { "X XFree86",	"Configure XFree86",
-#endif
 	NULL, configXEnvironment },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 561244fac15e..a939db5a960c 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -19,7 +19,6 @@ SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
 CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
-#CFLAGS+= -DUSE_XIG_ENVIRONMENT
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 3272f5a847b9..e7a07bbe2de5 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.105 1998/03/07 08:59:22 jkh Exp $
+ * $Id: config.c,v 1.106 1998/03/09 08:39:46 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -503,7 +503,6 @@ configUsers(dialogMenuItem *self)
 int
 configXEnvironment(dialogMenuItem *self)
 {
-#ifndef USE_XIG_ENVIRONMENT
     char *config, *execfile;
     char *moused;
 
@@ -544,83 +543,6 @@ configXEnvironment(dialogMenuItem *self)
 		   "The XFree86 distribution before attempting to configure it.");
 	return DITEM_FAILURE | DITEM_RESTORE;
     }
-
-#else	/* USE_XIG_ENVIRONMENT */
-    int i;
-
-    /* Make sure we're sane first */
-    if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") ||
-	!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) {
-	dialog_clear_norefresh();
-	msgConfirm("Hmmm!  It looks like you elected not to install the AccelleratedX\n"
-		   "server package (or the installation failed somehow).  If this was\n"
-		   "an omission rather than an error, please go to the Distributions\n"
-		   "menu, select the Custom distribution options and then choose your X11\n"
-		   "distribution components from the XFree86 menu.  AccelX will be selected\n"
-		   "as the default server automatically.");
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-
-    if (mediaDevice && mediaDevice->type != DEVICE_TYPE_CDROM) {
-	if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
-	    msgConfirm("I can't mount the CDE distribution from CDROM, sorry.\n"
-		       "Please make sure you have the 1st CD of your FreeBSD Desktop/Pro\n"
-		       "distribution in the drive before trying this operation.");
-	    return DITEM_FAILURE | DITEM_RESTORE;
-	}
-    }
-
-    if (!directory_exists("/dist/CDE/")) {
-	msgConfirm("Hmmm!  I can't find the CDE distribution.  Please place the 1st CD of your\n"
-		   "FreeBSD Desktop/Pro distribution in the drive and try this operation again.");
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-
-    /* Pre-extract base sets in kludge to work around chicken-and-egg problem with CDE and Xaccel */
-    if (directory_exists("/dist/CDE/") && !file_readable("/usr/X11R6/bin/xterm")) {
-	msgNotify("Installing bootstrap X11 tools from CDE distribution.");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-RUN/archive -C /");
-	systemExecute("tar xpf /dist/CDE/FreeBSD/packages/X11-PRG/archive -C /");
-    }
-    systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/dt/lib /usr/local/lib /usr/lib/compat");
-
-    dialog_clear_norefresh();
-    msgNotify("Running AcceleratedX 3.1 installation procedure, please wait.");
-    if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) {
-	dialog_clear_norefresh();
-	msgConfirm("Installation procedure failed, error code %d!  Please report\n"
-		   "error to Walnut Creek CDROM tech support (either send email\n"
-		   "to support@cdrom.com or call +1 510 603 1234).  Thank you!", i);
-	return DITEM_FAILURE | DITEM_RESTORE;
-    }
-    else {
-	dialog_clear();
-	systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup");
-    }
-    if (directory_exists("/dist/CDE")) {
-	dialog_clear_norefresh();
-	msgNotify("Running CDE installation - please wait (this may take awhile!).");
-	dialog_clear();
-	clear();
-	refresh();
-	i = systemExecute("(cd /dist/CDE; sh Install)");
-	dialog_clear();
-	if (i) {
-	    msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n"
-		       "To try again, you should run this command manually after the system\n"
-		       "is up (and if your CDROM is mounted in the standard location, the path\n"
-		       "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n");
-	}
-	else {
-	    if (file_readable("/dist/CDE/post-install"))
-		systemExecute("/dist/CDE/post-install");
-	    /* Repair the damage done by the CDE installation */
-	    msgNotify("Doing final adjustments to Xaccel distribution...");
-	    systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall");
-	}
-    }
-    return DITEM_SUCCESS | DITEM_RESTORE;
-#endif	/* USE_XIG_ENVIRONMENT */
 }
 
 void
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 9a7f686a5708..a60ddf374186 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.120 1997/10/13 12:12:14 jkh Exp $
+ * $Id: dist.c,v 1.121 1998/01/23 07:53:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -41,11 +41,9 @@
 unsigned int Dists;
 unsigned int DESDists;
 unsigned int SrcDists;
-#ifndef USE_XIG_ENVIRONMENT
 unsigned int XF86Dists;
 unsigned int XF86ServerDists;
 unsigned int XF86FontDists;
-#endif
 
 typedef struct _dist {
     char *my_name;
@@ -58,11 +56,9 @@ typedef struct _dist {
 extern Distribution DistTable[];
 extern Distribution DESDistTable[];
 extern Distribution SrcDistTable[];
-#ifndef USE_XIG_ENVIRONMENT
 extern Distribution XF86DistTable[];
 extern Distribution XF86FontDistTable[];
 extern Distribution XF86ServerDistTable[];
-#endif
 
 /* The top-level distribution categories */
 static Distribution DistTable[] = {
@@ -80,11 +76,7 @@ static Distribution DistTable[] = {
 { "compat20",	"/",			&Dists,		DIST_COMPAT20,		NULL		},
 { "compat21",	"/",			&Dists,		DIST_COMPAT21,		NULL		},
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
-#ifdef USE_XIG_ENVIRONMENT
-{ "accelx",	"/usr/X11R6/lib/X11",	&Dists,		DIST_XIG_SERVER,	NULL		},
-#else
 { "XF86331",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
-#endif
 { NULL },
 };
 
@@ -120,7 +112,6 @@ static Distribution SrcDistTable[] = {
 { NULL },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
 { "XF86331",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
@@ -183,7 +174,6 @@ static Distribution XF86FontDistTable[] = {
 { "X331fsrv",	"/usr/X11R6",		&XF86FontDists,		DIST_XF86_FONTS_SERVER,	NULL		},
 { NULL },
 };
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 static int	distMaybeSetDES(dialogMenuItem *self);
 static int	distMaybeSetPorts(dialogMenuItem *self);
@@ -199,7 +189,6 @@ distVerifyFlags(void)
 	    DESDists |= DIST_DES_DES;
 	Dists |= DIST_DES;
     }
-#ifndef USE_XIG_ENVIRONMENT
     if (XF86Dists & DIST_XF86_SET)
 	XF86ServerDists |= DIST_XF86_SERVER_VGA16;
     if (XF86ServerDists)
@@ -208,7 +197,6 @@ distVerifyFlags(void)
 	XF86Dists |= DIST_XF86_FONTS;
     if (XF86Dists)
 	Dists |= (DIST_XF86 | DIST_COMPAT21);
-#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);
@@ -220,11 +208,9 @@ distReset(dialogMenuItem *self)
     Dists = 0;
     DESDists = 0;
     SrcDists = 0;
-#ifndef USE_XIG_ENVIRONMENT
     XF86Dists = 0;
     XF86ServerDists = 0;
     XF86FontDists = 0;
-#endif
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -244,7 +230,6 @@ distConfig(dialogMenuItem *self)
     if ((cp = variable_get(VAR_DIST_SRC)) != NULL)
 	SrcDists = atoi(cp);
 
-#ifndef	USE_XIG_ENVIRONMENT
     if ((cp = variable_get(VAR_DIST_X11)) != NULL)
 	XF86Dists = atoi(cp);
 
@@ -253,7 +238,6 @@ distConfig(dialogMenuItem *self)
 
     if ((cp = variable_get(VAR_DIST_XFONTS)) != NULL)
 	XF86FontDists = atoi(cp);
-#endif
     distVerifyFlags();
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
@@ -279,13 +263,9 @@ distSetXDeveloper(dialogMenuItem *self)
     distReset(NULL);
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_ALL;
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
     XF86FontDists = DIST_XF86_FONTS_MISC;
-#endif
     i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
@@ -323,13 +303,9 @@ distSetXUser(dialogMenuItem *self)
 
     distReset(NULL);
     Dists = _DIST_USER;
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
     XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86FontDists = DIST_XF86_FONTS_MISC;
-#endif
     i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
@@ -350,13 +326,9 @@ distSetEverything(dialogMenuItem *self)
 
     Dists = DIST_ALL;
     SrcDists = DIST_SRC_ALL;
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     XF86Dists = DIST_XF86_ALL;
     XF86ServerDists = DIST_XF86_SERVER_ALL;
     XF86FontDists = DIST_XF86_FONTS_ALL;
-#endif
     i = distMaybeSetDES(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
@@ -487,12 +459,8 @@ distSetXF86(dialogMenuItem *self)
 {
     int i = DITEM_SUCCESS;
 
-#ifdef USE_XIG_ENVIRONMENT
-    Dists |= (DIST_XIG_SERVER | DIST_COMPAT21);
-#else
     if (!dmenuOpenSimple(&MenuXF86Select, FALSE))
 	i = DITEM_FAILURE;
-#endif
     distVerifyFlags();
     return i | DITEM_RESTORE;
 }
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 2da05df31135..bdecdbd98a75 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -17,11 +17,7 @@
 #define DIST_DES		0x1000
 #define DIST_CATPAGES		0x2000
 #define DIST_PORTS		0x4000
-#ifdef USE_XIG_ENVIRONMENT
-#define DIST_XIG_SERVER		0x8000
-#else
 #define DIST_USR1		0x8000
-#endif
 #define DIST_ALL		0x7FFF
 
 /* Canned distribution sets */
@@ -58,7 +54,6 @@
 #define DIST_SRC_SMAILCF	0x10000
 #define DIST_SRC_ALL		0xFFFF	/* no SMAILCF, it's part of USBIN */
 
-#ifndef USE_XIG_ENVIRONMENT
 /* Subtypes for XFree86 distribution */
 #define DIST_XF86_BIN		0x0001
 #define DIST_XF86_CFG		0x0002
@@ -112,6 +107,5 @@
 #define DIST_XF86_FONTS_SERVER		0x0020
 #define DIST_XF86_FONTS_ALL		0x003F
 #define DIST_XF86_ALL		0x1FFFF
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 #endif	/* _DIST_H_INCLUDE */
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 6c989f9d0b0c..c51e10ca7065 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.204 1998/01/16 15:07:55 jkh Exp $
+ * $Id: install.c,v 1.205 1998/02/10 18:31:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -573,13 +573,11 @@ nodisks:
     configRC_conf("/etc/rc.conf");
     sync();
 
-#ifndef USE_XIG_ENVIRONMENT
     if (directory_exists("/usr/X11R6")) {
 	dialog_clear_norefresh();
 	if (!msgYesNo("Would you like to configure your X server at this time?"))
 	    configXEnvironment(self);
     }
-#endif
 
     dialog_clear_norefresh();
     if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n"
@@ -708,11 +706,6 @@ try_media:
     }
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
 
-    /* We always try to install X with the XiG product */
-#ifdef USE_XIG_ENVIRONMENT
-    if (directory_exists("/usr/X11R6"))
-	configXEnvironment(self);
-#endif
     return i | DITEM_RESTORE;
 }
 
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index d69c4bf5fe73..94f6232602eb 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.155 1998/03/07 08:59:27 jkh Exp $
+ * $Id: menus.c,v 1.156 1998/03/09 14:24:21 ache Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -53,7 +53,6 @@ clearSrc(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
-#ifndef USE_XIG_ENVIRONMENT
 static int
 setX11All(dialogMenuItem *self)
 {
@@ -122,7 +121,6 @@ clearX11Fonts(dialogMenuItem *self)
     XF86FontDists = 0;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 #define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
 				   (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
@@ -168,12 +166,8 @@ checkDistMinimum(dialogMenuItem *self)
 static int
 checkDistEverything(dialogMenuItem *self)
 {
-#ifdef USE_XIG_ENVIRONMENT
-    return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL);
-#else
     return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
 	    XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
-#endif
 }
 
 static int
@@ -188,13 +182,11 @@ srcFlagCheck(dialogMenuItem *item)
     return SrcDists;
 }
 
-#ifndef USE_XIG_ENVIRONMENT
 static int
 x11FlagCheck(dialogMenuItem *item)
 {
     return XF86Dists;
 }
-#endif
 
 static int
 checkTrue(dialogMenuItem *item)
@@ -233,9 +225,7 @@ DMenu MenuIndex = {
       { "Dists, User",		"Select average user distribution.",	checkDistUser, distSetUser },
       { "Dists, X User",	"Select average X user distribution.",	checkDistXUser, distSetXUser },
       { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll },
-#ifndef USE_XIG_ENVIRONMENT
       { "Distributions, XFree86","XFree86 distribution menu.",		NULL, distSetXF86 },
-#endif
       { "Documentation",	"Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
       { "Doc, README",		"The distribution README file.",	NULL, dmenuDisplayFile, NULL, "readme" },
       { "Doc, Hardware",	"The distribution hardware guide.",	NULL, dmenuDisplayFile,	NULL, "hardware" },
@@ -284,11 +274,9 @@ DMenu MenuIndex = {
       { "Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { "Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },
       { "User Management",	"Add user and group information.",	NULL, dmenuSubmenu, NULL, &MenuUsermgmt },
-#ifndef USE_XIG_ENVIRONMENT
       { "XFree86, Fonts",	"XFree86 Font selection menu.",		NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts },
       { "XFree86, Server",	"XFree86 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer },
       { "XFree86, PC98 Server",	"XFree86 PC98 Server selection menu.",	NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server },
-#endif
       { NULL } },
 };
 
@@ -438,7 +426,6 @@ DMenu MenuMouse = {
       { NULL } },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 DMenu MenuXF86Config = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Please select the XFree86 configuration tool you want to use.",
@@ -457,7 +444,6 @@ DMenu MenuXF86Config = {
 	NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" },
       { NULL } },
 };
-#endif
 
 DMenu MenuMediaCDROM = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
@@ -778,13 +764,8 @@ DMenu MenuSubDistributions = {
 	srcFlagCheck,	distSetSrc },
       { "ports",	"The FreeBSD Ports collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
-#ifdef USE_XIG_ENVIRONMENT
-      { "Xaccel",	"The XiG AcceleratedX 3.1 distribution",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XIG_SERVER },
-#else
       { "XFree86",	"The XFree86 3.3.1 distribution",
 	x11FlagCheck,	distSetXF86 },
-#endif
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
       { "Clear",	"Reset all of the above",
@@ -868,7 +849,6 @@ DMenu MenuSrcDistributions = {
       { NULL } },
 };
 
-#ifndef USE_XIG_ENVIRONMENT
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
     "XFree86 3.3.1 Distribution",
@@ -902,22 +882,18 @@ DMenu MenuXF86SelectCore = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
       { "lib",		"Data files needed at runtime",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
-#ifndef USE_XIG_ENVIRONMENT
       { "lk98",		"Server link kit for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
       { "lkit",		"Server link kit for all other machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
-#endif
       { "man",		"Manual pages",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
       { "prog",		"Programmer's header and library files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
       { "ps",		"Postscript documentation",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
-#ifndef USE_XIG_ENVIRONMENT
       { "set",		"XFree86 Setup Utility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
-#endif
       { "sources",	"XFree86 3.3.1 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
       { "csources",	"XFree86 3.3.1 contrib sources",
@@ -1048,7 +1024,6 @@ Mono servers are particularly well-suited to most LCD displays).",
 	checkTrue,	dmenuExit, NULL, NULL, '<', '<', '<' },
       { NULL } }
 };
-#endif	/* !USE_XIG_ENVIRONMENT */
 
 DMenu MenuDiskDevices = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
@@ -1155,11 +1130,7 @@ DMenu MenuConfigure = {
 	NULL,	dmenuSystemCommand, NULL, "passwd root" },
       { "B HTML Docs",	"Go to the HTML documentation menu (post-install)",
 	NULL, docBrowser },
-#ifdef USE_XIG_ENVIRONMENT
-      { "X X + CDE",	"Configure X Window system & CDE environment",
-#else
       { "X XFree86",	"Configure XFree86",
-#endif
 	NULL, configXEnvironment },
       { "D Distributions", "Install additional distribution sets",
 	NULL, distExtractAll },