diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.21.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -86,6 +86,25 @@ HTTP_STATUS HTTP_SUB HTTPV2 MAIL MAIL_SSL PCRE_ONE STREAM \ STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW +OPTIONS_RADIO+= V3 +OPTIONS_RADIO_V3= V3_BORING V3_QUICTLS +V3_CONFIGURE_ON= --with-ld-opt="-L ${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib" \ + --with-http_ssl_module \ + --build=nginx-quic \ + --with-stream_quic_module \ + --with-http_v3_module +V3_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-httpv3:-p1 + +V3_BORING_BUILD_DEPENDS=${LOCALBASE}/bin/bssl:security/boringssl +V3_BORING_RUN_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl +V3_BORING_CONFIGURE_ON= ${V3_CONFIGURE_ON} +V3_BORING_EXTRA_PATCHES=${V3_EXTRA_PATCHES} + +V3_QUICTLS_BUILD_DEPENDS=${LOCALBASE}/bin/openssl:security/openssl-quictls +V3_QUICTLS_RUN_DEPENDS= ${LOCALBASE}/bin/openssl:security/openssl-quictls +V3_QUICTLS_CONFIGURE_ON=${V3_CONFIGURE_ON} +V3_QUICTLS_EXTRA_PATCHES=${V3_EXTRA_PATCHES} + OPTIONS_RADIO+= PCRE OPTIONS_RADIO_PCRE= PCRE_ONE PCRE_TWO PCRE_ONE_LIB_DEPENDS= libpcre.so:devel/pcre @@ -170,14 +189,6 @@ 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-ld-opt="-L ${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib" \ - --with-http_ssl_module \ - --build=nginx-quic \ - --with-stream_quic_module \ - --with-http_v3_module -HTTPV3_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-httpv3:-p1 MAIL_VARS= DSO_BASEMODS+=mail MAIL_IMAP_CONFIGURE_OFF= --without-mail_imap_module MAIL_POP3_CONFIGURE_OFF= --without-mail_pop3_module diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -22,7 +22,10 @@ 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 +V3_DESC= Enable HTTP/3 protocol support +V3_BORING_DESC= Use security/boringssl +V3_QUICTLS_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