[125309] trunk/dports/science/sumo/Portfile

[ryandesign at macports.org]

Revision: 125309
          https://trac.macports.org/changeset/125309
Author:   ryandesign at macports.org
Date:     2014-09-12 19:40:47 -0700 (Fri, 12 Sep 2014)
Log Message:
-----------
sumo: fix reinplace to preserve whitespace (#44950); remove conflict with sumo-devel because sumo-devel is replaced_by sumo

Modified Paths:
--------------
    trunk/dports/science/sumo/Portfile

Modified: trunk/dports/science/sumo/Portfile
===================================================================
--- trunk/dports/science/sumo/Portfile	2014-09-12 23:29:42 UTC (rev 125308)
+++ trunk/dports/science/sumo/Portfile	2014-09-13 02:40:47 UTC (rev 125309)
@@ -4,9 +4,8 @@
 PortSystem          1.0
 
 name                sumo
-conflicts           sumo-devel
 version             0.21.0
-revision            1
+revision            2
 categories          science devel
 platforms           darwin
 maintainers         nomaintainer
@@ -56,8 +55,8 @@
     foreach f [list {*}$python_scripts {*}$python_libs {*}$python_tutorials] {
         reinplace "s#/usr/bin/env python#${python_bin}#" $f
         reinplace -E "s|^(sys.path.append)|# \\1|" $f
-        reinplace -E "s#^ *from (assign|costMemory|dijkstra|duaIterate|elements|inputs|network|outputs|routeChoices|statisticsElements|tables)#from sumolib.assign.\\1#" $f
-        reinplace -E "s#^ *from (miscutils|OrderedMultiSet|output|testUtil)#from sumolib.\\1#" $f
+        reinplace -E "s#^( *)from (assign|costMemory|dijkstra|duaIterate|elements|inputs|network|outputs|routeChoices|statisticsElements|tables)#\\1from sumolib.assign.\\2#" $f
+        reinplace -E "s#^( *)from (miscutils|OrderedMultiSet|output|testUtil)#\\1from sumolib.\\2#" $f
         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
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140912/a5272834/attachment.html>