Accordingly update (www/nginx and www/nginx-devel):

 passenger module support from 2.2.5 to 2.2.7;
 upload module to 2.0.11;
 uploadprogress module from 0.6 to 0.7.

Remove needless patch.

Also, h264 module distfile re-rolled due moon phase.

Do not bump PORTREVISIONs.

5 files changed, 38 insertions, 90 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index d24ce3608d63..f33513eddecb 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -53,7 +53,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_REDIS_MODULE	"3rd party http_redis module" off \
 		HTTP_RESPONSE_MODULE	"3rd party http_response module" off \
 		HTTP_UPLOAD_MODULE	"3rd party upload module" off \
-		HTTP_UPLOAD_PROGRESS	"3rd party upload_progress module" off \
+		HTTP_UPLOAD_PROGRESS	"3rd party uploadprogress module" off \
 		HTTP_UPSTREAM_FAIR	"3rd party upstream fair module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
@@ -246,17 +246,17 @@ CONFIGURE_ARGS+=--with-http_sub_module
 .endif
 
 .if defined(WITH_HTTP_UPLOAD_MODULE)
-NGINX_UPLOAD_MODULE_VERSION=	2.0.10
+NGINX_UPLOAD_MODULE_VERSION=	2.0.11
 MASTER_SITES+=	http://www.grid.net.ru/nginx/download/:upload
 DISTFILES+=	nginx_upload_module-${NGINX_UPLOAD_MODULE_VERSION}.tar.gz:upload
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE_VERSION}
 .endif
 
 .if defined(WITH_HTTP_UPLOAD_PROGRESS)
-NGINX_UPLOAD_PROGRESS_MODULE_VERSION=	0.6
-MASTER_SITES+=	http://wiki.nginx.org/images/7/70/:uploadprogress
-DISTFILES+=	Nginx-upload-progress-module-${NGINX_UPLOAD_PROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-upload-progress-module
+NGINX_UPLOADPROGRESS_MODULE_VERSION=	0.7
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:uploadprogress/}
+DISTFILES+=	nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}
 .endif
 
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
@@ -297,7 +297,7 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	2.2.5
+PASSENGER_VERSION=	2.2.7
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
@@ -368,10 +368,6 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_redis_module.c
 .endif
-.if defined(WITH_HTTP_UPLOAD_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_upload_module.c
-.endif
 .if defined(WITH_PASSENGER_MODULE)
 	@${REINPLACE_CMD} 's!g++!${CXX}!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 00f5e9db1591..70cc7003250d 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -13,9 +13,9 @@ SIZE (nginx-fancyindex-0.1_beta5.tar.bz2) = 12211
 MD5 (nginx_mogilefs_module-1.0.2.tar.gz) = 62a72ce32d10b7811a18b672d8f69e17
 SHA256 (nginx_mogilefs_module-1.0.2.tar.gz) = fb9910e220567c7e19e2508c7d3a45e54c69b617c0eeb5eac7dbe728dc964855
 SIZE (nginx_mogilefs_module-1.0.2.tar.gz) = 13706
-MD5 (nginx_mod_h264_streaming-2.2.5.tar.gz) = d3d411089b1a7e59db740285f491ac1b
-SHA256 (nginx_mod_h264_streaming-2.2.5.tar.gz) = fe574974afb2e0910de3f2c4379be6155b9c737031cd827e6862319436ef74eb
-SIZE (nginx_mod_h264_streaming-2.2.5.tar.gz) = 39760
+MD5 (nginx_mod_h264_streaming-2.2.5.tar.gz) = 204fc4feb56fb68669b4499008b409ca
+SHA256 (nginx_mod_h264_streaming-2.2.5.tar.gz) = e285f0df518817eaa4bb92746286aff3364a2b67bc1cc1fd98b368194d85ab7d
+SIZE (nginx_mod_h264_streaming-2.2.5.tar.gz) = 39771
 MD5 (nginx-notice-2.tar.gz) = 7253bdd2b88cc981867b72efdc484772
 SHA256 (nginx-notice-2.tar.gz) = 682824a9f5187831ee49e5828bafebde5c25706e681d361804f96308f24e58c2
 SIZE (nginx-notice-2.tar.gz) = 3253
@@ -25,12 +25,12 @@ SIZE (ngx_http_redis-0.2.0.tar.gz) = 5706
 MD5 (ngx_http_response-0.3.tar.gz) = 178a8f13a41388ef50b3726fa9fede50
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
-MD5 (nginx_upload_module-2.0.10.tar.gz) = 5ac249003c6eb6ce919510a5ff9ffc79
-SHA256 (nginx_upload_module-2.0.10.tar.gz) = 96b6610996c83c4e2d1b2f31b263b5ff6cc86c3b4a4e7ad0e1bf6c1ec806e5a0
-SIZE (nginx_upload_module-2.0.10.tar.gz) = 18331
-MD5 (Nginx-upload-progress-module-0.6.tar.gz) = 98cfd8a950edaecf1bdf95bd32f8c1f4
-SHA256 (Nginx-upload-progress-module-0.6.tar.gz) = 19db47b4d5e3e3c7304fb77c257daf1f8c727ccc8f16876352141152e32a2f5f
-SIZE (Nginx-upload-progress-module-0.6.tar.gz) = 11856
+MD5 (nginx_upload_module-2.0.11.tar.gz) = dd1d0f11201073938c8b4225d3aac9f9
+SHA256 (nginx_upload_module-2.0.11.tar.gz) = 287c56a42b4cfe4ffc6466b550675fc0f705cf696833ed74af2be8a1cf021b39
+SIZE (nginx_upload_module-2.0.11.tar.gz) = 20056
+MD5 (nginx_uploadprogress_module-0.7.tar.gz) = 427b7849d06465b3497ae60bf6731c37
+SHA256 (nginx_uploadprogress_module-0.7.tar.gz) = a3623629c43823e5dcf8b822157e9b02792ce68350c7235d6d752cc4f9ee59df
+SIZE (nginx_uploadprogress_module-0.7.tar.gz) = 15602
 MD5 (nginx_upstream_fair-20081012.tar.gz) = 1f7b4f3e47c32f89afac59fa60381dc4
 SHA256 (nginx_upstream_fair-20081012.tar.gz) = 4c2bd957168008e5b2397fad49824ca70f3685cf884e8d1be45d56c8e3bbe88c
 SIZE (nginx_upstream_fair-20081012.tar.gz) = 10021
@@ -40,6 +40,6 @@ SIZE (ngx_http_upstream_keepalive-0.1.tar.gz) = 4978
 MD5 (mod_zip-1.1.5.tar.gz) = cc8f5caa893f818176c08b48b2a613ca
 SHA256 (mod_zip-1.1.5.tar.gz) = 36fff54b74d82f8722d2d005aba9f767fd26faeb1cff778da3766246a44083df
 SIZE (mod_zip-1.1.5.tar.gz) = 19126
-MD5 (passenger-2.2.5.tar.gz) = 93838b842ce0a0c65d7c6ef9ce59c41f
-SHA256 (passenger-2.2.5.tar.gz) = b090817e840c7b7e0d39c5eea292c87d428b1e56f29ef4a178705db42c9ec326
-SIZE (passenger-2.2.5.tar.gz) = 1799698
+MD5 (passenger-2.2.7.tar.gz) = 128444ab93b582450c89aeebb7f4df5d
+SHA256 (passenger-2.2.7.tar.gz) = 37ebbcb1201b14f34946674daa80f4e8f2c5f1ec35d5d2149c0c52bb3757eb09
+SIZE (passenger-2.2.7.tar.gz) = 2045572
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c b/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
deleted file mode 100644
index d0d8679e9962..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_upload_module.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- ../nginx_upload_module-2.0.10/ngx_http_upload_module.c.orig	2009-11-19 12:10:09.000000000 +0300
-+++ ../nginx_upload_module-2.0.10/ngx_http_upload_module.c	2009-11-19 12:52:53.000000000 +0300
-@@ -1558,9 +1595,14 @@
- 
-     ngx_str_t                  *value;
- #if (NGX_PCRE)
-+#if defined nginx_version && nginx_version >= 8025
-+    ngx_regex_compile_t         rc;
-+    u_char                      errstr[NGX_MAX_CONF_ERRSTR];
-+#else
-     ngx_int_t                   n;
-     ngx_str_t                  err;
- #endif
-+#endif
-     ngx_http_upload_field_filter_t *f;
- 
-     value = cf->args->elts;
-@@ -1579,6 +1621,22 @@
-     }
- 
- #if (NGX_PCRE)
-+#if defined nginx_version && nginx_version >= 8025
-+    ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
-+
-+    rc.pattern = value[1];
-+    rc.pool = cf->pool;
-+    rc.err.len = NGX_MAX_CONF_ERRSTR;
-+    rc.err.data = errstr;
-+
-+    if(ngx_regex_compile(&rc) != NGX_OK) {
-+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
-+        return NGX_CONF_ERROR;
-+    }
-+
-+    f->regex = rc.regex;
-+    f->ncaptures = rc.captures;
-+#else
-     f->regex = ngx_regex_compile(&value[1], 0, cf->pool, &err);
- 
-     if (f->regex == NULL) {
-@@ -1596,6 +1654,7 @@
-     }
- 
-     f->ncaptures = n;
-+#endif
- #else
-     f->text.len = value[1].len;
-     f->text.data = value[1].data;
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index a631dcd1f93c..33cc169d2d50 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -50,7 +50,7 @@ OPTIONS=	DEBUG			"Enable nginx debugging" off \
 		HTTP_REDIS_MODULE	"3rd party http_redis module" off \
 		HTTP_RESPONSE_MODULE	"3rd party http_response module" off \
 		HTTP_UPLOAD_MODULE	"3rd party upload module" off \
-		HTTP_UPLOAD_PROGRESS	"3rd party upload_progress module" off \
+		HTTP_UPLOAD_PROGRESS	"3rd party uploadprogress module" off \
 		HTTP_UPSTREAM_FAIR	"3rd party upstream fair module" off \
 		HTTP_UPSTREAM_KEEPALIVE "3rd party upstream keepalive module" off \
 		HTTP_ZIP_MODULE		"3rd party http_zip module" off \
@@ -234,17 +234,17 @@ CONFIGURE_ARGS+=--with-http_sub_module
 .endif
 
 .if defined(WITH_HTTP_UPLOAD_MODULE)
-NGINX_UPLOAD_MODULE_VERSION=	2.0.9
+NGINX_UPLOAD_MODULE_VERSION=	2.0.11
 MASTER_SITES+=	http://www.grid.net.ru/nginx/download/:upload
 DISTFILES+=	nginx_upload_module-${NGINX_UPLOAD_MODULE_VERSION}.tar.gz:upload
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upload_module-${NGINX_UPLOAD_MODULE_VERSION}
 .endif
 
 .if defined(WITH_HTTP_UPLOAD_PROGRESS)
-NGINX_UPLOAD_PROGRESS_MODULE_VERSION=	0.6
-MASTER_SITES+=	http://wiki.nginx.org/images/7/70/:uploadprogress
-DISTFILES+=	Nginx-upload-progress-module-${NGINX_UPLOAD_PROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-upload-progress-module
+NGINX_UPLOADPROGRESS_MODULE_VERSION=	0.7
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:uploadprogress/}
+DISTFILES+=	nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}.tar.gz:uploadprogress
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_uploadprogress_module-${NGINX_UPLOADPROGRESS_MODULE_VERSION}
 .endif
 
 .if defined(WITH_HTTP_UPSTREAM_FAIR)
@@ -285,7 +285,7 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	2.2.5
+PASSENGER_VERSION=	2.2.7
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 82787acc4d45..f5c752db8974 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -13,9 +13,9 @@ SIZE (nginx-fancyindex-0.1_beta5.tar.bz2) = 12211
 MD5 (nginx_mogilefs_module-1.0.2.tar.gz) = 62a72ce32d10b7811a18b672d8f69e17
 SHA256 (nginx_mogilefs_module-1.0.2.tar.gz) = fb9910e220567c7e19e2508c7d3a45e54c69b617c0eeb5eac7dbe728dc964855
 SIZE (nginx_mogilefs_module-1.0.2.tar.gz) = 13706
-MD5 (nginx_mod_h264_streaming-2.2.5.tar.gz) = d3d411089b1a7e59db740285f491ac1b
-SHA256 (nginx_mod_h264_streaming-2.2.5.tar.gz) = fe574974afb2e0910de3f2c4379be6155b9c737031cd827e6862319436ef74eb
-SIZE (nginx_mod_h264_streaming-2.2.5.tar.gz) = 39760
+MD5 (nginx_mod_h264_streaming-2.2.5.tar.gz) = 204fc4feb56fb68669b4499008b409ca
+SHA256 (nginx_mod_h264_streaming-2.2.5.tar.gz) = e285f0df518817eaa4bb92746286aff3364a2b67bc1cc1fd98b368194d85ab7d
+SIZE (nginx_mod_h264_streaming-2.2.5.tar.gz) = 39771
 MD5 (nginx-notice-2.tar.gz) = 7253bdd2b88cc981867b72efdc484772
 SHA256 (nginx-notice-2.tar.gz) = 682824a9f5187831ee49e5828bafebde5c25706e681d361804f96308f24e58c2
 SIZE (nginx-notice-2.tar.gz) = 3253
@@ -25,12 +25,12 @@ SIZE (ngx_http_redis-0.2.0.tar.gz) = 5706
 MD5 (ngx_http_response-0.3.tar.gz) = 178a8f13a41388ef50b3726fa9fede50
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
-MD5 (nginx_upload_module-2.0.9.tar.gz) = bd8ee6011e3e24805c8ead617211a04b
-SHA256 (nginx_upload_module-2.0.9.tar.gz) = 3c43e185f85a5a719de2cd02083ae0802a8fd2645c79a78c7d37c3d1f0361f9f
-SIZE (nginx_upload_module-2.0.9.tar.gz) = 18232
-MD5 (Nginx-upload-progress-module-0.6.tar.gz) = 98cfd8a950edaecf1bdf95bd32f8c1f4
-SHA256 (Nginx-upload-progress-module-0.6.tar.gz) = 19db47b4d5e3e3c7304fb77c257daf1f8c727ccc8f16876352141152e32a2f5f
-SIZE (Nginx-upload-progress-module-0.6.tar.gz) = 11856
+MD5 (nginx_upload_module-2.0.11.tar.gz) = dd1d0f11201073938c8b4225d3aac9f9
+SHA256 (nginx_upload_module-2.0.11.tar.gz) = 287c56a42b4cfe4ffc6466b550675fc0f705cf696833ed74af2be8a1cf021b39
+SIZE (nginx_upload_module-2.0.11.tar.gz) = 20056
+MD5 (nginx_uploadprogress_module-0.7.tar.gz) = 427b7849d06465b3497ae60bf6731c37
+SHA256 (nginx_uploadprogress_module-0.7.tar.gz) = a3623629c43823e5dcf8b822157e9b02792ce68350c7235d6d752cc4f9ee59df
+SIZE (nginx_uploadprogress_module-0.7.tar.gz) = 15602
 MD5 (nginx_upstream_fair-20081012.tar.gz) = 1f7b4f3e47c32f89afac59fa60381dc4
 SHA256 (nginx_upstream_fair-20081012.tar.gz) = 4c2bd957168008e5b2397fad49824ca70f3685cf884e8d1be45d56c8e3bbe88c
 SIZE (nginx_upstream_fair-20081012.tar.gz) = 10021
@@ -40,6 +40,6 @@ SIZE (ngx_http_upstream_keepalive-0.1.tar.gz) = 4978
 MD5 (mod_zip-1.1.5.tar.gz) = cc8f5caa893f818176c08b48b2a613ca
 SHA256 (mod_zip-1.1.5.tar.gz) = 36fff54b74d82f8722d2d005aba9f767fd26faeb1cff778da3766246a44083df
 SIZE (mod_zip-1.1.5.tar.gz) = 19126
-MD5 (passenger-2.2.5.tar.gz) = 93838b842ce0a0c65d7c6ef9ce59c41f
-SHA256 (passenger-2.2.5.tar.gz) = b090817e840c7b7e0d39c5eea292c87d428b1e56f29ef4a178705db42c9ec326
-SIZE (passenger-2.2.5.tar.gz) = 1799698
+MD5 (passenger-2.2.7.tar.gz) = 128444ab93b582450c89aeebb7f4df5d
+SHA256 (passenger-2.2.7.tar.gz) = 37ebbcb1201b14f34946674daa80f4e8f2c5f1ec35d5d2149c0c52bb3757eb09
+SIZE (passenger-2.2.7.tar.gz) = 2045572