<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135505] trunk/dports/gis/mapnik</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135505">135505</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-04-24 19:18:04 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mapnik: update to 3.0.0-rc1 (#45944)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgismapnikPortfile">trunk/dports/gis/mapnik/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgismapnikfilespatchpluginsinputgeojsongeojson_datasourcehppdiff">trunk/dports/gis/mapnik/files/patch-plugins-input-geojson-geojson_datasource.hpp.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgismapnikfilespatchbindings_python_mapnik_text_placementcppdiff">trunk/dports/gis/mapnik/files/patch-bindings_python_mapnik_text_placement.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgismapnikPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/mapnik/Portfile (135504 => 135505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup mapnik mapnik 2.2.0 v
-revision 3
</del><ins>+github.setup mapnik mapnik 3.0.0-rc1 v
</ins><span class="cx"> categories gis devel
</span><span class="cx"> license LGPL-2.1
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -27,11 +26,9 @@
</span><span class="cx">
</span><span class="cx"> homepage http://mapnik.org
</span><span class="cx">
</span><del>-conflicts py26-mapnik
</del><ins>+checksums rmd160 6a37a8daa8c1862618e636d41233bf78531b31d1 \
+ sha256 2999b3cec80812bd87b7ad822188926aac9671a4c5d1a20caa4b3c0e55d8c207
</ins><span class="cx">
</span><del>-checksums rmd160 2d02fe1ed28bbabe1adb309a74eac100ff5a204d \
- sha256 5500d5cccfe3d9ee1b8353a01688d807b4b2f422d1e17fbc90f75cc543e40398
-
</del><span class="cx"> depends_lib-append port:boost \
</span><span class="cx"> port:icu \
</span><span class="cx"> port:libpng \
</span><span class="lines">@@ -109,11 +106,12 @@
</span><span class="cx"> lappend input_plugins sqlite
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +python27
</del><ins>+if {![variant_isset python26]} {
+ default_variants +python27
+}
</ins><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-# 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
</del><ins>+patchfiles patch-plugins-input-geojson-geojson_datasource.hpp.diff
</ins><span class="cx">
</span><span class="cx"> configure.pkg_config ${prefix}/bin/pkg-config
</span><span class="cx">
</span><span class="lines">@@ -206,10 +204,9 @@
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
</span><del>- eval xinstall -m 640 [glob ${worksrcpath}/docs/*] \
</del><ins>+ xinstall -m 644 -W ${worksrcpath} \
+ {*}[glob ${worksrcpath}/docs/*] AUTHORS.md CHANGELOG.md COPYING README.md \
</ins><span class="cx"> ${destroot}${prefix}/share/doc/${name}
</span><del>- xinstall -m 644 -W ${worksrcpath} AUTHORS.md CHANGELOG.md COPYING README.md \
- ${destroot}${prefix}/share/doc/${name}
</del><span class="cx"> xinstall -d -m 755 ${destroot}${prefix}/share/${name}
</span><span class="cx"> copy ${worksrcpath}/demo ${destroot}${prefix}/share/${name}
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgismapnikfilespatchbindings_python_mapnik_text_placementcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/mapnik/files/patch-bindings_python_mapnik_text_placement.cpp.diff (135504 => 135505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>---- 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.
-
</del></span></pre></div>
<a id="trunkdportsgismapnikfilespatchpluginsinputgeojsongeojson_datasourcehppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/mapnik/files/patch-plugins-input-geojson-geojson_datasource.hpp.diff (0 => 135505)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+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
+ };
+
+ }}}}}
</ins></span></pre>
</div>
</div>
</body>
</html>