Multiple third-party modules as well as repos have been moved from agentzh and chaoslawful

to openresty and renamed accordingly.

Do not dump PORTREVISION.

PR:	190074

6 files changed, 128 insertions, 128 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index bc2e0ab7a242..8643b6381fcc 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -334,17 +334,17 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_ctpp2-${NGINX_CTPP2_VERSION}
 .if ${PORT_OPTIONS:MECHO}
 NGINX_ECHO_VERSION=	0.51
 GIT_ECHO_VERSION=	0-g44c92a5
-MASTER_SITES+=	https://github.com/agentzh/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
-DISTFILES+=	agentzh-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
+DISTFILES+=	openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MHEADERS_MORE}
 NGINX_HEADERS_MORE_VERSION=	0.25
 GIT_HEADERS_MORE_VERSION=	0-g0c6e05d
-MASTER_SITES+=	https://github.com/agentzh/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
-DISTFILES+=	agentzh-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
+DISTFILES+=	openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
@@ -572,9 +572,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSI
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
 NGINX_ENCRYPTSESSION_VERSION=	0.03
 GIT_ENCRYPTSESSION_VERSION=	0-g49d741b
-MASTER_SITES+=	https://github.com/agentzh/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
-DISTFILES+=	agentzh-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
+DISTFILES+=	openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MGRIDFS}
@@ -603,17 +603,17 @@ CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	0.9.4
 GIT_LUA_VERSION=	0-g6169a19
-MASTER_SITES+=	https://github.com/chaoslawful/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua
-DISTFILES+=	chaoslawful-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua
+DISTFILES+=	openresty-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
 NGINX_MEMC_VERSION=	0.14
 GIT_MEMC_VERSION=	0-gde4cf86
-MASTER_SITES+=	https://github.com/agentzh/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
-DISTFILES+=	agentzh-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
+DISTFILES+=	openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
@@ -670,25 +670,25 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
 .if ${PORT_OPTIONS:MRDS_CSV}
 NGINX_RDS_CSV_VERSION=	0.05
 GIT_RDS_CSV_VERSION=	0-g607e26b
-MASTER_SITES+=	https://github.com/agentzh/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
-DISTFILES+=	agentzh-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
+DISTFILES+=	openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MRDS_JSON}
 NGINX_RDS_JSON_VERSION=	0.13
 GIT_RDS_JSON_VERSION=	0-g8292070
-MASTER_SITES+=	https://github.com/agentzh/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
-DISTFILES+=	agentzh-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
+DISTFILES+=	openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MREDIS2}
 NGINX_REDIS2_VERSION=	0.10
 GIT_REDIS2_VERSION=	0-g78a7622
-MASTER_SITES+=	https://github.com/agentzh/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
-DISTFILES+=	agentzh-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
+DISTFILES+=	openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
@@ -701,10 +701,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION}
 .if ${PORT_OPTIONS:MSET_MISC}
 NGINX_SET_MISC_VERSION=	0.24
 GIT_SET_MISC_VERSION=	0-g36fd035
-MASTER_SITES+=	https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
-DISTFILES+=	agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_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
+MASTER_SITES+=	https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
+DISTFILES+=	openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MSFLOW}
@@ -726,9 +726,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 .if ${PORT_OPTIONS:MSRCACHE}
 NGINX_SRCACHE_VERSION=	0.25
 GIT_SRCACHE_VERSION=	0-gf25fe90
-MASTER_SITES+=	https://github.com/agentzh/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
-DISTFILES+=	agentzh-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
+DISTFILES+=	openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MSUPERVISORD}
@@ -772,9 +772,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/gabor-nginx-x-rid-header-${GIT_XRID_VERSI
 .if ${PORT_OPTIONS:MXSS}
 NGINX_XSS_VERSION=	0.04
 GIT_XSS_VERSION=	0-g7e37038
-MASTER_SITES+=	https://github.com/agentzh/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
-DISTFILES+=	agentzh-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
+DISTFILES+=	openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MSPDY}
@@ -819,9 +819,9 @@ CONFIGURE_ARGS+=--with-http_ssl_module
 .if ${PORT_OPTIONS:MARRAYVAR}
 NGINX_ARRAYVAR_VERSION=	0.03
 GIT_ARRAYVAR_VERSION=	0-g4676747
-MASTER_SITES+=	https://github.com/agentzh/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
-DISTFILES+=	agentzh-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
+DISTFILES+=	openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MFORMINPUT}
@@ -933,7 +933,7 @@ post-patch:
 .endif
 .if ${PORT_OPTIONS:MLUA}
 	@${REINPLACE_CMD} '464d' \
-		${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c
+		${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c
 .endif
 .endif
 .if ${PORT_OPTIONS:MSUPERVISORD}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 6631c0e559ae..5c61b9f4c773 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -14,10 +14,10 @@ SHA256 (ngx_cache_purge-2.1.tar.gz) = 424005af0c04e59ffa65a65e446081d4f95ee76a80
 SIZE (ngx_cache_purge-2.1.tar.gz) = 10535
 SHA256 (ngx_ctpp2-0.5.tar.gz) = f8adfecc23e2c23af95df8549ef92fd52598b21506a9d9df2278b2605668d5a6
 SIZE (ngx_ctpp2-0.5.tar.gz) = 19686
-SHA256 (agentzh-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = eacf34d90e6e95421e8ccc6500c78d18e45595d60cf96a843bdc41e762e1d548
-SIZE (agentzh-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = 63455
-SHA256 (agentzh-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = 7bd16d2bcd14a44c586a5e307171e37a2dfdf1d1d5c250b4d0dd64d36afca2d8
-SIZE (agentzh-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = 27949
+SHA256 (openresty-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = d4463cc6430bfd25a86ddf4a20d34fdb84899ff9dcc158af86d1bec9ec98da5c
+SIZE (openresty-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = 63469
+SHA256 (openresty-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = e68077d6a1031aaf933373ece18ff8c21ae030798836d3334cf9925f931cb04b
+SIZE (openresty-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = 27961
 SHA256 (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = a0d6fa256e354ce48c06e1f689d26ebb2f7b75f71ce682e34ae6c29331a7fbff
 SIZE (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = 6065
 SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f
@@ -56,18 +56,18 @@ SHA256 (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 7687f119343
 SIZE (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 58730
 SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
 SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
-SHA256 (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 4485214756dc935a959efd3a2fcd750263df1719956a4ac73f96b0cee0763395
-SIZE (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8947
+SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
+SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954
 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 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
 SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
-SHA256 (chaoslawful-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = c91f0112474c6265ec766f4a11d3199047d98c5e021a96ee574016e9f58cf4ed
-SIZE (chaoslawful-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 470252
-SHA256 (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 5e8cacd7af42685794bbe121264173de4141e5746031e23f8e363ab14ccb1534
-SIZE (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37755
+SHA256 (openresty-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 4d869650d03a76d2811715aa10c962162315603b65794475be8aec682db29f4a
+SIZE (openresty-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 470182
+SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9
+SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756
 SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
@@ -76,24 +76,24 @@ SHA256 (passenger-4.0.44.tar.gz) = 201308c9d95ccbd7aa5167a22bdc4e403f90ba7a185d5
 SIZE (passenger-4.0.44.tar.gz) = 3928963
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
-SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c
-SIZE (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18423
-SHA256 (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 9e59b90d84f9bc814eba85bfcf126e3fd6406ddc771702c096a657c17354c302
-SIZE (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32965
-SHA256 (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = c2a164df07759d2a45beacc1f72316be84e9348b7ae5509723eabd2d61cb4897
-SIZE (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850
+SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f
+SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416
+SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4
+SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961
+SHA256 (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 76606bf3b548b072f8a6426033c115d013c52068f174f61d21c671435087e97d
+SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850
 SHA256 (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 48a23f879416c0d8da5795c419b94f1ffa42ee06602545f494db4d9aba646e8f
 SIZE (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 3934
 SHA256 (rtmp-nginx-module-v1.1.4.tar.gz) = 076efef9698076fa23622e093cfb3959e4d14fcd6e9dcdf0b8e6d9154c720dc9
 SIZE (rtmp-nginx-module-v1.1.4.tar.gz) = 517774
-SHA256 (agentzh-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = dd00e4c2312db6e50e3fae8620285b07618df76c229757f2878989001c5370bb
-SIZE (agentzh-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 40399
+SHA256 (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 5475877d67a952beaf0b726b96d0c9abf48ccfc27367a6bebb5738e04d054a76
+SIZE (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 40390
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
-SHA256 (agentzh-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = fccf700d63d75c821e298094008b5a436fb8a6ccb5b09f13708e96b73b8ee0fd
-SIZE (agentzh-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = 57291
+SHA256 (openresty-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = 3613c2796f4b55dcfc49a25ddcb25eef4cd1c4b240a7f0df98c20538f1f9d3e5
+SIZE (openresty-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = 57299
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
 SIZE (ngx_supervisord-1.4.tar.gz) = 19351
 SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a
@@ -102,10 +102,10 @@ SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45
 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035
 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
-SHA256 (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 3e5b1eba411e1e51bbb197d2adb2d5304cd4050dca95f506cae635e4af5e9b35
-SIZE (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10535
-SHA256 (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9670207b5a74ddbdf510b973ddbcf3e4ecd4c5fe50829b17c560ba4a30aa73f4
-SIZE (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
+SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa
+SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542
+SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442
+SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
 SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa
 SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580
 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d
diff --git a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config b/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config
index a8e01bc35f05..22c4094179c8 100644
--- a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-openresty-set-misc-nginx-module-config
@@ -1,5 +1,5 @@
---- ../agentzh-set-misc-nginx-module-36fd035/config.orig       2011-12-09 10:27:53.861265188 +0300
-+++ ../agentzh-set-misc-nginx-module-36fd035/config    2011-12-09 10:28:07.107259301 +0300
+--- ../openresty-set-misc-nginx-module-36fd035/config.orig       2011-12-09 10:27:53.861265188 +0300
++++ ../openresty-set-misc-nginx-module-36fd035/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."
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 3471204c0832..6c90d3992fbf 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -337,17 +337,17 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_ctpp2-${NGINX_CTPP2_VERSION}
 .if ${PORT_OPTIONS:MECHO}
 NGINX_ECHO_VERSION=	0.51
 GIT_ECHO_VERSION=	0-g44c92a5
-MASTER_SITES+=	https://github.com/agentzh/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
-DISTFILES+=	agentzh-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo
+DISTFILES+=	openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MHEADERS_MORE}
 NGINX_HEADERS_MORE_VERSION=	0.25
 GIT_HEADERS_MORE_VERSION=	0-g0c6e05d
-MASTER_SITES+=	https://github.com/agentzh/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
-DISTFILES+=	agentzh-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more
+DISTFILES+=	openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
@@ -575,9 +575,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/simpl-ngx_devel_kit-${GIT_DEVEL_KIT_VERSI
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
 NGINX_ENCRYPTSESSION_VERSION=	0.03
 GIT_ENCRYPTSESSION_VERSION=	0-g49d741b
-MASTER_SITES+=	https://github.com/agentzh/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
-DISTFILES+=	agentzh-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession
+DISTFILES+=	openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MGRIDFS}
@@ -606,17 +606,17 @@ CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	0.9.4
 GIT_LUA_VERSION=	0-g6169a19
-MASTER_SITES+=	https://github.com/chaoslawful/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua
-DISTFILES+=	chaoslawful-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/lua-nginx-module/tarball/v${NGINX_LUA_VERSION}/:lua
+DISTFILES+=	openresty-lua-nginx-module-v${NGINX_LUA_VERSION}-${GIT_LUA_VERSION}.tar.gz:lua
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MMEMC}
 NGINX_MEMC_VERSION=	0.14
 GIT_MEMC_VERSION=	0-gde4cf86
-MASTER_SITES+=	https://github.com/agentzh/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
-DISTFILES+=	agentzh-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc
+DISTFILES+=	openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MMODSECURITY}
@@ -672,25 +672,25 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
 .if ${PORT_OPTIONS:MRDS_CSV}
 NGINX_RDS_CSV_VERSION=	0.05
 GIT_RDS_CSV_VERSION=	0-g607e26b
-MASTER_SITES+=	https://github.com/agentzh/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
-DISTFILES+=	agentzh-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv
+DISTFILES+=	openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MRDS_JSON}
 NGINX_RDS_JSON_VERSION=	0.13
 GIT_RDS_JSON_VERSION=	0-g8292070
-MASTER_SITES+=	https://github.com/agentzh/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
-DISTFILES+=	agentzh-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson
+DISTFILES+=	openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MREDIS2}
 NGINX_REDIS2_VERSION=	0.10
 GIT_REDIS2_VERSION=	0-g78a7622
-MASTER_SITES+=	https://github.com/agentzh/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
-DISTFILES+=	agentzh-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2
+DISTFILES+=	openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
@@ -703,10 +703,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-rtmp-module-${NGINX_RTMP_VERSION}
 .if ${PORT_OPTIONS:MSET_MISC}
 NGINX_SET_MISC_VERSION=	0.24
 GIT_SET_MISC_VERSION=	0-g36fd035
-MASTER_SITES+=	https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
-DISTFILES+=	agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_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
+MASTER_SITES+=	https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
+DISTFILES+=	openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MSFLOW}
@@ -728,9 +728,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VER
 .if ${PORT_OPTIONS:MSRCACHE}
 NGINX_SRCACHE_VERSION=	0.25
 GIT_SRCACHE_VERSION=	0-gf25fe90
-MASTER_SITES+=	https://github.com/agentzh/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
-DISTFILES+=	agentzh-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache
+DISTFILES+=	openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MSUPERVISORD}
@@ -774,9 +774,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/gabor-nginx-x-rid-header-${GIT_XRID_VERSI
 .if ${PORT_OPTIONS:MXSS}
 NGINX_XSS_VERSION=	0.04
 GIT_XSS_VERSION=	0-g7e37038
-MASTER_SITES+=	https://github.com/agentzh/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
-DISTFILES+=	agentzh-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss
+DISTFILES+=	openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MSPDY}
@@ -821,9 +821,9 @@ CONFIGURE_ARGS+=--with-http_ssl_module
 .if ${PORT_OPTIONS:MARRAYVAR}
 NGINX_ARRAYVAR_VERSION=	0.03
 GIT_ARRAYVAR_VERSION=	0-g4676747
-MASTER_SITES+=	https://github.com/agentzh/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
-DISTFILES+=	agentzh-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
+MASTER_SITES+=	https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar
+DISTFILES+=	openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//}
 .endif
 
 .if ${PORT_OPTIONS:MFORMINPUT}
@@ -935,7 +935,7 @@ post-patch:
 .endif
 .if ${PORT_OPTIONS:MLUA}
 	@${REINPLACE_CMD} '464d' \
-		${WRKDIR}/chaoslawful-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c
+		${WRKDIR}/openresty-lua-nginx-module-${GIT_LUA_VERSION:S/^0-g//}/src/ngx_http_lua_socket_tcp.c
 .endif
 .endif
 .if ${PORT_OPTIONS:MSUPERVISORD}
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 77dde202eaa5..411e1567ebdd 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -16,10 +16,10 @@ SHA256 (ngx_cache_purge-2.1.tar.gz) = 424005af0c04e59ffa65a65e446081d4f95ee76a80
 SIZE (ngx_cache_purge-2.1.tar.gz) = 10535
 SHA256 (ngx_ctpp2-0.5.tar.gz) = f8adfecc23e2c23af95df8549ef92fd52598b21506a9d9df2278b2605668d5a6
 SIZE (ngx_ctpp2-0.5.tar.gz) = 19686
-SHA256 (agentzh-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = eacf34d90e6e95421e8ccc6500c78d18e45595d60cf96a843bdc41e762e1d548
-SIZE (agentzh-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = 63455
-SHA256 (agentzh-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = 7bd16d2bcd14a44c586a5e307171e37a2dfdf1d1d5c250b4d0dd64d36afca2d8
-SIZE (agentzh-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = 27949
+SHA256 (openresty-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = d4463cc6430bfd25a86ddf4a20d34fdb84899ff9dcc158af86d1bec9ec98da5c
+SIZE (openresty-echo-nginx-module-v0.51-0-g44c92a5.tar.gz) = 63469
+SHA256 (openresty-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = e68077d6a1031aaf933373ece18ff8c21ae030798836d3334cf9925f931cb04b
+SIZE (openresty-headers-more-nginx-module-v0.25-0-g0c6e05d.tar.gz) = 27961
 SHA256 (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = a0d6fa256e354ce48c06e1f689d26ebb2f7b75f71ce682e34ae6c29331a7fbff
 SIZE (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = 6065
 SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f
@@ -58,18 +58,18 @@ SHA256 (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 7687f119343
 SIZE (chaoslawful-drizzle-nginx-module-v0.1.7-0-gb83a8a9.tar.gz) = 58730
 SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7
 SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033
-SHA256 (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 4485214756dc935a959efd3a2fcd750263df1719956a4ac73f96b0cee0763395
-SIZE (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8947
+SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3
+SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954
 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 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da
 SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543
-SHA256 (chaoslawful-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = c91f0112474c6265ec766f4a11d3199047d98c5e021a96ee574016e9f58cf4ed
-SIZE (chaoslawful-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 470252
-SHA256 (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 5e8cacd7af42685794bbe121264173de4141e5746031e23f8e363ab14ccb1534
-SIZE (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37755
+SHA256 (openresty-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 4d869650d03a76d2811715aa10c962162315603b65794475be8aec682db29f4a
+SIZE (openresty-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 470182
+SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9
+SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756
 SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2
 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387
 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef
@@ -78,24 +78,24 @@ SHA256 (passenger-4.0.44.tar.gz) = 201308c9d95ccbd7aa5167a22bdc4e403f90ba7a185d5
 SIZE (passenger-4.0.44.tar.gz) = 3928963
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
-SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c
-SIZE (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18423
-SHA256 (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 9e59b90d84f9bc814eba85bfcf126e3fd6406ddc771702c096a657c17354c302
-SIZE (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32965
-SHA256 (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = c2a164df07759d2a45beacc1f72316be84e9348b7ae5509723eabd2d61cb4897
-SIZE (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850
+SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f
+SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416
+SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4
+SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961
+SHA256 (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 76606bf3b548b072f8a6426033c115d013c52068f174f61d21c671435087e97d
+SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850
 SHA256 (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 48a23f879416c0d8da5795c419b94f1ffa42ee06602545f494db4d9aba646e8f
 SIZE (alibaba-nginx-footer-filter-1.2.2-0-g3572184.tar.gz) = 3934
 SHA256 (rtmp-nginx-module-v1.1.4.tar.gz) = 076efef9698076fa23622e093cfb3959e4d14fcd6e9dcdf0b8e6d9154c720dc9
 SIZE (rtmp-nginx-module-v1.1.4.tar.gz) = 517774
-SHA256 (agentzh-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = dd00e4c2312db6e50e3fae8620285b07618df76c229757f2878989001c5370bb
-SIZE (agentzh-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 40399
+SHA256 (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 5475877d67a952beaf0b726b96d0c9abf48ccfc27367a6bebb5738e04d054a76
+SIZE (openresty-set-misc-nginx-module-v0.24-0-g36fd035.tar.gz) = 40390
 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76
 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
-SHA256 (agentzh-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = fccf700d63d75c821e298094008b5a436fb8a6ccb5b09f13708e96b73b8ee0fd
-SIZE (agentzh-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = 57291
+SHA256 (openresty-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = 3613c2796f4b55dcfc49a25ddcb25eef4cd1c4b240a7f0df98c20538f1f9d3e5
+SIZE (openresty-srcache-nginx-module-v0.25-0-gf25fe90.tar.gz) = 57299
 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b
 SIZE (ngx_supervisord-1.4.tar.gz) = 19351
 SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a
@@ -104,10 +104,10 @@ SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45
 SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284
 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035
 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714
-SHA256 (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 3e5b1eba411e1e51bbb197d2adb2d5304cd4050dca95f506cae635e4af5e9b35
-SIZE (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10535
-SHA256 (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9670207b5a74ddbdf510b973ddbcf3e4ecd4c5fe50829b17c560ba4a30aa73f4
-SIZE (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
+SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa
+SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542
+SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442
+SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518
 SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa
 SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580
 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d
diff --git a/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config b/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config
index a8e01bc35f05..22c4094179c8 100644
--- a/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config
+++ b/www/nginx/files/extra-patch-openresty-set-misc-nginx-module-config
@@ -1,5 +1,5 @@
---- ../agentzh-set-misc-nginx-module-36fd035/config.orig       2011-12-09 10:27:53.861265188 +0300
-+++ ../agentzh-set-misc-nginx-module-36fd035/config    2011-12-09 10:28:07.107259301 +0300
+--- ../openresty-set-misc-nginx-module-36fd035/config.orig       2011-12-09 10:27:53.861265188 +0300
++++ ../openresty-set-misc-nginx-module-36fd035/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."