Attachment #167117 for bug #207060




# $FreeBSD$

PORTNAME=	mapnik
PORTVERSION=	3.0.9
DISTVERSIONPREFIX=	v
PORTREVISION=	15
CATEGORIES=	graphics geography
MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/


MAINTAINER=	littlesavage@rambler.ru
COMMENT=	Free Toolkit For Developing Mapping Applications

LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu \
		libicuuc.so:${PORTSDIR}/devel/icu \
		libboost_system.so:${PORTSDIR}/devel/boost-libs \
		libfreetype.so:${PORTSDIR}/print/freetype2 \
		libharfbuzz.so:${PORTSDIR}/print/harfbuzz
		${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu

BROKEN_powerpc=	does not install: runs out of virtual memory
BROKEN_FreeBSD_9=	does not build: lack of c++11 support

USES=		compiler:c++11-lib pkgconfig python scons tar:bzip2
USE_GNOME=	libxml2
USE_LDCONFIG=	yes
MAKE_ARGS=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \
		CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \
		CUSTOM_LDFLAGS="${LDFLAGS}"

PORTDOCS=	*

INPUT_PLUGINS=	csv raster shape geojson topojson
OPTIONS_DEFINE=	CAIRO CSV GDAL OGR OSM POSTGIS SQLITE3 JPEG PNG TIFF
OPTIONS_DEFAULT=	CAIRO CSV GDAL OGR OSM POSTGIS SQLITE3 JPEG PNG TIFF

OPTIONS_DEFINE=	CAIRO JPEG PNG TIFF WEBP PROJ
OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP
OPTIONS_GROUP=	INPUT
OPTIONS_GROUP_INPUT=	GDAL OGR POSTGIS PGRASTER SQLITE3
OPTIONS_SUB=	yes

INPUT_DESC=	Input plugins
GDAL_DESC=	GDAL input plugin
OGR_DESC=	OGR input plugin
OSM_DESC=	OSM input plugin
POSTGIS_DESC=	PostGIS input plugin
PGRASTER_DESC=	PGraster input plugin
SQLITE3_DESC=	SQLite input plugin

PROJ_DESC=	proj4 support

CAIRO_DESC=	Enable cairo rendering

GDAL_VARS=		INPUT_PLUGINS+=gdal
GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
OGR_VARS=		INPUT_PLUGINS+=ogr
OGR_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
POSTGIS_VARS=		INPUT_PLUGINS+=postgis
POSTGIS_USES=		pgsql
PGRASTER_VARS=		INPUT_PLUGINS+=pgraster
PGRASTER_USES=		pgsql
SQLITE3_VARS=		INPUT_PLUGINS+=sqlite
SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3

PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
PNG_MAKE_ARGS_OFF=	PNG=False
JPEG_USES=		jpeg
JPEG_MAKE_ARGS_OFF=	JPEG=False
TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
TIFF_MAKE_ARGS_OFF=	TIFF=False
WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
WEBP_MAKE_ARGS_OFF=	WEBP=False
PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
PROJ_MAKE_ARGS_OFF=	PROJ=False

CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
CAIRO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
CAIRO_MAKE_ARGS_OFF=	CAIRO=False

.if ${PORT_OPTIONS:MCAIRO}
LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
.else
MAKE_ARGS+=	CAIRO=False
.endif

.if ${PORT_OPTIONS:MCSV}
INPUT_PLUGINS+=	csv
.endif

.if ${PORT_OPTIONS:MGDAL}
INPUT_PLUGINS+=	gdal
LIB_DEPENDS+=	libgdal.so:${PORTSDIR}/graphics/gdal
.endif

.if ${PORT_OPTIONS:MOGR}
INPUT_PLUGINS+=	ogr
LIB_DEPENDS+=	libgdal.so:${PORTSDIR}/graphics/gdal
.endif

.if ${PORT_OPTIONS:MOSM}
INPUT_PLUGINS+=	osm
LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
.endif

.if ${PORT_OPTIONS:MPOSTGIS}
INPUT_PLUGINS+=	postgis
USES+=		pgsql
.endif

.if ${PORT_OPTIONS:MSQLITE3}
INPUT_PLUGINS+=	sqlite
LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
BUILD_DEPENDS+=	sqlite3>=3.7.12:${PORTSDIR}/databases/sqlite3
.endif

.if ${PORT_OPTIONS:MJPEG}
USES+=		jpeg
.else
MAKE_ARGS+=	JPEG=False
.endif

.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+=   libpng.so:${PORTSDIR}/graphics/png
.else
MAKE_ARGS+=	PNG=False
.endif

.if ${PORT_OPTIONS:MTIFF}
LIB_DEPENDS+=   libtiff.so:${PORTSDIR}/graphics/tiff
.else
MAKE_ARGS+=	TIFF=False
.endif

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == gcc
CXXFLAGS+=	-D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
.endif

pre-configure-SQLITE3-on:
MAKE_ARGS+=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`"
MAKE_ARGS+=	JOBS=${MAKE_JOBS_NUMBER}
MAKE_ARGS+=	${MAKE_ENV}

pre-configure:
.if ${PORT_OPTIONS:MSQLITE3}
	@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \
		${ECHO_MSG} "" ; \
		${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \

		${ECHO_MSG} "" ; \
		${FALSE} ; \
	fi
.endif

post-patch:
	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \

		${WRKSRC}/SConstruct

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \
		${STAGEDIR}${PREFIX}/bin/mapnik-render \
		${STAGEDIR}${PREFIX}/bin/shapeindex
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS.md CHANGELOG.md README.md docs" \
		${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mapnik-v2.2.0.tar.bz2) = 9b30de4e58adc6d5aa8478779d0a47fdabe6bf8b166b67a383b35f5aa5d6c1b0	1	SHA256 (mapnik-v3.0.9.tar.bz2) = 3a3f67532b05f8a527a5bab32effd7dd5aa59165c7e24505268f6d827955d3da
2	SIZE (mapnik-v2.2.0.tar.bz2) = 23007178	2	SIZE (mapnik-v3.0.9.tar.bz2) = 75213927




--- SConstruct.orig	2016-02-15 15:52:54 UTC
+++ SConstruct
@@ -1789,10 +1789,6 @@ if not preconfigured:
 
         if env['DEBUG']:
             env.Append(CXXFLAGS = common_cxx_flags + '-O0')
-        else:
-            # TODO - add back -fvisibility-inlines-hidden
-            # https://github.com/mapnik/mapnik/issues/1863
-            env.Append(CXXFLAGS = common_cxx_flags + '-O%s' % (env['OPTIMIZATION']))
         if env['DEBUG_UNDEFINED']:
             env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
 




--- bindings/python/mapnik_text_placement.cpp.orig	2013-09-14 06:44:28.000000000 +0400
+++ bindings/python/mapnik_text_placement.cpp	2013-09-14 06:46:57.000000000 +0400
@@ -194,7 +194,11 @@
     ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
     {
         stl_input_iterator<formatting::node_ptr> begin(l), end;
-        children_.insert(children_.end(), begin, end);
+        while (begin != end)
+        {
+           children_.push_back(*begin);
+           ++begin;
+        }
     }
 
     /* TODO: Add constructor taking variable number of arguments.




Obtained from:	https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53
		https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb

--- plugins/input/ogr/ogr_datasource.cpp.orig	2013-06-04 01:35:27 UTC
+++ plugins/input/ogr/ogr_datasource.cpp
@@ -72,7 +72,11 @@ ogr_datasource::~ogr_datasource()
 {
     // free layer before destroying the datasource
     layer_.free_layer();
+#if GDAL_VERSION_MAJOR >= 2
+    GDALClose(( GDALDatasetH) dataset_);
+#else
     OGRDataSource::DestroyDataSource (dataset_);
+#endif
 }
 
 void ogr_datasource::init(mapnik::parameters const& params)
@@ -82,6 +86,7 @@ void ogr_datasource::init(mapnik::parame
 #endif
 
     // initialize ogr formats
+    // NOTE: in GDAL >= 2.0 this is the same as GDALAllRegister()
     OGRRegisterAll();
 
     boost::optional<std::string> file = params.get<std::string>("file");
@@ -112,17 +117,26 @@ void ogr_datasource::init(mapnik::parame
 
     if (! driver.empty())
     {
+#if GDAL_VERSION_MAJOR >= 2
+        unsigned int nOpenFlags = GDAL_OF_READONLY | GDAL_OF_VECTOR;
+        const char* papszAllowedDrivers[] = { driver.c_str(), NULL };
+        dataset_ = static_cast<gdal_dataset_type>(GDALOpenEx(dataset_name_.c_str(),nOpenFlags,papszAllowedDrivers,NULL,NULL));
+#else
         OGRSFDriver * ogr_driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driver.c_str());
         if (ogr_driver && ogr_driver != NULL)
         {
             dataset_ = ogr_driver->Open((dataset_name_).c_str(), FALSE);
         }
-
+#endif
     }
     else
     {
         // open ogr driver
-        dataset_ = OGRSFDriverRegistrar::Open((dataset_name_).c_str(), FALSE);
+#if GDAL_VERSION_MAJOR >= 2
+        dataset_ = static_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), FALSE, NULL));
+#else
+        dataset_ = OGRSFDriverRegistrar::Open(dataset_name_.c_str(), FALSE);
+#endif
     }
 
     if (! dataset_)




Obtained from:	https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53

--- plugins/input/ogr/ogr_datasource.hpp.orig
+++ plugins/input/ogr/ogr_datasource.hpp
@@ -63,7 +63,7 @@ class ogr_datasource : public mapnik::datasource
     mapnik::datasource::datasource_t type_;
     std::string dataset_name_;
     std::string index_name_;
-    OGRDataSource* dataset_;
+    gdal_dataset_type dataset_;
     ogr_layer_ptr layer_;
     std::string layer_name_;
     mapnik::layer_descriptor desc_;




Obtained from:	https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53
		https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb

--- plugins/input/ogr/ogr_layer_ptr.hpp.orig
+++ plugins/input/ogr/ogr_layer_ptr.hpp
@@ -29,9 +29,16 @@
 // stl
 #include <stdexcept>
 
-// ogr
+// gdal
+#include <gdal_version.h>
 #include <ogrsf_frmts.h>
 
+#if GDAL_VERSION_MAJOR >= 2
+typedef GDALDataset* gdal_dataset_type;
+#else
+typedef OGRDataSource* gdal_dataset_type;
+#endif
+
 class ogr_layer_ptr
 {
 public:
@@ -62,7 +69,7 @@ class ogr_layer_ptr
         is_valid_ = false;
     }
 
-    void layer_by_name(OGRDataSource* const datasource,
+    void layer_by_name(gdal_dataset_type const datasource,
                        std::string const& layer_name)
     {
         free_layer();
@@ -84,7 +91,7 @@ class ogr_layer_ptr
 #endif
     }
 
-    void layer_by_index(OGRDataSource* const datasource,
+    void layer_by_index(gdal_dataset_type const datasource,
                         int layer_index)
     {
         free_layer();
@@ -110,7 +117,7 @@ class ogr_layer_ptr
 #endif
     }
 
-    void layer_by_sql(OGRDataSource* const datasource,
+    void layer_by_sql(gdal_dataset_type const datasource,
                       std::string const& layer_sql)
     {
         free_layer();
@@ -179,7 +186,7 @@ class ogr_layer_ptr
     }
 #endif
 
-    OGRDataSource* datasource_;
+    gdal_dataset_type datasource_;
     OGRLayer* layer_;
     std::string layer_name_;
     bool owns_layer_;




--- src/build.py.orig	2012-08-24 01:57:06.000000000 +0400
+++ src/build.py	2012-09-16 19:38:43.000000000 +0400
@@ -357,7 +357,11 @@
 
     major, minor, micro = ABI_VERSION
 
-    soFile = "%s.%d.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor), int(micro))
+    if env['PLATFORM'] == 'FreeBSD':
+        soFile = "%s.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor))
+    else:
+        soFile = "%s.%d.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor), int(micro))
+
     target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
 
     if 'uninstall' not in COMMAND_LINE_TARGETS:
@@ -372,8 +376,13 @@
 
 
     # Install symlinks
-    target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % \
-        (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major), int(minor)))
+    if env['PLATFORM'] == 'FreeBSD':
+        target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d" % \
+              (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major)))
+    else:
+        target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % \
+              (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major), int(minor)))
+
     target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])))
     if 'uninstall' not in COMMAND_LINE_TARGETS:
         link1 = env.Command(target1, target, symlink)




--- tests/cpp_tests/conversions_test.cpp.orig	2013-06-30 22:35:29.000000000 +0400
+++ tests/cpp_tests/conversions_test.cpp	2013-06-30 22:38:32.000000000 +0400
@@ -166,31 +166,31 @@
         BOOST_TEST_EQ( out,  "1e+09" );
         out.clear();
 
-        to_string(out, double(10000000000));
+        to_string(out, double(10000000000ULL));
         BOOST_TEST_EQ( out,  "1e+10" );
         out.clear();
 
-        to_string(out, double(100000000000));
+        to_string(out, double(100000000000ULL));
         BOOST_TEST_EQ( out,  "1e+11" );
         out.clear();
 
-        to_string(out, double(1000000000000));
+        to_string(out, double(1000000000000ULL));
         BOOST_TEST_EQ( out,  "1e+12" );
         out.clear();
 
-        to_string(out, double(10000000000000));
+        to_string(out, double(10000000000000ULL));
         BOOST_TEST_EQ( out,  "1e+13" );
         out.clear();
 
-        to_string(out, double(100000000000000));
+        to_string(out, double(100000000000000ULL));
         BOOST_TEST_EQ( out,  "1e+14" );
         out.clear();
 
-        to_string(out, double(1000000000000005));
+        to_string(out, double(1000000000000005ULL));
         BOOST_TEST_EQ( out,  "1e+15" );
         out.clear();
 
-        to_string(out, double(-1000000000000000));
+        to_string(out, double(-1000000000000000LL));
         BOOST_TEST_EQ( out,  "-1e+15" );
         out.clear();
 
@@ -210,7 +210,7 @@
         BOOST_TEST_EQ( out,  "67.35" );
         out.clear();
 
-        to_string(out, double(1234000000000000));
+        to_string(out, double(1234000000000000ULL));
         BOOST_TEST_EQ( out,  "1.234e+15" );
         out.clear();
 
@@ -235,16 +235,16 @@
         BOOST_TEST_EQ( out, "-2" );
         out.clear();
 
-        to_string(out, int(2147483647));
+        to_string(out, int(2147483647ULL));
         BOOST_TEST_EQ( out, "2147483647" );
         out.clear();
 
-        to_string(out, int(-2147483648));
+        to_string(out, int(-2147483648LL));
         BOOST_TEST_EQ( out, "-2147483648" );
         out.clear();
 
         // unsigned
-        to_string(out, unsigned(4294967295));
+        to_string(out, unsigned(4294967295ULL));
         BOOST_TEST_EQ( out, "4294967295" );
         out.clear();
 
@@ -258,7 +258,7 @@
         BOOST_TEST_EQ( out, "-2" );
         out.clear();
 
-        to_string(out,mapnik::value_integer(9223372036854775807));
+        to_string(out,mapnik::value_integer(9223372036854775807ULL));
         BOOST_TEST_EQ( out, "9223372036854775807" );
         out.clear();
 #else




bin/mapnik-config
bin/mapnik-index
bin/mapnik-render
bin/shapeindex
bin/upgrade_map_xml.py
include/mapnik/agg/agg_alpha_mask_u8.h
include/mapnik/agg/agg_arc.h
include/mapnik/agg/agg_array.h

include/mapnik/agg/agg_conv_bspline.h
include/mapnik/agg/agg_conv_clip_polygon.h
include/mapnik/agg/agg_conv_clip_polyline.h
include/mapnik/agg/agg_conv_clipper.h
include/mapnik/agg/agg_conv_close_polygon.h
include/mapnik/agg/agg_conv_concat.h
include/mapnik/agg/agg_conv_contour.h

include/mapnik/agg/agg_conv_gpc.h
include/mapnik/agg/agg_conv_marker.h
include/mapnik/agg/agg_conv_marker_adaptor.h
include/mapnik/agg/agg_conv_offset.h
include/mapnik/agg/agg_conv_segmentator.h
include/mapnik/agg/agg_conv_shorten_path.h
include/mapnik/agg/agg_conv_smooth_poly1.h

include/mapnik/agg/agg_path_storage_integer.h
include/mapnik/agg/agg_pattern_filters_rgba.h
include/mapnik/agg/agg_pixfmt_amask_adaptor.h
include/mapnik/agg/agg_pixfmt_base.h
include/mapnik/agg/agg_pixfmt_gray.h
include/mapnik/agg/agg_pixfmt_rgb.h
include/mapnik/agg/agg_pixfmt_rgb_packed.h

include/mapnik/agg/agg_vpgen_clip_polygon.h
include/mapnik/agg/agg_vpgen_clip_polyline.h
include/mapnik/agg/agg_vpgen_segmentator.h
include/mapnik/agg/clipper.hpp
include/mapnik/agg_helpers.hpp
include/mapnik/agg_pattern_source.hpp
include/mapnik/agg_rasterizer.hpp
include/mapnik/agg_render_marker.hpp
include/mapnik/agg_renderer.hpp
include/mapnik/attribute.hpp
include/mapnik/attribute_collector.hpp

include/mapnik/attribute_descriptor.hpp
include/mapnik/boolean.hpp
include/mapnik/box2d.hpp
include/mapnik/cairo/cairo_context.hpp
include/mapnik/cairo/cairo_image_util.hpp
include/mapnik/cairo/cairo_render_vector.hpp
include/mapnik/cairo/cairo_renderer.hpp
include/mapnik/cairo_io.hpp
include/mapnik/color.hpp
include/mapnik/color_factory.hpp
include/mapnik/config.hpp
include/mapnik/config_error.hpp
include/mapnik/coord.hpp
include/mapnik/coord_array.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/css_color_grammar_impl.hpp
include/mapnik/csv/csv_grammar.hpp
include/mapnik/datasource.hpp
include/mapnik/datasource_cache.hpp
include/mapnik/datasource_geometry_type.hpp
include/mapnik/debug.hpp
include/mapnik/debug_symbolizer.hpp
include/mapnik/distance.hpp
include/mapnik/ellipsoid.hpp
include/mapnik/enumeration.hpp
include/mapnik/evaluate_global_attributes.hpp
include/mapnik/expression.hpp
include/mapnik/expression_evaluator.hpp
include/mapnik/expression_grammar.hpp

include/mapnik/expression_node_types.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_kv_iterator.hpp
include/mapnik/feature_layer_desc.hpp
include/mapnik/feature_style_processor.hpp
include/mapnik/feature_style_processor_context.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/feature_type_style.hpp
include/mapnik/featureset.hpp
include/mapnik/filter_factory.hpp
include/mapnik/filter_featureset.hpp
include/mapnik/font_engine_freetype.hpp
include/mapnik/font_set.hpp
include/mapnik/function_call.hpp
include/mapnik/formatting/base.hpp
include/mapnik/formatting/expression_format.hpp
include/mapnik/formatting/format.hpp
include/mapnik/formatting/list.hpp
include/mapnik/formatting/registry.hpp
include/mapnik/formatting/text.hpp
include/mapnik/gamma_method.hpp
include/mapnik/geom_util.hpp
include/mapnik/geometry.hpp
include/mapnik/geometry_adapters.hpp
include/mapnik/geometry_centroid.hpp
include/mapnik/geometry_correct.hpp
include/mapnik/geometry_envelope.hpp
include/mapnik/geometry_envelope_impl.hpp
include/mapnik/geometry_fusion_adapted.hpp
include/mapnik/geometry_is_empty.hpp
include/mapnik/geometry_is_simple.hpp
include/mapnik/geometry_is_valid.hpp
include/mapnik/geometry_remove_empty.hpp
include/mapnik/geometry_reprojection.hpp
include/mapnik/geometry_reprojection_impl.hpp
include/mapnik/geometry_strategy.hpp
include/mapnik/geometry_to_path.hpp
include/mapnik/geometry_transform.hpp
include/mapnik/geometry_type.hpp
include/mapnik/geometry_types.hpp
include/mapnik/geometry_unique.hpp
include/mapnik/global.hpp
include/mapnik/gradient.hpp
include/mapnik/graphics.hpp
include/mapnik/grid/grid.hpp
include/mapnik/grid/grid_marker_helpers.hpp
include/mapnik/grid/grid_pixel.hpp
include/mapnik/grid/grid_pixfmt.hpp
include/mapnik/grid/grid_rasterizer.hpp
include/mapnik/grid/grid_render_marker.hpp
include/mapnik/grid/grid_renderer.hpp
include/mapnik/grid/grid_renderer_base.hpp
include/mapnik/grid/grid_rendering_buffer.hpp
include/mapnik/grid/grid_util.hpp
include/mapnik/grid/grid_view.hpp
include/mapnik/group/group_layout.hpp
include/mapnik/group/group_layout_manager.hpp
include/mapnik/group/group_rule.hpp
include/mapnik/group/group_symbolizer_helper.hpp
include/mapnik/group/group_symbolizer_properties.hpp
include/mapnik/hextree.hpp
include/mapnik/hit_test_filter.hpp
include/mapnik/image.hpp
include/mapnik/image_any.hpp
include/mapnik/image_compositing.hpp
include/mapnik/image_copy.hpp
include/mapnik/image_filter.hpp
include/mapnik/image_filter_grammar.hpp
include/mapnik/image_filter_grammar_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_impl.hpp
include/mapnik/image_null.hpp
include/mapnik/image_options.hpp
include/mapnik/image_reader.hpp
include/mapnik/image_scaling.hpp
include/mapnik/image_scaling_traits.hpp
include/mapnik/image_util.hpp
include/mapnik/image_util_jpeg.hpp
include/mapnik/image_util_png.hpp
include/mapnik/image_util_tiff.hpp
include/mapnik/image_util_webp.hpp
include/mapnik/image_view.hpp
include/mapnik/image_view_any.hpp
include/mapnik/image_view_impl.hpp
include/mapnik/image_view_null.hpp
include/mapnik/jpeg_io.hpp
include/mapnik/json/error_handler.hpp
include/mapnik/json/extract_bounding_box_grammar.hpp
include/mapnik/json/extract_bounding_box_grammar_impl.hpp
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_grammar_impl.hpp
include/mapnik/json/feature_generator.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_generator_grammar_impl.hpp
include/mapnik/json/feature_grammar.hpp
include/mapnik/json/feature_grammar_impl.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/generic_json.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_generator_grammar_impl.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/json/geometry_grammar_impl.hpp
include/mapnik/json/geometry_parser.hpp
include/mapnik/json/geometry_util.hpp
include/mapnik/json/positions_grammar.hpp
include/mapnik/json/positions_grammar_impl.hpp
include/mapnik/json/properties_generator_grammar.hpp
include/mapnik/json/properties_generator_grammar_impl.hpp
include/mapnik/json/symbolizer_grammar.hpp
include/mapnik/json/topojson_grammar.hpp
include/mapnik/json/topojson_grammar_impl.hpp
include/mapnik/json/topojson_utils.hpp
include/mapnik/json/topology.hpp
include/mapnik/json/value_converters.hpp
include/mapnik/label_collision_detector.hpp
include/mapnik/layer.hpp
include/mapnik/line_pattern_symbolizer.hpp
include/mapnik/line_symbolizer.hpp
include/mapnik/load_map.hpp
include/mapnik/make_unique.hpp
include/mapnik/map.hpp
include/mapnik/mapped_memory_cache.hpp
include/mapnik/marker.hpp

include/mapnik/marker_cache.hpp
include/mapnik/marker_helpers.hpp
include/mapnik/markers_placement.hpp
include/mapnik/markers_placements/interior.hpp
include/mapnik/markers_placements/line.hpp
include/mapnik/markers_placements/point.hpp
include/mapnik/markers_placements/vertext_first.hpp
include/mapnik/markers_placements/vertext_last.hpp
include/mapnik/memory_datasource.hpp
include/mapnik/memory_featureset.hpp
include/mapnik/miniz_png.hpp
include/mapnik/noncopyable.hpp
include/mapnik/octree.hpp
include/mapnik/offset_converter.hpp
include/mapnik/palette.hpp

include/mapnik/params_impl.hpp
include/mapnik/parse_path.hpp
include/mapnik/parse_transform.hpp
include/mapnik/path.hpp
include/mapnik/path_expression.hpp
include/mapnik/path_expression_grammar.hpp
include/mapnik/path_expression_grammar_impl.hpp
include/mapnik/pixel_position.hpp
include/mapnik/pixel_types.hpp
include/mapnik/plugin.hpp
include/mapnik/png_io.hpp
include/mapnik/point_symbolizer.hpp
include/mapnik/polygon_clipper.hpp
include/mapnik/polygon_pattern_symbolizer.hpp
include/mapnik/polygon_symbolizer.hpp
include/mapnik/pool.hpp
include/mapnik/proj_strategy.hpp
include/mapnik/proj_transform.hpp
include/mapnik/projection.hpp
include/mapnik/ptree_helpers.hpp

include/mapnik/query.hpp
include/mapnik/raster.hpp
include/mapnik/raster_colorizer.hpp
include/mapnik/renderer_common.hpp
include/mapnik/request.hpp
include/mapnik/rule.hpp
include/mapnik/rule_cache.hpp
include/mapnik/safe_cast.hpp
include/mapnik/save_map.hpp
include/mapnik/scale_denominator.hpp
include/mapnik/segment.hpp
include/mapnik/shield_symbolizer.hpp
include/mapnik/simplify.hpp
include/mapnik/simplify_converter.hpp
include/mapnik/span_image_filter.hpp
include/mapnik/sparsehash/dense_hash_map
include/mapnik/sparsehash/internal/densehashtable.h
include/mapnik/sparsehash/internal/hashtable-common.h

include/mapnik/sparsehash/template_util.h
include/mapnik/sparsehash/type_traits.h
include/mapnik/sql_utils.hpp
include/mapnik/sse.hpp
include/mapnik/svg/geometry_svg_generator.hpp
include/mapnik/svg/geometry_svg_generator_impl.hpp
include/mapnik/svg/svg_converter.hpp
include/mapnik/svg/svg_parser.hpp
include/mapnik/svg/svg_parser_exception.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_storage.hpp
include/mapnik/svg/svg_transform_grammar.hpp
include/mapnik/symbolizer.hpp
include/mapnik/symbolizer_base.hpp
include/mapnik/symbolizer_default_values.hpp
include/mapnik/symbolizer_dispatch.hpp
include/mapnik/symbolizer_enumerations.hpp
include/mapnik/symbolizer_hash.hpp
include/mapnik/symbolizer_keys.hpp
include/mapnik/symbolizer_utils.hpp
include/mapnik/text/evaluated_format_properties_ptr.hpp
include/mapnik/text/face.hpp
include/mapnik/text/font_feature_settings.hpp
include/mapnik/text/font_library.hpp
include/mapnik/text/formatting/base.hpp
include/mapnik/text/formatting/format.hpp
include/mapnik/text/formatting/layout.hpp
include/mapnik/text/formatting/list.hpp
include/mapnik/text/formatting/registry.hpp
include/mapnik/text/formatting/text.hpp
include/mapnik/text/glyph_info.hpp
include/mapnik/text/glyph_positions.hpp
include/mapnik/text/harfbuzz_shaper.hpp
include/mapnik/text/icu_shaper.hpp
include/mapnik/text/itemizer.hpp
include/mapnik/text/placement_finder.hpp
include/mapnik/text/placement_finder_impl.hpp
include/mapnik/text/placements/base.hpp
include/mapnik/text/placements/dummy.hpp
include/mapnik/text/placements/list.hpp
include/mapnik/text/placements/registry.hpp
include/mapnik/text/placements/simple.hpp
include/mapnik/text/properties_util.hpp
include/mapnik/text/renderer.hpp
include/mapnik/text/rotation.hpp
include/mapnik/text/scrptrun.hpp
include/mapnik/text/symbolizer_helpers.hpp
include/mapnik/text/text_layout.hpp
include/mapnik/text/text_line.hpp
include/mapnik/text/text_properties.hpp
include/mapnik/tiff_io.hpp
include/mapnik/timer.hpp
include/mapnik/tolerance_iterator.hpp
include/mapnik/transform_expression.hpp
include/mapnik/transform_expression_grammar.hpp
include/mapnik/transform_expression_grammar_impl.hpp
include/mapnik/transform_path_adapter.hpp
include/mapnik/transform_processor.hpp
include/mapnik/unicode.hpp
include/mapnik/util/const_rendering_buffer.hpp
include/mapnik/util/container_adapter.hpp
include/mapnik/util/conversions.hpp
include/mapnik/util/dasharray_parser.hpp
include/mapnik/util/feature_to_geojson.hpp
include/mapnik/util/featureset_buffer.hpp
include/mapnik/util/file_io.hpp
include/mapnik/util/fs.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_to_ds_type.hpp
include/mapnik/util/geometry_to_geojson.hpp
include/mapnik/util/geometry_to_svg.hpp
include/mapnik/util/geometry_to_wkb.hpp
include/mapnik/util/geometry_to_wkt.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/util/hsl.hpp
include/mapnik/util/is_clockwise.hpp
include/mapnik/util/math.hpp
include/mapnik/util/noncopyable.hpp
include/mapnik/util/path_iterator.hpp
include/mapnik/util/recursive_wrapper.hpp
include/mapnik/util/rounding_cast.hpp
include/mapnik/util/singleton.hpp
include/mapnik/util/spatial_index.hpp
include/mapnik/util/spirit_transform_attribute.hpp
include/mapnik/util/timer.hpp
include/mapnik/util/trim.hpp
include/mapnik/util/utf_conv_win.hpp
include/mapnik/util/variant.hpp
include/mapnik/util/variant_io.hpp
include/mapnik/value.hpp
include/mapnik/value_error.hpp
include/mapnik/value_hash.hpp
include/mapnik/value_types.hpp
include/mapnik/version.hpp
include/mapnik/vertex.hpp
include/mapnik/vertex_adapters.hpp
include/mapnik/vertex_cache.hpp
include/mapnik/vertex_converters.hpp
include/mapnik/vertex_processor.hpp
include/mapnik/vertex_vector.hpp
include/mapnik/view_strategy.hpp
include/mapnik/view_transform.hpp
include/mapnik/warning_ignore.hpp
include/mapnik/warp.hpp
include/mapnik/webp_io.hpp
include/mapnik/well_known_srs.hpp
include/mapnik/wkb.hpp
include/mapnik/wkt/wkt_factory.hpp
include/mapnik/wkt/wkt_generator_grammar.hpp
include/mapnik/wkt/wkt_generator_grammar_impl.hpp
include/mapnik/wkt/wkt_grammar.hpp
include/mapnik/wkt/wkt_grammar_impl.hpp
include/mapnik/xml_attribute_cast.hpp
include/mapnik/xml_loader.hpp
include/mapnik/xml_node.hpp
include/mapnik/xml_tree.hpp
lib/libmapnik-json.a
lib/libmapnik-wkt.a
lib/libmapnik.so
lib/libmapnik.so.3.0
lib/libmapnik.so.3.0.9
lib/mapnik/fonts/DejaVuSans-Bold.ttf
lib/mapnik/fonts/DejaVuSans-BoldOblique.ttf
lib/mapnik/fonts/DejaVuSans-ExtraLight.ttf

lib/mapnik/fonts/DejaVuSerifCondensed-BoldItalic.ttf
lib/mapnik/fonts/DejaVuSerifCondensed-Italic.ttf
lib/mapnik/fonts/DejaVuSerifCondensed.ttf
lib/mapnik/fonts/unifont-8.0.01.ttf
@comment =====[ Uncomment these after boost 1.60 hits the tree ]=====
@comment lib/mapnik/input/csv.input
%%GDAL%%lib/mapnik/input/gdal.input
@comment lib/mapnik/input/geojson.input
%%OGR%%lib/mapnik/input/ogr.input
%%PGRASTER%%lib/mapnik/input/pgraster.input
%%POSTGIS%%lib/mapnik/input/postgis.input
lib/mapnik/input/python.input
lib/mapnik/input/raster.input
lib/mapnik/input/shape.input
%%SQLITE3%%lib/mapnik/input/sqlite.input
@comment lib/mapnik/input/topojson.input
%%PYTHON_SITELIBDIR%%/mapnik/printing.py
%%PYTHON_SITELIBDIR%%/mapnik/paths.py
%%PYTHON_SITELIBDIR%%/mapnik/_mapnik.so
%%PYTHON_SITELIBDIR%%/mapnik2/__init__.py

Return to bug 207060

Lines 2-10 Link Here

(-)Makefile (-93 / +59 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mapnik	4	PORTNAME= mapnik
5	PORTVERSION= 2.2.0	5	PORTVERSION= 3.0.9
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 15
8	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
9	MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/	8	MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
10		9
Lines 11-126 Link Here
11	MAINTAINER= littlesavage@rambler.ru	10	MAINTAINER= littlesavage@rambler.ru
12	COMMENT= Free Toolkit For Developing Mapping Applications	11	COMMENT= Free Toolkit For Developing Mapping Applications
13		12
14	LICENSE= LGPL21	13	LICENSE= LGPL21+
15	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
16		15
17	LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \	16	LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu \
18	libicuuc.so:${PORTSDIR}/devel/icu \
19	libboost_system.so:${PORTSDIR}/devel/boost-libs \	17	libboost_system.so:${PORTSDIR}/devel/boost-libs \
20	libboost_python.so:${PORTSDIR}/devel/boost-python-libs	18	libfreetype.so:${PORTSDIR}/print/freetype2 \
21	BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \	19	libharfbuzz.so:${PORTSDIR}/print/harfbuzz
22	${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu
23		20
24	USES= pkgconfig python scons tar:bzip2	21	BROKEN_powerpc= does not install: runs out of virtual memory
		22	BROKEN_FreeBSD_9= does not build: lack of c++11 support
		23
		24	USES= compiler:c++11-lib pkgconfig python scons tar:bzip2
25	USE_GNOME= libxml2	25	USE_GNOME= libxml2
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
27	WARNING_CXXFLAGS?= -w	27	MAKE_ARGS= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} \| ${TR} ' ' ,`" \
		28	CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \
		29	CUSTOM_LDFLAGS="${LDFLAGS}"
28		30
29	INPUT_PLUGINS= geojson python raster shape	31	PORTDOCS= *
30		32
31	NO_OPTIONS_SORT= yes	33	INPUT_PLUGINS= csv raster shape geojson topojson
32	OPTIONS_DEFINE= CAIRO CSV GDAL OGR OSM POSTGIS SQLITE3 JPEG PNG TIFF
33	OPTIONS_DEFAULT= CAIRO CSV GDAL OGR OSM POSTGIS SQLITE3 JPEG PNG TIFF
34		34
35	CAIRO_DESC= Enable cairo rendering	35	OPTIONS_DEFINE= CAIRO JPEG PNG TIFF WEBP PROJ
36	CSV_DESC= CSV input plugin	36	OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP
		37	OPTIONS_GROUP= INPUT
		38	OPTIONS_GROUP_INPUT= GDAL OGR POSTGIS PGRASTER SQLITE3
		39	OPTIONS_SUB= yes
		40
		41	INPUT_DESC= Input plugins
37	GDAL_DESC= GDAL input plugin	42	GDAL_DESC= GDAL input plugin
38	OGR_DESC= OGR input plugin	43	OGR_DESC= OGR input plugin
39	OSM_DESC= OSM input plugin
40	POSTGIS_DESC= PostGIS input plugin	44	POSTGIS_DESC= PostGIS input plugin
		45	PGRASTER_DESC= PGraster input plugin
41	SQLITE3_DESC= SQLite input plugin	46	SQLITE3_DESC= SQLite input plugin
42		47
43	OPTIONS_SUB= yes	48	PROJ_DESC= proj4 support
44		49
45	PORTDOCS= *	50	CAIRO_DESC= Enable cairo rendering
46		51
47	DOCSRCDIR1= ${WRKSRC}	52	GDAL_VARS= INPUT_PLUGINS+=gdal
48	DOC_FILES1= AUTHORS.md CHANGELOG.md README.md	53	GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal
		54	OGR_VARS= INPUT_PLUGINS+=ogr
		55	OGR_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal
		56	POSTGIS_VARS= INPUT_PLUGINS+=postgis
		57	POSTGIS_USES= pgsql
		58	PGRASTER_VARS= INPUT_PLUGINS+=pgraster
		59	PGRASTER_USES= pgsql
		60	SQLITE3_VARS= INPUT_PLUGINS+=sqlite
		61	SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
49		62
50	DOCSRCDIR2= ${WRKSRC}/docs	63	PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
51	DOCSDIR2= ${DOCSDIR}/docs	64	PNG_MAKE_ARGS_OFF= PNG=False
52	DOC_FILES2= *	65	JPEG_USES= jpeg
		66	JPEG_MAKE_ARGS_OFF= JPEG=False
		67	TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff
		68	TIFF_MAKE_ARGS_OFF= TIFF=False
		69	WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
		70	WEBP_MAKE_ARGS_OFF= WEBP=False
		71	PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj
		72	PROJ_MAKE_ARGS_OFF= PROJ=False
53		73
54	.include <bsd.port.options.mk>	74	CAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo
		75	CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
		76	CAIRO_MAKE_ARGS_OFF= CAIRO=False
55		77
56	.if ${PORT_OPTIONS:MCAIRO}
57	LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo
58	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo
59	.else
60	MAKE_ARGS+= CAIRO=False
61	.endif
62
63	.if ${PORT_OPTIONS:MCSV}
64	INPUT_PLUGINS+= csv
65	.endif
66
67	.if ${PORT_OPTIONS:MGDAL}
68	INPUT_PLUGINS+= gdal
69	LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal
70	.endif
71
72	.if ${PORT_OPTIONS:MOGR}
73	INPUT_PLUGINS+= ogr
74	LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal
75	.endif
76
77	.if ${PORT_OPTIONS:MOSM}
78	INPUT_PLUGINS+= osm
79	LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
80	.endif
81
82	.if ${PORT_OPTIONS:MPOSTGIS}
83	INPUT_PLUGINS+= postgis
84	USES+= pgsql
85	.endif
86
87	.if ${PORT_OPTIONS:MSQLITE3}
88	INPUT_PLUGINS+= sqlite
89	LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3
90	BUILD_DEPENDS+= sqlite3>=3.7.12:${PORTSDIR}/databases/sqlite3
91	.endif
92
93	.if ${PORT_OPTIONS:MJPEG}
94	USES+= jpeg
95	.else
96	MAKE_ARGS+= JPEG=False
97	.endif
98
99	.if ${PORT_OPTIONS:MPNG}
100	LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png
101	.else
102	MAKE_ARGS+= PNG=False
103	.endif
104
105	.if ${PORT_OPTIONS:MTIFF}
106	LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff
107	.else
108	MAKE_ARGS+= TIFF=False
109	.endif
110
111	.include <bsd.port.pre.mk>	78	.include <bsd.port.pre.mk>
112		79
113	.if ${ARCH} == "powerpc"	80	.if ${COMPILER_TYPE} == gcc
114	IGNORE= does not install: runs out of virtual memory	81	CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
115	.endif	82	.endif
116		83
117	MAKE_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS}	84	pre-configure-SQLITE3-on:
118	MAKE_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} \| ${TR} ' ' ,`"
119	MAKE_ARGS+= JOBS=${MAKE_JOBS_NUMBER}
120	MAKE_ARGS+= ${MAKE_ENV}
121
122	pre-configure:
123	.if ${PORT_OPTIONS:MSQLITE3}
124	@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \	85	@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \
125	${ECHO_MSG} "" ; \	86	${ECHO_MSG} "" ; \
126	${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \	87	${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \
Lines 128-134 Link Here
128	${ECHO_MSG} "" ; \	89	${ECHO_MSG} "" ; \
129	${FALSE} ; \	90	${FALSE} ; \
130	fi	91	fi
131	.endif
132		92
133	post-patch:	93	post-patch:
134	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \	94	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
Lines 136-144 Link Here
136	${WRKSRC}/SConstruct	96	${WRKSRC}/SConstruct
137		97
138	post-install:	98	post-install:
		99	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \
		100	${STAGEDIR}${PREFIX}/bin/mapnik-render \
		101	${STAGEDIR}${PREFIX}/bin/shapeindex
		102	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
		103	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input
		104
		105	post-install-DOCS-on:
139	@${MKDIR} ${STAGEDIR}${DOCSDIR}	106	@${MKDIR} ${STAGEDIR}${DOCSDIR}
140	${INSTALL_DATA} ${DOC_FILES1:S\|^\|${DOCSRCDIR1}/\|} ${STAGEDIR}${DOCSDIR}	107	@cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS.md CHANGELOG.md README.md docs" \
141	@${MKDIR} ${STAGEDIR}${DOCSDIR2}	108	${STAGEDIR}${DOCSDIR}
142	${INSTALL_DATA} ${DOC_FILES2:S\|^\|${DOCSRCDIR2}/\|} ${STAGEDIR}${DOCSDIR2}
143		109
144	.include <bsd.port.post.mk>	110	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-SConstruct (+13 lines)
	1	--- SConstruct.orig 2016-02-15 15:52:54 UTC
	2	+++ SConstruct
	3	@@ -1789,10 +1789,6 @@ if not preconfigured:
	4
	5	if env['DEBUG']:
	6	env.Append(CXXFLAGS = common_cxx_flags + '-O0')
	7	- else:
	8	- # TODO - add back -fvisibility-inlines-hidden
	9	- # https://github.com/mapnik/mapnik/issues/1863
	10	- env.Append(CXXFLAGS = common_cxx_flags + '-O%s' % (env['OPTIMIZATION']))
	11	if env['DEBUG_UNDEFINED']:
	12	env.Append(CXXFLAGS = '-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv -fwrapv')
	13

Lines 1-15 Link Here

(-)files/patch-bindings-python-mapnik_text_placement.cpp (-15 lines)
1	--- bindings/python/mapnik_text_placement.cpp.orig 2013-09-14 06:44:28.000000000 +0400
2	+++ bindings/python/mapnik_text_placement.cpp 2013-09-14 06:46:57.000000000 +0400
3	@@ -194,7 +194,11 @@
4	ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
5	{
6	stl_input_iterator<formatting::node_ptr> begin(l), end;
7	- children_.insert(children_.end(), begin, end);
8	+ while (begin != end)
9	+ {
10	+ children_.push_back(*begin);
11	+ ++begin;
12	+ }
13	}
14
15	/* TODO: Add constructor taking variable number of arguments.

Lines 1-54 Link Here

(-)files/patch-plugins-input-ogr-ogr_datasource.cpp (-54 lines)
1	Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53
2	https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb
3
4	--- plugins/input/ogr/ogr_datasource.cpp.orig 2013-06-04 01:35:27 UTC
5	+++ plugins/input/ogr/ogr_datasource.cpp
6	@@ -72,7 +72,11 @@ ogr_datasource::~ogr_datasource()
7	{
8	// free layer before destroying the datasource
9	layer_.free_layer();
10	+#if GDAL_VERSION_MAJOR >= 2
11	+ GDALClose(( GDALDatasetH) dataset_);
12	+#else
13	OGRDataSource::DestroyDataSource (dataset_);
14	+#endif
15	}
16
17	void ogr_datasource::init(mapnik::parameters const& params)
18	@@ -82,6 +86,7 @@ void ogr_datasource::init(mapnik::parame
19	#endif
20
21	// initialize ogr formats
22	+ // NOTE: in GDAL >= 2.0 this is the same as GDALAllRegister()
23	OGRRegisterAll();
24
25	boost::optional<std::string> file = params.get<std::string>("file");
26	@@ -112,17 +117,26 @@ void ogr_datasource::init(mapnik::parame
27
28	if (! driver.empty())
29	{
30	+#if GDAL_VERSION_MAJOR >= 2
31	+ unsigned int nOpenFlags = GDAL_OF_READONLY \| GDAL_OF_VECTOR;
32	+ const char* papszAllowedDrivers[] = { driver.c_str(), NULL };
33	+ dataset_ = static_cast<gdal_dataset_type>(GDALOpenEx(dataset_name_.c_str(),nOpenFlags,papszAllowedDrivers,NULL,NULL));
34	+#else
35	OGRSFDriver * ogr_driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driver.c_str());
36	if (ogr_driver && ogr_driver != NULL)
37	{
38	dataset_ = ogr_driver->Open((dataset_name_).c_str(), FALSE);
39	}
40	-
41	+#endif
42	}
43	else
44	{
45	// open ogr driver
46	- dataset_ = OGRSFDriverRegistrar::Open((dataset_name_).c_str(), FALSE);
47	+#if GDAL_VERSION_MAJOR >= 2
48	+ dataset_ = static_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), FALSE, NULL));
49	+#else
50	+ dataset_ = OGRSFDriverRegistrar::Open(dataset_name_.c_str(), FALSE);
51	+#endif
52	}
53
54	if (! dataset_)

Lines 1-13 Link Here

(-)files/patch-plugins-input-ogr-ogr_datasource.hpp (-13 lines)
1	Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53
2
3	--- plugins/input/ogr/ogr_datasource.hpp.orig
4	+++ plugins/input/ogr/ogr_datasource.hpp
5	@@ -63,7 +63,7 @@ class ogr_datasource : public mapnik::datasource
6	mapnik::datasource::datasource_t type_;
7	std::string dataset_name_;
8	std::string index_name_;
9	- OGRDataSource* dataset_;
10	+ gdal_dataset_type dataset_;
11	ogr_layer_ptr layer_;
12	std::string layer_name_;
13	mapnik::layer_descriptor desc_;

Lines 1-59 Link Here

(-)files/patch-plugins-input-ogr-ogr_layer_ptr.hpp (-59 lines)
1	Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53
2	https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb
3
4	--- plugins/input/ogr/ogr_layer_ptr.hpp.orig
5	+++ plugins/input/ogr/ogr_layer_ptr.hpp
6	@@ -29,9 +29,16 @@
7	// stl
8	#include <stdexcept>
9
10	-// ogr
11	+// gdal
12	+#include <gdal_version.h>
13	#include <ogrsf_frmts.h>
14
15	+#if GDAL_VERSION_MAJOR >= 2
16	+typedef GDALDataset* gdal_dataset_type;
17	+#else
18	+typedef OGRDataSource* gdal_dataset_type;
19	+#endif
20	+
21	class ogr_layer_ptr
22	{
23	public:
24	@@ -62,7 +69,7 @@ class ogr_layer_ptr
25	is_valid_ = false;
26	}
27
28	- void layer_by_name(OGRDataSource* const datasource,
29	+ void layer_by_name(gdal_dataset_type const datasource,
30	std::string const& layer_name)
31	{
32	free_layer();
33	@@ -84,7 +91,7 @@ class ogr_layer_ptr
34	#endif
35	}
36
37	- void layer_by_index(OGRDataSource* const datasource,
38	+ void layer_by_index(gdal_dataset_type const datasource,
39	int layer_index)
40	{
41	free_layer();
42	@@ -110,7 +117,7 @@ class ogr_layer_ptr
43	#endif
44	}
45
46	- void layer_by_sql(OGRDataSource* const datasource,
47	+ void layer_by_sql(gdal_dataset_type const datasource,
48	std::string const& layer_sql)
49	{
50	free_layer();
51	@@ -179,7 +186,7 @@ class ogr_layer_ptr
52	}
53	#endif
54
55	- OGRDataSource* datasource_;
56	+ gdal_dataset_type datasource_;
57	OGRLayer* layer_;
58	std::string layer_name_;
59	bool owns_layer_;

Lines 1-31 Link Here

(-)files/patch-src-build.py (-31 lines)
1	--- src/build.py.orig 2012-08-24 01:57:06.000000000 +0400
2	+++ src/build.py 2012-09-16 19:38:43.000000000 +0400
3	@@ -357,7 +357,11 @@
4
5	major, minor, micro = ABI_VERSION
6
7	- soFile = "%s.%d.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor), int(micro))
8	+ if env['PLATFORM'] == 'FreeBSD':
9	+ soFile = "%s.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor))
10	+ else:
11	+ soFile = "%s.%d.%d.%d" % (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])), int(major), int(minor), int(micro))
12	+
13	target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], soFile)
14
15	if 'uninstall' not in COMMAND_LINE_TARGETS:
16	@@ -372,8 +376,13 @@
17
18
19	# Install symlinks
20	- target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % \
21	- (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major), int(minor)))
22	+ if env['PLATFORM'] == 'FreeBSD':
23	+ target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d" % \
24	+ (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major)))
25	+ else:
26	+ target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % \
27	+ (os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])),int(major), int(minor)))
28	+
29	target2 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], os.path.basename(env.subst(env['MAPNIK_LIB_NAME'])))
30	if 'uninstall' not in COMMAND_LINE_TARGETS:
31	link1 = env.Command(target1, target, symlink)

Lines 1-79 Link Here

(-)files/patch-tests-cpp_tests-conversions_test.cpp (-79 lines)
1	--- tests/cpp_tests/conversions_test.cpp.orig 2013-06-30 22:35:29.000000000 +0400
2	+++ tests/cpp_tests/conversions_test.cpp 2013-06-30 22:38:32.000000000 +0400
3	@@ -166,31 +166,31 @@
4	BOOST_TEST_EQ( out, "1e+09" );
5	out.clear();
6
7	- to_string(out, double(10000000000));
8	+ to_string(out, double(10000000000ULL));
9	BOOST_TEST_EQ( out, "1e+10" );
10	out.clear();
11
12	- to_string(out, double(100000000000));
13	+ to_string(out, double(100000000000ULL));
14	BOOST_TEST_EQ( out, "1e+11" );
15	out.clear();
16
17	- to_string(out, double(1000000000000));
18	+ to_string(out, double(1000000000000ULL));
19	BOOST_TEST_EQ( out, "1e+12" );
20	out.clear();
21
22	- to_string(out, double(10000000000000));
23	+ to_string(out, double(10000000000000ULL));
24	BOOST_TEST_EQ( out, "1e+13" );
25	out.clear();
26
27	- to_string(out, double(100000000000000));
28	+ to_string(out, double(100000000000000ULL));
29	BOOST_TEST_EQ( out, "1e+14" );
30	out.clear();
31
32	- to_string(out, double(1000000000000005));
33	+ to_string(out, double(1000000000000005ULL));
34	BOOST_TEST_EQ( out, "1e+15" );
35	out.clear();
36
37	- to_string(out, double(-1000000000000000));
38	+ to_string(out, double(-1000000000000000LL));
39	BOOST_TEST_EQ( out, "-1e+15" );
40	out.clear();
41
42	@@ -210,7 +210,7 @@
43	BOOST_TEST_EQ( out, "67.35" );
44	out.clear();
45
46	- to_string(out, double(1234000000000000));
47	+ to_string(out, double(1234000000000000ULL));
48	BOOST_TEST_EQ( out, "1.234e+15" );
49	out.clear();
50
51	@@ -235,16 +235,16 @@
52	BOOST_TEST_EQ( out, "-2" );
53	out.clear();
54
55	- to_string(out, int(2147483647));
56	+ to_string(out, int(2147483647ULL));
57	BOOST_TEST_EQ( out, "2147483647" );
58	out.clear();
59
60	- to_string(out, int(-2147483648));
61	+ to_string(out, int(-2147483648LL));
62	BOOST_TEST_EQ( out, "-2147483648" );
63	out.clear();
64
65	// unsigned
66	- to_string(out, unsigned(4294967295));
67	+ to_string(out, unsigned(4294967295ULL));
68	BOOST_TEST_EQ( out, "4294967295" );
69	out.clear();
70
71	@@ -258,7 +258,7 @@
72	BOOST_TEST_EQ( out, "-2" );
73	out.clear();
74
75	- to_string(out,mapnik::value_integer(9223372036854775807));
76	+ to_string(out,mapnik::value_integer(9223372036854775807ULL));
77	BOOST_TEST_EQ( out, "9223372036854775807" );
78	out.clear();
79	#else