From nobody Mon Jan 16 09:28:14 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 4NwRXG6lPnz2tjyQ; Mon, 16 Jan 2023 09:28:14 +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 4NwRXG6CDQz3nMh; Mon, 16 Jan 2023 09:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673861294; 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=xR2z1sepE3ttPtAnqih1oWfJsJ0lROeo4l2iJv1nATc=; b=NJtu45FbGSspsJ+CYfr7JoX3588rqLuyso2J07HdsfO5vidgtNM0EYCqYbwZi55PgLS8QG eWXur5oGnxoDDeqKnQoOl2FCTKHeNP0pwYHD583EZuaCkAHqtBHL3l55Y3rNb5BeXPV++O b0PwDH/3RJYMcxBAvFFsFpQq0oFJAYthSwvfkaxB6mD4ZJJe71PA7YFXCbng9uOlRK4Neu tvs9o3faBNeS7y8Ar07QYZ7+tnED/pNod7itRZLypXP9A1+KSUJ96JvP15nEnI34kPc4Fp gf4IeBc7U5DUbBXX5foUUfUi3BR9yUTUNmhGrPkky6fA9+lrJDTu3N9oBqx6ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673861294; 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=xR2z1sepE3ttPtAnqih1oWfJsJ0lROeo4l2iJv1nATc=; b=R9nvHQj0Sa5WdmpcSn9U9jJsoYdIkzpaR1nyGnoz9+kaxDMhAZebaoXu3QFRdnDWUJ8wjZ K+Qoi7rOCA0Ql6FJYkRSFyoGh5nWZgMtQXX9GQ4GTTxz4wR8dPuk2DYZmHiIV8iPdCXMci J4cd46wD61eDp0ItlXAD61qwjOcTLTWlV+KQWFd6TrM7atHM57IeSifHNObPmbRZsHlsJ1 6Qi+TN3Z9Ti7k0WEQgSxIO1Mnn7kyuntWxNNcpR6g7wPr8EsBzHzSrAcerPsWLzjMjXnt/ EIcSMwLByteBqeY2W0njCI87UeHPUoKhP5u6pfuTEbzyeFftmq3yEZBumWiNeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673861294; a=rsa-sha256; cv=none; b=wle9m3oD4RoqIpfFnJAWB9XanLQmeAP8BIk1AjnYYS2hmXuddw0vCantOr8pIQoxSMTo8s mCfzRuiH/DuAbvtSKi7nhXb099pJMzJVxhvh7tZO0PnjwVlaQ0Koguwhuv07k/0BpjiwBr PaBDGddWjCNSrp7BPE4fGr2Mvi8s65dO+3kq3ZGuic7jtbdkITwjBm3j0raTpHLy4TsNjS jmz/o/arnTE2xDB9rooYIi8Kp73IqKebs96wP/kvmi9CiFkFE9sR9PyMnk2WFSE+Ufji3B CK7Qa8uSORF093vfb1tfGTA6lkHkSwbpbvAarq9Pi6oklmsgdHnH1entZe2fGg== 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 4NwRXG5G33z12Hv; Mon, 16 Jan 2023 09:28:14 +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 30G9SE1A005201; Mon, 16 Jan 2023 09:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30G9SEu4005200; Mon, 16 Jan 2023 09:28:14 GMT (envelope-from git) Date: Mon, 16 Jan 2023 09:28:14 GMT Message-Id: <202301160928.30G9SEu4005200@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: 3bbd8494cddb - main - www/libnghttp2: 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: 3bbd8494cddb03fe841ad150a4e8da7737e9d36b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bbd8494cddb03fe841ad150a4e8da7737e9d36b commit 3bbd8494cddb03fe841ad150a4e8da7737e9d36b Author: Daniel Engberg AuthorDate: 2023-01-16 09:23:12 +0000 Commit: Daniel Engberg CommitDate: 2023-01-16 09:23:25 +0000 www/libnghttp2: Update to 1.51.0 * Switch to CMake * Modernize Makefile to follow Porters Handbook more closely Poudriere test run by bofh (thanks!) Changelog: https://github.com/nghttp2/nghttp2/releases/tag/v1.51.0 PR: 268536 Approved by: portmgr (maintainer timeout, 2+ weeks) --- www/libnghttp2/Makefile | 16 +++++++++------- www/libnghttp2/distinfo | 6 +++--- www/libnghttp2/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ www/libnghttp2/files/patch-Makefile.in | 21 --------------------- www/libnghttp2/pkg-plist | 2 +- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile index 7d1ec104d9f6..2f3c4983e106 100644 --- a/www/libnghttp2/Makefile +++ b/www/libnghttp2/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}/ PKGNAMEPREFIX= lib MAINTAINER= sunpoet@FreeBSD.org @@ -11,12 +11,14 @@ WWW= https://nghttp2.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++14-lang cpe libtool pathfix pkgconfig tar:xz +USES= cmake compiler:c++14-lang pathfix pkgconfig tar:xz -CONFIGURE_ARGS= --enable-lib-only -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_CXXSTD= c++14 USE_LDCONFIG= yes +CMAKE_OFF= ENABLE_DOC \ + ENABLE_HTTP3 \ + ENABLE_PYTHON_BINDINGS +CMAKE_ON= ENABLE_LIB_ONLY \ + ENABLE_STATIC_LIB + .include diff --git a/www/libnghttp2/distinfo b/www/libnghttp2/distinfo index b1c0da2a4659..5c28ff945e0e 100644 --- a/www/libnghttp2/distinfo +++ b/www/libnghttp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656092904 -SHA256 (nghttp2-1.48.0.tar.xz) = 47d8f30ee4f1bc621566d10362ca1b3ac83a335c63da7144947c806772d016e4 -SIZE (nghttp2-1.48.0.tar.xz) = 4112072 +TIMESTAMP = 1671868303 +SHA256 (nghttp2-1.51.0.tar.xz) = 66aa76d97c143f42295405a31413e5e7d157968dad9f957bb4b015b598882e6b +SIZE (nghttp2-1.51.0.tar.xz) = 4115988 diff --git a/www/libnghttp2/files/patch-CMakeLists.txt b/www/libnghttp2/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9eb3864499c1 --- /dev/null +++ b/www/libnghttp2/files/patch-CMakeLists.txt @@ -0,0 +1,20 @@ +--- CMakeLists.txt.orig 2022-12-24 08:18:29 UTC ++++ CMakeLists.txt +@@ -503,7 +503,7 @@ include_directories( + set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}") + set(PKGLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}") + +-install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}") ++#install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}") + + add_subdirectory(lib) + #add_subdirectory(lib/includes) +@@ -519,7 +519,7 @@ if(ENABLE_DOC) + add_subdirectory(doc) + endif() + add_subdirectory(contrib) +-add_subdirectory(script) ++#add_subdirectory(script) + add_subdirectory(bpf) + + diff --git a/www/libnghttp2/files/patch-Makefile.in b/www/libnghttp2/files/patch-Makefile.in deleted file mode 100644 index 03e06cc3f46b..000000000000 --- a/www/libnghttp2/files/patch-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.in.orig 2021-09-21 13:09:49 UTC -+++ Makefile.in -@@ -461,8 +461,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 \ -- doc contrib script -+SUBDIRS = lib - - - # Now with python setuptools, make uninstall will leave many files we -@@ -470,7 +469,7 @@ SUBDIRS = lib third-party src bpf examples python test - # distcheck rule. - AM_DISTCHECK_CONFIGURE_FLAGS = --disable-python-bindings - ACLOCAL_AMFLAGS = -I m4 --dist_doc_DATA = README.rst -+dist_doc_DATA = - EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \ - Dockerfile.android \ - cmakeconfig.h.in \ diff --git a/www/libnghttp2/pkg-plist b/www/libnghttp2/pkg-plist index 7b377e7e7e4b..fc71897d44a1 100644 --- a/www/libnghttp2/pkg-plist +++ b/www/libnghttp2/pkg-plist @@ -3,5 +3,5 @@ include/nghttp2/nghttp2ver.h lib/libnghttp2.a lib/libnghttp2.so lib/libnghttp2.so.14 -lib/libnghttp2.so.14.22.0 +lib/libnghttp2.so.14.24.1 libdata/pkgconfig/libnghttp2.pc