8 files changed, 219 insertions, 124 deletions

diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index ceb41c1affab..37295ce17df6 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -5,15 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mapnik
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTNAME=	mapnik2
+PORTVERSION=	2.0.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	BERLIOS
+MASTER_SITE_SUBDIR=	mapnik
+DISTNAME=	mapnik-${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	A Free Toolkit For Developing Mapping Applications
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
 		png:${PORTSDIR}/graphics/png \
 		tiff:${PORTSDIR}/graphics/tiff \
@@ -21,30 +25,28 @@ LIB_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
 		icuuc:${PORTSDIR}/devel/icu \
 		boost_system:${PORTSDIR}/devel/boost-libs
 BUILD_DEPENDS=	${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \
-		icu>=4.1.4:${PORTSDIR}/devel/icu \
+		icu>=4.2:${PORTSDIR}/devel/icu \
 		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu \
-		boost-libs>1.41:${PORTSDIR}/devel/boost-libs \
+		boost-libs>=1.45:${PORTSDIR}/devel/boost-libs \
 		${LOCALBASE}/include/boost/python.hpp:${PORTSDIR}/devel/boost-python-libs
 
-LICENSE=	LGPL21
-LICENSE_FILE=   ${WRKSRC}/COPYING
-
 USE_BZIP2=	yes
-USE_PYTHON=	2.5+
+USE_PYTHON=	2.6+
 USE_LDCONFIG=	yes
 USE_SCONS=	yes
 USE_AUTOTOOLS=	libltdl
 USE_GNOME=	pkgconfig libxml2
 MAKE_JOBS_SAFE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+CONFLICTS=	mapnik-1.*
 
 INPUT_PLUGINS=	raster shape
 
 OPTIONS=	CAIRO "Enable cairo rendering" on \
+		SQLITE "SQLite input plugin" on \
+		OGR "ogr input plugin" on \
+		GDAL "gdal input plugin" on \
 		POSTGIS "Postgis input plugin" on \
-		GDAL "gdal input plugin" off \
-		OGR "ogr input plugin" off \
-		SQLITE "SQLite input plugin" off \
 		OSM "OSM input plugin" off
 
 .include <bsd.port.options.mk>
@@ -65,7 +67,7 @@ PLIST_SUB+=	POSTGIS=""
 PLIST_SUB+=	POSTGIS="@comment "
 .endif
 
-.if defined(WITH_GDAL)
+.if !defined(WITHOUT_GDAL)
 INPUT_PLUGINS+=	gdal
 LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
 PLIST_SUB+=	GDAL=""
@@ -73,7 +75,7 @@ PLIST_SUB+=	GDAL=""
 PLIST_SUB+=	GDAL="@comment "
 .endif
 
-.if defined(WITH_OGR)
+.if !defined(WITHOUT_OGR)
 INPUT_PLUGINS+=	ogr
 LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
 PLIST_SUB+=	OGR=""
@@ -81,7 +83,7 @@ PLIST_SUB+=	OGR=""
 PLIST_SUB+=	OGR="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if !defined(WITHOUT_SQLITE)
 INPUT_PLUGINS+=	sqlite
 LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 PLIST_SUB+=	SQLITE=""
diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo
index 39bc1bcc3711..f12751040e15 100644
--- a/graphics/mapnik/distinfo
+++ b/graphics/mapnik/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mapnik-0.7.1.tar.bz2) = 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d
-SIZE (mapnik-0.7.1.tar.bz2) = 10021260
+SHA256 (mapnik-2.0.0.tar.bz2) = 036477761e56a4e0ccad58d9426bbde39566aecdb9cb845469c1221292fab6bc
+SIZE (mapnik-2.0.0.tar.bz2) = 12302295
diff --git a/graphics/mapnik/files/patch-bindings-python-build.py b/graphics/mapnik/files/patch-bindings-python-build.py
new file mode 100644
index 000000000000..7d70aa038624
--- /dev/null
+++ b/graphics/mapnik/files/patch-bindings-python-build.py
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..adf061bbd27e
--- /dev/null
+++ b/graphics/mapnik/files/patch-include-mapnik-grid.hpp
@@ -0,0 +1,11 @@
+--- 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-SConscript b/graphics/mapnik/files/patch-src-SConscript
deleted file mode 100644
index ccedccaa190d..000000000000
--- a/graphics/mapnik/files/patch-src-SConscript
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/SConscript.orig	2009-04-26 12:18:44.000000000 +0400
-+++ src/SConscript	2009-04-26 13:00:21.000000000 +0400
-@@ -37,6 +37,8 @@
-     linkflags = '-Wl,-install_name,libmapnik.dylib'
- elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
-     linkflags = '-R. -h libmapnik.so'
-+elif env['PLATFORM'] == 'FreeBSD':
-+    linkflags = '-Wl,-soname,libmapnik.so.' + ("%d" % (ABI_VERSION[0]))
- else: # Linux and others
-     linkflags = '-Wl,-rpath-link,. -Wl,-soname,libmapnik.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1])) 
- 
-@@ -106,16 +108,24 @@
- 
-     major, minor, micro = ABI_VERSION
-     
--    soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
-+    if env['PLATFORM'] == 'FreeBSD':
-+        soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), major)
-+    else:
-+        soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
-     libDir = install_prefix + '/' + env['LIBDIR_SCHEMA']
-     env.Alias(target='install', source=env.InstallAs(target=os.path.join(libDir, soFile), source=mapnik))
-     # Install symlinks
--    link1 = env.Command(os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), 
-+    if env['PLATFORM'] == 'FreeBSD':
-+        link = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))), 
-+                        os.path.join(libDir, "%s.%d" % (os.path.basename(str(mapnik[0])),major)), symlink)
-+        env.Alias(target='install', source=link)
-+    else:
-+        link1 = env.Command(os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), 
-                         os.path.join(libDir, soFile), symlink)
--    env.Alias(target='install', source=link1)
--    link2 = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))), 
-+        env.Alias(target='install', source=link1)
-+        link2 = env.Command(os.path.join(libDir, os.path.basename(str(mapnik[0]))), 
-                         os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), symlink)
--    env.Alias(target='install', source=link2)
-+        env.Alias(target='install', source=link2)
- else:
-     env.Alias(target='install', source=env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'], mapnik))
- 
diff --git a/graphics/mapnik/files/patch-src-build.py b/graphics/mapnik/files/patch-src-build.py
new file mode 100644
index 000000000000..31442e222579
--- /dev/null
+++ b/graphics/mapnik/files/patch-src-build.py
@@ -0,0 +1,45 @@
+--- 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 @@
+ 
+ if env['PLATFORM'] == 'Darwin':
+     mapnik_libname = 'libmapnik2.dylib'
++elif env['PLATFORM'] == 'FreeBSD':
++    mapnik_libname = 'libmapnik2.so.' + ("%d" % (ABI_VERSION[0])) 
+ else:
+     mapnik_libname = 'libmapnik2.so.' + ("%d.%d" % (ABI_VERSION[0],ABI_VERSION[1])) 
+ 
+@@ -320,7 +322,10 @@
+ 
+     major, minor, micro = ABI_VERSION
+     
+-    soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
++    if env['PLATFORM'] == 'FreeBSD':
++        soFile = "%s.%d" % (os.path.basename(str(mapnik[0])), major)
++    else:
++        soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
+     target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
+     
+     if 'uninstall' not in COMMAND_LINE_TARGETS:
+@@ -335,13 +340,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:
+-            link1 = env.Command(target1, target, symlink)
+-            env.Alias(target='install', source=link1)
+-            link2 = env.Command(target2, target1, symlink)
++            if env['PLATFORM'] == 'FreeBSD':
++                link2 = env.Command(target2, target, symlink)
++            else:
++                link1 = env.Command(target1, target, symlink)
++                env.Alias(target='install', source=link1)
++                link2 = env.Command(target2, target1, symlink)
+             env.Alias(target='install', source=link2)
+     # delete in reverse order..
+     env['create_uninstall_target'](env, target2)
+-    env['create_uninstall_target'](env, target1)
++    if env['PLATFORM'] != 'FreeBSD':
++        env['create_uninstall_target'](env, target1)
+     env['create_uninstall_target'](env, target)
+ 
+ else:
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
new file mode 100644
index 000000000000..53e8682f97d0
--- /dev/null
+++ b/graphics/mapnik/files/patch-utils-mapnik-config-mapnik-config.template.sh
@@ -0,0 +1,16 @@
+--- 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 aec33ceddfa4..cf2f68c59d26 100644
--- a/graphics/mapnik/pkg-plist
+++ b/graphics/mapnik/pkg-plist
@@ -1,13 +1,13 @@
+bin/mapnik-config
+bin/mapnik-speed-check
 bin/shapeindex
-include/mapnik/boolean_filter.hpp
+bin/upgrade_map_xml.py
 include/mapnik/font_set.hpp
 include/mapnik/cairo_renderer.hpp
 include/mapnik/version.hpp
-include/mapnik/wall_clock_timer.hpp
 include/mapnik/wkb.hpp
 include/mapnik/coord.hpp
 include/mapnik/utils.hpp
-include/mapnik/filter.hpp
 include/mapnik/pool.hpp
 include/mapnik/image_util.hpp
 include/mapnik/rule.hpp
@@ -17,7 +17,6 @@ include/mapnik/text_path.hpp
 include/mapnik/arrow.hpp
 include/mapnik/memory_datasource.hpp
 include/mapnik/query.hpp
-include/mapnik/math_expr.hpp
 include/mapnik/filter_factory.hpp
 include/mapnik/label_collision_detector.hpp
 include/mapnik/fill.hpp
@@ -27,7 +26,6 @@ include/mapnik/attribute.hpp
 include/mapnik/line_pattern_symbolizer.hpp
 include/mapnik/point_symbolizer.hpp
 include/mapnik/params.hpp
-include/mapnik/regex_filter.hpp
 include/mapnik/libxml2_loader.hpp
 include/mapnik/image_view.hpp
 include/mapnik/feature_factory.hpp
@@ -37,7 +35,6 @@ include/mapnik/text_symbolizer.hpp
 include/mapnik/line_symbolizer.hpp
 include/mapnik/raster.hpp
 include/mapnik/polygon_symbolizer.hpp
-include/mapnik/css_color_parser.hpp
 include/mapnik/geom_util.hpp
 include/mapnik/image_reader.hpp
 include/mapnik/config_error.hpp
@@ -49,9 +46,7 @@ include/mapnik/raster_symbolizer.hpp
 include/mapnik/vertex.hpp
 include/mapnik/scale_denominator.hpp
 include/mapnik/stroke.hpp
-include/mapnik/expression.hpp
 include/mapnik/value.hpp
-include/mapnik/logical.hpp
 include/mapnik/datasource.hpp
 include/mapnik/map.hpp
 include/mapnik/placement_finder.hpp
@@ -59,7 +54,6 @@ include/mapnik/unicode.hpp
 include/mapnik/coord_array.hpp
 include/mapnik/factory.hpp
 include/mapnik/graphics.hpp
-include/mapnik/style.hpp
 include/mapnik/jpeg_io.hpp
 include/mapnik/color_factory.hpp
 include/mapnik/plugin.hpp
@@ -71,11 +65,7 @@ include/mapnik/symbolizer.hpp
 include/mapnik/png_io.hpp
 include/mapnik/feature_layer_desc.hpp
 include/mapnik/layer.hpp
-include/mapnik/filter_expression.hpp
 include/mapnik/label_placement.hpp
-include/mapnik/envelope.hpp
-include/mapnik/markers_converter.hpp
-include/mapnik/filter_parser.hpp
 include/mapnik/font_engine_freetype.hpp
 include/mapnik/quad_tree.hpp
 include/mapnik/enumeration.hpp
@@ -89,7 +79,6 @@ include/mapnik/ptree_helpers.hpp
 include/mapnik/global.hpp
 include/mapnik/config.hpp
 include/mapnik/ctrans.hpp
-include/mapnik/spatial.hpp
 include/mapnik/color.hpp
 include/mapnik/vertex_transform.hpp
 include/mapnik/vertex_vector.hpp
@@ -97,57 +86,117 @@ include/mapnik/markers_symbolizer.hpp
 include/mapnik/save_map.hpp
 include/mapnik/shield_symbolizer.hpp
 include/mapnik/memory.hpp
-include/mapnik/filter_visitor.hpp
-include/mapnik/comparison.hpp
 include/mapnik/proj_transform.hpp
 include/mapnik/distance.hpp
-lib/libmapnik.so
-lib/libmapnik.so.0
-%%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/paths.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wms130.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/WMS.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wms111.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/modserver.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/cgiserver.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/__init__.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/common.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/configparser.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/exceptions.py
-%%PYTHON_SITELIBDIR%%/mapnik/ogcserver/wsgi.py
-%%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so
-@dirrm %%PYTHON_SITELIBDIR%%/mapnik/ogcserver
-@dirrm %%PYTHON_SITELIBDIR%%/mapnik
-@dirrm lib/mapnik/input
-@dirrm lib/mapnik/fonts
-@dirrm lib/mapnik
+include/mapnik/agg_pattern_source.hpp
+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_evaluator.hpp
+include/mapnik/expression_grammar.hpp
+include/mapnik/expression_node.hpp
+include/mapnik/expression_string.hpp
+include/mapnik/fastmath.hpp
+include/mapnik/glyph_symbolizer.hpp
+include/mapnik/gradient.hpp
+include/mapnik/grid/grid.hpp
+include/mapnik/grid/grid_pixel.hpp
+include/mapnik/grid/grid_pixfmt.hpp
+include/mapnik/grid/grid_rasterizer.hpp
+include/mapnik/grid/grid_renderer.hpp
+include/mapnik/grid/grid_rendering_buffer.hpp
+include/mapnik/grid/grid_util.hpp
+include/mapnik/grid/grid_view.hpp
+include/mapnik/image_compositing.hpp
+include/mapnik/mapped_memory_cache.hpp
+include/mapnik/marker.hpp
+include/mapnik/marker_cache.hpp
+include/mapnik/markers_placement.hpp
+include/mapnik/metawriter.hpp
+include/mapnik/metawriter_factory.hpp
+include/mapnik/metawriter_inmem.hpp
+include/mapnik/metawriter_json.hpp
+include/mapnik/palette.hpp
+include/mapnik/parse_path.hpp
+include/mapnik/path_expression_grammar.hpp
+include/mapnik/raster_colorizer.hpp
+include/mapnik/segment.hpp
+include/mapnik/sql_utils.hpp
+include/mapnik/svg/svg_converter.hpp
+include/mapnik/svg/svg_generator.hpp
+include/mapnik/svg/svg_output_attributes.hpp
+include/mapnik/svg/svg_output_grammars.hpp
+include/mapnik/svg/svg_parser.hpp
+include/mapnik/svg/svg_path_adapter.hpp
+include/mapnik/svg/svg_path_attributes.hpp
+include/mapnik/svg/svg_path_commands.hpp
+include/mapnik/svg/svg_path_grammar.hpp
+include/mapnik/svg/svg_path_iterator.hpp
+include/mapnik/svg/svg_path_parser.hpp
+include/mapnik/svg/svg_points_grammar.hpp
+include/mapnik/svg/svg_renderer.hpp
+include/mapnik/svg/svg_storage.hpp
+include/mapnik/svg/svg_transform_grammar.hpp
+include/mapnik/svg_renderer.hpp
+include/mapnik/text_placements.hpp
+include/mapnik/text_placements_simple.hpp
+include/mapnik/timer.hpp
+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
+%%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%%/mapnik2
+@dirrm lib/mapnik2/input
+@dirrm lib/mapnik2/fonts
+@dirrm lib/mapnik2
+@dirrm include/mapnik/grid
+@dirrm include/mapnik/svg
+@dirrm include/mapnik/wkt
 @dirrm include/mapnik