Date: Wed, 8 Feb 2023 03:37:43 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Daniel Engberg <diizzy@freebsd.org> Cc: "Tobias C. Berner" <tcberner@gmail.com>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 6ab07aa32fc9 - main - www/nghttp2: Change back to make Message-ID: <CAMHz58SYhCL808fwWqLDZH%2BFB%2Bob4_HfVnp%2BL_V7zO7mwOAxBg@mail.gmail.com> In-Reply-To: <c3f668f393bbc60a39c199aa34110609@FreeBSD.org> References: <202301301306.30UD6U79053773@gitrepo.freebsd.org> <4630ebaf16b69312bfdb0f534173edc9@FreeBSD.org> <CAOshKtftn4X%2B4AQBSFtY4vZh%2BMaNexnxtn6wnpCaqvxv3_d8jA@mail.gmail.com> <CAMHz58StLaC6=2R5JRqMw91w1inuraAC2OZHUsmgTSHYhz=c6w@mail.gmail.com> <c3f668f393bbc60a39c199aa34110609@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000048052a05f4214a65 Content-Type: text/plain; charset="UTF-8" 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 <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, > > 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 <tcberner@gmail.com> > wrote: > > Moin moin > > What's the reasoning behind this change? > > > mfg Tobias > > On Mon, 30 Jan 2023 at 16:23, Daniel Engberg <diizzy@freebsd.org> 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 <sunpoet@FreeBSD.org> > > > AuthorDate: 2023-01-30 12:28:54 +0000 > > > Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > > > 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 <bsd.port.mk> > > > 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 > > > > > --00000000000048052a05f4214a65 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr">Hello,</div><div dir=3D"ltr"><br></div><d= iv dir=3D"ltr">I want to emphasize again that I'd like to follow the of= ficial build process in most cases to avoid unexpected=C2=A0problems.</div>= <div>Since it's=C2=A0supported by upstream, I'm OK to convert this = port to cmake.</div><div>But I need some time to read the cmake files and d= o it by myself (better for future maintenance) with your version as a refer= ence.</div><div><br></div><div>Regards,</div><div>sunpoet</div><br><div cla= ss=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Mon, Feb 6, 202= 3 at 3:13 AM Daniel Engberg <<a href=3D"mailto:diizzy@freebsd.org" targe= t=3D"_blank">diizzy@freebsd.org</a>> wrote:<br></div><blockquote class= =3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rg= b(204,204,204);padding-left:1ex"><div style=3D"font-size:10pt;font-family:V= erdana,Geneva,sans-serif"> <p>CMake is supported by upstream (see also submitted PRs and issue reports= ) and is included in CI</p> <p><a href=3D"https://github.com/nghttp2/nghttp2/blob/master/.github/workfl= ows/build.yml" target=3D"_blank">https://github.com/nghttp2/nghttp2/blob/ma= ster/.github/workflows/build.yml</a></p> <p>Many upstream projects lags when it comes to documentation unfortunately= </p> <p>Best regards,</p> <p>Daniel</p> <p id=3D"m_-7170269197222797375m_3378933126392978909reply-intro">On 2023-02= -05 15:17, Po-Chuan Hsieh wrote:</p> <blockquote type=3D"cite" style=3D"padding:0px 0.4em;border-left:2px solid = rgb(16,16,255);margin:0px"> <div id=3D"m_-7170269197222797375m_3378933126392978909replybody1"> <div dir=3D"ltr"> <div>Hello,</div> <div>=C2=A0</div> <div>I'm following the official=C2=A0build process [1].</div> <div>=C2=A0</div> <div>[1]=C2=A0<a href=3D"https://github.com/nghttp2/nghttp2/blob/master/REA= DME.rst" rel=3D"noopener noreferrer" target=3D"_blank">https://github.com/n= ghttp2/nghttp2/blob/master/README.rst</a></div> <div>=C2=A0</div> <div>Regards,</div> <div>sunpoet</div> <br> <div> <div dir=3D"ltr">On Wed, Feb 1, 2023 at 2:28 AM Tobias C. Berner <<a hre= f=3D"mailto:tcberner@gmail.com" rel=3D"noreferrer" target=3D"_blank">tcbern= er@gmail.com</a>> wrote:</div> <blockquote style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204= ,204,204);padding-left:1ex">Moin moin<br><br>What's the reasoning behin= d this change?<br><br><br>mfg Tobias<br><br>On Mon, 30 Jan 2023 at 16:23, D= aniel Engberg <<a href=3D"mailto:diizzy@freebsd.org" rel=3D"noreferrer" = target=3D"_blank">diizzy@freebsd.org</a>> wrote:<br>><br>> On 2023= -01-30 14:06, Po-Chuan Hsieh wrote:<br>> > The branch main has been u= pdated by sunpoet:<br>> ><br>> > URL:<br>> > <a href=3D"h= ttps://cgit.FreeBSD.org/ports/commit/?id=3D6ab07aa32fc9b73564a66f81feef6362= 25bdd941" rel=3D"noopener noreferrer" target=3D"_blank">https://cgit.FreeBS= D.org/ports/commit/?id=3D6ab07aa32fc9b73564a66f81feef636225bdd941</a><br>&g= t; ><br>> > commit 6ab07aa32fc9b73564a66f81feef636225bdd941<br>>= ; > Author:=C2=A0 =C2=A0 =C2=A0Po-Chuan Hsieh <sunpoet@FreeBSD.org>= ;<br>> > AuthorDate: 2023-01-30 12:28:54 +0000<br>> > Commit:= =C2=A0 =C2=A0 =C2=A0Po-Chuan Hsieh <sunpoet@FreeBSD.org><br>> >= CommitDate: 2023-01-30 12:59:12 +0000<br>> ><br>> >=C2=A0 =C2= =A0 =C2=A0www/nghttp2: Change back to make<br>> ><br>> >=C2=A0 = =C2=A0 =C2=A0- Bump PORTREVISION for package change<br>> > ---<br>>= ; >=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 += ++++++-----<br>> >=C2=A0 www/nghttp2/files/patch-CMakeLists.txt=C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 11 ---<br>> >=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 +++<br>> >=C2=A0 www/nghttp2/files/patch-examples-Mak= efile.in=C2=A0 =C2=A0 =C2=A0 =C2=A0| 66<br>> > +++++++++++++++++<br>&= gt; >=C2=A0 www/nghttp2/files/patch-script-fetch-ocsp-response |=C2=A0 7= ++<br>> >=C2=A0 www/nghttp2/files/patch-src-Makefile.in=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 83<br>> > ++++++++++++++++++++++<br>&g= t; >=C2=A0 www/nghttp2/files/patch-tests-Makefile.in=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 | 31 ++++++++<br>> >=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 ++<br>> >=C2=A0 8 files changed, 2= 31 insertions(+), 28 deletions(-)<br>> ><br>> > diff --git a/ww= w/nghttp2/Makefile b/www/nghttp2/Makefile<br>> > index 8ef93d6c83f7..= e6a38583cd3d 100644<br>> > --- a/www/nghttp2/Makefile<br>> > ++= + b/www/nghttp2/Makefile<br>> > @@ -1,7 +1,7 @@<br>> >=C2=A0 PO= RTNAME=3D=C2=A0 =C2=A0 nghttp2<br>> > -DISTVERSION=3D 1.51.0<br>> = > +PORTVERSION=3D 1.51.0<br>> >=C2=A0 CATEGORIES=3D=C2=A0 www net<= br>> > -MASTER_SITES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 <a href=3D"https:/= /github.com/$%7BPORTNAME%7D/$%7BPORTNAME%7D/releases/download/v$%7BDISTVERS= ION%7D/" rel=3D"noopener noreferrer" target=3D"_blank">https://github.com/$= {PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/</a><br>> > = +MASTER_SITES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 <a href=3D"https://github.com/n= ghttp2/nghttp2/releases/download/v$%7BPORTVERSION%7D/" rel=3D"noopener nore= ferrer" target=3D"_blank">https://github.com/nghttp2/nghttp2/releases/downl= oad/v${PORTVERSION}/</a><br>> ><br>> >=C2=A0 MAINTAINER=3D=C2= =A0 sunpoet@FreeBSD.org<br>> >=C2=A0 COMMENT=3D=C2=A0 =C2=A0 =C2=A0HT= TP/2.0 C Library<br>> > @@ -10,32 +10,44 @@ WWW=3D=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 <a href=3D"https://nghttp2.org/" rel=3D"noo= pener noreferrer" target=3D"_blank">https://nghttp2.org/</a><br>> >= =C2=A0 LICENSE=3D=C2=A0 =C2=A0 =C2=A0MIT<br>> >=C2=A0 LICENSE_FILE=3D= =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/COPYING<br>> ><br>> > -BU= ILD_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0libnghttp2>=3D${DISTVERSION}:ww= w/libnghttp2<br>> > +BUILD_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0libng= http2>=3D${PORTVERSION}:www/libnghttp2<br>> >=C2=A0 LIB_DEPENDS=3D= libnghttp2.so:www/libnghttp2<br>> ><br>> > -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 \<br>> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pkgconfig python:env shebangfix ssl tar:xz<br>> > -U= SE_RC_SUBR=3D nghttpx<br>> > -SHEBANG_FILES=3D=C2=A0 =C2=A0 =C2=A0 = =C2=A0script/fetch-ocsp-response<br>> > +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<br>> > pkgconfig ssl tar:xz<br>> ><br>> >= -CMAKE_OFF=3D=C2=A0 =C2=A0ENABLE_PYTHON_BINDINGS ENABLE_HTTP3<br>> >= -CMAKE_ARGS=3D=C2=A0 -DCMAKE_INSTALL_MANDIR:PATH=3Dman<br>> > +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}" \<br>> > +=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<br>> > += INSTALL_TARGET=3D=C2=A0 =C2=A0 =C2=A0 install-strip<br>> > +USE_CXXST= D=3D=C2=A0 c++14<br>> > +USE_RC_SUBR=3D nghttpx<br>> ><br>> = >=C2=A0 OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 APP DOCS EXAMPLES HPACK<br= >> >=C2=A0 OPTIONS_DEFAULT=3DAPP HPACK<br>> >=C2=A0 OPTIONS_SUB= =3D yes<br>> > -<br>> >=C2=A0 APP_DESC=3D=C2=A0 =C2=A0 Build h2= load, nghttp, nghttpd and nghttpx<br>> ><br>> > +APP_BUILD_DEPE= NDS=3D=C2=A0 =C2=A0c-ares>=3D1.7.5:dns/c-ares \<br>> > +=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<br>> > +APP_CONFIGURE_ENABLE=3D=C2=A0 =C2=A0 =C2= =A0 =C2=A0 app<br>> > +APP_CONFIGURE_OFF=3D=C2=A0 =C2=A0--without-lib= xml2<br>> >=C2=A0 APP_LIB_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0libcares.so:d= ns/c-ares \<br>> >=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<br>> > -APP_US= ES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 gnome<br>> >=C2=A0 APP= _USE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0GNOME=3Dlibxml2<br>&= gt; > -APP_CMAKE_BOOL=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= ENABLE_APP WITH_LIBXML2<br>> > -HPACK_LIB_DEPENDS=3D=C2=A0 =C2=A0lib= jansson.so:devel/jansson<br>> > -HPACK_CMAKE_BOOL=3D=C2=A0 =C2=A0 ENA= BLE_HPACK_TOOLS<br>> > +APP_USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 gnome<br>> > +EXAMPLES_CONFIGURE_ENABLE=3D=C2=A0 =C2=A0exampl= es<br>> > +EXAMPLES_BUILD_DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 libevent>= =3D2.0.8:devel/libevent<br>> >=C2=A0 EXAMPLES_LIB_DEPENDS=3D=C2=A0 = =C2=A0 =C2=A0 =C2=A0 libevent_openssl.so:devel/libevent<br>> > -EXAMP= LES_CMAKE_BOOL=3D ENABLE_EXAMPLES<br>> > +HPACK_BUILD_DEPENDS=3D jans= son>=3D2.5:devel/jansson<br>> > +HPACK_CONFIGURE_ENABLE=3D=C2=A0 = =C2=A0 =C2=A0 hpack-tools<br>> > +HPACK_LIB_DEPENDS=3D=C2=A0 =C2=A0li= bjansson.so:devel/jansson<br>> > +<br>> > +# lib/libnghttp2.* a= re not available until configure phase<br>> > +post-configure:<br>>= ; > +=C2=A0 =C2=A0 =C2=A0@${MKDIR} ${WRKSRC}/lib/.libs/<br>> > += =C2=A0 =C2=A0 =C2=A0@${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.l= ibs/<br>> > +=C2=A0 =C2=A0 =C2=A0@cd ${WRKSRC}/lib/.libs/ && = ${AR} x ${LOCALBASE}/lib/libnghttp2.a<br>> ><br>> >=C2=A0 post-= install:<br>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0${MKDIR} ${STAGEDIR}${PREFI= X}/etc/nghttpx/<br>> > @@ -43,7 +55,7 @@ post-install:<br>> ><b= r>> >=C2=A0 post-install-EXAMPLES-on:<br>> >=C2=A0 =C2=A0 =C2= =A0 =C2=A0${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/<br>> > -=C2=A0 =C2=A0 = =C2=A0cd ${WRKSRC}/examples/ && ${INSTALL_DATA} client.c deflate.c<= br>> > libevent-client.c libevent-server.c ${STAGEDIR}${EXAMPLESDIR}/= <br>> > -=C2=A0 =C2=A0 =C2=A0cd ${INSTALL_WRKSRC}/examples/ &&= ; ${INSTALL_PROGRAM} client deflate<br>> > libevent-client libevent-s= erver ${STAGEDIR}${EXAMPLESDIR}/<br>> > +=C2=A0 =C2=A0 =C2=A0${INSTAL= L_DATA} ${WRKSRC}/examples/*.c* ${STAGEDIR}${EXAMPLESDIR}/<br>> > += =C2=A0 =C2=A0 =C2=A0cd ${WRKSRC}/examples/ && ${INSTALL_PROGRAM} cl= ient deflate<br>> > libevent-client libevent-server ${STAGEDIR}${EXAM= PLESDIR}/<br>> ><br>> >=C2=A0 .include <<a href=3D"http://bs= d.port.mk" rel=3D"noopener noreferrer" target=3D"_blank">bsd.port.mk</a>>= ;<br>> > diff --git a/www/nghttp2/files/patch-CMakeLists.txt<br>> = > b/www/nghttp2/files/patch-CMakeLists.txt<br>> > deleted file mod= e 100644<br>> > index e8cf364abae5..000000000000<br>> > --- a/w= ww/nghttp2/files/patch-CMakeLists.txt<br>> > +++ /dev/null<br>> &g= t; @@ -1,11 +0,0 @@<br>> > ---- CMakeLists.txt.orig=C2=A0 =C2=A0 =C2= =A0 2022-12-24 08:52:48 UTC<br>> > -+++ CMakeLists.txt<br>> > -= @@ -505,7 +505,7 @@ set(PKGLIBDIR<br>> > "${CMAKE_INSTALL_FULL_L= IBDIR}/${CMAKE_PR<br>> > -<br>> > - install(FILES README.rst DE= STINATION "${CMAKE_INSTALL_DOCDIR}")<br>> > -<br>> > = --add_subdirectory(lib)<br>> > -+#add_subdirectory(lib)<br>> > = - #add_subdirectory(lib/includes)<br>> > - add_subdirectory(third-par= ty)<br>> > - add_subdirectory(src)<br>> > diff --git a/www/nght= tp2/files/patch-Makefile.in<br>> > b/www/nghttp2/files/patch-Makefile= .in<br>> > new file mode 100644<br>> > index 000000000000..4bc7= bac0f224<br>> > --- /dev/null<br>> > +++ b/www/nghttp2/files/pa= tch-Makefile.in<br>> > @@ -0,0 +1,11 @@<br>> > +--- Makefile.in= .orig 2022-11-13 06:53:28 UTC<br>> > ++++ Makefile.in<br>> > +@= @ -465,7 +465,7 @@ top_srcdir =3D @top_srcdir@<br>> > + # LIABLE FOR = ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN<br>> > ACTION<br= >> > + # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN<b= r>> > CONNECTION<br>> > + # WITH THE SOFTWARE OR THE USE OR OTH= ER DEALINGS IN THE SOFTWARE.<br>> > +-SUBDIRS =3D lib third-party src= bpf examples python tests<br>> > integration-tests \<br>> > ++= SUBDIRS =3D third-party src bpf examples python tests integration-tests<br>= > > \<br>> > +=C2=A0 =C2=A0 =C2=A0doc contrib script<br>> &g= t; +<br>> > +<br>> > diff --git a/www/nghttp2/files/patch-examp= les-Makefile.in<br>> > b/www/nghttp2/files/patch-examples-Makefile.in= <br>> > new file mode 100644<br>> > index 000000000000..5bfb48b= 8f134<br>> > --- /dev/null<br>> > +++ b/www/nghttp2/files/patch= -examples-Makefile.in<br>> > @@ -0,0 +1,66 @@<br>> > +% sed -i = .orig 's|$[({]top_builddir[})]/lib/<a href=3D"http://libnghttp2.la" rel= =3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a>|-lnghttp2|'= ;<br>> > */Makefile.in<br>> > +<br>> > +--- examples/Make= file.in.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2022-11-13 06:53:28 UTC<br>> >= ; ++++ examples/Makefile.in<br>> > +@@ -146,7 +146,7 @@ am__asio_cl_S= OURCES_DIST =3D asio-cl.cc<br>> > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXA= MPLES_TRUE@am_asio_cl_OBJECTS =3D<br>> > asio_cl-asio-cl.$(OBJEXT)<br= >> > + asio_cl_OBJECTS =3D $(am_asio_cl_OBJECTS)<br>> > + am__D= EPENDENCIES_1 =3D<br>> > +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRU= E@am__DEPENDENCIES_2 =3D<br>> > $(top_builddir)/lib/<a href=3D"http:/= /libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la= </a> \<br>> > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPEN= DENCIES_2 =3D<br>> > -lnghttp2 \<br>> > +<br>> > @ENABLE_= ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@=C2=A0 $(top_builddir)/src/<a href=3D"h= ttp://libnghttp2_asio.la" rel=3D"noopener noreferrer" target=3D"_blank">lib= nghttp2_asio.la</a><br>> > \<br>> > +<br>> > @ENABLE_ASIO= _LIB_TRUE@@ENABLE_EXAMPLES_TRUE@=C2=A0 $(top_builddir)/third-party/<a href= =3D"http://liburl-parser.la" rel=3D"noopener noreferrer" target=3D"_blank">= liburl-parser.la</a><br>> > \<br>> > + @ENABLE_ASIO_LIB_TRUE@@E= NABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 =C2=A0 $(am__DEPENDENCIES_1) \<br>= > > +@@ -175,14 +175,14 @@ am__client_SOURCES_DIST =3D client.c<br>&g= t; > + client_OBJECTS =3D $(am_client_OBJECTS)<br>> > + client_LDA= DD =3D $(LDADD)<br>> > + @ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES = =3D=C2=A0 \<br>> > +-@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top= _builddir)/lib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer"= target=3D"_blank">libnghttp2.la</a> \<br>> > ++@ENABLE_EXAMPLES_TRUE= @=C2=A0 =C2=A0 =C2=A0 -lnghttp2 \<br>> > + @ENABLE_EXAMPLES_TRUE@=C2= =A0 =C2=A0 =C2=A0 $(top_builddir)/third-party/<a href=3D"http://liburl-pars= er.la" rel=3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a><b= r>> > + am__deflate_SOURCES_DIST =3D deflate.c<br>> > + @ENABLE= _EXAMPLES_TRUE@am_deflate_OBJECTS =3D deflate.$(OBJEXT)<br>> > + defl= ate_OBJECTS =3D $(am_deflate_OBJECTS)<br>> > + deflate_LDADD =3D $(LD= ADD)<br>> > + @ENABLE_EXAMPLES_TRUE@deflate_DEPENDENCIES =3D=C2=A0 \<= br>> > +-@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/l= ib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_= blank">libnghttp2.la</a> \<br>> > ++@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2= =A0 =C2=A0 -lnghttp2 \<br>> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 = =C2=A0 $(top_builddir)/third-party/<a href=3D"http://liburl-parser.la" rel= =3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a><br>> >= ; + am__libevent_client_SOURCES_DIST =3D libevent-client.c<br>> > + @= ENABLE_EXAMPLES_TRUE@am_libevent_client_OBJECTS =3D=C2=A0 \<br>> > +@= @ -190,7 +190,7 @@ am__libevent_client_SOURCES_DIST =3D<br>> > libeve= nt-client.c<br>> > + libevent_client_OBJECTS =3D $(am_libevent_client= _OBJECTS)<br>> > + libevent_client_LDADD =3D $(LDADD)<br>> > + = @ENABLE_EXAMPLES_TRUE@libevent_client_DEPENDENCIES =3D=C2=A0 \<br>> >= +-@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/lib/<a href= =3D"http://libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">lib= nghttp2.la</a> \<br>> > ++@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 = -lnghttp2 \<br>> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top= _builddir)/third-party/<a href=3D"http://liburl-parser.la" rel=3D"noopener = noreferrer" target=3D"_blank">liburl-parser.la</a><br>> > + am__libev= ent_server_SOURCES_DIST =3D libevent-server.c<br>> > + @ENABLE_EXAMPL= ES_TRUE@am_libevent_server_OBJECTS =3D=C2=A0 \<br>> > +@@ -198,7 +198= ,7 @@ am__libevent_server_SOURCES_DIST =3D<br>> > libevent-server.c<b= r>> > + libevent_server_OBJECTS =3D $(am_libevent_server_OBJECTS)<br>= > > + libevent_server_LDADD =3D $(LDADD)<br>> > + @ENABLE_EXAMP= LES_TRUE@libevent_server_DEPENDENCIES =3D=C2=A0 \<br>> > +-@ENABLE_EX= AMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/lib/<a href=3D"http://libn= ghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a> = \<br>> > ++@ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 -lnghttp2 \<br>= > > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/thir= d-party/<a href=3D"http://liburl-parser.la" rel=3D"noopener noreferrer" tar= get=3D"_blank">liburl-parser.la</a><br>> > + AM_V_P =3D $(am__v_P_@AM= _V@)<br>> > + am__v_P_ =3D $(am__v_P_@AM_DEFAULT_V@)<br>> > +@@= -504,7 +504,7 @@ EXTRA_DIST =3D CMakeLists.txt<br>> > + @ENABLE_EXAM= PLES_TRUE@=C2=A0 =C2=A0 =C2=A0 @DEFS@<br>> > +<br>> > + @ENABLE= _EXAMPLES_TRUE@AM_LDFLAGS =3D @LIBTOOL_LDFLAGS@<br>> > +-@ENABLE_EXAM= PLES_TRUE@LDADD =3D $(top_builddir)/lib/<a href=3D"http://libnghttp2.la" re= l=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a> \<br>> >= ; ++@ENABLE_EXAMPLES_TRUE@LDADD =3D -lnghttp2 \<br>> > + @ENABLE_EXAM= PLES_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/third-party/<a href=3D"http:= //liburl-parser.la" rel=3D"noopener noreferrer" target=3D"_blank">liburl-pa= rser.la</a> \<br>> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 =C2=A0 @LI= BEVENT_OPENSSL_LIBS@ \<br>> > + @ENABLE_EXAMPLES_TRUE@=C2=A0 =C2=A0 = =C2=A0 @OPENSSL_LIBS@ \<br>> > +@@ -519,7 +519,7 @@ EXTRA_DIST =3D CM= akeLists.txt<br>> > + # nghttp2/nghttp2.h) in this package is used ra= ther than installed<br>> > + # one.<br>> > + @ENABLE_ASIO_LIB_T= RUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS =3D<br>> > ${AM_CPPFLAGS} ${BO= OST_CPPFLAGS}<br>> > +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@AS= IOLDADD =3D<br>> > $(top_builddir)/lib/<a href=3D"http://libnghttp2.l= a" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a> \<br>>= ; > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD =3D -lnghttp= 2 \<br>> > +<br>> > @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE= @=C2=A0 $(top_builddir)/src/<a href=3D"http://libnghttp2_asio.la" rel=3D"no= opener noreferrer" target=3D"_blank">libnghttp2_asio.la</a><br>> > @J= EMALLOC_LIBS@ \<br>> > +<br>> > @ENABLE_ASIO_LIB_TRUE@@ENABLE_E= XAMPLES_TRUE@=C2=A0 $(top_builddir)/third-party/<a href=3D"http://liburl-pa= rser.la" rel=3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a>= <br>> > \<br>> > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@= =C2=A0 =C2=A0 =C2=A0 =C2=A0 @OPENSSL_LIBS@ \<br>> > diff --git a/www/= nghttp2/files/patch-script-fetch-ocsp-response<br>> > b/www/nghttp2/f= iles/patch-script-fetch-ocsp-response<br>> > new file mode 100644<br>= > > index 000000000000..e68d0f63ef0e<br>> > --- /dev/null<br>&g= t; > +++ b/www/nghttp2/files/patch-script-fetch-ocsp-response<br>> &g= t; @@ -0,0 +1,7 @@<br>> > +--- script/fetch-ocsp-response.orig=C2=A0 = 2021-10-19 09:31:47 UTC<br>> > ++++ script/fetch-ocsp-response<br>>= ; > +@@ -1,4 +1,3 @@<br>> > +-#!/usr/bin/env python<br>> > += # -*- coding: utf-8 -*-<br>> > +<br>> > + # nghttp2 - HTTP/2 C= Library<br>> > diff --git a/www/nghttp2/files/patch-src-Makefile.in<= br>> > b/www/nghttp2/files/patch-src-Makefile.in<br>> > new fil= e mode 100644<br>> > index 000000000000..2af9e94c05f9<br>> > --= - /dev/null<br>> > +++ b/www/nghttp2/files/patch-src-Makefile.in<br>&= gt; > @@ -0,0 +1,83 @@<br>> > +% sed -i .orig 's|$[({]top_buil= ddir[})]/lib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer" t= arget=3D"_blank">libnghttp2.la</a>|-lnghttp2|'<br>> > */Makefile.= in<br>> > +<br>> > +--- src/Makefile.in.orig=C2=A0 =C2=A0 =C2= =A02022-11-13 06:53:29 UTC<br>> > ++++ src/Makefile.in<br>> > += @@ -318,7 +318,7 @@ am__libnghttpx_a_SOURCES_DIST =3D util.cc util.h<br>>= ; > http2.c<br>> > + libnghttpx_a_OBJECTS =3D $(am_libnghttpx_a_OB= JECTS)<br>> > + am__DEPENDENCIES_1 =3D<br>> > + @ENABLE_ASIO_LI= B_TRUE@libnghttp2_asio_la_DEPENDENCIES =3D=C2=A0 \<br>> > +-@ENABLE_A= SIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/lib/<a href=3D"http://lib= nghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a>= \<br>> > ++@ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 -lnghttp2 \<br= >> > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/thi= rd-party/<a href=3D"http://liburl-parser.la" rel=3D"noopener noreferrer" ta= rget=3D"_blank">liburl-parser.la</a> \<br>> > + @ENABLE_ASIO_LIB_TRUE= @=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/third-party/<a href=3D"http://libllht= tp.la" rel=3D"noopener noreferrer" target=3D"_blank">libllhttp.la</a> \<br>= > > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(am__DEPENDENCIES_1= ) \<br>> > +@@ -394,7 +394,7 @@ am__deflatehd_SOURCES_DIST =3D deflat= ehd.cc<br>> > comp_helper.<br>> > + @ENABLE_HPACK_TOOLS_TRUE@= =C2=A0 =C2=A0$(am__objects_4)<br>> > + deflatehd_OBJECTS =3D $(am_def= latehd_OBJECTS)<br>> > + deflatehd_LDADD =3D $(LDADD)<br>> > +-= deflatehd_DEPENDENCIES =3D $(top_builddir)/lib/<a href=3D"http://libnghttp2= .la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a> \<br>&= gt; > ++deflatehd_DEPENDENCIES =3D -lnghttp2 \<br>> > +=C2=A0 =C2= =A0 =C2=A0$(top_builddir)/third-party/<a href=3D"http://liburl-parser.la" r= el=3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a> \<br>>= > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"http://li= bllhttp.la" rel=3D"noopener noreferrer" target=3D"_blank">libllhttp.la</a><= br>> > + am__h2load_SOURCES_DIST =3D util.cc util.h http2.cc http2.h = h2load.cc \<br>> > +@@ -413,7 +413,7 @@ am__h2load_SOURCES_DIST =3D u= til.cc util.h http2.cc<br>> > http<br>> > + @ENABLE_APP_TRUE@= =C2=A0 =C2=A0$(am__objects_5)<br>> > + h2load_OBJECTS =3D $(am_h2load= _OBJECTS)<br>> > + h2load_LDADD =3D $(LDADD)<br>> > +-h2load_DE= PENDENCIES =3D $(top_builddir)/lib/<a href=3D"http://libnghttp2.la" rel=3D"= noopener noreferrer" target=3D"_blank">libnghttp2.la</a> \<br>> > ++h= 2load_DEPENDENCIES =3D -lnghttp2 \<br>> > +=C2=A0 =C2=A0 =C2=A0$(top_= builddir)/third-party/<a href=3D"http://liburl-parser.la" rel=3D"noopener n= oreferrer" target=3D"_blank">liburl-parser.la</a> \<br>> > +=C2=A0 = =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"http://libllhttp.la" re= l=3D"noopener noreferrer" target=3D"_blank">libllhttp.la</a><br>> > += am__inflatehd_SOURCES_DIST =3D inflatehd.cc comp_helper.c comp_helper.h<br= >> > \<br>> > +@@ -422,7 +422,7 @@ am__inflatehd_SOURCES_DIST = =3D inflatehd.cc<br>> > comp_helper.<br>> > + @ENABLE_HPACK_TOO= LS_TRUE@=C2=A0 =C2=A0$(am__objects_4)<br>> > + inflatehd_OBJECTS =3D = $(am_inflatehd_OBJECTS)<br>> > + inflatehd_LDADD =3D $(LDADD)<br>>= > +-inflatehd_DEPENDENCIES =3D $(top_builddir)/lib/<a href=3D"http://li= bnghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a= > \<br>> > ++inflatehd_DEPENDENCIES =3D -lnghttp2 \<br>> > +=C2= =A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"http://liburl-parse= r.la" rel=3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a> \<= br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"ht= tp://libllhttp.la" rel=3D"noopener noreferrer" target=3D"_blank">libllhttp.= la</a><br>> > + am__nghttp_SOURCES_DIST =3D util.cc http2.cc timegm.c= app_helper.cc \<br>> > +@@ -441,7 +441,7 @@ am__objects_7 =3D<br>>= ; > + @ENABLE_APP_TRUE@=C2=A0 =C2=A0$(am__objects_7) tls.$(OBJEXT)<br>&g= t; > + nghttp_OBJECTS =3D $(am_nghttp_OBJECTS)<br>> > + nghttp_LDA= DD =3D $(LDADD)<br>> > +-nghttp_DEPENDENCIES =3D $(top_builddir)/lib/= <a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_bla= nk">libnghttp2.la</a> \<br>> > ++nghttp_DEPENDENCIES =3D -lnghttp2 \<= br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"ht= tp://liburl-parser.la" rel=3D"noopener noreferrer" target=3D"_blank">liburl= -parser.la</a> \<br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-pa= rty/<a href=3D"http://libllhttp.la" rel=3D"noopener noreferrer" target=3D"_= blank">libllhttp.la</a><br>> > + am__nghttpd_SOURCES_DIST =3D util.cc= http2.cc timegm.c app_helper.cc \<br>> > +@@ -453,13 +453,13 @@ am__= nghttpd_SOURCES_DIST =3D util.cc http2.cc<br>> > timegm.c a<br>> &= gt; + @ENABLE_APP_TRUE@=C2=A0 =C2=A0tls.$(OBJEXT) HttpServer.$(OBJEXT)<br>&= gt; > + nghttpd_OBJECTS =3D $(am_nghttpd_OBJECTS)<br>> > + nghttpd= _LDADD =3D $(LDADD)<br>> > +-nghttpd_DEPENDENCIES =3D $(top_builddir)= /lib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer" target=3D= "_blank">libnghttp2.la</a> \<br>> > ++nghttpd_DEPENDENCIES =3D -lnght= tp2 \<br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href= =3D"http://liburl-parser.la" rel=3D"noopener noreferrer" target=3D"_blank">= liburl-parser.la</a> \<br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/th= ird-party/<a href=3D"http://libllhttp.la" rel=3D"noopener noreferrer" targe= t=3D"_blank">libllhttp.la</a><br>> > + am__nghttpx_SOURCES_DIST =3D s= hrpx.cc shrpx.h<br>> > + @ENABLE_APP_TRUE@am_nghttpx_OBJECTS =3D nght= tpx-shrpx.$(OBJEXT)<br>> > + nghttpx_OBJECTS =3D $(am_nghttpx_OBJECTS= )<br>> > +-am__DEPENDENCIES_2 =3D $(top_builddir)/lib/<a href=3D"http= ://libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.= la</a> \<br>> > ++am__DEPENDENCIES_2 =3D -lnghttp2 \<br>> > += =C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"http://liburl-pa= rser.la" rel=3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a>= \<br>> > +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D= "http://libllhttp.la" rel=3D"noopener noreferrer" target=3D"_blank">libllht= tp.la</a><br>> > + @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES =3D libnghtt= px.a \<br>> > +@@ -1150,7 +1150,7 @@ AM_CPPFLAGS =3D \<br>> > += =C2=A0 =C2=A0 =C2=A0@DEFS@<br>> > +<br>> > + AM_LDFLAGS =3D @LI= BTOOL_LDFLAGS@<br>> > +-LDADD =3D $(top_builddir)/lib/<a href=3D"http= ://libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.= la</a> \<br>> > ++LDADD =3D -lnghttp2 \<br>> > +=C2=A0 =C2=A0 = =C2=A0$(top_builddir)/third-party/<a href=3D"http://liburl-parser.la" rel= =3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a> \<br>> &= gt; +=C2=A0 =C2=A0 =C2=A0$(top_builddir)/third-party/<a href=3D"http://libl= lhttp.la" rel=3D"noopener noreferrer" target=3D"_blank">libllhttp.la</a> \<= br>> > +=C2=A0 =C2=A0 =C2=A0@JEMALLOC_LIBS@ \<br>> > +@@ -1330,= 7 +1330,7 @@ LDADD =3D $(top_builddir)/lib/<a href=3D"http://libnghttp2.la"= rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a> \<br>> = > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_CPPFLAGS =3D ${AM_CPPFLAGS}= <br>> > ${BOOST_CPPFLAGS}<br>> > + @ENABLE_ASIO_LIB_TRUE@libngh= ttp2_asio_la_LDFLAGS =3D $(AM_LDFLAGS)<br>> > -no-undefined -version-= info 1:0:0<br>> > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_LIBADD = =3D \<br>> > +-@ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_build= dir)/lib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer" targe= t=3D"_blank">libnghttp2.la</a> \<br>> > ++@ENABLE_ASIO_LIB_TRUE@=C2= =A0 =C2=A0 =C2=A0 -lnghttp2 \<br>> > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 = =C2=A0 =C2=A0 $(top_builddir)/third-party/<a href=3D"http://liburl-parser.l= a" rel=3D"noopener noreferrer" target=3D"_blank">liburl-parser.la</a> \<br>= > > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 =C2=A0 =C2=A0 $(top_builddir)/thir= d-party/<a href=3D"http://libllhttp.la" rel=3D"noopener noreferrer" target= =3D"_blank">libllhttp.la</a> \<br>> > + @ENABLE_ASIO_LIB_TRUE@=C2=A0 = =C2=A0 =C2=A0 @OPENSSL_LIBS@ \<br>> > diff --git a/www/nghttp2/files/= patch-tests-Makefile.in<br>> > b/www/nghttp2/files/patch-tests-Makefi= le.in<br>> > new file mode 100644<br>> > index 000000000000..1f= e8da5ede92<br>> > --- /dev/null<br>> > +++ b/www/nghttp2/files/= patch-tests-Makefile.in<br>> > @@ -0,0 +1,31 @@<br>> > +% sed -= i .orig 's|$[({]top_builddir[})]/lib/<a href=3D"http://libnghttp2.la" r= el=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la</a>|-lnghttp2|&#= 39;<br>> > */Makefile.in<br>> > +<br>> > +--- tests/Makef= ile.in.orig=C2=A0 =C2=A02022-11-13 06:53:29 UTC<br>> > ++++ tests/Mak= efile.in<br>> > +@@ -141,7 +141,7 @@ failmalloc_OBJECTS =3D $(am_fail= malloc_OBJECTS)<br>> > + am__DEPENDENCIES_1 =3D<br>> > + @ENABL= E_STATIC_FALSE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 =3D<br>> > ${top_b= uilddir}/lib/.libs/*.o \<br>> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TR= UE@=C2=A0 =C2=A0 =C2=A0 $(am__DEPENDENCIES_1)<br>> > +-@ENABLE_STATIC= _TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 =3D<br>> > ${top_builddir}/= lib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noreferrer" target=3D"= _blank">libnghttp2.la</a> \<br>> > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_= TRUE@am__DEPENDENCIES_2 =3D -lnghttp2 \<br>> > + @ENABLE_STATIC_TRUE@= @HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2=A0 =C2=A0$(am__DEPENDENCIES_1)<br>> &= gt; + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_DEPENDENCIES =3D<= br>> > $(am__DEPENDENCIES_2)<br>> > + AM_V_lt =3D $(am__v_lt_@A= M_V@)<br>> > +@@ -181,7 +181,7 @@ am__objects_1 =3D<br>> > + ma= in_OBJECTS =3D $(am_main_OBJECTS)<br>> > + @ENABLE_STATIC_FALSE@@HAVE= _CUNIT_TRUE@main_DEPENDENCIES =3D<br>> > ${top_builddir}/lib/.libs/*.= o \<br>> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2= =A0 $(am__DEPENDENCIES_1)<br>> > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TR= UE@main_DEPENDENCIES =3D<br>> > ${top_builddir}/lib/<a href=3D"http:/= /libnghttp2.la" rel=3D"noopener noreferrer" target=3D"_blank">libnghttp2.la= </a> \<br>> > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIE= S =3D -lnghttp2 \<br>> > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@=C2= =A0 =C2=A0 =C2=A0 =C2=A0$(am__DEPENDENCIES_1)<br>> > + main_LINK =3D = $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \<br>> > +=C2=A0 = =C2=A0 =C2=A0$(LIBTOOLFLAGS) --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFLAGS) \= <br>> > +@@ -743,7 +743,7 @@ EXTRA_DIST =3D CMakeLists.txt<br>> &g= t; + # files directly because the tests use symbols not included in public<= br>> > API.<br>> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@main= _LDADD =3D<br>> > ${top_builddir}/lib/.libs/*.o \<br>> > + @ENA= BLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2=A0 $(am__append_2)<br>&= gt; > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD =3D<br>> >= ${top_builddir}/lib/<a href=3D"http://libnghttp2.la" rel=3D"noopener noref= errer" target=3D"_blank">libnghttp2.la</a> \<br>> > ++@ENABLE_STATIC_= TRUE@@HAVE_CUNIT_TRUE@main_LDADD =3D -lnghttp2 \<br>> > + @ENABLE_STA= TIC_TRUE@@HAVE_CUNIT_TRUE@=C2=A0 =C2=A0 =C2=A0 =C2=A0$(am__append_2)<br>>= ; > + @HAVE_CUNIT_TRUE@main_LDFLAGS =3D -static<br>> > + @ENABLE_F= AILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_SOURCES =3D<br>> > failmal= loc.c failmalloc_test.c failmalloc_test.h \<br>> > diff --git a/www/n= ghttp2/pkg-plist b/www/nghttp2/pkg-plist<br>> > index be8f7de0e846..1= 6fccb59dac4 100644<br>> > --- a/www/nghttp2/pkg-plist<br>> > ++= + b/www/nghttp2/pkg-plist<br>> > @@ -10,6 +10,10 @@ man/man1/nghttp.1= .gz<br>> >=C2=A0 man/man1/nghttpd.1.gz<br>> >=C2=A0 man/man1/ng= httpx.1.gz<br>> >=C2=A0 %%PORTDOCS%%%%DOCSDIR%%/README.rst<br>> &g= t; +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-cl.cc<br>> > +%%PORTEXAMPLES= %%%%EXAMPLESDIR%%/asio-cl2.cc<br>> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%= /asio-sv.cc<br>> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-sv2.cc<br>&g= t; >=C2=A0 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/client<br>> >=C2=A0 %%P= ORTEXAMPLES%%%%EXAMPLESDIR%%/client.c<br>> >=C2=A0 %%PORTEXAMPLES%%%%= EXAMPLESDIR%%/deflate<br>><br>> I'm missing the benefit with this= change? More patches, hacks and it<br>> also takes longer to build<br>&= gt;<br>> Best regards,<br>> Daniel<br>></blockquote> </div> </div> </div> </blockquote> <p><br></p> </div> </blockquote></div></div> --00000000000048052a05f4214a65--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58SYhCL808fwWqLDZH%2BFB%2Bob4_HfVnp%2BL_V7zO7mwOAxBg>