From owner-svn-ports-all@FreeBSD.ORG Fri Dec 6 18:57:56 2013 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B0EED1BB; Fri, 6 Dec 2013 18:57:56 +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 9CF7B1702; Fri, 6 Dec 2013 18:57:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6IvuRK084151; Fri, 6 Dec 2013 18:57:56 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6IvuEI084148; Fri, 6 Dec 2013 18:57:56 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312061857.rB6IvuEI084148@svn.freebsd.org> From: Koop Mast Date: Fri, 6 Dec 2013 18:57:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335782 - in head/print/libgnomeprint: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 06 Dec 2013 18:57:56 -0000 Author: kwm Date: Fri Dec 6 18:57:55 2013 New Revision: 335782 URL: http://svnweb.freebsd.org/changeset/ports/335782 Log: Add patches to fix the build with freetype 2.5.1. Stageify, use new lib_depend syntax. Added: head/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c (contents, props changed) head/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c (contents, props changed) Modified: head/print/libgnomeprint/Makefile Modified: head/print/libgnomeprint/Makefile ============================================================================== --- head/print/libgnomeprint/Makefile Fri Dec 6 18:45:13 2013 (r335781) +++ head/print/libgnomeprint/Makefile Fri Dec 6 18:57:55 2013 (r335782) @@ -16,8 +16,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - popt:${PORTSDIR}/devel/popt +LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ + libpopt.so:${PORTSDIR}/devel/popt USES= bison pathfix gettext gmake pkgconfig USE_GNOME= gnomeprefix intlhack gnomehier glib20 pango libxml2 \ @@ -33,12 +33,11 @@ PLIST_SUB= VERSION=${PORTVERSION} \ OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT=CUPS -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCUPS} CONFIGURE_ARGS+= --with-cups -LIB_DEPENDS+= gnomecups-1:${PORTSDIR}/print/libgnomecups +LIB_DEPENDS+= libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" .else CONFIGURE_ARGS+= --without-cups @@ -52,8 +51,11 @@ post-patch: @${REINPLACE_CMD} -e "/^SUBDIRS =/s|doc||" ${WRKSRC}/Makefile.in post-install: - @${MKDIR} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts - @${TOUCH} ${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts + @${TOUCH} ${STAGEDIR}${PREFIX}/etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint-2-2.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint/2.18.8/modules/*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomeprint/2.18.8/modules/*/*.so .include Added: head/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/libgnomeprint/files/patch-libgnomeprint_gnome-font-face.c Fri Dec 6 18:57:55 2013 (r335782) @@ -0,0 +1,12 @@ +--- libgnomeprint/gnome-font-face.c.orig 2013-12-06 19:26:26.000000000 +0100 ++++ libgnomeprint/gnome-font-face.c 2013-12-06 19:27:43.000000000 +0100 +@@ -36,7 +36,8 @@ + #include + #include + +-#include ++#include ++#include FT_OUTLINE_H + + #include + #include Added: head/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/libgnomeprint/files/patch-libgnomeprint_gnome-rfont.c Fri Dec 6 18:57:55 2013 (r335782) @@ -0,0 +1,14 @@ +--- libgnomeprint/gnome-rfont.c.orig 2013-12-06 19:28:40.000000000 +0100 ++++ libgnomeprint/gnome-rfont.c 2013-12-06 19:29:56.000000000 +0100 +@@ -27,9 +27,8 @@ + #include + + #include +-#include FT_FREETYPE_H +-#include +-#include ++#include FT_GLYPH_H ++#include FT_BBOX_H + #include + #include + #include