Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Apr 2018 21:35:52 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r468061 - in head/www/nginx-devel: . files
Message-ID:  <201804222135.w3MLZqP3018537@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Sun Apr 22 21:35:51 2018
New Revision: 468061
URL: https://svnweb.freebsd.org/changeset/ports/468061

Log:
  Merge from www/nginx and adopt next revisions:
  	465814, 465851, 465931, 468031.
  
  Bump PORTREVISION.

Added:
  head/www/nginx-devel/Makefile.extmod   (contents, props changed)
  head/www/nginx-devel/Makefile.options.desc   (contents, props changed)
  head/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL   (contents, props changed)
  head/www/nginx-devel/files/extra-patch-ngx_http_upstream_fair_module.c.n   (contents, props changed)
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
  head/www/nginx-devel/pkg-plist

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sun Apr 22 21:35:38 2018	(r468060)
+++ head/www/nginx-devel/Makefile	Sun Apr 22 21:35:51 2018	(r468061)
@@ -3,9 +3,10 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.14.0
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://nginx.org/download/
-MASTER_SITES+=	LOCAL/osa
+MASTER_SITES=	http://nginx.org/download/ \
+		LOCAL/osa
 PKGNAMESUFFIX?=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -16,249 +17,14 @@ LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	nginx
 
-PORTSCOUT=	limit:^1\.13\.[0-9]*
+PORTSCOUT=	limit:^1\.14\.[0-9]*
 
-USES+=		cpe
+USES=		cpe
 
 CPE_VENDOR=	nginx
 CPE_PRODUCT=	nginx
 USE_GITHUB=	nodefault
 
-NO_OPTIONS_SORT=	yes
-OPTIONS_DEFINE=	\
-	DSO \
-	DEBUG \
-	DEBUGLOG \
-	FILE_AIO \
-	IPV6 \
-	GOOGLE_PERFTOOLS \
-	HTTP \
-	HTTP_ADDITION \
-	HTTP_AUTH_REQ \
-	HTTP_CACHE \
-	HTTP_DAV \
-	HTTP_FLV \
-	HTTP_GEOIP \
-	HTTP_GZIP_STATIC \
-	HTTP_GUNZIP_FILTER \
-	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 \
-	MAIL \
-	MAIL_IMAP \
-	MAIL_POP3 \
-	MAIL_SMTP \
-	MAIL_SSL \
-	HTTPV2 \
-	NJS \
-	STREAM \
-	STREAM_SSL \
-	STREAM_SSL_PREREAD \
-	THREADS \
-	WWW \
-	AJP \
-	AWS_AUTH \
-	CACHE_PURGE \
-	CLOJURE \
-	CT \
-	ECHO \
-	FASTDFS \
-	HEADERS_MORE \
-	HTTP_ACCEPT_LANGUAGE \
-	HTTP_AUTH_DIGEST \
-	HTTP_AUTH_KRB5 \
-	HTTP_AUTH_LDAP \
-	HTTP_AUTH_PAM \
-	HTTP_DAV_EXT \
-	HTTP_EVAL \
-	HTTP_FANCYINDEX \
-	HTTP_FOOTER \
-	HTTP_GEOIP2 \
-	HTTP_JSON_STATUS \
-	HTTP_MOGILEFS \
-	HTTP_MP4_H264 \
-	HTTP_NOTICE \
-	HTTP_PUSH \
-	HTTP_PUSH_STREAM \
-	HTTP_REDIS \
-	HTTP_RESPONSE \
-	HTTP_SUBS_FILTER \
-	HTTP_TARANTOOL \
-	HTTP_UPLOAD \
-	HTTP_UPLOAD_PROGRESS \
-	HTTP_UPSTREAM_CHECK \
-	HTTP_UPSTREAM_FAIR \
-	HTTP_UPSTREAM_STICKY \
-	HTTP_VIDEO_THUMBEXTRACTOR \
-	HTTP_ZIP \
-	ARRAYVAR \
-	BROTLI \
-	DRIZZLE \
-	DYNAMIC_UPSTREAM \
-	ENCRYPTSESSION \
-	FORMINPUT \
-	GRIDFS \
-	ICONV \
-	LET \
-	LUA \
-	MEMC \
-	MODSECURITY \
-	MODSECURITY3 \
-	NAXSI \
-	PASSENGER \
-	POSTGRES \
-	RDS_CSV \
-	RDS_JSON \
-	REDIS2 \
-	RTMP \
-	SET_MISC \
-	SFLOW \
-	SHIBBOLETH \
-	SLOWFS_CACHE \
-	SMALL_LIGHT \
-	SRCACHE \
-	VOD \
-	VTS \
-	X11 \
-	XSS
-
-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
-
-DSO_DESC=			Enable dynamic modules support
-DEBUG_DESC=			Build with debugging support
-DEBUGLOG_DESC=			Enable debug log (--with-debug)
-FILE_AIO_DESC=			Enable file aio
-IPV6_DESC=			Enable IPv6 support
-GOOGLE_PERFTOOLS_DESC=		Enable google perftools module
-HTTP_DESC=			Enable HTTP module
-HTTP_ADDITION_DESC=		Enable http_addition module
-HTTP_AUTH_REQ_DESC=		Enable http_auth_request module
-HTTP_CACHE_DESC=		Enable http_cache module
-HTTP_DAV_DESC=			Enable http_webdav module
-HTTP_FLV_DESC=			Enable http_flv module
-HTTP_GEOIP_DESC=		Enable http_geoip module
-HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
-HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
-HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
-HTTP_MP4_DESC=			Enable http_mp4 module
-HTTP_PERL_DESC=			Enable http_perl module
-HTTP_RANDOM_INDEX_DESC=		Enable http_random_index module
-HTTP_REALIP_DESC=		Enable http_realip module
-HTTP_REWRITE_DESC=		Enable http_rewrite module
-HTTP_SECURE_LINK_DESC=		Enable http_secure_link module
-HTTP_SLICE_DESC=		Enable http_slice module
-HTTP_SSL_DESC=			Enable http_ssl module
-HTTP_STATUS_DESC=		Enable http_stub_status module
-HTTP_SUB_DESC=			Enable http_sub module
-HTTP_XSLT_DESC=			Enable http_xslt module
-MAIL_DESC=			Enable IMAP4/POP3/SMTP proxy module
-MAIL_IMAP_DESC=			Enable IMAP4 proxy module
-MAIL_POP3_DESC=			Enable POP3 proxy module
-MAIL_SMTP_DESC=			Enable SMTP proxy module
-MAIL_SSL_DESC=			Enable mail_ssl module
-HTTPV2_DESC=			Enable HTTP/2 protocol support (SSL req.)
-NJS_DESC=			Enable http_javascript module
-STREAM_DESC=			Enable stream 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
-WWW_DESC=			Enable html sample files
-AJP_DESC=			3rd party ajp module
-AWS_AUTH_DESC=			3rd party aws auth module
-CACHE_PURGE_DESC=		3rd party cache_purge module
-CLOJURE_DESC=			3rd party clojure module
-CT_DESC=			3rd party cert_transparency module (SSL req.)
-ECHO_DESC=			3rd party echo module
-FASTDFS_DESC=			3rd party fastdfs module
-HEADERS_MORE_DESC=		3rd party headers_more module
-HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
-HTTP_AUTH_DIGEST_DESC=		3rd party http_authdigest module
-HTTP_AUTH_KRB5_DESC=		3rd party http_auth_gss module
-HTTP_AUTH_LDAP_DESC=		3rd party http_auth_ldap module
-HTTP_AUTH_PAM_DESC=		3rd party http_auth_pam module
-HTTP_DAV_EXT_DESC=		3rd party webdav_ext module
-HTTP_EVAL_DESC=			3rd party eval module
-HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
-HTTP_FOOTER_DESC=		3rd party http_footer module
-HTTP_GEOIP2_DESC=		3rd party geoip2 module
-HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
-HTTP_MOGILEFS_DESC=		3rd party mogilefs module
-HTTP_MP4_H264_DESC=		3rd party mp4/h264 module
-HTTP_NOTICE_DESC=		3rd party notice module
-HTTP_PUSH_DESC=			3rd party push module
-HTTP_PUSH_STREAM_DESC=		3rd party push stream module
-HTTP_REDIS_DESC=		3rd party http_redis module
-HTTP_RESPONSE_DESC=		3rd party http_response module
-HTTP_SUBS_FILTER_DESC=		3rd party subs filter module
-HTTP_TARANTOOL_DESC=		3rd party tarantool upstream module
-HTTP_UPLOAD_DESC=		3rd party upload module
-HTTP_UPLOAD_PROGRESS_DESC=	3rd party uploadprogress module
-HTTP_UPSTREAM_CHECK_DESC=	3rd party upstream check module
-HTTP_UPSTREAM_FAIR_DESC=	3rd party upstream fair module
-HTTP_UPSTREAM_STICKY_DESC=	3rd party upstream sticky module
-HTTP_VIDEO_THUMBEXTRACTOR_DESC=	3rd party video_thumbextractor module
-HTTP_ZIP_DESC=			3rd party http_zip module
-ARRAYVAR_DESC=			3rd party array_var module
-BROTLI_DESC=			3rd party brotli module
-DRIZZLE_DESC=			3rd party drizzlie module
-DYNAMIC_UPSTREAM_DESC=		3rd party dynamic_upstream module
-ENCRYPTSESSION_DESC=		3rd party encrypted_session module
-FORMINPUT_DESC=			3rd party form_input module
-GRIDFS_DESC=			3rd party gridfs module
-ICONV_DESC=			3rd party iconv module
-LET_DESC=			3rd party let module
-LUA_DESC=			3rd party lua module
-MEMC_DESC=			3rd party memc (memcached) module
-MODSECURITY_DESC=		3rd party mod_security module
-MODSECURITY3_DESC=		3rd party mod_security v3 module
-NAXSI_DESC=			3rd party naxsi module
-PASSENGER_DESC=			3rd party passenger module
-POSTGRES_DESC=			3rd party postgres module
-RDS_CSV_DESC=			3rd party rds_csv module
-RDS_JSON_DESC=			3rd party rds_json module
-REDIS2_DESC=			3rd party redis2 module
-RTMP_DESC=			3rd party rtmp module
-SET_MISC_DESC=			3rd party set_misc module
-SFLOW_DESC=			3rd party sflow module
-SHIBBOLETH_DESC=		3rd party shibboleth module
-SLOWFS_CACHE_DESC=		3rd party slowfs_cache module
-SMALL_LIGHT_DESC=		3rd party small_light module
-SRCACHE_DESC=			3rd party srcache module
-VOD_DESC=			3rd party vod module
-VTS_DESC=			3rd party vts module
-X11_DESC=			graphics/ImageMagick[-nox11] dependency
-XSS_DESC=			3rd party xss module
-VIDEO_DESC=			Video module support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
-.else
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick-nox11
-.endif
-
-.if ${PORT_OPTIONS:MPASSENGER}
-CATEGORIES+=	ruby
-USE_RUBY=	yes
-BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:devel/rubygem-rake
-RAKE_BIN=	${LOCALBASE}/bin/rake
-.endif
-
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
@@ -269,9 +35,9 @@ NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-1.* \
-			nginx-full-1.* \
-			nginx-lite-1.* \
-			nginx-naxsi-1.*
+		nginx-full-1.* \
+		nginx-lite-1.* \
+		nginx-naxsi-1.*
 USE_RC_SUBR=	nginx
 SUB_FILES=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
@@ -290,902 +56,173 @@ CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP}
 
-.if ${PORT_OPTIONS:MDSO}
-MODULESDIR=	${PREFIX}/libexec/${PORTNAME}
-CONFIGURE_ARGS+=--modules-path=${MODULESDIR}
-.endif
+PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-.if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
-IGNORE=		requires at least HTTP or MAIL to \
-		be defined.  Please do 'make config' again
-.endif
+USERS?=	${WWWOWN}
+GROUPS?=${WWWGRP}
 
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+=	-g
-STRIP=		#do not strip if nginx with debug information
-.endif
+NO_OPTIONS_SORT=	yes
 
-.if ${PORT_OPTIONS:MDEBUGLOG}
-CONFIGURE_ARGS+=--with-debug
-.endif
+OPTIONS_GROUP=	MAILGRP HTTPGRP
+# 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_GEOIP 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
 
-.if ${PORT_OPTIONS:MFILE_AIO}
-CONFIGURE_ARGS+=--with-file-aio
-.endif
+# 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 \
+	GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \
+	HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
+	HTTP_FOOTER HTTP_GEOIP2 HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 \
+	HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM HTTP_REDIS HTTP_RESPONSE \
+	HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS \
+	HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \
+	HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET 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
+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
 
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
-.else
-CATEGORIES+=	ipv6
-.endif
+OPTIONS_RADIO+=		GSSAPI
+OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
+GSSAPI_MIT_USES=	gssapi:mit
 
-.if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
-LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
-CONFIGURE_ARGS+=--with-google_perftools_module
-.endif
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MHTTP}
-CONFIGURE_ARGS+=--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
-		--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
-		--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
-		--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
-		--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
-		--http-log-path=${NGINX_ACCESSLOG}
+.include "Makefile.options.desc"
 
-.if ${PORT_OPTIONS:MHTTP_ACCEPT_LANGUAGE}
-GIT_ACCEPT_LANGUAGE_VERSION=	2f69842
-GH_ACCOUNT+=	giom:accept_language
-GH_PROJECT+=	nginx_accept_language_module:accept_language
-GH_TAGNAME+=	${GIT_ACCEPT_LANGUAGE_VERSION}:accept_language
-CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language}
-.endif
+.for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
+${opt}_IMPLIES=	MAIL
+.endfor
 
-.if ${PORT_OPTIONS:MHTTP_ADDITION}
-CONFIGURE_ARGS+=--with-http_addition_module
-.endif
+.for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
+${opt}_IMPLIES=	HTTP
+.endfor
 
-.if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST}
-GIT_AUTH_DIGEST_VERSION=	274490c
-GH_ACCOUNT+=	atomx:auth_digest
-GH_PROJECT+=	nginx-http-auth-digest:auth_digest
-GH_TAGNAME+=	${GIT_AUTH_DIGEST_VERSION}:auth_digest
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_auth_digest}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
-.endif
-.endif
+GSSAPI_BASE_IMPLIES=	HTTP_AUTH_KRB5
+GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
+GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
-.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
-GIT_HTTP_AUTH_KRB5_VERSION=	7e028a5
-GH_ACCOUNT+=	stnoonan:auth_krb5
-GH_PROJECT+=	spnego-http-auth-nginx-module:auth_krb5
-GH_TAGNAME+=	${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5
-CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_krb5}
-#EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
-#OPTIONS_RADIO+=		GSSAPI
-#OPTIONS_RADIO_GSSAPI+=	GSSAPI_HEIMDAL GSSAPI_MIT
-#GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
-#GSSAPI_MIT_USES=	gssapi:mit
+# 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}
 .endif
 
-.if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
-# WWW: https://github.com/kvspb/nginx-auth-ldap
-GIT_HTTP_AUTH_LDAP_VERSION=	42d195d
-GH_ACCOUNT+=	kvspb:http_auth_ldap
-GH_PROJECT+=	nginx-auth-ldap:http_auth_ldap
-GH_TAGNAME+=	${GIT_HTTP_AUTH_LDAP_VERSION}:http_auth_ldap
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_http_auth_ldap}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_http_auth_ldap}
-.endif
-USE_OPENLDAP=	yes
-.endif
+# Non-module options handling
+DEBUG_CFLAGS=		-g
+DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
+DEBUGLOG_CONFIGURE_ON=	--with-debug
+DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
+DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
+FILE_AIO_CONFIGURE_ON=	--with-file-aio
+IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
+IPV6_CATEGORIES=	ipv6
+THREADS_CONFIGURE_ON=	--with-threads
 
-.if ${PORT_OPTIONS:MHTTP_AUTH_PAM}
-GIT_HTTP_AUTH_PAM_VERSION=	1.5.1
-GH_ACCOUNT+=	sto:auth_pam
-GH_PROJECT+=	ngx_http_auth_pam_module:auth_pam
-GH_TAGNAME+=	v${GIT_HTTP_AUTH_PAM_VERSION}:auth_pam
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_auth_pam}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_pam}
-.endif
-.endif
+# Bundled modules
+GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
+GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
+HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
+				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
+				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
+				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
+				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
+				--http-log-path=${NGINX_ACCESSLOG}
+HTTP_CONFIGURE_OFF=		--without-http
+HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
+HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
+HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
+HTTP_DAV_CONFIGURE_ARGS=	--with-http_dav_module
+HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
+HTTP_GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
+HTTP_GEOIP_VARS=		DSO_BASEMODS+=http_geoip_module
+HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
+HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
+HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
+HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
+HTTP_MP4_CONFIGURE_ARGS=	--with-http_mp4_module
+HTTP_PERL_CATEGORIES=		perl5
+HTTP_PERL_USES=			perl5
+HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
+HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
+HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
+HTTP_REWRITE_LIB_DEPENDS=	libpcre.so:devel/pcre
+HTTP_REWRITE_CONFIGURE_ON=	--with-pcre
+HTTP_REWRITE_CONFIGURE_OFF=	--without-http_rewrite_module
+HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
+HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
+HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
+HTTP_SSL_USES=			ssl
+HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
+HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
+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
+MAIL_VARS=			DSO_BASEMODS+=mail
+MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
+MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
+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_SSL_IMPLIES=		HTTP_SSL
+STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
+STREAM_SSL_PREREAD_OFF=		--without-stream_ssl_preread_module
 
-.if ${PORT_OPTIONS:MHTTP_AUTH_REQ}
-CONFIGURE_ARGS+=--with-http_auth_request_module
-.endif
+### External modules
+.include "Makefile.extmod"
 
-.if empty(PORT_OPTIONS:MHTTP_CACHE)
-CONFIGURE_ARGS+=--without-http-cache
-.endif
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MAJP}
-NGINX_AJP_VERSION=	bf6cd93
-GH_ACCOUNT+=	yaoweibin:ajp
-GH_PROJECT+=	nginx_ajp_module:ajp
-GH_TAGNAME+=	${NGINX_AJP_VERSION}:ajp
-CONFIGURE_ARGS+=--add-module=${WRKSRC_ajp}
-.endif
-
-.if ${PORT_OPTIONS:MAWS_AUTH}
-NGINX_AWS_AUTH_VERSION=	1e62670
-GH_ACCOUNT+=	anomalizer:aws_auth
-GH_PROJECT+=	ngx_aws_auth:aws_auth
-GH_TAGNAME+=	${NGINX_AWS_AUTH_VERSION}:aws_auth
-CONFIGURE_ARGS+=--add-module=${WRKSRC_aws_auth}
-.endif
-
-.if ${PORT_OPTIONS:MCACHE_PURGE}
-NGINX_CACHE_PURGE_VERSION=	2.3
-MASTER_SITES+=	http://labs.frickle.com/files/:cache_purge
-DISTFILES+=	ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}.tar.gz:cache_purge
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}
-.endif
-
-.if ${PORT_OPTIONS:MCLOJURE}
-CATEGORIES+=	java
-USE_JAVA=	yes
-JAVA_OS=	native
-JAVA_VERSION=	1.8
-JAVA_VENDOR=	openjdk
-JAVA_BUILD=	yes
-JAVA_RUN=	yes
-NGINX_CLOJURE_VERSION=	0.4.5
-GH_ACCOUNT+=	nginx-clojure:clojure
-GH_PROJECT+=	nginx-clojure:clojure
-GH_TAGNAME+=	v${NGINX_CLOJURE_VERSION}:clojure
-CONFIGURE_ENV+=	"JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd"
-CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c
-.endif
-
-.if ${PORT_OPTIONS:MCT}
-GIT_CT_VERSION=	1.3.2
-GH_ACCOUNT+=	grahamedgecombe:ct
-GH_PROJECT+=	nginx-ct:ct
-GH_TAGNAME+=	v${GIT_CT_VERSION}:ct
 .if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_ct}
+_addbasemod=	=dynamic
+_addextmod=	add-dynamic-module
 .else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_ct}
+_addextmod=	add-module
 .endif
-NGINX_OPENSSL=	yes
-USE_HTTP_SSL=	yes
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
-IGNORE=		CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
-.endif
-.endif
 
-.if ${PORT_OPTIONS:MECHO}
-NGINX_ECHO_VERSION=	c65f5c6
-GH_ACCOUNT+=	openresty:echo
-GH_PROJECT+=	echo-nginx-module:echo
-GH_TAGNAME+=	${NGINX_ECHO_VERSION}:echo
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_echo}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
-.endif
-.endif
+.for mod in ${DSO_BASEMODS}
+CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
+.endfor
 
-.if ${PORT_OPTIONS:MFASTDFS}
-NGINX_FASTDFS_VERSION=	85347be
-GH_ACCOUNT+=	happyfish100:fastdfs
-GH_PROJECT+=	fastdfs-nginx-module:fastdfs
-GH_TAGNAME+=	${NGINX_FASTDFS_VERSION}:fastdfs
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-fastdfs-src-config
-BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
-		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
-LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
-		libfdfsclient.so:ftp/fastdfs
-CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src \
-		--with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
-		-I ${LOCALBASE}/include/fastcommon"
-.endif
+.for mod in ${DSO_EXTMODS}
+CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
+.endfor
+# For non-GitHub hosted modules
+.for moddir in ${DSO_EXTDIRS}
+CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
+.endfor
 
-.if ${PORT_OPTIONS:MHEADERS_MORE}
-NGINX_HEADERS_MORE_VERSION=	55fbdab
-GH_ACCOUNT+=	openresty:headers_more
-GH_PROJECT+=	headers-more-nginx-module:headers_more
-GH_TAGNAME+=	${NGINX_HEADERS_MORE_VERSION}:headers_more
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_headers_more}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more}
+.if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
+IGNORE=		requires at least HTTP or MAIL to \
+		be defined.  Please do 'make config' again
 .endif
-.endif
 
-.if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
-CONFIGURE_ARGS+=--with-http_dav_module
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base && ${PORT_OPTIONS:MCT}
+IGNORE=		CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
 .endif
 
-.if ${PORT_OPTIONS:MHTTP_DAV_EXT}
-USE_HTTP_DAV=	yes
-LIB_DEPENDS+=	libexpat.so:textproc/expat2
-NGINX_DAV_EXT_VERSION=	0.1.0
-GH_ACCOUNT+=	arut:dav_ext
-GH_PROJECT+=	nginx-dav-ext-module:dav_ext
-GH_TAGNAME+=	v${NGINX_DAV_EXT_VERSION}:dav_ext
-CONFIGURE_ARGS+=--add-module=${WRKSRC_dav_ext}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_EVAL}
-NGINX_EVAL_VERSION=	582bd25
-GH_ACCOUNT+=	openresty:eval
-GH_PROJECT+=	nginx-eval-module:eval
-GH_TAGNAME+=	${NGINX_EVAL_VERSION}:eval
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_eval}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_FANCYINDEX}
-NGINX_FANCYINDEX_VERSION=	0.4.2
-GH_ACCOUNT+=	aperezdc:fancyindex
-GH_PROJECT+=	ngx-fancyindex:fancyindex
-GH_TAGNAME+=	v${NGINX_FANCYINDEX_VERSION}:fancyindex
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_fancyindex}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_fancyindex}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_FOOTER}
-NGINX_FOOTER_VERSION=	1.2.2
-GH_ACCOUNT+=	alibaba:footer
-GH_PROJECT+=	nginx-http-footer-filter:footer
-GH_TAGNAME+=	${NGINX_FOOTER_VERSION}:footer
-CONFIGURE_ARGS+=--add-module=${WRKSRC_footer}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_GEOIP2}
-# WWW: https://github.com/leev/ngx_http_geoip2_module
-NGINX_HTTP_GEOIP2_VERSION=	2.0
-GH_ACCOUNT+=	leev:geoip2
-GH_PROJECT+=	ngx_http_geoip2_module:geoip2
-GH_TAGNAME+=	${NGINX_HTTP_GEOIP2_VERSION}:geoip2
-CFLAGS+=	"-I${LOCALBASE}/include"
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_geoip2}
-.endif
-LIB_DEPENDS+=	libmaxminddb.so:net/libmaxminddb
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_FLV}
-CONFIGURE_ARGS+=--with-http_flv_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_JSON_STATUS}
-NGINX_JSON_STATUS_VERSION=	1d2f303
-GH_ACCOUNT+=	nginx-modules:json_status
-GH_PROJECT+=	ngx_http_json_status_module:json_status
-GH_TAGNAME+=	${NGINX_JSON_STATUS_VERSION}:json_status
-CONFIGURE_ARGS+=--add-module=${WRKSRC_json_status}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_GEOIP}
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--with-http_geoip_module=dynamic
-.else
-CONFIGURE_ARGS+=--with-http_geoip_module
-.endif
-LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_GZIP_STATIC}
-CONFIGURE_ARGS+=--with-http_gzip_static_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_GUNZIP_FILTER}
-CONFIGURE_ARGS+=--with-http_gunzip_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_IMAGE_FILTER}
-LIB_DEPENDS+=	libgd.so:graphics/gd
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--with-http_image_filter_module=dynamic
-.else
-CONFIGURE_ARGS+=--with-http_image_filter_module
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_MP4}
-CONFIGURE_ARGS+=--with-http_mp4_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_MOGILEFS}
-NGINX_MOGILEFS_VERSION=	1.0.4
-MASTER_SITES+=	http://www.grid.net.ru/nginx/download/:mogilefs
-DISTFILES+=	nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION}.tar.gz:mogilefs
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_MP4_H264}
-NGINX_H264_VERSION=	2.2.7
-MASTER_SITES+=	http://h264.code-shop.com/download/:mp4streaming
-DISTFILES+=	nginx_mod_h264_streaming-${NGINX_H264_VERSION}.tar.gz:mp4streaming
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mod_h264_streaming-${NGINX_H264_VERSION}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_NOTICE}
-GIT_NOTICE_VERSION=	3c95966
-GH_ACCOUNT+=	kr:notice
-GH_PROJECT+=	nginx-notice:notice
-GH_TAGNAME+=	${GIT_NOTICE_VERSION}:notice
-CONFIGURE_ARGS+=--add-module=${WRKSRC_notice}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_PERL}
-CATEGORIES+=	perl5
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--with-http_perl_module=dynamic
-.else
-CONFIGURE_ARGS+=--with-http_perl_module
-.endif
-USES+=		perl5
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_PUSH}
-GIT_PUSH_VERSION=	1.1.14
-GH_ACCOUNT+=	slact:push
-GH_PROJECT+=	nchan:push
-GH_TAGNAME+=	v${GIT_PUSH_VERSION}:push
-CONFIGURE_ARGS+=--add-module=${WRKSRC_push}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_PUSH_STREAM}
-NGINX_PUSH_STREAM_VERSION=	0.5.4
-GH_ACCOUNT+=	wandenberg:pushstream
-GH_PROJECT+=	nginx-push-stream-module:pushstream
-GH_TAGNAME+=	${NGINX_PUSH_STREAM_VERSION}:pushstream
-CONFIGURE_ARGS+=--add-module=${WRKSRC_pushstream}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_RANDOM_INDEX}
-CONFIGURE_ARGS+=--with-http_random_index_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_REALIP}
-CONFIGURE_ARGS+=--with-http_realip_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_REDIS}
-NGINX_REDIS_VERSION=	0.3.8
-MASTER_SITES+=	LOCAL/osa:redis
-DISTFILES+=	ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_RESPONSE}
-NGINX_RESPONSE_VERSION=	0.3
-MASTER_SITES+=	http://catap.ru/downloads/nginx/:response
-DISTFILES+=	ngx_http_response-${NGINX_RESPONSE_VERSION}.tar.gz:response
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_VERSION}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_SUBS_FILTER}
-NGINX_HTTP_SUBS_FILTER_VERSION=	0.6.4
-GH_ACCOUNT+=	yaoweibin:subs_filter
-GH_PROJECT+=	ngx_http_substitutions_filter_module:subs_filter
-GH_TAGNAME+=	v${NGINX_HTTP_SUBS_FILTER_VERSION}:subs_filter
-CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_TARANTOOL}
-LIB_DEPENDS+=	libmsgpuck.so:devel/msgpuck \
-		libyajl.so:devel/yajl
-GH_ACCOUNT+=	tarantool:nginx_tarantool
-GH_PROJECT+=	nginx_upstream_module:nginx_tarantool
-GH_TAGNAME+=	4ca8684:nginx_tarantool
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool}
-.endif
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_tarantool-config
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_SECURE_LINK}
-CONFIGURE_ARGS+=--with-http_secure_link_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_SLICE}
-CONFIGURE_ARGS+=--with-http_slice_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_STATUS}
-CONFIGURE_ARGS+=--with-http_stub_status_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_SUB}
-CONFIGURE_ARGS+=--with-http_sub_module
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_UPLOAD}
-GIT_UPLOAD_VERSION=	72ec037
-GH_ACCOUNT+=	Austinb:upload
-GH_PROJECT+=	nginx-upload-module:upload
-GH_TAGNAME+=	${GIT_UPLOAD_VERSION}:upload
-CONFIGURE_ARGS+=--add-module=${WRKSRC_upload}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
-NGINX_UPLOADPROGRESS_VERSION=	afb2d31
-GH_ACCOUNT+=	masterzen:uploadprogress
-GH_PROJECT+=	nginx-upload-progress-module:uploadprogress
-GH_TAGNAME+=	${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_UPSTREAM_CHECK}
-# WWW: https://github.com/yaoweibin/nginx_upstream_check_module
-NGINX_UPSTREAM_CHECK_VERSION=	9aecf15
-GH_ACCOUNT+=	yaoweibin:upstreamcheck
-GH_PROJECT+=	nginx_upstream_check_module:upstreamcheck
-GH_TAGNAME+=	${NGINX_UPSTREAM_CHECK_VERSION}:upstreamcheck
-CONFIGURE_ARGS+=--add-module=${WRKSRC_upstreamcheck}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \
-		${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \
-		${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \
-		${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \
-		${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
-NGINX_UPSTREAM_FAIR_VERSION=	b5be36f
-GH_ACCOUNT+=	cryptofuture:upstreamfair
-GH_PROJECT+=	nginx-upstream-fair:upstreamfair
-GH_TAGNAME+=	${NGINX_UPSTREAM_FAIR_VERSION}:upstreamfair
-CONFIGURE_ARGS+=--add-module=${WRKSRC_upstreamfair}
-#.if ${PORT_OPTIONS:MHTTP_UPSTREAM_CHECK}
-#EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_upstream_fair_module.c
-#.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY}
-USE_HTTP_SSL=	yes
-NGINX_UPSTREAM_STICKY_VERSION=	08a395c66e42
-MASTER_SITES+=	https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky
-DISTFILES+=	${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-${NGINX_UPSTREAM_STICKY_VERSION}/
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
-NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.9.0
-LIB_DEPENDS+=	libavformat.so:multimedia/ffmpeg \
-		libavcodec.so:multimedia/ffmpeg \
-		libavutil.so:multimedia/ffmpeg \
-		libswscale.so:multimedia/ffmpeg
-USES+=		jpeg
-GH_ACCOUNT+=	wandenberg:vte
-GH_PROJECT+=	nginx-video-thumbextractor-module:vte
-GH_TAGNAME+=	${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte
-CONFIGURE_ARGS+=--add-module=${WRKSRC_vte}
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_XSLT}
-USE_GNOME+=	libxml2 libxslt
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--with-http_xslt_module=dynamic
-.else
-CONFIGURE_ARGS+=--with-http_xslt_module
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_ZIP}
-NGINX_ZIP_VERSION=	74ef235
-GH_ACCOUNT+=	anthonyryan1:mod_zip
-GH_PROJECT+=	mod_zip:mod_zip
-GH_TAGNAME+=	${NGINX_ZIP_VERSION}:mod_zip
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
-.endif
-
-.if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=	libdrizzle.so:databases/libdrizzle
-CONFIGURE_ENV+=	"LIBDRIZZLE_INC=${LOCALBASE}/include"
-CONFIGURE_ENV+=	"LIBDRIZZLE_LIB=${LOCALBASE}/lib"
-NGINX_DRIZZLE_VERSION=	0.1.10
-GH_ACCOUNT+=	openresty:drizzle
-GH_PROJECT+=	drizzle-nginx-module:drizzle
-GH_TAGNAME+=	v${NGINX_DRIZZLE_VERSION}:drizzle
-CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
-.endif
-
-.if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM}
-NGINX_DYNAMIC_UPSTREAM_VERSION=	0.1.6
-GH_ACCOUNT+=	cubicdaiya:dyn_upstream
-GH_PROJECT+=	ngx_dynamic_upstream:dyn_upstream
-GH_TAGNAME+=	v${NGINX_DYNAMIC_UPSTREAM_VERSION}:dyn_upstream
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_dyn_upstream}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_dyn_upstream}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
-NGINX_DEVEL_KIT_VERSION=	0.3.0
-GH_ACCOUNT+=	simpl:devel_kit
-GH_PROJECT+=	ngx_devel_kit:devel_kit
-GH_TAGNAME+=	v${NGINX_DEVEL_KIT_VERSION}:devel_kit
-CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit}
-.endif
-
-.if ${PORT_OPTIONS:MENCRYPTSESSION}
-NGINX_ENCRYPTSESSION_VERSION=	0.07
-GH_ACCOUNT+=	openresty:encryptsession
-GH_PROJECT+=	encrypted-session-nginx-module:encryptsession
-GH_TAGNAME+=	v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession
-CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession}
-.endif
-
-.if ${PORT_OPTIONS:MGRIDFS}
-NGINX_GRIDFS_VERSION=	0.8
-MONGO_C_DRIVER_VERSION=		0.3.1
-GH_ACCOUNT+=	mdirolf:gridfs mongodb:mongo_c
-GH_PROJECT+=	nginx-gridfs:gridfs mongo-c-driver:mongo_c
-GH_TAGNAME+=	v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c
-CONFIGURE_ARGS+=--add-module=${WRKSRC_gridfs}
-.endif
-
-.if ${PORT_OPTIONS:MLET}
-NGINX_LET_VERSION=	0.0.4
-GH_ACCOUNT+=	arut:let
-GH_PROJECT+=	nginx-let-module:let
-GH_TAGNAME+=	v${NGINX_LET_VERSION}:let
-CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
-CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
-CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
-NGINX_LUA_VERSION=	0.10.11
-GH_ACCOUNT+=	openresty:lua
-GH_PROJECT+=	lua-nginx-module:lua
-GH_TAGNAME+=	v${NGINX_LUA_VERSION}:lua
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_lua}
-.else
-CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MMEMC}
-NGINX_MEMC_VERSION=	0.18
-GH_ACCOUNT+=	openresty:memc
-GH_PROJECT+=	memc-nginx-module:memc
-GH_TAGNAME+=	v${NGINX_MEMC_VERSION}:memc
-.if ${PORT_OPTIONS:MDSO}
-CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_memc}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804222135.w3MLZqP3018537>