<!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>[137820] trunk/dports/gis/mapnik/Portfile</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/137820">137820</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2015-06-20 13:46:36 -0700 (Sat, 20 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mapnik: update to version 3.0.0-rc3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgismapnikPortfile">trunk/dports/gis/mapnik/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgismapnikPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/mapnik/Portfile (137819 => 137820)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/mapnik/Portfile 2015-06-20 19:26:29 UTC (rev 137819)
+++ trunk/dports/gis/mapnik/Portfile 2015-06-20 20:46:36 UTC (rev 137820)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup cxx11 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup mapnik mapnik 3.0.0-rc2 v
</del><ins>+github.setup mapnik mapnik 3.0.0-rc3 v
</ins><span class="cx"> revision 0
</span><span class="cx"> categories gis devel
</span><span class="cx"> license LGPL-2.1
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> homepage http://mapnik.org
</span><span class="cx">
</span><del>-checksums rmd160 608071712cd81745a3a6d0abeb4c052603802eb0 \
- sha256 b5f014ad703031760723ebc86b894bc8cefa552d153ca62964c00915fcda7d8e
</del><ins>+checksums rmd160 72d3217db9f3ad48ec998ff592887f502df1121d \
+ sha256 73669a9bd4a7ee1630350d95be848d6fd0721ac69a87e6683d648f1bb03b88eb
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -45,46 +45,12 @@
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:proj
</span><span class="cx">
</span><del>-set python_suffixes {27 34}
-set python_ports {}
-foreach s ${python_suffixes} {
- lappend python_ports python${s}
-}
-foreach s ${python_suffixes} {
- set p python${s}
- set v [string index ${s} 0].[string index ${s} 1]
- set i [lsearch -exact ${python_ports} ${p}]
- set c [lreplace ${python_ports} ${i} ${i}]
- eval [subst {
- variant ${p} conflicts ${c} description {Build Python bindings} {
- depends_lib-append port:${p}
- configure.args-delete BINDINGS=none
- configure.args-append BINDINGS=python
- configure.args-append PYTHON=${prefix}/bin/python${v}
- }
- }]
-}
</del><ins>+set input_plugins {shape csv raster geojson topojson}
</ins><span class="cx">
</span><del>-proc python_branch {} {
- global python_suffixes
- foreach s ${python_suffixes} {
- if {[variant_isset python${s}]} { return ${s} }
- }
- error "Python support not enabled."
-}
-
-set input_plugins {shape geojson raster csv}
-
</del><span class="cx"> variant cairo description {Enable Cairo support for PDF, PostScript, and SVG} {
</span><span class="cx"> configure.args-delete CAIRO=False
</span><span class="cx"> configure.args-append CAIRO=True
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/cairo.pc:cairo
</span><del>- if {![catch {set s [python_branch]}]} {
- set pf Python.framework/Versions/[string index ${s} 0].[string index ${s} 1]
- depends_lib-append port:py${s}-cairo
- configure.args-append PKG_CONFIG_PATH=${frameworks_dir}/${pf}/lib/pkgconfig
- lappend input_plugins python
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant gdal description {Build GDAL/OGR plugin} {
</span><span class="lines">@@ -111,21 +77,11 @@
</span><span class="cx"> lappend input_plugins sqlite
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python34]} {
- default_variants +python27
-}
-
</del><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> configure.pkg_config ${prefix}/bin/pkg-config
</span><span class="cx">
</span><del>-if {[variant_isset python27]} {
- configure.python ${prefix}/bin/python2.7
-} elseif {[variant_isset python34]} {
- configure.python ${prefix}/bin/python3.4
-} else {
- configure.python /usr/bin/python
-}
</del><ins>+configure.python /usr/bin/python
</ins><span class="cx">
</span><span class="cx"> build.cmd ${configure.python} scons/scons.py
</span><span class="cx"> build.pre_args
</span><span class="lines">@@ -142,7 +98,6 @@
</span><span class="cx"> DESTDIR=${destroot} \
</span><span class="cx"> CAIRO=False \
</span><span class="cx"> CPP_TESTS=False \
</span><del>- FRAMEWORK_PYTHON=False \
</del><span class="cx"> BINDINGS=none \
</span><span class="cx"> JOBS=${build.jobs} \
</span><span class="cx"> FREETYPE_CONFIG=${prefix}/bin/freetype-config \
</span><span class="lines">@@ -155,50 +110,6 @@
</span><span class="cx"> destroot.destdir
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><del>- # Hack to check for correct boost variant
- if {![catch {set pys [python_branch]}]} {
- set boost_py ${prefix}/lib/libboost_python-mt.dylib
- if {![file exists ${boost_py}]} {
- ui_error "
-****
-**** Your current boost does not have Python support. Please reinstall
-**** boost before trying ${name} +python${pys} again:
-****
-**** sudo port install boost +python${pys}
-****
-"
- return -code error "Boost.Python missing"
- }
- regexp {Python\.framework/Versions/([[:digit:]]\.[[:digit:]])} \
- [exec /usr/bin/otool -L ${boost_py}] foo bpv
- if {[set bps [string replace ${bpv} 1 1]] != ${pys}} {
- if {${bps} ni ${python_suffixes}} {
- ui_error "
-****
-**** Your current boost is incompatible with ${name} +python${pys}.
-**** Please install the boost variant that matches ${name}:
-****
-**** sudo port install boost +python${pys}
-****
-"
- return -code error "Incompatible Boost.Python"
- }
- ui_error "
-****
-**** ${name} +python${pys} is incompatible with your current boost.
-**** Please install the ${name} variant that matches boost +python${bps}:
-****
-**** sudo port install ${name} +python${bps}
-****
-**** or install the boost variant that matches ${name} +python${pys}:
-****
-**** sudo port install boost +python${pys}
-****
-"
- return -code error "Incompatible Boost.Python"
- }
- }
-
</del><span class="cx"> # Must be evaluated after the variants
</span><span class="cx"> configure.args-append INPUT_PLUGINS=[join ${input_plugins} ","]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>