diff options
| author | Chris Hoffman | 2010-07-09 01:06:29 -0500 |
|---|---|---|
| committer | Adam Vandenberg | 2010-07-09 06:56:26 -0700 |
| commit | 705b2f894ac7e08439677d84451b0e98adff96ae (patch) | |
| tree | dd81e3c8d3173ad8b71597417134845d3c0f140e /Library | |
| parent | a149f24bc64c43edbf0152bd72f41b13e38e3119 (diff) | |
| download | homebrew-705b2f894ac7e08439677d84451b0e98adff96ae.tar.bz2 | |
Change nginx head, make nginx use homebrew installed pcre, and check for -H flag
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/nginx.rb | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb index c8343ec66..7be9054ff 100644 --- a/Library/Formula/nginx.rb +++ b/Library/Formula/nginx.rb @@ -2,24 +2,22 @@ require 'formula' class Nginx < Formula url 'http://nginx.org/download/nginx-0.7.67.tar.gz' - head 'http://nginx.org/download/nginx-0.8.43.tar.gz' + head 'http://nginx.org/download/nginx-0.8.44.tar.gz' homepage 'http://nginx.org/' - if ARGV.include? '--HEAD' - @md5='db13a36e5b6d1766e65d658eb1429803' + unless (ARGV & ['--HEAD', '-H']).empty? + @md5='7158c67ba2697f7d469aa7b17bef202f' else @md5='b6e175f969d03a4d3c5643aaabc6a5ff' end - # Nginx sometimes needs to find PCRE in /usr/local/lib even though - # it links against the system library in /usr/lib. The upstream - # configure scripts really ought to be fixed. - depends_on 'pcre' if ARGV.flag? "--hack" + depends_on 'pcre' skip_clean 'logs' def patches # Changes default port to 8080 + # Set configure to look in homebrew prefix for pcre DATA end @@ -63,6 +61,31 @@ any other web servers running port 80, of course. end __END__ +--- a/auto/lib/pcre/conf ++++ b/auto/lib/pcre/conf +@@ -155,6 +155,22 @@ else + . auto/feature + fi + ++ if [ $ngx_found = no ]; then ++ ++ # Homebrew ++ HOMEBREW_PREFIX=${NGX_PREFIX%Cellar*} ++ ngx_feature="PCRE library in ${HOMEBREW_PREFIX}" ++ ngx_feature_path="${HOMEBREW_PREFIX}/include" ++ ++ if [ $NGX_RPATH = YES ]; then ++ ngx_feature_libs="-R${HOMEBREW_PREFIX}/lib -L${HOMEBREW_PREFIX}/lib -lpcre" ++ else ++ ngx_feature_libs="-L${HOMEBREW_PREFIX}/lib -lpcre" ++ fi ++ ++ . auto/feature ++ fi ++ + if [ $ngx_found = yes ]; then + CORE_DEPS="$CORE_DEPS $REGEX_DEPS" + CORE_SRCS="$CORE_SRCS $REGEX_SRCS" --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -33,7 +33,7 @@ |