From owner-svn-ports-head@FreeBSD.ORG Thu Dec 5 18:27:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABB9663B; Thu, 5 Dec 2013 18:27:04 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7DBBD11B2; Thu, 5 Dec 2013 18:27:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5IR3Gw089001; Thu, 5 Dec 2013 18:27:03 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5IR3aU088985; Thu, 5 Dec 2013 18:27:03 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312051827.rB5IR3aU088985@svn.freebsd.org> From: Koop Mast Date: Thu, 5 Dec 2013 18:27:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335678 - in head/x11-fonts/libXft: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Dec 2013 18:27:04 -0000 Author: kwm Date: Thu Dec 5 18:27:03 2013 New Revision: 335678 URL: http://svnweb.freebsd.org/changeset/ports/335678 Log: Add patch to fix build with freetype 2.5.1. Use a LIB_DEPEND line to replace a RUN_/BUILD_ lines for fontconfig. Stageify. Added: head/x11-fonts/libXft/files/patch-src_xftglyphs.c (contents, props changed) Modified: head/x11-fonts/libXft/Makefile head/x11-fonts/libXft/pkg-plist Modified: head/x11-fonts/libXft/Makefile ============================================================================== --- head/x11-fonts/libXft/Makefile Thu Dec 5 18:04:43 2013 (r335677) +++ head/x11-fonts/libXft/Makefile Thu Dec 5 18:27:03 2013 (r335678) @@ -7,16 +7,12 @@ CATEGORIES= x11-fonts MAINTAINER= gnome@FreeBSD.org COMMENT= Client-sided font API for X applications -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 -BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig XORG_CAT= lib USE_XORG= xproto:both xrender -MAN3= Xft.3 - -NO_STAGE= yes post-extract: @${CP} ${FILESDIR}/xft-config.in \ ${WRKSRC}/xft-config.in @@ -27,6 +23,7 @@ post-patch: post-install: @${INSTALL_SCRIPT} ${WRKSRC}/xft-config \ - ${PREFIX}/bin/ + ${STAGEDIR}${PREFIX}/bin/ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXft.so.2 .include Added: head/x11-fonts/libXft/files/patch-src_xftglyphs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/libXft/files/patch-src_xftglyphs.c Thu Dec 5 18:27:03 2013 (r335678) @@ -0,0 +1,17 @@ +--- src/xftglyphs.c.orig 2012-06-02 18:36:35.000000000 +0200 ++++ src/xftglyphs.c 2013-12-05 16:57:20.000000000 +0100 +@@ -21,10 +21,11 @@ + */ + + #include "xftint.h" +-#include +-#include + +-#include ++#include ++#include FT_OUTLINE_H ++#include FT_LCD_FILTER_H ++#include FT_SYNTHESIS_H + + /* + * Validate the memory info for a font Modified: head/x11-fonts/libXft/pkg-plist ============================================================================== --- head/x11-fonts/libXft/pkg-plist Thu Dec 5 18:04:43 2013 (r335677) +++ head/x11-fonts/libXft/pkg-plist Thu Dec 5 18:27:03 2013 (r335678) @@ -6,4 +6,5 @@ lib/libXft.la lib/libXft.so lib/libXft.so.2 libdata/pkgconfig/xft.pc +man/man3/Xft.3.gz @dirrm include/X11/Xft