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