Add three new third-party modules:

o) drizzle -  an upstream module that talks to mysql and drizzle by libdrizzle;
o) rds_csv -  an output filter module to convert Resty-DBD-Streams (RDS) to
   Comma-Separated Values (CSV);
o) rds_json - an output filter that formats Resty DBD Streams generated by
   ngx_drizzle and others to JSON.

Do not bump PORTREVISION because these modules disabled by default.

6 files changed, 124 insertions, 0 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 0c3f8013c887..24b5997c2d27 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -71,12 +71,15 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_UPSTREAM_HASH	"3rd party upstream hash module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
 		CHUNKIN_MODULE		"3rd party chunkin module" off \
+		DRIZZLE_MODULE		"3rd party drizzlie module" off \
 		GRIDFS_MODULE		"3rd party gridfs module" off \
 		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		NAXSI_MODULE		"3rd party naxsi module" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
 		POSTGRES_MODULE		"3rd party postgresql module" off \
+		RDS_CSV_MODULE		"3rd party rds_csv module" off \
+		RDS_JSON_MODULE		"3rd party rds_json 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 \
@@ -414,6 +417,17 @@ 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_DRIZZLE_MODULE)
+LIB_DEPENDS+=	drizzle.0:${PORTSDIR}/databases/drizzle
+NGINX_DRIZZLE_MODULE_VERSION=	0.1.2rc4
+GIT_DRIZZLE_MODULE_VERSION=	0-g46b744a
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_MODULE_VERSION}/:drizzle
+DISTFILES+=	chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_MODULE_VERSION}-${GIT_DRIZZLE_MODULE_VERSION}.tar.gz:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_MODULE_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
+.endif
+
 .if defined(WITH_GRIDFS_MODULE)
 NGINX_GRIDFS_MODULE_VERSION=	0.8
 GIT_GRIDFS_MODULE_VERSION=	0-gb5f8113
@@ -487,6 +501,24 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_MODULE_VERS
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
 .endif
 
+.if defined(WITH_RDS_CSV_MODULE)
+NGINX_RDS_CSV_MODULE_VERSION=	0.04
+GIT_RDS_CSV_MODULE_VERSION=	0-g4cd999b
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_MODULE_VERSION}/:rdscsv
+DISTFILES+=	agentzh-rds-csv-nginx-module-v${NGINX_RDS_CSV_MODULE_VERSION}-${GIT_RDS_CSV_MODULE_VERSION}.tar.gz:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-csv-nginx-module-${GIT_RDS_CSV_MODULE_VERSION:S/^0-g//}
+.endif
+
+.if defined(WITH_RDS_JSON_MODULE)
+NGINX_RDS_JSON_MODULE_VERSION=	0.12rc7
+GIT_RDS_JSON_MODULE_VERSION=	0-g253db2b
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_MODULE_VERSION}/:rdsjson
+DISTFILES+=	agentzh-rds-json-nginx-module-v${NGINX_RDS_JSON_MODULE_VERSION}-${GIT_RDS_JSON_MODULE_VERSION}.tar.gz:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-json-nginx-module-${GIT_RDS_JSON_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_REDIS2_MODULE)
 NGINX_REDIS2_MODULE_VERSION=	0.07
 GIT_REDIS2_MODULE_VERSION=	0-g6f7fc37
@@ -639,6 +671,11 @@ post-patch:
 		's!^inline!static inline!' \
 		${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}/ngx_http_zip_parsers.*
 .endif
+.if defined(WITH_DRIZZLE_MODULE)
+	@${REINPLACE_CMD} \
+		's!%%PREFIX%%!${PREFIX}!' \
+		${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_MODULE_VERSION:S/^0-g//}/config
+.endif
 # Respect CFLAGS by remove needless --std=c99 flag
 .if defined(WITH_GRIDFS_MODULE)
 	@${REINPLACE_CMD} \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 8edb93a8fb87..bd262bb07d1f 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -46,6 +46,8 @@ 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 (chaoslawful-drizzle-nginx-module-v0.1.2rc4-0-g46b744a.tar.gz) = 7260be8d69e1f3990061bc4ce8afbfa8150ddd74c4f3e77c405630adec2c529d
+SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc4-0-g46b744a.tar.gz) = 61019
 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
@@ -60,6 +62,10 @@ SHA256 (passenger-3.0.11.tar.gz) = 7bbabfafb9d7f4e1beb6a231dea1fe68d540910ceafec
 SIZE (passenger-3.0.11.tar.gz) = 2378398
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
+SHA256 (agentzh-rds-csv-nginx-module-v0.04-0-g4cd999b.tar.gz) = 59f84d343ab562013ef2198ac8e5eae7bf3c7de3581bc64403711a230c584f25
+SIZE (agentzh-rds-csv-nginx-module-v0.04-0-g4cd999b.tar.gz) = 18311
+SHA256 (agentzh-rds-json-nginx-module-v0.12rc7-0-g253db2b.tar.gz) = 2b3eba099d9c99b1107962561724a27d1978df5948821cc7f31573b1abe626f1
+SIZE (agentzh-rds-json-nginx-module-v0.12rc7-0-g253db2b.tar.gz) = 31835
 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
diff --git a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
new file mode 100644
index 000000000000..9dea1b620155
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
@@ -0,0 +1,19 @@
+--- ../chaoslawful-drizzle-nginx-module-46b744a/config.orig	2011-12-30 10:26:53.000000000 +0400
++++ ../chaoslawful-drizzle-nginx-module-46b744a/config	2011-12-30 10:28:20.000000000 +0400
+@@ -22,12 +22,12 @@
+ 
+     if [ $ngx_found = no ]; then
+         # FreeBSD, OpenBSD
+-        ngx_feature="libdrizzle library in /usr/local/"
+-        ngx_feature_path="/usr/local/include/libdrizzle-1.0"
++        ngx_feature="libdrizzle library in %%PREFIX%%"
++        ngx_feature_path="%%PREFIX%%/include/libdrizzle"
+         if [ $NGX_RPATH = YES ]; then
+-            ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
++            ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle"
+         else
+-            ngx_feature_libs="-L/usr/local/lib -ldrizzle"
++            ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle"
+         fi
+         . auto/feature
+     fi
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 885d1923cc91..50a8b278dd58 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -72,12 +72,15 @@ 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 \
+		DRIZZLE_MODULE		"3rd party drizzlie module" off \
 		GRIDFS_MODULE		"3rd party gridfs module" off \
 		LUA_MODULE		"3rd party lua module" off \
 		MEMC_MODULE		"3rd party memc (memcached) module" off \
 		NAXSI_MODULE		"3rd party naxsi module" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
 		POSTGRES_MODULE		"3rd party postgresql module" off \
+		RDS_CSV_MODULE		"3rd party rds_csv module" off \
+		RDS_JSON_MODULE		"3rd party rds_json 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 \
@@ -422,6 +425,17 @@ 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_DRIZZLE_MODULE)
+LIB_DEPENDS+=	drizzle.0:${PORTSDIR}/databases/drizzle
+NGINX_DRIZZLE_MODULE_VERSION=	0.1.2rc4
+GIT_DRIZZLE_MODULE_VERSION=	0-g46b744a
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_MODULE_VERSION}/:drizzle
+DISTFILES+=	chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_MODULE_VERSION}-${GIT_DRIZZLE_MODULE_VERSION}.tar.gz:drizzle
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_MODULE_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
+.endif
+
 .if defined(WITH_GRIDFS_MODULE)
 NGINX_GRIDFS_MODULE_VERSION=	0.8
 GIT_GRIDFS_MODULE_VERSION=	0-gb5f8113
@@ -495,6 +509,24 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_MODULE_VERS
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
 .endif
 
+.if defined(WITH_RDS_CSV_MODULE)
+NGINX_RDS_CSV_MODULE_VERSION=	0.04
+GIT_RDS_CSV_MODULE_VERSION=	0-g4cd999b
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_MODULE_VERSION}/:rdscsv
+DISTFILES+=	agentzh-rds-csv-nginx-module-v${NGINX_RDS_CSV_MODULE_VERSION}-${GIT_RDS_CSV_MODULE_VERSION}.tar.gz:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-csv-nginx-module-${GIT_RDS_CSV_MODULE_VERSION:S/^0-g//}
+.endif
+
+.if defined(WITH_RDS_JSON_MODULE)
+NGINX_RDS_JSON_MODULE_VERSION=	0.12rc7
+GIT_RDS_JSON_MODULE_VERSION=	0-g253db2b
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	https://github.com/agentzh/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_MODULE_VERSION}/:rdsjson
+DISTFILES+=	agentzh-rds-json-nginx-module-v${NGINX_RDS_JSON_MODULE_VERSION}-${GIT_RDS_JSON_MODULE_VERSION}.tar.gz:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-json-nginx-module-${GIT_RDS_JSON_MODULE_VERSION:S/^0-g//}
+.endif
+
 .if defined(WITH_REDIS2_MODULE)
 NGINX_REDIS2_MODULE_VERSION=	0.07
 GIT_REDIS2_MODULE_VERSION=	0-g6f7fc37
@@ -647,6 +679,11 @@ post-patch:
 		's!^inline!static inline!' \
 		${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}/ngx_http_zip_parsers.*
 .endif
+.if defined(WITH_DRIZZLE_MODULE)
+	@${REINPLACE_CMD} \
+		's!%%PREFIX%%!${PREFIX}!' \
+		${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_MODULE_VERSION:S/^0-g//}/config
+.endif
 # Respect CFLAGS by remove needless --std=c99 flag
 .if defined(WITH_GRIDFS_MODULE)
 	@${REINPLACE_CMD} \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index a2801649f1fa..039df608abc8 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -48,6 +48,8 @@ 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 (chaoslawful-drizzle-nginx-module-v0.1.2rc4-0-g46b744a.tar.gz) = 7260be8d69e1f3990061bc4ce8afbfa8150ddd74c4f3e77c405630adec2c529d
+SIZE (chaoslawful-drizzle-nginx-module-v0.1.2rc4-0-g46b744a.tar.gz) = 61019
 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
@@ -62,6 +64,10 @@ SHA256 (passenger-3.0.11.tar.gz) = 7bbabfafb9d7f4e1beb6a231dea1fe68d540910ceafec
 SIZE (passenger-3.0.11.tar.gz) = 2378398
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
+SHA256 (agentzh-rds-csv-nginx-module-v0.04-0-g4cd999b.tar.gz) = 59f84d343ab562013ef2198ac8e5eae7bf3c7de3581bc64403711a230c584f25
+SIZE (agentzh-rds-csv-nginx-module-v0.04-0-g4cd999b.tar.gz) = 18311
+SHA256 (agentzh-rds-json-nginx-module-v0.12rc7-0-g253db2b.tar.gz) = 2b3eba099d9c99b1107962561724a27d1978df5948821cc7f31573b1abe626f1
+SIZE (agentzh-rds-json-nginx-module-v0.12rc7-0-g253db2b.tar.gz) = 31835
 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
diff --git a/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
new file mode 100644
index 000000000000..9dea1b620155
--- /dev/null
+++ b/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
@@ -0,0 +1,19 @@
+--- ../chaoslawful-drizzle-nginx-module-46b744a/config.orig	2011-12-30 10:26:53.000000000 +0400
++++ ../chaoslawful-drizzle-nginx-module-46b744a/config	2011-12-30 10:28:20.000000000 +0400
+@@ -22,12 +22,12 @@
+ 
+     if [ $ngx_found = no ]; then
+         # FreeBSD, OpenBSD
+-        ngx_feature="libdrizzle library in /usr/local/"
+-        ngx_feature_path="/usr/local/include/libdrizzle-1.0"
++        ngx_feature="libdrizzle library in %%PREFIX%%"
++        ngx_feature_path="%%PREFIX%%/include/libdrizzle"
+         if [ $NGX_RPATH = YES ]; then
+-            ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
++            ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle"
+         else
+-            ngx_feature_libs="-L/usr/local/lib -ldrizzle"
++            ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle"
+         fi
+         . auto/feature
+     fi