Add set-misc-nginx third-party module.

Remove DEVEL_KIT_MODULE from OPTIONS, because the devel_kit module
is used as a toolkit for other modules.

Add internal USE_NGINX_DEVEL_KIT variable.

Cleanup whitespaces.

Do not bump PORTREVISION because these modules disabled by default.

Feature safe:	yes

PR:		163148 (mostly)

3 files changed, 40 insertions, 16 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 2b02f9ed0a9c..3fb253068714 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -73,13 +73,13 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		CHUNKIN_MODULE		"3rd party chunkin module" off \
-		DEVEL_KIT_MODULE	"3rd party devel_kit module" off \
 		GRIDFS_MODULE		"3rd party gridfs module" off \
 		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
 		POSTGRES_MODULE		"3rd party postgresql module" off \
 		REDIS2_MODULE		"3rd party redis2 module" off \
+		SET_MISC_MODULE		"3rd party set_misc module" off \
 		SLOWFS_CACHE_MODULE	"3rd party slowfs_cache module" off \
 		SRCACHE_MODULE		"3rd party srcache module" off \
 		SUPERVISORD_MODULE	"3rd party supervisord module" off \
@@ -421,15 +421,6 @@ DISTFILES+=	agentzh-chunkin-nginx-module-v${NGINX_CHUNKIN_MODULE_VERSION}-${GIT_
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-chunkin-nginx-module-${GIT_CHUNKIN_MODULE_VERSION:S/^0-g//}
 .endif
 
-.if defined(WITH_DEVEL_KIT_MODULE)
-NGINX_DEVEL_KIT_MODULE_VERSION=	0.2.17
-GIT_DEVEL_KIT_MODULE_VERSION=	0-gbc97eea
-FETCH_ARGS=	-pRr
-MASTER_SITES+=	https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_MODULE_VERSION}/:devel_kit
-DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_MODULE_VERSION}-${GIT_DEVEL_KIT_MODULE_VERSION}.tar.gz:devel_kit
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_MODULE_VERSION:S/^0-g//}
-.endif
-
 .if defined(WITH_GRIDFS_MODULE)
 NGINX_GRIDFS_MODULE_VERSION=	0.8
 GIT_GRIDFS_MODULE_VERSION=	0-gb5f8113
@@ -444,9 +435,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_
 .endif
 
 .if defined(WITH_LUA_MODULE)
-.if !defined(WITH_DEVEL_KIT_MODULE)
-BROKEN=		for lua module build devel_kit also should be defined
-.endif
+USE_NGINX_DEVEL_KIT=	yes
 USE_LUA=	5.1+
 NGINX_LUA_MODULE_VERSION=	0.3.0
 GIT_LUA_MODULE_VERSION=	0-gdd0d4d0
@@ -505,6 +494,17 @@ DISTFILES+=	agentzh-redis2-nginx-module-v${NGINX_REDIS2_MODULE_VERSION}-${GIT_RE
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_MODULE_VERSION:S/^0-g//}
 .endif
 
+.if defined(WITH_SET_MISC_MODULE)
+USE_NGINX_DEVEL_KIT=	yes
+NGINX_SET_MISC_MODULE_VERSION=	0.22rc3
+GIT_SET_MISC_VERSION=	0-g7adef5a
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_MODULE_VERSION}/:setmisc
+DISTFILES+=	agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_MODULE_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
+.endif
+
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.6
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -543,7 +543,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_udplog_module.c
 .endif
 
 .if defined(WITH_XRID_HEADER_MODULE)
-GIT_XRID_MODULE_VERSION=        0daa3cc
+GIT_XRID_MODULE_VERSION=	0daa3cc
 FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/gabor/nginx-x-rid-header/tarball/master/:xrid
 DISTFILES+=	gabor-nginx-x-rid-header-${GIT_XRID_MODULE_VERSION}.tar.gz:xrid
@@ -591,6 +591,15 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
 USE_OPENSSL=	yes
 .endif
 
+.if defined(USE_NGINX_DEVEL_KIT)
+NGINX_DEVEL_KIT_MODULE_VERSION=	0.2.17
+GIT_DEVEL_KIT_MODULE_VERSION=	0-gbc97eea
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/simpl/ngx_devel_kit/tarball/v${NGINX_DEVEL_KIT_MODULE_VERSION}/:devel_kit
+DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_MODULE_VERSION}-${GIT_DEVEL_KIT_MODULE_VERSION}.tar.gz:devel_kit
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_MODULE_VERSION:S/^0-g//}
+.endif
+
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 .include <bsd.port.pre.mk>
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 38cec9273c4c..724ccac6d822 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -48,8 +48,6 @@ SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a11032
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
 SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803f8521c55b9c76d5c35b20e9870576478ce9152d2ecddffbf2ca
 SIZE (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 32575
-SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02
-SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
 SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c
 SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882
 SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0
@@ -64,6 +62,8 @@ SHA256 (ngx_postgres-0.8.tar.gz) = 321de5ddfe95da45550a2b1d29cfcd425ed7d7d63edb0
 SIZE (ngx_postgres-0.8.tar.gz) = 40108
 SHA256 (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 3fbc76fbf60e02e879184b28cb9e834a4bb8f10ecd073ebd3cc585c469650b1a
 SIZE (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 23458
+SHA256 (agentzh-set-misc-nginx-module-v0.22rc3-0-g7adef5a.tar.gz) = 3fab5dcd2fc653983c4295a6223ddb42283b06ac739131a45470aa084b17c402
+SIZE (agentzh-set-misc-nginx-module-v0.22rc3-0-g7adef5a.tar.gz) = 30689
 SHA256 (ngx_slowfs_cache-1.6.tar.gz) = cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
 SIZE (ngx_slowfs_cache-1.6.tar.gz) = 10972
 SHA256 (agentzh-srcache-nginx-module-v0.12-0-g362530f.tar.gz) = 05adb583377c0ae82dc99af5dcd3866407d57f6c278c621c8a48d5ec186801d4
@@ -76,3 +76,5 @@ SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3
 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
 SHA256 (agentzh-xss-nginx-module-v0.03rc3-0-g8618dd3.tar.gz) = 53d24316489344beac53bff46f30433ef483123db397e7db27459cd6131eaa39
 SIZE (agentzh-xss-nginx-module-v0.03rc3-0-g8618dd3.tar.gz) = 10016
+SHA256 (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02
+SIZE (simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz) = 64964
diff --git a/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config b/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config
new file mode 100644
index 000000000000..f032a28d37fb
--- /dev/null
+++ b/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config
@@ -0,0 +1,13 @@
+--- ../agentzh-set-misc-nginx-module-7adef5a/config.orig       2011-12-09 10:27:53.861265188 +0300
++++ ../agentzh-set-misc-nginx-module-7adef5a/config    2011-12-09 10:28:07.107259301 +0300
+@@ -1,10 +1,3 @@
+-if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
+-    echo "found ngx_devel_kit for ngx_set_misc; looks good."
+-else
+-    echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2
+-    exit 1
+-fi
+-
+ ngx_addon_name=ngx_http_set_misc_module
+ HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module"
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c"