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

MFC v1.253 of dist.c and v1.71 of dist.h:

Browse Source 
> A few more adjustments needed because of changes in xorg.  Just installing
> xorg-server doesn't include any video drivers so install xorg-drivers as
> well.  And if font-alias isn't installed the X server won't start,
> complaining it can't find the font "fixed".
This commit is contained in:
kensmith 2007-12-17 23:43:42 +00:00
parent 33cff6a11c
commit 26c3492fe1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,7 @@ static Distribution XOrgDistTable[] = {
DTE_PACKAGE("Xprog", &XOrgDists, XORG_IMAKE, "imake"),
DTE_PACKAGE("Xsrv", &XOrgDists, XORG_SERVER, "xorg-server"),
DTE_PACKAGE("Xdrv", &XOrgDists, XORG_DRIVERS, "xorg-drivers"),
DTE_PACKAGE("Xnest", &XOrgDists, XORG_NESTSERVER, "xorg-nestserver"),
DTE_PACKAGE("Xvfb", &XOrgDists, XORG_VFBSERVER, "xorg-vfbserver"),
@ -147,6 +148,7 @@ 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("Xfali", &XOrgDists, XORG_FONTS_ALIAS, "font-alias"),
DTE_END,
};

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

@ -52,7 +52,8 @@
#define DIST_XORG_IMAKE 0x000010
#define DIST_XORG_SERVER 0x000100
#define DIST_XORG_NESTSERVER 0x000200
#define DIST_XORG_DRIVERS 0x000200
#define DIST_XORG_NESTSERVER 0x000400
#define DIST_XORG_VFBSERVER 0x000800
#define DIST_XORG_FONTS_MISC 0x010000
@ -61,6 +62,7 @@
#define DIST_XORG_FONTS_CYR 0x080000
#define DIST_XORG_FONTS_T1 0x100000
#define DIST_XORG_FONTS_TT 0x200000
#define DIST_XORG_FONTS_ALIAS 0x400000
#define DIST_XORG_MISC_ALL 0x00001f
#define DIST_XORG_SERVER_ALL 0x000f00
@ -77,7 +79,7 @@
#define _DIST_XORG_FONTS_BASE \
(DIST_XORG_FONTS_MISC | DIST_XORG_FONTS_75 | DIST_XORG_FONTS_100 | \
DIST_XORG_FONTS_TT)
DIST_XORG_FONTS_TT | DIST_XORG_FONTS_ALIAS)
#define _DIST_USER \
( DIST_BASE | DIST_KERNEL | DIST_DOC | DIST_MANPAGES | DIST_DICT )