Update to mapnik 2.0.1

- enable sqlite input plugin - enable regress tests - fix WANTLIB - now scons doesn't rebuild mapnik during make fake ! Hint : http://wiki.gentoo.org/wiki/SCons#Why_you_should_NOT_use_SCons_in_your_project
2012-05-03 08:48:26 +00:00 · 2012-05-03 08:48:26 +00:00 · f75f2cdf77
commit f75f2cdf77
parent 15b1ad1747
8 changed files with 173 additions and 91 deletions
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/16 10:02:37 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2012/05/03 08:48:26 landry Exp $

 COMMENT =	toolkit for developing mapping applications

-DISTNAME =	mapnik-0.7.1
-REVISION =	1
+DISTNAME =	mapnik-v2.0.1
+PKGNAME =	${DISTNAME:S/v//}
 EXTRACT_SUFX =	.tar.bz2

-SHARED_LIBS =	mapnik 0.0 #0.7
+SHARED_LIBS =	mapnik 1.0 #2.0
 CATEGORIES =	graphics geo

 HOMEPAGE =	http://mapnik.org/
-MAINTAINER =	Landry Breuil <gaston@gcu.info>
+MAINTAINER =	Landry Breuil <landry@openbsd.org>

 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
@ -18,12 +18,11 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes

-MASTER_SITES =	${MASTER_SITE_BERLIOS:=mapnik/}
-
+MASTER_SITES =	https://github.com/downloads/mapnik/mapnik/
 MODULES =	devel/scons lang/python

 VMEM_WARNING =	Yes
-
+REGRESS_DEPENDS =	devel/py-nose
 BUILD_DEPENDS =	graphics/py-cairo

 LIB_DEPENDS =	devel/boost \
@ -35,19 +34,29 @@ LIB_DEPENDS =	devel/boost \
 		textproc/icu4c

 WANTLIB =	cairomm-1.0 cairo icuuc ltdl png pq proj jpeg \
-		boost_filesystem-mt boost_iostreams-mt tiff \
+		boost_filesystem-mt tiff sqlite3 \
 		boost_program_options-mt boost_python-mt \
 		boost_regex-mt boost_system-mt boost_thread-mt \
-		c freetype m stdc++ xml2 z curl gdal agg pthread
+		c freetype m stdc++ xml2 z curl gdal agg
+
+WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
+WANTLIB += drm expat fontconfig glib-2.0 gobject-2.0 intl pcre
+WANTLIB += pixman-1 pthread-stubs sigc-2.0 xcb xcb-render xcb-shm
+

 MODSCONS_FLAGS =	PREFIX="${TRUEPREFIX}" \
+			DESTDIR="${WRKINST}" \
+			PNG_INCLUDES="${LOCALBASE}/include/libpng/" \
 			INTERNAL_LIBAGG=no \
 			SYSTEM_FONTS="${X11BASE}/lib/X11/fonts/TTF/" \
-			USE_CONFIG=no \
 			FAST=yes \
-			INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,osm
+			INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,osm,sqlite

 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/src/SConscript
+	# subst shlib version
+	${SUBST_CMD} ${WRKSRC}/src/build.py
+
+do-regress:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} tests/run_tests.py 

 .include <bsd.port.mk>
--- a/graphics/mapnik/distinfo
+++ b/graphics/mapnik/distinfo
@ -1,5 +1,5 @@
-MD5 (mapnik-0.7.1.tar.bz2) = j2X9oqeSUY1va+ioX2L8cw==
-RMD160 (mapnik-0.7.1.tar.bz2) = nkGA6QHfryVQkYQ4aelEHXoIIJ8=
-SHA1 (mapnik-0.7.1.tar.bz2) = oZYfbf5dWR1aiSvvBdWOZlN0QMQ=
-SHA256 (mapnik-0.7.1.tar.bz2) = DQToy8KgYM4JuhPM3Ne/i9Ar7XeoSj3RGR5NdfupW40=
-SIZE (mapnik-0.7.1.tar.bz2) = 10021260
+MD5 (mapnik-v2.0.1.tar.bz2) = 490JmRNA4laLmfRrrDSwqA==
+RMD160 (mapnik-v2.0.1.tar.bz2) = 8AG7MfX5sMIQ+YAO0Cgy7PmT7AU=
+SHA1 (mapnik-v2.0.1.tar.bz2) = CuajOOPdtIC1P7e7yYTEsEea74g=
+SHA256 (mapnik-v2.0.1.tar.bz2) = /j2gsa27SPVevQGrDpXlGD9RIVQknx1Ae35ZqpF2uow=
+SIZE (mapnik-v2.0.1.tar.bz2) = 12018783
--- a/graphics/mapnik/patches/patch-SConstruct
+++ b/graphics/mapnik/patches/patch-SConstruct
@ -1,15 +1,24 @@
-$OpenBSD: patch-SConstruct,v 1.1.1.1 2010/10/24 22:41:09 landry Exp $
--- SConstruct.orig	Mon Mar 22 17:40:47 2010
-+++ SConstruct	Sun Oct 24 12:14:27 2010
-@@ -725,6 +726,11 @@ if not preconfigured:
+$OpenBSD: patch-SConstruct,v 1.2 2012/05/03 08:48:26 landry Exp $
+--- SConstruct.orig	Tue Apr 10 00:56:48 2012
+++ SConstruct	Wed May  2 22:39:34 2012
+@@ -1028,6 +1028,11 @@ if not preconfigured:
         thread_suffix = ''
         env.Append(LIBS = 'pthread')
-     
+ 
 +    if env['PLATFORM'] == 'OpenBSD':
 +        thread_suffix = '-mt'
 +        env.Append(LIBS = 'pthread')
 +        env.Append(LINKFLAGS = ['-lstdc++'])
 +
-     if env['SYSTEM_FONTS']:
-         if not os.path.isdir(env['SYSTEM_FONTS']):
-             color_print(1,'Warning: Directory specified for SYSTEM_FONTS does not exist!')
+     # Solaris & Sun Studio settings (the `SUNCC` flag will only be
+     # set if the `CXX` option begins with `CC`)
+     SOLARIS = env['PLATFORM'] == 'SunOS'
+@@ -1145,6 +1150,8 @@ if not preconfigured:
+         # of attaching to cxxflags after configure
+         if env['PLATFORM'] == 'SunOS':
+             env.Append(CXXFLAGS = '-pthreads')
+        if env['PLATFORM'] == 'OpenBSD':
+            env.Append(CXXFLAGS = '-pthread')
+ 
+     # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
+     if env['PRIORITIZE_LINKING']:
--- a/graphics/mapnik/patches/patch-bindings_python_build_py
+++ b/graphics/mapnik/patches/patch-bindings_python_build_py
@ -0,0 +1,16 @@
+$OpenBSD: patch-bindings_python_build_py,v 1.1 2012/05/03 08:48:26 landry Exp $
+paths.py ends up with an insane ../../../ garbage pointing to /local otherwise
+--- bindings/python/build.py.orig	Thu May  3 00:00:31 2012
+++ bindings/python/build.py	Thu May  3 00:03:21 2012
+@@ -143,10 +143,7 @@ paths += "__all__ = [mapniklibpath,inputpluginspath,fo
+ if not os.path.exists('mapnik'):
+     os.mkdir('mapnik')
+ 
+-if hasattr(os.path,'relpath'): # python 2.6 and above
+-    file('mapnik/paths.py','w').write(paths % (os.path.relpath(env['MAPNIK_LIB_DIR'],target_path)))
+-else:
+-    file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
+file('mapnik/paths.py','w').write(paths % (env['MAPNIK_LIB_DIR']))
+ 
+ # force open perms temporarily so that `sudo scons install`
+ # does not later break simple non-install non-sudo rebuild
--- a/graphics/mapnik/patches/patch-src_SConscript
+++ b/graphics/mapnik/patches/patch-src_SConscript
@ -1,22 +0,0 @@
-$OpenBSD: patch-src_SConscript,v 1.1.1.1 2010/10/24 22:41:09 landry Exp $
-dont install stupid symlinks and set our libversion
--- src/SConscript.orig	Mon Mar 22 17:40:13 2010
-+++ src/SConscript	Tue Oct  5 15:25:34 2010
-@@ -144,16 +144,9 @@ if env['PLATFORM'] != 'Darwin':
- 
-     major, minor, micro = ABI_VERSION
-     
-    soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), major, minor, micro)
-+    soFile = "%s.${LIBmapnik_VERSION}" % (os.path.basename(str(mapnik[0])))
-     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)), 
-                        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]))), 
-                        os.path.join(libDir, "%s.%d.%d" % (os.path.basename(str(mapnik[0])),major, minor)), symlink)
-    env.Alias(target='install', source=link2)
- else:
-     env.Alias(target='install', source=env.Install(install_prefix + '/' + env['LIBDIR_SCHEMA'], mapnik))
- 
--- a/graphics/mapnik/patches/patch-src_build_py
+++ b/graphics/mapnik/patches/patch-src_build_py
@ -0,0 +1,44 @@
+$OpenBSD: patch-src_build_py,v 1.1 2012/05/03 08:48:26 landry Exp $
+Set shlib version, don't do stupid symlinks
+--- src/build.py.orig	Tue Apr 10 00:56:48 2012
+++ src/build.py	Wed May  2 22:39:34 2012
+@@ -81,7 +81,7 @@ if not env['RUNTIME_LINK'] == 'static':
+ if env['PLATFORM'] == 'Darwin':
+     mapnik_libname = 'libmapnik.dylib'
+ else:
+-    mapnik_libname = 'libmapnik.so.' + ("%d.%d" % (int(ABI_VERSION[0]),int(ABI_VERSION[1])))
+    mapnik_libname = 'libmapnik.so.${LIBmapnik_VERSION}'
+ 
+ if env['PLATFORM'] == 'Darwin':
+     if env['FULL_LIB_PATH']:
+@@ -325,9 +325,7 @@ if env['PLATFORM'] != 'Darwin':
+             os.remove(trgt)
+         os.symlink(os.path.basename(src), trgt)
+ 
+-    major, minor, micro = ABI_VERSION
+-    
+-    soFile = "%s.%d.%d.%d" % (os.path.basename(str(mapnik[0])), int(major), int(minor), int(micro))
+    soFile = "%s.${LIBmapnik_VERSION}" % (os.path.basename(str(mapnik[0])))
+     target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
+     
+     if 'uninstall' not in COMMAND_LINE_TARGETS:
+@@ -336,19 +334,6 @@ if env['PLATFORM'] != 'Darwin':
+       if result:
+             env.AddPostAction(result, ldconfig)
+ 
+-    
+-    # Install symlinks
+-    target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % (os.path.basename(str(mapnik[0])),int(major), int(minor)))
+-    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)
+-            env.Alias(target='install', source=link2)
+-    # delete in reverse order..
+-    env['create_uninstall_target'](env, target2)
+-    env['create_uninstall_target'](env, target1)
+     env['create_uninstall_target'](env, target)
+ 
+ else:
--- a/graphics/mapnik/patches/patch-src_png_reader_cpp
+++ b/graphics/mapnik/patches/patch-src_png_reader_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-src_png_reader_cpp,v 1.1 2011/07/08 20:38:01 naddy Exp $
-
-Fix build with png-1.5.
-
--- src/png_reader.cpp.orig	Tue Jul  5 18:18:28 2011
-+++ src/png_reader.cpp	Tue Jul  5 18:18:53 2011
-@@ -82,7 +82,7 @@ namespace mapnik
-     {
-         png_size_t check;
-         check = (png_size_t)fread(data, (png_size_t)1, length,
-                                  (FILE *)png_ptr->io_ptr);
-+                                  (FILE *)png_get_io_ptr(png_ptr));
- 
-         if (check != length)
-         {
--- a/graphics/mapnik/pkg/PLIST
+++ b/graphics/mapnik/pkg/PLIST
@ -1,51 +1,68 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/10/24 22:41:09 landry Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/05/03 08:48:26 landry Exp $
+bin/mapnik-config
+bin/mapnik-speed-check
@bin bin/shapeindex
+bin/upgrade_map_xml.py
 include/mapnik/
+include/mapnik/agg_pattern_source.hpp
+include/mapnik/agg_rasterizer.hpp
 include/mapnik/agg_renderer.hpp
 include/mapnik/arrow.hpp
 include/mapnik/attribute.hpp
 include/mapnik/attribute_collector.hpp
 include/mapnik/attribute_descriptor.hpp
-include/mapnik/boolean_filter.hpp
+include/mapnik/box2d.hpp
 include/mapnik/cairo_renderer.hpp
 include/mapnik/color.hpp
 include/mapnik/color_factory.hpp
-include/mapnik/comparison.hpp
 include/mapnik/config.hpp
 include/mapnik/config_error.hpp
 include/mapnik/coord.hpp
 include/mapnik/coord_array.hpp
-include/mapnik/css_color_parser.hpp
+include/mapnik/css_color_grammar.hpp
+include/mapnik/css_color_grammar_deprecated.hpp
 include/mapnik/ctrans.hpp
 include/mapnik/datasource.hpp
 include/mapnik/datasource_cache.hpp
 include/mapnik/distance.hpp
 include/mapnik/ellipsoid.hpp
 include/mapnik/enumeration.hpp
-include/mapnik/envelope.hpp
 include/mapnik/expression.hpp
+include/mapnik/expression_evaluator.hpp
+include/mapnik/expression_grammar.hpp
+include/mapnik/expression_node.hpp
+include/mapnik/expression_string.hpp
 include/mapnik/factory.hpp
+include/mapnik/fastmath.hpp
 include/mapnik/feature.hpp
 include/mapnik/feature_factory.hpp
 include/mapnik/feature_layer_desc.hpp
 include/mapnik/feature_style_processor.hpp
 include/mapnik/feature_type_style.hpp
 include/mapnik/fill.hpp
-include/mapnik/filter.hpp
-include/mapnik/filter_expression.hpp
 include/mapnik/filter_factory.hpp
 include/mapnik/filter_featureset.hpp
-include/mapnik/filter_parser.hpp
-include/mapnik/filter_visitor.hpp
 include/mapnik/font_engine_freetype.hpp
 include/mapnik/font_set.hpp
 include/mapnik/gamma.hpp
 include/mapnik/geom_util.hpp
 include/mapnik/geometry.hpp
 include/mapnik/global.hpp
+include/mapnik/glyph_symbolizer.hpp
+include/mapnik/gradient.hpp
 include/mapnik/graphics.hpp
+include/mapnik/grid/
+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/hextree.hpp
 include/mapnik/hit_test_filter.hpp
+include/mapnik/image_compositing.hpp
 include/mapnik/image_data.hpp
 include/mapnik/image_reader.hpp
 include/mapnik/image_util.hpp
@ -58,16 +75,24 @@ include/mapnik/libxml2_loader.hpp
 include/mapnik/line_pattern_symbolizer.hpp
 include/mapnik/line_symbolizer.hpp
 include/mapnik/load_map.hpp
-include/mapnik/logical.hpp
 include/mapnik/map.hpp
-include/mapnik/markers_converter.hpp
+include/mapnik/mapped_memory_cache.hpp
+include/mapnik/marker.hpp
+include/mapnik/marker_cache.hpp
+include/mapnik/markers_placement.hpp
 include/mapnik/markers_symbolizer.hpp
-include/mapnik/math_expr.hpp
 include/mapnik/memory.hpp
 include/mapnik/memory_datasource.hpp
 include/mapnik/memory_featureset.hpp
+include/mapnik/metawriter.hpp
+include/mapnik/metawriter_factory.hpp
+include/mapnik/metawriter_inmem.hpp
+include/mapnik/metawriter_json.hpp
 include/mapnik/octree.hpp
+include/mapnik/palette.hpp
 include/mapnik/params.hpp
+include/mapnik/parse_path.hpp
+include/mapnik/path_expression_grammar.hpp
 include/mapnik/placement_finder.hpp
 include/mapnik/plugin.hpp
 include/mapnik/png_io.hpp
@ -81,28 +106,52 @@ include/mapnik/ptree_helpers.hpp
 include/mapnik/quad_tree.hpp
 include/mapnik/query.hpp
 include/mapnik/raster.hpp
+include/mapnik/raster_colorizer.hpp
 include/mapnik/raster_symbolizer.hpp
-include/mapnik/regex_filter.hpp
 include/mapnik/rule.hpp
 include/mapnik/save_map.hpp
 include/mapnik/scale_denominator.hpp
+include/mapnik/segment.hpp
 include/mapnik/shield_symbolizer.hpp
-include/mapnik/spatial.hpp
+include/mapnik/sql_utils.hpp
 include/mapnik/stroke.hpp
-include/mapnik/style.hpp
 include/mapnik/style_factory.hpp
+include/mapnik/svg/
+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/symbolizer.hpp
 include/mapnik/text_path.hpp
+include/mapnik/text_placements.hpp
+include/mapnik/text_placements_simple.hpp
 include/mapnik/text_symbolizer.hpp
+include/mapnik/timer.hpp
 include/mapnik/unicode.hpp
 include/mapnik/utils.hpp
 include/mapnik/value.hpp
+include/mapnik/value_error.hpp
 include/mapnik/version.hpp
 include/mapnik/vertex.hpp
 include/mapnik/vertex_transform.hpp
 include/mapnik/vertex_vector.hpp
-include/mapnik/wall_clock_timer.hpp
+include/mapnik/warp.hpp
 include/mapnik/wkb.hpp
+include/mapnik/wkt/
+include/mapnik/wkt/wkt_factory.hpp
+include/mapnik/wkt/wkt_grammar.hpp
@lib lib/libmapnik.so.${LIBmapnik_VERSION}
 lib/mapnik/
 lib/mapnik/input/
@ -112,19 +161,11 @@ lib/mapnik/input/
@bin lib/mapnik/input/postgis.input
@bin lib/mapnik/input/raster.input
@bin lib/mapnik/input/shape.input
+@bin lib/mapnik/input/sqlite.input
 lib/python${MODPY_VERSION}/site-packages/mapnik/
 lib/python${MODPY_VERSION}/site-packages/mapnik/__init__.py
 lib/python${MODPY_VERSION}/site-packages/mapnik/_mapnik.so
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/WMS.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/__init__.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/cgiserver.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/common.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/configparser.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/modserver.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/wms111.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/wms130.py
-lib/python${MODPY_VERSION}/site-packages/mapnik/ogcserver/wsgi.py
-@mode 644
 lib/python${MODPY_VERSION}/site-packages/mapnik/paths.py
+lib/python${MODPY_VERSION}/site-packages/mapnik/printing.py
+lib/python${MODPY_VERSION}/site-packages/mapnik2/
+lib/python${MODPY_VERSION}/site-packages/mapnik2/__init__.py