d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update X11 dists for xorg-7.3 layout.

Browse Source 
X-MFC-after:	Insta-MFC may be coming so this can get into 6.3-BETA2.
This commit is contained in:
Ken Smith 2007-11-08 15:40:40 +00:00
parent f53d15fe1b
commit c8e793828f
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sysinstall/dist.c
View File

@ -133,10 +133,9 @@ static Distribution SrcDistTable[] = {
/* The X.Org distribution */ /* The X.Org distribution */
static Distribution XOrgDistTable[] = { 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("Xlib", &XOrgDists, XORG_LIB, "xorg-libraries"),
DTE_PACKAGE("Xman", &XOrgDists, XORG_MAN, "xorg-manpages"), DTE_PACKAGE("Xdoc", &XOrgDists, XORG_DOC, "xorg-docs"),
DTE_PACKAGE("Xdoc", &XOrgDists, XORG_DOC, "xorg-documents"),
DTE_PACKAGE("Xprog", &XOrgDists, XORG_IMAKE, "imake"), DTE_PACKAGE("Xprog", &XOrgDists, XORG_IMAKE, "imake"),
DTE_PACKAGE("Xsrv", &XOrgDists, XORG_SERVER, "xorg-server"), 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("Xfcyr", &XOrgDists, XORG_FONTS_CYR, "xorg-fonts-cyrillic"),
DTE_PACKAGE("Xft1", &XOrgDists, XORG_FONTS_T1, "xorg-fonts-type1"), DTE_PACKAGE("Xft1", &XOrgDists, XORG_FONTS_T1, "xorg-fonts-type1"),
DTE_PACKAGE("Xftt", &XOrgDists, XORG_FONTS_TT, "xorg-fonts-truetype"), DTE_PACKAGE("Xftt", &XOrgDists, XORG_FONTS_TT, "xorg-fonts-truetype"),
DTE_PACKAGE("Xfs", &XOrgDists, XORG_FONTSERVER, "xorg-fontserver"),
DTE_END, DTE_END,
}; };

4
usr.sbin/sysinstall/dist.h
View File

@ -47,9 +47,8 @@
#define DIST_SRC_ALL 0x1FFFFF #define DIST_SRC_ALL 0x1FFFFF
/* Subtypes for X.Org packages */ /* Subtypes for X.Org packages */
#define DIST_XORG_CLIENTS 0x000001 #define DIST_XORG_APPS 0x000001
#define DIST_XORG_LIB 0x000002 #define DIST_XORG_LIB 0x000002
#define DIST_XORG_MAN 0x000004
#define DIST_XORG_DOC 0x000008 #define DIST_XORG_DOC 0x000008
#define DIST_XORG_IMAKE 0x000010 #define DIST_XORG_IMAKE 0x000010
@ -64,7 +63,6 @@
#define DIST_XORG_FONTS_CYR 0x080000 #define DIST_XORG_FONTS_CYR 0x080000
#define DIST_XORG_FONTS_T1 0x100000 #define DIST_XORG_FONTS_T1 0x100000
#define DIST_XORG_FONTS_TT 0x200000 #define DIST_XORG_FONTS_TT 0x200000
#define DIST_XORG_FONTSERVER 0x400000
#define DIST_XORG_MISC_ALL 0x00001f #define DIST_XORG_MISC_ALL 0x00001f
#define DIST_XORG_SERVER_ALL 0x000f00 #define DIST_XORG_SERVER_ALL 0x000f00

6
usr.sbin/sysinstall/menus.c
View File

@ -1189,9 +1189,7 @@ DMenu MenuXOrgSelectCore = {
{ " lib", "Shared libraries and data files needed at runtime", { " lib", "Shared libraries and data files needed at runtime",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_LIB }, dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_LIB },
{ " bin", "Client applications", { " bin", "Client applications",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_CLIENTS }, dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_APPS },
{ " man", "Manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_MAN },
{ " doc", "Documentation", { " doc", "Documentation",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_DOC }, dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_DOC },
{ " prog", "Programming tools", { " prog", "Programming tools",
@ -1228,8 +1226,6 @@ configurations.",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_T1 }, dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_T1 },
{ " ftt", "TrueType scalable fonts", { " ftt", "TrueType scalable fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_TT }, dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTS_TT },
{ " fs", "Font server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_FONTSERVER },
{ NULL } }, { NULL } },
}; };