<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/f850901e748132e6ae042d646afec2266ff4652b">https://github.com/macports/macports-ports/commit/f850901e748132e6ae042d646afec2266ff4652b</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 f850901  cmake: redo +pythonXY and add dependencies on py3Y-sphinxcontrib-[various]
</span>f850901 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f850901e748132e6ae042d646afec2266ff4652b
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Apr 15 10:56:23 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    cmake: redo +pythonXY and add dependencies on py3Y-sphinxcontrib-[various]
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/58339
</span>---
 devel/cmake/Portfile | 81 +++++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 39 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 46d9004..b354c77 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;'>@@ -51,7 +51,7 @@ if {${subport} eq ${name}} {
</span>     checksums       rmd160 2c883e9858a2d3d1c360a094ccd9c7bf38fdaa7f \
                     sha256 a3cbf562b99270c0ff192f692139e98c605f292bfdbc04d70da0309a5358e71e \
                     size   8850106
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span> 
     master_sites    ${homepage}/files/v${branch}/
     conflicts       cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@ if {${subport} eq ${name}} {
</span>     checksums       rmd160 44f730f91005984e95f608c9e59dbb1d2a40288e \
                     sha256 5f8d7f0b2f0369152ca4ef49cff1fa07d9c3faf792b188d1741440d6ab3bf68a \
                     size   6878866
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span> 
     use_bzip2       yes
     master_sites    https://gitlab.kitware.com/cmake/cmake/repository/archive${extract.suffix}?ref=${commit}&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,17 +200,6 @@ post-patch {
</span>     # used, because the PYTHON_EXECUTABLE is used only when building
     # docs -- so, when not building docs its setting makes no difference.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set PYTHON_VERSION_WITH_DOT "2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set PYTHON_VERSION_WITH_DOT "3.4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set PYTHON_VERSION_WITH_DOT "3.5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set PYTHON_VERSION_WITH_DOT "3.6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set PYTHON_VERSION_WITH_DOT "3.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span>     reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,48 +262,47 @@ if {[variant_isset gui]} {
</span> }
 
 variant docs description {Build documentation: HTML and manpages} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     configure.args-append \
         --mandir=share/man \
         --sphinx-man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        --sphinx-html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        --sphinx-html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        --sphinx-build=${prefix}/bin/sphinx-build-${PYTHON_VERSION_WITH_DOT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${PYTHON_VERSION_NO_DOT}-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # these are required for Py3X, but not Py27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${PYTHON_VERSION_NO_DOT} ne "27"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
</span><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:#ffe0e0;'>-    description {Build documentation using Sphinx from Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:py27-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --sphinx-build=${prefix}/bin/sphinx-build-2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Build documentation using Sphinx from Python 2.7} {}
</span> 
 variant python34 conflicts python27 python35 python36 python37 requires docs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    description {Build documentation using Sphinx from Python 3.4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:py34-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --sphinx-build=${prefix}/bin/sphinx-build-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Build documentation using Sphinx from Python 3.4} {}
</span> 
 variant python35 conflicts python27 python34 python36 python37 requires docs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    description {Build documentation using Sphinx from Python 3.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:py35-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --sphinx-build=${prefix}/bin/sphinx-build-3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Build documentation using Sphinx from Python 3.5} {}
</span> 
 variant python36 conflicts python27 python34 python35 python37 requires docs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    description {Build documentation using Sphinx from Python 3.6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:py36-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --sphinx-build=${prefix}/bin/sphinx-build-3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Build documentation using Sphinx from Python 3.6} {}
</span> 
 variant python37 conflicts python27 python34 python35 python36 requires docs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    description {Build documentation using Sphinx from Python 3.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append port:py37-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --sphinx-build=${prefix}/bin/sphinx-build-3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Build documentation using Sphinx from Python 3.7} {}
</span> 
 if {[variant_isset docs]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # default Python is 2.7
</span>     if {![variant_isset python27] &&
         ![variant_isset python34] &&
         ![variant_isset python35] &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,6 +311,7 @@ if {[variant_isset docs]} {
</span>         default_variants +python27
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # make sure -python27 is not specified alone
</span>     if {![variant_isset python27] &&
         ![variant_isset python34] &&
         ![variant_isset python35] &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,4 +320,18 @@ if {[variant_isset docs]} {
</span>         ui_error "\n\nYou must select either the +python27, +python34, +python35, +python36, or +python37 variant when using variant +docs.\n"
         return -code error "Invalid variant selection"
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # determine Python-related variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set PYTHON_VERSION_WITH_DOT "2.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {[variant_isset python34]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set PYTHON_VERSION_WITH_DOT "3.4"
</span><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;'>+    } elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set PYTHON_VERSION_WITH_DOT "3.6"
</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.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]
</span> }
</pre><pre style='margin:0'>

</pre>