Update X11 dists for xorg-7.3 layout.

X-MFC-after:	Insta-MFC may be coming so this can get into 6.3-BETA2.

3 files changed, 4 insertions, 12 deletions

diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 37f210f..6d8b102 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -133,10 +133,9 @@ static Distribution SrcDistTable[] = {
 
 /* The X.Org distribution */
 static Distribution XOrgDistTable[] = {
-    DTE_PACKAGE("Xbin",	 &XOrgDists, XORG_CLIENTS,	 "xorg-clients"),
+    DTE_PACKAGE("Xbin",	 &XOrgDists, XORG_APPS,		 "xorg-apps"),
     DTE_PACKAGE("Xlib",	 &XOrgDists, XORG_LIB,		 "xorg-libraries"),
-    DTE_PACKAGE("Xman",	 &XOrgDists, XORG_MAN,		 "xorg-manpages"),
-    DTE_PACKAGE("Xdoc",  &XOrgDists, XORG_DOC,		 "xorg-documents"),
+    DTE_PACKAGE("Xdoc",  &XOrgDists, XORG_DOC,		 "xorg-docs"),
     DTE_PACKAGE("Xprog", &XOrgDists, XORG_IMAKE,	 "imake"),
 
     DTE_PACKAGE("Xsrv",  &XOrgDists, XORG_SERVER,	 "xorg-server"),
@@ -150,7 +149,6 @@ static Distribution XOrgDistTable[] = {
     DTE_PACKAGE("Xfcyr", &XOrgDists, XORG_FONTS_CYR,	 "xorg-fonts-cyrillic"),
     DTE_PACKAGE("Xft1",  &XOrgDists, XORG_FONTS_T1,	 "xorg-fonts-type1"),
     DTE_PACKAGE("Xftt",  &XOrgDists, XORG_FONTS_TT,	 "xorg-fonts-truetype"),
-    DTE_PACKAGE("Xfs",   &XOrgDists, XORG_FONTSERVER,	 "xorg-fontserver"),
     DTE_END,
 };
 
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 20ee45a..08ff326 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -47,9 +47,8 @@
 #define DIST_SRC_ALL		0x1FFFFF
 
 /* Subtypes for X.Org packages */
-#define	DIST_XORG_CLIENTS	0x000001
+#define	DIST_XORG_APPS		0x000001
 #define	DIST_XORG_LIB		0x000002
-#define DIST_XORG_MAN		0x000004
 #define DIST_XORG_DOC		0x000008
 #define DIST_XORG_IMAKE		0x000010
 
@@ -64,7 +63,6 @@
 #define DIST_XORG_FONTS_CYR	0x080000
 #define DIST_XORG_FONTS_T1	0x100000
 #define DIST_XORG_FONTS_TT	0x200000
-#define DIST_XORG_FONTSERVER	0x400000
 
 #define	DIST_XORG_MISC_ALL	0x00001f
 #define	DIST_XORG_SERVER_ALL	0x000f00
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 460d66d..a4277e8 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -1189,9 +1189,7 @@ DMenu MenuXOrgSelectCore = {
       { " lib",         "Shared libraries and data files needed at runtime",
 	dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_LIB },
       { " bin", 	"Client applications",
-	dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_CLIENTS },
-      { " man",         "Manual pages",
-	dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_MAN },
+	dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_APPS },
       { " doc",         "Documentation",
 	dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_DOC },
       { " prog",        "Programming tools",
@@ -1228,8 +1226,6 @@ configurations.",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_T1 },
       { " ftt",		"TrueType scalable fonts",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_TT },
-      { " fs",		"Font server",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTSERVER },
       { NULL } },
 };