Update from 0.8.30 to 0.8.31.

Update http_redis module from 0.2.0 to 0.3.0.
Remove needless extra patch.

<ChangeLog>

*) Feature: now the "error_page" directive may redirect the 301 and 302
   responses.

*) Feature: the $geoip_city_continent_code, $geoip_latitude, and
   $geoip_longitude variables.
   Thanks to Arvind Sundararajan.

*) Feature: now the ngx_http_image_filter_module deletes always EXIF
   and other application specific data if the data consume more than 5%
   of a JPEG file.

*) Bugfix: nginx closed a connection if a cached response had an empty
   body.
   Thanks to Piotr Sikora.

*) Bugfix: nginx might not be built by gcc 4.x if the -O2 or higher
   optimization option was used.
   Thanks to Maxim Dounin and Denis F. Latypoff.

*) Bugfix: regular expressions in location were always tested in
   case-sensitive mode; the bug had appeared in 0.8.25.

*) Bugfix: nginx cached a 304 response if there was the "If-None-Match"
   header line in a proxied request.
   Thanks to Tim Dettrick and David Kostal.

*) Bugfix: nginx/Windows tried to delete a temporary file twice if the
   file should replace an already existent file.

</ChangeLog>

3 files changed, 8 insertions, 32 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 04c1c0b29b66..3ebe72e3dc4d 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.8.30
+PORTVERSION=	0.8.31
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -232,7 +232,7 @@ CONFIGURE_ARGS+=--with-http_realip_module
 .endif
 
 .if defined(WITH_HTTP_REDIS_MODULE)
-NGINX_REDIS_MODULE_VERSION=	0.2.0
+NGINX_REDIS_MODULE_VERSION=	0.3.0
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:redis/}
 MASTER_SITE_SUBDIR+=	osa/:redis
 DISTFILES+=	ngx_http_redis-${NGINX_REDIS_MODULE_VERSION}.tar.gz:redis
@@ -397,10 +397,6 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
-.if defined(WITH_HTTP_REDIS_MODULE)
-	@${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
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 1f47c4d4b83f..693fc7d84bb6 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (nginx-0.8.30.tar.gz) = d2195557f0b3d1626cb8b8daff4489c1
-SHA256 (nginx-0.8.30.tar.gz) = ed79a8201299ae90181d4623004ed5329054e3a78291e5e416a9341e036353d5
-SIZE (nginx-0.8.30.tar.gz) = 617971
+MD5 (nginx-0.8.31.tar.gz) = 0bb07c1efc4b972950d210f69081017d
+SHA256 (nginx-0.8.31.tar.gz) = a810044bd7768da89d794dea8d6fb8503c5c46b0cfc4221e5151e04c4b91904e
+SIZE (nginx-0.8.31.tar.gz) = 619261
 MD5 (nginx-accesskey-2.0.3.tar.gz) = 9b5304346d5139b1841f5baa01ab0cbe
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
@@ -25,9 +25,9 @@ SIZE (nginx-notice-2.tar.gz) = 3253
 MD5 (nginx_http_push_module-0.69.tar.gz) = 5722ac1ec726194a480bd19ad7e99996
 SHA256 (nginx_http_push_module-0.69.tar.gz) = 2384ff752115b5f959abf17ca466217a675796e295ba5c46d20270923fe286ec
 SIZE (nginx_http_push_module-0.69.tar.gz) = 28345
-MD5 (ngx_http_redis-0.2.0.tar.gz) = 4055ed2b19e7634c40384c13e680b103
-SHA256 (ngx_http_redis-0.2.0.tar.gz) = d5a5a8d55983ce55670b231c254a89d8ef0f81830d0dd2f1abe146e42a5406a3
-SIZE (ngx_http_redis-0.2.0.tar.gz) = 5706
+MD5 (ngx_http_redis-0.3.0.tar.gz) = 4167df3410e4446ebaee46d3f9e51197
+SHA256 (ngx_http_redis-0.3.0.tar.gz) = fb46c5415ec35e8865912f4a37257c39db7574ac717b05c1af40bd24d5e63928
+SIZE (ngx_http_redis-0.3.0.tar.gz) = 5907
 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
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c b/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c
deleted file mode 100644
index 102094fe8a20..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../ngx_http_redis-0.2.0/ngx_http_redis_module.c.orig	2009-11-19 11:21:17.000000000 +0300
-+++ ../ngx_http_redis-0.2.0/ngx_http_redis_module.c	2009-11-19 11:21:57.000000000 +0300
-@@ -244,7 +244,7 @@
-     vv[0] = ngx_http_get_indexed_variable(r, rlcf->db);
- 
-     if (vv[0] == NULL || vv[0]->not_found || vv[0]->len == 0) {
--        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                        "select 0 redis database" );
-         len = sizeof("select 0") - 1;
-     } else {
-@@ -287,7 +287,7 @@
-     ctx->key.data = b->last;
- 
-     if (vv[0] == NULL || vv[0]->not_found || vv[0]->len == 0) {
--        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                        "select 0 redis database" );
-         *b->last++ = '0';
-     } else {