From nobody Mon Jan 16 09:28:15 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 4NwRXJ0T1sz2tjyT; Mon, 16 Jan 2023 09:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NwRXH6tdhz3nVG; Mon, 16 Jan 2023 09:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673861295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxxrQ4ZVhGUPb2OXiTMRCwRCQMfnPeMYZ9mTOmhtMVQ=; b=bF2FsiP9mFJ5yZYtW9iVl5oDJCsFcXnQVLllZ3ibn3TnXrnd4nKY3zh2YU895bmcq1WYV/ BabbPk6yaXiOZZob1jpX13lJDK4LTInfYq3hqyLgdIazKCLHPuH/7vReZnbMQ5J+pbnO8y dFGXQbkhKbx9BE3horiO5dU2iAEy2cGctrtqtsXqdJtr9KnWE5s9sD6CL7McMuBYt35Wm/ 1LKVh79cEjU2T1F98rnWwvX+W6kTPiugVg/ARFULIoXKyPYYSocncEd6uYlN2SjOy5YjeO GFn9rmD7/O69jCRpBevbm2r7/oGTtnWCXItulLM/6OizsET3AtCBbVHJzIY3QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673861295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxxrQ4ZVhGUPb2OXiTMRCwRCQMfnPeMYZ9mTOmhtMVQ=; b=ewDl2SitpPkEVM3DtYdBfENyGfWKkYd92geM4cpePMctZuxdY+a0bPVZLQbB8BqcL/9Z/V j9RKulrWitrgxeKtD7GNgYwTsNwB5KazuZMiclebcYC4Qs3WC0/MZQgjXW0rv1c3sW5jl/ bG+yUISx+HJgYA67iNhd2CP0SG1Dswheu7iSS8I/jBMgHIXYR2KwIVdP3hGLhv7p2y9EVq XZmp02GOt2q7wgGHV7JVds8zvui0lz/xkFCShm3vxOR9shAzRwDl+sjhPidN97Ao2dQoAJ NplxuAUvwB9/C5NE4acJme41cC5CDgQxL+1M6EOdBqgwpIDeZHngacnP3crjag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673861295; a=rsa-sha256; cv=none; b=pw1aLI9eqYCmCDkHHB89l0brf/KcWBfAGx7xx+MiG5xx4N5qIHaE/CbwonOwYd+WvCZytO f0cYnmTTycZtgit6XGzYJm+27dLqVaZ2Txva8Ls2+Mfp8Tgzm1M6dUHmPaTA1841VmVicI ZY6p99cdfC5qSWXqNXAr2z60rAP4XWQh6Q21atZUB4Ypn9adBL6KmLwnSt5BW8R7RDjfAB pzjvBF0pQa3rxUfCQWdGPmWUNEUPsmw4wGIG9zCXfMmAJCnpLJ8cbtwomFnS+80nF8DBp5 LOuMY6yMzBL+/X7g1LLNqaeJ5ISFTud3PFVAmHgXiQgQhUFO5NlW7LK9CmMkGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NwRXH5xydz11lp; Mon, 16 Jan 2023 09:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30G9SFFo005226; Mon, 16 Jan 2023 09:28:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30G9SFn9005225; Mon, 16 Jan 2023 09:28:15 GMT (envelope-from git) Date: Mon, 16 Jan 2023 09:28:15 GMT Message-Id: <202301160928.30G9SFn9005225@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: b1e165f32341 - main - www/nghttp2: Update to 1.51.0 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1e165f3234177a3f9eea5dd6f5c23b46a950768 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1e165f3234177a3f9eea5dd6f5c23b46a950768 commit b1e165f3234177a3f9eea5dd6f5c23b46a950768 Author: Daniel Engberg AuthorDate: 2023-01-16 09:26:31 +0000 Commit: Daniel Engberg CommitDate: 2023-01-16 09:26:35 +0000 www/nghttp2: Update to 1.51.0 * Switch to CMake (simplifies patching a lot) * Drop ASIO option (removed in 1.52.0) * Remove ancient version dependencies of libraries to simplify port * Make use of helpers instead of patching by hand * Modernize Makefile to follow Porters Handbook more closely Reference: https://github.com/nghttp2/nghttp2/pull/1844 Changelog: https://github.com/nghttp2/nghttp2/releases/tag/v1.51.0 PR: 268537 Approved by: portmgr (maintainer timeout, 2+ weeks) --- www/nghttp2/Makefile | 53 +++++--------- www/nghttp2/distinfo | 6 +- 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 | 12 ---- 9 files changed, 32 insertions(+), 248 deletions(-) diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index fc4e9ff016dc..8ef93d6c83f7 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -1,7 +1,7 @@ PORTNAME= nghttp2 -PORTVERSION= 1.48.0 +DISTVERSION= 1.51.0 CATEGORIES= www net -MASTER_SITES= https://github.com/nghttp2/nghttp2/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2.0 C Library @@ -10,49 +10,32 @@ WWW= https://nghttp2.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= libnghttp2>=${PORTVERSION}:www/libnghttp2 +BUILD_DEPENDS= libnghttp2>=${DISTVERSION}:www/libnghttp2 LIB_DEPENDS= libnghttp2.so:www/libnghttp2 -USES= compiler:c++14-lang cpe gmake libtool localbase pathfix pkgconfig ssl tar:xz - -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 +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 + +CMAKE_OFF= ENABLE_PYTHON_BINDINGS ENABLE_HTTP3 +CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:PATH=man -OPTIONS_DEFINE= APP ASIO DOCS EXAMPLES HPACK +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_USE= GNOME=libxml2 APP_USES= gnome -ASIO_BUILD_DEPENDS= boost-libs>=1.54.0:devel/boost-libs -ASIO_CONFIGURE_OFF= --with-boost=no -ASIO_CONFIGURE_ON= --enable-asio-lib --with-boost-asio --with-boost-system --with-boost-thread -ASIO_LIB_DEPENDS= libboost_thread.so:devel/boost-libs -ASIO_USE= LDCONFIG=yes -EXAMPLES_CONFIGURE_ENABLE= examples -EXAMPLES_BUILD_DEPENDS= libevent>=2.0.8:devel/libevent -EXAMPLES_LIB_DEPENDS= libevent_openssl.so:devel/libevent -HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson -HPACK_CONFIGURE_ENABLE= hpack-tools +APP_USE= GNOME=libxml2 +APP_CMAKE_BOOL= ENABLE_APP WITH_LIBXML2 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 +HPACK_CMAKE_BOOL= ENABLE_HPACK_TOOLS +EXAMPLES_LIB_DEPENDS= libevent_openssl.so:devel/libevent +EXAMPLES_CMAKE_BOOL= ENABLE_EXAMPLES post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/ @@ -60,7 +43,7 @@ post-install: post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ - ${INSTALL_DATA} ${WRKSRC}/examples/*.c* ${STAGEDIR}${EXAMPLESDIR}/ - cd ${WRKSRC}/examples/ && ${INSTALL_PROGRAM} client deflate libevent-client libevent-server ${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}/ .include diff --git a/www/nghttp2/distinfo b/www/nghttp2/distinfo index 535746e9c5f1..a0e85380f40f 100644 --- a/www/nghttp2/distinfo +++ b/www/nghttp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656092908 -SHA256 (nghttp2-1.48.0.tar.xz) = 47d8f30ee4f1bc621566d10362ca1b3ac83a335c63da7144947c806772d016e4 -SIZE (nghttp2-1.48.0.tar.xz) = 4112072 +TIMESTAMP = 1671871962 +SHA256 (nghttp2-1.51.0.tar.xz) = 66aa76d97c143f42295405a31413e5e7d157968dad9f957bb4b015b598882e6b +SIZE (nghttp2-1.51.0.tar.xz) = 4115988 diff --git a/www/nghttp2/files/patch-CMakeLists.txt b/www/nghttp2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e8cf364abae5 --- /dev/null +++ b/www/nghttp2/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- 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 deleted file mode 100644 index 065fc9c70ac2..000000000000 --- a/www/nghttp2/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2021-10-19 09:32:30 UTC -+++ Makefile.in -@@ -464,7 +464,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 deleted file mode 100644 index 879b9c1885cc..000000000000 --- a/www/nghttp2/files/patch-examples-Makefile.in +++ /dev/null @@ -1,66 +0,0 @@ -sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' */Makefile.in - ---- examples/Makefile.in.orig 2021-10-19 09:32:30 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@) -@@ -503,7 +503,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@ \ -@@ -518,7 +518,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 deleted file mode 100644 index e68d0f63ef0e..000000000000 --- a/www/nghttp2/files/patch-script-fetch-ocsp-response +++ /dev/null @@ -1,7 +0,0 @@ ---- 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 deleted file mode 100644 index e632cf924baf..000000000000 --- a/www/nghttp2/files/patch-src-Makefile.in +++ /dev/null @@ -1,83 +0,0 @@ -sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' */Makefile.in - ---- src/Makefile.in.orig 2021-10-19 09:32:30 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) \ -@@ -392,7 +392,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 \ -@@ -411,7 +411,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 -@@ -419,7 +419,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 \ -@@ -438,7 +438,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 \ -@@ -450,13 +450,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 \ -@@ -1146,7 +1146,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@ \ -@@ -1322,7 +1322,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 deleted file mode 100644 index f521a8965870..000000000000 --- a/www/nghttp2/files/patch-tests-Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -sed -i .orig 's|$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' */Makefile.in - ---- tests/Makefile.in.orig 2021-10-19 09:32:30 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@) -@@ -177,7 +177,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) \ -@@ -732,7 +732,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 e6065b9771c8..be8f7de0e846 100644 --- a/www/nghttp2/pkg-plist +++ b/www/nghttp2/pkg-plist @@ -5,23 +5,11 @@ %%APP%%bin/nghttpd %%APP%%bin/nghttpx @sample etc/nghttpx/nghttpx.conf.sample -%%ASIO%%include/nghttp2/asio_http2.h -%%ASIO%%include/nghttp2/asio_http2_client.h -%%ASIO%%include/nghttp2/asio_http2_server.h -%%ASIO%%lib/libnghttp2_asio.a -%%ASIO%%lib/libnghttp2_asio.so -%%ASIO%%lib/libnghttp2_asio.so.1 -%%ASIO%%lib/libnghttp2_asio.so.1.0.0 -%%ASIO%%libdata/pkgconfig/libnghttp2_asio.pc man/man1/h2load.1.gz 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