Ticket #44950: Portfile.diff

File Portfile.diff, 1.4 KB (added by lockhart (Thomas Lockhart), 10 years ago)

Preserve whitespace in front of import statements.

  • Portfile

    old new  
    66name                sumo
    77conflicts           sumo-devel
    88version             0.21.0
    9 revision            1
     9revision            2
    1010categories          science devel
    1111platforms           darwin
    1212maintainers         nomaintainer
    … …  
    5656    foreach f [list {*}$python_scripts {*}$python_libs {*}$python_tutorials] {
    5757        reinplace "s#/usr/bin/env python#${python_bin}#" $f
    5858        reinplace -E "s|^(sys.path.append)|# \\1|" $f
    59         reinplace -E "s#^ *from (assign|costMemory|dijkstra|duaIterate|elements|inputs|network|outputs|routeChoices|statisticsElements|tables)#from sumolib.assign.\\1#" $f
    60         reinplace -E "s#^ *from (miscutils|OrderedMultiSet|output|testUtil)#from sumolib.\\1#" $f
     59        reinplace -E "s#^( *)from (assign|costMemory|dijkstra|duaIterate|elements|inputs|network|outputs|routeChoices|statisticsElements|tables)#\\1from sumolib.assign.\\2#" $f
     60        reinplace -E "s#^( *)from (miscutils|OrderedMultiSet|output|testUtil)#\\1from sumolib.\\2#" $f
    6161        reinplace -E "s#^import (xsd|collectinghandler|connections|turndefinitions|rmsd)#from sumolib import \\1#" $f
    6262        reinplace -E "s#^import (os,.*), helpers#import \\1, sumolib.helpers as helpers#" $f
    6363    }