Hello,
more apps start using QUIC with GnuTLS. Port net/ngtcp2 can support
GnuTLS in a subpackage with no change in the main package. However,
security/gnutls is needed for building the port with this diff and as a
dependency for the new subpackage net/ngtcp2-gnutls. I have also changed
the package description, but didn't touch the style of the Makefile yet.
REVISON's of both subpackages set to he same value. Tested on amd64 so
far.
Please Cc: me in replies, I'm currently not subscribed to ports@.
Thanks.
Regards,
David
Index: ports/net/ngtcp2/Makefile
===
RCS file: /cvs/ports/net/ngtcp2/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- ports/net/ngtcp2/Makefile 9 Feb 2023 22:26:17 - 1.6
+++ ports/net/ngtcp2/Makefile 24 Feb 2023 22:53:44 -
@@ -1,10 +1,16 @@
-COMMENT= implementation of the RFC 9000 QUIC protocol
+COMMENT-main= implementation of the RFC 9000 QUIC protocol
+COMMENT-gnutls=GnuTLS support for ngtcp2
V=0.13.1
DISTNAME= ngtcp2-$V
+REVISION-main= 1
+REVISION-gnutls= 1
+
+MULTI_PACKAGES=-main -gnutls
SHARED_LIBS +=ngtcp2 1.0 # 10.1
SHARED_LIBS +=ngtcp2_crypto_openssl 0.0 # 4.0
+SHARED_LIBS += ngtcp2_crypto_gnutls0.0 # 4.0
CATEGORIES= net
@@ -13,7 +19,10 @@ HOMEPAGE=https://nghttp2.org/ngtcp2/
# MIT
PERMIT_PACKAGE= Yes
-WANTLIB += crypto ssl
+LIB_DEPENDS-gnutls=${BASE_PKGPATH},-main security/gnutls
+
+WANTLIB-main +=crypto ssl
+WANTLIB-gnutls += gnutls ngtcp2
MASTER_SITES= https://github.com/ngtcp2/ngtcp2/releases/download/v$V/
@@ -21,7 +30,7 @@ SEPARATE_BUILD= Yes
DEBUG_PACKAGES= ${BUILD_PACKAGES}
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-openssl
+CONFIGURE_ARGS+= --with-openssl --with-gnutls
# Don't pull this in as BUILD_DEPENDS to reduce dependencies on
# the path to building curl->cmake.
Index: ports/net/ngtcp2/pkg/DESCR
===
RCS file: ports/net/ngtcp2/pkg/DESCR
diff -N ports/net/ngtcp2/pkg/DESCR
--- ports/net/ngtcp2/pkg/DESCR 9 Nov 2022 11:56:28 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1 +0,0 @@
-implementation of the RFC 9000 QUIC protocol
Index: ports/net/ngtcp2/pkg/DESCR-gnutls
===
RCS file: ports/net/ngtcp2/pkg/DESCR-gnutls
diff -N ports/net/ngtcp2/pkg/DESCR-gnutls
--- /dev/null 1 Jan 1970 00:00:00 -
+++ ports/net/ngtcp2/pkg/DESCR-gnutls 24 Feb 2023 22:53:44 -
@@ -0,0 +1,2 @@
+This packages contains the GnuTLS backend for ngtcp2, a QUIC
+protocol implementation.
Index: ports/net/ngtcp2/pkg/DESCR-main
===
RCS file: ports/net/ngtcp2/pkg/DESCR-main
diff -N ports/net/ngtcp2/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -
+++ ports/net/ngtcp2/pkg/DESCR-main 24 Feb 2023 22:53:44 -
@@ -0,0 +1,4 @@
+ngtcp2 is an implementation of QUIC, a UDP-based secure general-purpose
+transport protocol. QUIC is published as RFC 9000.
+
+This packages also contains the LibreSSL backend for ngtcp2.
Index: ports/net/ngtcp2/pkg/PLIST
===
RCS file: ports/net/ngtcp2/pkg/PLIST
diff -N ports/net/ngtcp2/pkg/PLIST
--- ports/net/ngtcp2/pkg/PLIST 9 Nov 2022 11:56:28 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-include/ngtcp2/
-include/ngtcp2/ngtcp2.h
-include/ngtcp2/ngtcp2_crypto.h
-include/ngtcp2/ngtcp2_crypto_openssl.h
-include/ngtcp2/version.h
-@static-lib lib/libngtcp2.a
-lib/libngtcp2.la
-@lib lib/libngtcp2.so.${LIBngtcp2_VERSION}
-@static-lib lib/libngtcp2_crypto_openssl.a
-lib/libngtcp2_crypto_openssl.la
-@lib
lib/libngtcp2_crypto_openssl.so.${LIBngtcp2_crypto_openssl_VERSION}
-lib/pkgconfig/libngtcp2.pc
-lib/pkgconfig/libngtcp2_crypto_openssl.pc
-share/doc/ngtcp2/
-share/doc/ngtcp2/README.rst
Index: ports/net/ngtcp2/pkg/PLIST-gnutls
===
RCS file: ports/net/ngtcp2/pkg/PLIST-gnutls
diff -N ports/net/ngtcp2/pkg/PLIST-gnutls
--- /dev/null 1 Jan 1970 00:00:00 -
+++ ports/net/ngtcp2/pkg/PLIST-gnutls 24 Feb 2023 22:53:44 -
@@ -0,0 +1,6 @@
+include/ngtcp2/
+include/ngtcp2/ngtcp2_crypto_gnutls.h
+@static-lib lib/libngtcp2_crypto_gnutls.a
+lib/libngtcp2_crypto_gnutls.la
+@lib lib/libngtcp2_crypto_gnutls.so.${LIBngtcp2_crypto_gnutls_VERSION}
+lib/pkgconfig/libngtcp2_crypto_gnutls.pc
Index: ports/net/ngtcp2/pkg/PLIST-main
===
RCS file: ports/net/ngtcp2/pkg/PLIST-main
diff -N ports/net/ngtcp2/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -
+++ ports/net/ngtcp2/pkg/PLIST-main 24 Feb 2023 22:53:44 -
@@ -0,0 +1,