From nobody Sun Feb 12 21:11:51 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 4PFKsl5p4jz3rLC0; Sun, 12 Feb 2023 21:11:55 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFKsl06HJz4Htk; Sun, 12 Feb 2023 21:11:54 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: (Authenticated sender: daniel.engberg@pyret.net) by mail.gandi.net (Postfix) with ESMTPA id E1E84240004; Sun, 12 Feb 2023 21:11:51 +0000 (UTC) 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 Date: Sun, 12 Feb 2023 22:11:51 +0100 From: Daniel Engberg To: Po-Chuan Hsieh Cc: "Tobias C. Berner" , 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 In-Reply-To: References: <202301301306.30UD6U79053773@gitrepo.freebsd.org> <4630ebaf16b69312bfdb0f534173edc9@FreeBSD.org> <05540117dbdae463b70aac81adac661d@FreeBSD.org> Message-ID: X-Sender: diizzy@FreeBSD.org Content-Type: multipart/alternative; boundary="=_e9a48e52ca301b33587fb9131d861f79" X-Rspamd-Queue-Id: 4PFKsl06HJz4Htk X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29169, ipnet:217.70.176.0/20, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --=_e9a48e52ca301b33587fb9131d861f79 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Thanks, Can we also do the same for the library? https://cgit.freebsd.org/ports/commit/www/libnghttp2?id=3bbd8494cddb03fe841ad150a4e8da7737e9d36b Best regards, Daniel On 2023-02-12 20:15, Po-Chuan Hsieh wrote: > 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}/ >>> [1] >>> +MASTER_SITES= >>> https://github.com/nghttp2/nghttp2/releases/download/v${PORTVERSION}/ >>> [2] >>> >>> 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 >>> [4]|-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 [4] \ >>> ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 = >>> -lnghttp2 \ >>> + >>> @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/src/libnghttp2_asio.la [5] >>> \ >>> + >>> @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] >>> \ >>> + @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 [4] \ >>> ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ >>> + @ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] >>> + 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 [4] \ >>> ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ >>> + @ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] >>> + 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 [4] \ >>> ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ >>> + @ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] >>> + 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 [4] \ >>> ++@ENABLE_EXAMPLES_TRUE@ -lnghttp2 \ >>> + @ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] >>> + 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 [4] >>> \ >>> ++@ENABLE_EXAMPLES_TRUE@LDADD = -lnghttp2 \ >>> + @ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + @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 [4] \ >>> ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOLDADD = -lnghttp2 \ >>> + >>> @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/src/libnghttp2_asio.la [5] >>> @JEMALLOC_LIBS@ \ >>> + >>> @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] >>> \ >>> + @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 >>> [4]|-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 [4] \ >>> ++@ENABLE_ASIO_LIB_TRUE@ -lnghttp2 \ >>> + @ENABLE_ASIO_LIB_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + @ENABLE_ASIO_LIB_TRUE@ >>> $(top_builddir)/third-party/libllhttp.la [7] \ >>> + @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 [4] \ >>> ++deflatehd_DEPENDENCIES = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] >>> + 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 [4] \ >>> ++h2load_DEPENDENCIES = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] >>> + 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 [4] \ >>> ++inflatehd_DEPENDENCIES = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] >>> + 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 [4] \ >>> ++nghttp_DEPENDENCIES = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] >>> + 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 [4] \ >>> ++nghttpd_DEPENDENCIES = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] >>> + 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 [4] \ >>> ++am__DEPENDENCIES_2 = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] >>> + @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES = libnghttpx.a \ >>> +@@ -1150,7 +1150,7 @@ AM_CPPFLAGS = \ >>> + @DEFS@ >>> + >>> + AM_LDFLAGS = @LIBTOOL_LDFLAGS@ >>> +-LDADD = $(top_builddir)/lib/libnghttp2.la [4] \ >>> ++LDADD = -lnghttp2 \ >>> + $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + $(top_builddir)/third-party/libllhttp.la [7] \ >>> + @JEMALLOC_LIBS@ \ >>> +@@ -1330,7 +1330,7 @@ LDADD = $(top_builddir)/lib/libnghttp2.la [4] >>> \ >>> + @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 [4] \ >>> ++@ENABLE_ASIO_LIB_TRUE@ -lnghttp2 \ >>> + @ENABLE_ASIO_LIB_TRUE@ >>> $(top_builddir)/third-party/liburl-parser.la [6] \ >>> + @ENABLE_ASIO_LIB_TRUE@ >>> $(top_builddir)/third-party/libllhttp.la [7] \ >>> + @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 >>> [4]|-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 [4] \ >>> ++@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 [4] \ >>> ++@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 [4] \ >>> ++@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 >> Links: ------ [1] https://github.com/$%7BPORTNAME%7D/$%7BPORTNAME%7D/releases/download/v$%7BDISTVERSION%7D/ [2] https://github.com/nghttp2/nghttp2/releases/download/v$%7BPORTVERSION%7D/ [3] http://bsd.port.mk [4] http://libnghttp2.la [5] http://libnghttp2_asio.la [6] http://liburl-parser.la [7] http://libllhttp.la --=_e9a48e52ca301b33587fb9131d861f79 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8

Thanks,

Can we also do the same for the library?

https://cgit.freebsd.org/ports/commi= t/www/libnghttp2?id=3D3bbd8494cddb03fe841ad150a4e8da7737e9d36b

Best regards,

Daniel

On 2023-02-12 20:15, Po-Chuan Hsieh wrote:

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= Hsieh wrote:

Hello,
 
I want to emphasize again that I'd like to follow the offi= cial 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 (bett= er 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= =2Ecom/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].
 
 
Regards,
sunpoet

On Wed, Feb 1, 2023 at 2:28 AM Tobias C. Berner <tcberner@gmail.com&g= t; wrote:
Moin moin

What's the reasoning behind t= his change?


mfg Tobias

On Mon, 30 Jan 2023 at 1= 6:23, Daniel Engberg <diizzy@freebsd.org> wrote:
>
> On 2023-01-30 = 14:06, Po-Chuan Hsieh wrote:
> > The branch main has been update= d by sunpoet:
> >
> > URL:
> > https://cgit.FreeB= SD.org/ports/commit/?id=3D6ab07aa32fc9b73564a66f81feef636225bdd941
> >
> > commit 6ab07aa32fc9b73564a66f81feef636225bdd941> > Author:     Po-Chuan Hsieh <sunpoet@FreeBSD= =2Eorg>
> > AuthorDate: 2023-01-30 12:28:54 +0000
> &= gt; 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    &nbs= p;                     &n= bsp;    | 46 +++++++-----
> >  www/nghttp2/files/= patch-CMakeLists.txt             | 11 --= -
> >  www/nghttp2/files/patch-Makefile.in    &nb= sp;           | 11 +++
> >  www/ng= http2/files/patch-examples-Makefile.in       | 66
= > > +++++++++++++++++
> >  www/nghttp2/files/patch-sc= ript-fetch-ocsp-response |  7 ++
> >  www/nghttp2/file= s/patch-src-Makefile.in            | 83
= > > ++++++++++++++++++++++
> >  www/nghttp2/files/pat= ch-tests-Makefile.in          | 31 ++++++++
&= gt; >  www/nghttp2/pkg-plist          &nbs= p;                   |  4= ++
> >  8 files changed, 231 insertions(+), 28 deletions(-= )
> >
> > diff --git a/www/nghttp2/Makefile b/www/ngh= ttp2/Makefile
> > index 8ef93d6c83f7..e6a38583cd3d 100644
&= gt; > --- a/www/nghttp2/Makefile
> > +++ b/www/nghttp2/Makefi= le
> > @@ -1,7 +1,7 @@
> >  PORTNAME=3D  &n= bsp; nghttp2
> > -DISTVERSION=3D 1.51.0
> > +PORTVERS= ION=3D 1.51.0
> >  CATEGORIES=3D  www net
> &g= t; -MASTER_SITES=3D        https://github.com/${PORTNAME}= /${PORTNAME}/releases/download/v${DISTVERSION}/
> > +MASTER_= SITES=3D        https://github.com/nghttp2/nghttp2/releases/download/v${P= ORTVERSION}/
> >
> >  MAINTAINER=3D  su= npoet@FreeBSD.org
> >  COMMENT=3D     HTTP/2= =2E0 C Library
> > @@ -10,32 +10,44 @@ WWW=3D     = ;         https://nghttp2.org/
> >&n= bsp; LICENSE=3D     MIT
> >  LICENSE_FILE=3D=         ${WRKSRC}/COPYING
> >
> >= -BUILD_DEPENDS=3D       libnghttp2>=3D${DISTVERSION= }:www/libnghttp2
> > +BUILD_DEPENDS=3D       = ;libnghttp2>=3D${PORTVERSION}:www/libnghttp2
> >  LIB_DE= PENDS=3D libnghttp2.so:www/libnghttp2
> >
> > -USES= =3D                cmake compiler:c= ++14-lang cpe localbase:ldflags pathfix \
> > -    &nb= sp;        pkgconfig python:env shebangfix ssl tar:xz> > -USE_RC_SUBR=3D nghttpx
> > -SHEBANG_FILES=3D = ;      script/fetch-ocsp-response
> > +USES=3D&nb= sp;               compiler:c++14-lang cp= e gmake libtool localbase pathfix
> > pkgconfig ssl tar:xz
= > >
> > -CMAKE_OFF=3D   ENABLE_PYTHON_BINDINGS E= NABLE_HTTP3
> > -CMAKE_ARGS=3D  -DCMAKE_INSTALL_MANDIR:PATH= =3Dman
> > +CONFIGURE_ARGS=3D      --disable-pyth= on-bindings --with-jemalloc
> > +CONFIGURE_ENV=3D    &= nbsp;  OPENSSL_CFLAGS=3D"-I${OPENSSLINC}" \
> > +  &nb= sp;          OPENSSL_LIBS=3D"-L${OPENSSLLIB} -lcry= pto -lssl"
> > +GNU_CONFIGURE=3D       yes> > +INSTALL_TARGET=3D      install-strip
>= ; > +USE_CXXSTD=3D  c++14
> > +USE_RC_SUBR=3D nghttpx> >
> >  OPTIONS_DEFINE=3D      APP= DOCS EXAMPLES HPACK
> >  OPTIONS_DEFAULT=3DAPP HPACK
= > >  OPTIONS_SUB=3D yes
> > -
> >  AP= P_DESC=3D    Build h2load, nghttp, nghttpd and nghttpx
> = >
> > +APP_BUILD_DEPENDS=3D   c-ares>=3D1.7.5:dn= s/c-ares \
> > +             =        libev>=3D4.11:devel/libev
> > +AP= P_CONFIGURE_ENABLE=3D        app
> > +APP_CO= NFIGURE_OFF=3D   --without-libxml2
> >  APP_LIB_D= EPENDS=3D     libcares.so:dns/c-ares \
> >  =                      = ;libev.so:devel/libev
> > -APP_USES=3D       = ;     gnome
> >  APP_USE=3D      &= nbsp;      GNOME=3Dlibxml2
> > -APP_CMAKE_BOOL=3D=               ENABLE_APP WITH_LIBXML2> > -HPACK_LIB_DEPENDS=3D   libjansson.so:devel/jansson<= br />> > -HPACK_CMAKE_BOOL=3D    ENABLE_HPACK_TOOLS
&g= t; > +APP_USES=3D            gnome
&g= t; > +EXAMPLES_CONFIGURE_ENABLE=3D   examples
> > += EXAMPLES_BUILD_DEPENDS=3D      libevent>=3D2.0.8:devel/li= bevent
> >  EXAMPLES_LIB_DEPENDS=3D      &nb= sp; libevent_openssl.so:devel/libevent
> > -EXAMPLES_CMAKE_BOOL= =3D ENABLE_EXAMPLES
> > +HPACK_BUILD_DEPENDS=3D jansson>=3D2.= 5:devel/jansson
> > +HPACK_CONFIGURE_ENABLE=3D    &nbs= p; hpack-tools
> > +HPACK_LIB_DEPENDS=3D   libjansson.= so:devel/jansson
> > +
> > +# lib/libnghttp2.* are no= t available until configure phase
> > +post-configure:
>= > +     @${MKDIR} ${WRKSRC}/lib/.libs/
> > +&= nbsp;    @${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.li= bs/
> > +     @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:
> >&nbs= p;      ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
> > -=      cd ${WRKSRC}/examples/ && ${INSTALL_DATA} clien= t.c deflate.c
> > libevent-client.c libevent-server.c ${STAGEDIR= }${EXAMPLESDIR}/
> > -     cd ${INSTALL_WRKSRC}/e= xamples/ && ${INSTALL_PROGRAM} client deflate
> > libeve= nt-client libevent-server ${STAGEDIR}${EXAMPLESDIR}/
> > + =    ${INSTALL_DATA} ${WRKSRC}/examples/*.c* ${STAGEDIR}${EXAMPLES= DIR}/
> > +     cd ${WRKSRC}/examples/ &&= ${INSTALL_PROGRAM} client deflate
> > libevent-client libevent-= server ${STAGEDIR}${EXAMPLESDIR}/
> >
> >  .incl= ude <bsd.port.mk>
> > diff --git a/www/nghttp2/files= /patch-CMakeLists.txt
> > b/www/nghttp2/files/patch-CMakeLists.t= xt
> > deleted file mode 100644
> > index e8cf364abae= 5..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(PKGL= IBDIR
> > "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PR
> >= ; -
> > - install(FILES README.rst DESTINATION "${CMAKE_INSTALL_= DOCDIR}")
> > -
> > --add_subdirectory(lib)
>= > -+#add_subdirectory(lib)
> > - #add_subdirectory(lib/inclu= des)
> > - add_subdirectory(third-party)
> > - add_su= bdirectory(src)
> > diff --git a/www/nghttp2/files/patch-Makefil= e.in
> > b/www/nghttp2/files/patch-Makefile.in
> > ne= w file mode 100644
> > index 000000000000..4bc7bac0f224
>= ; > --- /dev/null
> > +++ b/www/nghttp2/files/patch-Makefile.= in
> > @@ -0,0 +1,11 @@
> > +--- Makefile.in.orig 202= 2-11-13 06:53:28 UTC
> > ++++ Makefile.in
> > +@@ -46= 5,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<= br />> > CONNECTION
> > + # WITH THE SOFTWARE OR THE USE O= R OTHER DEALINGS IN THE SOFTWARE.
> > +-SUBDIRS =3D lib third-pa= rty src bpf examples python tests
> > integration-tests \
&= gt; > ++SUBDIRS =3D third-party src bpf examples python tests integratio= n-tests
> > \
> > +     doc contrib sc= ript
> > +
> > +
> > diff --git a/www/nght= tp2/files/patch-examples-Makefile.in
> > b/www/nghttp2/files/pat= ch-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/l= ibnghttp2.la|-lnghttp2|'
> > */Makefile.in
> > +<= br />> > +--- examples/Makefile.in.orig        20= 22-11-13 06:53:28 UTC
> > ++++ examples/Makefile.in
> &g= t; +@@ -146,7 +146,7 @@ am__asio_cl_SOURCES_DIST =3D asio-cl.cc
> &= gt; + @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am_asio_cl_OBJECTS =3D> > asio_cl-asio-cl.$(OBJEXT)
> > + asio_cl_OBJECTS =3D= $(am_asio_cl_OBJECTS)
> > + am__DEPENDENCIES_1 =3D
> &g= t; +-@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 =3D
> > $(top_builddir)/lib/libnghttp2.la \
> > ++@E= NABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@am__DEPENDENCIES_2 =3D
> = > -lnghttp2 \
> > +
> > @ENABLE_ASIO_LIB_TRUE@@ENA= BLE_EXAMPLES_TRUE@  $(top_builddir)/src/libnghttp2_asio.la
> > \
> > +
> > @ENABLE_ASIO_LIB_TRUE@@E= NABLE_EXAMPLES_TRUE@  $(top_builddir)/third-party/liburl-parser= =2Ela
> > \
> > + @ENABLE_ASIO_LIB_TRUE@@ENABLE_E= XAMPLES_TRUE@        $(am__DEPENDENCIES_1) \
> = > +@@ -175,14 +175,14 @@ am__client_SOURCES_DIST =3D client.c
> = > + client_OBJECTS =3D $(am_client_OBJECTS)
> > + client_LDAD= D =3D $(LDADD)
> > + @ENABLE_EXAMPLES_TRUE@client_DEPENDENCIES = =3D  \
> > +-@ENABLE_EXAMPLES_TRUE@      $(t= op_builddir)/lib/libnghttp2.la \
> > ++@ENABLE_EXAMPLES_= TRUE@      -lnghttp2 \
> > + @ENABLE_EXAMPLES_TRU= E@      $(top_builddir)/third-party/liburl-parser.la<= /a>
> > + am__deflate_SOURCES_DIST =3D deflate.c
> > = + @ENABLE_EXAMPLES_TRUE@am_deflate_OBJECTS =3D deflate.$(OBJEXT)
> = > + deflate_OBJECTS =3D $(am_deflate_OBJECTS)
> > + deflate_L= DADD =3D $(LDADD)
> > + @ENABLE_EXAMPLES_TRUE@deflate_DEPENDENCI= ES =3D  \
> > +-@ENABLE_EXAMPLES_TRUE@      = $(top_builddir)/lib/libnghttp2.la \
> > ++@ENABLE_EXAMP= LES_TRUE@      -lnghttp2 \
> > + @ENABLE_EXAMPLES= _TRUE@      $(top_builddir)/third-party/liburl-parser= =2Ela
> > + am__libevent_client_SOURCES_DIST =3D libevent-cl= ient.c
> > + @ENABLE_EXAMPLES_TRUE@am_libevent_client_OBJECTS = =3D  \
> > +@@ -190,7 +190,7 @@ am__libevent_client_SOURCES= _DIST =3D
> > libevent-client.c
> > + libevent_client= _OBJECTS =3D $(am_libevent_client_OBJECTS)
> > + libevent_client= _LDADD =3D $(LDADD)
> > + @ENABLE_EXAMPLES_TRUE@libevent_client_= DEPENDENCIES =3D  \
> > +-@ENABLE_EXAMPLES_TRUE@  &nbs= p;   $(top_builddir)/lib/libnghttp2.la \
> > ++@ENA= BLE_EXAMPLES_TRUE@      -lnghttp2 \
> > + @ENABLE= _EXAMPLES_TRUE@      $(top_builddir)/third-party/libu= rl-parser.la
> > + am__libevent_server_SOURCES_DIST =3D libe= vent-server.c
> > + @ENABLE_EXAMPLES_TRUE@am_libevent_server_OBJ= ECTS =3D  \
> > +@@ -198,7 +198,7 @@ am__libevent_server_SO= URCES_DIST =3D
> > libevent-server.c
> > + libevent_s= erver_OBJECTS =3D $(am_libevent_server_OBJECTS)
> > + libevent_s= erver_LDADD =3D $(LDADD)
> > + @ENABLE_EXAMPLES_TRUE@libevent_se= rver_DEPENDENCIES =3D  \
> > +-@ENABLE_EXAMPLES_TRUE@ =     $(top_builddir)/lib/libnghttp2.la \
> > = ++@ENABLE_EXAMPLES_TRUE@      -lnghttp2 \
> > + @= ENABLE_EXAMPLES_TRUE@      $(top_builddir)/third-party/libnghttp2.la \
> = > ++@ENABLE_EXAMPLES_TRUE@LDADD =3D -lnghttp2 \
> > + @ENABLE= _EXAMPLES_TRUE@      $(top_builddir)/third-party/libu= rl-parser.la \
> > + @ENABLE_EXAMPLES_TRUE@    &nb= sp; @LIBEVENT_OPENSSL_LIBS@ \
> > + @ENABLE_EXAMPLES_TRUE@ =     @OPENSSL_LIBS@ \
> > +@@ -519,7 +519,7 @@ EXTRA_D= IST =3D CMakeLists.txt
> > + # nghttp2/nghttp2.h) in this packag= e is used rather than installed
> > + # one.
> > + @E= NABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@ASIOCPPFLAGS =3D
> > $= {AM_CPPFLAGS} ${BOOST_CPPFLAGS}
> > +-@ENABLE_ASIO_LIB_TRUE@@ENA= BLE_EXAMPLES_TRUE@ASIOLDADD =3D
> > $(top_builddir)/lib/lib= nghttp2.la \
> > ++@ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TR= UE@ASIOLDADD =3D -lnghttp2 \
> > +
> > @ENABLE_ASIO_L= IB_TRUE@@ENABLE_EXAMPLES_TRUE@  $(top_builddir)/src/libnghttp= 2_asio.la
> > @JEMALLOC_LIBS@ \
> > +
> &= gt; @ENABLE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@  $(top_builddir)/thir= d-party/liburl-parser.la
> > \
> > + @ENAB= LE_ASIO_LIB_TRUE@@ENABLE_EXAMPLES_TRUE@        @OPENSSL= _LIBS@ \
> > diff --git a/www/nghttp2/files/patch-script-fetch-o= csp-response
> > b/www/nghttp2/files/patch-script-fetch-ocsp-res= ponse
> > new file mode 100644
> > index 000000000000= =2E.e68d0f63ef0e
> > --- /dev/null
> > +++ b/www/nght= tp2/files/patch-script-fetch-ocsp-response
> > @@ -0,0 +1,7 @@> > +--- script/fetch-ocsp-response.orig  2021-10-19 09:31:4= 7 UTC
> > ++++ script/fetch-ocsp-response
> > +@@ -1,= 4 +1,3 @@
> > +-#!/usr/bin/env python
> > + # -*- cod= ing: utf-8 -*-
> > +
> > + # nghttp2 - HTTP/2 C Libra= ry
> > diff --git a/www/nghttp2/files/patch-src-Makefile.in
> > 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.i= n
> > @@ -0,0 +1,83 @@
> > +% sed -i .orig 's|$[({]to= p_builddir[})]/lib/libnghttp2.la|-lnghttp2|'
> > */Mak= efile.in
> > +
> > +--- src/Makefile.in.orig  &n= bsp;  2022-11-13 06:53:29 UTC
> > ++++ src/Makefile.in
> > +@@ -318,7 +318,7 @@ am__libnghttpx_a_SOURCES_DIST =3D util.cc u= til.h
> > http2.c
> > + libnghttpx_a_OBJECTS =3D $(am= _libnghttpx_a_OBJECTS)
> > + am__DEPENDENCIES_1 =3D
> &g= t; + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_DEPENDENCIES =3D  \
> > +-@ENABLE_ASIO_LIB_TRUE@      $(top_builddir)/lib= /libnghttp2.la \
> > ++@ENABLE_ASIO_LIB_TRUE@  &nbs= p;   -lnghttp2 \
> > + @ENABLE_ASIO_LIB_TRUE@    =   $(top_builddir)/third-party/liburl-parser.la \
> = > + @ENABLE_ASIO_LIB_TRUE@      $(top_builddir)/third-par= ty/libllhttp.la \
> > + @ENABLE_ASIO_LIB_TRUE@  &nbs= p;   $(am__DEPENDENCIES_1) \
> > +@@ -394,7 +394,7 @@ am__d= eflatehd_SOURCES_DIST =3D deflatehd.cc
> > comp_helper.
>= ; > + @ENABLE_HPACK_TOOLS_TRUE@   $(am__objects_4)
> &= gt; + deflatehd_OBJECTS =3D $(am_deflatehd_OBJECTS)
> > + deflat= ehd_LDADD =3D $(LDADD)
> > +-deflatehd_DEPENDENCIES =3D $(top_bu= ilddir)/lib/libnghttp2.la \
> > ++deflatehd_DEPENDENCIES= =3D -lnghttp2 \
> > +     $(top_builddir)/third-= party/liburl-parser.la \
> > +     $(t= op_builddir)/third-party/libllhttp.la
> > + am__h2load_SO= URCES_DIST =3D util.cc util.h http2.cc http2.h h2load.cc \
> > += @@ -413,7 +413,7 @@ am__h2load_SOURCES_DIST =3D util.cc util.h http2.cc
> > http
> > + @ENABLE_APP_TRUE@   $(am__objec= ts_5)
> > + h2load_OBJECTS =3D $(am_h2load_OBJECTS)
> &g= t; + h2load_LDADD =3D $(LDADD)
> > +-h2load_DEPENDENCIES =3D $(t= op_builddir)/lib/libnghttp2.la \
> > ++h2load_DEPENDENCI= ES =3D -lnghttp2 \
> > +     $(top_builddir)/thir= d-party/liburl-parser.la \
> > +     $= (top_builddir)/third-party/libllhttp.la
> > + am__inflate= hd_SOURCES_DIST =3D inflatehd.cc comp_helper.c comp_helper.h
> >= \
> > +@@ -422,7 +422,7 @@ am__inflatehd_SOURCES_DIST =3D infla= tehd.cc
> > comp_helper.
> > + @ENABLE_HPACK_TOOLS_TR= UE@   $(am__objects_4)
> > + inflatehd_OBJECTS =3D $(a= m_inflatehd_OBJECTS)
> > + inflatehd_LDADD =3D $(LDADD)
>= ; > +-inflatehd_DEPENDENCIES =3D $(top_builddir)/lib/libnghttp2.la \
> > ++inflatehd_DEPENDENCIES =3D -lnghttp2 \
> >= +     $(top_builddir)/third-party/liburl-parser.la \
> > +     $(top_builddir)/third-party/lib= llhttp.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@   $(am__objects_7) tls.$(= OBJEXT)
> > + nghttp_OBJECTS =3D $(am_nghttp_OBJECTS)
> = > + nghttp_LDADD =3D $(LDADD)
> > +-nghttp_DEPENDENCIES =3D $= (top_builddir)/lib/libnghttp2.la \
> > ++nghttp_DEPEND= ENCIES =3D -lnghttp2 \
> > +     $(top_builddir)/= third-party/liburl-parser.la \
> > +    &nb= sp;$(top_builddir)/third-party/libllhttp.la
> > + am__ngh= ttpd_SOURCES_DIST =3D util.cc http2.cc timegm.c app_helper.cc \
> &= gt; +@@ -453,13 +453,13 @@ am__nghttpd_SOURCES_DIST =3D util.cc http2.cc> > timegm.c a
> > + @ENABLE_APP_TRUE@   tls.= $(OBJEXT) HttpServer.$(OBJEXT)
> > + nghttpd_OBJECTS =3D $(am_ng= httpd_OBJECTS)
> > + nghttpd_LDADD =3D $(LDADD)
> > += -nghttpd_DEPENDENCIES =3D $(top_builddir)/lib/libnghttp2.la \
= > > ++nghttpd_DEPENDENCIES =3D -lnghttp2 \
> > +  &nb= sp;  $(top_builddir)/third-party/liburl-parser.la \
&g= t; > +     $(top_builddir)/third-party/libllhttp.la
> > + am__nghttpx_SOURCES_DIST =3D shrpx.cc shrpx.h
> = > + @ENABLE_APP_TRUE@am_nghttpx_OBJECTS =3D nghttpx-shrpx.$(OBJEXT)
> > + nghttpx_OBJECTS =3D $(am_nghttpx_OBJECTS)
> > +-am_= _DEPENDENCIES_2 =3D $(top_builddir)/lib/libnghttp2.la \
> &= gt; ++am__DEPENDENCIES_2 =3D -lnghttp2 \
> > +    &nbs= p;$(top_builddir)/third-party/liburl-parser.la \
> > = +     $(top_builddir)/third-party/libllhttp.la
&= gt; > + @ENABLE_APP_TRUE@nghttpx_DEPENDENCIES =3D libnghttpx.a \
&g= t; > +@@ -1150,7 +1150,7 @@ AM_CPPFLAGS =3D \
> > +  &nb= sp;  @DEFS@
> > +
> > + AM_LDFLAGS =3D @LIBTOOL_= LDFLAGS@
> > +-LDADD =3D $(top_builddir)/lib/libnghttp2.la \
> > ++LDADD =3D -lnghttp2 \
> > +    &= nbsp;$(top_builddir)/third-party/liburl-parser.la \
> &g= t; +     $(top_builddir)/third-party/libllhttp.la \> > +     @JEMALLOC_LIBS@ \
> > +@@ -13= 30,7 +1330,7 @@ LDADD =3D $(top_builddir)/lib/libnghttp2.la \
= > > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asio_la_CPPFLAGS =3D ${AM_CPPF= LAGS}
> > ${BOOST_CPPFLAGS}
> > + @ENABLE_ASIO_LIB_TR= UE@libnghttp2_asio_la_LDFLAGS =3D $(AM_LDFLAGS)
> > -no-undefine= d -version-info 1:0:0
> > + @ENABLE_ASIO_LIB_TRUE@libnghttp2_asi= o_la_LIBADD =3D \
> > +-@ENABLE_ASIO_LIB_TRUE@    &nbs= p; $(top_builddir)/lib/libnghttp2.la \
> > ++@ENABLE_ASI= O_LIB_TRUE@      -lnghttp2 \
> > + @ENABLE_ASIO_L= IB_TRUE@      $(top_builddir)/third-party/liburl-pars= er.la \
> > + @ENABLE_ASIO_LIB_TRUE@      $(t= op_builddir)/third-party/libllhttp.la \
> > + @ENABLE_ASI= O_LIB_TRUE@      @OPENSSL_LIBS@ \
> > diff --git = a/www/nghttp2/files/patch-tests-Makefile.in
> > b/www/nghttp2/fi= les/patch-tests-Makefile.in
> > new file mode 100644
> &= gt; 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 =3D $(am_failmalloc_OBJECTS)
> > + am__DE= PENDENCIES_1 =3D
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@am_= _DEPENDENCIES_2 =3D
> > ${top_builddir}/lib/.libs/*.o \
>= ; > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@      $(am__D= EPENDENCIES_1)
> > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@am__DE= PENDENCIES_2 =3D
> > ${top_builddir}/lib/libnghttp2.la \=
> > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@am__DEPENDENCIES_2 = =3D -lnghttp2 \
> > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@ = ;      $(am__DEPENDENCIES_1)
> > + @ENABLE_FAILMA= LLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_DEPENDENCIES =3D
> > $(am_= _DEPENDENCIES_2)
> > + AM_V_lt =3D $(am__v_lt_@AM_V@)
> = > +@@ -181,7 +181,7 @@ am__objects_1 =3D
> > + main_OBJECTS = =3D $(am_main_OBJECTS)
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TR= UE@main_DEPENDENCIES =3D
> > ${top_builddir}/lib/.libs/*.o \
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@      $(= am__DEPENDENCIES_1)
> > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@m= ain_DEPENDENCIES =3D
> > ${top_builddir}/lib/libnghttp2.la \
> > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_DEPENDENCIE= S =3D -lnghttp2 \
> > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@&nb= sp;      $(am__DEPENDENCIES_1)
> > + main_LINK = =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCC $(AM_LIBTOOLFLAGS) \
> > +&= nbsp;    $(LIBTOOLFLAGS) --mode=3Dlink $(CCLD) $(AM_CFLAGS) $(CFL= AGS) \
> > +@@ -743,7 +743,7 @@ EXTRA_DIST =3D CMakeLists.txt> > + # files directly because the tests use symbols not included = in public
> > API.
> > + @ENABLE_STATIC_FALSE@@HAVE_C= UNIT_TRUE@main_LDADD =3D
> > ${top_builddir}/lib/.libs/*.o \
> > + @ENABLE_STATIC_FALSE@@HAVE_CUNIT_TRUE@      $(= am__append_2)
> > +-@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LD= ADD =3D
> > ${top_builddir}/lib/libnghttp2.la \
>= ; > ++@ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@main_LDADD =3D -lnghttp2 \> > + @ENABLE_STATIC_TRUE@@HAVE_CUNIT_TRUE@      &n= bsp;$(am__append_2)
> > + @HAVE_CUNIT_TRUE@main_LDFLAGS =3D -sta= tic
> > + @ENABLE_FAILMALLOC_TRUE@@HAVE_CUNIT_TRUE@failmalloc_SO= URCES =3D
> > failmalloc.c failmalloc_test.c failmalloc_test.h \=
> > diff --git a/www/nghttp2/pkg-plist b/www/nghttp2/pkg-plist<= br />> > 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
> >&nbs= p; %%PORTDOCS%%%%DOCSDIR%%/README.rst
> > +%%PORTEXAMPLES%%%%EXA= MPLESDIR%%/asio-cl.cc
> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-= cl2.cc
> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-sv.cc
>= > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asio-sv2.cc
> >  %%P= ORTEXAMPLES%%%%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
>




--=_e9a48e52ca301b33587fb9131d861f79--