Attachment #250806 for bug #278965




PORTNAME=	nghttp2
DISTVERSION=	1.62.1
CATEGORIES=	www net
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	HTTP/2.0 C Library

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	libnghttp2>=${DISTVERSION}:www/libnghttp2
LIB_DEPENDS=	libnghttp2.so:www/libnghttp2

USES=		cmake compiler:c++20-lang cpe localbase:ldflags pathfix \
		pkgconfig python:env shebangfix ssl tar:xz
SHEBANG_FILES=	script/fetch-ocsp-response

CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=share/man
CMAKE_OFF=	ENABLE_DEBUG ENABLE_HTTP3 ENABLE_LIB_ONLY ENABLE_STATIC_CRT ENABLE_WERROR WITH_LIBBPF WITH_MRUBY WITH_NEVERBLEED
CMAKE_ON=	ENABLE_DOC ENABLE_FAILMALLOC ENABLE_THREADS
USE_RC_SUBR=	nghttpx

CMAKE_OFF=	ENABLE_DEBUG \
		ENABLE_HTTP3 \
		ENABLE_LIB_ONLY \
		ENABLE_STATIC_CRT \
		ENABLE_WERROR \
		WITH_LIBBPF \
		WITH_MRUBY \
		WITH_NEVERBLEED
CMAKE_ON=	ENABLE_DOC \
		ENABLE_FAILMALLOC \
		ENABLE_THREADS \
		CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \
		CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \
		CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \
		CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl

OPTIONS_DEFINE=	APP EXAMPLES HPACK
OPTIONS_DEFAULT=APP HPACK
OPTIONS_SUB=	yes

APP_DESC=	Build h2load, nghttp, nghttpd and nghttpx

APP_BUILD_DEPENDS=	c-ares>=1.7.5:dns/c-ares \
			libev>=4.11:devel/libev
APP_CMAKE_BOOL=		ENABLE_APP
APP_LIB_DEPENDS=	libcares.so:dns/c-ares \
			libev.so:devel/libev
APP_USE=		GNOME=libxml2
APP_USES=		gnome
APP_CMAKE_BOOL=		ENABLE_APP
APP_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_Libev:BOOL=True \
			-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:BOOL=True

EXAMPLES_BUILD_DEPENDS=	libevent>=2.0.8:devel/libevent
EXAMPLES_CMAKE_BOOL=	ENABLE_EXAMPLES
EXAMPLES_LIB_DEPENDS=	libevent_openssl.so:devel/libevent
EXAMPLES_CMAKE_BOOL=	ENABLE_EXAMPLES
EXAMPLES_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Libevent:BOOL=True

HPACK_BUILD_DEPENDS=	jansson>=2.5:devel/jansson
HPACK_CMAKE_BOOL=	ENABLE_HPACK_TOOLS
HPACK_LIB_DEPENDS=	libjansson.so:devel/jansson
HPACK_CMAKE_BOOL=	ENABLE_HPACK_TOOLS
HPACK_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Jansson:BOOL=True

.include <bsd.port.options.mk>

.if ${OPSYS}_${OSREL:C/\\./-/} == FreeBSD_13-2
USES+=	llvm
.endif

post-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/

Lines 1-3 Link Here

(-)b/www/nghttp2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1712261836	1	TIMESTAMP = 1716115105
2	SHA256 (nghttp2-1.61.0.tar.xz) = c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654	2	SHA256 (nghttp2-1.62.1.tar.xz) = 2345d4dc136fda28ce243e0bb21f2e7e8ef6293d62c799abbf6f633a6887af72
3	SIZE (nghttp2-1.61.0.tar.xz) = 1645808	3	SIZE (nghttp2-1.62.1.tar.xz) = 1606084

Lines 1-6 Link Here

(-)b/www/nghttp2/files/patch-CMakeLists.txt (-2 / +2 lines)
1	--- CMakeLists.txt.orig 2022-11-13 06:53:06 UTC	1	--- CMakeLists.txt.orig 2024-05-13 21:32:20 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -505,7 +505,7 @@ set(PKGLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PR	3	@@ -430,7 +430,7 @@ install(FILES README.rst DESTINATION "${CMAKE_INSTALL_
4		4
5	install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")	5	install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
6		6

Added Link Here

(-)b/www/nghttp2/files/patch-src_template.h (+11 lines)
1	--- src/template.h.orig 2024-05-13 21:28:56 UTC
2	+++ src/template.h
3	@@ -444,7 +444,7 @@ inline constexpr bool operator==(const StringRef &lhs,
4	std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
5	}
6
7	-#ifndef __APPLE__
8	+#ifndef __FreeBSD__
9	inline constexpr std::strong_ordering
10	operator<=>(const StringRef &lhs, const StringRef &rhs) noexcept {
11	return std::lexicographical_compare_three_way(std::begin(lhs), std::end(lhs),

Return to bug 278965

Lines 1-7 Link Here

(-)b/www/nghttp2/Makefile (-11 / +37 lines)
1	PORTNAME= nghttp2	1	PORTNAME= nghttp2
2	PORTVERSION= 1.61.0	2	DISTVERSION= 1.62.1
3	CATEGORIES= www net	3	CATEGORIES= www net
4	MASTER_SITES= https://github.com/nghttp2/nghttp2/releases/download/v${PORTVERSION}/	4	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
5		5
6	MAINTAINER= sunpoet@FreeBSD.org	6	MAINTAINER= sunpoet@FreeBSD.org
7	COMMENT= HTTP/2.0 C Library	7	COMMENT= HTTP/2.0 C Library
Lines 10-45 WWW= https://nghttp2.org/ Link Here
10	LICENSE= MIT	10	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	BUILD_DEPENDS= libnghttp2>=${PORTVERSION}:www/libnghttp2	13	BUILD_DEPENDS= libnghttp2>=${DISTVERSION}:www/libnghttp2
14	LIB_DEPENDS= libnghttp2.so:www/libnghttp2	14	LIB_DEPENDS= libnghttp2.so:www/libnghttp2
15		15
16	USES= cmake compiler:c++14-lang cpe localbase:ldflags pathfix pkgconfig python:env shebangfix ssl tar:xz	16	USES= cmake compiler:c++20-lang cpe localbase:ldflags pathfix \
		17	pkgconfig python:env shebangfix ssl tar:xz
		18	SHEBANG_FILES= script/fetch-ocsp-response
17		19
18	CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=share/man
19	CMAKE_OFF= ENABLE_DEBUG ENABLE_HTTP3 ENABLE_LIB_ONLY ENABLE_STATIC_CRT ENABLE_WERROR WITH_LIBBPF WITH_MRUBY WITH_NEVERBLEED
20	CMAKE_ON= ENABLE_DOC ENABLE_FAILMALLOC ENABLE_THREADS
21	USE_RC_SUBR= nghttpx	20	USE_RC_SUBR= nghttpx
22		21
23	SHEBANG_FILES= script/fetch-ocsp-response	22	CMAKE_OFF= ENABLE_DEBUG \
		23	ENABLE_HTTP3 \
		24	ENABLE_LIB_ONLY \
		25	ENABLE_STATIC_CRT \
		26	ENABLE_WERROR \
		27	WITH_LIBBPF \
		28	WITH_MRUBY \
		29	WITH_NEVERBLEED
		30	CMAKE_ON= ENABLE_DOC \
		31	ENABLE_FAILMALLOC \
		32	ENABLE_THREADS \
		33	CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \
		34	CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \
		35	CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \
		36	CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl
24		37
25	OPTIONS_DEFINE= APP EXAMPLES HPACK	38	OPTIONS_DEFINE= APP EXAMPLES HPACK
26	OPTIONS_DEFAULT=APP HPACK	39	OPTIONS_DEFAULT=APP HPACK
27	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
		41
28	APP_DESC= Build h2load, nghttp, nghttpd and nghttpx	42	APP_DESC= Build h2load, nghttp, nghttpd and nghttpx
29		43
30	APP_BUILD_DEPENDS= c-ares>=1.7.5:dns/c-ares \	44	APP_BUILD_DEPENDS= c-ares>=1.7.5:dns/c-ares \
31	libev>=4.11:devel/libev	45	libev>=4.11:devel/libev
32	APP_CMAKE_BOOL= ENABLE_APP
33	APP_LIB_DEPENDS= libcares.so:dns/c-ares \	46	APP_LIB_DEPENDS= libcares.so:dns/c-ares \
34	libev.so:devel/libev	47	libev.so:devel/libev
35	APP_USE= GNOME=libxml2	48	APP_USE= GNOME=libxml2
36	APP_USES= gnome	49	APP_USES= gnome
		50	APP_CMAKE_BOOL= ENABLE_APP
		51	APP_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Libev:BOOL=True \
		52	-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:BOOL=True
		53
37	EXAMPLES_BUILD_DEPENDS= libevent>=2.0.8:devel/libevent	54	EXAMPLES_BUILD_DEPENDS= libevent>=2.0.8:devel/libevent
38	EXAMPLES_CMAKE_BOOL= ENABLE_EXAMPLES
39	EXAMPLES_LIB_DEPENDS= libevent_openssl.so:devel/libevent	55	EXAMPLES_LIB_DEPENDS= libevent_openssl.so:devel/libevent
		56	EXAMPLES_CMAKE_BOOL= ENABLE_EXAMPLES
		57	EXAMPLES_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Libevent:BOOL=True
		58
40	HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson	59	HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson
41	HPACK_CMAKE_BOOL= ENABLE_HPACK_TOOLS
42	HPACK_LIB_DEPENDS= libjansson.so:devel/jansson	60	HPACK_LIB_DEPENDS= libjansson.so:devel/jansson
		61	HPACK_CMAKE_BOOL= ENABLE_HPACK_TOOLS
		62	HPACK_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Jansson:BOOL=True
		63
		64	.include <bsd.port.options.mk>
		65
		66	.if ${OPSYS}_${OSREL:C/\\./-/} == FreeBSD_13-2
		67	USES+= llvm
		68	.endif
43		69
44	post-install:	70	post-install:
45	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/	71	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/