- Update to 2.0.1

- Pass maintainership to submitter

PR:		166857
Submitted by:	Alexey Illarionov <littlesavage@rambler.ru>

7 files changed, 62 insertions, 110 deletions

diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index e6452fcef4ef..84fedc2e950f 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -5,14 +5,13 @@
 # $FreeBSD$
 #
 
-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@gmail.com
+MAINTAINER=	littlesavage@rambler.ru
 COMMENT=	A Free Toolkit For Developing Mapping Applications
 
 LICENSE=	LGPL21
@@ -38,8 +37,6 @@ USE_AUTOTOOLS=	libltdl
 USE_GNOME=	pkgconfig libxml2
 MAKE_JOBS_SAFE=	yes
 
-CONFLICTS=	mapnik-1.*
-
 INPUT_PLUGINS=	raster shape
 
 OPTIONS=	CAIRO "Enable cairo rendering" on \
diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo
index f12751040e15..4ffa42f384de 100644
--- a/graphics/mapnik/distinfo
+++ b/graphics/mapnik/distinfo
@@ -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 --git a/graphics/mapnik/files/patch-bindings-python-build.py b/graphics/mapnik/files/patch-bindings-python-build.py
deleted file mode 100644
index 7d70aa038624..000000000000
--- a/graphics/mapnik/files/patch-bindings-python-build.py
+++ /dev/null
@@ -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 --git a/graphics/mapnik/files/patch-include-mapnik-grid.hpp b/graphics/mapnik/files/patch-include-mapnik-grid.hpp
deleted file mode 100644
index adf061bbd27e..000000000000
--- a/graphics/mapnik/files/patch-include-mapnik-grid.hpp
+++ /dev/null
@@ -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 --git a/graphics/mapnik/files/patch-src-build.py b/graphics/mapnik/files/patch-src-build.py
index 31442e222579..b0ec4be25e64 100644
--- a/graphics/mapnik/files/patch-src-build.py
+++ b/graphics/mapnik/files/patch-src-build.py
@@ -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 --git a/graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh b/graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh
deleted file mode 100644
index 53e8682f97d0..000000000000
--- a/graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh
+++ /dev/null
@@ -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 --git a/graphics/mapnik/pkg-plist b/graphics/mapnik/pkg-plist
index cf2f68c59d26..65f9606e3512 100644
--- a/graphics/mapnik/pkg-plist
+++ b/graphics/mapnik/pkg-plist
@@ -93,6 +93,7 @@ include/mapnik/agg_rasterizer.hpp
 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/value_error.hpp
 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
-@dirrm %%PYTHON_SITELIBDIR%%/mapnik2/ogcserver
+@dirrm %%PYTHON_SITELIBDIR%%/mapnik
 @dirrm %%PYTHON_SITELIBDIR%%/mapnik2
-@dirrm lib/mapnik2/input
-@dirrm lib/mapnik2/fonts
-@dirrm lib/mapnik2
+@dirrm lib/mapnik/input
+@dirrm lib/mapnik/fonts
+@dirrm lib/mapnik
 @dirrm include/mapnik/grid
 @dirrm include/mapnik/svg
 @dirrm include/mapnik/wkt