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

wsxiaoys · Jun 1, 2012 · 507c5af · 507c5af
2 parents 371e0b7 + 7898629
commit 507c5af
Show file tree

Hide file tree

Showing 84 changed files with 926 additions and 381 deletions.
diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
@@ -95,7 +95,7 @@ __brew_complete_tapped ()
 __brew_complete_taps ()
 {
     if [[ -z "$__brew_cached_taps" ]]; then
-        __brew_cached_taps="$(/usr/bin/ruby -e '
+        __brew_cached_taps="$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -e '
             require "open-uri"
             require "yaml"
 

diff --git a/Library/Contributions/cmds/brew-server b/Library/Contributions/cmds/brew-server
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 
 ## brew server: Run a local webserver for browsing available and installed brews.
 # Note: this external command is ruby, but set up as a shell script, so that it gets exec'd.

diff --git a/Library/Contributions/install_homebrew.rb b/Library/Contributions/install_homebrew.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 # This script installs to /usr/local only. To install elsewhere you can just
 # untar https://github.com/mxcl/homebrew/tarball/master anywhere you like.
 

diff --git a/Library/Formula/abyss.rb b/Library/Formula/abyss.rb
@@ -2,8 +2,8 @@
 
 class Abyss < Formula
   homepage 'http://www.bcgsc.ca/platform/bioinfo/software/abyss'
-  url 'http://www.bcgsc.ca/downloads/abyss/abyss-1.3.3.tar.gz'
-  md5 '15953363d4ef5795d3a82d129e4ca240'
+  url 'http://www.bcgsc.ca/downloads/abyss/abyss-1.3.4.tar.gz'
+  md5 '5a79f33f828db3c626627c5facd0f712'
   head 'https://github.com/sjackman/abyss.git'
 
   # Only header files are used from these packages, so :build is appropriate

diff --git a/Library/Formula/agrep.rb b/Library/Formula/agrep.rb
diff --git a/Library/Formula/android-ndk.rb b/Library/Formula/android-ndk.rb
@@ -1,10 +1,10 @@
 require 'formula'
 
 class AndroidNdk < Formula
-  homepage 'http://developer.android.com/sdk/ndk/index.html#overview'
-  url 'http://dl.google.com/android/ndk/android-ndk-r7c-darwin-x86.tar.bz2'
-  md5 '025f57feb5f32ed993a5fa7f5996477d'
-  version 'r7c'
+  homepage 'http://developer.android.com/sdk/ndk/index.html'
+  url 'http://dl.google.com/android/ndk/android-ndk-r8-darwin-x86.tar.bz2'
+  version 'r8'
+  md5 '81ce5de731f945692123b377afe0bad9'
 
   depends_on 'android-sdk'
 
@@ -19,23 +19,23 @@ def install
       BASENAME=`basename $0`
       EXEC="#{prefix}/$BASENAME"
       test -f "$EXEC" && exec "$EXEC" "$@"
-      EOS
+    EOS
     (ndk_exec).chmod 0755
     %w[ ndk-build ndk-gdb ndk-stack ].each { |app| ln_s ndk_exec, bin+app }
   end
 
-  def caveats; <<-EOS
-We agreed to the Android NDK License Agreement for you by downloading the NDK.
-If this is unacceptable you should uninstall.
+  def caveats; <<-EOS.undent
+    We agreed to the Android NDK License Agreement for you by downloading the NDK.
+    If this is unacceptable you should uninstall.
 
-License information at:
-http://developer.android.com/sdk/terms.html
+    License information at:
+    http://developer.android.com/sdk/terms.html
 
-Software and System requirements at:
-http://developer.android.com/sdk/ndk/index.html#requirements
+    Software and System requirements at:
+    http://developer.android.com/sdk/ndk/index.html#requirements
 
-For more documentation on Android NDK, please check:
-  #{prefix}/docs
-EOS
+    For more documentation on Android NDK, please check:
+      #{prefix}/docs
+    EOS
   end
 end
diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
@@ -1,22 +1,20 @@
 require 'formula'
 
 class AndroidSdk < Formula
-  url 'http://dl.google.com/android/android-sdk_r18-macosx.zip'
   homepage 'http://developer.android.com/index.html'
-  md5 '8328e8a5531c9d6f6f1a0261cb97af36'
+  url 'http://dl.google.com/android/android-sdk_r18-macosx.zip'
   version 'r18'
+  md5 '8328e8a5531c9d6f6f1a0261cb97af36'
 
+  # TODO docs and platform-tools
+  # See the long comment below for the associated problems
   def self.var_dirs
     %w[platforms samples temp add-ons sources system-images extras]
-    # TODO docs and platform-tools
-    # See the long comment below for the associated problems
   end
 
   skip_clean var_dirs
 
   def install
-    mkdir bin
-
     mv 'SDK Readme.txt', prefix/'README'
     mv 'tools', prefix
 
@@ -44,21 +42,20 @@ def install
       ADB="#{prefix}/platform-tools/adb"
       test -f "$ADB" && exec "$ADB" "$@"
       echo Use the \\`android\\' tool to install the \\"Android SDK Platform-tools\\".
-      EOS
+    EOS
   end
 
   def caveats; <<-EOS.undent
     Now run the `android' tool to install the actual SDK stuff.
 
-    NOTE you should tell Eclipse, IntelliJ etc. to use the Android-SDK found
-    here: #{prefix}
+    The Android-SDK location for IDEs such as Eclipse, IntelliJ etc is:
+      #{prefix}
 
     You will have to install the platform-tools and docs EVERY time this formula
     updates. If you want to try and fix this then see the comment in this formula.
 
     You may need to add the following to your .bashrc:
-
-       export ANDROID_SDK_ROOT=#{prefix}
+      export ANDROID_SDK_ROOT=#{prefix}
     EOS
   end
 

diff --git a/Library/Formula/aria2.rb b/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.0/aria2-1.15.0.tar.bz2'
-  sha1 'b29e498a31fdcf890ba93749a221f6022784e003'
+  url 'http://downloads.sourceforge.net/project/aria2/stable/aria2-1.15.1/aria2-1.15.1.tar.bz2'
+  sha1 '67b70d3492b0edb3af314a253540b921e1bc0c4e'
 
   depends_on 'pkg-config' => :build
 

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.2.0.tar.gz'
-  sha1 '19f9207c762f7aa1cb8ddfac2223590b566e8f2c'
+  url 'http://sourceforge.net/projects/arma/files/armadillo-3.2.1.tar.gz'
+  sha1 'd331fd1707ea51be19624a251780d26dc9b29227'
 
   depends_on 'cmake' => :build
   depends_on 'boost'

diff --git a/Library/Formula/atlassian-plugin-sdk.rb b/Library/Formula/atlassian-plugin-sdk.rb
@@ -2,8 +2,8 @@
 
 class AtlassianPluginSdk < Formula
   homepage 'https://developer.atlassian.com/display/DOCS/Atlassian+Plugin+SDK+Documentation'
-  url 'https://maven.atlassian.com/content/repositories/atlassian-public/com/atlassian/amps/atlassian-plugin-sdk/3.10.3/atlassian-plugin-sdk-3.10.3.tar.gz'
-  md5 '33212e59590dd9aa85fe3618bd3192eb'
+  url 'https://maven.atlassian.com/content/repositories/atlassian-public/com/atlassian/amps/atlassian-plugin-sdk/3.10.4/atlassian-plugin-sdk-3.10.4.tar.gz'
+  md5 '77ff1f8f531519bcbed8391f4c394fba'
 
   def install
     # Remove windows files

diff --git a/Library/Formula/atool.rb b/Library/Formula/atool.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Atool < Formula
-  url 'http://savannah.nongnu.org/download/atool/atool-0.38.0.tar.gz'
   homepage 'http://www.nongnu.org/atool/'
-  md5 'bf05a07f7b35415d146b2e21edc1ebbf'
+  url 'http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz'
+  md5 'e0aa006decbc6484b9dba2879f1bb9f0'
 
   depends_on "gnu-sed"
 

diff --git a/Library/Formula/audiofile.rb b/Library/Formula/audiofile.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Audiofile < Formula
-  url 'https://github.com/downloads/mpruett/audiofile/audiofile-0.3.2.tar.gz'
-  sha1 'fb55a3c9153475daa8932d3626797e033d149c1d'
   homepage 'http://www.68k.org/~michael/audiofile/'
+  url 'https://github.com/downloads/mpruett/audiofile/audiofile-0.3.4.tar.gz'
+  sha1 'e6f664b0d551df35ce0c10e38e5617bcd4605335'
 
   depends_on 'lcov' if ARGV.include? '--with-lcov'
 

diff --git a/Library/Formula/augeas.rb b/Library/Formula/augeas.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Augeas < Formula
-  url 'http://augeas.net/download/augeas-0.8.1.tar.gz'
   homepage 'http://augeas.net'
-  md5 '62d47bdc60e175f93aed3b81cb8e2785'
+  url 'http://augeas.net/download/augeas-0.10.0.tar.gz'
+  md5 'fe1834e90a066c3208ac0214622c7352'
 
   depends_on 'readline'
 

diff --git a/Library/Formula/bazaar.rb b/Library/Formula/bazaar.rb
@@ -2,8 +2,8 @@
 
 class Bazaar < Formula
   homepage 'http://bazaar-vcs.org/'
-  url 'https://launchpad.net/bzr/2.5/2.5.0/+download/bzr-2.5.0.tar.gz'
-  md5 '44eb47b77995098a28f017e2daa606b6'
+  url 'https://launchpad.net/bzr/2.5/2.5.1/+download/bzr-2.5.1.tar.gz'
+  md5 'ac5079858364a046071000d5cdccb67b'
 
   def options
     [["--system", "Install using the OS X system Python."]]

diff --git a/Library/Formula/beanstalk.rb b/Library/Formula/beanstalk.rb
@@ -2,17 +2,58 @@
 
 class Beanstalk < Formula
   homepage 'http://kr.github.com/beanstalkd/'
-  url 'https://github.com/downloads/kr/beanstalkd/beanstalkd-1.5.tar.gz'
-  md5 'd75a0a93e6b80b57fea61136f6da57eb'
-
-  # fix cpu use on freebsd and darwin
-  # bug report: https://github.com/kr/beanstalkd/issues/96
-  # Will be in next release
-  def patches
-    "http://github.com/kr/beanstalkd/commit/80da772efeeaabb12893f52a93da74ca9e69206d.patch"
-  end
+  url 'https://github.com/downloads/kr/beanstalkd/beanstalkd-1.6.tar.gz'
+  md5 '844cb7790e2a7ccfc08629dbc2b73178'
 
   def install
     system "make", "install", "PREFIX=#{prefix}"
   end
+
+  def caveats
+    <<-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}
+
+      To start beanstalk manually:
+        beanstalkd
+    EOS
+  end
+
+  def startup_plist
+    <<-EOPLIST.undent
+    <?xml version="1.0" encoding="UTF-8"?>
+    <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    <plist version="1.0">
+      <dict>
+        <key>KeepAlive</key>
+        <true/>
+        <key>Label</key>
+        <string>#{plist_name}</string>
+        <key>ProgramArguments</key>
+        <array>
+          <string>#{HOMEBREW_PREFIX}/bin/beanstalkd</string>
+        </array>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>KeepAlive</key>
+        <true/>
+        <key>UserName</key>
+        <string>#{`whoami`.chomp}</string>
+        <key>WorkingDirectory</key>
+        <string>#{var}</string>
+        <key>StandardErrorPath</key>
+        <string>#{var}/log/beanstalkd.log</string>
+        <key>StandardOutPath</key>
+        <string>#{var}/log/beanstalkd.log</string>
+      </dict>
+    </plist>
+    EOPLIST
+  end
 end
diff --git a/Library/Formula/coda-cli.rb b/Library/Formula/coda-cli.rb
@@ -2,8 +2,8 @@
 
 class CodaCli < Formula
   homepage 'http://justinhileman.info/coda-cli/'
-  url 'https://github.com/bobthecow/coda-cli/zipball/v1.0.3'
-  md5 '706e49cad02472e70b4c361035a852f8'
+  url 'https://github.com/bobthecow/coda-cli/zipball/v1.0.5'
+  md5 'ad5362f24f4cfdd93c7f235467603a5e'
 
   def install
     bin.install 'coda'

diff --git a/Library/Formula/crossroads.rb b/Library/Formula/crossroads.rb
@@ -2,8 +2,8 @@
 
 class Crossroads < Formula
   homepage 'http://www.crossroads.io/'
-  url 'http://download.crossroads.io/libxs-1.0.1.tar.gz'
-  md5 '915aaf168f4a47d8ccf6d03b33845038'
+  url 'http://download.crossroads.io/libxs-1.1.0.tar.gz'
+  md5 '04147c17285e60bc1bb0b9521d3d9aab'
   head 'https://github.com/crossroads-io/libxs.git'
 
   fails_with :llvm do

diff --git a/Library/Formula/doxygen.rb b/Library/Formula/doxygen.rb
@@ -2,8 +2,8 @@
 
 class Doxygen < Formula
   homepage 'http://www.doxygen.org/'
-  url 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.0.src.tar.gz'
-  sha1 '7f4348418dc3efefd357b32a2b5c8010211ab284'
+  url 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.1.src.tar.gz'
+  sha1 '7a340a866ba9f55d941fb1de30dfb8a3d23109b2'
 
   head 'https://doxygen.svn.sourceforge.net/svnroot/doxygen/trunk'
 

diff --git a/Library/Formula/drush.rb b/Library/Formula/drush.rb
@@ -2,8 +2,8 @@
 
 class Drush < Formula
   homepage 'http://drupal.org/project/drush'
-  url 'http://ftp.drupal.org/files/projects/drush-7.x-5.2.tar.gz'
-  md5 'eb18dc1640bcf7a9dc776dec5cd0d163'
+  url 'http://ftp.drupal.org/files/projects/drush-7.x-5.3.tar.gz'
+  md5 'b477c0088c6806a2d5cf7abb57ffad9f'
   head 'git://git.drupal.org/project/drush.git'
 
   def install

diff --git a/Library/Formula/duplicity.rb b/Library/Formula/duplicity.rb
@@ -2,8 +2,8 @@
 
 class Duplicity < Formula
   homepage 'http://www.nongnu.org/duplicity/'
-  url 'https://launchpad.net/duplicity/0.6-series/0.6.18/+download/duplicity-0.6.18.tar.gz'
-  md5 '66b5e64de43e09d3c3ff9890faf9de07'
+  url 'http://code.launchpad.net/duplicity/0.6-series/0.6.19/+download/duplicity-0.6.19.tar.gz'
+  md5 'c88122d0b651f84f3bfa42e55591c36b'
 
   depends_on 'librsync'
   depends_on 'gnupg'

diff --git a/Library/Formula/eigen.rb b/Library/Formula/eigen.rb
@@ -10,7 +10,11 @@ class Eigen < Formula
   def install
     ENV.fortran
     mkdir 'eigen-build' do
-      system "cmake", "..", "-Dpkg_config_libdir=#{lib}", *std_cmake_args
+      args = std_cmake_args
+      args.delete '-DCMAKE_BUILD_TYPE=None'
+      args << '-DCMAKE_BUILD_TYPE=Release'
+
+      system "cmake", "..", "-Dpkg_config_libdir=#{lib}", *args
       system "make install"
     end
   end

diff --git a/Library/Formula/exiftool.rb b/Library/Formula/exiftool.rb
@@ -2,8 +2,8 @@
 
 class Exiftool < Formula
   homepage 'http://www.sno.phy.queensu.ca/~phil/exiftool/index.html'
-  url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.91.tar.gz'
-  md5 'd02b8092d6da481bcc5e3155b0d453a1'
+  url 'http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-8.93.tar.gz'
+  md5 'd3c330b7b279b31733d75de3dba9fd7f'
 
   def install
     system "perl", "Makefile.PL"

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
@@ -6,8 +6,8 @@ def ffplay?
 
 class Ffmpeg < Formula
   homepage 'http://ffmpeg.org/'
-  url 'http://ffmpeg.org/releases/ffmpeg-0.10.3.tar.bz2'
-  sha1 '4fb6f682dbc1b4ea54178040d515fc3a4c05d415'
+  url 'http://ffmpeg.org/releases/ffmpeg-0.11.tar.bz2'
+  sha1 '1aa3443c20b1c5d132d1fe06de7cc949a7219edd'
 
   head 'git://git.videolan.org/ffmpeg.git'
 
@@ -27,10 +27,6 @@ class Ffmpeg < Formula
 
   depends_on 'sdl' if ffplay?
 
-  fails_with :llvm do
-    cause 'Undefined symbols when linking libavfilter'
-  end
-
   def options
     [
       ["--with-tools", "Install additional FFmpeg tools."],