Add one more third-party module nginx-gridfs 0.8 - module to serve content

directly from MongoDB's GridFS.

Update nginx_redis2 module from 0.7rc5 to 0.7.

Fix compile mod_zip module.

Move down CHUNKIN_MODULE in OPTIONS.

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

2 files changed, 43 insertions, 5 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index d4e935cb8f42..a735471a5b7f 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -69,8 +69,9 @@ 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 \
 		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 \
@@ -417,6 +418,19 @@ DISTFILES+=	simpl-ngx_devel_kit-v${NGINX_DEVEL_KIT_MODULE_VERSION}-${GIT_DEVEL_K
 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
+MONGO_C_DRIVER_VERSION=		0.3.1
+GIT_MONGO_C_DRIVER_VERSION=	0-g9b4b232
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/mdirolf/nginx-gridfs/tarball/v${NGINX_GRIDFS_MODULE_VERSION}/:gridfs
+MASTER_SITES+=	https://github.com/mongodb/mongo-c-driver/tarball/v${MONGO_C_DRIVER_VERSION}/:mongo_c
+DISTFILES+=	mdirolf-nginx-gridfs-v${NGINX_GRIDFS_MODULE_VERSION}-${GIT_GRIDFS_MODULE_VERSION}.tar.gz:gridfs
+DISTFILES+=	mongodb-mongo-c-driver-v${MONGO_C_DRIVER_VERSION}-${GIT_MONGO_C_DRIVER_VERSION}.tar.gz:mongo_c
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_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
@@ -471,8 +485,8 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
 .endif
 
 .if defined(WITH_REDIS2_MODULE)
-NGINX_REDIS2_MODULE_VERSION=	0.07rc5
-GIT_REDIS2_MODULE_VERSION=	0-g1e01aca
+NGINX_REDIS2_MODULE_VERSION=	0.07
+GIT_REDIS2_MODULE_VERSION=	0-g6f7fc37
 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
@@ -571,6 +585,14 @@ pre-everything::
 .endif
 	@${ECHO_MSG}
 
+post-extract:
+.if defined(WITH_GRIDFS_MODULE)
+	@${RMDIR} ${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_VERSION:S/^0-g//}/mongo-c-driver/
+	@${MV} \
+	${WRKDIR}/mongodb-mongo-c-driver-${GIT_MONGO_C_DRIVER_VERSION:S/^0-g//}/ \
+	${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_VERSION:S/^0-g//}/mongo-c-driver/
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
@@ -580,6 +602,18 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
+# linker error acquire if --std=c99 defined, add "static" to inline function
+.if defined(WITH_HTTP_ZIP_MODULE)
+	@${REINPLACE_CMD} \
+		's!^inline!static inline!' \
+		${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}/ngx_http_zip_parsers.*
+.endif
+# Respect CFLAGS by remove needless --std=c99 flag
+.if defined(WITH_GRIDFS_MODULE)
+	@${REINPLACE_CMD} \
+		's!--std=c99!-DMONGO_HAVE_STDINT!' \
+		${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_MODULE_VERSION:S/^0-g//}/config
+.endif
 .if defined(WITH_LUA_MODULE)
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!' \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index d458e74b8926..94d04eea6d8b 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -50,6 +50,10 @@ SHA256 (agentzh-chunkin-nginx-module-v0.22rc1-0-gb0a3ee3.tar.gz) = 23c41a6743803
 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
+SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033
 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
@@ -58,8 +62,8 @@ SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d3
 SIZE (passenger-3.0.7.tar.gz) = 2830376
 SHA256 (ngx_postgres-0.8.tar.gz) = 321de5ddfe95da45550a2b1d29cfcd425ed7d7d63edb0e086406486675d04283
 SIZE (ngx_postgres-0.8.tar.gz) = 40108
-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 (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 3fbc76fbf60e02e879184b28cb9e834a4bb8f10ecd073ebd3cc585c469650b1a
+SIZE (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 23458
 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