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

Library/Contributions/examples/brew-missing.rb

@@ -29,7 +29,7 @@ def main
 
     unless missing_deps.empty?
       print "#{f.name}: " if formulae_to_check.size > 1
-      puts "#{missing_deps * ', '}"
+      puts "#{missing_deps * ' '}"
     end
   end
 end

Library/Formula/android-sdk.rb

@@ -7,7 +7,7 @@ class AndroidSdk < Formula
   version 'r16'
 
   def self.var_dirs
-    %w[platforms samples temp add-ons bin]
+    %w[platforms samples temp add-ons]
     # TODO docs, google-market_licensing and platform-tools
     # See the long comment below for the associated problems
   end
@@ -60,13 +60,10 @@ def caveats; <<-EOS.undent
     EOS
   end
 
-  # The `android' tool insists on deleting /usr/local/Cellar/android-sdl/rx/platform-tools
+  # The `android' tool insists on deleting #{prefix}/platform-tools
   # and then installing the new one. So it is impossible for us to redirect
   # the SDK location to var so that the platform-tools don't have to be
-  # freshly installed EVERY FUCKING time the base SDK updates.
-  # My disgust at Google's ineptitude here knows NO bounds. I can only LOL.
-  # And I do LOL. A lot. In Google's general direction. I can't stop LOLing.
-  # In fact, I may have LOLd myself into insanity.
+  # freshly installed EVERY DANG time the base SDK updates.
 
   # Ideas: make android a script that calls the actual android tool, but after
   # that tool exits it repairs the directory locations?

Library/Formula/aria2.rb

@@ -1,10 +1,11 @@
 require 'formula'
 
 class Aria2 < Formula
-  url 'http://downloads.sourceforge.net/project/aria2/stable/aria2-1.14.1/aria2-1.14.1.tar.bz2'
-  md5 '3a23844ab3e1460eb7e6dac9b5dd798c'
-
   homepage 'http://aria2.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/project/aria2/stable/aria2-1.14.2/aria2-1.14.2.tar.bz2'
+  md5 '19b1a9f83a09c6ef5c7ab87e4e0f7974'
+
+  depends_on 'pkg-config' => :build
 
   def install
     system "./configure", "--disable-dependency-tracking",

Library/Formula/asymptote.rb

@@ -1,7 +1,5 @@
 require 'formula'
 
-def TeX_installed?; return `which latex`.chomp != ''; end
-
 class Asymptote < Formula
   homepage 'http://asymptote.sourceforge.net/'
   url 'http://downloads.sourceforge.net/asymptote/asymptote-2.15.src.tgz'
@@ -11,7 +9,7 @@ class Asymptote < Formula
   depends_on 'bdw-gc'
 
   def install
-    unless TeX_installed?
+    unless which 'latex'
       onoe <<-EOS.undent
         Asymptote requires a TeX/LaTeX installation; aborting now.
         You can obtain the TeX distribution for Mac OS X from

Library/Formula/auctex.rb

@@ -21,8 +21,7 @@ def which_emacs
   end
 
   def install
-    # based on the asymtote formula LaTeX check
-    if `which latex`.chomp == ''
+    unless which 'latex'
       onoe <<-EOS.undent
         AUCTeX requires a TeX/LaTeX installation; aborting now.
         You can obtain the TeX distribution for Mac OS X from

Library/Formula/auto-scaling.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class AutoScaling < AmazonWebServicesFormula
   version  '1.0.49.1'
   homepage 'http://aws.amazon.com/developertools/2535'

Library/Formula/automake.rb

@@ -16,9 +16,10 @@ def install
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
+    # our aclocal must go first: https://github.com/mxcl/homebrew/issues/10618
     (share/"aclocal/dirlist").write <<-EOS.undent
-      /usr/share/aclocal
       #{HOMEBREW_PREFIX}/share/aclocal
+      /usr/share/aclocal
       EOS
   end
 

Library/Formula/aws-cfn-tools.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class AwsCfnTools < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/AWS-CloudFormation/2555753788650372'
   url 'https://s3.amazonaws.com/cloudformation-cli/AWSCloudFormation-cli.zip'

Library/Formula/aws-elasticache.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class AwsElasticache < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/2310261897259567'
   url 'https://s3.amazonaws.com/elasticache-downloads/AmazonElastiCacheCli-2011-07-15-1.5.000.zip'

Library/Formula/aws-iam-tools.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class AwsIamTools < AmazonWebServicesFormula
   url 'http://awsiammedia.s3.amazonaws.com/public/tools/cli/latest/IAMCli.zip'
   homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?externalID=4143&categoryID=322'
@@ -13,33 +10,32 @@ def install
     standard_install
   end
 
-  def caveats
-    <<-EOS.undent
-      Before you can use these tools you must export some variables to your $SHELL
-      and create a file containing your aws credentials.
+  def caveats; <<-EOS.undent
+    Before you can use these tools you must export some variables to your $SHELL
+    and create a file containing your aws credentials.
 
-      You can access your AWS access ID and AWS secret key:
-      http://aws-portal.amazon.com/gp/aws/developer/account/index.html?action=access-key
+    You can access your AWS access ID and AWS secret key:
+    http://aws-portal.amazon.com/gp/aws/developer/account/index.html?action=access-key
 
-      You must create the file $HOME/.aws-credentials-master, here is a template:
+    You must create the file $HOME/.aws-credentials-master, here is a template:
 
-      # Enter the AWS Keys without the < or >
-      # You can either use the AWS Accounts access keys and they can be found at
-      # http://aws.amazon.com under Account->Security Credentials
-      # or you can use the access keys of a user created with IAM
-      AWSAccessKeyId=<Write your AWS access ID>
-      AWSSecretKey=<Write your AWS secret key>
+    # Enter the AWS Keys without the < or >
+    # You can either use the AWS Accounts access keys and they can be found at
+    # http://aws.amazon.com under Account->Security Credentials
+    # or you can use the access keys of a user created with IAM
+    AWSAccessKeyId=<Write your AWS access ID>
+    AWSSecretKey=<Write your AWS secret key>
 
-      To preserve your credentials don't forget to:
-      chmod 600 $HOME/.aws-credentials-master
+    To preserve your credentials don't forget to:
+    chmod 600 $HOME/.aws-credentials-master
 
-      To export the needed variables, add them to your dotfiles.
-        * On Bash, add them to `~/.bash_profile`.
-        * On Zsh, add them to `~/.zprofile` instead.
+    To export the needed variables, add them to your dotfiles.
+      * On Bash, add them to `~/.bash_profile`.
+      * On Zsh, add them to `~/.zprofile` instead.
 
-      export JAVA_HOME="$(/usr/libexec/java_home)"
-      export AWS_IAM_HOME="#{prefix}/jars"
-      export AWS_CREDENTIAL_FILE=$HOME/.aws-credentials-master
+    export JAVA_HOME="$(/usr/libexec/java_home)"
+    export AWS_IAM_HOME="#{prefix}/jars"
+    export AWS_CREDENTIAL_FILE=$HOME/.aws-credentials-master
     EOS
   end
 end

Library/Formula/beanstalk.rb

@@ -1,9 +1,16 @@
 require 'formula'
 
 class Beanstalk < Formula
+  homepage 'http://kr.github.com/beanstalkd/'
   url 'https://github.com/downloads/kr/beanstalkd/beanstalkd-1.5.tar.gz'
   md5 'd75a0a93e6b80b57fea61136f6da57eb'
-  homepage 'http://kr.github.com/beanstalkd/'
+
+  # fix cpu use on freebsd and darwin
+  # bug report: https://github.com/kr/beanstalkd/issues/96
+  # Will be in next release
+  def patches
+    {:p1 => "http://github.com/kr/beanstalkd/commit/80da772efeeaabb12893f52a93da74ca9e69206d.patch"}
+  end
 
   def install
     system "make install PREFIX=#{prefix}"

Library/Formula/cloud-watch.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class CloudWatch < AmazonWebServicesFormula
   version  '1.0.12.1'
   homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?externalID=2534&categoryID=251'

Library/Formula/dbslayer.rb

@@ -7,7 +7,7 @@ class Dbslayer < Formula
   md5 'a529ea503c244d723166f78c75df3bb3'
 
   def install
-    unless `/usr/bin/which mysql_config`.size > 0
+    unless which 'mysql_config'
       opoo "No MySQL client library detected"
       puts "This formula may fail to build, see caveats for more information."
     end

Library/Formula/dotless.rb

@@ -6,11 +6,12 @@ class Dotless < Formula
   md5 "dd06170b2e6a8f943f715977cfcd254d"
 
   def install
-    mono_path = `/usr/bin/which mono`.strip
-    if mono_path.size == 0
+    mono_path = which 'mono'
+    unless mono_path
       opoo "mono not found in path"
       puts "You need to install Mono to run this software:"
       puts "http://www.go-mono.com/mono-downloads/download.html"
+      exit 1
     end
 
     (bin+'dotless').write <<-EOF.undent

Library/Formula/easy-tag.rb

@@ -1,23 +1,23 @@
 require 'formula'
 
 class EasyTag < Formula
-  url 'http://archive.ubuntu.com/ubuntu/pool/universe/e/easytag/easytag_2.1.6.orig.tar.gz'
-  homepage 'http://easytag.sf.net'
-  md5 '91b57699ac30c1764af33cc389a64c71'
+  homepage 'http://easytag.sourceforge.net'
+  url 'http://sourceforge.net/projects/easytag/files/easytag%20%28gtk%202%29/2.1/easytag-2.1.7.tar.bz2'
+  md5 '9df3e800d80e754670642f2ba5e03539'
 
   depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'gtk+'
-  depends_on 'id3lib'
   depends_on 'libid3tag'
-  depends_on 'mp4v2'
+  depends_on 'id3lib' => :optional
+  depends_on 'libvorbis' => :optional
+  depends_on 'speex' => :optional
+  depends_on 'flac' => :optional
+  depends_on 'mp4v2' => :optional
+  depends_on 'wavpack' => :optional
 
   def install
-    # Use mp4v2 instead of mp4
-    inreplace ['configure', 'src/mp4_header.c', 'src/mp4_tag.c'],
-      "#include <mp4.h>", "#include <mp4v2/mp4v2.h>"
-
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make"
     ENV.deparallelize # make install fails in parallel

Library/Formula/ec2-ami-tools.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class Ec2AmiTools < AmazonWebServicesFormula
   homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368'
   url 'http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.3-45758.zip'

Library/Formula/ec2-api-tools.rb

@@ -1,44 +1,5 @@
 require 'formula'
 
-# This formula serves as the base class for several very similar
-# formulae for Amazon Web Services related tools.
-
-class AmazonWebServicesFormula < Formula
-  # Use this method to peform a standard install for Java-based tools,
-  # keeping the .jars out of HOMEBREW_PREFIX/lib
-  def standard_install
-    rm Dir['bin/*.cmd'] # Remove Windows versions
-    prefix.install "bin"
-    # Put the .jars in prefix/jars/lib, which isn't linked to the Cellar
-    # This will prevent conflicts with other versions of these jars.
-    (prefix+'jars').install 'lib'
-    (prefix+'jars/bin').make_symlink '../bin'
-  end
-
-  # Use this method to generate standard caveats.
-  def standard_instructions var_name, var_value=prefix+'jars'
-    <<-EOS.undent
-      Before you can use these tools you must export some variables to your $SHELL
-      and download your X.509 certificate and private key from Amazon Web Services.
-
-      Your certificate and private key are available at:
-      http://aws-portal.amazon.com/gp/aws/developer/account/index.html?action=access-key
-
-      Download two ".pem" files, one starting with `pk-`, and one starting with `cert-`.
-      You need to put both into a folder in your home directory, `~/.ec2`.
-
-      To export the needed variables, add them to your dotfiles.
-       * On Bash, add them to `~/.bash_profile`.
-       * On Zsh, add them to `~/.zprofile` instead.
-
-      export JAVA_HOME="$(/usr/libexec/java_home)"
-      export EC2_PRIVATE_KEY="$(/bin/ls $HOME/.ec2/pk-*.pem)"
-      export EC2_CERT="$(/bin/ls $HOME/.ec2/cert-*.pem)"
-      export #{var_name}="#{var_value}"
-    EOS
-  end
-end
-
 class Ec2ApiTools < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/351'
   url 'http://ec2-downloads.s3.amazonaws.com/ec2-api-tools-1.5.2.3.zip'

Library/Formula/elb-tools.rb

@@ -1,8 +1,5 @@
 require 'formula'
 
-# Require ec2-api-tools to get the base class
-require "#{File.dirname __FILE__}/ec2-api-tools.rb"
-
 class ElbTools < AmazonWebServicesFormula
   homepage 'http://developer.amazonwebservices.com/connect/entry.jspa?categoryID=251&externalID=2536'
   url 'http://ec2-downloads.s3.amazonaws.com/ElasticLoadBalancing.zip'

Library/Formula/fantom.rb

@@ -2,8 +2,8 @@
 
 class Fantom < Formula
   homepage 'http://fantom.org'
-  url 'http://fan.googlecode.com/files/fantom-1.0.61.zip'
-  md5 '4ead834efae383be885401a747edc6af'
+  url 'http://fan.googlecode.com/files/fantom-1.0.62.zip'
+  md5 '253acd05563b58b41f8381435586e3d6'
 
   def options
     [['--with-src', 'Also install fantom source'],
@@ -15,8 +15,8 @@ def install
     rm_rf "examples" unless ARGV.include? '--with-examples'
     rm_rf "src" unless ARGV.include? '--with-src'
 
-    libexec.install Dir['*']
-
+    libexec.install Dir['*']    
+    system "chmod 0755 #{libexec}/bin/*"
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
 end

Library/Formula/fftw.rb

@@ -13,7 +13,7 @@ def install
             "--disable-dependency-tracking"]
 
     # check for gfortran
-    args << "--disable-fortran" if `/usr/bin/which gfortran`.chomp.empty?
+    args << "--disable-fortran" unless which 'gfortran'
 
     # single precision
     # enable-sse only works with single

Library/Formula/git-flow.rb

@@ -22,6 +22,7 @@ def install
 
     GitFlowCompletion.new.brew do
       (prefix+'etc/bash_completion.d').install "git-flow-completion.bash"
+      (share+'zsh/functions').install "git-flow-completion.zsh"
     end
   end
 end

Library/Formula/git-hg.rb

@@ -5,7 +5,7 @@ class GitHg < Formula
   homepage 'http://offbytwo.com/git-hg/'
 
   def install
-    unless `/usr/bin/which hg`.size > 0
+    unless which 'hg'
       puts "You may need to install Mercurial before using this software:"
       puts "  brew install mercurial"
     end

Library/Formula/git.rb

@@ -32,7 +32,7 @@ def install
     ENV['NO_R_TO_GCC_LINKER'] = '1' # pass arguments to LD correctly
     ENV['NO_GETTEXT'] = '1'
     # workaround for users of perlbrew
-    ENV['PERL_PATH'] = `/usr/bin/which perl`.chomp
+    ENV['PERL_PATH'] = which 'perl'
 
     # Clean XCode 4.x installs don't include Perl MakeMaker
     ENV['NO_PERL_MAKEMAKER']='1' if MacOS.lion?