<!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>[139980] trunk/dports/science/sumo/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/139980">139980</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-09-04 13:11:35 -0700 (Fri, 04 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>sumo: update to 0.24.0. Fixes build failure with newest gdal version. Patch provided by user. Fixes: #48753.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencesumoPortfile">trunk/dports/science/sumo/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencesumoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/sumo/Portfile (139979 => 139980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/sumo/Portfile 2015-09-04 20:04:46 UTC (rev 139979)
+++ trunk/dports/science/sumo/Portfile 2015-09-04 20:11:35 UTC (rev 139980)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name sumo
</span><del>-version 0.23.0
</del><ins>+version 0.24.0
</ins><span class="cx"> categories science devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> distname ${name}-src-${version}
</span><span class="cx"> worksrcdir ${name}-${version}
</span><span class="cx">
</span><del>-checksums rmd160 e57ef20322a87f9801e160be122ba683dc9c2e5a \
- sha256 ab8806c076edc730c4fca0eb4ceed5b008a2214ad90d90d6c1e607d5f282e987
</del><ins>+checksums rmd160 712b8fc05dcc230940abe4d897357bb49d418e00 \
+ sha256 b9fe97bdd0981098b3136456954b6ece718e5efb6a782b0f98f519ccf28a8429
</ins><span class="cx">
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:fox \
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx"> set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span><span class="cx"> set python_lib ${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><del>-set perl_bin "/usr/bin/env perl"
</del><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s#std::getenv(\"SUMO_HOME\")#\"${sharedir}\"#" src/utils/xml/SUMOSAXReader.cpp
</span><span class="lines">@@ -59,10 +58,6 @@
</span><span class="cx"> reinplace -E "s#^import (xsd|collectinghandler|connections|turndefinitions|rmsd)#from sumolib import \\1#" $f
</span><span class="cx"> reinplace -E "s#^import (os,.*), helpers#import \\1, sumolib.helpers as helpers#" $f
</span><span class="cx"> }
</span><del>- foreach f $perl_scripts {
- reinplace "s#/usr/bin/perl#${perl_bin}#" $f
- }
- reinplace -E "s#(removeTripsIfNotInInterval).pl#sumo-\\1#" tools/trip/splitTripsByHours.pl
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # List of all python scripts. Used later to ensure usage of python27
</span><span class="lines">@@ -84,7 +79,6 @@
</span><span class="cx"> tools/detector/validate.py \
</span><span class="cx"> tools/district/countConnectionsInDistricts.py \
</span><span class="cx"> tools/district/districtMapper.py \
</span><del>- tools/district/edgesInDistricts.py \
</del><span class="cx"> tools/net/0103to0110.py \
</span><span class="cx"> tools/net/0123to0130.py \
</span><span class="cx"> tools/net/batch0103to0110.py \
</span><span class="lines">@@ -146,9 +140,6 @@
</span><span class="cx"> tools/traci/rebuildConstants.py \
</span><span class="cx"> tools/traci/traciToHex.py \
</span><span class="cx"> tools/trigger/csv2vss.py \
</span><del>- tools/trip/generateTripsXml.py \
- tools/trip/randomTrips.py \
- tools/trip/route2trips.py \
</del><span class="cx"> tools/turn-defs/generateTurnDefs.py \
</span><span class="cx"> tools/visualization/mpl_dump_onNet.py \
</span><span class="cx"> tools/visualization/mpl_dump_timeline.py \
</span><span class="lines">@@ -204,14 +195,6 @@
</span><span class="cx"> docs/tutorial/traci_tls/runner.py \
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-set perl_scripts [list \
- tools/trip/removeGeometryInTrips.pl \
- tools/trip/removeTripsIfNotInInterval.pl \
- tools/trip/splitTripsByHours.pl \
-]
-# no perl header line to ensure perl is executed
-# tools/purgatory/xml2csv.pl \
-
</del><span class="cx"> # required for the gui to be enabled
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --with-fox=${prefix}
</span><span class="lines">@@ -267,7 +250,7 @@
</span><span class="cx"> xinstall -m 755 ${worksrcpath}/${f} ${destroot}${python_lib}/sumolib/
</span><span class="cx"> }
</span><span class="cx">
</span><del>- foreach f [list {*}$python_scripts {*}$perl_scripts] {
</del><ins>+ foreach f [list {*}$python_scripts] {
</ins><span class="cx"> # convert file names to use dash rather than underscore and remove trailing .py or .pl
</span><span class="cx"> set x [string map [list _ -] [file rootname [file tail ${f}]]]
</span><span class="cx"> xinstall -m 755 ${worksrcpath}/${f} ${destroot}${prefix}/bin/sumo-${x}
</span></span></pre>
</div>
</div>
</body>
</html>