<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b287af815041398973345033725bebecf8524040">https://github.com/macports/macports-ports/commit/b287af815041398973345033725bebecf8524040</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 b287af8 cmake: Fix patching bug introduced in previous commit
</span>b287af8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b287af815041398973345033725bebecf8524040
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Apr 15 18:18:55 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> cmake: Fix patching bug introduced in previous commit
</span>---
devel/cmake/Portfile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b354c77..d162c2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,12 +195,6 @@ post-patch {
</span> # patch PREFIX
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/macports.cmake
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Modules/CMakeFindFrameworks.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch Python Version; doing this is OK even when +docs is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # used, because the PYTHON_EXECUTABLE is used only when building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # docs -- so, when not building docs its setting makes no difference.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -283,6 +277,7 @@ variant docs description {Build documentation: HTML and manpages} {
</span> port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
variant python27 conflicts python34 python35 python36 requires docs \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,4 +329,10 @@ if {[variant_isset docs]} {
</span> set PYTHON_VERSION_WITH_DOT "3.7"
}
set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch Python Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
</pre><pre style='margin:0'>
</pre>