From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 30 13:58:28 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7FBB1E8E;
 Mon, 30 Dec 2013 13:58:28 +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 6B01B1E83;
 Mon, 30 Dec 2013 13:58:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBUDwSE8049866;
 Mon, 30 Dec 2013 13:58:28 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBUDwSJA049865;
 Mon, 30 Dec 2013 13:58:28 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201312301358.rBUDwSJA049865@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Mon, 30 Dec 2013 13:58:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338115 - head/graphics/xpaint
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Dec 2013 13:58:28 -0000

Author: johans
Date: Mon Dec 30 13:58:27 2013
New Revision: 338115
URL: http://svnweb.freebsd.org/changeset/ports/338115

Log:
  Fix build issue with freetype (again), hopefully now working for all versions

Modified:
  head/graphics/xpaint/Makefile

Modified: head/graphics/xpaint/Makefile
==============================================================================
--- head/graphics/xpaint/Makefile	Mon Dec 30 13:40:51 2013	(r338114)
+++ head/graphics/xpaint/Makefile	Mon Dec 30 13:58:27 2013	(r338115)
@@ -30,7 +30,8 @@ GNU_CONFIGURE=	yes
 USES=		shebangfix
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+		-I${LOCALBASE}/include/freetype2/freetype
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	RM="${RM} -f"
 
@@ -39,6 +40,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-ldl //' \
+		-e 's|freetype/||g' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \
 		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \