<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/57b0f39d22787b21beff5d81532ea29be68b462a">https://github.com/macports/macports-ports/commit/57b0f39d22787b21beff5d81532ea29be68b462a</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 57b0f39 cmake*: add support for building docs with Python 3.5 and 3.6; addresses ticket https://trac.macports.org/ticket/53302 .
</span>57b0f39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 57b0f39d22787b21beff5d81532ea29be68b462a
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jan 13 10:40:07 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake*: add support for building docs with Python 3.5 and 3.6; addresses ticket https://trac.macports.org/ticket/53302 .
</span>---
devel/cmake/Portfile | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 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 5916e51..5303200 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;'>@@ -175,8 +175,12 @@ post-patch {
</span>
if {[variant_isset python27]} {
set PYTHON_VERSION_WITH_DOT "2.7"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python34]} {
</span> set PYTHON_VERSION_WITH_DOT "3.4"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.5"
</span><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.6"
</span> }
reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,25 +280,47 @@ variant docs description {Build documentation: HTML and manpages} {
</span> --sphinx-html
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python34 requires docs description {Build documentation using Sphinx from Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python34 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 2.7} {
</span> depends_build-append port:py27-sphinx
configure.args-append \
--sphinx-build=${prefix}/bin/sphinx-build-2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python34 conflicts python27 requires docs description {Build documentation using Sphinx from Python 3.4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python34 conflicts python27 python35 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.4} {
</span> 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:#e0ffe0;'>+variant python35 conflicts python27 python34 python36 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py35-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.5
</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;'>+variant python36 conflicts python27 python34 python35 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py36-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.6
</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]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python27] && ![variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span> default_variants +python27
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python27] && ![variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +python27 or +python34 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python27] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python34] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select either the +python27, +python34, +python35, or +python36 variant when using variant +docs.\n"
</span> return -code error "Invalid variant selection"
}
}
</pre><pre style='margin:0'>
</pre>