diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-22 19:49:09 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-22 19:49:09 +0000 |
| commit | 66d439f626997fffc175a2c19180f3014b0e9442 (patch) | |
| tree | 6083fa1d825dd19c7fc9778b13edb446af71a40c | |
| parent | 6faf9b65ab0e0621394262181c71c5db839b61e6 (diff) | |
Notes
| -rw-r--r-- | Mk/bsd.xorg.mk | 3 | ||||
| -rw-r--r-- | x11-servers/xorg-nestserver/Makefile | 5 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-vfbserver/Makefile | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 3aa18c3c60c0..e7d9bbfec98d 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -96,8 +96,7 @@ DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} USES+= pathfix CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb \ - --with-fontrootdir=${LOCALBASE}/share/fonts \ - --with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins" + --with-fontrootdir=${LOCALBASE}/share/fonts LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto fontutil:build diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index fc71f8891ca6..05d1134acd68 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -3,7 +3,7 @@ PORTNAME= xorg-nestserver PORTVERSION= 1.14.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG @@ -41,8 +41,7 @@ CONFIGURE_ARGS= --disable-dmx \ --disable-vbe \ --disable-vgahw \ --disable-xvfb \ - --with-fontrootdir=${PREFIX}/share/fonts \ - --with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins" + --with-fontrootdir=${PREFIX}/share/fonts USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto inputproto \ diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index dd566bd9080c..b4c539150142 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION= 1.14.7 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index f46ce8012867..9cff2e2588d1 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -41,8 +41,7 @@ CONFIGURE_ARGS= --disable-dmx \ --disable-vbe \ --disable-vgahw \ --enable-xvfb \ - --with-fontrootdir=${PREFIX}/share/fonts \ - --with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins" + --with-fontrootdir=${PREFIX}/share/fonts USE_XORG= pixman x11 fixesproto damageproto xcmiscproto xtrans \ bigreqsproto randrproto renderproto xextproto inputproto \ |