svn commit: r319806 - in head/graphics/mapnik: . files

[Guido Falsi]

Author: madpilot
Date: Mon Jun  3 20:39:41 2013
New Revision: 319806
URL: http://svnweb.freebsd.org/changeset/ports/319806

Log:
  - Remove double dependencies [1]
  - Adopt USES [1]
  - Change tab to space for WWW line in pkg-descr [1]
  - Add patch to fix a rare build failure when using parallel make jobs
  
  PR:		ports/179169 [1]
  Submitted by:	myself
  Approved by:	Aleksey Illarionov <littlesavage at rambler.ru> (maintainer)

Added:
  head/graphics/mapnik/files/patch-plugins-input-python-build.py   (contents, props changed)
Modified:
  head/graphics/mapnik/Makefile
  head/graphics/mapnik/pkg-descr   (contents, props changed)

Modified: head/graphics/mapnik/Makefile
==============================================================================
--- head/graphics/mapnik/Makefile	Mon Jun  3 20:14:07 2013	(r319805)
+++ head/graphics/mapnik/Makefile	Mon Jun  3 20:39:41 2013	(r319806)
@@ -3,8 +3,8 @@
 
 PORTNAME=	mapnik
 PORTVERSION=	2.1.0
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
 
@@ -22,16 +22,15 @@ LIB_DEPENDS=	proj:${PORTSDIR}/graphics/p
 		boost_system:${PORTSDIR}/devel/boost-libs \
 		boost_python:${PORTSDIR}/devel/boost-python-libs
 BUILD_DEPENDS=	${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \
-		icu>=4.2:${PORTSDIR}/devel/icu \
-		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu \
-		boost-libs>=1.47:${PORTSDIR}/devel/boost-libs \
+		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu
 
 USE_BZIP2=	yes
 USE_PYTHON=	2.6+
 USE_LDCONFIG=	yes
 USE_SCONS=	yes
 USE_AUTOTOOLS=	libltdl
-USE_GNOME=	pkgconfig libxml2
+USES=		pkgconfig
+USE_GNOME=	libxml2
 MAKE_JOBS_SAFE=	yes
 WARNING_CXXFLAGS?=	-w
 

Added: head/graphics/mapnik/files/patch-plugins-input-python-build.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/mapnik/files/patch-plugins-input-python-build.py	Mon Jun  3 20:39:41 2013	(r319806)
@@ -0,0 +1,12 @@
+--- plugins/input/python/build.py.orig 2013-06-02 20:28:29.000000000 +0400
++++ plugins/input/python/build.py 2013-06-02 20:29:34.000000000 +0400
+@@ -68,6 +68,9 @@
+ LINKFLAGS=linkflags
+ )
+
++# if the plugin links to libmapnik ensure it is built first
++Depends(TARGET, env.subst('../../../src/%s' % env['MAPNIK_LIB_NAME']))
++
+ # if 'uninstall' is not passed on the command line
+ # then we actually create the install targets that
+ # scons will install if 'install' is passed as an arg

Modified: head/graphics/mapnik/pkg-descr
==============================================================================
--- head/graphics/mapnik/pkg-descr	Mon Jun  3 20:14:07 2013	(r319805)
+++ head/graphics/mapnik/pkg-descr	Mon Jun  3 20:39:41 2013	(r319806)
@@ -12,4 +12,4 @@ access, regular expressions, parsing and
 the wheel, but utilizes best of breed industry standard libraries from
 boost.org.
 
-WWW:	http://www.mapnik.org/
+WWW: http://www.mapnik.org/