Merge branch 'master' of https://github.com/mxcl/homebrew

Homebrew · Oct 3, 2011 · c30a0e6 · c30a0e6
2 parents c9eb941 + 52eaf97
commit c30a0e6
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 24 deletions.
diff --git a/Library/Formula/bedtools.rb b/Library/Formula/bedtools.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Bedtools < Formula
-  url 'http://bedtools.googlecode.com/files/BEDTools.v2.13.2.tar.gz'
+  url 'http://bedtools.googlecode.com/files/BEDTools.v2.13.3.tar.gz'
   homepage 'http://code.google.com/p/bedtools/'
-  md5 'cd3671eda69da312237523beadefbd52'
+  md5 '4119b0e84d49b0a7425070c82b4d1920'
   head 'https://github.com/arq5x/bedtools.git'
 
   def install

diff --git a/Library/Formula/chkrootkit.rb b/Library/Formula/chkrootkit.rb
@@ -7,17 +7,17 @@ class Chkrootkit < Formula
   version '0.49'
 
   def install
-    chmod 0755, 'Makefile' # Makefile is read-only
+    chmod 0644, 'Makefile' # Makefile is read-only
 
     inreplace 'Makefile' do |s|
-          s.remove_make_var! 'STATIC'
+      s.remove_make_var! 'STATIC'
     end
 
     system "make CC=#{ENV.cc} sense"
 
     sbin.install ['check_wtmpx', 'chkdirs', 'chklastlog', 'chkproc',
-                 'chkrootkit', 'chkutmp', 'chkwtmp', 'ifpromisc',
-                 'strings-static']
+                  'chkrootkit', 'chkutmp', 'chkwtmp', 'ifpromisc',
+                  'strings-static']
     doc.install ['README', 'README.chklastlog', 'README.chkwtmp']
   end
 

diff --git a/Library/Formula/exiftool.rb b/Library/Formula/exiftool.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Exiftool < Formula
-  url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.65.tar.gz'
+  url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.66.tar.gz'
   homepage 'http://www.sno.phy.queensu.ca/~phil/exiftool/index.html'
-  md5 '8b27b63af0eec744afb7f373750c282b'
+  md5 '0aad446fbe5c529470c3b6fba177507a'
 
   def install
     system "perl", "Makefile.PL"

diff --git a/Library/Formula/gmp.rb b/Library/Formula/gmp.rb
@@ -27,7 +27,7 @@ def install
       args << "--build=x86_64-apple-darwin"
     else
       ENV.m32
-      args << "--host=none-apple-darwin"
+      args << "--build=none-apple-darwin"
     end
 
     system "./configure", *args

diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb
@@ -1,9 +1,10 @@
 require 'formula'
 
 class Mapnik < Formula
-  url 'http://download.berlios.de/mapnik/mapnik-0.7.1.tar.gz'
+  url 'http://download.berlios.de/mapnik/mapnik-2.0.0.tar.gz'
   homepage 'http://www.mapnik.org/'
-  md5 '3a070fdd7c6a3367ad78d95c2387b03b'
+  md5 '3b0dacbf98f24dbcf113c6f4b1d7f0c8'
+  head 'http://svn.mapnik.org/trunk', :using => :svn
 
   depends_on 'pkg-config' => :build
   depends_on 'scons' => :build
@@ -17,11 +18,6 @@ class Mapnik < Formula
   def install
     ENV.x11 # for freetype-config
 
-    # Allow compilation against boost 1.46
-    inreplace ["src/datasource_cache.cpp", "src/libxml2_loader.cpp", "src/load_map.cpp", "src/tiff_reader.cpp"],
-      "#include <boost/filesystem/operations.hpp>",
-      "#define BOOST_FILESYSTEM_VERSION 2\n#include <boost/filesystem/operations.hpp>"
-
     icu = Formula.factory("icu4c")
     system "scons",
         "PREFIX=#{prefix}",

diff --git a/Library/Formula/mpfr.rb b/Library/Formula/mpfr.rb
@@ -1,20 +1,16 @@
 require 'formula'
 
 class Mpfr < Formula
-  url 'http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2'
+  url 'http://www.mpfr.org/mpfr-3.1.0/mpfr-3.1.0.tar.bz2'
   homepage 'http://www.mpfr.org/'
-  md5 'bfbecb2eacb6d48432ead5cfc3f7390a'
+  md5 '238ae4a15cc3a5049b723daef5d17938'
 
   depends_on 'gmp'
 
   def options
     [["--32-bit", "Force 32-bit."]]
   end
 
-  def patches
-    {:p1 => ['http://www.mpfr.org/mpfr-3.0.1/allpatches']}
-  end
-
   def install
     args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
 
@@ -25,7 +21,7 @@ def install
       args << "--build=x86_64-apple-darwin"
     else
       ENV.m32
-      args << "--host=none-apple-darwin"
+      args << "--build=none-apple-darwin"
     end
 
     system "./configure", *args

diff --git a/Library/Formula/redo.rb b/Library/Formula/redo.rb
@@ -9,7 +9,7 @@ class Redo < Formula
   version '0.06'
   url "https://github.com/apenwarr/redo/zipball/redo-#{version}"
   homepage 'https://github.com/apenwarr/redo'
-  md5 '7af7d8a639943731bb0370427b55bf10'
+  md5 '28c32ca00bb4d884e0d87c89808771a6'
 
   def install
     ENV['PREFIX'] = prefix

diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
@@ -759,6 +759,23 @@ def check_git_status
   end
 end
 
+def check_for_leopard_ssl
+  if MacOS.leopard? and not ENV['GIT_SSL_NO_VERIFY']
+    puts <<-EOS.undent
+      The version of libcurl provided with Mac OS X Leopard has outdated
+      SSL certificates.
+
+      This can cause problems when running Homebrew commands that use Git to
+      fetch over HTTPS, e.g. `brew update` or installing formulae that perform
+      Git checkouts.
+
+      You can force Git to ignore these errors by setting $GIT_SSL_NO_VERIFY.
+        export GIT_SSL_NO_VERIFY=1
+
+    EOS
+  end
+end
+
 module Homebrew extend self
   def doctor
     old_stdout = $stdout
@@ -802,6 +819,7 @@ def doctor
       check_tmpdir
       check_missing_deps
       check_git_status
+      check_for_leopard_ssl
     ensure
       $stdout = old_stdout
     end