www/nginx-devel: able to build with security/openssl-quictls

While I'm here fix a typo in a start-up template, introduced in
c42df2fcbbeccbfb2d57f4d6d7558493d512d732.

Bump PORTREVISION.

Differential Revision:	https://reviews.freebsd.org/D33773
Reviewed by:		pluknet

3 files changed, 20 insertions, 8 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index f691a8f93632..8560909b0327 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.21.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -72,7 +72,7 @@ OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
-	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3
+	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
@@ -170,13 +170,17 @@ HTTP_XSLT_USE=			GNOME=libxml2,libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
-HTTPV3_BUILD_DEPENDS=		${LOCALBASE}/bin/bssl:security/boringssl
-HTTPV3_RUN_DEPENDS=		${LOCALBASE}/bin/bssl:security/boringssl
-HTTPV3_CONFIGURE_ON=		--with-http_ssl_module \
-				--build=nginx-quic \
+HTTPV3_CONFIGURE_ON=		--build=nginx-quic \
 				--with-stream_quic_module \
 				--with-http_v3_module
 HTTPV3_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-httpv3:-p1
+HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
+HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
+HTTPV3_BORING_IMPLIES=		HTTPV3
+HTTPV3_BORING_PREVENTS=		HTTPV3_QTLS
+HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
+HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
+HTTPV3_QTLS_IMPLIES=		HTTPV3
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
@@ -234,6 +238,12 @@ IGNORE=		required at least PCRE_ONE or PCRE_TWO \
 		to be defined. Please do 'make config' again
 .endif
 
+.if ${PORT_OPTIONS:MHTTPV3} && \
+    (empty(PORT_OPTIONS:MHTTPV3_BORING) && empty(PORT_OPTIONS:MHTTPV3_QTLS))
+IGNORE=		required HTTPV3_BORING or HTTPV3_QTLS \
+		to be defined. Please do 'make config' again
+.endif
+
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index b39e871d0a9b..b6067fe10827 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -22,7 +22,9 @@ GSSAPI_DESC=			GSSAPI implementation (imply HTTP_AUTH_KRB5)
 HEADERS_MORE_DESC=		3rd party headers_more module
 HTTPGRP_DESC=			Modules that require HTTP module
 HTTPV2_DESC=			Enable HTTP/2 protocol support (SSL req.)
-HTTPV3_DESC=			Enable HTTP/3 protocol support (BoringSSL req.)
+HTTPV3_DESC=			Enable HTTP/3 protocol support
+HTTPV3_BORING_DESC=		Use security/boringssl
+HTTPV3_QTLS_DESC=		Use security/openssl-quictls
 HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
 HTTP_ADDITION_DESC=		Enable http_addition module
 HTTP_AUTH_DIGEST_DESC=		3rd party http_authdigest module
diff --git a/www/nginx-devel/files/nginx.in b/www/nginx-devel/files/nginx.in
index 7ab503d01820..652468a97596 100644
--- a/www/nginx-devel/files/nginx.in
+++ b/www/nginx-devel/files/nginx.in
@@ -25,7 +25,7 @@
 # nginx_http_accept_enable (bool): Set to "NO" by default.
 #				Set to yes to check for accf_http kernel module
 #				on start-up and load if not loaded.
-# nginx_sig_stop (str):		Default to "-TERM"
+# nginx_sig_stop (str):		Default to "TERM"
 
 . /etc/rc.subr