From owner-svn-ports-all@FreeBSD.ORG Sun Mar 22 19:49:11 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5A5A462; Sun, 22 Mar 2015 19:49:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0271C66; Sun, 22 Mar 2015 19:49:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MJnBX1077467; Sun, 22 Mar 2015 19:49:11 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MJnADA077463; Sun, 22 Mar 2015 19:49:10 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503221949.t2MJnADA077463@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 22 Mar 2015 19:49:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381951 - in head: Mk x11-servers/xorg-nestserver x11-servers/xorg-server x11-servers/xorg-vfbserver X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2015 19:49:12 -0000 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 , Stefan Thurner 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 \