Update third-party modules (openresty 1.0.15.5):

o) lua     - from 0.5.0rc27 to 0.5.0rc28;
o) rds_scv - from 0.05rc1 to 0.05rc2.

Remove needless patch.

Do not bump PORTREVISIONs because these modules are disabled by default.

6 files changed, 16 insertions, 66 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 462157bb1401..6aa08d1cb64f 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -496,13 +496,12 @@ LIB_DEPENDS+=	luajit-5.1.2:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 USE_NGINX_DEVEL_KIT=	yes
-NGINX_LUA_MODULE_VERSION=	0.5.0rc27
-GIT_LUA_MODULE_VERSION=	0-gdbe0dc4
+NGINX_LUA_MODULE_VERSION=	0.5.0rc28
+GIT_LUA_MODULE_VERSION=	0-g7a7ac79
 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)
@@ -552,8 +551,8 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
 .endif
 
 .if defined(WITH_RDS_CSV_MODULE)
-NGINX_RDS_CSV_MODULE_VERSION=	0.05rc1
-GIT_RDS_CSV_MODULE_VERSION=	0-g98c7907
+NGINX_RDS_CSV_MODULE_VERSION=	0.05rc2
+GIT_RDS_CSV_MODULE_VERSION=	0-gc15d3a4
 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
@@ -772,11 +771,6 @@ post-patch:
 		'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%%!${LOCALBASE}!g' \
-		${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 f8d19cc98126..3e98396c8fa2 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -62,8 +62,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf
 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.5.0rc27-0-gdbe0dc4.tar.gz) = e01299c1604a23e2ddc4c8bbc498c687985906d4957cccac0fb5223b8f5c8e70
-SIZE (chaoslawful-lua-nginx-module-v0.5.0rc27-0-gdbe0dc4.tar.gz) = 312188
+SHA256 (chaoslawful-lua-nginx-module-v0.5.0rc28-0-g7a7ac79.tar.gz) = 87cd0c2c5efb57128948b5ab4a49d8a3828cf5fef69aa9bae9dfdb4ddfe40ee7
+SIZE (chaoslawful-lua-nginx-module-v0.5.0rc28-0-g7a7ac79.tar.gz) = 313690
 SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c
 SIZE (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 39778
 SHA256 (naxsi-0.45.tgz) = 86faccbb18a7e2b065b0d75052cd491a737bc6511c92ac7103d27c7b48458ab0
@@ -72,8 +72,8 @@ SHA256 (passenger-3.0.12.tar.gz) = 30e069dd8a311792ecada9df2caecc2a981d1948b88a7
 SIZE (passenger-3.0.12.tar.gz) = 2368176
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
-SHA256 (agentzh-rds-csv-nginx-module-v0.05rc1-0-g98c7907.tar.gz) = a879834dfeb76795432a1e83bb81417faa1b98ee91c9428f982901248dabd040
-SIZE (agentzh-rds-csv-nginx-module-v0.05rc1-0-g98c7907.tar.gz) = 18238
+SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023
+SIZE (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 17993
 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.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2
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
deleted file mode 100644
index 67ffd001c1c6..000000000000
--- a/www/nginx-devel/files/extra-patch-chaoslawful-lua-nginx-module::config
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../chaoslawful-lua-nginx-module-dbe0dc4/config.orig	2011-07-12 11:24:16.000000000 +0400
-+++ ../chaoslawful-lua-nginx-module-dbe0dc4/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 ba9e1086fa2e..f70a7d99da54 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -497,13 +497,12 @@ LIB_DEPENDS+=	luajit-5.1.2:${PORTSDIR}/lang/luajit
 CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 USE_NGINX_DEVEL_KIT=	yes
-NGINX_LUA_MODULE_VERSION=	0.5.0rc27
-GIT_LUA_MODULE_VERSION=	0-gdbe0dc4
+NGINX_LUA_MODULE_VERSION=	0.5.0rc28
+GIT_LUA_MODULE_VERSION=	0-g7a7ac79
 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)
@@ -553,8 +552,8 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
 .endif
 
 .if defined(WITH_RDS_CSV_MODULE)
-NGINX_RDS_CSV_MODULE_VERSION=	0.05rc1
-GIT_RDS_CSV_MODULE_VERSION=	0-g98c7907
+NGINX_RDS_CSV_MODULE_VERSION=	0.05rc2
+GIT_RDS_CSV_MODULE_VERSION=	0-gc15d3a4
 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
@@ -773,11 +772,6 @@ post-patch:
 		'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%%!${LOCALBASE}!g' \
-		${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 2a40040442c4..5dcfca425cf5 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -62,8 +62,8 @@ SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf
 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.5.0rc27-0-gdbe0dc4.tar.gz) = e01299c1604a23e2ddc4c8bbc498c687985906d4957cccac0fb5223b8f5c8e70
-SIZE (chaoslawful-lua-nginx-module-v0.5.0rc27-0-gdbe0dc4.tar.gz) = 312188
+SHA256 (chaoslawful-lua-nginx-module-v0.5.0rc28-0-g7a7ac79.tar.gz) = 87cd0c2c5efb57128948b5ab4a49d8a3828cf5fef69aa9bae9dfdb4ddfe40ee7
+SIZE (chaoslawful-lua-nginx-module-v0.5.0rc28-0-g7a7ac79.tar.gz) = 313690
 SHA256 (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 8c6f7a421346be1f53240b370cd29edd833f8ca32f6f9b926d66230b15727f0c
 SIZE (agentzh-memc-nginx-module-v0.13rc3-0-g4007350.tar.gz) = 39778
 SHA256 (naxsi-0.45.tgz) = 86faccbb18a7e2b065b0d75052cd491a737bc6511c92ac7103d27c7b48458ab0
@@ -72,8 +72,8 @@ SHA256 (passenger-3.0.12.tar.gz) = 30e069dd8a311792ecada9df2caecc2a981d1948b88a7
 SIZE (passenger-3.0.12.tar.gz) = 2368176
 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
 SIZE (ngx_postgres-0.9.tar.gz) = 41022
-SHA256 (agentzh-rds-csv-nginx-module-v0.05rc1-0-g98c7907.tar.gz) = a879834dfeb76795432a1e83bb81417faa1b98ee91c9428f982901248dabd040
-SIZE (agentzh-rds-csv-nginx-module-v0.05rc1-0-g98c7907.tar.gz) = 18238
+SHA256 (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 5b135136b646c2647de2d89007bafd1136b06f20379555f8ebbc903b55000023
+SIZE (agentzh-rds-csv-nginx-module-v0.05rc2-0-gc15d3a4.tar.gz) = 17993
 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.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2
diff --git a/www/nginx/files/extra-patch-chaoslawful-lua-nginx-module::config b/www/nginx/files/extra-patch-chaoslawful-lua-nginx-module::config
deleted file mode 100644
index 67ffd001c1c6..000000000000
--- a/www/nginx/files/extra-patch-chaoslawful-lua-nginx-module::config
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../chaoslawful-lua-nginx-module-dbe0dc4/config.orig	2011-07-12 11:24:16.000000000 +0400
-+++ ../chaoslawful-lua-nginx-module-dbe0dc4/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