Attachment #245929 for bug #274402




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

MAINTAINER=	sunpoet@FreeBSD.org

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake compiler:c++14-lang cpe 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_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

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/www/libnghttp2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1696963432	1	TIMESTAMP = 1698422107
2	SHA256 (nghttp2-1.57.0.tar.xz) = 9210b0113109f43be526ac5835d58a701411821a4d39e155c40d67c40f47a958	2	SHA256 (nghttp2-1.58.0.tar.xz) = 4a68a3040da92fd9872c056d0f6b0cd60de8410de10b578f8ade9ecc14d297e0
3	SIZE (nghttp2-1.57.0.tar.xz) = 1543568	3	SIZE (nghttp2-1.58.0.tar.xz) = 1546332

Added Link Here

(-)b/www/libnghttp2/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2023-09-15 17:17:34 UTC
2	+++ CMakeLists.txt
3	@@ -483,7 +483,7 @@ if(ENABLE_DOC)
4	add_subdirectory(doc)
5	endif()
6	add_subdirectory(contrib)
7	-add_subdirectory(script)
8	+#add_subdirectory(script)
9	add_subdirectory(bpf)
10
11




--- 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 \

Lines 3-7 include/nghttp2/nghttp2ver.h Link Here

(-)b/www/libnghttp2/pkg-plist (-1 / +1 lines)
3	lib/libnghttp2.a	3	lib/libnghttp2.a
4	lib/libnghttp2.so	4	lib/libnghttp2.so
5	lib/libnghttp2.so.14	5	lib/libnghttp2.so.14
6	lib/libnghttp2.so.14.25.0	6	lib/libnghttp2.so.14.25.1
7	libdata/pkgconfig/libnghttp2.pc	7	libdata/pkgconfig/libnghttp2.pc

Return to bug 274402

Lines 1-7 Link Here

(-)b/www/libnghttp2/Makefile (-8 / +18 lines)
1	PORTNAME= nghttp2	1	PORTNAME= nghttp2
2	PORTVERSION= 1.57.0	2	DISTVERSION= 1.58.0
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	PKGNAMEPREFIX= lib	5	PKGNAMEPREFIX= lib
6		6
7	MAINTAINER= sunpoet@FreeBSD.org	7	MAINTAINER= sunpoet@FreeBSD.org
Lines 12-23 WWW= https://nghttp2.org/ \ Link Here
12	LICENSE= MIT	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	USES= compiler:c++14-lang cpe libtool pathfix pkgconfig tar:xz	15	USES= cmake compiler:c++14-lang cpe pathfix pkgconfig tar:xz
16
17	CONFIGURE_ARGS= --enable-lib-only
18	GNU_CONFIGURE= yes
19	INSTALL_TARGET= install-strip
20	USE_CXXSTD= c++14
21	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
22		17
		18	CMAKE_OFF= ENABLE_DOC \
		19	ENABLE_FAILMALLOC \
		20	ENABLE_HTTP3
		21	CMAKE_ON= ENABLE_LIB_ONLY \
		22	ENABLE_STATIC_LIB \
		23	CMAKE_DISABLE_FIND_PACKAGE_Jansson \
		24	CMAKE_DISABLE_FIND_PACKAGE_Jemalloc \
		25	CMAKE_DISABLE_FIND_PACKAGE_Libcares \
		26	CMAKE_DISABLE_FIND_PACKAGE_Libev \
		27	CMAKE_DISABLE_FIND_PACKAGE_Libevent \
		28	CMAKE_DISABLE_FIND_PACKAGE_Libnghttp3 \
		29	CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2 \
		30	CMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl \
		31	CMAKE_DISABLE_FIND_PACKAGE_LibXml2
		32
23	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Removed Link Here

(-)a/www/libnghttp2/files/patch-Makefile.in (-16 lines)
1	--- Makefile.in.orig 2023-02-13 12:02:52 UTC
2	+++ Makefile.in
3	@@ -448,11 +448,10 @@ top_srcdir = @top_srcdir@
4	# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
5	# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
6	# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7	-SUBDIRS = lib third-party src bpf examples tests integration-tests \
8	- doc contrib script
9	+SUBDIRS = lib
10
11	ACLOCAL_AMFLAGS = -I m4
12	-dist_doc_DATA = README.rst
13	+dist_doc_DATA =
14	EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-env \
15	Dockerfile.android \
16	cmakeconfig.h.in \