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

Homebrew · Sep 22, 2012 · 37cca40 · 37cca40
2 parents 108340d + 523a7a6
commit 37cca40
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 49 deletions.
diff --git a/Library/Formula/armadillo.rb b/Library/Formula/armadillo.rb
@@ -2,8 +2,8 @@
 
 class Armadillo < Formula
   homepage 'http://arma.sourceforge.net/'
-  url 'http://sourceforge.net/projects/arma/files/armadillo-3.4.0.tar.gz'
+  url 'http://sourceforge.net/projects/arma/files/armadillo-3.4.1.tar.gz'
-  sha1 'e7fdb6518172aabaa28c84412b52db7d86ef37a5'
+  sha1 '16f11ee6e7a545581ab239e7f826e14d7d1c2e3a'
 
   depends_on 'cmake' => :build
   depends_on 'boost'

diff --git a/Library/Formula/leiningen.rb b/Library/Formula/leiningen.rb
@@ -7,6 +7,12 @@ class Leiningen < Formula
 
   head 'https://github.com/technomancy/leiningen.git'
 
+  devel do
+    url 'https://github.com/technomancy/leiningen/tarball/2.0.0-preview10'
+    version '2.0.0-preview10'
+    sha1 'e6bef03e50c2f0bfaa927c52953440c24a9ce235'
+  end
+
   def install
     bin.install "bin/lein"
     system "#{bin}/lein", "self-install"

diff --git a/Library/Formula/libgtop.rb b/Library/Formula/libgtop.rb
@@ -17,7 +17,8 @@ def patches; DATA; end
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
+                          "--prefix=#{prefix}",
+                          "--without-x"
     system "make install"
   end
 end

diff --git a/Library/Formula/liblastfm.rb b/Library/Formula/liblastfm.rb
@@ -2,19 +2,14 @@
 
 class Liblastfm < Formula
   homepage 'https://github.com/mxcl/liblastfm/'
-  url 'https://github.com/mxcl/liblastfm/tarball/0.3.3'
+  url 'https://github.com/mxcl/liblastfm/tarball/e380c7f03f4b2417db87372df733606f4a153c53'
-  sha1 'f2e9705c9c2cbeaa14f46da9bd35ab36fe710392'
+  version '0.3.3.1'
+  sha1 'c68691b63a383f2a53a5894b99f165ffed4ea0db'
 
   depends_on 'qt'
   depends_on 'fftw'
   depends_on 'libsamplerate'
 
-  # See issue #12886.  Reported in: https://github.com/mxcl/liblastfm/issues/14
-  fails_with :clang do
-    build 318
-    cause 'error: reference to non-static member function must be called'
-  end
-
   def install
     system "./configure", "--release", "--prefix", prefix
     system "make"

diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb
@@ -0,0 +1,18 @@
+require 'formula'
+
+class Libmusicbrainz < Formula
+  homepage 'http://musicbrainz.org/doc/libmusicbrainz'
+  url 'https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-5.0.1.tar.gz'
+  sha1 'd4823beeca3faf114756370dc7dd6e3cd01d7e4f'
+
+  depends_on 'cmake' => :build
+  depends_on 'neon'
+
+  def install
+    neon = Formula.factory("neon")
+    neon_args = %W[-DNEON_LIBRARIES:FILEPATH=#{neon.lib}/libneon.dylib
+                 -DNEON_INCLUDE_DIR:PATH=#{neon.include}/neon]
+    system "cmake", ".", *(std_cmake_args + neon_args)
+    system "make install"
+  end
+end
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
@@ -65,6 +65,7 @@ def install
 
     # install clang tools and bindings
     cd clang_dir do
+      system 'make install'
       (share/'clang/tools').install 'tools/scan-build', 'tools/scan-view'
       (share/'clang/bindings').install 'bindings/python'
     end if build.include? 'with-clang'

diff --git a/Library/Formula/memcached.rb b/Library/Formula/memcached.rb
@@ -2,8 +2,8 @@
 
 class Memcached < Formula
   homepage 'http://memcached.org/'
-  url "http://memcached.googlecode.com/files/memcached-1.4.14.tar.gz"
+  url "http://memcached.googlecode.com/files/memcached-1.4.15.tar.gz"
-  sha1 'b360a6acf2454452c6fd4a5bdbbc303d85c3ec27'
+  sha1 '12ec84011f408846250a462ab9e8e967a2e8cbbc'
 
   depends_on 'libevent'
 

diff --git a/Library/Formula/node.rb b/Library/Formula/node.rb
@@ -44,8 +44,8 @@ def fatal?
 
 class Node < Formula
   homepage 'http://nodejs.org/'
-  url 'http://nodejs.org/dist/v0.8.8/node-v0.8.8.tar.gz'
+  url 'http://nodejs.org/dist/v0.8.9/node-v0.8.9.tar.gz'
-  sha1 '5ddafc059d2f774e35e6375f5b61157879a46f0f'
+  sha1 '2d3234adceedc2dc87284af88609ede6ecd71734'
 
   head 'https://github.com/joyent/node.git'
 

diff --git a/Library/Formula/osmosis.rb b/Library/Formula/osmosis.rb
@@ -2,8 +2,8 @@
 
 class Osmosis < Formula
   homepage 'http://wiki.openstreetmap.org/wiki/Osmosis'
-  url 'http://bretth.dev.openstreetmap.org/osmosis-build/osmosis-0.40.1.zip'
+  url 'http://bretth.dev.openstreetmap.org/osmosis-build/osmosis-0.41.zip'
-  sha1 '2a51c35b6270af51f6fffaa9d7ed5fa5e1c30a7b'
+  sha1 'b4119871ed74af4c320685a45defb255acf4499f'
 
   def patches
     # need to adjust home dir for a clean install

diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
@@ -2,14 +2,13 @@
 
 class Qt < Formula
   homepage 'http://qt.nokia.com/'
-  url 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz'
+  url 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz'
-  sha1 'e1e2edef1d63ed677d6534d32800c2e1f7ad0e73'
+  sha1 'bc352a283610e0cd2fe0dbedbc45613844090fcb'
 
   bottle do
-    version 1
+    sha1 'ff488747325cd6771fbf0b79156fd3833ff3af63' => :mountainlion
-    sha1 'dfa0daa951e889a2548b1cff66759b449b5a6b98' => :mountainlion
+    sha1 '048517758b2beb2dddabb97f711410ccbcb29c01' => :lion
-    sha1 '0905eb8b2c5a9bae0d1f9a8234173daba680c48c' => :lion
+    sha1 'bb0b7e58d743e7b9147ae0d03cebc83134b8f68c' => :snowleopard
-    sha1 'c37ac19d54c4684d8996a0ee96cdf971bd2c1f7b' => :snowleopard
   end
 
   head 'git://gitorious.org/qt/qt.git', :branch => 'master'
@@ -21,45 +20,34 @@ class Qt < Formula
   option 'with-qt3support', 'Enable deprecated Qt3Support module'
   option 'with-demos-examples', 'Enable Qt demos and examples'
   option 'with-debug-and-release', 'Compile Qt in debug and release mode'
+  option 'with-mysql', 'Enable MySQL plugin'
   option 'developer', 'Compile and link Qt with developer options'
 
   depends_on "d-bus" if build.include? 'with-qtdbus'
+  depends_on "mysql" if build.include? 'with-mysql'
   depends_on 'sqlite' if MacOS.version == :leopard
 
-  fails_with :clang do
-    build 421
-  end
-
   def patches
-    # fixes conflict on osx 10.5. See qt bug:
+    # Fixes compilation failure on Leopard.
     # https://bugreports.qt-project.org/browse/QTBUG-23258
     if MacOS.version == :leopard
       "http://bugreports.qt-project.org/secure/attachment/26712/Patch-Qt-4.8-for-10.5"
-    # add support for Mountain Lion
-    # should be unneeded for 4.8.3
-    elsif MacOS.version >= :mountain_lion
-      [ "https://qt.gitorious.org/qt/qt/commit/422f1b?format=patch",
-        "https://qt.gitorious.org/qt/qt/commit/665355?format=patch",
-        "https://raw.github.com/gist/3187034/893252db0ae3bb9bb5fa3ff7c530c7978399b101/0001-Fix-WebKit-on-OS-X-Mountain-Lion.patch" ]
     end
-
   end
 
   def install
-    # Apply binary git patch; normal patch ignores this.
-    # TODO: Autodetect binary patches and apply them correctly.
-    system "git apply --exclude=*/QtWebKit.pro 002-homebrew.diff" if MacOS.version >= :mountain_lion
-
     ENV.append "CXXFLAGS", "-fvisibility=hidden"
     args = ["-prefix", prefix,
             "-system-zlib",
             "-confirm-license", "-opensource",
             "-cocoa", "-fast" ]
 
+    args << "-platform" << "unsupported/macx-clang" if ENV.compiler == :clang
+
     # See: https://github.com/mxcl/homebrew/issues/issue/744
     args << "-system-sqlite" if MacOS.version == :leopard
 
-    args << "-plugin-sql-mysql" if (HOMEBREW_CELLAR+"mysql").directory?
+    args << "-plugin-sql-mysql" if build.include? 'with-mysql'
 
     if build.include? 'with-qtdbus'
       args << "-I#{Formula.factory('d-bus').lib}/dbus-1.0/include"
@@ -95,7 +83,7 @@ def install
 
     args << '-developer-build' if build.include? 'developer'
 
-    # Needed for Qt 4.8.1 due to attempting to link moc with gcc.
+    # Needed for Qt 4.8.3 due to attempting to link moc with gcc.
     ENV['LD'] = ENV.cxx
 
     system "./configure", *args

diff --git a/Library/Formula/tor.rb b/Library/Formula/tor.rb
@@ -2,8 +2,8 @@
 
 class Tor < Formula
   homepage 'https://www.torproject.org/'
-  url 'https://www.torproject.org/dist/tor-0.2.2.38.tar.gz'
+  url 'https://www.torproject.org/dist/tor-0.2.2.39.tar.gz'
-  sha1 'abac1902d301c6bd5d522e4cc81aead3299cf968'
+  sha1 'cc5021a7656c0cd22de42da9f0ce7335026852bf'
 
   depends_on 'libevent'
 

diff --git a/Library/Homebrew/cmd/--env.rb b/Library/Homebrew/cmd/--env.rb
@@ -26,7 +26,7 @@ def build_env_keys env
       HOMEBREW_USE_GCC HOMEBREW_USE_LLVM HOMEBREW_SVN HOMEBREW_GIT
       HOMEBREW_SDKROOT
       MAKE GIT CPP
-      ACLOCAL_PATH OBJC PATH ].select{ |key| env[key] }
+      ACLOCAL_PATH OBJC PATH ].select{ |key| env.fetch(key) if env.key? key }
   end
 
   def dump_build_env env

diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
@@ -35,8 +35,12 @@ def cleanup_formula f
       f.rack.children.each do |keg|
         if f.installed_prefix != keg
           if f.can_cleanup?
-            puts "Removing #{keg}..."
+            if ARGV.dry_run?
-            rm_rf keg unless ARGV.dry_run?
+              puts "Would remove: #{keg}"
+            else
+              puts "Removing: #{keg}..."
+              rm_rf keg
+            end
           else
             opoo "Skipping (old) keg-only: #{keg}"
           end
@@ -58,8 +62,12 @@ def clean_cache
         f = Formula.factory(name) rescue nil
         old_bottle = bottle_file_outdated? f, pn
         if not f or (f.version != version or ARGV.switch? "s" and not f.installed?) or old_bottle
-          puts "Removing #{pn}..."
+          if ARGV.dry_run?
-          rm pn unless ARGV.dry_run?
+            puts "Would remove: #{pn}"
+          else
+            puts "Removing: #{pn}..."
+            rm pn
+          end
         end
       end
     end

diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
@@ -41,7 +41,7 @@ def reset
   def setup_build_environment
     reset
     check
-    ENV['CC'] = ENV['LD'] = 'cc'
+    ENV['CC'] = 'cc'
     ENV['CXX'] = 'c++'
     ENV['MAKEFLAGS'] ||= "-j#{determine_make_jobs}"
     ENV['PATH'] = determine_path