svn commit: r381951 - in head: Mk x11-servers/xorg-nestserver x11-servers/xorg-server x11-servers/xorg-vfbserver

[Baptiste Daroussin]

Author: bapt
Date: Sun Mar 22 19:49:09 2015
New Revision: 381951
URL: https://svnweb.freebsd.org/changeset/ports/381951
QAT: https://qat.redports.org/buildarchive/r381951/

Log:
  Disable fontpath.d support as it overwrites the default fontrootdir making non
  fontconfig application like xcalc not to find their fonts
  
  Reported by:	Jakub Lach <jakub_lach at mailplus.pl>, Stefan Thurner <stthur at gmail.com>

Modified:
  head/Mk/bsd.xorg.mk
  head/x11-servers/xorg-nestserver/Makefile
  head/x11-servers/xorg-server/Makefile
  head/x11-servers/xorg-vfbserver/Makefile

Modified: head/Mk/bsd.xorg.mk
==============================================================================
--- head/Mk/bsd.xorg.mk	Sun Mar 22 19:41:44 2015	(r381950)
+++ head/Mk/bsd.xorg.mk	Sun Mar 22 19:49:09 2015	(r381951)
@@ -96,8 +96,7 @@ DISTFILES?=	xorg-server-${PORTVERSION}.t
 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

Modified: head/x11-servers/xorg-nestserver/Makefile
==============================================================================
--- head/x11-servers/xorg-nestserver/Makefile	Sun Mar 22 19:41:44 2015	(r381950)
+++ head/x11-servers/xorg-nestserver/Makefile	Sun Mar 22 19:49:09 2015	(r381951)
@@ -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 \

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Sun Mar 22 19:41:44 2015	(r381950)
+++ head/x11-servers/xorg-server/Makefile	Sun Mar 22 19:49:09 2015	(r381951)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION=	1.14.7
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG

Modified: head/x11-servers/xorg-vfbserver/Makefile
==============================================================================
--- head/x11-servers/xorg-vfbserver/Makefile	Sun Mar 22 19:41:44 2015	(r381950)
+++ head/x11-servers/xorg-vfbserver/Makefile	Sun Mar 22 19:49:09 2015	(r381951)
@@ -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 \