svn commit: r531086 - head/www/nginx-devel

[Sergey A. Osokin]

Author: osa
Date: Wed Apr  8 03:34:20 2020
New Revision: 531086
URL: https://svnweb.freebsd.org/changeset/ports/531086

Log:
  Add STREAM_REALIP knob for the ngx_stream_realip module. (*)
  
  Enable STREAM_REALIP knob by default.
  
  Also, create STREAMGRP group for stream-specific modules.
  
  Bump PORTREVISION.
  
  Requested by:	Kirill I. <kerya at kerya.net> (*)

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.options.desc

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Wed Apr  8 03:27:35 2020	(r531085)
+++ head/www/nginx-devel/Makefile	Wed Apr  8 03:34:20 2020	(r531086)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.17.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -64,14 +65,19 @@ GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
-OPTIONS_GROUP=	MAILGRP HTTPGRP
+OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
 	HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \
 	HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS \
-	HTTP_SUB HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD
+	HTTP_SUB HTTP_XSLT HTTPV2
 
+OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
+
+OPTIONS_GROUP_STREAMGTP=	STREAM STREAM_REALIP STREAM_SSL \
+	STREAM_SSL_PREREAD
+
 # External modules (arrayvar MUST appear after devel_kit for build-dep)
 OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \
 	ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \
@@ -85,14 +91,13 @@ OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURG
 	HTTP_ZIP ICONV LET LINK LUA MEMC MODSECURITY MODSECURITY3 NAXSI NJS \
 	PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP SET_MISC \
 	SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
-OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \
 		HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \
 		HTTP_SLICE HTTP_REWRITE HTTP_SSL HTTP_STATUS HTTP_SUB \
-		HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL STREAM_SSL_PREREAD \
-		THREADS WWW
+		HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL STREAM_REALIP \
+		STREAM_SSL_PREREAD THREADS WWW
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
@@ -112,13 +117,18 @@ ${opt}_IMPLIES=	MAIL
 ${opt}_IMPLIES=	HTTP
 .endfor
 
+.for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
+${opt}_IMPLIES=	STREAM
+.endfor
+
 GSSAPI_BASE_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTP} ${OPTIONS_GROUP_MAIL}
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTP} \
+	 ${OPTIONS_GROUP_MAIL} ${OPTIONS_GROUP_STREAM}
 .endif
 
 # Non-module options handling
@@ -177,6 +187,7 @@ MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
+STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module

Modified: head/www/nginx-devel/Makefile.options.desc
==============================================================================
--- head/www/nginx-devel/Makefile.options.desc	Wed Apr  8 03:27:35 2020	(r531085)
+++ head/www/nginx-devel/Makefile.options.desc	Wed Apr  8 03:34:20 2020	(r531086)
@@ -104,6 +104,7 @@ SLOWFS_CACHE_DESC=		3rd party slowfs_cache module
 SMALL_LIGHT_DESC=		3rd party small_light module
 SRCACHE_DESC=			3rd party srcache module
 STREAM_DESC=			Enable stream module
+STREAM_REALIP_DESC=		Enable stream_realip module
 STREAM_SSL_DESC=		Enable stream_ssl module (SSL req.)
 STREAM_SSL_PREREAD_DESC=	Enable stream_ssl_preread module (SSL req.)
 THREADS_DESC=			Enable threads support