Accordingly update fancyindex module from 0.1_beta5 to 0.2.1.

Remove needless patches.

Do not bump PORTREVISIONs.

6 files changed, 14 insertions, 148 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 32cef1b8a1ed..1a158161c28d 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -178,12 +178,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_eval_module-${NGINX_EVAL_MODULE_VER
 .endif
 
 .if defined(WITH_HTTP_FANCYINDEX_MODULE)
-NGINX_FANCYINDEX_MODULE_VERSION=	0.1b5
-MASTER_SITES+=	http://furi-ku.org/nginx/fancyindex/:fancyindex
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:fancyindex/}
-MASTER_SITE_SUBDIR+=	osa/:fancyindex
-DISTFILES+=	nginx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION:S/b/_beta/}.tar.bz2:fancyindex
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION:S/b/_beta/}
+NGINX_FANCYINDEX_MODULE_VERSION=	0.2.1
+MASTER_SITES+=	http://connectical.com/attachments/download/21/:fancyindex
+DISTFILES+=	ngx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION}.tar.bz2:fancyindex
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION}
 .endif
 
 .if defined(WITH_HTTP_GUNZIP_FILTER)
@@ -435,10 +433,6 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
-.if defined(WITH_HTTP_FANCYINDEX_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_fancyindex_module.c
-.endif
 .if defined(WITH_HTTP_NOTICE_MODULE)
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 3a001d1f8f9e..1b17e5c0a7dd 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -13,9 +13,9 @@ SIZE (ngx_cache_purge-1.0.tar.gz) = 4569
 MD5 (nginx_eval_module-1.0.1.tar.gz) = 570b6f7e40e489c5846ffca725226edb
 SHA256 (nginx_eval_module-1.0.1.tar.gz) = f11ba0bf445f0eafd999d52817e298b1f1b09817f74b6120ed491e611d53c798
 SIZE (nginx_eval_module-1.0.1.tar.gz) = 4974
-MD5 (nginx-fancyindex-0.1_beta5.tar.bz2) = ac371c8c03e7235f1e8e8c187a5a93cb
-SHA256 (nginx-fancyindex-0.1_beta5.tar.bz2) = 155c0fac05a7f6c013b5cc368926d71d5da73e4e5a9f2506b2e5114eee8680a2
-SIZE (nginx-fancyindex-0.1_beta5.tar.bz2) = 12211
+MD5 (ngx-fancyindex-0.2.1.tar.bz2) = 52caeb824d521b086f0086a782d458dc
+SHA256 (ngx-fancyindex-0.2.1.tar.bz2) = 975e01ed40af8467c2a9bd2b46b28f250cf9fc2fa055d19d68b44c63cda83f74
+SIZE (ngx-fancyindex-0.2.1.tar.bz2) = 11590
 MD5 (ngx_http_gunzip_filter_module-0.2.tar.gz) = 0ba8d4924d6e6a1462ebd7bcb2f5c4d0
 SHA256 (ngx_http_gunzip_filter_module-0.2.tar.gz) = 399942c23ba5ebd15b6dbde9e9bbfda0a4faa5a7289f579ee36a0c15cfed0d3f
 SIZE (ngx_http_gunzip_filter_module-0.2.tar.gz) = 7054
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_fancyindex_module.c b/www/nginx-devel/files/extra-patch-ngx_http_fancyindex_module.c
deleted file mode 100644
index 2b7512e39db6..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_fancyindex_module.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c.orig	2007-09-29 01:02:05.000000000 +0400
-+++ ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c	2009-06-03 16:41:36.000000000 +0400
-@@ -290,12 +290,12 @@
-     ngx_http_fancyindex_entry_t *entry;
- 
-     off_t        length;
--    size_t       len, root, copy, allocated;
-+    size_t       len, root, utf_len, allocated;
-     u_char      *filename, *last, scale;
-     ngx_tm_t     tm;
-     ngx_array_t  entries;
-     ngx_time_t  *tp;
--    ngx_uint_t   i;
-+    ngx_uint_t   i, utf8;
-     ngx_int_t    size;
-     ngx_str_t    path;
-     ngx_str_t    readme_path;
-@@ -355,6 +355,15 @@
-     filename = path.data;
-     filename[path.len] = '/';
- 
-+    if (r->headers_out.charset.len == 5
-+        && ngx_strncasecmp(r->headers_out.charset.data, (u_char *) "utf-8", 5)
-+           == 0)
-+    {
-+        utf8 = 1;
-+    } else {
-+        utf8 = 0;
-+    }
-+
-     /* Read directory entries and their associated information. */
-     for (;;) {
-         ngx_set_errno(0);
-@@ -425,8 +434,8 @@
-         entry->dir     = ngx_de_is_dir(&dir);
-         entry->mtime   = ngx_de_mtime(&dir);
-         entry->size    = ngx_de_size(&dir);
--        entry->utf_len = (r->utf8)
--            ?  ngx_utf_length(entry->name.data, entry->name.len)
-+        entry->utf_len = utf8
-+            ?  ngx_utf8_length(entry->name.data, entry->name.len)
-             : len;
-     }
- 
-@@ -563,12 +572,13 @@
- 
-         if (entry[i].name.len - len) {
-             if (len > NGX_HTTP_FANCYINDEX_NAME_LEN) {
--                copy = NGX_HTTP_FANCYINDEX_NAME_LEN - 3 + 1;
-+                utf_len = NGX_HTTP_FANCYINDEX_NAME_LEN - 3 + 1;
-             } else {
--                copy = NGX_HTTP_FANCYINDEX_NAME_LEN + 1;
-+                utf_len = NGX_HTTP_FANCYINDEX_NAME_LEN + 1;
-             }
- 
--            b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, copy);
-+            b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
-+                                       utf_len, entry[i].name.len + 1);
-             last = b->last;
- 
-         } else {
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 7c823928d6c6..856f1fc173da 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -171,12 +171,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_eval_module-${NGINX_EVAL_MODULE_VER
 .endif
 
 .if defined(WITH_HTTP_FANCYINDEX_MODULE)
-NGINX_FANCYINDEX_MODULE_VERSION=	0.1b5
-MASTER_SITES+=	http://furi-ku.org/nginx/fancyindex/:fancyindex
-MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:fancyindex/}
-MASTER_SITE_SUBDIR+=	osa/:fancyindex
-DISTFILES+=	nginx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION:S/b/_beta/}.tar.bz2:fancyindex
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION:S/b/_beta/}
+NGINX_FANCYINDEX_MODULE_VERSION=	0.2.1
+MASTER_SITES+=	http://connectical.com/attachments/download/21/:fancyindex
+DISTFILES+=	ngx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION}.tar.bz2:fancyindex
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx-fancyindex-${NGINX_FANCYINDEX_MODULE_VERSION}
 .endif
 
 .if defined(WITH_HTTP_GUNZIP_FILTER)
@@ -422,10 +420,6 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
-.if defined(WITH_HTTP_FANCYINDEX_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_fancyindex_module.c
-.endif
 .if defined(WITH_HTTP_NOTICE_MODULE)
 	@${PATCH} ${PATCH_ARGS} < \
 		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 69f3dd82b8d1..b5f02e4a7cd6 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -13,9 +13,9 @@ SIZE (ngx_cache_purge-1.0.tar.gz) = 4569
 MD5 (nginx_eval_module-1.0.1.tar.gz) = 570b6f7e40e489c5846ffca725226edb
 SHA256 (nginx_eval_module-1.0.1.tar.gz) = f11ba0bf445f0eafd999d52817e298b1f1b09817f74b6120ed491e611d53c798
 SIZE (nginx_eval_module-1.0.1.tar.gz) = 4974
-MD5 (nginx-fancyindex-0.1_beta5.tar.bz2) = ac371c8c03e7235f1e8e8c187a5a93cb
-SHA256 (nginx-fancyindex-0.1_beta5.tar.bz2) = 155c0fac05a7f6c013b5cc368926d71d5da73e4e5a9f2506b2e5114eee8680a2
-SIZE (nginx-fancyindex-0.1_beta5.tar.bz2) = 12211
+MD5 (ngx-fancyindex-0.2.1.tar.bz2) = 52caeb824d521b086f0086a782d458dc
+SHA256 (ngx-fancyindex-0.2.1.tar.bz2) = 975e01ed40af8467c2a9bd2b46b28f250cf9fc2fa055d19d68b44c63cda83f74
+SIZE (ngx-fancyindex-0.2.1.tar.bz2) = 11590
 MD5 (ngx_http_gunzip_filter_module-0.2.tar.gz) = 0ba8d4924d6e6a1462ebd7bcb2f5c4d0
 SHA256 (ngx_http_gunzip_filter_module-0.2.tar.gz) = 399942c23ba5ebd15b6dbde9e9bbfda0a4faa5a7289f579ee36a0c15cfed0d3f
 SIZE (ngx_http_gunzip_filter_module-0.2.tar.gz) = 7054
diff --git a/www/nginx/files/extra-patch-ngx_http_fancyindex_module.c b/www/nginx/files/extra-patch-ngx_http_fancyindex_module.c
deleted file mode 100644
index 2b7512e39db6..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_fancyindex_module.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c.orig	2007-09-29 01:02:05.000000000 +0400
-+++ ../nginx-fancyindex-0.1_beta5/ngx_http_fancyindex_module.c	2009-06-03 16:41:36.000000000 +0400
-@@ -290,12 +290,12 @@
-     ngx_http_fancyindex_entry_t *entry;
- 
-     off_t        length;
--    size_t       len, root, copy, allocated;
-+    size_t       len, root, utf_len, allocated;
-     u_char      *filename, *last, scale;
-     ngx_tm_t     tm;
-     ngx_array_t  entries;
-     ngx_time_t  *tp;
--    ngx_uint_t   i;
-+    ngx_uint_t   i, utf8;
-     ngx_int_t    size;
-     ngx_str_t    path;
-     ngx_str_t    readme_path;
-@@ -355,6 +355,15 @@
-     filename = path.data;
-     filename[path.len] = '/';
- 
-+    if (r->headers_out.charset.len == 5
-+        && ngx_strncasecmp(r->headers_out.charset.data, (u_char *) "utf-8", 5)
-+           == 0)
-+    {
-+        utf8 = 1;
-+    } else {
-+        utf8 = 0;
-+    }
-+
-     /* Read directory entries and their associated information. */
-     for (;;) {
-         ngx_set_errno(0);
-@@ -425,8 +434,8 @@
-         entry->dir     = ngx_de_is_dir(&dir);
-         entry->mtime   = ngx_de_mtime(&dir);
-         entry->size    = ngx_de_size(&dir);
--        entry->utf_len = (r->utf8)
--            ?  ngx_utf_length(entry->name.data, entry->name.len)
-+        entry->utf_len = utf8
-+            ?  ngx_utf8_length(entry->name.data, entry->name.len)
-             : len;
-     }
- 
-@@ -563,12 +572,13 @@
- 
-         if (entry[i].name.len - len) {
-             if (len > NGX_HTTP_FANCYINDEX_NAME_LEN) {
--                copy = NGX_HTTP_FANCYINDEX_NAME_LEN - 3 + 1;
-+                utf_len = NGX_HTTP_FANCYINDEX_NAME_LEN - 3 + 1;
-             } else {
--                copy = NGX_HTTP_FANCYINDEX_NAME_LEN + 1;
-+                utf_len = NGX_HTTP_FANCYINDEX_NAME_LEN + 1;
-             }
- 
--            b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, copy);
-+            b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
-+                                       utf_len, entry[i].name.len + 1);
-             last = b->last;
- 
-         } else {