ports/166857: [patch] graphics/mapnik: update to 2.0.1
Alexey Illarionov
littlesavage at rambler.ru
Wed Apr 11 19:50:12 UTC 2012
>Number: 166857
>Category: ports
>Synopsis: [patch] graphics/mapnik: update to 2.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 11 19:50:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Alexey Illarionov
>Release:
>Organization:
>Environment:
>Description:
The attached patch updates graphics/mapnik to 2.0.1 release.
Changes: https://github.com/mapnik/mapnik/wiki/Release2.0.1
Package and library names switched back from "mapnik2" to "mapnik" (https://github.com/mapnik/mapnik/issues/941).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN graphics/mapnik.orig/Makefile graphics/mapnik/Makefile
--- graphics/mapnik.orig/Makefile 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/Makefile 2012-04-11 21:42:33.000000000 +0400
@@ -5,12 +5,11 @@
# $FreeBSD: ports/graphics/mapnik/Makefile,v 1.21 2011/12/28 03:53:49 linimon Exp $
#
-PORTNAME= mapnik2
-PORTVERSION= 2.0.0
+PORTNAME= mapnik
+PORTVERSION= 2.0.1
+DISTVERSIONPREFIX= v
CATEGORIES= graphics geography
-MASTER_SITES= BERLIOS
-MASTER_SITE_SUBDIR= mapnik
-DISTNAME= mapnik-${PORTVERSION}
+MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
MAINTAINER= wenheping at gmail.com
COMMENT= A Free Toolkit For Developing Mapping Applications
@@ -38,8 +37,6 @@
USE_GNOME= pkgconfig libxml2
MAKE_JOBS_SAFE= yes
-CONFLICTS= mapnik-1.*
-
INPUT_PLUGINS= raster shape
OPTIONS= CAIRO "Enable cairo rendering" on \
diff -ruN graphics/mapnik.orig/distinfo graphics/mapnik/distinfo
--- graphics/mapnik.orig/distinfo 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/distinfo 2012-04-11 14:18:17.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (mapnik-2.0.0.tar.bz2) = 036477761e56a4e0ccad58d9426bbde39566aecdb9cb845469c1221292fab6bc
-SIZE (mapnik-2.0.0.tar.bz2) = 12302295
+SHA256 (mapnik-v2.0.1.tar.bz2) = fe3da0b1adbb48f55ebd01ab0e95e5183f512154249f1d407b7e59aa9176ba8c
+SIZE (mapnik-v2.0.1.tar.bz2) = 12018783
diff -ruN graphics/mapnik.orig/files/patch-bindings-python-build.py graphics/mapnik/files/patch-bindings-python-build.py
--- graphics/mapnik.orig/files/patch-bindings-python-build.py 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/files/patch-bindings-python-build.py 1970-01-01 03:00:00.000000000 +0300
@@ -1,13 +0,0 @@
---- bindings/python/build.py.orig 2011-10-08 18:47:26.408387316 +0400
-+++ bindings/python/build.py 2011-10-08 18:49:32.905390831 +0400
-@@ -144,10 +144,6 @@
- os.mkdir('mapnik')
- file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
-
--try:
-- os.chmod('mapnik/paths.py',0666)
--except: pass
--
- # install the core mapnik python files, including '__init__.py' and 'paths.py'
- if 'install' in COMMAND_LINE_TARGETS:
- init_files = glob.glob('mapnik/*.py')
\ No newline at end of file
diff -ruN graphics/mapnik.orig/files/patch-include-mapnik-grid.hpp graphics/mapnik/files/patch-include-mapnik-grid.hpp
--- graphics/mapnik.orig/files/patch-include-mapnik-grid.hpp 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/files/patch-include-mapnik-grid.hpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- include/mapnik/grid/grid.hpp.orig 2011-10-09 13:38:31.962692544 +0400
-+++ include/mapnik/grid/grid.hpp 2011-10-09 13:38:53.371691622 +0400
-@@ -284,7 +284,7 @@
- {
-
- #ifdef MAPNIK_BIG_ENDIAN
-- unsigned a1 = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
-+ unsigned a = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
- #else
- unsigned a = (int)(((rgba1 >> 24) & 0xff) * opacity) & 0xff; // adjust for desired opacity
- #endif
diff -ruN graphics/mapnik.orig/files/patch-src-build.py graphics/mapnik/files/patch-src-build.py
--- graphics/mapnik.orig/files/patch-src-build.py 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/files/patch-src-build.py 2012-04-11 16:04:45.000000000 +0400
@@ -1,27 +1,30 @@
---- src/build.py.orig 2011-09-26 14:30:13.000000000 +0400
-+++ src/build.py 2011-10-08 19:52:17.875391466 +0400
-@@ -79,6 +79,8 @@
+--- src/build.py.orig 2012-04-11 14:29:19.000000000 +0400
++++ src/build.py 2012-04-11 14:34:13.000000000 +0400
+@@ -80,6 +80,8 @@
if env['PLATFORM'] == 'Darwin':
- mapnik_libname = 'libmapnik2.dylib'
+ mapnik_libname = 'libmapnik.dylib'
+elif env['PLATFORM'] == 'FreeBSD':
-+ mapnik_libname = 'libmapnik2.so.' + ("%d" % (ABI_VERSION[0]))
++ mapnik_libname = 'libmapnik.so.' + ("%d" % int(ABI_VERSION[0]))
else:
- mapnik_libname = 'libmapnik2.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1]))
+ mapnik_libname = 'libmapnik.so.' + ("%d.%d" % (int(ABI_VERSION[0]),int(ABI_VERSION[1])))
-@@ -320,7 +322,10 @@
+@@ -326,8 +328,12 @@
+ os.symlink(os.path.basename(src), trgt)
major, minor, micro = ABI_VERSION
-
-- soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
+-
+- soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
++
+ if env['PLATFORM'] == 'FreeBSD':
-+ soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), major)
++ soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), int(major))
+ else:
-+ soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
++ soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
++
target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
if 'uninstall' not in COMMAND_LINE_TARGETS:
-@@ -335,13 +340,17 @@
+@@ -342,13 +348,17 @@
target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(str(mapnik[0])))
if 'uninstall' not in COMMAND_LINE_TARGETS:
if 'install' in COMMAND_LINE_TARGETS:
diff -ruN graphics/mapnik.orig/files/patch-utils-mapnik-config-mapnik-config.template.sh graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh
--- graphics/mapnik.orig/files/patch-utils-mapnik-config-mapnik-config.template.sh 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh 1970-01-01 03:00:00.000000000 +0300
@@ -1,16 +0,0 @@
---- utils/mapnik-config/mapnik-config.template.sh.orig 2011-10-08 20:02:02.011385698 +0400
-+++ utils/mapnik-config/mapnik-config.template.sh 2011-10-08 20:02:21.915390000 +0400
-@@ -48,11 +48,11 @@
- ;;
-
- -v)
-- echo $CONFIG_VERSION
-+ echo $CONFIG_MAPNIK_VERSION
- ;;
-
- --version)
-- echo $CONFIG_VERSION
-+ echo $CONFIG_MAPNIK_VERSION
- ;;
-
- --json)
diff -ruN graphics/mapnik.orig/pkg-plist graphics/mapnik/pkg-plist
--- graphics/mapnik.orig/pkg-plist 2012-04-11 13:53:38.000000000 +0400
+++ graphics/mapnik/pkg-plist 2012-04-11 21:26:05.000000000 +0400
@@ -93,6 +93,7 @@
include/mapnik/box2d.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/css_color_grammar_deprecated.hpp
+include/mapnik/expression.hpp
include/mapnik/expression_evaluator.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/expression_node.hpp
@@ -146,56 +147,47 @@
include/mapnik/warp.hpp
include/mapnik/wkt/wkt_factory.hpp
include/mapnik/wkt/wkt_grammar.hpp
-lib/libmapnik2.so
-lib/libmapnik2.so.2
-%%GDAL%%lib/mapnik2/input/gdal.input
-%%OGR%%lib/mapnik2/input/ogr.input
-%%OSM%%lib/mapnik2/input/osm.input
-%%POSTGIS%%lib/mapnik2/input/postgis.input
-lib/mapnik2/input/raster.input
-lib/mapnik2/input/shape.input
-%%SQLITE%%lib/mapnik2/input/sqlite.input
-lib/mapnik2/fonts/unifont-5.1.20080907.ttf
-lib/mapnik2/fonts/DejaVuSerif-BoldItalic.ttf
-lib/mapnik2/fonts/DejaVuSerifCondensed-BoldItalic.ttf
-lib/mapnik2/fonts/DejaVuSerif-Italic.ttf
-lib/mapnik2/fonts/DejaVuSerifCondensed-Italic.ttf
-lib/mapnik2/fonts/DejaVuSansMono-Oblique.ttf
-lib/mapnik2/fonts/DejaVuSerifCondensed-Bold.ttf
-lib/mapnik2/fonts/DejaVuSansCondensed-Oblique.ttf
-lib/mapnik2/fonts/DejaVuSansCondensed-Bold.ttf
-lib/mapnik2/fonts/DejaVuSans-Oblique.ttf
-lib/mapnik2/fonts/DejaVuSansCondensed.ttf
-lib/mapnik2/fonts/DejaVuSansMono-Bold.ttf
-lib/mapnik2/fonts/DejaVuSans.ttf
-lib/mapnik2/fonts/DejaVuSans-Bold.ttf
-lib/mapnik2/fonts/DejaVuSans-ExtraLight.ttf
-lib/mapnik2/fonts/DejaVuSerif.ttf
-lib/mapnik2/fonts/DejaVuSerifCondensed.ttf
-lib/mapnik2/fonts/DejaVuSansCondensed-BoldOblique.ttf
-lib/mapnik2/fonts/DejaVuSansMono-BoldOblique.ttf
-lib/mapnik2/fonts/DejaVuSans-BoldOblique.ttf
-lib/mapnik2/fonts/DejaVuSerif-Bold.ttf
-lib/mapnik2/fonts/DejaVuSansMono.ttf
+lib/libmapnik.so
+lib/libmapnik.so.2
+%%GDAL%%lib/mapnik/input/gdal.input
+%%OGR%%lib/mapnik/input/ogr.input
+%%OSM%%lib/mapnik/input/osm.input
+%%POSTGIS%%lib/mapnik/input/postgis.input
+lib/mapnik/input/raster.input
+lib/mapnik/input/shape.input
+%%SQLITE%%lib/mapnik/input/sqlite.input
+lib/mapnik/fonts/unifont-5.1.20080907.ttf
+lib/mapnik/fonts/DejaVuSerif-BoldItalic.ttf
+lib/mapnik/fonts/DejaVuSerifCondensed-BoldItalic.ttf
+lib/mapnik/fonts/DejaVuSerif-Italic.ttf
+lib/mapnik/fonts/DejaVuSerifCondensed-Italic.ttf
+lib/mapnik/fonts/DejaVuSansMono-Oblique.ttf
+lib/mapnik/fonts/DejaVuSerifCondensed-Bold.ttf
+lib/mapnik/fonts/DejaVuSansCondensed-Oblique.ttf
+lib/mapnik/fonts/DejaVuSansCondensed-Bold.ttf
+lib/mapnik/fonts/DejaVuSans-Oblique.ttf
+lib/mapnik/fonts/DejaVuSansCondensed.ttf
+lib/mapnik/fonts/DejaVuSansMono-Bold.ttf
+lib/mapnik/fonts/DejaVuSans.ttf
+lib/mapnik/fonts/DejaVuSans-Bold.ttf
+lib/mapnik/fonts/DejaVuSans-ExtraLight.ttf
+lib/mapnik/fonts/DejaVuSerif.ttf
+lib/mapnik/fonts/DejaVuSerifCondensed.ttf
+lib/mapnik/fonts/DejaVuSansCondensed-BoldOblique.ttf
+lib/mapnik/fonts/DejaVuSansMono-BoldOblique.ttf
+lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf
+lib/mapnik/fonts/DejaVuSerif-Bold.ttf
+lib/mapnik/fonts/DejaVuSansMono.ttf
+%%PYTHON_SITELIBDIR%%/mapnik/__init__.py
+%%PYTHON_SITELIBDIR%%/mapnik/printing.py
+%%PYTHON_SITELIBDIR%%/mapnik/paths.py
+%%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so
%%PYTHON_SITELIBDIR%%/mapnik2/__init__.py
-%%PYTHON_SITELIBDIR%%/mapnik2/printing.py
-%%PYTHON_SITELIBDIR%%/mapnik2/paths.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wms130.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/WMS.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wms111.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/modserver.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/cgiserver.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/__init__.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/common.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/configparser.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/exceptions.py
-%%PYTHON_SITELIBDIR%%/mapnik2/ogcserver/wsgi.py
-%%PYTHON_SITELIBDIR%%/mapnik2/_mapnik2.so
- at dirrm %%PYTHON_SITELIBDIR%%/mapnik2/ogcserver
+ at dirrm %%PYTHON_SITELIBDIR%%/mapnik
@dirrm %%PYTHON_SITELIBDIR%%/mapnik2
- at dirrm lib/mapnik2/input
- at dirrm lib/mapnik2/fonts
- at dirrm lib/mapnik2
+ at dirrm lib/mapnik/input
+ at dirrm lib/mapnik/fonts
+ at dirrm lib/mapnik
@dirrm include/mapnik/grid
@dirrm include/mapnik/svg
@dirrm include/mapnik/wkt
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list