<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d03c360dc16bb7815b75170e7ae1dd0d17451b00">https://github.com/macports/macports-ports/commit/d03c360dc16bb7815b75170e7ae1dd0d17451b00</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d03c360 grass: Avoid hardcoding the list of python files
</span>d03c360 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d03c360dc16bb7815b75170e7ae1dd0d17451b00
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Feb 27 10:12:42 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> grass: Avoid hardcoding the list of python files
</span>---
gis/grass/Portfile | 166 ++++-------------------------------------------------
1 file changed, 12 insertions(+), 154 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/Portfile b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6349f66..046836c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,156 +56,6 @@ post-patch {
</span> reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/gem/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# List of all python scripts. Used later to ensure usage of python26/python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (insteaf of the currently active python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Work around bug http://trac.osgeo.org/grass/ticket/1758
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_scripts [ list \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc/python/m.distance.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc/python/raster_example_ctypes.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc/python/vector_example_ctypes.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- general/g.parser/test.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/scripts/d.rast3d.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/scripts/g.change.gui.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/scripts/g.extension.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/scripts/g.extension.rebuild.all.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/scripts/v.type_wrapper.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/compat/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/compat/subprocess.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/debug.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/gcmd.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/globalvar.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/menudata.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/render.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/settings.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/units.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/utils.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/core/workspace.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/create__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/dbmgr/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/dbmgr/manager.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/dbmgr/sqlbuilder.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/dbmgr/vinfo.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gcp/manager.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gcp/mapdisplay.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gcp/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gis_set.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gmodeler/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gmodeler/frame.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gmodeler/menudata.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gmodeler/model.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gmodeler/preferences.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gmodeler/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/forms.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/ghelp.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/goutput.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/gselect.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/mapdisp.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/mapwindow.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/menu.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/preferences.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/prompt.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/gui_core/widgets.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/icons/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/icons/grass2_icons.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/icons/grass_icons.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/icons/icon.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/icons/silk_icons.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/lmgr/frame.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/lmgr/layertree.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/lmgr/menudata.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/lmgr/pyshell.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/lmgr/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/location_wizard/base.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/location_wizard/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/location_wizard/wizard.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/frame.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/gprint.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/main.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/mapwindow.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/overlays.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/statusbar.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/mapdisp/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/modules/colorrules.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/modules/extensions.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/modules/histogram.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/modules/mcalc_builder.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/modules/ogc_services.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/modules/vclean.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/animation.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/main.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/mapwindow.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/preferences.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/tools.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/workspace.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/nviz/wxnviz.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/psmap/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/psmap/frame.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/psmap/instructions.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/psmap/menudata.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/psmap/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/psmap/utils.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/scripts/p.cmd.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/scripts/p.db.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/scripts/p.mon.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/scripts/p.rast.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/scripts/p.vect.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/scripts/vkrige.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/tools/update_menudata.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/main.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/mapwindow.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/preferences.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/toolbars.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/wxdigit.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/vdigit/wxdisplay.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/wxgui.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/wxplot/base.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/wxplot/dialogs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gui/wxpython/wxplot/profile.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- imagery/i.atcorr/create_iwave.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/array.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/core.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgen.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/ctypedescs.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/descriptions.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/expressions.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/libraryloader.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/messages.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/options.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/cdeclarations.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/cgrammar.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/cparser.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/ctypesparser.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/lex.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/lextab.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/parsetab.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/pplexer.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/preprocessor.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/parser/yacc.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/printer/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/printer/defaultheader.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/printer/preamble.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/printer/printer.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/printer/test.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/processor/__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/processor/dependencies.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/processor/operations.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/ctypesgencore/processor/pipeline.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/loader.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/ctypes/preamble.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/db.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/grass__init__.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/raster.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/task.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/python/vector.py ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.ldflags-append -framework OpenGL -framework Accelerate
configure.args \
--with-fftw-includes=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -330,8 +180,12 @@ variant python26 conflicts python27 description {} {
</span>
post-patch {
reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f $python_scripts {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${python_bin}|" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure usage of python26/python27 (instead of the currently active python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Work around bug https://trac.osgeo.org/grass/ticket/1758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python|${python_bin}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -345,8 +199,12 @@ variant python27 conflicts python26 description {} {
</span>
post-patch {
reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f $python_scripts {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python|${python_bin}|" $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure usage of python26/python27 (instead of the currently active python)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Work around bug https://trac.osgeo.org/grass/ticket/1758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python|${python_bin}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>