svn commit: r361586 - head/graphics/mapnik

[John Marino]

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: