Update Nginx

* Bump HEAD version to 0.8.42
* Remove pcre dependency; ./configure finds the system pcre and uses that
* Strip whitespace

1 files changed, 13 insertions, 15 deletions

diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index d6aea4bc1..74aae2965 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -2,17 +2,15 @@ require 'formula'
 
 class Nginx < Formula
   url 'http://nginx.org/download/nginx-0.7.67.tar.gz'
-  head 'http://nginx.org/download/nginx-0.8.41.tar.gz'
+  head 'http://nginx.org/download/nginx-0.8.42.tar.gz'
   homepage 'http://nginx.org/'
 
   if ARGV.include? '--HEAD'
-    @md5='b32dd29c10acede70f5ac81911f48707'
+    @md5='2818e8b03512b239f1238d702703bcf3'
   else
     @md5='b6e175f969d03a4d3c5643aaabc6a5ff'
   end
 
-  depends_on 'pcre'
-  
   skip_clean 'logs'
 
   def patches
@@ -26,35 +24,35 @@ class Nginx < Formula
       ['--with-passenger', "Compile with support for Phusion Passenger module"]
     ]
   end
-  
+
   def passenger_config_args
       passenger_root = `passenger-config --root`.chomp
-      
+
       if File.directory?(passenger_root)
         return "--add-module=#{passenger_root}/ext/nginx"
       end
-      
+
       puts "Unable to install nginx with passenger support. The passenger"
       puts "gem must be installed and passenger-config must be in your path"
       puts "in order to continue."
       exit
   end
-    
+
   def install
     configure_args = [
       "--prefix=#{prefix}",
       "--with-http_ssl_module"
     ]
-    
+
     configure_args << passenger_config_args if ARGV.include? '--with-passenger'
-    
+
     system "./configure", *configure_args
     system "make install"
   end
-  
+
   def caveats
     <<-CAVEATS
-In the interest of allowing you to run `nginx` without `sudo`, the default 
+In the interest of allowing you to run `nginx` without `sudo`, the default
 port is set to localhost:8080.
 
 If you want to host pages on your local machine to the public, you should
@@ -70,7 +68,7 @@ __END__
 @@ -155,6 +155,22 @@ else
              . auto/feature
          fi
- 
+
 +        if [ $ngx_found = no ]; then
 +
 +            # Homebrew
@@ -94,10 +92,10 @@ __END__
 +++ b/conf/nginx.conf
 @@ -33,7 +33,7 @@
      #gzip  on;
- 
+
      server {
 -        listen       80;
 +        listen       8080;
          server_name  localhost;
- 
+
          #charset koi8-r;