[96536] trunk/dports/www/nginx

[cal at macports.org]

Revision: 96536
          https://trac.macports.org/changeset/96536
Author:   cal at macports.org
Date:     2012-08-13 12:07:20 -0700 (Mon, 13 Aug 2012)
Log Message:
-----------
nginx: Update to 1.2.3

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

Removed Paths:
-------------
    trunk/dports/www/nginx/files/patch-perl_bool.diff

Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile	2012-08-13 18:58:24 UTC (rev 96535)
+++ trunk/dports/www/nginx/Portfile	2012-08-13 19:07:20 UTC (rev 96536)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                nginx
-version             1.2.2
+version             1.2.3
 categories          www mail
 platforms           darwin
 license             BSD
@@ -29,8 +29,8 @@
 
 distfiles           ${name}-${version}${extract.suffix}:nginx
 checksums           ${name}-${version}${extract.suffix} \
-                    rmd160  5099bf88de4b8128907c66ba53f007395978b61b \
-                    sha256  409477c7a9fba58c110a176fd7965b9db188bcf8be0e7f8a0731b8ae1e6ee880
+                    rmd160  49f9a8ede7ab68a067ba562b9917f84db427b2a1 \
+                    sha256  06a1153b32b43f100ee9147fe230917deea648f0155111c749e35da120646bf5
 
 depends_lib         port:pcre \
                     port:zlib
@@ -130,7 +130,6 @@
 
 variant perl5 description {Add perl support to the server directly within nginx and call perl via SSI} {
     depends_run-append      path:bin/perl:perl5
-    patchfiles-append       patch-perl_bool.diff
     configure.args-append   --with-http_perl_module \
                             --with-perl=${prefix}/bin/perl
 }

Modified: trunk/dports/www/nginx/files/patch-auto__install.diff
===================================================================
--- trunk/dports/www/nginx/files/patch-auto__install.diff	2012-08-13 18:58:24 UTC (rev 96535)
+++ trunk/dports/www/nginx/files/patch-auto__install.diff	2012-08-13 19:07:20 UTC (rev 96536)
@@ -1,48 +1,11 @@
---- auto/install.orig	2010-09-11 11:20:40.000000000 -0400
-+++ auto/install	2010-09-11 11:54:06.000000000 -0400
-@@ -7,7 +7,7 @@
+--- auto/install.orig	2012-08-13 15:48:18.000000000 +0200
++++ auto/install	2012-08-13 20:54:49.000000000 +0200
+@@ -8,7 +8,7 @@
      cat << END                                                >> $NGX_MAKEFILE
  
  install_perl_modules:
--	cd $NGX_OBJS/src/http/modules/perl && make install
-+	cd $NGX_OBJS/src/http/modules/perl && make pure_install
+-	cd $NGX_OBJS/src/http/modules/perl && \${MAKE} install
++	cd $NGX_OBJS/src/http/modules/perl && \${MAKE} pure_install
  END
  
      NGX_INSTALL_PERL_MODULES=install_perl_modules
-@@ -94,30 +94,30 @@
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types' \
- 		|| cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.default'
-+	cp conf/mime.types '\$(DESTDIR)$NGX_CONF_PREFIX/mime.types.example'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
- 		|| cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
- 	cp conf/fastcgi_params \
--		'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
-+		'\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.example'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
- 		|| cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
--	cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
-+	cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.example'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params' \
- 		|| cp conf/uwsgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
- 	cp conf/uwsgi_params \
--		'\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.default'
-+		'\$(DESTDIR)$NGX_CONF_PREFIX/uwsgi_params.example'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params' \
- 		|| cp conf/scgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
- 	cp conf/scgi_params \
--		'\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.default'
-+		'\$(DESTDIR)$NGX_CONF_PREFIX/scgi_params.example'
- 
- 	test -f '\$(DESTDIR)$NGX_CONF_PATH' \
- 		|| 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"`'

Deleted: trunk/dports/www/nginx/files/patch-perl_bool.diff
===================================================================
--- trunk/dports/www/nginx/files/patch-perl_bool.diff	2012-08-13 18:58:24 UTC (rev 96535)
+++ trunk/dports/www/nginx/files/patch-perl_bool.diff	2012-08-13 19:07:20 UTC (rev 96536)
@@ -1,15 +0,0 @@
-Index: src/os/unix/ngx_atomic.h
-===================================================================
---- src/os/unix/ngx_atomic.h	(revision 4608)
-+++ src/os/unix/ngx_atomic.h	(working copy)
-@@ -47,10 +47,6 @@
- 
- #include <libkern/OSAtomic.h>
- 
--/* "bool" conflicts with perl's CORE/handy.h */
--#undef bool
--
--
- #define NGX_HAVE_ATOMIC_OPS  1
- 
- #if (NGX_PTR_SIZE == 8)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120813/5aa50169/attachment.html>