Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Sep 2024 23:30:17 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3920730e8d45 - main - www/libnghttp3: Revert commit 7d992c5fed2f3c8a8953404fec189424d6da1144
Message-ID:  <202409232330.48NNUHJK073285@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3920730e8d456472d921a2ccac4c54fa7e6278a8

commit 3920730e8d456472d921a2ccac4c54fa7e6278a8
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-09-23 22:55:12 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-09-23 23:29:44 +0000

    www/libnghttp3: Revert commit 7d992c5fed2f3c8a8953404fec189424d6da1144
    
    Previous commit introduced a regression which removed unit tests
    (make test). Applying this under blanket commit and maintainer hasn't
    responded to multiple mails within 2 weeks.
    
    Approved by:    portmgr (blanket)
---
 www/libnghttp3/Makefile                | 15 ++++++++-------
 www/libnghttp3/files/patch-Makefile.in | 14 --------------
 www/libnghttp3/pkg-plist               |  4 ++++
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/www/libnghttp3/Makefile b/www/libnghttp3/Makefile
index f9a07767a9c5..751969bdd4cf 100644
--- a/www/libnghttp3/Makefile
+++ b/www/libnghttp3/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	nghttp3
-PORTVERSION=	1.5.0
+DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	www net
-MASTER_SITES=	https://github.com/ngtcp2/nghttp3/releases/download/v${PORTVERSION}/
+MASTER_SITES=	https://github.com/ngtcp2/${PORTNAME}/releases/download/v${DISTVERSION}/
 PKGNAMEPREFIX=	lib
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -12,11 +13,11 @@ WWW=		https://nghttp2.org/nghttp3/ \
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool pathfix pkgconfig tar:xz
-
-CONFIGURE_ARGS=	--enable-lib-only
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+USES=		cmake pathfix tar:xz
 USE_LDCONFIG=	yes
 
+TEST_TARGET=	check
+
+CMAKE_ON=	ENABLE_LIB_ONLY
+
 .include <bsd.port.mk>
diff --git a/www/libnghttp3/files/patch-Makefile.in b/www/libnghttp3/files/patch-Makefile.in
deleted file mode 100644
index 130c25e3faba..000000000000
--- a/www/libnghttp3/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	2022-01-22 09:12:33 UTC
-+++ Makefile.in
-@@ -404,9 +404,9 @@ 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 tests doc examples
-+SUBDIRS = lib
- ACLOCAL_AMFLAGS = -I m4
--dist_doc_DATA = README.rst
-+dist_doc_DATA =
- EXTRA_DIST = \
- 	cmakeconfig.h.in \
- 	CMakeLists.txt \
diff --git a/www/libnghttp3/pkg-plist b/www/libnghttp3/pkg-plist
index f2b11cdd64dd..f5e90a19e16f 100644
--- a/www/libnghttp3/pkg-plist
+++ b/www/libnghttp3/pkg-plist
@@ -1,5 +1,9 @@
 include/nghttp3/nghttp3.h
 include/nghttp3/version.h
+lib/cmake/nghttp3/nghttp3Config.cmake
+lib/cmake/nghttp3/nghttp3ConfigVersion.cmake
+lib/cmake/nghttp3/nghttp3Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/nghttp3/nghttp3Targets.cmake
 lib/libnghttp3.a
 lib/libnghttp3.so
 lib/libnghttp3.so.9



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409232330.48NNUHJK073285>