From owner-svn-ports-all@FreeBSD.ORG  Fri Jul 11 21:33:20 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 341EE38D;
 Fri, 11 Jul 2014 21:33:20 +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 2199F2962;
 Fri, 11 Jul 2014 21:33:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BLXKcj052106;
 Fri, 11 Jul 2014 21:33:20 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BLXJW8052104;
 Fri, 11 Jul 2014 21:33:19 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201407112133.s6BLXJW8052104@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Fri, 11 Jul 2014 21:33:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361586 - head/graphics/mapnik
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
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jul 2014 21:33:20 -0000

Author: marino
Date: Fri Jul 11 21:33:19 2014
New Revision: 361586
URL: http://svnweb.freebsd.org/changeset/ports/361586
QAT: https://qat.redports.org/buildarchive/r361586/

Log:
  graphics/mapnik: fix build with graphics/agg is installed
  
  PR: 		189943
  Submitted by:	brfr (metrico.lu)
  Patch by:	maintainer (Aleksey Illarionov)

Modified:
  head/graphics/mapnik/Makefile

Modified: head/graphics/mapnik/Makefile
==============================================================================
--- head/graphics/mapnik/Makefile	Fri Jul 11 21:11:13 2014	(r361585)
+++ head/graphics/mapnik/Makefile	Fri Jul 11 21:33:19 2014	(r361586)
@@ -4,7 +4,7 @@
 PORTNAME=	mapnik
 PORTVERSION=	2.2.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
 
@@ -21,8 +21,7 @@ LIB_DEPENDS=	libproj.so:${PORTSDIR}/grap
 BUILD_DEPENDS=	${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \
 		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu
 
-USE_BZIP2=	yes
-USES=		pkgconfig scons
+USES=		pkgconfig scons tar:bzip2
 USE_GNOME=	libxml2
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
@@ -116,9 +115,6 @@ MAKE_ARGS+=	TIFF=False
 IGNORE=		does not install: runs out of virtual memory
 .endif
 
-MAKE_ARGS+=	CUSTOM_CFLAGS=-I${LOCALBASE}/include
-MAKE_ARGS+=	CUSTOM_CXXFLAGS=-I${LOCALBASE}/include
-MAKE_ARGS+=	CUSTOM_LDFLAGS=-L${LOCALBASE}/lib
 MAKE_ARGS+=	WARNING_CXXFLAGS=${WARNING_CXXFLAGS}
 MAKE_ARGS+=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`"
 MAKE_ARGS+=	JOBS=${MAKE_JOBS_NUMBER}
@@ -137,6 +133,7 @@ pre-configure:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
+		-e 's#/usr/include#${LOCALBASE}/include#g' \
 		${WRKSRC}/SConstruct
 
 post-install: