Attachment #243361 for bug #272214




PORTNAME=	nghttp2
DISTVERSION=	1.55.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 = 1688166092	1	TIMESTAMP = 1689190163
2	SHA256 (nghttp2-1.54.0.tar.xz) = 20533c9354fbb6aa689b6aa0ddb77f91da1d242587444502832e1864308152df	2	SHA256 (nghttp2-1.55.0.tar.xz) = bc5b9d33fc08b195f0f2e685aa70bfd3f2f265a8d48039a701b7d67b375a783f
3	SIZE (nghttp2-1.54.0.tar.xz) = 1541460	3	SIZE (nghttp2-1.55.0.tar.xz) = 1542356




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




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

Return to bug 272214

Lines 1-7 Link Here

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

Added Link Here

(-)b/www/libnghttp2/files/patch-CMakeLists.txt (+20 lines)
1	--- CMakeLists.txt.orig 2022-12-24 08:18:29 UTC
2	+++ CMakeLists.txt
3	@@ -503,7 +503,7 @@ include_directories(
4	set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
5	set(PKGLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}")
6
7	-install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
8	+#install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
9
10	add_subdirectory(lib)
11	#add_subdirectory(lib/includes)
12	@@ -519,7 +519,7 @@ if(ENABLE_DOC)
13	add_subdirectory(doc)
14	endif()
15	add_subdirectory(contrib)
16	-add_subdirectory(script)
17	+#add_subdirectory(script)
18	add_subdirectory(bpf)
19
20

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 \