From nobody Wed Feb 21 15:20:14 2024 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 4Tg0MM4rf8z59fWs; Wed, 21 Feb 2024 15:20:15 +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 4Tg0ML4cDbz42HF; Wed, 21 Feb 2024 15:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528814; 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=TbhGberaqnApJE8o/F4eGbHGRLWuhzotVU06kECfC9M=; b=yQltHHVS5oMfPC3sNGY2Gi7gFNbBMEuQGFAipat1byruIXeTepfqkyzUvJBmBZC4O5uL+b um0HhW8usMzNdAdGZfv5zze0o83KOmlAwjyfaIFyGdyr+wnuFiJfW7W8p8V0MO8IDCDl3T vIGNxNLzjjODRvZanD2YFoLalPSP6BO1xkClO8SEYsCnjwr1VZrtMBCJH9jhpktVm0TDtL wAIgo6quLaIGLqEFcGLqtxPeVZDoQBpwp+dWcpQPtn2Bf6LSUV+VnbocUDzL2CAFL6ocdL BBQJFotCLjiQNJeDP6Wir1V3FObSrbOo09yh/eVm0LagiCxvzUQcZ1wGGM9HIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708528814; 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=TbhGberaqnApJE8o/F4eGbHGRLWuhzotVU06kECfC9M=; b=QByZSmppqWT7wlpE7wa8jmU0Xd5y9hFWxDD7VpKj6VAsnpCmdIEnN5BbZAaCPdBP3I2/tL bssTsp5H3/r18X9HMQa5ip4dbTlSIkYZetDj/RooJt0OlSa6DsMCwrCoVQtBq1i74VBjJL Y90CpjKbV4h2WIRXr4PmUYTPDd9Iv3jaq5Veb+f9rO22DBtni502XmAEO3JaJ6BqHBzXKf QONTWJ0GA7FzN9Aiw08bil21rV5FPFrdGq3Pym5VdR2041HMCsINXugVBXnnfIzNz/7FKw PAMjeaHVbhZ+eAsIWsndYRzpEfqrhAFFMC/hVfQ1Ctv7qx2GzERyvCTu30wb4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708528814; a=rsa-sha256; cv=none; b=sLuovSUp3l7jherfJgXoChqHmNEKLrlCoQcqLjHjVHyq+ea6kItNXibgH79gRR8UX0mXc8 /LUwIALdOVWEqJQPqnjdRsl6H67ruCVOzKdDacMMAS8XLRKKsBfQcEd9J8np/w1hlNfXvg ujsrdjCFl6uS21YJi6jT8zGrp43zq4QOk9ytvwH5BbyITS8XYeFd9KaP+OeX03iKLwzup3 UsKsdHFflVVxxPS7dWSvJU/1DEIrRprXfgh3TonT+ki8voPfAtgeRO6SAoE661eAW8Bgks cUihzmwZl/j42SiPsM/EAn/b2k/14n7s453VKlNHHGWdVQ7mSW8YlwbkamkPTw== 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 4Tg0ML3PTQz172S; Wed, 21 Feb 2024 15:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFKEH8025699; Wed, 21 Feb 2024 15:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFKESY025689; Wed, 21 Feb 2024 15:20:14 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:20:14 GMT Message-Id: <202402211520.41LFKESY025689@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 37c4249febbb - main - www/libnghttp2: Convert back to autotools 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37c4249febbb08b3664032e79a301cb624277d78 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=37c4249febbb08b3664032e79a301cb624277d78 commit 37c4249febbb08b3664032e79a301cb624277d78 Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 14:29:42 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:06:48 +0000 www/libnghttp2: Convert back to autotools - Remove unnecessary substitution --- www/libnghttp2/Makefile | 26 ++++++++------------------ www/libnghttp2/files/patch-CMakeLists.txt | 11 ----------- www/libnghttp2/files/patch-Makefile.in | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile index 98257399a7c2..33063cf78338 100644 --- a/www/libnghttp2/Makefile +++ b/www/libnghttp2/Makefile @@ -1,7 +1,7 @@ PORTNAME= nghttp2 -DISTVERSION= 1.59.0 +PORTVERSION= 1.59.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}/ PKGNAMEPREFIX= lib MAINTAINER= sunpoet@FreeBSD.org @@ -12,22 +12,12 @@ WWW= https://nghttp2.org/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake cpe pathfix pkgconfig tar:xz -USE_LDCONFIG= yes +USES= compiler:c++14-lang cpe libtool pathfix pkgconfig tar:xz -CMAKE_OFF= ENABLE_DOC \ - ENABLE_FAILMALLOC \ - ENABLE_HTTP3 -CMAKE_ON= ENABLE_LIB_ONLY \ - ENABLE_STATIC_LIB \ - CMAKE_DISABLE_FIND_PACKAGE_Jansson \ - CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \ - CMAKE_DISABLE_FIND_PACKAGE_Libcares \ - CMAKE_DISABLE_FIND_PACKAGE_Libev \ - CMAKE_DISABLE_FIND_PACKAGE_Libevent \ - CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \ - CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \ - CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl \ - CMAKE_DISABLE_FIND_PACKAGE_LibXml2 +CONFIGURE_ARGS= --enable-lib-only +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USE_CXXSTD= c++14 +USE_LDCONFIG= yes .include diff --git a/www/libnghttp2/files/patch-CMakeLists.txt b/www/libnghttp2/files/patch-CMakeLists.txt deleted file mode 100644 index 7d11bf640cd7..000000000000 --- a/www/libnghttp2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2023-09-15 17:17:34 UTC -+++ CMakeLists.txt -@@ -483,7 +483,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 new file mode 100644 index 000000000000..d4174dca7bda --- /dev/null +++ b/www/libnghttp2/files/patch-Makefile.in @@ -0,0 +1,16 @@ +--- Makefile.in.orig 2023-02-13 12:02:52 UTC ++++ Makefile.in +@@ -448,11 +448,10 @@ 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 tests integration-tests \ +- doc contrib script ++SUBDIRS = lib + + 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 \