<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35e611d9bc3b61b3fa0b9def910977fd53db153e">https://github.com/macports/macports-ports/commit/35e611d9bc3b61b3fa0b9def910977fd53db153e</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 35e611d grass7: bad Python version in patch (fixes #59954)
</span>35e611d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35e611d9bc3b61b3fa0b9def910977fd53db153e
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Jan 17 16:27:27 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass7: bad Python version in patch (fixes #59954)
</span>---
gis/grass7/Portfile | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 311199f..07d188d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
PortSystem 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,18 +101,24 @@ foreach pyver ${python_suffixes} {
</span> port:py${pyver}-six
depends_run-append port:py${pyver}-psycopg2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bin ${prefix}/bin/python${pyversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|/usr/bin/env python3|${python_bin}|" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches scripts to launch the selected Python version (fixes #59954)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [variant_isset python${pyver}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pybin ${prefix}/bin/python${pyversion}
</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;'>+ reinplace -q "s|/usr/bin/env python3|${pybin}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^PYTHON.*|PYTHON = ${pybin}|" ${worksrcpath}/include/Make/Platform.make.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^PYTHON.*|PYTHON = ${python_bin}|" ${worksrcpath}/include/Make/Platform.make.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
</span> }
}
</pre><pre style='margin:0'>
</pre>