Use autotools symbols

75 files changed, 301 insertions, 359 deletions

diff --git a/Library/Formula/aalib.rb b/Library/Formula/aalib.rb
index 06c5c9a3e..b6c31f5d7 100644
--- a/Library/Formula/aalib.rb
+++ b/Library/Formula/aalib.rb
@@ -5,15 +5,10 @@ class Aalib < Formula
   url 'http://downloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz'
   md5 'd5aa8e9eae07b7441298b5c30490f6a6'
 
+  depends_on :automake
+  depends_on :libtool
   depends_on :x11
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible, no comment provided about why it is there
-    # so we have no basis to make a decision at this point.
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   # Fix malloc/stdlib issue on OS X
   def patches
     DATA
@@ -21,7 +16,7 @@ class Aalib < Formula
 
   def install
     ENV.ncurses_define
-    system 'autoreconf --force --install'
+    system 'autoreconf --force --install' # To fix X11 linker flags
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/aplus.rb b/Library/Formula/aplus.rb
index 72c477e5b..6f1c982fc 100644
--- a/Library/Formula/aplus.rb
+++ b/Library/Formula/aplus.rb
@@ -11,10 +11,8 @@ class Aplus < Formula
     DATA
   end
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     # replace placeholder w/ actual prefix
diff --git a/Library/Formula/asciidoc.rb b/Library/Formula/asciidoc.rb
index 2a90648b3..2ef270010 100644
--- a/Library/Formula/asciidoc.rb
+++ b/Library/Formula/asciidoc.rb
@@ -1,12 +1,13 @@
 require 'formula'
 
 class Asciidoc < Formula
+  homepage 'http://www.methods.co.nz/asciidoc'
   url 'http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz'
-  md5 'edcf05b28ce21a4d27b1cd3028930021'
+  sha1 '5fc55496b2a23e2cc1dcc1f6b1f75dd06fcdefa1'
+
   head 'https://code.google.com/p/asciidoc/', :using => :hg
-  homepage 'http://www.methods.co.nz/asciidoc'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
+  depends_on :autoconf if ARGV.build_head?
   depends_on 'docbook'
 
   def install
diff --git a/Library/Formula/atomicparsley.rb b/Library/Formula/atomicparsley.rb
index 911bd1e62..42075f166 100644
--- a/Library/Formula/atomicparsley.rb
+++ b/Library/Formula/atomicparsley.rb
@@ -1,17 +1,14 @@
 require 'formula'
 
 class Atomicparsley < Formula
-  url 'https://bitbucket.org/wez/atomicparsley/get/0.9.4.tar.bz2'
   homepage 'http://bitbucket.org/wez/atomicparsley/overview/'
-  md5 '2ce6f39cedc959f46b5515920c35d0d7'
+  url 'https://bitbucket.org/wez/atomicparsley/get/0.9.4.tar.bz2'
+  sha1 'd38dee8fddf1d554d07a18edb28635c4eb6bedde'
 
   head 'https://bitbucket.org/wez/atomicparsley', :using => :hg
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     system "./autogen.sh"
@@ -21,4 +18,3 @@ class Atomicparsley < Formula
     system "make install"
   end
 end
-
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
index 502d32f74..9c6a05f3c 100644
--- a/Library/Formula/automake.rb
+++ b/Library/Formula/automake.rb
@@ -6,7 +6,7 @@ class Automake < Formula
   mirror 'http://ftp.gnu.org/gnu/automake/automake-1.12.1.tar.gz'
   sha1 'e39d3e95e384549cbac22f9f0b110fa53825ddef'
 
-  depends_on "autoconf" => :build
+  depends_on :autoconf
 
   if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/automake"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Automake."
@@ -16,11 +16,12 @@ class Automake < Formula
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
-    # our aclocal must go first: https://github.com/mxcl/homebrew/issues/10618
+    # Our aclocal must go first. See:
+    # https://github.com/mxcl/homebrew/issues/10618
     (share/"aclocal/dirlist").write <<-EOS.undent
       #{HOMEBREW_PREFIX}/share/aclocal
       /usr/share/aclocal
-      EOS
+    EOS
   end
 
   def test
diff --git a/Library/Formula/bash-completion.rb b/Library/Formula/bash-completion.rb
index bbc2f3687..0950ef91c 100644
--- a/Library/Formula/bash-completion.rb
+++ b/Library/Formula/bash-completion.rb
@@ -1,12 +1,18 @@
 require 'formula'
 
+# NOTE: version 2.0 is out, but it requires Bash 4, and OS X ships
+# with 3.2.48
 class BashCompletion < Formula
-  url 'http://bash-completion.alioth.debian.org/files/bash-completion-1.3.tar.bz2'
   homepage 'http://bash-completion.alioth.debian.org/'
-  md5 'a1262659b4bbf44dc9e59d034de505ec'
+  url 'http://bash-completion.alioth.debian.org/files/bash-completion-1.3.tar.bz2'
+  sha1 '6a46b93f44c56cc336632ab28d90c0595fbcc98f'
+
   head 'git://git.debian.org/git/bash-completion/bash-completion.git'
 
-  depends_on "automake" => :build if ARGV.build_head? and MacOS.xcode_version.to_f >= 4.3
+  if ARGV.build_head?
+    depends_on :autoconf
+    depends_on :automake
+  end
 
   def install
     inreplace "bash_completion" do |s|
diff --git a/Library/Formula/blitz.rb b/Library/Formula/blitz.rb
index 46a2ac9c9..e4be7b109 100644
--- a/Library/Formula/blitz.rb
+++ b/Library/Formula/blitz.rb
@@ -3,13 +3,13 @@ require 'formula'
 class Blitz < Formula
   homepage 'http://oonumerics.org/blitz'
   url 'http://downloads.sourceforge.net/project/blitz/blitz/Blitz%2B%2B%200.9/blitz-0.9.tar.gz'
-  md5 '031df2816c73e2d3bd6d667bbac19eca'
+  sha1 '055a4bcb47903e5c2446884d2df1494ac3e24034'
 
   head 'http://blitz.hg.sourceforge.net:8000/hgroot/blitz/blitz', :using => :hg
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
diff --git a/Library/Formula/bulk_extractor.rb b/Library/Formula/bulk_extractor.rb
index 8f95aa7bb..93c3dcf0d 100644
--- a/Library/Formula/bulk_extractor.rb
+++ b/Library/Formula/bulk_extractor.rb
@@ -3,13 +3,14 @@ require 'formula'
 class BulkExtractor < Formula
   homepage 'https://github.com/simsong/bulk_extractor/wiki'
   url 'https://github.com/downloads/simsong/bulk_extractor/bulk_extractor-1.2.2.tar.gz'
-  md5 '11ccee3709ac862a41edad309153c7a3'
+  sha1 '2f0a2049259f826afe253cf5baeeb139b795dddb'
+
+  depends_on :autoconf
+  depends_on :automake
 
   depends_on 'afflib' => :optional
   depends_on 'exiv2' => :optional
   depends_on 'libewf' => :optional
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
-  depends_on 'automake' => :build if MacOS.xcode_version.to_f >= 4.3
 
   def install
     system "autoreconf", "-i"
diff --git a/Library/Formula/cdparanoia.rb b/Library/Formula/cdparanoia.rb
index 9262cb678..cf0efc0d6 100644
--- a/Library/Formula/cdparanoia.rb
+++ b/Library/Formula/cdparanoia.rb
@@ -1,11 +1,11 @@
 require 'formula'
 
 class Cdparanoia < Formula
-  url 'http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz'
   homepage 'http://www.xiph.org/paranoia/'
+  url 'http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz'
   md5 'b304bbe8ab63373924a744eac9ebc652'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :autoconf
 
   fails_with :llvm do
     build 2326
@@ -23,8 +23,11 @@ class Cdparanoia < Formula
     system "autoconf"
     # Libs are installed as keg-only because most software that searches for cdparanoia
     # will fail to link against it cleanly due to our patches
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-           "--prefix=#{prefix}", "--mandir=#{man}", "--libdir=#{libexec}"
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}",
+                          "--libdir=#{libexec}"
     system "make all"
     system "make install"
   end
diff --git a/Library/Formula/crossroads.rb b/Library/Formula/crossroads.rb
index 6cd247cd9..d13706b5e 100644
--- a/Library/Formula/crossroads.rb
+++ b/Library/Formula/crossroads.rb
@@ -3,23 +3,22 @@ require 'formula'
 class Crossroads < Formula
   homepage 'http://www.crossroads.io/'
   url 'http://download.crossroads.io/libxs-1.2.0.tar.gz'
-  md5 'aac1264bb0d03704bd2126419b981fd5'
-  head 'https://github.com/crossroads-io/libxs.git'
+  sha1 'd9633e6df56e3ed0c4f0e86d80ee0ae10c8a966a'
 
-  fails_with :llvm do
-    build 2326
-    cause "Compiling with LLVM gives a segfault while linking."
-  end
+  head 'https://github.com/crossroads-io/libxs.git'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def options
     [['--with-pgm', 'Build with PGM extension']]
   end
 
+  fails_with :llvm do
+    build 2326
+    cause "Compiling with LLVM gives a segfault while linking."
+  end
+
   def install
     system "./autogen.sh" if ARGV.build_head?
 
diff --git a/Library/Formula/ctags.rb b/Library/Formula/ctags.rb
index 8df47b0d3..402235a0a 100644
--- a/Library/Formula/ctags.rb
+++ b/Library/Formula/ctags.rb
@@ -1,13 +1,13 @@
 require 'formula'
 
 class Ctags < Formula
-  url 'http://downloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
   homepage 'http://ctags.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
   md5 'c00f82ecdcc357434731913e5b48630d'
 
   head 'https://ctags.svn.sourceforge.net/svnroot/ctags/trunk'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :autoconf
 
   fails_with :llvm do
     build 2335
diff --git a/Library/Formula/curlftpfs.rb b/Library/Formula/curlftpfs.rb
index e215f3454..2257ec01f 100644
--- a/Library/Formula/curlftpfs.rb
+++ b/Library/Formula/curlftpfs.rb
@@ -3,15 +3,14 @@ require 'formula'
 class Curlftpfs < Formula
   homepage 'http://curlftpfs.sourceforge.net/'
   url 'http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/0.9.2/curlftpfs-0.9.2.tar.gz'
-  md5 'b452123f755114cd4461d56c648d9f12'
+  sha1 '83f148afe6bd4d44c9790790f1c30986c8b9ea56'
+
   head 'https://github.com/rfw/curlftpfs.git'
 
-  depends_on 'pkg-config' => :build
+  depends_on :automake
+  depends_on :libtool
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on 'pkg-config' => :build
 
   depends_on 'fuse4x'
   depends_on 'glib'
diff --git a/Library/Formula/dash.rb b/Library/Formula/dash.rb
index 13df39133..7bad1f577 100644
--- a/Library/Formula/dash.rb
+++ b/Library/Formula/dash.rb
@@ -1,13 +1,13 @@
 require 'formula'
 
 class Dash < Formula
-  url 'http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz'
   homepage 'http://gondor.apana.org.au/~herbert/dash/'
+  url 'http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz'
   sha1 'a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6'
 
   head 'https://git.kernel.org/pub/scm/utils/dash/dash.git'
 
-  depends_on "automake" => :build if MacOS.xcode_version >= "4.3" and ARGV.build_head?
+  depends_on :automake if ARGV.build_head?
 
   def install
     if ARGV.build_head?
diff --git a/Library/Formula/dc3dd.rb b/Library/Formula/dc3dd.rb
index 91ebac28d..b9e71fc24 100644
--- a/Library/Formula/dc3dd.rb
+++ b/Library/Formula/dc3dd.rb
@@ -3,7 +3,9 @@ require 'formula'
 class Dc3dd < Formula
   homepage 'http://sourceforge.net/projects/dc3dd/'
   url 'http://downloads.sourceforge.net/project/dc3dd/dc3dd/7.1.0/dc3dd-7.1.614.tar.gz'
-  md5 'b6c4ec16e7f539b17224d7f334f8396e'
+  sha1 '808abb6472861a88efd94fd22ffea7021007d769'
+
+  depends_on :automake
 
   # Remove explicit dependency on automake 1.10.1
   def patches; DATA; end
diff --git a/Library/Formula/eet.rb b/Library/Formula/eet.rb
index eceab7f1e..a8a0883b8 100644
--- a/Library/Formula/eet.rb
+++ b/Library/Formula/eet.rb
@@ -3,20 +3,20 @@ require 'formula'
 class Eet < Formula
   homepage 'http://trac.enlightenment.org/e/wiki/Eet'
   url 'http://download.enlightenment.org/releases/eet-1.5.0.tar.gz'
-  md5 'f6fd734fbf6a2852abf044a2e1a8cabf'
+  sha1 '58a06c81027e4d85e5ced3260dde1faf4046b2ce'
 
   head 'http://svn.enlightenment.org/svn/e/trunk/eet/'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'eina'
   depends_on 'jpeg'
   depends_on 'lzlib'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/eina.rb b/Library/Formula/eina.rb
index 55af336c2..5dfb31e05 100644
--- a/Library/Formula/eina.rb
+++ b/Library/Formula/eina.rb
@@ -3,18 +3,18 @@ require 'formula'
 class Eina < Formula
   homepage 'http://trac.enlightenment.org/e/wiki/Eina'
   url 'http://download.enlightenment.org/releases/eina-1.1.0.tar.gz'
-  md5 'fedb3814427827c1bb777edea3c86298'
+  sha1 'b9dbfda79d0cc9cdc28a4a87125d339688bb65a4'
 
   head 'http://svn.enlightenment.org/svn/e/trunk/eina/'
 
-  depends_on 'pkg-config' => :build
-
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :autoconf
+    depends_on :automake
+    depends_on :libtool
   end
 
+  depends_on 'pkg-config' => :build
+
   def install
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/elinks.rb b/Library/Formula/elinks.rb
index b46d5eccf..0a21606b0 100644
--- a/Library/Formula/elinks.rb
+++ b/Library/Formula/elinks.rb
@@ -3,7 +3,7 @@ require 'formula'
 class Elinks < Formula
   homepage 'http://elinks.or.cz/'
   url 'http://elinks.or.cz/download/elinks-0.11.7.tar.bz2'
-  md5 'fcd087a6d2415cd4c6fd1db53dceb646'
+  sha1 'd13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54'
 
   head 'http://elinks.cz/elinks.git'
 
@@ -13,9 +13,9 @@ class Elinks < Formula
     md5 '92790144290131ac5e63b44548b45e08'
   end
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   fails_with :llvm do
diff --git a/Library/Formula/embryo.rb b/Library/Formula/embryo.rb
index c0147ed16..f3a93a387 100644
--- a/Library/Formula/embryo.rb
+++ b/Library/Formula/embryo.rb
@@ -3,18 +3,18 @@ require 'formula'
 class Embryo < Formula
   homepage 'http://trac.enlightenment.org/e/wiki/Embryo'
   url 'http://download.enlightenment.org/releases/embryo-1.1.0.tar.gz'
-  md5 'aded5754ee7f586e3a0631e0fa3abcc8'
+  sha1 'f17bd3af565ada4ed5bbae1818c871b33c0897b8'
 
   head 'http://svn.enlightenment.org/svn/e/trunk/embryo/'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'eina'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index 9d5757178..fd5cb8ff9 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -43,11 +43,9 @@ class Erlang < Formula
   # may as well skip bin too, everything is just shell scripts
   skip_clean ['lib', 'bin']
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  # remove the autoreconf if possible
+  depends_on :automake
+  depends_on :libtool
 
   fails_with :llvm do
     build 2334
diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index 3fc9a411c..f1ab7f5cf 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -1,15 +1,15 @@
 require 'formula'
 
 class Fish < Formula
-  url 'http://downloads.sourceforge.net/project/fish/fish/1.23.1/fish-1.23.1.tar.bz2'
   homepage 'http://fishshell.com'
+  url 'http://downloads.sourceforge.net/project/fish/fish/1.23.1/fish-1.23.1.tar.bz2'
   md5 'ead6b7c6cdb21f35a3d4aa1d5fa596f1'
 
   head 'git://gitorious.org/fish-shell/fish-shell.git'
 
   # Indeed, the head build always builds documentation
   depends_on 'doxygen' => :build if ARGV.build_head?
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
+  depends_on :autoconf if ARGV.build_head?
   depends_on 'readline'
   skip_clean 'share/doc'
 
diff --git a/Library/Formula/freealut.rb b/Library/Formula/freealut.rb
index 63b7b87ad..a8d62193d 100644
--- a/Library/Formula/freealut.rb
+++ b/Library/Formula/freealut.rb
@@ -1,18 +1,15 @@
 require 'formula'
 
 class Freealut < Formula
-  url 'http://connect.creativelabs.com/openal/Downloads/ALUT/freealut-1.1.0.tar.gz'
   homepage 'http://connect.creativelabs.com/openal/Documentation/The%20OpenAL%20Utility%20Toolkit.htm'
-  md5 'e089b28a0267faabdb6c079ee173664a'
+  url 'http://connect.creativelabs.com/openal/Downloads/ALUT/freealut-1.1.0.tar.gz'
+  sha1 'b2c04d2b5e0896b3164c01deda39f58933c8055f'
 
   # Adds the OpenAL frameworks to the library list so linking succeeds
   def patches; DATA; end
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     system "./autogen.sh"
diff --git a/Library/Formula/freeswitch.rb b/Library/Formula/freeswitch.rb
index 554dcb178..890c1c390 100644
--- a/Library/Formula/freeswitch.rb
+++ b/Library/Formula/freeswitch.rb
@@ -7,15 +7,13 @@ class Freeswitch < Formula
 
   head 'git://git.freeswitch.org/freeswitch.git'
 
+  depends_on :autoconf
+  depends_on :automake
+  depends_on :libtool
+
   depends_on 'pkg-config' => :build
   depends_on 'jpeg'
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./bootstrap.sh -j#{ENV.make_jobs}"
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/fuse4x.rb b/Library/Formula/fuse4x.rb
index 2ad2747a2..e2ad7b3f6 100644
--- a/Library/Formula/fuse4x.rb
+++ b/Library/Formula/fuse4x.rb
@@ -6,8 +6,8 @@ class Fuse4x < Formula
   md5 '1c82dd00feff6e422b6cef81abd98185'
   version "0.9.1"
 
-  depends_on "automake" => :build
-  depends_on "libtool" => :build
+  depends_on :automake
+  depends_on :libtool
   depends_on 'gettext'
   depends_on 'fuse4x-kext'
 
diff --git a/Library/Formula/ganglia.rb b/Library/Formula/ganglia.rb
index 0edb99f26..15456cba7 100644
--- a/Library/Formula/ganglia.rb
+++ b/Library/Formula/ganglia.rb
@@ -5,6 +5,9 @@ class Ganglia < Formula
   url 'http://downloads.sourceforge.net/project/ganglia/ganglia%20monitoring%20core/3.1.7/ganglia-3.1.7.tar.gz'
   md5 '6aa5e2109c2cc8007a6def0799cf1b4c'
 
+  depends_on :automake
+  depends_on :libtool
+
   depends_on 'confuse'
   depends_on 'pcre'
   depends_on 'rrdtool'
@@ -17,11 +20,6 @@ class Ganglia < Formula
     DATA
   end
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     # ENV var needed to confirm putting the config in the prefix until 3.2
     ENV['GANGLIA_ACK_SYSCONFDIR'] = '1'
diff --git a/Library/Formula/geoip.rb b/Library/Formula/geoip.rb
index bf8c5f118..b289bcc00 100644
--- a/Library/Formula/geoip.rb
+++ b/Library/Formula/geoip.rb
@@ -1,15 +1,13 @@
 require 'formula'
 
 class Geoip < Formula
-  url 'http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz'
   homepage 'http://www.maxmind.com/app/c'
-  md5 '05b7300435336231b556df5ab36f326d'
+  url 'http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz'
+  sha1 '7bafb9918e3c35a6ccc71bb14945245d45c4b796'
 
   # These are needed for the autoreconf it always tries to run.
-  if MacOS.xcode_version.to_f >= 4.3
-    depends_on 'automake' => :build
-    depends_on 'libtool' => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def options
     [["--universal", "Build a universal binary."]]
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
index 57b7bc90d..e3e38ee8c 100644
--- a/Library/Formula/ghostscript.rb
+++ b/Library/Formula/ghostscript.rb
@@ -13,6 +13,11 @@ class Ghostscript < Formula
 
   head 'git://git.ghostscript.com/ghostpdl.git'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'jpeg'
   depends_on 'libtiff'
@@ -20,11 +25,6 @@ class Ghostscript < Formula
   depends_on 'little-cms2'
   depends_on :libpng
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def move_included_source_copies
     # If the install version of any of these doesn't match
     # the version included in ghostscript, we get errors
diff --git a/Library/Formula/gnu-smalltalk.rb b/Library/Formula/gnu-smalltalk.rb
index 1959c7b2c..4dd587566 100644
--- a/Library/Formula/gnu-smalltalk.rb
+++ b/Library/Formula/gnu-smalltalk.rb
@@ -17,16 +17,16 @@ class GnuSmalltalk < Formula
 
   head 'https://github.com/bonzini/smalltalk.git'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'readline'
   depends_on 'libffi' if ARGV.build_head?
   depends_on 'libsigsegv' if ARGV.build_head?
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   fails_with :llvm do
     build 2334
     cause "Codegen problems with LLVM"
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index 99fe68b2e..9b2886165 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -4,8 +4,14 @@ class Gnuplot < Formula
   homepage 'http://www.gnuplot.info'
   url 'http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz'
   md5 '8e6e92b4596ea0eb75e16a57fc79efec'
+
   head 'cvs://:pserver:anonymous@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot', :using => :cvs
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'readline'
   depends_on 'pango'
@@ -15,11 +21,6 @@ class Gnuplot < Formula
   depends_on 'gd' unless ARGV.include? "--nogd"
   depends_on 'wxmac' if ARGV.include? "--wx"
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def options
     [
       ["--pdf", "Build with pdflib-lite support."],
diff --git a/Library/Formula/gource.rb b/Library/Formula/gource.rb
index 9baba0eb3..55e468a87 100644
--- a/Library/Formula/gource.rb
+++ b/Library/Formula/gource.rb
@@ -4,12 +4,19 @@ class Gource < Formula
   homepage 'http://code.google.com/p/gource/'
   url 'http://gource.googlecode.com/files/gource-0.38.tar.gz'
   sha1 '78f8c2064114313851f53b657d12db28abb89fae'
+
   head 'https://github.com/acaudwell/Gource.git'
 
-  depends_on 'glm' => :build
-  depends_on 'pkg-config' => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
 
   depends_on :x11 # for Freetype
+
+  depends_on 'pkg-config' => :build
+  depends_on 'glm' => :build
+
   depends_on 'boost'
   depends_on 'glew'
   depends_on 'jpeg'
@@ -17,11 +24,6 @@ class Gource < Formula
   depends_on 'sdl'
   depends_on 'sdl_image'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     # For non-/usr/local installs
     ENV.append "CXXFLAGS", "-I#{HOMEBREW_PREFIX}/include"
diff --git a/Library/Formula/gst-rtsp.rb b/Library/Formula/gst-rtsp.rb
index e0504092d..056f4b369 100644
--- a/Library/Formula/gst-rtsp.rb
+++ b/Library/Formula/gst-rtsp.rb
@@ -5,16 +5,13 @@ class GstRtsp < Formula
   url 'http://gstreamer.freedesktop.org/src/gst-rtsp/gst-rtsp-0.10.8.tar.bz2'
   sha256 '9915887cf8515bda87462c69738646afb715b597613edc7340477ccab63a6617'
 
+  depends_on :automake
+  depends_on :libtool
+
   depends_on 'pkg-config' => :build
   depends_on 'gettext'
   depends_on 'gst-plugins-base'
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./autogen.sh", "--disable-debug", "--disable-dependency-tracking",
                            "--prefix=#{prefix}",
diff --git a/Library/Formula/htop-osx.rb b/Library/Formula/htop-osx.rb
index 62724c191..29a575a07 100644
--- a/Library/Formula/htop-osx.rb
+++ b/Library/Formula/htop-osx.rb
@@ -1,11 +1,11 @@
 require 'formula'
 
 class HtopOsx < Formula
-  url 'https://github.com/max-horvath/htop-osx/tarball/0.8.2.1-2012-04-18'
   homepage 'https://github.com/max-horvath/htop-osx'
+  url 'https://github.com/max-horvath/htop-osx/tarball/0.8.2.1-2012-04-18'
   md5 'c1e91e6afe98ec124dab12f420c855da'
 
-  depends_on "automake" => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :automake
 
   def install
     # Otherwise htop will segfault when resizing the terminal
diff --git a/Library/Formula/jcal.rb b/Library/Formula/jcal.rb
index 8962b17d6..70f3d07fe 100644
--- a/Library/Formula/jcal.rb
+++ b/Library/Formula/jcal.rb
@@ -5,11 +5,8 @@ class Jcal < Formula
   url 'http://download.savannah.gnu.org/releases/jcal/jcal-0.4.1.tar.gz'
   md5 'd4f94ee612494cd0ab0cf1f537aaa33b'
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     system "/bin/sh autogen.sh"
diff --git a/Library/Formula/libagg.rb b/Library/Formula/libagg.rb
index d5cc2325c..68d3b3879 100644
--- a/Library/Formula/libagg.rb
+++ b/Library/Formula/libagg.rb
@@ -5,10 +5,10 @@ class Libagg < Formula
   url 'http://www.antigrain.com/agg-2.5.tar.gz'
   md5 '0229a488bc47be10a2fee6cf0b2febd6'
 
-  depends_on "automake" => :build if MacOS.xcode_version >= "4.3"
+  depends_on :automake
+  depends_on :x11 # for Freetype
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
-  depends_on :x11 # for Freetype
 
   fails_with :clang do
     build 318
diff --git a/Library/Formula/libdnet.rb b/Library/Formula/libdnet.rb
index d7a7924eb..6ebe93579 100644
--- a/Library/Formula/libdnet.rb
+++ b/Library/Formula/libdnet.rb
@@ -1,17 +1,15 @@
 require 'formula'
 
 class Libdnet < Formula
-  url 'http://libdnet.googlecode.com/files/libdnet-1.12.tgz'
   homepage 'http://code.google.com/p/libdnet/'
+  url 'http://libdnet.googlecode.com/files/libdnet-1.12.tgz'
   md5 '9253ef6de1b5e28e9c9a62b882e44cc9'
 
-  if MacOS.xcode_version >= '4.3'
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def options
-    [['--with-python', 'Build Python module too.']]
+    [['--with-python', 'Build Python module.']]
   end
 
   def install
diff --git a/Library/Formula/libdvdnav.rb b/Library/Formula/libdvdnav.rb
index 7aa21bf75..2e889307f 100644
--- a/Library/Formula/libdvdnav.rb
+++ b/Library/Formula/libdvdnav.rb
@@ -8,11 +8,8 @@ class Libdvdnav < Formula
 
   depends_on 'libdvdread'
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     system "./autogen.sh", "--disable-debug", "--disable-dependency-tracking",
diff --git a/Library/Formula/libdvdread.rb b/Library/Formula/libdvdread.rb
index 7f406e5b3..d9bbd5fe0 100644
--- a/Library/Formula/libdvdread.rb
+++ b/Library/Formula/libdvdread.rb
@@ -8,11 +8,8 @@ class Libdvdread < Formula
 
   depends_on 'libdvdcss' => :optional
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     if Formula.factory("libdvdcss").installed?
diff --git a/Library/Formula/libemu.rb b/Library/Formula/libemu.rb
index 331521e16..e0491c8b7 100644
--- a/Library/Formula/libemu.rb
+++ b/Library/Formula/libemu.rb
@@ -14,12 +14,8 @@ class Libemu < Formula
     [["--enable-python-bindings", "Compile bindings for Python"]]
   end
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible, no comment provided about why it is there
-    # so we have no basis to make a decision at this point.
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   def install
     inreplace 'Makefile.am' do |s|
diff --git a/Library/Formula/libevent.rb b/Library/Formula/libevent.rb
index 93ead8b45..8a10a6d2b 100644
--- a/Library/Formula/libevent.rb
+++ b/Library/Formula/libevent.rb
@@ -12,9 +12,9 @@ class Libevent < Formula
     cause "Undefined symbol '_current_base' reported during linking."
   end
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   depends_on "doxygen" => :build if ARGV.include? '--enable-manpages'
diff --git a/Library/Formula/libimobiledevice.rb b/Library/Formula/libimobiledevice.rb
index d827cccd9..3de5591b7 100644
--- a/Library/Formula/libimobiledevice.rb
+++ b/Library/Formula/libimobiledevice.rb
@@ -14,9 +14,9 @@ class Libimobiledevice < Formula
   depends_on 'usbmuxd'
   depends_on 'gnutls'
 
-  if MacOS.xcode_version >= "4.3" and ARGV.build_head?
-    depends_on 'libtool' => :build
-    depends_on 'automake' => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
diff --git a/Library/Formula/libogg.rb b/Library/Formula/libogg.rb
index b01cbdc65..5e6264ec4 100644
--- a/Library/Formula/libogg.rb
+++ b/Library/Formula/libogg.rb
@@ -8,12 +8,9 @@ class Libogg < Formula
   head 'http://svn.xiph.org/trunk/ogg'
 
   if ARGV.build_head?
-    depends_on "automake" => :build
-
-    if MacOS.xcode_version >= "4.3"
-      depends_on "libtool" => :build
-      depends_on "autoconf" => :build
-    end
+    depends_on :autoconf
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
diff --git a/Library/Formula/libusb.rb b/Library/Formula/libusb.rb
index 721ab31d1..3fbce1a43 100644
--- a/Library/Formula/libusb.rb
+++ b/Library/Formula/libusb.rb
@@ -11,9 +11,9 @@ class Libusb < Formula
     [["--universal", "Build a universal binary."]]
   end
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index 1205ee1b0..0b1e659f8 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -12,20 +12,15 @@ class Libvorbis < Formula
   depends_on 'libogg'
 
   if ARGV.build_head?
-    depends_on "automake" => :build
-
-    if MacOS.xcode_version >= "4.3"
-      depends_on "libtool" => :build
-      depends_on "autoconf" => :build
-    end
+    depends_on :autoconf
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
-    if ARGV.build_head?
-      system "./autogen.sh"
-    end
-
-    system './configure', "--prefix=#{prefix}", '--disable-dependency-tracking'
+    system "./autogen.sh" if ARGV.build_head?
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/log4cxx.rb b/Library/Formula/log4cxx.rb
index 374672033..64f97250e 100644
--- a/Library/Formula/log4cxx.rb
+++ b/Library/Formula/log4cxx.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Log4cxx < Formula
-  url 'http://www.apache.org/dyn/closer.cgi?path=logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz'
   homepage 'http://logging.apache.org/log4cxx/index.html'
+  url 'http://www.apache.org/dyn/closer.cgi?path=logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz'
   md5 'b30ffb8da3665178e68940ff7a61084c'
 
   fails_with :llvm do
@@ -10,15 +10,13 @@ class Log4cxx < Formula
     cause "Fails with 'collect2: ld terminated with signal 11 [Segmentation fault]'"
   end
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def options
-    [
-      ["--universal", "Build for both 32 & 64 bit Intel."]
-    ]
+    [["--universal", "Build for both 32 & 64 bit Intel."]]
   end
 
   def install
diff --git a/Library/Formula/logstalgia.rb b/Library/Formula/logstalgia.rb
index d07010ec2..046ff9b93 100644
--- a/Library/Formula/logstalgia.rb
+++ b/Library/Formula/logstalgia.rb
@@ -1,11 +1,12 @@
 require 'formula'
 
 class Logstalgia < Formula
-  url 'http://logstalgia.googlecode.com/files/logstalgia-1.0.3.tar.gz'
-  head 'https://github.com/acaudwell/Logstalgia.git'
   homepage 'http://code.google.com/p/logstalgia/'
+  url 'http://logstalgia.googlecode.com/files/logstalgia-1.0.3.tar.gz'
   md5 '5160380adb1fb1ed9272cf57fbdf3341'
 
+  head 'https://github.com/acaudwell/Logstalgia.git'
+
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'sdl_image'
@@ -14,12 +15,11 @@ class Logstalgia < Formula
   depends_on 'pcre'
   depends_on :x11
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
-
   def install
     # For non-/usr/local installs
     ENV.append "CXXFLAGS", "-I#{HOMEBREW_PREFIX}/include"
diff --git a/Library/Formula/mcabber.rb b/Library/Formula/mcabber.rb
index b289bf28b..1b7ab9993 100644
--- a/Library/Formula/mcabber.rb
+++ b/Library/Formula/mcabber.rb
@@ -17,9 +17,9 @@ class Mcabber < Formula
   depends_on 'aspell' if ARGV.include? '--enable-aspell'
   depends_on 'enchant' if ARGV.include? '--enable-enchant'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def options
@@ -40,7 +40,8 @@ class Mcabber < Formula
     end
 
     args = ["--disable-debug", "--disable-dependency-tracking",
-            "--prefix=#{prefix}", "--enable-otr"]
+            "--prefix=#{prefix}",
+            "--enable-otr"]
 
     args << "--enable-aspell" if ARGV.include? "--enable-aspell"
     args << "--enable-enchant" if ARGV.include? "--enable-enchant"
@@ -51,12 +52,11 @@ class Mcabber < Formula
     (share+'mcabber').install %w[mcabberrc.example contrib]
   end
 
-  def caveats
-    <<-EOS.undent
-      A configuration file is necessary to start mcabber.  The template is here:
-          #{share}/mcabber/mcabberrc.example
-      And there is a Getting Started Guide you will need to setup Mcabber:
-          http://wiki.mcabber.com/index.php/Getting_started
+  def caveats; <<-EOS.undent
+    A configuration file is necessary to start mcabber.  The template is here:
+      #{share}/mcabber/mcabberrc.example
+    And there is a Getting Started Guide you will need to setup Mcabber:
+      http://wiki.mcabber.com/index.php/Getting_started
     EOS
   end
 end
diff --git a/Library/Formula/mdbtools.rb b/Library/Formula/mdbtools.rb
index 69e404634..c94594e81 100644
--- a/Library/Formula/mdbtools.rb
+++ b/Library/Formula/mdbtools.rb
@@ -9,10 +9,8 @@ class Mdbtools < Formula
   depends_on 'glib'
   depends_on 'readline'
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   # remove unknown linker flags
   def patches
diff --git a/Library/Formula/midgard2.rb b/Library/Formula/midgard2.rb
index ca7e4d258..c699d4d78 100644
--- a/Library/Formula/midgard2.rb
+++ b/Library/Formula/midgard2.rb
@@ -1,19 +1,20 @@
 require 'formula'
 
 class Midgard2 < Formula
-  url 'http://www.midgard-project.org/midcom-serveattachmentguid-b459b3e443f711e0a6353dc3bca0241a241a/midgard2-core-10.05.4.tar.gz'
-  head 'https://github.com/midgardproject/midgard-core.git', :branch => 'ratatoskr'
   homepage 'http://www.midgard-project.org/'
+  url 'http://www.midgard-project.org/midcom-serveattachmentguid-b459b3e443f711e0a6353dc3bca0241a241a/midgard2-core-10.05.4.tar.gz'
   md5 '99dcf5d5e39901712a882598e3da17d2'
 
+  head 'https://github.com/midgardproject/midgard-core.git', :branch => 'ratatoskr'
+
   depends_on 'pkg-config' => :build
   depends_on 'glib'
   depends_on 'dbus-glib'
   depends_on 'libgda'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
@@ -21,6 +22,7 @@ class Midgard2 < Formula
       system "autoreconf", "-i", "--force"
       system "automake"
     end
+
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--with-libgda4",
diff --git a/Library/Formula/minc.rb b/Library/Formula/minc.rb
index b2914904a..6233c279d 100644
--- a/Library/Formula/minc.rb
+++ b/Library/Formula/minc.rb
@@ -9,10 +9,8 @@ class Minc < Formula
 
   depends_on 'netcdf'
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on :automake
+  depends_on :libtool
 
   fails_with :clang do
     # TODO This is an easy fix, someone send it upstream!
diff --git a/Library/Formula/mu.rb b/Library/Formula/mu.rb
index ba24e8d01..7512cba92 100644
--- a/Library/Formula/mu.rb
+++ b/Library/Formula/mu.rb
@@ -24,6 +24,7 @@ class Mu < Formula
   homepage 'http://www.djcbsoftware.nl/code/mu/'
   url 'http://mu0.googlecode.com/files/mu-0.9.8.4.tar.gz'
   sha1 'd586dddcc5b2f73e0bc1c835c199644a65c0f5b5'
+
   head 'https://github.com/djcb/mu.git'
 
   depends_on 'gettext'
@@ -32,9 +33,9 @@ class Mu < Formula
   depends_on 'xapian'
   depends_on Emacs23Installed.new if ARGV.include? '--with-emacs'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   # Fixes configure error using Xapian-1.2.10, where it thinks 1.2.10 < 1.2
diff --git a/Library/Formula/nload.rb b/Library/Formula/nload.rb
index 6fb35b5a4..9f60aaa3f 100644
--- a/Library/Formula/nload.rb
+++ b/Library/Formula/nload.rb
@@ -9,7 +9,7 @@ class Nload < Formula
     build 2334
   end
 
-  depends_on "automake" => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :automake
 
   # Patching configure.in file to make configure compile on Mac OS.
   # Patch taken from MacPorts.
diff --git a/Library/Formula/osm2pgsql.rb b/Library/Formula/osm2pgsql.rb
index b7124d8b0..711c24058 100644
--- a/Library/Formula/osm2pgsql.rb
+++ b/Library/Formula/osm2pgsql.rb
@@ -23,12 +23,11 @@ class Osm2pgsql < Formula
   homepage 'http://wiki.openstreetmap.org/wiki/Osm2pgsql'
   head 'http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/'
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   depends_on PostgresqlInstalled.new
+
+  depends_on :automake
+  depends_on :libtool
+
   depends_on "geos"
   depends_on "proj"
   depends_on "protobuf-c" => :optional
diff --git a/Library/Formula/owfs.rb b/Library/Formula/owfs.rb
index e831ef60c..eb47c2b9f 100644
--- a/Library/Formula/owfs.rb
+++ b/Library/Formula/owfs.rb
@@ -1,19 +1,15 @@
 require 'formula'
 
 class Owfs < Formula
+  homepage 'http://owfs.org/'
   url 'http://downloads.sourceforge.net/project/owfs/owfs/2.8p13/owfs-2.8p13.tar.gz'
   version '2.8p13'
-  homepage 'http://owfs.org/'
   md5 'cc3e2542aed41c753bffca13f2a0a84e'
 
-  depends_on 'libusb-compat'
+  depends_on :automake
+  depends_on :libtool
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible, no comment provided about why it is there
-    # so we have no basis to make a decision at this point.
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on 'libusb-compat'
 
   def install
     system "autoreconf -ivf"
diff --git a/Library/Formula/pcb.rb b/Library/Formula/pcb.rb
index 7b45f2541..cd903b525 100644
--- a/Library/Formula/pcb.rb
+++ b/Library/Formula/pcb.rb
@@ -8,7 +8,7 @@ class Pcb < Formula
 
   head 'git://git.gpleda.org/pcb.git'
 
-  depends_on "automake" => :build if MacOS.xcode_version >= "4.3"
+  depends_on :automake
   depends_on 'pkg-config' => :build
   depends_on 'intltool'
   depends_on 'gettext'
diff --git a/Library/Formula/postgis.rb b/Library/Formula/postgis.rb
index 3ba942ea0..d487e8624 100644
--- a/Library/Formula/postgis.rb
+++ b/Library/Formula/postgis.rb
@@ -11,6 +11,11 @@ class Postgis < Formula
 
   head 'http://svn.osgeo.org/postgis/trunk/'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'postgresql'
   depends_on 'proj'
   depends_on 'geos'
@@ -21,11 +26,6 @@ class Postgis < Formula
   depends_on 'json-c'
   depends_on 'gdal'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def options
     [
       ['--with-gui', 'Build shp2pgsql-gui in addition to command line tools']
diff --git a/Library/Formula/privoxy.rb b/Library/Formula/privoxy.rb
index 5dac0fd2b..7d1a613e6 100644
--- a/Library/Formula/privoxy.rb
+++ b/Library/Formula/privoxy.rb
@@ -5,9 +5,9 @@ class Privoxy < Formula
   url 'http://downloads.sourceforge.net/project/ijbswa/Sources/3.0.19%20%28stable%29/privoxy-3.0.19-stable-src.tar.gz'
   sha1 'a82287cbf48375ef449d021473a366baeca49250'
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   depends_on 'pcre'
diff --git a/Library/Formula/recode.rb b/Library/Formula/recode.rb
index 4daf50753..b7ecd6c69 100644
--- a/Library/Formula/recode.rb
+++ b/Library/Formula/recode.rb
@@ -6,7 +6,7 @@ class Recode < Formula
   md5 'f82e9a6ede9119268c13493c9add2809'
 
   depends_on "gettext"
-  depends_on "libtool" => :build if MacOS.xcode_version.to_f >= 4.3
+  depends_on :libtool
 
   # Patches from MacPorts
   # No reason for patch given, no link to patches given. Someone shoot that guy :P
diff --git a/Library/Formula/robodoc.rb b/Library/Formula/robodoc.rb
index bc620fed3..97e5c4644 100644
--- a/Library/Formula/robodoc.rb
+++ b/Library/Formula/robodoc.rb
@@ -1,14 +1,15 @@
 require 'formula'
 
 class Robodoc < Formula
+  homepage 'http://rfsber.home.xs4all.nl/Robo/robodoc.html'
   url 'http://rfsber.home.xs4all.nl/Robo/robodoc-4.99.41.tar.gz'
   md5 '986ff954e0ba5a9c407384fc4b05303d'
-  homepage 'http://rfsber.home.xs4all.nl/Robo/robodoc.html'
+
   head 'https://github.com/gumpu/ROBODoc.git'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index a3ad85330..040921bdf 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -7,7 +7,7 @@ class Ruby < Formula
 
   head 'http://svn.ruby-lang.org/repos/ruby/trunk/'
 
-  depends_on 'autoconf' => :build if MacOS.xcode_version.to_f >= 4.3 and ARGV.build_head?
+  depends_on :autoconf if ARGV.build_head?
   depends_on 'pkg-config' => :build
   depends_on 'readline'
   depends_on 'gdbm'
diff --git a/Library/Formula/samba.rb b/Library/Formula/samba.rb
index 215c929b8..84d0fbe8a 100644
--- a/Library/Formula/samba.rb
+++ b/Library/Formula/samba.rb
@@ -5,11 +5,9 @@ class Samba < Formula
   url 'http://samba.org/samba/ftp/stable/samba-3.6.5.tar.gz'
   sha1 'e41611c95b2bb91c7735928742b8aff4fc0da76e'
 
-  # This formula calls autogen.sh.  So add the standard deps.
-  if MacOS.xcode_version >= '4.3'
-    depends_on 'automake' => :build
-    depends_on 'libtool'  => :build
-  end
+  # Needed for autogen.sh
+  depends_on :automake
+  depends_on :libtool
 
   # Fixes the Grouplimit of 16 users os OS X.
   # Bug has been raised upstream:
diff --git a/Library/Formula/schroedinger.rb b/Library/Formula/schroedinger.rb
index e192a2026..b619190f9 100644
--- a/Library/Formula/schroedinger.rb
+++ b/Library/Formula/schroedinger.rb
@@ -7,14 +7,14 @@ class Schroedinger < Formula
 
   head  'git://diracvideo.org/git/schroedinger.git'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'orc'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "autoreconf -i -f" if ARGV.build_head?
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/sdl.rb b/Library/Formula/sdl.rb
index 2792723ac..811d5c3c1 100644
--- a/Library/Formula/sdl.rb
+++ b/Library/Formula/sdl.rb
@@ -9,9 +9,9 @@ class Sdl < Formula
 
   depends_on :x11
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def options
diff --git a/Library/Formula/sdl_sound.rb b/Library/Formula/sdl_sound.rb
index 784dc07d9..f8dd2407a 100644
--- a/Library/Formula/sdl_sound.rb
+++ b/Library/Formula/sdl_sound.rb
@@ -6,6 +6,11 @@ class SdlSound < Formula
   md5 'aa09cd52df85d29bee87a664424c94b5'
   head 'http://hg.icculus.org/icculus/SDL_sound', :using => :hg
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'flac' => :optional
@@ -15,11 +20,6 @@ class SdlSound < Formula
   depends_on 'speex' => :optional
   depends_on 'physfs' => :optional
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     if ARGV.build_head?
       # Set the environment and call autoreconf, because boostrap.sh
diff --git a/Library/Formula/sleuthkit.rb b/Library/Formula/sleuthkit.rb
index 17ccd1886..0d4cb6501 100644
--- a/Library/Formula/sleuthkit.rb
+++ b/Library/Formula/sleuthkit.rb
@@ -7,15 +7,15 @@ class Sleuthkit < Formula
 
   head 'https://github.com/sleuthkit/sleuthkit.git'
 
+  if ARGV.build_head?
+    depends_on :autoconf
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'afflib' => :optional
   depends_on 'libewf' => :optional
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "autoconf" => :build
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def patches
     # required for new-ish libewf releases (API change)
     # fixed in the upcoming sleuthkit 4.x
diff --git a/Library/Formula/smpeg.rb b/Library/Formula/smpeg.rb
index e81777449..0ee6d11e4 100644
--- a/Library/Formula/smpeg.rb
+++ b/Library/Formula/smpeg.rb
@@ -1,17 +1,15 @@
 require 'formula'
 
 class Smpeg < Formula
-  head 'svn://svn.icculus.org/smpeg/trunk'
   homepage 'http://icculus.org/smpeg/'
+  head 'svn://svn.icculus.org/smpeg/trunk'
+
+  depends_on :automake
+  depends_on :libtool
 
   depends_on 'pkg-config' => :build
   depends_on 'sdl'
 
-  if MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "./autogen.sh"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index 3ed69cb31..b4831d1cb 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -6,17 +6,13 @@ class Sshfs < Formula
   md5 'c9ea547b9684ec4d85437393a2731322'
   version '2.4.0'
 
+  depends_on :automake
+  depends_on :libtool
+
   depends_on 'pkg-config' => :build
   depends_on 'fuse4x'
   depends_on 'glib'
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible, no comment provided about why it is there
-    # so we have no basis to make a decision at this point.
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     system "autoreconf", "--force", "--install"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
@@ -24,10 +20,9 @@ class Sshfs < Formula
     system "make install"
   end
 
-  def caveats
-    <<-EOS.undent
-      Make sure to follow the directions given by `brew info fuse4x-kext`
-      before trying to use a FUSE-based filesystem.
+  def caveats; <<-EOS.undent
+    Make sure to follow the directions given by `brew info fuse4x-kext`
+    before trying to use a FUSE-based filesystem.
     EOS
   end
 end
diff --git a/Library/Formula/tesseract.rb b/Library/Formula/tesseract.rb
index 5ef1edc3b..826814e27 100644
--- a/Library/Formula/tesseract.rb
+++ b/Library/Formula/tesseract.rb
@@ -85,15 +85,12 @@ class Tesseract < Formula
   url 'http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz'
   md5 '1ba496e51a42358fb9d3ffe781b2d20a'
 
+  depends_on :automake
+  depends_on :libtool
+
   depends_on 'libtiff'
   depends_on 'leptonica'
 
-  if MacOS.xcode_version >= "4.3"
-    # when and if the tarball provides configure, remove autogen.sh and these deps
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   fails_with :llvm do
     build 2206
     cause "Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc"
diff --git a/Library/Formula/the_silver_searcher.rb b/Library/Formula/the_silver_searcher.rb
index cdc4510bd..1f2df395c 100644
--- a/Library/Formula/the_silver_searcher.rb
+++ b/Library/Formula/the_silver_searcher.rb
@@ -7,14 +7,12 @@ class TheSilverSearcher < Formula
 
   head 'https://github.com/ggreer/the_silver_searcher.git'
 
-  if MacOS.xcode_version >= '4.3'
-    depends_on 'automake' => :build
-    depends_on 'autoconf' => :build
-  end
+  depends_on :automake
+  depends_on :autoconf
+
   depends_on 'pkg-config' => :build
   depends_on 'pcre'
 
-
   def install
     # Stable tarball does not include pre-generated configure script
     system "aclocal -I /usr/local/share/aclocal"
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index d1e807bb0..5f2945d8a 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -10,16 +10,16 @@ class Tmux < Formula
   depends_on 'pkg-config' => :build
   depends_on 'libevent'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
+  # This patch adds the implementation of osdep_get_cwd for Darwin platform,
+  # so that tmux can get current working directory correctly under Mac OS.
+  # NOTE: it applies to 1.6 only, and should be removed when 1.7 is out.
+  #       (because it has been merged upstream)
   def patches
-    # This patch adds the implementation of osdep_get_cwd for Darwin platform,
-    # so that tmux can get current working directory correctly under Mac OS.
-    # NOTE: it applies to 1.6 only, and should be removed when 1.7 is out.
-    #       (because it has been merged upstream)
    DATA if ARGV.build_stable?
   end
 
diff --git a/Library/Formula/trafficserver.rb b/Library/Formula/trafficserver.rb
index a43165070..e25de8356 100644
--- a/Library/Formula/trafficserver.rb
+++ b/Library/Formula/trafficserver.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Trafficserver < Formula
-  url 'http://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-3.0.4.tar.bz2'
   homepage 'http://trafficserver.apache.org/'
+  url 'http://www.apache.org/dyn/closer.cgi/trafficserver/trafficserver-3.0.4.tar.bz2'
   md5 '90e259fb09cb7439c6908f1f5344c40f'
 
   head 'http://svn.apache.org/repos/asf/trafficserver/traffic/trunk/'
@@ -14,9 +14,9 @@ class Trafficserver < Formula
 
   depends_on 'pcre'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   def install
diff --git a/Library/Formula/urweb.rb b/Library/Formula/urweb.rb
index cf100d30d..41bec36f4 100644
--- a/Library/Formula/urweb.rb
+++ b/Library/Formula/urweb.rb
@@ -6,14 +6,10 @@ class Urweb < Formula
   md5 '18ad629eb55b0c4a62ef15ef561e0f1a'
   head 'http://hg.impredicative.com/urweb', :using => :hg
 
-  depends_on 'mlton'
+  depends_on :automake
+  depends_on :libtool
 
-  if MacOS.xcode_version >= "4.3"
-    # remove the autoreconf if possible, no comment provided about why it is there
-    # so we have no basis to make a decision at this point.
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
+  depends_on 'mlton'
 
   def install
     system "aclocal"
diff --git a/Library/Formula/vimpc.rb b/Library/Formula/vimpc.rb
index 7bcb39344..0676d618a 100644
--- a/Library/Formula/vimpc.rb
+++ b/Library/Formula/vimpc.rb
@@ -7,15 +7,15 @@ class Vimpc < Formula
 
   head 'https://github.com/richo/vimpc.git'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'pcre++'
   depends_on 'libmpdclient'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     if ARGV.build_head?
       ENV['ACLOCAL_FLAGS'] = "-I #{HOMEBREW_PREFIX}/share/aclocal"
diff --git a/Library/Formula/yasm.rb b/Library/Formula/yasm.rb
index d28567160..6cb671240 100644
--- a/Library/Formula/yasm.rb
+++ b/Library/Formula/yasm.rb
@@ -13,7 +13,7 @@ class Yasm < Formula
 
   if ARGV.build_head?
     depends_on 'gettext'
-    depends_on 'automake' => :build if MacOS.xcode_version.to_f >= 4.3
+    depends_on :automake
   end
 
   depends_on 'Cython' => :python if ARGV.include? '--enable-python'
diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb
index cb46f8126..32422a3fe 100644
--- a/Library/Formula/zeromq.rb
+++ b/Library/Formula/zeromq.rb
@@ -10,9 +10,9 @@ class Zeromq < Formula
   md5 '1b11aae09b19d18276d0717b2ea288f6'
   head 'https://github.com/zeromq/libzmq.git'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
   end
 
   fails_with :llvm do
diff --git a/Library/Formula/znc.rb b/Library/Formula/znc.rb
index 07c3aaad2..32abe70a7 100644
--- a/Library/Formula/znc.rb
+++ b/Library/Formula/znc.rb
@@ -7,6 +7,11 @@ class Znc < Formula
 
   head 'https://github.com/znc/znc.git'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   depends_on 'pkg-config' => :build
   depends_on 'c-ares' => :optional
 
@@ -14,11 +19,6 @@ class Znc < Formula
   skip_clean 'bin/znc-config'
   skip_clean 'bin/znc-buildmod'
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def options
     [['--enable-debug', "Compile ZNC with --enable-debug"]]
   end
diff --git a/Library/Formula/zookeeper.rb b/Library/Formula/zookeeper.rb
index e0899bc70..3d17b734c 100644
--- a/Library/Formula/zookeeper.rb
+++ b/Library/Formula/zookeeper.rb
@@ -7,6 +7,11 @@ class Zookeeper < Formula
 
   head 'http://svn.apache.org/repos/asf/zookeeper/trunk'
 
+  if ARGV.build_head?
+    depends_on :automake
+    depends_on :libtool
+  end
+
   def options
     [
       ["--c", "Build C bindings."],
@@ -42,11 +47,6 @@ class Zookeeper < Formula
     EOS
   end
 
-  if ARGV.build_head? and MacOS.xcode_version >= "4.3"
-    depends_on "automake" => :build
-    depends_on "libtool" => :build
-  end
-
   def install
     # Don't try to build extensions for PPC
     if Hardware.is_32_bit?