[60653] trunk/dports/www/nginx

[boeyms at macports.org]

Revision: 60653
          http://trac.macports.org/changeset/60653
Author:   boeyms at macports.org
Date:     2009-11-18 21:33:11 -0800 (Wed, 18 Nov 2009)
Log Message:
-----------
www/nginx: update to latest version (0.7.64).  Closes #22271.

Modified Paths:
--------------
    trunk/dports/www/nginx/Portfile
    trunk/dports/www/nginx/files/patch-auto__install.diff
    trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff

Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile	2009-11-19 03:54:19 UTC (rev 60652)
+++ trunk/dports/www/nginx/Portfile	2009-11-19 05:33:11 UTC (rev 60653)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name            nginx
-version         0.7.59
+version         0.7.64
 categories      www mail
 platforms       darwin
 maintainers     boeyms openmaintainer
@@ -22,9 +22,9 @@
                 http://www.grid.net.ru/nginx/download/:upload_module
 distfiles       ${name}-${version}${extract.suffix}:nginx
 checksums       ${name}-${version}${extract.suffix} \
-                    md5     d981b03b4c3ba43de580553355608b63 \
-                    sha1    3fb8d89420771106d04fb2f7dac2fcbe2e828be2 \
-                    rmd160  297aa1408cd89e78970a8e9c0bfdffc796155032
+                    md5     cfa97c0f784532820110b5eee57fef6d\
+                    sha1    e4f71b9a908c23c3d7bfeb63e97c7f85c3d6eed7\
+                    rmd160  88c982dc88a91db3337c1ab74d7a41d503736366
 
 depends_lib     port:pcre port:zlib
 

Modified: trunk/dports/www/nginx/files/patch-auto__install.diff
===================================================================
--- trunk/dports/www/nginx/files/patch-auto__install.diff	2009-11-19 03:54:19 UTC (rev 60652)
+++ trunk/dports/www/nginx/files/patch-auto__install.diff	2009-11-19 05:33:11 UTC (rev 60653)
@@ -1,5 +1,5 @@
---- auto/install	2008-07-07 20:25:08.000000000 +1000
-+++ auto/install.new	2008-09-28 23:13:21.000000000 +1000
+--- auto/install	2009-09-07 10:03:15.000000000 +0000
++++ auto/install.new	2009-11-15 15:42:09.000000000 +0000
 @@ -7,7 +7,7 @@
      cat << END                                                >> $NGX_MAKEFILE
  
@@ -9,7 +9,7 @@
  END
  
      NGX_INSTALL_PERL_MODULES=install_perl_modules
-@@ -35,18 +35,11 @@
+@@ -92,18 +92,12 @@
  	cp conf/koi-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
  	cp conf/win-utf '\$(DESTDIR)$NGX_CONF_PREFIX'
  
@@ -20,26 +20,26 @@
  
 -	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
 -		|| cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/fastcgi_params \
+ 	cp conf/fastcgi_params \
 -		'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
-+	cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.example'
++		'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.example'
  
 -	test -f '\$(DESTDIR)$NGX_CONF_PATH' \
--		|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
+-		|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
 -	cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
 +	cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.example'
  
  	test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
  		|| mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
-@@ -54,8 +47,9 @@
+@@ -111,8 +105,9 @@
  	test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
  		mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
  
 -	test -d '\$(DESTDIR)$NGX_PREFIX/html' \
 -		|| cp -r html '\$(DESTDIR)$NGX_PREFIX'
-+	test -d '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' || \
-+		mkdir -p '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' && \
-+		cp -r html '\$(DESTDIR)$NGX_PREFIX/share/nginx'
++	test -d '\$(DESTDIR)$NGX_PREFIX/share/nginx/html' \
++		|| mkdir -p '\$(DESTDIR)$NGX_PREFIX/share/nginx' \
++		&& cp -r html '\$(DESTDIR)$NGX_PREFIX/share/nginx'
  END
  
  

Modified: trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff
===================================================================
--- trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff	2009-11-19 03:54:19 UTC (rev 60652)
+++ trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff	2009-11-19 05:33:11 UTC (rev 60653)
@@ -1,5 +1,5 @@
---- conf/nginx.conf	2008-02-28 20:44:16.000000000 +0000
-+++ conf/nginx.conf	2008-07-09 18:05:34.000000000 +0100
+--- conf/nginx.conf	2009-04-06 13:43:46.000000000 +0000
++++ conf/nginx.conf.new	2009-11-15 13:18:15.000000000 +0000
 @@ -41,7 +41,7 @@
          #access_log  logs/host.access.log  main;
  
@@ -18,6 +18,15 @@
          }
  
          # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+@@ -63,7 +63,7 @@
+         # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+         #
+         #location ~ \.php$ {
+-        #    root           html;
++        #    root           share/nginx/html;
+         #    fastcgi_pass   127.0.0.1:9000;
+         #    fastcgi_index  index.php;
+         #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
 @@ -87,7 +87,7 @@
      #    server_name  somename  alias  another.alias;
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091118/5a5550de/attachment.html>