[135505] trunk/dports/gis/mapnik

[ryandesign at macports.org]

Revision: 135505
          https://trac.macports.org/changeset/135505
Author:   ryandesign at macports.org
Date:     2015-04-24 19:18:04 -0700 (Fri, 24 Apr 2015)
Log Message:
-----------
mapnik: update to 3.0.0-rc1 (#45944)

Modified Paths:
--------------
    trunk/dports/gis/mapnik/Portfile

Added Paths:
-----------
    trunk/dports/gis/mapnik/files/patch-plugins-input-geojson-geojson_datasource.hpp.diff

Removed Paths:
-------------
    trunk/dports/gis/mapnik/files/patch-bindings_python_mapnik_text_placement.cpp.diff

Modified: trunk/dports/gis/mapnik/Portfile
===================================================================
--- trunk/dports/gis/mapnik/Portfile	2015-04-25 02:05:44 UTC (rev 135504)
+++ trunk/dports/gis/mapnik/Portfile	2015-04-25 02:18:04 UTC (rev 135505)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        mapnik mapnik 2.2.0 v
-revision            3
+github.setup        mapnik mapnik 3.0.0-rc1 v
 categories          gis devel
 license             LGPL-2.1
 platforms           darwin
@@ -27,11 +26,9 @@
 
 homepage            http://mapnik.org
 
-conflicts           py26-mapnik
+checksums           rmd160  6a37a8daa8c1862618e636d41233bf78531b31d1 \
+                    sha256  2999b3cec80812bd87b7ad822188926aac9671a4c5d1a20caa4b3c0e55d8c207
 
-checksums           rmd160  2d02fe1ed28bbabe1adb309a74eac100ff5a204d \
-                    sha256  5500d5cccfe3d9ee1b8353a01688d807b4b2f422d1e17fbc90f75cc543e40398
-
 depends_lib-append  port:boost \
                     port:icu \
                     port:libpng \
@@ -109,11 +106,12 @@
     lappend input_plugins sqlite
 }
 
-default_variants    +python27
+if {![variant_isset python26]} {
+    default_variants    +python27
+}
 universal_variant   no
 
-# workaround for #41823 (c++11 compile error with boost 1.55+ and mapnik 2.2.0)
-patchfiles-append   patch-bindings_python_mapnik_text_placement.cpp.diff
+patchfiles          patch-plugins-input-geojson-geojson_datasource.hpp.diff
 
 configure.pkg_config ${prefix}/bin/pkg-config
 
@@ -206,10 +204,9 @@
 
 post-destroot {
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
-    eval xinstall -m 640 [glob ${worksrcpath}/docs/*] \
+    xinstall -m 644 -W ${worksrcpath} \
+        {*}[glob ${worksrcpath}/docs/*] AUTHORS.md CHANGELOG.md COPYING README.md \
         ${destroot}${prefix}/share/doc/${name}
-    xinstall -m 644 -W ${worksrcpath} AUTHORS.md CHANGELOG.md COPYING README.md \
-        ${destroot}${prefix}/share/doc/${name}
     xinstall -d -m 755 ${destroot}${prefix}/share/${name}
     copy ${worksrcpath}/demo ${destroot}${prefix}/share/${name}
 }

Deleted: trunk/dports/gis/mapnik/files/patch-bindings_python_mapnik_text_placement.cpp.diff
===================================================================
--- trunk/dports/gis/mapnik/files/patch-bindings_python_mapnik_text_placement.cpp.diff	2015-04-25 02:05:44 UTC (rev 135504)
+++ trunk/dports/gis/mapnik/files/patch-bindings_python_mapnik_text_placement.cpp.diff	2015-04-25 02:18:04 UTC (rev 135505)
@@ -1,16 +0,0 @@
---- bindings/python/mapnik_text_placement.cpp
-+++ bindings/python/mapnik_text_placement.cpp
-@@ -194,7 +194,11 @@ struct ListNodeWrap: formatting::list_node, wrapper<formatting::list_node>
-     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.
-

Added: trunk/dports/gis/mapnik/files/patch-plugins-input-geojson-geojson_datasource.hpp.diff
===================================================================
--- trunk/dports/gis/mapnik/files/patch-plugins-input-geojson-geojson_datasource.hpp.diff	                        (rev 0)
+++ trunk/dports/gis/mapnik/files/patch-plugins-input-geojson-geojson_datasource.hpp.diff	2015-04-25 02:18:04 UTC (rev 135505)
@@ -0,0 +1,17 @@
+Fix build with boost 1.57 and later
+https://github.com/mapnik/mapnik/commit/a65987af319f3a8a844198e302a8e8a0c0a4fe21
+--- plugins/input/geojson/geojson_datasource.hpp.orig
++++ plugins/input/geojson/geojson_datasource.hpp
+@@ -73,7 +73,12 @@ struct options_type<geojson_linear<Max,Min> >
+                          choose_by_content_diff_tag,
+                          split_default_tag,
+                          linear_tag,
++#if BOOST_VERSION >= 105700
++                         node_variant_static_tag>;
++#else
+                          node_s_mem_static_tag>;
++
++#endif
+ };
+ 
+ }}}}}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150424/f0ad884f/attachment.html>