Ticket #49397: Portfile.diff

Portfile

@@ -5 +5 @@
 
 name                sumo
 version             0.24.0
-revision            1
+revision            2
 categories          science devel
 platforms           darwin
 maintainers         nomaintainer
@@ -27 +27 @@
 checksums           rmd160  712b8fc05dcc230940abe4d897357bb49d418e00 \
                     sha256  b9fe97bdd0981098b3136456954b6ece718e5efb6a782b0f98f519ccf28a8429
 
+default_variants    +subseconds +messages
+
 depends_lib-append \
     port:fox \
     port:gdal \
@@ -40 +42 @@
     port:py27-matplotlib \
     port:py27-protobuf
 
+set bindir            ${prefix}/bin
+set libdir            ${prefix}/lib
 set sharedir          ${prefix}/share/${name}
 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
 
+post-extract {
+    copy ${filespath}/README.macosx ${worksrcpath}/
+}
+
 post-patch {
     reinplace "s#std::getenv(\"SUMO_HOME\")#\"${sharedir}\"#" src/utils/xml/SUMOSAXReader.cpp
     reinplace "s#\./PHEMlight/#${sharedir}/data/PHEMlight/#" src/microsim/MSFrame.cpp
@@ -54 +62 @@
     set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
     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|^( *)(sys.path.append)|\\1# \\2|" $f
+        reinplace -E "s|^( *)(.*__file__.*\\.\\.)|\\1# \\2|" $f
+        reinplace -E "s|^( *)(os.path.join.*\\.\\.)|\\1# \\2|" $f
+        reinplace -E "s|^( *)(SUMO_HOME =)|\\1  # \\2|" $f
+        reinplace -E "s|^(if .*SUMO_HOME)|if True:  # \\1|" $f
+        reinplace -E "s|^( +)(.*os.path.join.*SUMO_HOME)|\\1# \\2|" $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|xml2csv|collectinghandler|connections|netshiftadaptor|route_departOffset|turndefinitions|rmsd|xml2protobuf)#from sumolib import \\1#" $f
+        reinplace -E "s#^import (detector|route2trips|xsd|xml2csv|collectinghandler|connections|netshiftadaptor|route_departOffset|sort_routes|turndefinitions|rmsd|xml2protobuf)#from sumolib import \\1#" $f
         reinplace -E "s#^import (os,.*), helpers#import \\1, sumolib.helpers as helpers#" $f
     }
+    reinplace -E "s#@BINDIR@#${bindir}#" README.macosx
+    reinplace -E "s#@LIBDIR@#${libdir}#" README.macosx
+    reinplace -E "s#@DOCDIR@#${docdir}#" README.macosx
+    reinplace -E "s#@PYTHON_LIBDIR@#${python_lib}#" README.macosx
 }
 
 # List of all python scripts. Used later to ensure usage of python27
 # (instead of the currently active python)
+# available in the next release:
+# tools/tlsCoordinator.py
 set python_scripts [list \
+    tools/districts2poly.py \
+    tools/edgesInDistricts.py \
+    tools/generateBidiDistricts.py \
+    tools/pedestrianFlow.py \
+    tools/randomTrips.py \
+    tools/route2trips.py \
+    tools/route2sel.py \
+    tools/traceExporter.py \
     tools/assign/Assignment.py \
     tools/assign/cadytsIterate.py \
     tools/assign/costFunctionChecker.py \
@@ -156 +183 @@
     tools/visualization/plot_net_trafficLights.py \
     tools/visualization/plot_summary.py \
     tools/visualization/plot_tripinfo_distributions.py \
-    tools/xml/addSchema.py \
     tools/xml/binary2plain.py \
     tools/xml/csv2xml.py \
     tools/xml/protobuf2xml.py \
@@ -165 +191 @@
     tools/xml/xml2csv.py \
     tools/xml/xml2protobuf.py \
 ]
+# not needed for an installation:
+#    tools/xml/addSchema.py
 
 set python_libs [list \
+    tools/route2trips.py \
     tools/assign/assign.py \
     tools/assign/costMemory.py \
     tools/assign/dijkstra.py \
@@ -244 +273 @@
     file copy ${worksrcpath}/tools/turn-defs/connections.py ${destroot}${python_lib}/sumolib/
     file copy ${worksrcpath}/tools/turn-defs/turndefinitions.py ${destroot}${python_lib}/sumolib/
     xinstall -m 755 ${worksrcpath}/tools/detector/detector.py ${destroot}${python_lib}/sumolib/
+    xinstall -m 755 ${worksrcpath}/tools/route/sort_routes.py ${destroot}${python_lib}/sumolib/
     xinstall -m 755 ${worksrcpath}/tools/turn-defs/collectinghandler.py ${destroot}${python_lib}/sumolib/
     xinstall -m 755 ${worksrcpath}/tools/lib/rmsd.py ${destroot}${python_lib}/sumolib/
     xinstall -m 755 ${worksrcpath}/tools/lib/play.png ${destroot}${python_lib}/sumolib/
@@ -257 +287 @@
     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}
+        xinstall -m 755 ${worksrcpath}/${f} ${destroot}${bindir}/sumo-${x}
     }
 
     xinstall -m 755 -d ${destroot}${sharedir}
@@ -268 +298 @@
     # file copy ${worksrcpath}/tests ${destroot}${sharedir}/
 
     xinstall -m 755 -d ${destroot}${docdir}
-    xinstall ${worksrcpath}/README ${destroot}${docdir}/
+    file copy ${worksrcpath}/README ${destroot}${docdir}/
+    file copy ${worksrcpath}/README.macosx ${destroot}${docdir}/
     file copy ${worksrcpath}/docs/examples ${destroot}${docdir}/
     file copy ${worksrcpath}/docs/tutorial ${destroot}${docdir}/
     file copy ${worksrcpath}/data ${destroot}${sharedir}/data/
 }
 
+post-install {
+    ui_msg ""
+    ui_msg "*** Many program names are prefixed by sumo- for this port."
+    ui_msg "*** See ${docdir}/README.macosx for additional notes."
+    ui_msg ""
+}
+
 livecheck.regex     ${name}-src-(\[0-9.\]+)${extract.suffix}