<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/debd2252daa873acde078963068eaf8dee9f8882">https://github.com/macports/macports-ports/commit/debd2252daa873acde078963068eaf8dee9f8882</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit debd2252daa873acde078963068eaf8dee9f8882
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Feb 20 00:18:57 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ngtcp2: update to 1.3.0, support picotls
</span>---
net/ngtcp2/Portfile | 80 ++++++++++++++++++++-------------
net/ngtcp2/files/patch-examples.diff | 13 ------
net/ngtcp2/files/patch-no-examples.diff | 11 +++++
3 files changed, 61 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngtcp2/Portfile b/net/ngtcp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e07396b924..cf015c2da72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ngtcp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngtcp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +1,69 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ngtcp2 ngtcp2 1.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ngtcp2 ngtcp2 1.3.0 v
</span> revision 0
categories net devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description ngtcp2 project is an effort to implement RFC9000 QUIC protocol
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description ${name} project is an effort to implement RFC9000 QUIC protocol
</span> long_description {*}${description}
homepage https://nghttp2.org/ngtcp2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0acf2b5b52eec3cf2a28f781808c0bfcf752d3cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 15f3dd4cc4db2435bcd0b5253ccce4cbab26d18cc6ef4f00b5cb4af21ed06a0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 601707
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cunit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jemalloc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nghttp3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5ff8f4018ae180caf84fdfc2cb4e93ea8d44fc16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c3e386674103feedfedcc711190affcdec1c682af8a850469ecf1714d28c139b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 615620
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Do not force build examples: https://github.com/ngtcp2/ngtcp2/issues/804
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-examples.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Notice, QUIC via OpenSSL is unsupported presently:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ngtcp2/ngtcp2/issues/1034
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Other dependencies are only used for examples:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ngtcp2/ngtcp2/issues/1129
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DENABLE_EXAMPLES:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GNUTLS:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_JEMALLOC:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_OPENSSL:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_SHARED_LIB:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_WERROR:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Until this is fixed: https://github.com/ngtcp2/ngtcp2/issues/1034
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DHAVE_SSL_IS_QUIC:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Until jemalloc fixed for 10.5 and below: https://trac.macports.org/ticket/65945
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:jemalloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_JEMALLOC:BOOL=ON -DENABLE_JEMALLOC:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-lib-only=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-werror=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gnutls=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant picotls description "Enable PicoTLS" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:picotls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-picotls=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/picotls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lpicotls-core -lpicotls-minicrypto -lpicotls-openssl
</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;'>+# Do not force build examples:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ngtcp2/ngtcp2/issues/804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant examples description "Build examples" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:brotli \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libev \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nghttp3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(${os.platform} eq "darwin" && ${os.major} > 9) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/65945
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/jemalloc.pc:jemalloc
</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;'>+ compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libbrotlidec=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libbrotlienc=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-lib-only=yes
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngtcp2/files/patch-examples.diff b/net/ngtcp2/files/patch-examples.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f064a90e19f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ngtcp2/files/patch-examples.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-04-26 17:26:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-05-24 15:19:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,7 +396,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(tests)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(crypto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(third-party)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_subdirectory(examples)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(ENABLE_EXAMPLES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_subdirectory(examples)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</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;'>- string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngtcp2/files/patch-no-examples.diff b/net/ngtcp2/files/patch-no-examples.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b1bbdfe352a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngtcp2/files/patch-no-examples.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22311,7 +22311,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "x${have_crypto}" = "xyes" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "x${have_libev}" = "xyes" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "x${HAVE_CXX20}" = "x1"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- enable_examples=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ enable_examples=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x${have_openssl}" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>