<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/15ef62ebfbb1030e5a7065729105ef6a6fec2323">https://github.com/macports/macports-ports/commit/15ef62ebfbb1030e5a7065729105ef6a6fec2323</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 15ef62e cmake: add Python 3.7 variant
</span>15ef62e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 15ef62ebfbb1030e5a7065729105ef6a6fec2323
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Oct 6 14:49:00 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> cmake: add Python 3.7 variant
</span>---
devel/cmake/Portfile | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 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 e1617c2..bc5e55d 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;'>@@ -207,8 +207,10 @@ post-patch {
</span> set PYTHON_VERSION_WITH_DOT "3.4"
} elseif {[variant_isset python35]} {
set PYTHON_VERSION_WITH_DOT "3.5"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python36]} {
</span> set PYTHON_VERSION_WITH_DOT "3.6"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.7"
</span> }
reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,40 +287,49 @@ variant python27 conflicts python34 python35 python36 requires docs \
</span> --sphinx-build=${prefix}/bin/sphinx-build-2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 python37 requires docs \
</span> description {Build documentation using Sphinx from Python 3.4} {
depends_build-append port:py34-sphinx
configure.args-append \
--sphinx-build=${prefix}/bin/sphinx-build-3.4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python34 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 python37 requires docs \
</span> description {Build documentation using Sphinx from Python 3.5} {
depends_build-append port:py35-sphinx
configure.args-append \
--sphinx-build=${prefix}/bin/sphinx-build-3.5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python34 python35 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python27 python34 python35 python37 requires docs \
</span> description {Build documentation using Sphinx from Python 3.6} {
depends_build-append port:py36-sphinx
configure.args-append \
--sphinx-build=${prefix}/bin/sphinx-build-3.6
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python27 python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py37-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-build=${prefix}/bin/sphinx-build-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset docs]} {
if {![variant_isset python27] &&
![variant_isset python34] &&
![variant_isset python35] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37]} {
</span> default_variants +python27
}
if {![variant_isset python27] &&
![variant_isset python34] &&
![variant_isset python35] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +python27, +python34, +python35, or +python36 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select either the +python27, +python34, +python35, +python36, or +python37 variant when using variant +docs.\n"
</span> return -code error "Invalid variant selection"
}
}
</pre><pre style='margin:0'>
</pre>