diff options
| author | madpilot <madpilot@FreeBSD.org> | 2013-06-04 04:39:41 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2013-06-04 04:39:41 +0800 |
| commit | 0dec9047003e3ab54f73d31ef5c7e8c203f8e76e (patch) | |
| tree | 3846bf873684657cd2cdae823f8058c00ce8a5bd | |
| parent | 777f20cae4bc95b836875e9a9b1aca56a7c91b9c (diff) | |
| download | freebsd-ports-gnome-0dec9047003e3ab54f73d31ef5c7e8c203f8e76e.tar.gz freebsd-ports-gnome-0dec9047003e3ab54f73d31ef5c7e8c203f8e76e.tar.zst freebsd-ports-gnome-0dec9047003e3ab54f73d31ef5c7e8c203f8e76e.zip | |
- 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@rambler.ru> (maintainer)
| -rw-r--r-- | graphics/mapnik/Makefile | 9 | ||||
| -rw-r--r-- | graphics/mapnik/files/patch-plugins-input-python-build.py | 12 | ||||
| -rw-r--r-- | graphics/mapnik/pkg-descr | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 24ca0e3a94dd..467d0492ae63 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -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/proj \ 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 diff --git a/graphics/mapnik/files/patch-plugins-input-python-build.py b/graphics/mapnik/files/patch-plugins-input-python-build.py new file mode 100644 index 000000000000..13791b33edae --- /dev/null +++ b/graphics/mapnik/files/patch-plugins-input-python-build.py @@ -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 diff --git a/graphics/mapnik/pkg-descr b/graphics/mapnik/pkg-descr index 7a59c514f313..499f9f4ead89 100644 --- a/graphics/mapnik/pkg-descr +++ b/graphics/mapnik/pkg-descr @@ -12,4 +12,4 @@ access, regular expressions, parsing and so on, Mapnik doesn't re-invent the wheel, but utilizes best of breed industry standard libraries from boost.org. -WWW: http://www.mapnik.org/ +WWW: http://www.mapnik.org/ |