From nobody Sun Mar 19 23:43:17 2023 X-Original-To: dev-commits-ports-main@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 4PfvZG1zHvz3ys18; Sun, 19 Mar 2023 23:43:18 +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 4PfvZG197Rz4GqX; Sun, 19 Mar 2023 23:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679269398; 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=5ZM05Ai3ZuMYWZrIZdo2Hkthb6Z8k+gPLO+czJqI5T8=; b=KLaiRK30bdfrm9kH0wcC0chK+dovTNc5xQ58RnAm7mYfGVM1zATYoV5BNU6B4BHAkCT+Mn cSBNC9khLw6RJ4nkapB4Y0O5rg4eW0ARe3B9REokb3PHqFXF2+su0uO5Y/diMgFglM1CB3 8MrPIKA6wWUPddQoshYT4qzVkvhdaycNtCbwQErv5xd4YyDdsvawde2+GwMYSYU0cOZrIh d5J77tNByfVlHHUe8qtniBd/LUdBCsG+G/MsFGC1nGIQ+IzIX3Mw6sG1YfrDh8JFwOa042 Bnivbiz7R7rFNybfJoJ/IpwxyBpoEubHKr6iUQjV+5G89KN8D/3JJeTil3RRQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679269398; 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=5ZM05Ai3ZuMYWZrIZdo2Hkthb6Z8k+gPLO+czJqI5T8=; b=UXpYJtxQfnaf09YRWd9/cZq9066q8lCPGc4xtb/yOwNIC9Jp+dApE3aEmShyjE+VGuQGWE T5Fp5M8LM85ZIKTtArXE0na7Tb0+x+m7hGBdOfCqRagO7rXo5k4cApBs+AzGxpAFcPXML+ m5KA11B0omETAiWrhs2PQf4+DEAOhVKcjVl1Y/E6aWt4j5o6A+CVbA7amraWtEW03FheS5 fbBzbcmhB8Hac/tdO6Hmx4gse/PwtnKP+CdvYT5+t8wQWJOGV7kcM9TPa5WOQpA3EUvOb9 VluQ7vJYMAqtcmn3HFPQe+7fEMJGAWY5812HkyKjRfUMmG7BDhFtCP5EGMpfsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679269398; a=rsa-sha256; cv=none; b=SeBD5IEDsWl15mxOneWMQsK6c68UpGKl+X5F6eVBkrVhmadg0Fz8wXI//JV3pJEIxQEkX0 +303MLFsfPSnUexEyey8aHGErNeVo+2NsVmuhbCMDszvj6o/YVvPD8xUeaUkr8y7HnG/H+ C+KQSeLuwshRe5ktaupUAAFErTugmGDd1JvB44zwHOWd+x4b5i3Su2OliRIT+gB1q5NVl0 K9Qq5uflc0mMObzjRhjvyNwkpliQIpMf6w7/gX28n/zrh2vj2WenLNVsKBlBVA2j1VrK4z 97qe3dEhLHaynsSqnbTvTVRh/8t426U5ip4vvsQduhm7P4qkwRiQbwz+7/2rSA== 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 4PfvZG0DTgz17V1; Sun, 19 Mar 2023 23:43:18 +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 32JNhHfx009494; Sun, 19 Mar 2023 23:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32JNhH7R009493; Sun, 19 Mar 2023 23:43:17 GMT (envelope-from git) Date: Sun, 19 Mar 2023 23:43:17 GMT Message-Id: <202303192343.32JNhH7R009493@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: a7bfefeaa214 - main - www/libnghttp2: Update to 1.52.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a7bfefeaa214f42966d72d5298ba4f7c69bf40ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7bfefeaa214f42966d72d5298ba4f7c69bf40ac commit a7bfefeaa214f42966d72d5298ba4f7c69bf40ac Author: Daniel Engberg AuthorDate: 2023-03-19 23:37:49 +0000 Commit: Daniel Engberg CommitDate: 2023-03-19 23:40:23 +0000 www/libnghttp2: Update to 1.52.0 - Switch back to CMake for consistency (basically the same as PR 268536) - Refresh CMake args Changelog: https://github.com/nghttp2/nghttp2/releases/tag/v1.52.0 PR: 269548 Approved by: portmgr (maintainer timeout, 4+ weeks) --- www/libnghttp2/Makefile | 17 ++++++++--------- www/libnghttp2/distinfo | 6 +++--- www/libnghttp2/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ www/libnghttp2/files/patch-Makefile.in | 21 --------------------- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile index 5b3b17eddd77..e9e7c1cbaef6 100644 --- a/www/libnghttp2/Makefile +++ b/www/libnghttp2/Makefile @@ -1,8 +1,7 @@ PORTNAME= nghttp2 -PORTVERSION= 1.51.0 -PORTREVISION= 1 +DISTVERSION= 1.52.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 @@ -12,12 +11,12 @@ WWW= https://nghttp2.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++14-lang cpe libtool pathfix pkgconfig tar:xz - -CONFIGURE_ARGS= --enable-lib-only -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_CXXSTD= c++14 +USES= cmake compiler:c++14-lang cpe libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes +CMAKE_OFF= ENABLE_DOC \ + ENABLE_HTTP3 +CMAKE_ON= ENABLE_LIB_ONLY \ + ENABLE_STATIC_LIB + .include diff --git a/www/libnghttp2/distinfo b/www/libnghttp2/distinfo index 5c28ff945e0e..367c9878258b 100644 --- a/www/libnghttp2/distinfo +++ b/www/libnghttp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671868303 -SHA256 (nghttp2-1.51.0.tar.xz) = 66aa76d97c143f42295405a31413e5e7d157968dad9f957bb4b015b598882e6b -SIZE (nghttp2-1.51.0.tar.xz) = 4115988 +TIMESTAMP = 1676359019 +SHA256 (nghttp2-1.52.0.tar.xz) = 3ea9f0439e60469ad4d39cb349938684ffb929dd7e8e06a7bffe9f9d21f8ba7d +SIZE (nghttp2-1.52.0.tar.xz) = 1491732 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 3aad251a6069..000000000000 --- a/www/libnghttp2/files/patch-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.in.orig 2022-11-13 06:53:28 UTC -+++ Makefile.in -@@ -465,8 +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 \ -- doc contrib script -+SUBDIRS = lib - - - # Now with python setuptools, make uninstall will leave many files we -@@ -474,7 +473,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-env \ - Dockerfile.android \ - cmakeconfig.h.in \