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

Homebrew · Oct 15, 2011 · 4e76924 · 4e76924
2 parents 9cbffce + 5a1fcee
commit 4e76924
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 13 deletions.
diff --git a/Library/Contributions/examples/brew-unpack.rb b/Library/Contributions/examples/brew-unpack.rb
@@ -39,6 +39,10 @@ def patch
       do_patch
     end
   end
+
+  # handle_llvm_failure() requires extend/ENV, so let's never fail
+  # with llvm since we don't particularly care in this context.
+  def fails_with_llvm?; false; end
 end
 
 module Homebrew extend self

diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
@@ -57,7 +57,7 @@ def install
 
     args = ["--prefix=#{prefix}",
             "--libdir=#{lib}",
-            "-j#{Hardware.processor_count}",
+            "-j#{ENV.make_jobs}",
             "--layout=tagged",
             "--user-config=user-config.jam",
             "threading=multi",

diff --git a/Library/Formula/csstidy.rb b/Library/Formula/csstidy.rb
@@ -8,7 +8,7 @@ class Csstidy < Formula
 
   def install
     arch = Hardware.is_64_bit? ? 'x64' : 'ia32'
-    system "scons", "-j #{Hardware.processor_count}",
+    system "scons", "-j #{ENV.make_jobs}",
                     "arch=#{arch}"
 
     bin.install "release/csstidy/csstidy"

diff --git a/Library/Formula/ledger.rb b/Library/Formula/ledger.rb
@@ -19,7 +19,7 @@ def install
     else
       # gmp installs x86_64 only
       inreplace 'acprep', "'-arch', 'i386', ", "" if Hardware.is_64_bit?
-      system "./acprep -j#{Hardware.processor_count} opt make -- --prefix=#{prefix}"
+      system "./acprep -j#{ENV.make_jobs} opt make -- --prefix=#{prefix}"
     end
     system 'make'
     ENV.deparallelize

diff --git a/Library/Formula/libexif.rb b/Library/Formula/libexif.rb
@@ -1,11 +1,11 @@
 require 'formula'
 
 class Libexif < Formula
-  url 'http://downloads.sourceforge.net/project/libexif/libexif/0.6.19/libexif-0.6.19.tar.bz2'
+  url 'http://downloads.sourceforge.net/project/libexif/libexif/0.6.20/libexif-0.6.20.tar.bz2'
   homepage 'http://libexif.sourceforge.net/'
-  md5 '56144a030a4c875c600b1ccf713f69f7'
+  md5 '19844ce6b5d075af16f0d45de1e8a6a3'
 
-  fails_with_llvm "segfault with llvm"
+  fails_with_llvm "segfault with llvm", :build => 2334
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"

diff --git a/Library/Formula/mkvtoolnix.rb b/Library/Formula/mkvtoolnix.rb
@@ -17,7 +17,7 @@ def install
                           "--prefix=#{prefix}",
                           "--with-boost-libdir=#{HOMEBREW_PREFIX}/lib", # For non-/usr/local prefix
                           "--with-boost-regex=boost_regex-mt" # via macports
-    system "./drake -j#{Hardware.processor_count}"
+    system "./drake -j#{ENV.make_jobs}"
     system "./drake install"
   end
 end
diff --git a/Library/Formula/quassel.rb b/Library/Formula/quassel.rb
@@ -1,6 +1,8 @@
 require 'formula'
 
 class Quassel < Formula
+  url 'http://www.quassel-irc.org/pub/quassel-0.7.3.tar.bz2'
+  md5 'f12b2b09d8ebe533781aa969597d671c'
   head 'git://git.quassel-irc.org/quassel.git'
   homepage 'http://www.quassel-irc.org/'
 

diff --git a/Library/Formula/sphinx.rb b/Library/Formula/sphinx.rb
@@ -2,7 +2,7 @@
 
 class Libstemmer < Formula
   # upstream is constantly changing the tarball,
-  # so doing checksumv verification here would require
+  # so doing checksum verification here would require
   # constant, rapid updates to this formula.
   head 'http://snowball.tartarus.org/dist/libstemmer_c.tgz'
   homepage 'http://snowball.tartarus.org/'
@@ -14,7 +14,8 @@ class Sphinx < Formula
   md5 '7b9b618cb9b378f949bb1b91ddcc4f54'
   head 'http://sphinxsearch.googlecode.com/svn/trunk/'
 
-  fails_with_llvm "fails with: ld: rel32 out of range in _GetPrivateProfileString from /usr/lib/libodbc.a(SQLGetPrivateProfileString.o)"
+  fails_with_llvm "ld: rel32 out of range in _GetPrivateProfileString from /usr/lib/libodbc.a(SQLGetPrivateProfileString.o)",
+    :build => 2334
 
   def install
     lstem = Pathname.pwd+'libstemmer_c'

diff --git a/Library/Formula/v8.rb b/Library/Formula/v8.rb
@@ -9,7 +9,7 @@ class V8 < Formula
   def install
     arch = Hardware.is_64_bit? ? 'x64' : 'ia32'
 
-    system "scons", "-j #{Hardware.processor_count}",
+    system "scons", "-j #{ENV.make_jobs}",
                     "arch=#{arch}",
                     "mode=release",
                     "snapshot=on",

diff --git a/Library/Formula/v8cgi.rb b/Library/Formula/v8cgi.rb
@@ -33,7 +33,7 @@ def install
     args << (ARGV.include? '--with-sqlite') ? 'sqlite=1' : 'sqlite=0'
 
     system "scons",
-            "-j #{Hardware.processor_count}",
+            "-j #{ENV.make_jobs}",
             "arch=#{arch}",
             "library=shared",
             "socket=1",

diff --git a/Library/Formula/vice.rb b/Library/Formula/vice.rb
@@ -15,8 +15,9 @@ def remove_unused_icons
     end
   end
 
+  fails_with_llvm "Cannot build with LLVM"
+
   def install
-    fails_with_llvm "Cannot build with LLVM"
     ENV.libpng
 
     # Disable the zlibtest, we know we have it.

diff --git a/Library/Formula/vrpn.rb b/Library/Formula/vrpn.rb
@@ -4,7 +4,6 @@ class Vrpn < Formula
   url 'ftp://ftp.cs.unc.edu/pub/packages/GRIP/vrpn/vrpn_07_29.zip'
   md5 '422f13fc9cbb62d36c96f3cc3b06cec9'
   head 'git://git.cs.unc.edu/vrpn.git'
-  version '07.29'
   homepage 'http://vrpn.org'
 
   depends_on 'libusb' # for HID support

diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
@@ -178,6 +178,11 @@ def audit_formula_urls f
 
   urls = [(f.url rescue nil), (f.head rescue nil)].reject {|p| p.nil?}
 
+  f.mirrors.each do |m|
+    mirror = m.values_at :url
+    urls << (mirror.to_s rescue nil)
+  end
+
   # Check SourceForge urls
   urls.each do |p|
     # Is it a filedownload (instead of svnroot)