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

Library/ENV/4.3/cc

@@ -41,7 +41,12 @@ class Cmd
   def tool
     @tool ||= case @arg0
     when 'ld' then 'ld'
-    when 'cc' then ENV['HOMEBREW_CC']
+    when 'cc', 'c99', 'c89'
+      # Ideally we would run `cx9`, however these tools are POSIX compliant
+      # and don't support many flags. We need -isystem for instance, but also
+      # reliability is generally much higher if we just get clang/gcc to do
+      # the work since Makefiles are dumb and include a lot of excess flags.
+      ENV['HOMEBREW_CC']
     when 'c++'
       if ENV['HOMEBREW_CC'] =~ /gcc/
         'g++'
@@ -120,9 +125,11 @@ class Cmd
     if cccfg? 'Ob'
       %w{-mtune=generic -Oz}
     elsif cccfg? 'O'
-      u = '-arch i386 -arch x86_64' if cccfg? 'u'
-      c = case tool when 'clang', 'clang++' then '-march=native' end
-      %w{-pipe -w -Os} << u << c
+      args = %w{-pipe -w -Os}
+      args << '-march=native' if tool =~ /clang/
+      args += %w{-arch i386 -arch x86_64} if cccfg? 'u'
+      args << "--std=#{@arg0}" if @arg0 =~ /c[89]9/
+      args
     else
       []
     end
@@ -160,7 +167,9 @@ class Cmd
   def make_fuss args
     dels = @args - args
     adds = args - @args
+    dups = dels & args
     puts "brew: Superenv removed: #{dels*' '}" unless dels.empty?
+    puts "brew: Superenv deduped: #{dels}" unless dups.empty?
     puts "brew: Superenv added: #{adds*' '}" unless adds.empty?
   end
 end

Library/ENV/4.3/make

@@ -2,7 +2,10 @@
 export HOMEBREW_CCCFG="O$HOMEBREW_CCCFG"
 if [ $(basename "$0") == "bsdmake" ]; then
   pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-  exec "$pwd/../../../bin/bsdmake" "$@"
+  bsd="$pwd/../../../bin/bsdmake"
+  # bsdmake used to be keg-only: support users who don't run brew doctor
+  [ -x "$bsd" ] || bsd="$(brew --prefix bsdmake)/bin/bsdmake"
+  exec "$bsd" "$@"
 else
   exec xcrun make "$@"
 fi

Library/Formula/a2ps.rb

@@ -12,8 +12,8 @@ class A2ps < Formula
   # http://trac.macports.org/ticket/18255
   def patches
     { :p0 => [
-      "https://svn.macports.org/export/56498/trunk/dports/print/a2ps/files/patch-contrib_sample_Makefile.in",
-      "https://svn.macports.org/export/56498/trunk/dports/print/a2ps/files/patch-lib__xstrrpl.c"
+      "https://trac.macports.org/export/56498/trunk/dports/print/a2ps/files/patch-contrib_sample_Makefile.in",
+      "https://trac.macports.org/export/56498/trunk/dports/print/a2ps/files/patch-lib__xstrrpl.c"
     ]}
   end
 

Library/Formula/aqbanking.rb

@@ -1,9 +1,9 @@
 require 'formula'
 
 class Aqbanking < Formula
-  url 'http://www.aquamaniac.de/sites/download/download.php?package=03&release=94&file=01&dummy=aqbanking-5.0.24.0-git.tar.gz'
+  url 'http://www2.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=aqbanking-5.0.25.tar.gz'
   homepage 'http://www.aqbanking.de/'
-  sha1 '00577801882d63ba9ec7a7c900aae25af124586a'
+  sha1 '80314a6f6114a0a3f0062161bb38effc0f1f4b62'
   head 'http://devel.aqbanking.de/svn/aqbanking/trunk'
 
   depends_on 'gettext'

Library/Formula/aria2.rb

@@ -2,8 +2,8 @@
 
 class Aria2 < Formula
   homepage 'http://aria2.sourceforge.net/'
-  url 'http://downloads.sourceforge.net/project/aria2/stable/aria2-1.15.1/aria2-1.15.1.tar.bz2'
-  sha1 '67b70d3492b0edb3af314a253540b921e1bc0c4e'
+  url 'http://downloads.sourceforge.net/project/aria2/stable/aria2-1.15.2/aria2-1.15.2.tar.bz2'
+  sha1 'd33afc9bb4f854f3fc41adf46dd281f0c48b74ec'
 
   depends_on 'pkg-config' => :build
 

Library/Formula/aws-elasticache.rb

@@ -2,9 +2,9 @@
 
 class AwsElasticache < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/2310261897259567'
-  url 'https://s3.amazonaws.com/elasticache-downloads/AmazonElastiCacheCli-2012-03-09-1.6.000.zip'
-  version '1.6.0'
-  sha1 '1a45d1575d4806b432c9da38d9d4b2cadcaaac49'
+  url 'https://s3.amazonaws.com/elasticache-downloads/AmazonElastiCacheCli-2012-03-09-1.6.001.zip'
+  version '1.6.001'
+  sha1 '926ad40c8de4148ba14d3ea472cc56cbf445fc36'
 
   depends_on 'ec2-api-tools'
 

Library/Formula/basex.rb

@@ -0,0 +1,21 @@
+require 'formula'
+
+class Basex < Formula
+  homepage 'http://basex.org'
+  url 'http://files.basex.org/releases/7.3/BaseX73.zip'
+  version '7.3'
+  sha1 'f996b953c08a3a0bdce0985e0f939d4854216413'
+
+  def install
+    rm Dir['bin/*.bat']
+    rm_rf "repo"
+    rm_rf "data"
+    rm_rf "etc"
+    libexec.install Dir['*']
+    bin.install_symlink Dir["#{libexec}/bin/*"]
+  end
+
+  def test
+    system "#{bin}/basex", "'1 to 10'"
+  end
+end

Library/Formula/gpac.rb

@@ -41,7 +41,7 @@ def install
             # Force detection of X libs on 64-bit kernel
             "--extra-ldflags=-L#{MacOS::X11.lib}"]
 
-    system "chmod +x configure"
+    chmod 0700, "configure"
     system "./configure", *args
     system "make"
     system "make install"

Library/Formula/gradle.rb

@@ -2,14 +2,8 @@
 
 class Gradle < Formula
   homepage 'http://www.gradle.org/'
-  url 'http://services.gradle.org/distributions/gradle-1.1-bin.zip'
-  sha1 '938b2a4e40fd2fd701c5138edbcbab54b9b7f85e'
-
-  devel do
-    url 'http://services.gradle.org/distributions/gradle-1.2-rc-1-bin.zip'
-    sha1 '3e64ca9c8cbf1f03da4d5c20a42cb46464d0a820'
-    version '1.2-rc1'
-  end
+  url 'http://services.gradle.org/distributions/gradle-1.2-bin.zip'
+  sha1 'eeb372596534a813dd9ae7ff2f619567030946da'
 
   def install
     rm_f Dir["bin/*.bat"]

Library/Formula/grails.rb

@@ -2,8 +2,8 @@
 
 class Grails < Formula
   homepage 'http://grails.org'
-  url 'http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.1.0.zip'
-  sha1 'c0c6272aa7a85ab7e69df28d601245a0b823c68f'
+  url 'http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.1.1.zip'
+  sha1 '1beaa46a00ddd11c8c090c926e2f54af85530cc1'
 
   def install
     rm_f Dir["bin/*.bat", "bin/cygrails", "*.bat"]

Library/Formula/groovy.rb

@@ -2,8 +2,8 @@
 
 class Groovy < Formula
   homepage 'http://groovy.codehaus.org/'
-  url 'http://dist.groovy.codehaus.org/distributions/groovy-binary-2.0.1.zip'
-  sha1 '8368651e4c96e2ab272d2a0623861c817d947316'
+  url 'http://dist.groovy.codehaus.org/distributions/groovy-binary-2.0.2.zip'
+  sha1 '024104492f110b4395d6efd40207f8726468c6b4'
 
   def install
     # Don't need Windows files.

Library/Formula/ios-sim.rb

@@ -2,8 +2,8 @@
 
 class IosSim < Formula
   homepage 'https://github.com/phonegap/ios-sim'
-  url 'https://github.com/phonegap/ios-sim/tarball/1.5'
-  sha1 '3f9095e091602cf0c9a447d35a2558622a87d2c1'
+  url 'https://github.com/phonegap/ios-sim/tarball/1.5.1'
+  sha1 'ccacb1cec833a766c0960b7f400330a5d0664cbd'
 
   def install
     system "rake", "install", "prefix=#{prefix}"

Library/Formula/json-c.rb

@@ -1,12 +1,13 @@
 require 'formula'
 
 class JsonC < Formula
+  homepage 'https://github.com/json-c/json-c/wiki'
   url 'http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz'
-  homepage 'http://oss.metaparadigm.com/json-c/'
   sha1 'daaf5eb960fa98e137abc5012f569b83c79be90f'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end

Library/Formula/ledger.rb

@@ -7,30 +7,39 @@ class Ledger < Formula
 
   head 'https://github.com/jwiegley/ledger.git', :branch => 'next'
 
-  option 'no-python', 'Disable Python support'
+  option 'debug', 'Build with debugging symbols enabled'
+  option 'python', 'Enable Python support'
+  option 'time-colon', 'Apply time-colon patch'
 
   depends_on 'gettext'
   depends_on 'boost'
   depends_on 'mpfr'
   depends_on 'gmp'
   depends_on 'pcre'
   depends_on 'expat'
+  depends_on 'cmake' if build.head?
+
+  def patches
+    p = {:p1 => []}
+    p[:p1] << 'https://raw.github.com/gist/856799/66158f9f3b732d658f5d0784407ec63a0be33746/ledger_time_colon.patch' if build.include? 'time-colon'
+    p
+  end
 
   def install
     # find Homebrew's libpcre
     ENV.append 'LDFLAGS', "-L#{HOMEBREW_PREFIX}/lib"
 
     if build.head?
-      # gmp installs x86_64 only
-      inreplace 'acprep', "'-arch', 'i386', ", "" if Hardware.is_64_bit?
-      no_python = ((build.include? 'no-python') ? '--no-python' : '')
-      system "./acprep", no_python, "-j#{ENV.make_jobs}", "opt", "make", "--", "--prefix=#{prefix}"
+      args = [((build.include? 'debug') ? 'debug' : 'opt'), "make", "-j#{ENV.make_jobs}", "--output=build"]
+      args << '--python' if build.include? 'python'
+      system "./acprep", *args
+      system "cmake", "-D", "CMAKE_INSTALL_PREFIX=#{prefix}", "-P", "build/cmake_install.cmake"
     else
       system "./configure", "--disable-debug", "--disable-dependency-tracking",
                             "--prefix=#{prefix}"
+      system 'make'
+      ENV.deparallelize
+      system 'make install'
     end
-    system 'make'
-    ENV.deparallelize
-    system 'make install'
   end
 end

Library/Formula/maven.rb

@@ -2,7 +2,7 @@
 
 class Maven < Formula
   homepage 'http://maven.apache.org/'
-  url 'http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-3.0.4-bin.tar.gz'
+  url 'http://www.apache.org/dyn/closer.cgi/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz'
   sha1 '0de5dc162bafde3fcb0a6b009cfeea81a042523b'
 
   def install

Library/Formula/mercurial.rb

@@ -2,8 +2,8 @@
 
 class Mercurial < Formula
   homepage 'http://mercurial.selenic.com/'
-  url 'http://mercurial.selenic.com/release/mercurial-2.3.tar.gz'
-  sha1 'f5fb472500deb01677f1b2e82c7872fe06069cdb'
+  url 'http://mercurial.selenic.com/release/mercurial-2.3.1.tar.gz'
+  sha1 '59e42fd0aebabe8ec9bd59ca6a41416032f7ca48'
 
   head 'http://selenic.com/repo/hg', :using => :hg
 

Library/Formula/mongodb.rb

@@ -15,8 +15,6 @@ class Mongodb < Formula
 
   option '32-bit'
 
-  skip_clean :all
-
   def install
     # Copy the prebuilt binaries to prefix
     prefix.install Dir['*']
@@ -28,25 +26,34 @@ def install
     # Write the configuration files
     (prefix+'mongod.conf').write mongodb_conf
 
+    # Homebrew: it just works.
+    mv (sh = bin/'mongod'), prefix
+    sh.write <<-EOS.undent
+      #!/usr/bin/env ruby
+      ARGV << '--config' << '#{etc}/mongod.conf' unless ARGV.include? '--config'
+      exec "#{prefix}/mongod", *ARGV
+    EOS
+    sh.chmod 0755
+
     # copy the config file to etc if this is the first install.
     etc.install prefix+'mongod.conf' unless File.exists? etc+"mongod.conf"
   end
 
-  def caveats; <<-EOS.undent
+  def caveats
+    bn = plist_path.basename
+    plist_path = "#{HOMEBREW_PREFIX}/opt/#{name}/*.plist"
+    <<-EOS.undent
     If this is your first install, automatically load on login with:
         mkdir -p ~/Library/LaunchAgents
-        cp #{plist_path} ~/Library/LaunchAgents/
-        launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
-
-    If this is an upgrade and you already have the #{plist_path.basename} loaded:
-        launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
-        cp #{plist_path} ~/Library/LaunchAgents/
-        launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
+        ln -s #{plist_path} ~/Library/LaunchAgents/
+        launchctl load -w ~/Library/LaunchAgents/#{bn}
 
-    Or start it manually:
-        mongod run --config #{etc}/mongod.conf
+    If this is an upgrade and you already have the plist loaded:
+        launchctl unload -w ~/Library/LaunchAgents/#{bn}
+        launchctl load -w ~/Library/LaunchAgents/#{bn}
 
-    The launchctl plist above expects the config file to be at #{etc}/mongod.conf.
+    Or just start it manually:
+        mongod
     EOS
   end
 

Library/Formula/mp3fs.rb

@@ -0,0 +1,23 @@
+require 'formula'
+
+class Mp3fs < Formula
+  homepage 'http://khenriks.github.com/mp3fs/'
+  url 'https://github.com/downloads/khenriks/mp3fs/mp3fs-0.32.tar.gz'
+  sha1 'e6aef12f753721c87bdecfb4dca7e3721a808828'
+
+  depends_on 'pkg-config' => :build
+  depends_on 'lame'
+  depends_on 'fuse4x'
+  depends_on 'libid3tag'
+  depends_on 'flac'
+
+  def install
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make install"
+  end
+
+  def test
+    system "#{bin}/mp3fs -V | grep MP3FS && true || false"
+  end
+end

Library/Formula/mpd.rb

@@ -8,6 +8,7 @@ class Mpd < Formula
   head "git://git.musicpd.org/master/mpd.git"
 
   option "lastfm", "Compile with experimental support for Last.fm radio"
+  option 'libwrap', 'Enable support of TCP Wrappers (buggy on 10.7)'
 
   depends_on 'pkg-config' => :build
   depends_on 'glib'
@@ -38,6 +39,7 @@ def install
             "--enable-lame-encoder"]
     args << "--disable-curl" if MacOS.version == :leopard
     args << "--enable-lastfm" if build.include?("lastfm")
+    args << '--disable-libwrap' unless build.include? 'libwrap'
 
     system "./configure", *args
     system "make install"

Library/Formula/mutt.rb

@@ -22,10 +22,10 @@ def options
   def patches
     urls = [
       ['--sidebar-patch', 'http://lunar-linux.org/~tchan/mutt/patch-1.5.21.sidebar.20120829.txt'],
-      ['--trash-patch', 'http://patch-tracker.debian.org/patch/series/dl/mutt/1.5.21-6.1/features/trash-folder'],
+      ['--trash-patch', 'http://patch-tracker.debian.org/patch/series/dl/mutt/1.5.21-6.2/features/trash-folder'],
       ['--ignore-thread-patch', 'http://ben.at.tanjero.com/patches/ignore-thread-1.5.21.patch'],
       ['--pgp-verbose-mime-patch',
-          'http://patch-tracker.debian.org/patch/series/dl/mutt/1.5.21-6.1/features-old/patch-1.5.4.vk.pgp_verbose_mime'],
+          'http://patch-tracker.debian.org/patch/series/dl/mutt/1.5.21-6.2/features-old/patch-1.5.4.vk.pgp_verbose_mime'],
     ]
 
     p = []

Library/Formula/mysql.rb

@@ -26,6 +26,7 @@ class Mysql < Formula
 
   conflicts_with 'mariadb',
     :because => "mysql and mariadb install the same binaries."
+
   conflicts_with 'percona-server',
     :because => "mysql and percona-server install the same binaries."
 
@@ -34,8 +35,6 @@ class Mysql < Formula
     cause "https://github.com/mxcl/homebrew/issues/issue/144"
   end
 
-  skip_clean :all # So "INSTALL PLUGIN" can work.
-
   def install
     # Build without compiler or CPU specific optimization flags to facilitate
     # compilation of gems and other software that queries `mysql-config`.

Library/Formula/nginx.rb

@@ -6,8 +6,8 @@ class Nginx < Formula
   sha1 '98059ae08ebbfaaead868128f7b66ebce16be9af'
 
   devel do
-    url 'http://nginx.org/download/nginx-1.3.5.tar.gz'
-    sha1 'ce0245295f23a54f10d916eb6b7b34469d0618a1'
+    url 'http://nginx.org/download/nginx-1.3.6.tar.gz'
+    sha1 '8f1f1bd9a98a2d72a5b6fce24d67e9d5f48b5224'
   end
 
   depends_on 'pcre'