From nobody Mon Jan 30 13:06:26 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 4P57jb6TcSz3cYng; Mon, 30 Jan 2023 13:06:27 +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 4P57jb1JV6z3DHH; Mon, 30 Jan 2023 13:06:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083987; 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=8Ghd79+qzlCJvgyQhujqHCy6XZ2pj9fukOxYxXAe5YY=; b=O7Ads1jtXvxYGPALlzzCZRTxhq5eyquWZvO7rm8/AC5QNYzWTDuxToVhb8S5SQCu5rI6C7 skJz8gkEFnyy5FgrMhU5ZThgxjGGAYGcl81B4PTct0vvqewXovETwh9qgaq1khhal5lrj5 0tT3F/nb2vcVOZo3pVQCT35ClYbYMZdF4utoBnquUMuvU+T2MjX0AZnTdEV0bCg0ifcvd8 SRaDzx3Plb3gLhzNwS+TuK2moag2BJP61Xw+ptpsCZqE9r5PTeCXKtQYh4svx+QCIb4O2l O+FOUGaUXKrqYfudvIqWFxPv25r/vbT8WbOALdT4TSsWEWvf9yDoLWYxBLiJBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083987; 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=8Ghd79+qzlCJvgyQhujqHCy6XZ2pj9fukOxYxXAe5YY=; b=cPMVaP06eontEPbwYog4krJlBlOPilrBdgzkT+4wEok8M104uyyp3g0t73RepSccCmv4f1 00GuBUSn8icU5AfITcTxTMs2HQvFbDkh6vWAOZ12PM1ZVwx+6z2gDWowqFdYHvCODIwGE/ 0edIwh+MeJKMwV+hocaY1lEyr/97UrWSXFhgufEjPksAdQe5UtSyqs4MQqxpfgnXq39ecm 1pOduoSoYIJ1MucMrprJApaBuWr+SmeqXTQTwfs+Wq1F0tAAEWNsx4C7DuZQQAXD+qSTo3 FsOPmaN/de3Pl5O/suXAz0oGbUuYWIx4+9UFu/C1YBu9lzZ/g5klP4oYLRPNhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675083987; a=rsa-sha256; cv=none; b=ox6QvODrrSxHdhjIr6cdh7jWkP7qx9pfIgA83eYLX1uxI2arDXzjf04lNbl1LQeJfDa8NX 33bJrzYeo4zecikLKBPraxDwrFUwpy6beRH7ofkSqiq4vf4a7HxWVoG+6FhCgmryPG2Atx +fkVBsj1A0rCNDuQhVGN2pvf3huhJY8eLnPrbjUkkamlr7PKZGvtYxUf0+ZnPHPrsiI7Dj kQagX+rblbo0eXAMG8iVTXfmZIfWURkVyF8dEseHmHs+LMNBQHAovZRujDamYQrpeHv5w6 EQU3nCPsQzqJHeqqddiPDkyg6A2r/c432z2unphZldFQkDKjHrPpMA76otQAeQ== 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 4P57jb0K0Jz188m; Mon, 30 Jan 2023 13:06:27 +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 30UD6QTl053695; Mon, 30 Jan 2023 13:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UD6Qnc053694; Mon, 30 Jan 2023 13:06:26 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:06:26 GMT Message-Id: <202301301306.30UD6Qnc053694@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: c2412f4dfecf - main - www/libnghttp2: Change back to make 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: c2412f4dfecfabea70177e3c85892049ff454899 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2412f4dfecfabea70177e3c85892049ff454899 commit c2412f4dfecfabea70177e3c85892049ff454899 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:28:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 12:59:12 +0000 www/libnghttp2: Change back to make - Bump PORTREVISION for package change --- www/libnghttp2/Makefile | 17 ++++++++--------- www/libnghttp2/files/patch-CMakeLists.txt | 20 -------------------- www/libnghttp2/files/patch-Makefile.in | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/www/libnghttp2/Makefile b/www/libnghttp2/Makefile index 2f3c4983e106..5b3b17eddd77 100644 --- a/www/libnghttp2/Makefile +++ b/www/libnghttp2/Makefile @@ -1,7 +1,8 @@ PORTNAME= nghttp2 -DISTVERSION= 1.51.0 +PORTVERSION= 1.51.0 +PORTREVISION= 1 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 @@ -11,14 +12,12 @@ WWW= https://nghttp2.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c++14-lang pathfix pkgconfig tar:xz +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 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/files/patch-CMakeLists.txt b/www/libnghttp2/files/patch-CMakeLists.txt deleted file mode 100644 index 9eb3864499c1..000000000000 --- a/www/libnghttp2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 new file mode 100644 index 000000000000..3aad251a6069 --- /dev/null +++ b/www/libnghttp2/files/patch-Makefile.in @@ -0,0 +1,21 @@ +--- 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 \