<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/484b0e9201ce6934c95fcbfb7767c27fe7f89c32">https://github.com/macports/macports-ports/commit/484b0e9201ce6934c95fcbfb7767c27fe7f89c32</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 484b0e9  nghttp2: permit build w/o python
</span>484b0e9 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 484b0e9201ce6934c95fcbfb7767c27fe7f89c32
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue Apr 2 14:36:40 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    nghttp2: permit build w/o python
</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/58287
</span><span style='display:block; white-space:pre;color:#404040;'>    remove traces of python34
</span>---
 www/nghttp2/Portfile                            | 68 ++++++++++++++-----------
 www/nghttp2/files/patch-configure-nopython.diff | 20 ++++++++
 2 files changed, 57 insertions(+), 31 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/Portfile b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ec0492..6e667e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,18 +28,6 @@ checksums           rmd160  6743620cb9e0001b4ba8401cb744cd544a9f70c9 \
</span> # nghttp2 requires C++14
 compiler.blacklist-append {clang < 602}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} { default_variants +python27 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python34] && ![variant_isset python35] && ![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    error "You must select one of the python variants."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27]} { set PythonVersion   2.7 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python35]} { set PythonVersion   3.5 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python36]} { set PythonVersion   3.6 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python37]} { set PythonVersion   3.7 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set PythonBranch    [join [lrange [split ${PythonVersion} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build       port:pkgconfig
 
 depends_lib         port:c-ares \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,43 +36,61 @@ depends_lib         port:c-ares \
</span>                     port:libevent \
                     port:libxml2 \
                     path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${PythonBranch}-cython \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:py${PythonBranch}-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python${PythonBranch} \
</span>                     port:zlib
 
 # See: https://trac.macports.org/ticket/57960
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-src-shrpx_client_handler.cc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-configure-nopython.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-src-shrpx_client_handler.cc.diff \
</span>                     src-shrpx_config.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf      yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args      --disable-silent-rules \
                     --disable-threads \
                     --enable-app \
                     ac_cv_prog_AWK=/usr/bin/awk
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env       JANSSON_CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    OPENSSL_CFLAGS=-I${prefix}/include/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env       CYTHON=${prefix}/bin/cython-${PythonVersion} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    JANSSON_CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append \
</span>                     "JANSSON_LIBS=-L${prefix}/lib -ljansson" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
</span>                     "LIBEVENT_OPENSSL_LIBS=-L${prefix}/lib -levent -levent_openssl" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    OPENSSL_CFLAGS=-I${prefix}/include/openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    "OPENSSL_LIBS=-L${prefix}/lib -lcrypto -lssl" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    PYTHON=${prefix}/bin/python${PythonVersion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    "OPENSSL_LIBS=-L${prefix}/lib -lcrypto -lssl"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env       CYTHON=${prefix}/bin/cython-${PythonVersion} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    JANSSON_CFLAGS=-I${prefix}/include JANSSON_LIBS="-L${prefix}/lib -ljansson" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    JANSSON_LIBS="-L${prefix}/lib -ljansson" \
</span>                     LIBEVENT_OPENSSL_LIBS="-L${prefix}/lib -levent -levent_openssl" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    OPENSSL_CFLAGS=-I${prefix}/include/openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    OPENSSL_LIBS="-L${prefix}/lib -lcrypto -lssl" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    PYTHON=${prefix}/bin/python${PythonVersion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    OPENSSL_LIBS="-L${prefix}/lib -lcrypto -lssl"
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env        PYTHONPATH=${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python27]} { set PythonVersion   2.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python36]} { set PythonVersion   3.6 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python37]} { set PythonVersion   3.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python27] || [variant_isset python36] || [variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set PythonBranch    [join [lrange [split ${PythonVersion} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${PythonBranch}-cython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:py${PythonBranch}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python${PythonBranch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    CYTHON=${prefix}/bin/cython-${PythonVersion} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    PYTHON=${prefix}/bin/python${PythonVersion}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.env        PYTHONPATH=${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-python-bindings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --without-cython
</span> }
 
 variant python27 conflicts python35 python36 python37 description {Build using Python 2.7} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/files/patch-configure-nopython.diff b/www/nghttp2/files/patch-configure-nopython.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8d9bf1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/files/patch-configure-nopython.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 051eb139..e2a00ac8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,8 +151,6 @@ AC_PROG_MKDIR_P
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_PROG_PKG_CONFIG([0.20])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_PATH_PYTHON([2.7],, [:])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [test "x$request_lib_only" = "xyes"]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   request_app=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   request_hpack_tools=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,6 +159,7 @@ if [test "x$request_lib_only" = "xyes"]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [test "x$request_python_bindings" != "xno"]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AM_PATH_PYTHON([2.7],, [:])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AX_PYTHON_DEVEL([>= '2.7'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span></pre><pre style='margin:0'>

</pre>