<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/a478903161d69ba6a051e4fed0094daaac99511c">https://github.com/macports/macports-ports/commit/a478903161d69ba6a051e4fed0094daaac99511c</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 a478903 grass: Avoid defining python_bin twice
</span>a478903 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a478903161d69ba6a051e4fed0094daaac99511c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Feb 27 10:10:10 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> grass: Avoid defining python_bin twice
</span>---
gis/grass/Portfile | 5 ++---
1 file changed, 2 insertions(+), 3 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 b31ce5a..6349f66 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;'>@@ -319,6 +319,7 @@ variant ffmpeg description {Add ffmpeg support} {
</span> # once support for wxWidgets 3.0 is complete, support for Python 2.6 may be removed
variant python26 conflicts python27 description {} {
depends_lib-append port:python26
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global python_bin
</span> set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
# Enable support for wxGUI Python extensions
# (by removing this we wouldn't need to depend on py-wxpython-x.y)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,8 +329,6 @@ variant python26 conflicts python27 description {} {
</span> # but it would make sense to fix this in such a way that python_bin could be determined automatically
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # for some reason it fails if python_bin is not defined inside post-patch (figure out why)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
</span> reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
foreach f $python_scripts {
reinplace "s|/usr/bin/env python|${python_bin}|" $f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,12 +338,12 @@ variant python26 conflicts python27 description {} {
</span>
variant python27 conflicts python26 description {} {
depends_lib-append port:python27
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global python_bin
</span> set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7-config
build.args-append PYTHON=${python_bin}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span> reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
foreach f $python_scripts {
reinplace "s|/usr/bin/env python|${python_bin}|" $f
</pre><pre style='margin:0'>
</pre>