4 files changed, 54 insertions, 48 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 9f2899e2abc8..e61377d2788e 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -74,7 +74,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
 		SLOWFS_CACHE_MODULE	"3rd party slowfs_cache module" off \
 		SUPERVISORD_MODULE	"3rd party supervisord module" off \
-		SYSLOG_SUPPORT          "3rd party syslog support" off \
+		SYSLOG_SUPPORT		"3rd party syslog support" off \
 		UDPLOG_MODULE		"3rd party udplog (syslog) module" off
 
 WANT_GNOME=	yes
@@ -194,19 +194,21 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_MODUL
 .endif
 
 .if defined(WITH_ECHO_MODULE)
-NGINX_ECHO_MODULE_VERSION=	0.34
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:echo/}
-MASTER_SITE_SUBDIR+=	osa/:echo
-DISTFILES+=	ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}
+NGINX_ECHO_MODULE_VERSION=	0.36
+GIT_ECHO_MODULE_VERSION=	0-g13dd12f
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	http://download.github.com/:echo
+DISTFILES+=	agentzh-echo-nginx-module-v${NGINX_ECHO_MODULE_VERSION}-${GIT_ECHO_MODULE_VERSION}.tar.gz:echo
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-echo-nginx-module-${GIT_ECHO_MODULE_VERSION:S/^0-g//}
 .endif
 
 .if defined(WITH_HEADERS_MORE_MODULE)
-NGINX_HEADERS_MORE_MODULE_VERSION=	0.14
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:headers_more/}
-MASTER_SITE_SUBDIR+=	osa/:headers_more
-DISTFILES+=	ngx_headers_more_module-${NGINX_HEADERS_MORE_MODULE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_headers_more_module-${NGINX_HEADERS_MORE_MODULE_VERSION}
+NGINX_HEADERS_MORE_MODULE_VERSION=	0.15
+GIT_HEADERS_MORE_MODULE_VERSION=	0-g137855d
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	http://download.github.com/:headers_more
+DISTFILES+=	agentzh-headers-more-nginx-module-v${NGINX_HEADERS_MORE_MODULE_VERSION}-${GIT_HEADERS_MORE_MODULE_VERSION}.tar.gz:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_MODULE_VERSION:S/^0-g//}
 .endif
 
 .if defined(WITH_HTTP_DAV_MODULE)
@@ -313,8 +315,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_MODULE
 
 .if defined(WITH_HTTP_SUBS_FILTER_MODULE)
 NGINX_HTTP_SUBS_FILTER_MODULE_VERSION=	0.5.2.r45
-MASTER_SITES+=  ${MASTER_SITE_LOCAL:S/$/:subs_filter/}
-MASTER_SITE_SUBDIR+=    osa/:subs_filter
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:subs_filter/}
+MASTER_SITE_SUBDIR+=	osa/:subs_filter
 DISTFILES+=	ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}.tar.gz:subs_filter
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}
 .endif
@@ -388,11 +390,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .endif
 
 .if defined(WITH_MEMC_MODULE)
-NGINX_MEMC_MODULE_VERSION=	0.11
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:memc/}
-MASTER_SITE_SUBDIR+=	osa/:memc
-DISTFILES+=	ngx_http_memc_module-${NGINX_MEMC_MODULE_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_memc_module-${NGINX_MEMC_MODULE_VERSION}
+NGINX_MEMC_MODULE_VERSION=	0.12
+GIT_MEMC_MODULE_VERSION=	0-g4f1952c
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	http://download.github.com/:memc
+DISTFILES+=	agentzh-memc-nginx-module-v${NGINX_MEMC_MODULE_VERSION}-${GIT_MEMC_MODULE_VERSION}.tar.gz:echo
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_MODULE_VERSION:S/^0-g//}
 .endif
 
 .if defined(WITHOUT_HTTP_REWRITE_MODULE) || defined(WITHOUT_PCRE)
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index d4c24336708e..8bae45e43985 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -10,10 +10,10 @@ SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230c
 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
 SHA256 (ngx_cache_purge-1.3.tar.gz) = 256eec780f0f8f09ed10d5b0e4c3c32883a55d96e814fa0390b880d20745fcdb
 SIZE (ngx_cache_purge-1.3.tar.gz) = 6434
-SHA256 (ngx_echo_module-0.34.tar.gz) = e9c73f1d88fd57c6164bdada8d691828ac2e641abcf37a56ec9bf10ea6fd327f
-SIZE (ngx_echo_module-0.34.tar.gz) = 119654
-SHA256 (ngx_headers_more_module-0.14.tar.gz) = e7fb6743e85927097e063cd9015c381787d7256e56b265606b50bb42eca194c2
-SIZE (ngx_headers_more_module-0.14.tar.gz) = 25253
+SHA256 (agentzh-echo-nginx-module-v0.36-0-g13dd12f.tar.gz) = 04745fd3de81d350b3c8b3e6af1cddc51ebd903d848438d40c44de021f422745
+SIZE (agentzh-echo-nginx-module-v0.36-0-g13dd12f.tar.gz) = 63722
+SHA256 (agentzh-headers-more-nginx-module-v0.15-0-g137855d.tar.gz) = d5ada29c15ff112c39599e3b245450ef785bb096c6724ecd8eaf1699b06e10e2
+SIZE (agentzh-headers-more-nginx-module-v0.15-0-g137855d.tar.gz) = 22738
 SHA256 (nginx_eval_module-1.0.1.tar.gz) = f11ba0bf445f0eafd999d52817e298b1f1b09817f74b6120ed491e611d53c798
 SIZE (nginx_eval_module-1.0.1.tar.gz) = 4974
 SHA256 (ngx-fancyindex-0.3.1.tar.gz) = 877e383c6bc06be92abb88f5ac251a165b63feb5f4828d52a554efc19a3f7c7d
@@ -46,8 +46,8 @@ 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 (ngx_http_memc_module-0.11.tar.gz) = 9ece68bdae2c170fb845c1082da6502401763ffd3e4b443226ff9303df65951f
-SIZE (ngx_http_memc_module-0.11.tar.gz) = 98042
+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 (ngx_slowfs_cache-1.6.tar.gz) = cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index e66ee7d37381..929b4a3a3404 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -73,7 +73,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		PASSENGER_MODULE	"3rd party passenger module" off \
 		SLOWFS_CACHE_MODULE	"3rd party slowfs_cache module" off \
 		SUPERVISORD_MODULE	"3rd party supervisord module" off \
-		SYSLOG_SUPPORT          "3rd party syslog support" off \
+		SYSLOG_SUPPORT		"3rd party syslog support" off \
 		UDPLOG_MODULE		"3rd party udplog (syslog) module" off
 
 WANT_GNOME=	yes
@@ -193,19 +193,21 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_MODUL
 .endif
 
 .if defined(WITH_ECHO_MODULE)
-NGINX_ECHO_MODULE_VERSION=	0.34
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:echo/}
-MASTER_SITE_SUBDIR+=	osa/:echo
-DISTFILES+=	ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}
+NGINX_ECHO_MODULE_VERSION=	0.36
+GIT_ECHO_MODULE_VERSION=	0-g13dd12f
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	http://download.github.com/:echo
+DISTFILES+=	agentzh-echo-nginx-module-v${NGINX_ECHO_MODULE_VERSION}-${GIT_ECHO_MODULE_VERSION}.tar.gz:echo
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-echo-nginx-module-${GIT_ECHO_MODULE_VERSION:S/^0-g//}
 .endif
 
 .if defined(WITH_HEADERS_MORE_MODULE)
-NGINX_HEADERS_MORE_MODULE_VERSION=	0.14
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:headers_more/}
-MASTER_SITE_SUBDIR+=	osa/:headers_more
-DISTFILES+=	ngx_headers_more_module-${NGINX_HEADERS_MORE_MODULE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_headers_more_module-${NGINX_HEADERS_MORE_MODULE_VERSION}
+NGINX_HEADERS_MORE_MODULE_VERSION=	0.15
+GIT_HEADERS_MORE_MODULE_VERSION=	0-g137855d
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	http://download.github.com/:headers_more
+DISTFILES+=	agentzh-headers-more-nginx-module-v${NGINX_HEADERS_MORE_MODULE_VERSION}-${GIT_HEADERS_MORE_MODULE_VERSION}.tar.gz:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_MODULE_VERSION:S/^0-g//}
 .endif
 
 .if defined(WITH_HTTP_DAV_MODULE)
@@ -312,8 +314,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_MODULE
 
 .if defined(WITH_HTTP_SUBS_FILTER_MODULE)
 NGINX_HTTP_SUBS_FILTER_MODULE_VERSION=	0.5.2.r45
-MASTER_SITES+=  ${MASTER_SITE_LOCAL:S/$/:subs_filter/}
-MASTER_SITE_SUBDIR+=    osa/:subs_filter
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:subs_filter/}
+MASTER_SITE_SUBDIR+=	osa/:subs_filter
 DISTFILES+=	ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}.tar.gz:subs_filter
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_subs_filter_module-${NGINX_HTTP_SUBS_FILTER_MODULE_VERSION}
 .endif
@@ -387,11 +389,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_MODULE_VERSION}
 .endif
 
 .if defined(WITH_MEMC_MODULE)
-NGINX_MEMC_MODULE_VERSION=	0.11
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:memc/}
-MASTER_SITE_SUBDIR+=	osa/:memc
-DISTFILES+=	ngx_http_memc_module-${NGINX_MEMC_MODULE_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_memc_module-${NGINX_MEMC_MODULE_VERSION}
+NGINX_MEMC_MODULE_VERSION=	0.12
+GIT_MEMC_MODULE_VERSION=	0-g4f1952c
+FETCH_ARGS=	-pRr
+MASTER_SITES+=	http://download.github.com/:memc
+DISTFILES+=	agentzh-memc-nginx-module-v${NGINX_MEMC_MODULE_VERSION}-${GIT_MEMC_MODULE_VERSION}.tar.gz:echo
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_MODULE_VERSION:S/^0-g//}
 .endif
 
 .if defined(WITHOUT_HTTP_REWRITE_MODULE) || defined(WITHOUT_PCRE)
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index d4c24336708e..8bae45e43985 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -10,10 +10,10 @@ SHA256 (ngx_http_auth_request_module-0.2.tar.gz) = eea5d0ec02bba93d0b204a034230c
 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736
 SHA256 (ngx_cache_purge-1.3.tar.gz) = 256eec780f0f8f09ed10d5b0e4c3c32883a55d96e814fa0390b880d20745fcdb
 SIZE (ngx_cache_purge-1.3.tar.gz) = 6434
-SHA256 (ngx_echo_module-0.34.tar.gz) = e9c73f1d88fd57c6164bdada8d691828ac2e641abcf37a56ec9bf10ea6fd327f
-SIZE (ngx_echo_module-0.34.tar.gz) = 119654
-SHA256 (ngx_headers_more_module-0.14.tar.gz) = e7fb6743e85927097e063cd9015c381787d7256e56b265606b50bb42eca194c2
-SIZE (ngx_headers_more_module-0.14.tar.gz) = 25253
+SHA256 (agentzh-echo-nginx-module-v0.36-0-g13dd12f.tar.gz) = 04745fd3de81d350b3c8b3e6af1cddc51ebd903d848438d40c44de021f422745
+SIZE (agentzh-echo-nginx-module-v0.36-0-g13dd12f.tar.gz) = 63722
+SHA256 (agentzh-headers-more-nginx-module-v0.15-0-g137855d.tar.gz) = d5ada29c15ff112c39599e3b245450ef785bb096c6724ecd8eaf1699b06e10e2
+SIZE (agentzh-headers-more-nginx-module-v0.15-0-g137855d.tar.gz) = 22738
 SHA256 (nginx_eval_module-1.0.1.tar.gz) = f11ba0bf445f0eafd999d52817e298b1f1b09817f74b6120ed491e611d53c798
 SIZE (nginx_eval_module-1.0.1.tar.gz) = 4974
 SHA256 (ngx-fancyindex-0.3.1.tar.gz) = 877e383c6bc06be92abb88f5ac251a165b63feb5f4828d52a554efc19a3f7c7d
@@ -46,8 +46,8 @@ 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 (ngx_http_memc_module-0.11.tar.gz) = 9ece68bdae2c170fb845c1082da6502401763ffd3e4b443226ff9303df65951f
-SIZE (ngx_http_memc_module-0.11.tar.gz) = 98042
+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 (ngx_slowfs_cache-1.6.tar.gz) = cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc