Add 3 third-party modules:

o) ngx_devel_kit - module that is designed to extend the core
   functionality of nginx;
o) ngx_lua - embed the power of lua into nginx;
o) ngx_redis2 - upstream module for the Redis database 2.0 protocol.

Bump PORTREVISION is unnecessary, because these modules are
disabled by default.

6 files changed, 130 insertions, 0 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 630412103189..8233af1a7322 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -70,8 +70,11 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_HASH	"3rd party upstream hash module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
+		DEVEL_KIT_MODULE	"3rd party devel_kit module" off \
+		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
+		REDIS2_MODULE		"3rd party redis2 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 \
@@ -390,6 +393,29 @@ DISTFILES+=	mod_zip-${NGINX_ZIP_MODULE_VERSION}.tar.gz:zip
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .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_LUA_MODULE)
+.if !defined(WITH_DEVEL_KIT_MODULE)
+BROKEN=		for lua module build devel_kit also should be defined
+.endif
+USE_LUA=	5.1+
+NGINX_LUA_MODULE_VERSION=	0.2.0
+GIT_LUA_MODULE_VERSION=	0-g8e7d37e
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/chaoslawful/lua-nginx-module/tarball/v${NGINX_LUA_MODULE_VERSION}/:lua
+DISTFILES+=	chaoslawful-lua-nginx-module-v${NGINX_LUA_MODULE_VERSION}-${GIT_LUA_MODULE_VERSION}.tar.gz:lua
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_MODULE_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-lua-nginx-module::config
+.endif
+
 .if defined(WITH_MEMC_MODULE)
 NGINX_MEMC_MODULE_VERSION=	0.12
 GIT_MEMC_MODULE_VERSION=	0-g4f1952c
@@ -420,6 +446,15 @@ CFLAGS+=	-DNDEBUG
 .endif
 .endif
 
+.if defined(WITH_REDIS2_MODULE)
+NGINX_REDIS2_MODULE_VERSION=	0.07rc5
+GIT_REDIS2_MODULE_VERSION=	0-g1e01aca
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/redis2-nginx-module/tarball/v${NGINX_REDIS2_MODULE_VERSION}/:redis2
+DISTFILES+=	agentzh-redis2-nginx-module-v${NGINX_REDIS2_MODULE_VERSION}-${GIT_REDIS2_MODULE_VERSION}.tar.gz:redis2
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.6
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -512,6 +547,11 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
+.if defined(WITH_LUA_MODULE)
+	@${REINPLACE_CMD} \
+		's!%%PREFIX%%!${PREFIX}!' \
+		${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_MODULE_VERSION:S/^0-g//}/config
+.endif
 .if defined(WITH_PASSENGER_MODULE)
 	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx/config
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 9378967c58c3..614aad2d74e1 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -46,10 +46,16 @@ SHA256 (ngx_http_upstream_keepalive-0.4.tar.gz) = 47c751380deba98c57747d711157ed
 SIZE (ngx_http_upstream_keepalive-0.4.tar.gz) = 8267
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
+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 (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = abdd6409962a93a38615680f7b8a340c483a80b7098dab3bcd5af47533a596c3
+SIZE (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = 94607
 SHA256 (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = e0f604e20312bbd30ac88b2d83faa54f4668e6f6227762d2fc14e1d37df0b1de
 SIZE (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = 36414
 SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
 SIZE (passenger-3.0.7.tar.gz) = 2830376
+SHA256 (agentzh-redis2-nginx-module-v0.07rc5-0-g1e01aca.tar.gz) = bfd620e32a155ea2178b7c1ce8b9c969476cf1bae119bca5a9d20d3775007335
+SIZE (agentzh-redis2-nginx-module-v0.07rc5-0-g1e01aca.tar.gz) = 22317
 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
diff --git a/www/nginx-devel/files/extra-patch-chaoslawful-lua-nginx-module::config b/www/nginx-devel/files/extra-patch-chaoslawful-lua-nginx-module::config
new file mode 100644
index 000000000000..29b7489d4db1
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-chaoslawful-lua-nginx-module::config
@@ -0,0 +1,19 @@
+--- ../chaoslawful-lua-nginx-module-8e7d37e/config.orig	2011-07-12 11:24:16.000000000 +0400
++++ ../chaoslawful-lua-nginx-module-8e7d37e/config	2011-07-12 11:26:45.000000000 +0400
+@@ -104,12 +104,12 @@
+ 
+         if [ $ngx_found = no ]; then
+             # FreeBSD
+-            ngx_feature="lua library in /usr/local/../lua51/"
+-            ngx_feature_path="/usr/local/include/lua51"
++            ngx_feature="lua library in %%PREFIX%%/lua51/"
++            ngx_feature_path="%%PREFIX%%/include/lua51"
+             if [ $NGX_RPATH = YES ]; then
+-                ngx_feature_libs="-R/usr/local/lib/lua51 -L/usr/local/lib/lua51 -llua -lm"
++                ngx_feature_libs="-R%%PREFIX%%/lib/lua51 -L%%PREFIX%%/lib/lua51 -llua -lm"
+             else
+-                ngx_feature_libs="-L/usr/local/lib/lua51 -llua -lm"
++                ngx_feature_libs="-L%%PREFIX%%/lib/lua51 -llua -lm"
+             fi
+             . auto/feature
+         fi
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 8fdb9418298b..c788f71fc7e4 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -69,8 +69,11 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_HASH	"3rd party upstream hash module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
+		DEVEL_KIT_MODULE	"3rd party devel_kit module" off \
+		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
+		REDIS2_MODULE		"3rd party redis2 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 \
@@ -389,6 +392,29 @@ DISTFILES+=	mod_zip-${NGINX_ZIP_MODULE_VERSION}.tar.gz:zip
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .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_LUA_MODULE)
+.if !defined(WITH_DEVEL_KIT_MODULE)
+BROKEN=		for lua module build devel_kit also should be defined
+.endif
+USE_LUA=	5.1+
+NGINX_LUA_MODULE_VERSION=	0.2.0
+GIT_LUA_MODULE_VERSION=	0-g8e7d37e
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/chaoslawful/lua-nginx-module/tarball/v${NGINX_LUA_MODULE_VERSION}/:lua
+DISTFILES+=	chaoslawful-lua-nginx-module-v${NGINX_LUA_MODULE_VERSION}-${GIT_LUA_MODULE_VERSION}.tar.gz:lua
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_MODULE_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-lua-nginx-module::config
+.endif
+
 .if defined(WITH_MEMC_MODULE)
 NGINX_MEMC_MODULE_VERSION=	0.12
 GIT_MEMC_MODULE_VERSION=	0-g4f1952c
@@ -419,6 +445,15 @@ CFLAGS+=	-DNDEBUG
 .endif
 .endif
 
+.if defined(WITH_REDIS2_MODULE)
+NGINX_REDIS2_MODULE_VERSION=	0.07rc5
+GIT_REDIS2_MODULE_VERSION=	0-g1e01aca
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/redis2-nginx-module/tarball/v${NGINX_REDIS2_MODULE_VERSION}/:redis2
+DISTFILES+=	agentzh-redis2-nginx-module-v${NGINX_REDIS2_MODULE_VERSION}-${GIT_REDIS2_MODULE_VERSION}.tar.gz:redis2
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_SLOWFS_CACHE_MODULE)
 NGINX_SLOWFS_CACHE_MODULE_VERSION=	1.6
 MASTER_SITES+=	http://labs.frickle.com/files/:slowfs_cache
@@ -511,6 +546,11 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
+.if defined(WITH_LUA_MODULE)
+	@${REINPLACE_CMD} \
+		's!%%PREFIX%%!${PREFIX}!' \
+		${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_MODULE_VERSION:S/^0-g//}/config
+.endif
 .if defined(WITH_PASSENGER_MODULE)
 	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx/config
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 9378967c58c3..614aad2d74e1 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -46,10 +46,16 @@ SHA256 (ngx_http_upstream_keepalive-0.4.tar.gz) = 47c751380deba98c57747d711157ed
 SIZE (ngx_http_upstream_keepalive-0.4.tar.gz) = 8267
 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1
 SIZE (mod_zip-1.1.6.tar.gz) = 21991
+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 (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = abdd6409962a93a38615680f7b8a340c483a80b7098dab3bcd5af47533a596c3
+SIZE (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = 94607
 SHA256 (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = e0f604e20312bbd30ac88b2d83faa54f4668e6f6227762d2fc14e1d37df0b1de
 SIZE (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = 36414
 SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
 SIZE (passenger-3.0.7.tar.gz) = 2830376
+SHA256 (agentzh-redis2-nginx-module-v0.07rc5-0-g1e01aca.tar.gz) = bfd620e32a155ea2178b7c1ce8b9c969476cf1bae119bca5a9d20d3775007335
+SIZE (agentzh-redis2-nginx-module-v0.07rc5-0-g1e01aca.tar.gz) = 22317
 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
diff --git a/www/nginx/files/extra-patch-chaoslawful-lua-nginx-module::config b/www/nginx/files/extra-patch-chaoslawful-lua-nginx-module::config
new file mode 100644
index 000000000000..29b7489d4db1
--- /dev/null
+++ b/www/nginx/files/extra-patch-chaoslawful-lua-nginx-module::config
@@ -0,0 +1,19 @@
+--- ../chaoslawful-lua-nginx-module-8e7d37e/config.orig	2011-07-12 11:24:16.000000000 +0400
++++ ../chaoslawful-lua-nginx-module-8e7d37e/config	2011-07-12 11:26:45.000000000 +0400
+@@ -104,12 +104,12 @@
+ 
+         if [ $ngx_found = no ]; then
+             # FreeBSD
+-            ngx_feature="lua library in /usr/local/../lua51/"
+-            ngx_feature_path="/usr/local/include/lua51"
++            ngx_feature="lua library in %%PREFIX%%/lua51/"
++            ngx_feature_path="%%PREFIX%%/include/lua51"
+             if [ $NGX_RPATH = YES ]; then
+-                ngx_feature_libs="-R/usr/local/lib/lua51 -L/usr/local/lib/lua51 -llua -lm"
++                ngx_feature_libs="-R%%PREFIX%%/lib/lua51 -L%%PREFIX%%/lib/lua51 -llua -lm"
+             else
+-                ngx_feature_libs="-L/usr/local/lib/lua51 -llua -lm"
++                ngx_feature_libs="-L%%PREFIX%%/lib/lua51 -llua -lm"
+             fi
+             . auto/feature
+         fi