Update to 0.6.7.

Update patch for nginx.conf.
Rewrote pkg-plist as describe in FreeBSD Porter's Handbook,
section 7.3 for fix package installation. (*)

Problem found by: Denis Shaposhnikov dsh at vlink dot ru (*)

<ChangeLog>

*) Change: now the paths specified in the "include",
   "auth_basic_user_file", "perl_modules", "ssl_certificate",
   "ssl_certificate_key", and "ssl_client_certificate" directives
    are relative to directory of nginx configuration file
    nginx.conf, but no to nginx prefix directory.

*) Change: the --sysconfdir=PATH option in configure was canceled.

*) Change: the special make target "upgrade1" was defined for
   online upgrade of 0.1.x versions.

*) Feature: the "server_name" and "valid_referers" directives
   support regular expressions.

*) Feature: the "server" directive in the "upstream" context
   supports the "backup" parameter.

*) Feature: the ngx_http_perl_module supports the
   $r->discard_request_body.

*) Feature: the "add_header Last-Modified ..." directive changes
   the "Last-Modified" response header line.

*) Bugfix: if an response different than 200 was returned to an
   request with body and connection went to the keep-alive state
   after the request, then nginx returned 400 for the next request.

*) Bugfix: a segmentation fault occurred in worker process if
   invalid address was set in the "auth_http" directive.

*) Bugfix: now nginx uses default listen backlog value 511 on all
   platforms except FreeBSD.
   Thanks to Jiang Hong.

*) Bugfix: a worker process may got caught in an endless loop,
   if an "server" inside "upstream" block was marked as "down";
   bug appeared in 0.6.6.

*) Bugfix: now Solaris sendfilev() is not used to transfer the
   client request body to FastCGI-server via the unix domain
   socket.

</ChangeLog>

4 files changed, 10 insertions, 20 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index cfd52d5ca87c..ae0f2c6c2774 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.6.6
+PORTVERSION=	0.6.7
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index be9892c34b50..ad72ef614d9e 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (nginx-0.6.6.tar.gz) = 7dab36bab2ed3f770bdfc62babfc6664
-SHA256 (nginx-0.6.6.tar.gz) = 7d9a3d39c8253d4520aaaf34a5e62b289c823cbfe7a09ccd5e3b9d0c3c8235cd
-SIZE (nginx-0.6.6.tar.gz) = 478162
+MD5 (nginx-0.6.7.tar.gz) = 4a92903c9680bf955b84d5dd4d714bde
+SHA256 (nginx-0.6.7.tar.gz) = e421e51d1014da5328376a948b9ee56dfd2f37c936669beeb8cc20517b09a980
+SIZE (nginx-0.6.7.tar.gz) = 481828
diff --git a/www/nginx-devel/files/patch-conf-nginx.conf b/www/nginx-devel/files/patch-conf-nginx.conf
index 049fa52cf1e7..7ff1d6634c1e 100644
--- a/www/nginx-devel/files/patch-conf-nginx.conf
+++ b/www/nginx-devel/files/patch-conf-nginx.conf
@@ -3,15 +3,6 @@ $FreeBSD$
 
 --- conf/nginx.conf.orig	Thu Jan 18 10:08:18 2007
 +++ conf/nginx.conf	Thu Jun 14 12:57:52 2007
-@@ -15,7 +15,7 @@
- 
- 
- http {
--    include       conf/mime.types;
-+    include       mime.types;
-     default_type  application/octet-stream;
- 
-     #log_format  main  '$remote_addr - $remote_user [$time_gmt] $status '
 @@ -33,7 +33,7 @@
      #gzip  on;
  
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 7182b1af0a78..740189d46751 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -3,22 +3,21 @@ etc/nginx/fastcgi_params
 etc/nginx/koi-utf
 etc/nginx/koi-win
 etc/nginx/win-utf
-@unexec if cmp -s %D/etc/nginx/mime.types %D/etc/nginx/mime.types-dist; then rm -f %D/etc/nginx/mime.types; fi
+@unexec if cmp -s %D/etc/nginx/mime.types-dist %D/etc/nginx/mime.types; then rm -f %D/etc/nginx/mime.types; fi
 etc/nginx/mime.types-dist
-@exec [ -f %D/mime.types ] || cp %D/%f %D/mime.types
-@unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi
+@exec if [ ! -f %D/etc/nginx/mime.types ] ; then cp -p %D/%F %B/mime.types; fi
+@unexec if cmp -s %D/etc/nginx/nginx.conf-dist %D/etc/nginx/nginx.conf; then rm -f %D/etc/nginx/nginx.conf; fi
 etc/nginx/nginx.conf-dist
-@exec [ -f %D/nginx.conf ] || cp %D/%f %D/nginx.conf
+@exec if [ ! -f %D/etc/nginx/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi
 @dirrmtry etc/nginx
 %%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
-@comment @unexec chmod u+w www/nginx-dist
+%%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi
 %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-%%WWWDATA%%@exec [ -d %D/www/nginx/ ] || ln -fs %D %D/www/nginx
 %%WWWDATA%%www/nginx-dist/index.html
 %%WWWDATA%%www/nginx-dist/50x.html
 %%WWWDATA%%@exec chmod a-w www/nginx-dist
 %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
-%%WWWDATA%%@dirrm www/nginx-dist
+%%WWWDATA%%@dirrmtry www/nginx-dist
 sbin/nginx
 @exec [ -d %%NGINX_TMPDIR%% ] || mkdir -p %%NGINX_TMPDIR%%
 @exec chown %%WWWOWN%%:%%WWWGRP%% %%NGINX_TMPDIR%%