<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/a4201a72b9a537410000a9bd3a5525830c2a6e4f">https://github.com/macports/macports-ports/commit/a4201a72b9a537410000a9bd3a5525830c2a6e4f</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 a4201a7  xrootd: Make python bindings a non-default variant
</span>a4201a7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a4201a72b9a537410000a9bd3a5525830c2a6e4f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Apr 9 13:25:30 2019 +0100

<span style='display:block; white-space:pre;color:#404040;'>    xrootd: Make python bindings a non-default variant
</span>---
 science/xrootd/Portfile                            | 37 ++++++++++------------
 .../xrootd/files/XrdClBuffer-include-utility.patch | 12 -------
 2 files changed, 17 insertions(+), 32 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xrootd/Portfile b/science/xrootd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21e5127..150f898 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xrootd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xrootd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup           legacysupport               1.0
</span> 
 github.setup        xrootd xrootd 4.9.1 v
 version             ${github.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            4
</span> 
 livecheck.version   ${version}
 livecheck.type      regex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,7 @@ checksums           rmd160  b95c010dc952b641cae07805259a8c1ad689872b \
</span> depends_build-append port:cctools \
                      port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_v        3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_v_nodot  [string map {. {}} $python_v]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python    ${prefix}/bin/python${python_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib         port:curl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python${python_v_nodot} \
</span>                     port:libxml2 \
                     port:json-c \
                     port:swig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,12 +46,6 @@ default_variants    +ssl +readline +kerberos
</span> 
 cmake.out_of_source yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args      -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Temporary fix for missing <utility> include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/xrootd/xrootd/pull/958
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   XrdClBuffer-include-utility.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Force a compatible compiler
 compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
                            macports-clang-3.7 macports-clang-4.0 macports-clang-3.9 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,10 +57,24 @@ configure.args-append -DENABLE_CRYPTO=False \
</span>                       -DENABLE_READLINE=False \
                       -DENABLE_KRB5=False \
                       -DENABLE_FUSE=False \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                      -DENABLE_PYTHON=FALSE \
</span>                       -DCMAKE_BUILD_TYPE="Release" \
                       -DCMAKE_CXX_FLAGS="${configure.cxxflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                      -DCMAKE_INSTALL_MANDIR="share/man" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                      -DPYTHON_EXECUTABLE=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      -DCMAKE_INSTALL_MANDIR="share/man"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_v        3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_v_nodot  [string map {. {}} $python_v]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python${python_v_nodot} description "Enable python ${python_v} bindings" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.python        ${prefix}/bin/python${python_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:python${python_v_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-replace -DENABLE_PYTHON=FALSE  -DENABLE_PYTHON=TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append  -DPYTHON_EXECUTABLE=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Fix python install location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set python_framework ${frameworks_dir}/Python.framework/Versions/${python_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|\${CMAKE_INSTALL_PREFIX}|${python_framework}|g" ${worksrcpath}/bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 variant readline description {Build with Readline Support} {
     configure.args-delete   -DENABLE_READLINE=False
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,9 +93,3 @@ variant kerberos description {Build with Kerberos 5 Support} {
</span>     configure.args-append   -DENABLE_KRB5=True -DKERBEROS5_ROOT_DIR="${prefix}"
     depends_lib-append      port:kerberos5
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Fix python install location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|\${CMAKE_INSTALL_PREFIX}|${python_framework}|g" ${worksrcpath}/bindings/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xrootd/files/XrdClBuffer-include-utility.patch b/science/xrootd/files/XrdClBuffer-include-utility.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e051e86..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xrootd/files/XrdClBuffer-include-utility.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/XrdCl/XrdClBuffer.hh b/src/XrdCl/XrdClBuffer.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fbd035a6..4f437d3a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/XrdCl/XrdClBuffer.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/XrdCl/XrdClBuffer.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <new>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <utility>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace XrdCl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>

</pre>