<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/fa2d658286b5d1cacfd5a6eafff0a26ee4e224ce">https://github.com/macports/macports-ports/commit/fa2d658286b5d1cacfd5a6eafff0a26ee4e224ce</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa2d658286b5d1cacfd5a6eafff0a26ee4e224ce
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Wed Sep 16 12:31:37 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> nghttp2: separate tools into a subport to extract dependency on OpenSSL
</span>---
www/nghttp2/Portfile | 122 +++++++++++++++++++++++++++++++--------------------
1 file changed, 75 insertions(+), 47 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 e8a21b4262e..a15c7eae8ce 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;'>@@ -6,16 +6,14 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.0
github.setup tatsuhiro-t nghttp2 1.41.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories www
platforms darwin
maintainers {mps @Schamschula} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description nghttp2 is an implementation of HTTP/2 in C.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description} Included are a HTTP/2 client, server and proxy. The \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package also provides a load test and benchmarking tool for HTTP/2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description An implementation of HTTP/2 in C.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span>
github.tarball_from releases
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,14 +27,6 @@ compiler.blacklist-append {clang < 602}
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:c-ares \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jansson \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libevent \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # See: https://trac.macports.org/ticket/57960
patchfiles-append patch-configure-nopython.diff \
patch-src-shrpx_client_handler.cc.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,52 +39,90 @@ compiler.cxx_standard 2011
</span>
configure.args --disable-silent-rules \
--disable-threads \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-lib-only \
</span> ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env JANSSON_CFLAGS=-I${prefix}/include \
</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:#ffe0e0;'>- OPENSSL_CFLAGS=-I${prefix}/include/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.dir ${worksrcpath}/lib
</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;'>+subport nghttp2-tools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Tools for nghttp2, an implementation of HTTP/2 in C.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description HTTP/2 client, server and proxy tools, as well as a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ load test and benchmarking tool for HTTP/2.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "JANSSON_LIBS=-L${prefix}/lib -ljansson" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LIBEVENT_OPENSSL_LIBS=-L${prefix}/lib -levent -levent_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:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-lib-only --enable-app
</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 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;'>-if {[variant_isset python38]} { set PythonVersion 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:c-ares \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jansson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libevent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27] || [variant_isset python36] || [variant_isset python37] || [variant_isset python38]} {
</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:#e0ffe0;'>+ depends_run port:nghttp2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><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><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>
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CYTHON=${prefix}/bin/cython-${PythonVersion} \
</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;'>+ "JANSSON_LIBS=-L${prefix}/lib -ljansson" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBEVENT_OPENSSL_LIBS=-L${prefix}/lib -levent -levent_openssl" \
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove files contained in the main port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/include
</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:#ffe0e0;'>- destroot.env PYTHONPATH=${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</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;'>+ if {[variant_isset python38]} { set PythonVersion 3.8 }
</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] || [variant_isset python38]} {
</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:#e0ffe0;'>+
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+ variant python27 conflicts python36 python37 python38 description {Build using Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_EXTRA_LDFLAGS=-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python-bindings \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-cython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python36 python37 python38 description {Build using Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append "PYTHON_EXTRA_LDFLAGS=-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python27 python37 python38 description {Build using Python 3.6} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python37 python38 description {Build using Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python37 conflicts python27 python36 python38 description {Build using Python 3.7} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python36 python38 description {Build using Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python38 conflicts python27 python36 python37 description {Build using Python 3.8} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python36 python37 description {Build using Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove files contained in the libnghttp2 subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>