From nobody Sun Feb 12 19:15:48 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFHJX3kJRz3qbcd for ; Sun, 12 Feb 2023 19:16:28 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFHJX3LKKz3vfr for ; Sun, 12 Feb 2023 19:16:28 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676229388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MqeInRkdr6o/dZd1OKIVX54/2uljcTK708gh+UKVP6o=; b=gsq6I8LVx8Rod4PS6nmJDeUVbwXSndHmjjXoJApPaD4NK0NTvjs7WdlQWg0xlJg6j6ywdu W50UfLReh09T9s94mVGOhIezHprEq94q+xGxTcNKR7BNWfPYIG0/L9+y1FnVIDpBdcZODl pGg4IFeZ7bhvejlxWmTPxeaRBEaQopaAcN31YVTWEgaDdMkw91qRqFljHMMV3aP+UdqA+F 1s4hFldjqHc7DfbZqu+IZIVDfbeO2k+emqJdgv6hJwQJEVwKkFYSftTmLKoY+1lPt+CIin ydjNzD90yA3HUl6LZOiD3aoisVJMxP46nC+nxBSve5VK0edFSiy3TCN908xb8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676229388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MqeInRkdr6o/dZd1OKIVX54/2uljcTK708gh+UKVP6o=; b=sgFiuYOQHPygihXFh0/o8ZPrhXwLj1gHiI3B7286Ar9TFUyzYkrvxAkXcaWnowqmeuN5Z4 w4xnf/Y1ryjL5uS4uhvwGWgdr54un8Jkc7DNvLWlYK8uYTfuRTSDIsYfcWC3q5OTWndyoB Gw7b3oAqAjAymqOIUM/6dow/aZ9xaiGsZFwupPl+gkhQCn1oIsCT39Q3soGwgNJHLtgJhX dUDcPwiRhdnbyFgm7TrtmGyRq7ezNsnC4F4iiy/JM42qPKZT//ZkcGiJg5xcS7RPreV6rG u1F1EIHpzesyaWK+LYBLG0eY3e2zsZCGpRc1j8s6/Ya4rlWBnNh/fhhc8HgcPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676229388; a=rsa-sha256; cv=none; b=DCm0akno44MuLudBHkZxJosmVjTuiPfUgvS+69uu+LF/ole4cvBmXStRRJQ9XgsR5wA5R0 Qs3m3dpLKUUkaxJcCDJTJoRTNV9tXb3en5R9sjLD1Uo+nlP9UgQ/oooYQCYB/j4Z1RcGyp r9WoY5mchez8jGqPDat/Ex8qgEow2c5O0IdgNrkVZlH7veJwo35BogM1XLzMrdXV0FE+zS lDRrxf48s/TBuy3WhtjvCwQEjRK0U8qrNEgHpXiv+/kwpZKmbhfm7/rP65p56h67IV9IfZ 3WZkisNQ9Va4Dhsxjz3pkloudZyAqtdhppqDsicajT8chpFy6QB6ADmfnyE1Og== Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PFHJX1PNhzssw for ; Sun, 12 Feb 2023 19:16:28 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ej1-f44.google.com with SMTP id hx15so27007272ejc.11 for ; Sun, 12 Feb 2023 11:16:28 -0800 (PST) X-Gm-Message-State: AO0yUKWOBuEvRuo1QNM5eBd80SPBg/yLtoeA9SRmVHqW1ElJHKjIRgdG aZqNtSpL3ErrsWUCPxP7dujJSkTD2nGafn37Ok0Z+Q== X-Google-Smtp-Source: AK7set+Bcb1UWnCRxUKSzdNzCfmmwj9NqSXJZbdM2aIraIMpCSGtwwOHnbIXA2yKfpHebt1xcoV3bdkn+brOZhNAsdA= X-Received: by 2002:a17:906:27c4:b0:888:7a3e:1d7f with SMTP id k4-20020a17090627c400b008887a3e1d7fmr3452119ejc.12.1676229386952; Sun, 12 Feb 2023 11:16:26 -0800 (PST) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 References: <202301301306.30UD6U79053773@gitrepo.freebsd.org> <4630ebaf16b69312bfdb0f534173edc9@FreeBSD.org> <05540117dbdae463b70aac81adac661d@FreeBSD.org> In-Reply-To: <05540117dbdae463b70aac81adac661d@FreeBSD.org> From: Po-Chuan Hsieh Date: Mon, 13 Feb 2023 03:15:48 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 6ab07aa32fc9 - main - www/nghttp2: Change back to make To: Daniel Engberg Cc: Po-Chuan Hsieh , "Tobias C. Berner" , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002bf47505f48591d3" X-ThisMailContainsUnwantedMimeParts: N --0000000000002bf47505f48591d3 Content-Type: text/plain; charset="UTF-8" It is using cmake now. On Fri, Feb 10, 2023 at 4:52 AM Daniel Engberg wrote: > Hi, > > Sounds fair, thanks for looking into it. > > Best regards, > > Daniel > > On 2023-02-07 20:37, Po-Chuan Hsieh wrote: > > Hello, > > I want to emphasize again that I'd like to follow the official build > process in most cases to avoid unexpected problems. > Since it's supported by upstream, I'm OK to convert this port to cmake. > But I need some time to read the cmake files and do it by myself (better > for future maintenance) with your version as a reference. > > Regards, > sunpoet > > On Mon, Feb 6, 2023 at 3:13 AM Daniel Engberg wrote: > > CMake is supported by upstream (see also submitted PRs and issue reports) > and is included in CI > > https://github.com/nghttp2/nghttp2/blob/master/.github/workflows/build.yml > > Many upstream projects lags when it comes to documentation unfortunately > > Best regards, > > Daniel > > On 2023-02-05 15:17, Po-Chuan Hsieh wrote: > > Hello, > > I'm following the official build process [1]. > > [1] https://github.com/nghttp2/nghttp2/blob/master/README.rst > > Regards, > sunpoet > > On Wed, Feb 1, 2023 at 2:28 AM Tobias C. Berner > wrote: > > Moin moin > > What's the reasoning behind this change? > > > mfg Tobias > > On Mon, 30 Jan 2023 at 16:23, Daniel Engberg wrote: > > > > On 2023-01-30 14:06, Po-Chuan Hsieh wrote: > > > The branch main has been updated by sunpoet: > > > > > > URL: > > > > https://cgit.FreeBSD.org/ports/commit/?id=6ab07aa32fc9b73564a66f81feef636225bdd941 > > > > > > commit 6ab07aa32fc9b73564a66f81feef636225bdd941 > > > Author: Po-Chuan Hsieh > > > AuthorDate: 2023-01-30 12:28:54 +0000 > > > Commit: Po-Chuan Hsieh > > > CommitDate: 2023-01-30 12:59:12 +0000 > > > > > > www/nghttp2: Change back to make > > > > > > - Bump PORTREVISION for package change > > > --- > > > www/nghttp2/Makefile | 46 +++++++----- > > > www/nghttp2/files/patch-CMakeLists.txt | 11 --- > > > www/nghttp2/files/patch-Makefile.in | 11 +++ > > > www/nghttp2/files/patch-examples-Makefile.in | 66 > > > +++++++++++++++++ > > > www/nghttp2/files/patch-script-fetch-ocsp-response | 7 ++ > > > www/nghttp2/files/patch-src-Makefile.in | 83 > > > ++++++++++++++++++++++ > > > www/nghttp2/files/patch-tests-Makefile.in | 31 ++++++++ > > > www/nghttp2/pkg-plist | 4 ++ > > > 8 files changed, 231 insertions(+), 28 deletions(-) > > > > > > diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile > > > index 8ef93d6c83f7..e6a38583cd3d 100644 > > > --- a/www/nghttp2/Makefile > > > +++ b/www/nghttp2/Makefile > > > @@ -1,7 +1,7 @@ > > > PORTNAME= nghttp2 > > > -DISTVERSION= 1.51.0 > > > +PORTVERSION= 1.51.0 > > > CATEGORIES= www net > > > -MASTER_SITES= > https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ > > > +MASTER_SITES= > https://github.com/nghttp2/nghttp2/releases/download/v${PORTVERSION}/ > > > > > > MAINTAINER= sunpoet@FreeBSD.org > > > COMMENT= HTTP/2.0 C Library > > > @@ -10,32 +10,44 @@ WWW= https://nghttp2.org/ > > > LICENSE= MIT > > > LICENSE_FILE= ${WRKSRC}/COPYING > > > > > > -BUILD_DEPENDS= libnghttp2>=${DISTVERSION}:www/libnghttp2 > > > +BUILD_DEPENDS= libnghttp2>=${PORTVERSION}:www/libnghttp2 > > > LIB_DEPENDS= libnghttp2.so:www/libnghttp2 > > > > > > -USES= cmake compiler:c++14-lang cpe localbase:ldflags > pathfix \ > > > - pkgconfig python:env shebangfix ssl tar:xz > > > -USE_RC_SUBR= nghttpx > > > -SHEBANG_FILES= script/fetch-ocsp-response > > > +USES= compiler:c++14-lang cpe gmake libtool localbase > pathfix > > > pkgconfig ssl tar:xz > > > > > > -CMAKE_OFF= ENABLE_PYTHON_BINDINGS ENABLE_HTTP3 > > > -CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:PATH=man > > > +CONFIGURE_ARGS= --disable-python-bindings --with-jemalloc > > > +CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ > > > + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" > > > +GNU_CONFIGURE= yes > > > +INSTALL_TARGET= install-strip > > > +USE_CXXSTD= c++14 > > > +USE_RC_SUBR= nghttpx > > > > > > OPTIONS_DEFINE= APP DOCS EXAMPLES HPACK > > > OPTIONS_DEFAULT=APP HPACK > > > OPTIONS_SUB= yes > > > - > > > APP_DESC= Build h2load, nghttp, nghttpd and nghttpx > > > > > > +APP_BUILD_DEPENDS= c-ares>=1.7.5:dns/c-ares \ > > > + libev>=4.11:devel/libev > > > +APP_CONFIGURE_ENABLE= app > > > +APP_CONFIGURE_OFF= --without-libxml2 > > > APP_LIB_DEPENDS= libcares.so:dns/c-ares \ > > > libev.so:devel/libev > > > -APP_USES= gnome > > > APP_USE= GNOME=libxml2 > > > -APP_CMAKE_BOOL= ENABLE_APP WITH_LIBXML2 > > > -HPACK_LIB_DEPENDS= libjansson.so:devel/jansson > > > -HPACK_CMAKE_BOOL= ENABLE_HPACK_TOOLS > > > +APP_USES= gnome > > > +EXAMPLES_CONFIGURE_ENABLE= examples > > > +EXAMPLES_BUILD_DEPENDS= libevent>=2.0.8:devel/libevent > > > EXAMPLES_LIB_DEPENDS= libevent_openssl.so:devel/libevent > > > -EXAMPLES_CMAKE_BOOL= ENABLE_EXAMPLES > > > +HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson > > > +HPACK_CONFIGURE_ENABLE= hpack-tools > > > +HPACK_LIB_DEPENDS= libjansson.so:devel/jansson > > > + > > > +# lib/libnghttp2.* are not available until configure phase > > > +post-configure: > > > + @${MKDIR} ${WRKSRC}/lib/.libs/ > > > + @${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.libs/ > > > + @cd ${WRKSRC}/lib/.libs/ && ${AR} x ${LOCALBASE}/lib/libnghttp2.a > > > > > > post-install: > > > ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/ > > > @@ -43,7 +55,7 @@ post-install: > > > > > > post-install-EXAMPLES-on: > > > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ > > > - cd ${WRKSRC}/examples/ && ${INSTALL_DATA} client.c deflate.c > > > libevent-client.c libevent-server.c ${STAGEDIR}${EXAMPLESDIR}/ > > > - cd ${INSTALL_WRKSRC}/examples/ && ${INSTALL_PROGRAM} client > deflate > > > libevent-client libevent-server ${STAGEDIR}${EXAMPLESDIR}/ > > > + ${INSTALL_DATA} ${WRKSRC}/examples/*.c* > ${STAGEDIR}${EXAMPLESDIR}/ > > > + cd ${WRKSRC}/examples/ && ${INSTALL_PROGRAM} client deflate > > > libevent-client libevent-server ${STAGEDIR}${EXAMPLESDIR}/ > > > > > > .include > > > diff --git a/www/nghttp2/files/patch-CMakeLists.txt > > > b/www/nghttp2/files/patch-CMakeLists.txt > > > deleted file mode 100644 > > > index e8cf364abae5..000000000000 > > > --- a/www/nghttp2/files/patch-CMakeLists.txt > > > +++ /dev/null > > > @@ -1,11 +0,0 @@ > > > ---- CMakeLists.txt.orig 2022-12-24 08:52:48 UTC > > > -+++ CMakeLists.txt > > > -@@ -505,7 +505,7 @@ set(PKGLIBDIR > > > "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PR > > > - > > > - install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}") > > > - > > > --add_subdirectory(lib) > > > -+#add_subdirectory(lib) > > > - #add_subdirectory(lib/includes) > > > - add_subdirectory(third-party) > > > - add_subdirectory(src) > > > diff --git a/www/nghttp2/files/patch-Makefile.in > > > b/www/nghttp2/files/patch-Makefile.in > > > new file mode 100644 > > > index 000000000000..4bc7bac0f224 > > > --- /dev/null > > > +++ b/www/nghttp2/files/patch-Makefile.in > > > @@ -0,0 +1,11 @@ > > > +--- Makefile.in.orig 2022-11-13 06:53:28 UTC > > > ++++ Makefile.in > > > +@@ -465,7 +465,7 @@ top_srcdir = @top_srcdir@ > > > + # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > > > ACTION > > > + # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > > > CONNECTION > > > + # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > > > +-SUBDIRS = lib third-party src bpf examples python tests > > > integration-tests \ > > > ++SUBDIRS = third-party src bpf examples python tests integration-tests > > > \ > > > + doc contrib script > > > + > > > + > > > diff --git a/www/nghttp2/files/patch-examples-Makefile.in > > > b/www/nghttp2/files/patch-examples-Makefile.in > > > new file mode 100644 > > > index 000000000000..5bfb48b8f134 > > > --- /dev/null > > > +++ b/www/nghttp2/files/patch-examples-Makefile.in > > > @@ -0,0 +1,66 @@ > > > +% sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' > > > */Makefile.in > > > + > > > +--- examples/Makefile.in.orig 2022-11-13 06:53:28 UTC > > > ++++ examples/Makefile.in > > > +@@ -146,7 +146,7 @@ am__asio_cl_SOURCES_DIST = asio-cl.cc > > > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_cl_OBJECTS = > > > asio_cl-asio-cl.$(OBJEXT) > > > + asio_cl_OBJECTS = $(am_asio_cl_OBJECTS) > > > + am__DEPENDENCIES_1 = > > > +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = > > > $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = > > > -lnghttp2 \ > > > + > > > @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/src/ > libnghttp2_asio.la > > > \ > > > + > > > @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ > $(top_builddir)/third-party/liburl-parser.la > > > \ > > > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ > $(am__DEPENDENCIES_1) \ > > > +@@ -175,14 +175,14 @@ am__client_SOURCES_DIST = client.c > > > + client_OBJECTS = $(am_client_OBJECTS) > > > + client_LDADD = $(LDADD) > > > + @ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES = \ > > > +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ > > > + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la > > > + am__deflate_SOURCES_DIST = deflate.c > > > + @ENABLE_EXAMPLES_TRUE@am_deflate_OBJECTS = deflate.$(OBJEXT) > > > + deflate_OBJECTS = $(am_deflate_OBJECTS) > > > + deflate_LDADD = $(LDADD) > > > + @ENABLE_EXAMPLES_TRUE@deflate_DEPENDENCIES = \ > > > +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ > > > + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la > > > + am__libevent_client_SOURCES_DIST = libevent-client.c > > > + @ENABLE_EXAMPLES_TRUE@am_libevent_client_OBJECTS = \ > > > +@@ -190,7 +190,7 @@ am__libevent_client_SOURCES_DIST = > > > libevent-client.c > > > + libevent_client_OBJECTS = $(am_libevent_client_OBJECTS) > > > + libevent_client_LDADD = $(LDADD) > > > + @ENABLE_EXAMPLES_TRUE@libevent_client_DEPENDENCIES = \ > > > +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ > > > + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la > > > + am__libevent_server_SOURCES_DIST = libevent-server.c > > > + @ENABLE_EXAMPLES_TRUE@am_libevent_server_OBJECTS = \ > > > +@@ -198,7 +198,7 @@ am__libevent_server_SOURCES_DIST = > > > libevent-server.c > > > + libevent_server_OBJECTS = $(am_libevent_server_OBJECTS) > > > + libevent_server_LDADD = $(LDADD) > > > + @ENABLE_EXAMPLES_TRUE@libevent_server_DEPENDENCIES = \ > > > +-@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ > > > + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la > > > + AM_V_P = $(am__v_P_@AM_V@) > > > + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) > > > +@@ -504,7 +504,7 @@ EXTRA_DIST = CMakeLists.txt > > > + @ENABLE_EXAMPLES_TRUE@ @DEFS@ > > > + > > > + @ENABLE_EXAMPLES_TRUE@AM_LDFLAGS = @LIBTOOL_LDFLAGS@ > > > +-@ENABLE_EXAMPLES_TRUE@LDADD = $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_EXAMPLES_TRUE@LDADD = -lnghttp2 \ > > > + @ENABLE_EXAMPLES_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la \ > > > + @ENABLE_EXAMPLES_TRUE@ @LIBEVENT_OPENSSL_LIBS@ \ > > > + @ENABLE_EXAMPLES_TRUE@ @OPENSSL_LIBS@ \ > > > +@@ -519,7 +519,7 @@ EXTRA_DIST = CMakeLists.txt > > > + # nghttp2/nghttp2.h) in this package is used rather than installed > > > + # one. > > > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS = > > > ${AM_CPPFLAGS} ${BOOST_CPPFLAGS} > > > +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = > > > $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = -lnghttp2 \ > > > + > > > @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ $(top_builddir)/src/ > libnghttp2_asio.la > > > @JEMALLOC_LIBS@ \ > > > + > > > @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ > $(top_builddir)/third-party/liburl-parser.la > > > \ > > > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ @OPENSSL_LIBS@ \ > > > diff --git a/www/nghttp2/files/patch-script-fetch-ocsp-response > > > b/www/nghttp2/files/patch-script-fetch-ocsp-response > > > new file mode 100644 > > > index 000000000000..e68d0f63ef0e > > > --- /dev/null > > > +++ b/www/nghttp2/files/patch-script-fetch-ocsp-response > > > @@ -0,0 +1,7 @@ > > > +--- script/fetch-ocsp-response.orig 2021-10-19 09:31:47 UTC > > > ++++ script/fetch-ocsp-response > > > +@@ -1,4 +1,3 @@ > > > +-#!/usr/bin/env python > > > + # -*- coding: utf-8 -*- > > > + > > > + # nghttp2 - HTTP/2 C Library > > > diff --git a/www/nghttp2/files/patch-src-Makefile.in > > > b/www/nghttp2/files/patch-src-Makefile.in > > > new file mode 100644 > > > index 000000000000..2af9e94c05f9 > > > --- /dev/null > > > +++ b/www/nghttp2/files/patch-src-Makefile.in > > > @@ -0,0 +1,83 @@ > > > +% sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' > > > */Makefile.in > > > + > > > +--- src/Makefile.in.orig 2022-11-13 06:53:29 UTC > > > ++++ src/Makefile.in > > > +@@ -318,7 +318,7 @@ am__libnghttpx_a_SOURCES_DIST = util.cc util.h > > > http2.c > > > + libnghttpx_a_OBJECTS = $(am_libnghttpx_a_OBJECTS) > > > + am__DEPENDENCIES_1 = > > > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_DEPENDENCIES = \ > > > +-@ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_ASIO_LIB_TRUE@ -lnghttp2 \ > > > + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la \ > > > + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/libllhttp.la > \ > > > + @ENABLE_ASIO_LIB_TRUE@ $(am__DEPENDENCIES_1) \ > > > +@@ -394,7 +394,7 @@ am__deflatehd_SOURCES_DIST = deflatehd.cc > > > comp_helper. > > > + @ENABLE_HPACK_TOOLS_TRUE@ $(am__objects_4) > > > + deflatehd_OBJECTS = $(am_deflatehd_OBJECTS) > > > + deflatehd_LDADD = $(LDADD) > > > +-deflatehd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ > > > ++deflatehd_DEPENDENCIES = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la > > > + am__h2load_SOURCES_DIST = util.cc util.h http2.cc http2.h h2load.cc \ > > > +@@ -413,7 +413,7 @@ am__h2load_SOURCES_DIST = util.cc util.h http2.cc > > > http > > > + @ENABLE_APP_TRUE@ $(am__objects_5) > > > + h2load_OBJECTS = $(am_h2load_OBJECTS) > > > + h2load_LDADD = $(LDADD) > > > +-h2load_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ > > > ++h2load_DEPENDENCIES = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la > > > + am__inflatehd_SOURCES_DIST = inflatehd.cc comp_helper.c comp_helper.h > > > \ > > > +@@ -422,7 +422,7 @@ am__inflatehd_SOURCES_DIST = inflatehd.cc > > > comp_helper. > > > + @ENABLE_HPACK_TOOLS_TRUE@ $(am__objects_4) > > > + inflatehd_OBJECTS = $(am_inflatehd_OBJECTS) > > > + inflatehd_LDADD = $(LDADD) > > > +-inflatehd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ > > > ++inflatehd_DEPENDENCIES = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la > > > + am__nghttp_SOURCES_DIST = util.cc http2.cc timegm.c app_helper.cc \ > > > +@@ -441,7 +441,7 @@ am__objects_7 = > > > + @ENABLE_APP_TRUE@ $(am__objects_7) tls.$(OBJEXT) > > > + nghttp_OBJECTS = $(am_nghttp_OBJECTS) > > > + nghttp_LDADD = $(LDADD) > > > +-nghttp_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ > > > ++nghttp_DEPENDENCIES = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la > > > + am__nghttpd_SOURCES_DIST = util.cc http2.cc timegm.c app_helper.cc \ > > > +@@ -453,13 +453,13 @@ am__nghttpd_SOURCES_DIST = util.cc http2.cc > > > timegm.c a > > > + @ENABLE_APP_TRUE@ tls.$(OBJEXT) HttpServer.$(OBJEXT) > > > + nghttpd_OBJECTS = $(am_nghttpd_OBJECTS) > > > + nghttpd_LDADD = $(LDADD) > > > +-nghttpd_DEPENDENCIES = $(top_builddir)/lib/libnghttp2.la \ > > > ++nghttpd_DEPENDENCIES = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la > > > + am__nghttpx_SOURCES_DIST = shrpx.cc shrpx.h > > > + @ENABLE_APP_TRUE@am_nghttpx_OBJECTS = nghttpx-shrpx.$(OBJEXT) > > > + nghttpx_OBJECTS = $(am_nghttpx_OBJECTS) > > > +-am__DEPENDENCIES_2 = $(top_builddir)/lib/libnghttp2.la \ > > > ++am__DEPENDENCIES_2 = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la > > > + @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES = libnghttpx.a \ > > > +@@ -1150,7 +1150,7 @@ AM_CPPFLAGS = \ > > > + @DEFS@ > > > + > > > + AM_LDFLAGS = @LIBTOOL_LDFLAGS@ > > > +-LDADD = $(top_builddir)/lib/libnghttp2.la \ > > > ++LDADD = -lnghttp2 \ > > > + $(top_builddir)/third-party/liburl-parser.la \ > > > + $(top_builddir)/third-party/libllhttp.la \ > > > + @JEMALLOC_LIBS@ \ > > > +@@ -1330,7 +1330,7 @@ LDADD = $(top_builddir)/lib/libnghttp2.la \ > > > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_CPPFLAGS = ${AM_CPPFLAGS} > > > ${BOOST_CPPFLAGS} > > > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LDFLAGS = $(AM_LDFLAGS) > > > -no-undefined -version-info 1:0:0 > > > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LIBADD = \ > > > +-@ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/lib/libnghttp2.la \ > > > ++@ENABLE_ASIO_LIB_TRUE@ -lnghttp2 \ > > > + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/ > liburl-parser.la \ > > > + @ENABLE_ASIO_LIB_TRUE@ $(top_builddir)/third-party/libllhttp.la > \ > > > + @ENABLE_ASIO_LIB_TRUE@ @OPENSSL_LIBS@ \ > > > diff --git a/www/nghttp2/files/patch-tests-Makefile.in > > > b/www/nghttp2/files/patch-tests-Makefile.in > > > new file mode 100644 > > > index 000000000000..1fe8da5ede92 > > > --- /dev/null > > > +++ b/www/nghttp2/files/patch-tests-Makefile.in > > > @@ -0,0 +1,31 @@ > > > +% sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' > > > */Makefile.in > > > + > > > +--- tests/Makefile.in.orig 2022-11-13 06:53:29 UTC > > > ++++ tests/Makefile.in > > > +@@ -141,7 +141,7 @@ failmalloc_OBJECTS = $(am_failmalloc_OBJECTS) > > > + am__DEPENDENCIES_1 = > > > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = > > > ${top_builddir}/lib/.libs/*.o \ > > > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) > > > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = > > > ${top_builddir}/lib/libnghttp2.la \ > > > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = -lnghttp2 > \ > > > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) > > > + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_DEPENDENCIES = > > > $(am__DEPENDENCIES_2) > > > + AM_V_lt = $(am__v_lt_@AM_V@) > > > +@@ -181,7 +181,7 @@ am__objects_1 = > > > + main_OBJECTS = $(am_main_OBJECTS) > > > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = > > > ${top_builddir}/lib/.libs/*.o \ > > > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) > > > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = > > > ${top_builddir}/lib/libnghttp2.la \ > > > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIES = -lnghttp2 \ > > > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ $(am__DEPENDENCIES_1) > > > + main_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ > > > + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > > > +@@ -743,7 +743,7 @@ EXTRA_DIST = CMakeLists.txt > > > + # files directly because the tests use symbols not included in public > > > API. > > > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main_LDADD = > > > ${top_builddir}/lib/.libs/*.o \ > > > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@ $(am__append_2) > > > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD = > > > ${top_builddir}/lib/libnghttp2.la \ > > > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD = -lnghttp2 \ > > > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ $(am__append_2) > > > + @HAVE_CUNIT_TRUE@main_LDFLAGS = -static > > > + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_SOURCES = > > > failmalloc.c failmalloc_test.c failmalloc_test.h \ > > > diff --git a/www/nghttp2/pkg-plist b/www/nghttp2/pkg-plist > > > index be8f7de0e846..16fccb59dac4 100644 > > > --- a/www/nghttp2/pkg-plist > > > +++ b/www/nghttp2/pkg-plist > > > @@ -10,6 +10,10 @@ man/man1/nghttp.1.gz > > > man/man1/nghttpd.1.gz > > > man/man1/nghttpx.1.gz > > > %%PORTDOCS%%%%DOCSDIR%%/README.rst > > > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-cl.cc > > > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-cl2.cc > > > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-sv.cc > > > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-sv2.cc > > > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client > > > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client.c > > > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/deflate > > > > I'm missing the benefit with this change? More patches, hacks and it > > also takes longer to build > > > > Best regards, > > Daniel > > > > > > --0000000000002bf47505f48591d3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
It is using cmake now.

On Fri, Feb 10, 2023 at 4:52 AM Daniel Engberg <diizzy@freebsd.org> wrote:

Hi,

Sounds fair, thanks for looking into it.

Best regards,

Daniel

On 2023-02-07 20:37, Po-Chuan H= sieh wrote:

Hello,
=C2=A0
I want to emphasize again that I'd like to follow the = official build process in most cases to avoid unexpected=C2=A0problems.
Since it's=C2=A0supported by upstream, I'm OK to convert this = port to cmake.
But I need some time to read the cmake files and do it by myself (bett= er for future maintenance) with your version as a reference.
=C2=A0
Regards,
sunpoet

On Mon, Feb 6, 2023 at 3:13 AM Daniel Engberg <diizzy@= freebsd.org> wrote:

CMake is supported by upstream (see also submitted PRs and issue reports= ) and is included in CI

https://github= .com/nghttp2/nghttp2/blob/master/.github/workflows/build.yml

Many upstream projects lags when it comes to documentation unfortunately=

Best regards,

Daniel

On 2023-02-05 15:17, Po-Chuan Hsieh wrote:

Hello,
=C2=A0
I'm following the official=C2=A0build process [1].
=C2=A0
=C2=A0
Regards,
sunpoet

On Wed, Feb 1, 2023 at 2:28 AM Tobias C. Berner <tcbern= er@gmail.com> wrote:
Moin moin

What's the reasoning behin= d this change?


mfg Tobias

On Mon, 30 Jan 2023 at 16:23, D= aniel Engberg <diizzy@freebsd.org> wrote:
>
> On 2023= -01-30 14:06, Po-Chuan Hsieh wrote:
> > The branch main has been u= pdated by sunpoet:
> >
> > URL:
> > https://cgit.FreeBS= D.org/ports/commit/?id=3D6ab07aa32fc9b73564a66f81feef636225bdd941
&g= t; >
> > commit 6ab07aa32fc9b73564a66f81feef636225bdd941
>= ; > Author:=C2=A0 =C2=A0 =C2=A0Po-Chuan Hsieh <sunpoet@FreeBSD.org>= ;
> > AuthorDate: 2023-01-30 12:28:54 +0000
> > Commit:= =C2=A0 =C2=A0 =C2=A0Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> >= CommitDate: 2023-01-30 12:59:12 +0000
> >
> >=C2=A0 =C2= =A0 =C2=A0www/nghttp2: Change back to make
> >
> >=C2=A0 = =C2=A0 =C2=A0- Bump PORTREVISION for package change
> > ---
>= ; >=C2=A0 www/nghttp2/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 46 += ++++++-----
> >=C2=A0 www/nghttp2/files/patch-CMakeLists.txt=C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 11 ---
> >=C2=A0 www/n= ghttp2/files/patch-Makefile.in=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 | 11 +++
> >=C2=A0 www/nghttp2/files/patch-examples-Mak= efile.in=C2=A0 =C2=A0 =C2=A0 =C2=A0| 66
> > +++++++++++++++++
&= gt; >=C2=A0 www/nghttp2/files/patch-script-fetch-ocsp-response |=C2=A0 7= ++
> >=C2=A0 www/nghttp2/files/patch-src-Makefile.in=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 83
> > ++++++++++++++++++++++
&g= t; >=C2=A0 www/nghttp2/files/patch-tests-Makefile.in=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 | 31 ++++++++
> >=C2=A0 www/nghttp2/pkg-plist=C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 4 ++
> >=C2=A0 8 files changed, 2= 31 insertions(+), 28 deletions(-)
> >
> > diff --git a/ww= w/nghttp2/Makefile b/www/nghttp2/Makefile
> > index 8ef93d6c83f7..= e6a38583cd3d 100644
> > --- a/www/nghttp2/Makefile
> > ++= + b/www/nghttp2/Makefile
> > @@ -1,7 +1,7 @@
> >=C2=A0 PO= RTNAME=3D=C2=A0 =C2=A0 nghttp2
> > -DISTVERSION=3D 1.51.0
> = > +PORTVERSION=3D 1.51.0
> >=C2=A0 CATEGORIES=3D=C2=A0 www net<= br>> > -MASTER_SITES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 https://github.com/$= {PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
> > = +MASTER_SITES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 https://github.com/nghttp2/nghttp2/releases/downl= oad/v${PORTVERSION}/
> >
> >=C2=A0 MAINTAINER=3D=C2= =A0 sunpoet@FreeBSD.org
> >=C2=A0 COMMENT=3D=C2=A0 =C2=A0 =C2=A0HT= TP/2.0 C Library
> > @@ -10,32 +10,44 @@ WWW=3D=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 https://nghttp2.org/
> >= =C2=A0 LICENSE=3D=C2=A0 =C2=A0 =C2=A0MIT
> >=C2=A0 LICENSE_FILE=3D= =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/COPYING
> >
> > -BU= ILD_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0libnghttp2>=3D${DISTVERSION}:ww= w/libnghttp2
> > +BUILD_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0libng= http2>=3D${PORTVERSION}:www/libnghttp2
> >=C2=A0 LIB_DEPENDS=3D= libnghttp2.so:www/libnghttp2
> >
> > -USES=3D=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cmake compiler:c++14-lang cpe= localbase:ldflags pathfix \
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pkgconfig python:env shebangfix ssl tar:xz
> > -U= SE_RC_SUBR=3D nghttpx
> > -SHEBANG_FILES=3D=C2=A0 =C2=A0 =C2=A0 = =C2=A0script/fetch-ocsp-response
> > +USES=3D=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 compiler:c++14-lang cpe gmake libtool lo= calbase pathfix
> > pkgconfig ssl tar:xz
> >
> >= -CMAKE_OFF=3D=C2=A0 =C2=A0ENABLE_PYTHON_BINDINGS ENABLE_HTTP3
> >= -CMAKE_ARGS=3D=C2=A0 -DCMAKE_INSTALL_MANDIR:PATH=3Dman
> > +CONFI= GURE_ARGS=3D=C2=A0 =C2=A0 =C2=A0 --disable-python-bindings --with-jemalloc<= br>> > +CONFIGURE_ENV=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0OPENSSL_CFLAGS=3D&= quot;-I${OPENSSLINC}" \
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0OPENSSL_LIBS=3D"-L${OPENSSLLIB} -lcrypto -lssl"<= br>> > +GNU_CONFIGURE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0yes
> > += INSTALL_TARGET=3D=C2=A0 =C2=A0 =C2=A0 install-strip
> > +USE_CXXST= D=3D=C2=A0 c++14
> > +USE_RC_SUBR=3D nghttpx
> >
> = >=C2=A0 OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 APP DOCS EXAMPLES HPACK> >=C2=A0 OPTIONS_DEFAULT=3DAPP HPACK
> >=C2=A0 OPTIONS_SUB= =3D yes
> > -
> >=C2=A0 APP_DESC=3D=C2=A0 =C2=A0 Build h2= load, nghttp, nghttpd and nghttpx
> >
> > +APP_BUILD_DEPE= NDS=3D=C2=A0 =C2=A0c-ares>=3D1.7.5:dns/c-ares \
> > +=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libev>= =3D4.11:devel/libev
> > +APP_CONFIGURE_ENABLE=3D=C2=A0 =C2=A0 =C2= =A0 =C2=A0 app
> > +APP_CONFIGURE_OFF=3D=C2=A0 =C2=A0--without-lib= xml2
> >=C2=A0 APP_LIB_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0libcares.so:d= ns/c-ares \
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libev.so:devel/libev
> > -APP_US= ES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 gnome
> >=C2=A0 APP= _USE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0GNOME=3Dlibxml2
&= gt; > -APP_CMAKE_BOOL=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= ENABLE_APP WITH_LIBXML2
> > -HPACK_LIB_DEPENDS=3D=C2=A0 =C2=A0lib= jansson.so:devel/jansson
> > -HPACK_CMAKE_BOOL=3D=C2=A0 =C2=A0 ENA= BLE_HPACK_TOOLS
> > +APP_USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 gnome
> > +EXAMPLES_CONFIGURE_ENABLE=3D=C2=A0 =C2=A0exampl= es
> > +EXAMPLES_BUILD_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 libevent>= =3D2.0.8:devel/libevent
> >=C2=A0 EXAMPLES_LIB_DEPENDS=3D=C2=A0 = =C2=A0 =C2=A0 =C2=A0 libevent_openssl.so:devel/libevent
> > -EXAMP= LES_CMAKE_BOOL=3D ENABLE_EXAMPLES
> > +HPACK_BUILD_DEPENDS=3D jans= son>=3D2.5:devel/jansson
> > +HPACK_CONFIGURE_ENABLE=3D=C2=A0 = =C2=A0 =C2=A0 hpack-tools
> > +HPACK_LIB_DEPENDS=3D=C2=A0 =C2=A0li= bjansson.so:devel/jansson
> > +
> > +# lib/libnghttp2.* a= re not available until configure phase
> > +post-configure:
>= ; > +=C2=A0 =C2=A0 =C2=A0@${MKDIR} ${WRKSRC}/lib/.libs/
> > += =C2=A0 =C2=A0 =C2=A0@${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.l= ibs/
> > +=C2=A0 =C2=A0 =C2=A0@cd ${WRKSRC}/lib/.libs/ && = ${AR} x ${LOCALBASE}/lib/libnghttp2.a
> >
> >=C2=A0 post-= install:
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0${MKDIR} ${STAGEDIR}${PREFI= X}/etc/nghttpx/
> > @@ -43,7 +55,7 @@ post-install:
> >> >=C2=A0 post-install-EXAMPLES-on:
> >=C2=A0 =C2=A0 =C2= =A0 =C2=A0${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
> > -=C2=A0 =C2=A0 = =C2=A0cd ${WRKSRC}/examples/ && ${INSTALL_DATA} client.c deflate.c<= br>> > libevent-client.c libevent-server.c ${STAGEDIR}${EXAMPLESDIR}/=
> > -=C2=A0 =C2=A0 =C2=A0cd ${INSTALL_WRKSRC}/examples/ &&= ; ${INSTALL_PROGRAM} client deflate
> > libevent-client libevent-s= erver ${STAGEDIR}${EXAMPLESDIR}/
> > +=C2=A0 =C2=A0 =C2=A0${INSTAL= L_DATA} ${WRKSRC}/examples/*.c* ${STAGEDIR}${EXAMPLESDIR}/
> > += =C2=A0 =C2=A0 =C2=A0cd ${WRKSRC}/examples/ && ${INSTALL_PROGRAM} cl= ient deflate
> > libevent-client libevent-server ${STAGEDIR}${EXAM= PLESDIR}/
> >
> >=C2=A0 .include <bsd.port.mk>= ;
> > diff --git a/www/nghttp2/files/patch-CMakeLists.txt
> = > b/www/nghttp2/files/patch-CMakeLists.txt
> > deleted file mod= e 100644
> > index e8cf364abae5..000000000000
> > --- a/w= ww/nghttp2/files/patch-CMakeLists.txt
> > +++ /dev/null
> &g= t; @@ -1,11 +0,0 @@
> > ---- CMakeLists.txt.orig=C2=A0 =C2=A0 =C2= =A0 2022-12-24 08:52:48 UTC
> > -+++ CMakeLists.txt
> > -= @@ -505,7 +505,7 @@ set(PKGLIBDIR
> > "${CMAKE_INSTALL_FULL_L= IBDIR}/${CMAKE_PR
> > -
> > - install(FILES README.rst DE= STINATION "${CMAKE_INSTALL_DOCDIR}")
> > -
> > = --add_subdirectory(lib)
> > -+#add_subdirectory(lib)
> > = - #add_subdirectory(lib/includes)
> > - add_subdirectory(third-par= ty)
> > - add_subdirectory(src)
> > diff --git a/www/nght= tp2/files/patch-Makefile.in
> > b/www/nghttp2/files/patch-Makefile= .in
> > new file mode 100644
> > index 000000000000..4bc7= bac0f224
> > --- /dev/null
> > +++ b/www/nghttp2/files/pa= tch-Makefile.in
> > @@ -0,0 +1,11 @@
> > +--- Makefile.in= .orig 2022-11-13 06:53:28 UTC
> > ++++ Makefile.in
> > +@= @ -465,7 +465,7 @@ top_srcdir =3D @top_srcdir@
> > + # LIABLE FOR = ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> > ACTION> > + # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN> > CONNECTION
> > + # WITH THE SOFTWARE OR THE USE OR OTH= ER DEALINGS IN THE SOFTWARE.
> > +-SUBDIRS =3D lib third-party src= bpf examples python tests
> > integration-tests \
> > ++= SUBDIRS =3D third-party src bpf examples python tests integration-tests
= > > \
> > +=C2=A0 =C2=A0 =C2=A0doc contrib script
> &g= t; +
> > +
> > diff --git a/www/nghttp2/files/patch-examp= les-Makefile.in
> > b/www/nghttp2/files/patch-examples-Makefile.in=
> > new file mode 100644
> > index 000000000000..5bfb48b= 8f134
> > --- /dev/null
> > +++ b/www/nghttp2/files/patch= -examples-Makefile.in
> > @@ -0,0 +1,66 @@
> > +% sed -i = .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|'= ;
> > */Makefile.in
> > +
> > +--- examples/Make= file.in.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2022-11-13 06:53:28 UTC
> >= ; ++++ examples/Makefile.in
> > +@@ -146,7 +146,7 @@ am__asio_cl_S= OURCES_DIST =3D asio-cl.cc
> > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXA= MPLES_TRUE@am_asio_cl_OBJECTS =3D
> > asio_cl-asio-cl.$(OBJEXT)> > + asio_cl_OBJECTS =3D $(am_asio_cl_OBJECTS)
> > + am__D= EPENDENCIES_1 =3D
> > +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRU= E@am__DEPENDENCIES_2 =3D
> > $(top_builddir)/lib/libnghttp2.la= \
> > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPEN= DENCIES_2 =3D
> > -lnghttp2 \
> > +
> > @ENABLE_= ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@=C2=A0 $(top_builddir)/src/lib= nghttp2_asio.la
> > \
> > +
> > @ENABLE_ASIO= _LIB_TRUE@@ENABLE_EXAMPLES_TRUE@=C2=A0 $(top_builddir)/third-party/= liburl-parser.la
> > \
> > + @ENABLE_ASIO_LIB_TRUE@@E= NABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 =C2=A0 $(am__DEPENDENCIES_1) \
= > > +@@ -175,14 +175,14 @@ am__client_SOURCES_DIST =3D client.c
&g= t; > + client_OBJECTS =3D $(am_client_OBJECTS)
> > + client_LDA= DD =3D $(LDADD)
> > + @ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES = =3D=C2=A0 \
> > +-@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top= _builddir)/lib/libnghttp2.la \
> > ++@ENABLE_EXAMPLES_TRUE= @=C2=A0 =C2=A0 =C2=A0 -lnghttp2 \
> > + @ENABLE_EXAMPLES_TRUE@=C2= =A0 =C2=A0 =C2=A0 $(top_builddir)/third-party/liburl-parser.la> > + am__deflate_SOURCES_DIST =3D deflate.c
> > + @ENABLE= _EXAMPLES_TRUE@am_deflate_OBJECTS =3D deflate.$(OBJEXT)
> > + defl= ate_OBJECTS =3D $(am_deflate_OBJECTS)
> > + deflate_LDADD =3D $(LD= ADD)
> > + @ENABLE_EXAMPLES_TRUE@deflate_DEPENDENCIES =3D=C2=A0 \<= br>> > +-@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/l= ib/libnghttp2.la \
> > ++@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2= =A0 =C2=A0 -lnghttp2 \
> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 = =C2=A0 $(top_builddir)/third-party/liburl-parser.la
> >= ; + am__libevent_client_SOURCES_DIST =3D libevent-client.c
> > + @= ENABLE_EXAMPLES_TRUE@am_libevent_client_OBJECTS =3D=C2=A0 \
> > +@= @ -190,7 +190,7 @@ am__libevent_client_SOURCES_DIST =3D
> > libeve= nt-client.c
> > + libevent_client_OBJECTS =3D $(am_libevent_client= _OBJECTS)
> > + libevent_client_LDADD =3D $(LDADD)
> > + = @ENABLE_EXAMPLES_TRUE@libevent_client_DEPENDENCIES =3D=C2=A0 \
> >= +-@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/lib/lib= nghttp2.la \
> > ++@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 = -lnghttp2 \
> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top= _builddir)/third-party/liburl-parser.la
> > + am__libev= ent_server_SOURCES_DIST =3D libevent-server.c
> > + @ENABLE_EXAMPL= ES_TRUE@am_libevent_server_OBJECTS =3D=C2=A0 \
> > +@@ -198,7 +198= ,7 @@ am__libevent_server_SOURCES_DIST =3D
> > libevent-server.c> > + libevent_server_OBJECTS =3D $(am_libevent_server_OBJECTS)
= > > + libevent_server_LDADD =3D $(LDADD)
> > + @ENABLE_EXAMP= LES_TRUE@libevent_server_DEPENDENCIES =3D=C2=A0 \
> > +-@ENABLE_EX= AMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/lib/libnghttp2.la = \
> > ++@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 -lnghttp2 \
= > > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/thir= d-party/liburl-parser.la
> > + AM_V_P =3D $(am__v_P_@AM= _V@)
> > + am__v_P_ =3D $(am__v_P_@AM_DEFAULT_V@)
> > +@@= -504,7 +504,7 @@ EXTRA_DIST =3D CMakeLists.txt
> > + @ENABLE_EXAM= PLES_TRUE@=C2=A0 =C2=A0 =C2=A0 @DEFS@
> > +
> > + @ENABLE= _EXAMPLES_TRUE@AM_LDFLAGS =3D @LIBTOOL_LDFLAGS@
> > +-@ENABLE_EXAM= PLES_TRUE@LDADD =3D $(top_builddir)/lib/libnghttp2.la \
> >= ; ++@ENABLE_EXAMPLES_TRUE@LDADD =3D -lnghttp2 \
> > + @ENABLE_EXAM= PLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/third-party/liburl-pa= rser.la \
> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 @LI= BEVENT_OPENSSL_LIBS@ \
> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 = =C2=A0 @OPENSSL_LIBS@ \
> > +@@ -519,7 +519,7 @@ EXTRA_DIST =3D CM= akeLists.txt
> > + # nghttp2/nghttp2.h) in this package is used ra= ther than installed
> > + # one.
> > + @ENABLE_ASIO_LIB_T= RUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS =3D
> > ${AM_CPPFLAGS} ${BO= OST_CPPFLAGS}
> > +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@AS= IOLDADD =3D
> > $(top_builddir)/lib/libnghttp2.la \
>= ; > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD =3D -lnghttp= 2 \
> > +
> > @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE= @=C2=A0 $(top_builddir)/src/libnghttp2_asio.la
> > @J= EMALLOC_LIBS@ \
> > +
> > @ENABLE_ASIO_LIB_TRUE@@ENABLE_E= XAMPLES_TRUE@=C2=A0 $(top_builddir)/third-party/liburl-parser.la=
> > \
> > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@= =C2=A0 =C2=A0 =C2=A0 =C2=A0 @OPENSSL_LIBS@ \
> > diff --git a/www/= nghttp2/files/patch-script-fetch-ocsp-response
> > b/www/nghttp2/f= iles/patch-script-fetch-ocsp-response
> > new file mode 100644
= > > index 000000000000..e68d0f63ef0e
> > --- /dev/null
&g= t; > +++ b/www/nghttp2/files/patch-script-fetch-ocsp-response
> &g= t; @@ -0,0 +1,7 @@
> > +--- script/fetch-ocsp-response.orig=C2=A0 = 2021-10-19 09:31:47 UTC
> > ++++ script/fetch-ocsp-response
>= ; > +@@ -1,4 +1,3 @@
> > +-#!/usr/bin/env python
> > += # -*- coding: utf-8 -*-
> > +
> > + # nghttp2 - HTTP/2 C= Library
> > diff --git a/www/nghttp2/files/patch-src-Makefile.in<= br>> > b/www/nghttp2/files/patch-src-Makefile.in
> > new fil= e mode 100644
> > index 000000000000..2af9e94c05f9
> > --= - /dev/null
> > +++ b/www/nghttp2/files/patch-src-Makefile.in
&= gt; > @@ -0,0 +1,83 @@
> > +% sed -i .orig 's|$[({]top_buil= ddir[})]/lib/libnghttp2.la|-lnghttp2|'
> > */Makefile.= in
> > +
> > +--- src/Makefile.in.orig=C2=A0 =C2=A0 =C2= =A02022-11-13 06:53:29 UTC
> > ++++ src/Makefile.in
> > += @@ -318,7 +318,7 @@ am__libnghttpx_a_SOURCES_DIST =3D util.cc util.h
>= ; > http2.c
> > + libnghttpx_a_OBJECTS =3D $(am_libnghttpx_a_OB= JECTS)
> > + am__DEPENDENCIES_1 =3D
> > + @ENABLE_ASIO_LI= B_TRUE@libnghttp2_asio_la_DEPENDENCIES =3D=C2=A0 \
> > +-@ENABLE_A= SIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/lib/libnghttp2.la= \
> > ++@ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 -lnghttp2 \> > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/thi= rd-party/liburl-parser.la \
> > + @ENABLE_ASIO_LIB_TRUE= @=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/third-party/libllhttp.la \
= > > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(am__DEPENDENCIES_1= ) \
> > +@@ -394,7 +394,7 @@ am__deflatehd_SOURCES_DIST =3D deflat= ehd.cc
> > comp_helper.
> > + @ENABLE_HPACK_TOOLS_TRUE@= =C2=A0 =C2=A0$(am__objects_4)
> > + deflatehd_OBJECTS =3D $(am_def= latehd_OBJECTS)
> > + deflatehd_LDADD =3D $(LDADD)
> > +-= deflatehd_DEPENDENCIES =3D $(top_builddir)/lib/libnghttp2.la \
&= gt; > ++deflatehd_DEPENDENCIES =3D -lnghttp2 \
> > +=C2=A0 =C2= =A0 =C2=A0$(top_builddir)/third-party/liburl-parser.la \
>= > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/libllhttp.la<= br>> > + am__h2load_SOURCES_DIST =3D util.cc util.h http2.cc http2.h = h2load.cc \
> > +@@ -413,7 +413,7 @@ am__h2load_SOURCES_DIST =3D u= til.cc util.h http2.cc
> > http
> > + @ENABLE_APP_TRUE@= =C2=A0 =C2=A0$(am__objects_5)
> > + h2load_OBJECTS =3D $(am_h2load= _OBJECTS)
> > + h2load_LDADD =3D $(LDADD)
> > +-h2load_DE= PENDENCIES =3D $(top_builddir)/lib/libnghttp2.la \
> > ++h= 2load_DEPENDENCIES =3D -lnghttp2 \
> > +=C2=A0 =C2=A0 =C2=A0$(top_= builddir)/third-party/liburl-parser.la \
> > +=C2=A0 = =C2=A0 =C2=A0$(top_builddir)/third-party/libllhttp.la
> > += am__inflatehd_SOURCES_DIST =3D inflatehd.cc comp_helper.c comp_helper.h> > \
> > +@@ -422,7 +422,7 @@ am__inflatehd_SOURCES_DIST = =3D inflatehd.cc
> > comp_helper.
> > + @ENABLE_HPACK_TOO= LS_TRUE@=C2=A0 =C2=A0$(am__objects_4)
> > + inflatehd_OBJECTS =3D = $(am_inflatehd_OBJECTS)
> > + inflatehd_LDADD =3D $(LDADD)
>= > +-inflatehd_DEPENDENCIES =3D $(top_builddir)/lib/libnghttp2.la \
> > ++inflatehd_DEPENDENCIES =3D -lnghttp2 \
> > +=C2= =A0 =C2=A0 =C2=A0$(top_builddir)/third-party/liburl-parser.la \<= br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/libllhttp.= la
> > + am__nghttp_SOURCES_DIST =3D util.cc http2.cc timegm.c= app_helper.cc \
> > +@@ -441,7 +441,7 @@ am__objects_7 =3D
>= ; > + @ENABLE_APP_TRUE@=C2=A0 =C2=A0$(am__objects_7) tls.$(OBJEXT)
&g= t; > + nghttp_OBJECTS =3D $(am_nghttp_OBJECTS)
> > + nghttp_LDA= DD =3D $(LDADD)
> > +-nghttp_DEPENDENCIES =3D $(top_builddir)/lib/= libnghttp2.la \
> > ++nghttp_DEPENDENCIES =3D -lnghttp2 \<= br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/liburl= -parser.la \
> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-pa= rty/libllhttp.la
> > + am__nghttpd_SOURCES_DIST =3D util.cc= http2.cc timegm.c app_helper.cc \
> > +@@ -453,13 +453,13 @@ am__= nghttpd_SOURCES_DIST =3D util.cc http2.cc
> > timegm.c a
> &= gt; + @ENABLE_APP_TRUE@=C2=A0 =C2=A0tls.$(OBJEXT) HttpServer.$(OBJEXT)
&= gt; > + nghttpd_OBJECTS =3D $(am_nghttpd_OBJECTS)
> > + nghttpd= _LDADD =3D $(LDADD)
> > +-nghttpd_DEPENDENCIES =3D $(top_builddir)= /lib/libnghttp2.la \
> > ++nghttpd_DEPENDENCIES =3D -lnght= tp2 \
> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/= liburl-parser.la \
> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/th= ird-party/libllhttp.la
> > + am__nghttpx_SOURCES_DIST =3D s= hrpx.cc shrpx.h
> > + @ENABLE_APP_TRUE@am_nghttpx_OBJECTS =3D nght= tpx-shrpx.$(OBJEXT)
> > + nghttpx_OBJECTS =3D $(am_nghttpx_OBJECTS= )
> > +-am__DEPENDENCIES_2 =3D $(top_builddir)/lib/libnghttp2.= la \
> > ++am__DEPENDENCIES_2 =3D -lnghttp2 \
> > += =C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/liburl-parser.la= \
> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/libllht= tp.la
> > + @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES =3D libnghtt= px.a \
> > +@@ -1150,7 +1150,7 @@ AM_CPPFLAGS =3D \
> > += =C2=A0 =C2=A0 =C2=A0@DEFS@
> > +
> > + AM_LDFLAGS =3D @LI= BTOOL_LDFLAGS@
> > +-LDADD =3D $(top_builddir)/lib/libnghttp2.= la \
> > ++LDADD =3D -lnghttp2 \
> > +=C2=A0 =C2=A0 = =C2=A0$(top_builddir)/third-party/liburl-parser.la \
> &= gt; +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/libllhttp.la \<= br>> > +=C2=A0 =C2=A0 =C2=A0@JEMALLOC_LIBS@ \
> > +@@ -1330,= 7 +1330,7 @@ LDADD =3D $(top_builddir)/lib/libnghttp2.la \
> = > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_CPPFLAGS =3D ${AM_CPPFLAGS}=
> > ${BOOST_CPPFLAGS}
> > + @ENABLE_ASIO_LIB_TRUE@libngh= ttp2_asio_la_LDFLAGS =3D $(AM_LDFLAGS)
> > -no-undefined -version-= info 1:0:0
> > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LIBADD = =3D \
> > +-@ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_build= dir)/lib/libnghttp2.la \
> > ++@ENABLE_ASIO_LIB_TRUE@=C2= =A0 =C2=A0 =C2=A0 -lnghttp2 \
> > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 = =C2=A0 =C2=A0 $(top_builddir)/third-party/liburl-parser.la \
= > > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/thir= d-party/libllhttp.la \
> > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 = =C2=A0 =C2=A0 @OPENSSL_LIBS@ \
> > diff --git a/www/nghttp2/files/= patch-tests-Makefile.in
> > b/www/nghttp2/files/patch-tests-Makefi= le.in
> > new file mode 100644
> > index 000000000000..1f= e8da5ede92
> > --- /dev/null
> > +++ b/www/nghttp2/files/= patch-tests-Makefile.in
> > @@ -0,0 +1,31 @@
> > +% sed -= i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|&#= 39;
> > */Makefile.in
> > +
> > +--- tests/Makef= ile.in.orig=C2=A0 =C2=A02022-11-13 06:53:29 UTC
> > ++++ tests/Mak= efile.in
> > +@@ -141,7 +141,7 @@ failmalloc_OBJECTS =3D $(am_fail= malloc_OBJECTS)
> > + am__DEPENDENCIES_1 =3D
> > + @ENABL= E_STATIC_FALSE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 =3D
> > ${top_b= uilddir}/lib/.libs/*.o \
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TR= UE@=C2=A0 =C2=A0 =C2=A0 $(am__DEPENDENCIES_1)
> > +-@ENABLE_STATIC= _TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 =3D
> > ${top_builddir}/= lib/libnghttp2.la \
> > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_= TRUE@am__DEPENDENCIES_2 =3D -lnghttp2 \
> > + @ENABLE_STATIC_TRUE@= @HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2=A0 =C2=A0$(am__DEPENDENCIES_1)
> &= gt; + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_DEPENDENCIES =3D<= br>> > $(am__DEPENDENCIES_2)
> > + AM_V_lt =3D $(am__v_lt_@A= M_V@)
> > +@@ -181,7 +181,7 @@ am__objects_1 =3D
> > + ma= in_OBJECTS =3D $(am_main_OBJECTS)
> > + @ENABLE_STATIC_FALSE@@HAVE= _CUNIT_TRUE@main_DEPENDENCIES =3D
> > ${top_builddir}/lib/.libs/*.= o \
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2= =A0 $(am__DEPENDENCIES_1)
> > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TR= UE@main_DEPENDENCIES =3D
> > ${top_builddir}/lib/libnghttp2.la= \
> > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIE= S =3D -lnghttp2 \
> > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@=C2= =A0 =C2=A0 =C2=A0 =C2=A0$(am__DEPENDENCIES_1)
> > + main_LINK =3D = $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \
> > +=C2=A0 = =C2=A0 =C2=A0$(LIBTOOLFLAGS) --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) \=
> > +@@ -743,7 +743,7 @@ EXTRA_DIST =3D CMakeLists.txt
> &g= t; + # files directly because the tests use symbols not included in public<= br>> > API.
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main= _LDADD =3D
> > ${top_builddir}/lib/.libs/*.o \
> > + @ENA= BLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2=A0 $(am__append_2)
&= gt; > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD =3D
> >= ${top_builddir}/lib/libnghttp2.la \
> > ++@ENABLE_STATIC_= TRUE@@HAVE_CUNIT_TRUE@main_LDADD =3D -lnghttp2 \
> > + @ENABLE_STA= TIC_TRUE@@HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2=A0 =C2=A0$(am__append_2)
>= ; > + @HAVE_CUNIT_TRUE@main_LDFLAGS =3D -static
> > + @ENABLE_F= AILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_SOURCES =3D
> > failmal= loc.c failmalloc_test.c failmalloc_test.h \
> > diff --git a/www/n= ghttp2/pkg-plist b/www/nghttp2/pkg-plist
> > index be8f7de0e846..1= 6fccb59dac4 100644
> > --- a/www/nghttp2/pkg-plist
> > ++= + b/www/nghttp2/pkg-plist
> > @@ -10,6 +10,10 @@ man/man1/nghttp.1= .gz
> >=C2=A0 man/man1/nghttpd.1.gz
> >=C2=A0 man/man1/ng= httpx.1.gz
> >=C2=A0 %%PORTDOCS%%%%DOCSDIR%%/README.rst
> &g= t; +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-cl.cc
> > +%%PORTEXAMPLES= %%%%EXAMPLESDIR%%/asio-cl2.cc
> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%= /asio-sv.cc
> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-sv2.cc
&g= t; >=C2=A0 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client
> >=C2=A0 %%P= ORTEXAMPLES%%%%EXAMPLESDIR%%/client.c
> >=C2=A0 %%PORTEXAMPLES%%%%= EXAMPLESDIR%%/deflate
>
> I'm missing the benefit with this= change? More patches, hacks and it
> also takes longer to build
&= gt;
> Best regards,
> Daniel
>



--0000000000002bf47505f48591d3--