From d0efd9ee94a55e243f3b10e903526274fc21d569 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Tue, 6 Apr 2010 22:58:35 -0700
Subject: Update formulae for version 0.7

* Use new "url" features
* Use keg_only DSL
* Use "skip_clean :all" DSL
* Whitespace and style cleanups
* Make bash invocations less silly
* Use new man2-man8 helpers
* Remove "FileUtils." since it is included in Formula
* Use real names for deps instead of aliases
* ENV.x11 now updates path, so remove that from individual brews
---
 Library/Formula/aalib.rb               |  3 +-
 Library/Formula/abuse.rb               | 18 ++++++------
 Library/Formula/ack.rb                 |  2 +-
 Library/Formula/activemq.rb            |  6 ++--
 Library/Formula/adamem.rb              |  8 +++---
 Library/Formula/aircrack-ng.rb         | 11 ++++----
 Library/Formula/algol68g.rb            |  5 ++--
 Library/Formula/android-sdk.rb         |  2 +-
 Library/Formula/angband.rb             |  9 +++---
 Library/Formula/antiword.rb            |  4 +--
 Library/Formula/apg.rb                 | 11 +++-----
 Library/Formula/app-engine-java-sdk.rb |  2 +-
 Library/Formula/aqbanking.rb           | 16 ++++-------
 Library/Formula/arp-sk.rb              |  4 ++-
 Library/Formula/arping.rb              | 13 ++++-----
 Library/Formula/aspell.rb              | 26 +++++++----------
 Library/Formula/astyle.rb              |  8 +++---
 Library/Formula/atf.rb                 |  9 +++---
 Library/Formula/atk.rb                 |  2 +-
 Library/Formula/automoc4.rb            |  6 ++--
 Library/Formula/bcrypt.rb              |  2 +-
 Library/Formula/bitlbee.rb             | 13 ++++++---
 Library/Formula/botan.rb               |  2 +-
 Library/Formula/boxes.rb               |  4 +--
 Library/Formula/cadaver.rb             |  3 +-
 Library/Formula/cairo.rb               |  4 +--
 Library/Formula/calc.rb                |  8 ++++--
 Library/Formula/cassandra.rb           |  1 -
 Library/Formula/catdoc.rb              |  1 -
 Library/Formula/cdargs.rb              |  2 +-
 Library/Formula/chcase.rb              |  2 +-
 Library/Formula/chocolate-doom.rb      | 18 ++++++------
 Library/Formula/cksfv.rb               |  6 ++--
 Library/Formula/cloc.rb                |  2 +-
 Library/Formula/clucene.rb             |  6 ++--
 Library/Formula/clusterit.rb           | 12 ++++----
 Library/Formula/coffee-script.rb       |  2 +-
 Library/Formula/collectd.rb            |  4 +--
 Library/Formula/couchdb.rb             |  3 +-
 Library/Formula/cowsay.rb              |  2 +-
 Library/Formula/cppcheck.rb            |  2 +-
 Library/Formula/cracklib-words.rb      |  7 ++---
 Library/Formula/csshx.rb               |  2 +-
 Library/Formula/ctags.rb               |  6 ++--
 Library/Formula/cuetools.rb            |  4 ++-
 Library/Formula/cups-pdf.rb            |  3 +-
 Library/Formula/cvsps.rb               |  1 -
 Library/Formula/d-bus.rb               | 10 ++++---
 Library/Formula/ddclient.rb            |  5 ++--
 Library/Formula/ddrescue.rb            |  6 ++--
 Library/Formula/despotify.rb           |  3 +-
 Library/Formula/devtodo.rb             |  2 +-
 Library/Formula/dict.rb                | 11 ++++----
 Library/Formula/diction.rb             |  8 ++----
 Library/Formula/discount.rb            |  5 +++-
 Library/Formula/djmount.rb             |  6 ++--
 Library/Formula/dmd.rb                 | 14 +++++-----
 Library/Formula/dnsmasq.rb             |  6 ++--
 Library/Formula/docbook.rb             | 17 ++++++------
 Library/Formula/dos2unix.rb            |  2 +-
 Library/Formula/dosbox.rb              |  8 +++---
 Library/Formula/dovecot.rb             |  2 +-
 Library/Formula/duff.rb                |  6 ++--
 Library/Formula/dvdauthor.rb           |  8 ++----
 Library/Formula/dvdrtools.rb           | 11 ++------
 Library/Formula/dwdiff.rb              |  8 +++---
 Library/Formula/e2fsprogs.rb           |  6 ++--
 Library/Formula/ecl.rb                 |  4 +--
 Library/Formula/eigen.rb               |  2 +-
 Library/Formula/ejabberd.rb            |  3 +-
 Library/Formula/elasticsearch.rb       |  2 +-
 Library/Formula/elinks.rb              | 10 +++----
 Library/Formula/emacs.rb               |  9 ------
 Library/Formula/erlang.rb              |  3 +-
 Library/Formula/ettercap-ng.rb         | 30 ++++++++------------
 Library/Formula/exif.rb                |  2 +-
 Library/Formula/exiftool.rb            |  4 +--
 Library/Formula/exim.rb                | 25 ++++++++---------
 Library/Formula/expat.rb               |  8 +++---
 Library/Formula/exult.rb               | 24 +++++++++-------
 Library/Formula/fabricate.rb           |  5 ++--
 Library/Formula/falcon.rb              | 13 +++------
 Library/Formula/fastri.rb              |  6 ++--
 Library/Formula/fbida.rb               |  2 +-
 Library/Formula/ffmpeg-php.rb          |  7 ++---
 Library/Formula/figlet.rb              |  4 ---
 Library/Formula/findutils.rb           |  6 ++--
 Library/Formula/flac.rb                |  2 +-
 Library/Formula/flip.rb                |  2 +-
 Library/Formula/fltk.rb                |  2 +-
 Library/Formula/flvstreamer.rb         |  1 -
 Library/Formula/fondu.rb               |  6 ++--
 Library/Formula/fontconfig.rb          |  4 +--
 Library/Formula/foremost.rb            |  2 +-
 Library/Formula/fortune.rb             |  4 +--
 Library/Formula/freeimage.rb           |  7 ++---
 Library/Formula/frotz.rb               | 14 +++++-----
 Library/Formula/fsh.rb                 |  6 ++--
 Library/Formula/ftgl.rb                |  4 +--
 Library/Formula/gambit-scheme.rb       |  1 -
 Library/Formula/gant.rb                |  2 +-
 Library/Formula/gccxml.rb              |  8 ++----
 Library/Formula/gd.rb                  |  3 +-
 Library/Formula/gerrit-tools.rb        |  2 +-
 Library/Formula/gettext.rb             | 27 +++++++-----------
 Library/Formula/ghc.rb                 |  2 +-
 Library/Formula/git-flow.rb            |  9 ++----
 Library/Formula/git-sh.rb              |  3 +-
 Library/Formula/git.rb                 |  7 ++---
 Library/Formula/glew.rb                |  6 ++--
 Library/Formula/glib.rb                |  4 +--
 Library/Formula/global.rb              |  4 +--
 Library/Formula/gloox.rb               |  8 +++---
 Library/Formula/gmediaserver.rb        | 13 ++++-----
 Library/Formula/gmime.rb               |  3 +-
 Library/Formula/gnu-chess.rb           | 18 ++++++------
 Library/Formula/gnu-getopt.rb          |  4 +--
 Library/Formula/gnu-go.rb              | 10 ++++---
 Library/Formula/gnu-prolog.rb          |  5 ++--
 Library/Formula/gnu-smalltalk.rb       |  8 +++---
 Library/Formula/gnu-tar.rb             |  2 +-
 Library/Formula/gnu-time.rb            |  7 ++---
 Library/Formula/gnutls.rb              | 10 +++----
 Library/Formula/gource.rb              |  9 ++----
 Library/Formula/gphoto2.rb             |  6 +++-
 Library/Formula/gpsbabel.rb            |  7 ++---
 Library/Formula/graphviz.rb            |  4 +--
 Library/Formula/grc.rb                 | 18 +++++-------
 Library/Formula/greg.rb                |  4 +--
 Library/Formula/guile.rb               |  2 +-
 Library/Formula/hadoop.rb              |  5 ++--
 Library/Formula/haproxy.rb             |  8 +++---
 Library/Formula/hercules.rb            |  5 ++--
 Library/Formula/hevea.rb               |  4 +--
 Library/Formula/hping.rb               |  2 +-
 Library/Formula/html-xml-utils.rb      |  1 -
 Library/Formula/httrack.rb             |  4 +--
 Library/Formula/icu4c.rb               |  4 +--
 Library/Formula/id3tool.rb             |  1 -
 Library/Formula/id3v2.rb               |  8 ++++--
 Library/Formula/iftop.rb               |  3 +-
 Library/Formula/ilmbase.rb             |  2 +-
 Library/Formula/imagemagick.rb         |  5 +---
 Library/Formula/innotop.rb             |  2 +-
 Library/Formula/intltool.rb            |  6 ++--
 Library/Formula/iperf.rb               |  6 ++--
 Library/Formula/iphotoexport.rb        |  4 +--
 Library/Formula/john.rb                | 14 +++++-----
 Library/Formula/jsawk.rb               |  3 +-
 Library/Formula/kde-phonon.rb          |  6 ++--
 Library/Formula/kdelibs.rb             |  6 ++--
 Library/Formula/keychain.rb            |  3 +-
 Library/Formula/kumofs.rb              |  6 ++--
 Library/Formula/lame.rb                |  8 +++---
 Library/Formula/languagetool.rb        |  2 +-
 Library/Formula/libao.rb               |  6 ++--
 Library/Formula/libassuan.rb           |  2 +-
 Library/Formula/libcroco.rb            |  2 +-
 Library/Formula/libdvdread.rb          |  3 +-
 Library/Formula/libevent.rb            |  3 +-
 Library/Formula/libffi.rb              |  8 ++++--
 Library/Formula/libfixbuf.rb           |  8 ++----
 Library/Formula/libftdi.rb             |  9 +++---
 Library/Formula/libgadu.rb             |  1 -
 Library/Formula/libgarmin.rb           | 17 +++++-------
 Library/Formula/libgsf.rb              |  9 ++----
 Library/Formula/libidl.rb              |  2 +-
 Library/Formula/liblastfm.rb           |  8 +++---
 Library/Formula/libmagic.rb            |  6 ++--
 Library/Formula/libnet.rb              |  4 +--
 Library/Formula/libogg.rb              |  4 +--
 Library/Formula/liboil.rb              |  8 +++---
 Library/Formula/libpano.rb             |  2 +-
 Library/Formula/libplist.rb            |  3 +-
 Library/Formula/libpng.rb              |  4 +--
 Library/Formula/libquicktime.rb        |  5 +++-
 Library/Formula/librasterlite.rb       |  6 ++--
 Library/Formula/libspatialite.rb       |  2 +-
 Library/Formula/libspotify.rb          | 13 ++-------
 Library/Formula/libvorbis.rb           |  4 +--
 Library/Formula/libwpd.rb              |  2 +-
 Library/Formula/libwpg.rb              |  2 +-
 Library/Formula/libxml2.rb             |  4 +--
 Library/Formula/lighttpd.rb            |  6 ++--
 Library/Formula/lilypond.rb            |  2 +-
 Library/Formula/linklint.rb            |  2 +-
 Library/Formula/links.rb               |  6 ++--
 Library/Formula/litmus.rb              |  6 ++--
 Library/Formula/llvm.rb                | 12 +++-----
 Library/Formula/lorem.rb               |  5 ++--
 Library/Formula/lua.rb                 |  2 +-
 Library/Formula/lynx.rb                |  5 ++--
 Library/Formula/lysp.rb                |  4 +--
 Library/Formula/lzo.rb                 |  5 +++-
 Library/Formula/macvim.rb              |  4 +--
 Library/Formula/mailtomutt.rb          | 13 ++++-----
 Library/Formula/man2html.rb            |  4 +--
 Library/Formula/mathomatic.rb          |  3 +-
 Library/Formula/mawk.rb                |  4 ++-
 Library/Formula/maxima.rb              |  5 ++--
 Library/Formula/mcabber.rb             | 17 +++++-------
 Library/Formula/mcrypt.rb              |  7 ++++-
 Library/Formula/mediatomb.rb           |  2 +-
 Library/Formula/memcached.rb           |  2 +-
 Library/Formula/metalua.rb             |  1 -
 Library/Formula/metasploit.rb          |  3 +-
 Library/Formula/metis.rb               |  2 +-
 Library/Formula/mftrace.rb             |  2 +-
 Library/Formula/mhash.rb               |  6 ++--
 Library/Formula/minicom.rb             | 16 +++++------
 Library/Formula/mmv.rb                 |  4 +--
 Library/Formula/mod_python.rb          |  2 +-
 Library/Formula/mod_wsgi.rb            |  2 +-
 Library/Formula/mongodb.rb             |  6 ++--
 Library/Formula/most.rb                |  6 ++--
 Library/Formula/mp3gain.rb             |  2 +-
 Library/Formula/mpg123.rb              |  4 +--
 Library/Formula/mplayer.rb             |  2 +-
 Library/Formula/msmtp.rb               | 16 ++++-------
 Library/Formula/mtr.rb                 |  8 +++---
 Library/Formula/mutt.rb                | 51 ++++++++++++++++------------------
 Library/Formula/mysql-connector-c.rb   |  6 ++--
 Library/Formula/mysql.rb               | 10 +++----
 Library/Formula/mz-scheme.rb           |  9 ++++--
 Library/Formula/n2n.rb                 | 17 ++++++------
 Library/Formula/nasm.rb                |  6 ++--
 Library/Formula/nazghul.rb             |  9 +++---
 Library/Formula/ncftp.rb               |  9 +++---
 Library/Formula/neon.rb                |  8 ++----
 Library/Formula/netcdf.rb              |  2 --
 Library/Formula/nethack.rb             | 29 ++++++++-----------
 Library/Formula/newlisp.rb             |  2 +-
 Library/Formula/nkf.rb                 | 11 ++++----
 Library/Formula/nmap.rb                |  4 +--
 Library/Formula/node.rb                |  4 +--
 Library/Formula/objective-caml.rb      |  2 +-
 Library/Formula/ode.rb                 |  2 +-
 Library/Formula/omega.rb               |  8 +++---
 Library/Formula/oniguruma.rb           |  6 ++--
 Library/Formula/open-mpi.rb            |  2 +-
 Library/Formula/open-tyrian.rb         | 10 +++----
 Library/Formula/opencore-amr.rb        |  2 +-
 Library/Formula/opencv.rb              | 27 +++++++-----------
 Library/Formula/openexr.rb             |  7 ++---
 Library/Formula/openimageio.rb         |  8 +++---
 Library/Formula/openvpn.rb             |  5 ++--
 Library/Formula/orc.rb                 |  4 ++-
 Library/Formula/orderly.rb             |  2 +-
 Library/Formula/ossp-uuid.rb           |  2 +-
 Library/Formula/p0f.rb                 |  1 -
 Library/Formula/par2.rb                |  6 ++--
 Library/Formula/pbzip2.rb              |  6 ++--
 Library/Formula/pdflib-lite.rb         | 16 +++++++----
 Library/Formula/pdftohtml.rb           |  6 ++--
 Library/Formula/pgpool-ii.rb           |  2 +-
 Library/Formula/phoronix-test-suite.rb |  2 +-
 Library/Formula/pig.rb                 |  1 -
 Library/Formula/pigz.rb                |  3 +-
 Library/Formula/pkg-config.rb          |  2 --
 Library/Formula/playdar.rb             | 14 ++++------
 Library/Formula/plowshare.rb           |  4 +--
 Library/Formula/png2ico.rb             |  2 +-
 Library/Formula/pngrewrite.rb          |  5 +---
 Library/Formula/poco.rb                | 10 +++----
 Library/Formula/poppler.rb             | 10 ++-----
 Library/Formula/pos.rb                 |  5 ++--
 Library/Formula/postgresql.rb          | 33 ++++++++++------------
 Library/Formula/povray.rb              |  4 ++-
 Library/Formula/proctools.rb           | 12 ++++----
 Library/Formula/proj.rb                |  2 +-
 Library/Formula/protobuf.rb            |  8 +++---
 Library/Formula/pstree.rb              |  6 ++--
 Library/Formula/ptunnel.rb             |  2 +-
 Library/Formula/pure.rb                |  4 ++-
 Library/Formula/pwgen.rb               |  3 +-
 Library/Formula/pwsafe.rb              |  9 +++---
 Library/Formula/pyqt.rb                |  2 +-
 Library/Formula/qdbm.rb                | 11 ++------
 Library/Formula/qt.rb                  |  7 ++---
 Library/Formula/quicktree.rb           |  2 +-
 Library/Formula/ragel.rb               |  5 ++--
 Library/Formula/raptor.rb              |  2 +-
 Library/Formula/readline.rb            |  5 ++--
 Library/Formula/rename.rb              |  6 +---
 Library/Formula/repl.rb                |  2 +-
 Library/Formula/riak.rb                |  8 +++---
 Library/Formula/rinetd.rb              |  8 +++---
 Library/Formula/rlog.rb                |  2 +-
 Library/Formula/rogue.rb               | 15 ++++------
 Library/Formula/rtmpdump.rb            |  3 +-
 Library/Formula/rubinius.rb            |  2 +-
 Library/Formula/ruby.rb                | 10 ++-----
 Library/Formula/runit.rb               |  2 --
 Library/Formula/rxvt-unicode.rb        | 15 ++++------
 Library/Formula/rzip.rb                |  4 +--
 Library/Formula/s-lang.rb              | 11 ++++----
 Library/Formula/s3sync.rb              |  2 +-
 Library/Formula/saga-cpp.rb            |  1 -
 Library/Formula/sbcl.rb                |  1 -
 Library/Formula/sbt.rb                 |  5 ++--
 Library/Formula/scala.rb               |  2 +-
 Library/Formula/scalate.rb             |  2 +-
 Library/Formula/scheme48.rb            |  4 ++-
 Library/Formula/scons.rb               | 11 +++-----
 Library/Formula/scsh.rb                | 12 +++-----
 Library/Formula/scummvm.rb             |  2 +-
 Library/Formula/sdl_mixer.rb           |  3 +-
 Library/Formula/sdl_net.rb             |  5 ++--
 Library/Formula/sdl_sound.rb           |  2 +-
 Library/Formula/sdl_ttf.rb             |  5 ++--
 Library/Formula/sgrep.rb               |  7 ++---
 Library/Formula/shapefile.rb           |  4 +--
 Library/Formula/shared-mime-info.rb    | 10 ++++---
 Library/Formula/shorten.rb             |  6 ++--
 Library/Formula/siege.rb               | 10 +++----
 Library/Formula/silk.rb                | 11 ++++----
 Library/Formula/simh.rb                |  3 +-
 Library/Formula/sipsak.rb              |  3 +-
 Library/Formula/ski.rb                 |  2 +-
 Library/Formula/skipfish.rb            |  7 ++---
 Library/Formula/sloccount.rb           |  6 ++--
 Library/Formula/slrn.rb                | 16 ++++-------
 Library/Formula/smpeg.rb               |  2 +-
 Library/Formula/solr.rb                | 36 ++++++++++++------------
 Library/Formula/soprano.rb             |  2 +-
 Library/Formula/sox.rb                 | 10 ++-----
 Library/Formula/spatialite-tools.rb    |  7 ++---
 Library/Formula/spidermonkey.rb        |  2 +-
 Library/Formula/spim.rb                |  3 +-
 Library/Formula/spin.rb                |  2 +-
 Library/Formula/spring-roo.rb          |  2 +-
 Library/Formula/sqlite.rb              |  4 +--
 Library/Formula/stp.rb                 |  6 ++--
 Library/Formula/surfraw.rb             |  4 +--
 Library/Formula/swftools.rb            | 14 ++++------
 Library/Formula/tarsnap.rb             |  4 ++-
 Library/Formula/task.rb                |  7 ++---
 Library/Formula/term.rb                |  8 +++---
 Library/Formula/tesseract.rb           | 23 ++++++++-------
 Library/Formula/texinfo.rb             |  4 +--
 Library/Formula/thrift.rb              | 10 ++-----
 Library/Formula/timedog.rb             |  2 +-
 Library/Formula/tomcat.rb              | 17 ++++++------
 Library/Formula/tor.rb                 |  6 ++--
 Library/Formula/tre.rb                 |  6 ++--
 Library/Formula/tree.rb                |  6 ++--
 Library/Formula/uif2iso.rb             |  4 +--
 Library/Formula/unittest.rb            |  6 ++--
 Library/Formula/unix2dos.rb            |  4 +--
 Library/Formula/unixodbc.rb            | 10 ++++---
 Library/Formula/unp.rb                 | 12 ++++----
 Library/Formula/unrar.rb               |  2 +-
 Library/Formula/unyaffs.rb             |  2 +-
 Library/Formula/ut-cache.rb            |  2 +-
 Library/Formula/v8.rb                  | 17 ++++++------
 Library/Formula/varnish.rb             |  6 ++--
 Library/Formula/vcprompt.rb            |  1 -
 Library/Formula/vice.rb                | 15 ++++------
 Library/Formula/vilistextum.rb         |  6 ++--
 Library/Formula/virtuoso.rb            | 17 +++++-------
 Library/Formula/visualboyadvance.rb    | 10 +++----
 Library/Formula/voldemort.rb           | 15 +++++-----
 Library/Formula/vorbis-tools.rb        |  6 ++--
 Library/Formula/vpnc.rb                | 19 +++++--------
 Library/Formula/w3m.rb                 |  4 ++-
 Library/Formula/weechat.rb             |  2 +-
 Library/Formula/whohas.rb              |  2 +-
 Library/Formula/willgit.rb             |  2 +-
 Library/Formula/winetricks.rb          | 14 ++++------
 Library/Formula/wireshark.rb           |  4 +--
 Library/Formula/wkhtmltopdf.rb         | 12 ++++----
 Library/Formula/woof.rb                |  2 +-
 Library/Formula/wordnet.rb             |  3 +-
 Library/Formula/wrangler.rb            |  6 ++--
 Library/Formula/wtf.rb                 |  2 +-
 Library/Formula/wyrd.rb                | 10 ++-----
 Library/Formula/x264.rb                |  3 +-
 Library/Formula/xar.rb                 |  6 ++--
 Library/Formula/xdelta.rb              |  2 +-
 Library/Formula/xpdf.rb                | 20 ++++++-------
 Library/Formula/xu4.rb                 |  7 +++--
 Library/Formula/xz.rb                  |  4 ++-
 Library/Formula/yaf.rb                 |  8 ++----
 Library/Formula/yaws.rb                | 13 ++++-----
 Library/Formula/yaz.rb                 |  2 --
 Library/Formula/youtube-dl.rb          |  6 +---
 Library/Formula/zebra.rb               |  5 ++--
 Library/Formula/znc.rb                 |  6 ++--
 Library/Formula/zsh.rb                 | 12 ++++----
 389 files changed, 1133 insertions(+), 1404 deletions(-)

diff --git a/Library/Formula/aalib.rb b/Library/Formula/aalib.rb
index fbc2a1a94..dc55180da 100644
--- a/Library/Formula/aalib.rb
+++ b/Library/Formula/aalib.rb
@@ -11,7 +11,8 @@ class Aalib <Formula
 
   def install
     ENV.ncurses_define
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--mandir=#{man}", "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/abuse.rb b/Library/Formula/abuse.rb
index b6f94525a..ae1d8681f 100644
--- a/Library/Formula/abuse.rb
+++ b/Library/Formula/abuse.rb
@@ -9,18 +9,18 @@ class Abuse <Formula
   url 'svn://svn.zoy.org/abuse/abuse/trunk'
   homepage 'http://abuse.zoy.org/'
   version 'trunk'
-  
+
   depends_on 'pkg-config'
   depends_on 'sdl'
   depends_on 'libvorbis'
-  
+
   def patches
     # * Add SDL.m4 to aclocal includes
     # * Re-enable OpenGL detection
     # * Don't try to include malloc.h
     DATA
   end
-  
+
   def startup_script
       return <<-END
 #!/bin/bash
@@ -30,27 +30,25 @@ END
 
   def install
     # Copy the data files
-    d = libexec
-    AbuseGameData.new.brew { d.install Dir["*"] }
-    
+    AbuseGameData.new.brew { libexec.install Dir["*"] }
 
     system "./bootstrap"
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", 
+    system "./configure", "--prefix=#{prefix}", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--disable-sdltest",
                           "--with-sdl-prefix=#{HOMEBREW_PREFIX}"
-    
+
     # Use Framework OpenGL, not libGl
     %w[ . src src/imlib src/lisp src/net src/sdlport ].each do |p|
       inreplace "#{p}/Makefile", '-lGL', '-framework OpenGL'
     end
-    
+
     system "make"
     libexec.install "src/abuse"
     # Use a startup script to find the game data
     (bin+'abuse').write startup_script
   end
-  
+
   def caveats
     "Game settings and saves will be written to the ~/.abuse folder."
   end
diff --git a/Library/Formula/ack.rb b/Library/Formula/ack.rb
index bc54d5932..6cafbf4f4 100644
--- a/Library/Formula/ack.rb
+++ b/Library/Formula/ack.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Ack <ScriptFileFormula
-  version '1.92'
   url "http://github.com/petdance/ack/raw/079b049b7240c2960a8ff811b2857eba462ad803/ack"
+  version '1.92'
   md5 '7db577145ceba9f6cc5fddc3e8198342'
   homepage 'http://betterthangrep.com/'
 end
diff --git a/Library/Formula/activemq.rb b/Library/Formula/activemq.rb
index 11e8562f0..3c2213807 100755
--- a/Library/Formula/activemq.rb
+++ b/Library/Formula/activemq.rb
@@ -5,13 +5,11 @@ class Activemq <Formula
   homepage 'http://activemq.apache.org/'
   md5 '17574ad1ee6cc3727bf7447c2421097b'
 
-  def skip_clean? path
-    path == libexec + 'webapps/admin/WEB-INF/jsp'
-  end
+  skip_clean 'libexec/webapps/admin/WEB-INF/jsp'
 
   def startup_script
     <<-EOS.undent
-      #!/usr/bin/env bash
+      #!/bin/bash
       exec #{libexec}/bin/activemq
     EOS
   end
diff --git a/Library/Formula/adamem.rb b/Library/Formula/adamem.rb
index 725209cab..8e5ed8eec 100644
--- a/Library/Formula/adamem.rb
+++ b/Library/Formula/adamem.rb
@@ -13,18 +13,18 @@ class Adamem <Formula
 #{libexec}/#{app} -os7 "#{libexec}/OS7.rom" -eos "#{libexec}/EOS.rom" -wp "#{libexec}/WP.rom" $*
 END
   end
-  
+
   def install
     Dir.chdir 'src' do
       system "make -f Makefile.osx dist"
     end
-    
+
     libexec.install Dir["dist/*"]
-  
+
     (bin+'adamem').write startup_script('adamem')
     (bin+'cvem').write startup_script('cvem')
   end
-  
+
   def caveats
     "Note that AdamEm is an X11 app, and does not support sound."
   end
diff --git a/Library/Formula/aircrack-ng.rb b/Library/Formula/aircrack-ng.rb
index bdb951fd5..e0738b91c 100644
--- a/Library/Formula/aircrack-ng.rb
+++ b/Library/Formula/aircrack-ng.rb
@@ -4,7 +4,7 @@ class AircrackNg <Formula
   url 'http://download.aircrack-ng.org/aircrack-ng-1.1.tar.gz'
   md5 'f7a24ed8fad122c4187d06bfd6f998b4'
   homepage 'http://aircrack-ng.org/'
-  
+
   def install
     # Force i386, otherwise you get errors:
     #  sha1-sse2.S:190:32-bit absolute addressing is not supported for x86-64
@@ -13,15 +13,14 @@ class AircrackNg <Formula
       ENV.remove compiler_flag, "-arch x86_64"
       ENV.append compiler_flag, "-arch i386"
     end
-    
+
     system "make"
     system "make", "prefix=#{prefix}", "mandir=#{man1}", "install"
   end
 
-  def caveats
-    <<-EOS.undent
-      Run `airodump-ng-oui-update` as root (or with sudo) to install or update
-      the Airodump-ng OUI file.
+  def caveats;  <<-EOS.undent
+    Run `airodump-ng-oui-update` as root (or with sudo) to install or update
+    the Airodump-ng OUI file.
     EOS
   end
 end
diff --git a/Library/Formula/algol68g.rb b/Library/Formula/algol68g.rb
index ddb24b187..be8d965bf 100644
--- a/Library/Formula/algol68g.rb
+++ b/Library/Formula/algol68g.rb
@@ -9,9 +9,8 @@ class Algol68g <Formula
   def install
     # These folders need to exist for configure to work. Lame.
     bin.mkpath
-  
-    system "./configure",
-      "-O3", "--threads", "--bindir=#{bin}", "--cc=#{ENV.cc}"
+
+    system "./configure", "-O3", "--threads", "--bindir=#{bin}", "--cc=#{ENV.cc}"
 
     # Don't make the docs, they appear to be missing.
     inreplace 'makefile', '@install -m 644 doc/man1/a68g.1 $(man_dir)', ''
diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
index 3b2bfaa5a..b5359a0e6 100755
--- a/Library/Formula/android-sdk.rb
+++ b/Library/Formula/android-sdk.rb
@@ -16,7 +16,7 @@ class AndroidSdk <Formula
     mv 'SDK Readme.txt', 'README'
     prefix.install Dir['*']
 
-    %w[adb android apkbuilder ddms dmtracedump draw9patch emulator 
+    %w[adb android apkbuilder ddms dmtracedump draw9patch emulator
            hierarchyviewer hprof-conv layoutopt mksdcard traceview
            zipalign].each do |tool|
       (bin+tool).make_link(prefix+'tools'+tool)
diff --git a/Library/Formula/angband.rb b/Library/Formula/angband.rb
index 789dce27e..0ac622be0 100644
--- a/Library/Formula/angband.rb
+++ b/Library/Formula/angband.rb
@@ -1,15 +1,16 @@
 require 'formula'
 
 class Angband <Formula
-  @url='http://rephial.org/downloads/3.0/angband-3.0.9b-src.tar.gz'
-  @md5='51a24fe3119e7eff8a8395d601b2747e'
-  @homepage='http://rephial.org/'
+  url 'http://rephial.org/downloads/3.0/angband-3.0.9b-src.tar.gz'
+  md5 '51a24fe3119e7eff8a8395d601b2747e'
+  homepage 'http://rephial.org/'
 
   def install
     system "./configure", "--prefix=#{prefix}",
                           "--enable-curses",
                           "--disable-x11",
-                          "--disable-sdltest",
+                          "--disable-sdl",
+                          "--disable-sdl-mixer",
                           "--with-libpath=#{libexec}"
     system "make"
     # Install manually; 'make install' doesn't work.
diff --git a/Library/Formula/antiword.rb b/Library/Formula/antiword.rb
index 4cfc82ea8..4d937a072 100644
--- a/Library/Formula/antiword.rb
+++ b/Library/Formula/antiword.rb
@@ -5,9 +5,7 @@ class Antiword <Formula
   homepage 'http://www.winfield.demon.nl/'
   md5 'f868e2a269edcbc06bf77e89a55898d1'
 
-  def skip_clean? path
-    path == share+'antiword'
-  end
+  skip_clean 'share/antiword'
 
   def install
     inreplace "Makefile" do |s|
diff --git a/Library/Formula/apg.rb b/Library/Formula/apg.rb
index edd0ce542..358c5bf82 100644
--- a/Library/Formula/apg.rb
+++ b/Library/Formula/apg.rb
@@ -9,14 +9,11 @@ class Apg <Formula
     inreplace "Makefile" do |s|
       s.remove_make_var! ["CC", "FLAGS", "LIBS", "LIBM"]
     end
-    
+
     system "make standalone"
-    
+
     # Install manually
-    bin.install "apg"
-    man1.install "doc/man/apg.1"
-    
-    bin.install "apgbfm"
-    man1.install "doc/man/apgbfm.1"
+    bin.install ["apg", "apgbfm"]
+    man1.install ["doc/man/apg.1", "doc/man/apgbfm.1"]
   end
 end
diff --git a/Library/Formula/app-engine-java-sdk.rb b/Library/Formula/app-engine-java-sdk.rb
index 2803702f0..f981ee254 100644
--- a/Library/Formula/app-engine-java-sdk.rb
+++ b/Library/Formula/app-engine-java-sdk.rb
@@ -7,7 +7,7 @@ class AppEngineJavaSdk <Formula
 
   def shim_script target
     <<-EOS.undent
-      #!/usr/bin/env bash
+      #!/bin/bash
       #{libexec}/bin/#{target} $*
     EOS
   end
diff --git a/Library/Formula/aqbanking.rb b/Library/Formula/aqbanking.rb
index d04b64a85..b8a196df7 100644
--- a/Library/Formula/aqbanking.rb
+++ b/Library/Formula/aqbanking.rb
@@ -5,23 +5,19 @@ class Aqbanking <Formula
   homepage 'http://www.aqbanking.de/'
   md5 '244f5c6e470b55452d9f2cb6c081c137'
 
+  depends_on 'gettext'
   depends_on 'gmp'
   depends_on 'gwenhywfar'
   depends_on 'ktoblzcheck' => :optional
-  depends_on 'gettext'
- #depends_on 'qt3' # for gui frontends
 
   def install
     fails_with_llvm "llvm results in a sigsegfault during compile"
-    configure_args = [
-        "--prefix=#{prefix}",
-        "--disable-debug",
-        "--disable-dependency-tracking",
-        "--with-frontends=cli",
-        "--with-gwen-dir=#{HOMEBREW_PREFIX}",
-    ]
-    system "./configure", *configure_args
     ENV.j1
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-frontends=cli",
+                          "--with-gwen-dir=#{HOMEBREW_PREFIX}"
     system "make install"
   end
 end
diff --git a/Library/Formula/arp-sk.rb b/Library/Formula/arp-sk.rb
index bb498c63c..cb7ff3c04 100644
--- a/Library/Formula/arp-sk.rb
+++ b/Library/Formula/arp-sk.rb
@@ -8,7 +8,9 @@ class ArpSk <Formula
   depends_on 'libnet'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--with-libnet=#{HOMEBREW_PREFIX}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-libnet=#{HOMEBREW_PREFIX}"
     system "make install"
   end
 end
diff --git a/Library/Formula/arping.rb b/Library/Formula/arping.rb
index e6a02df7a..a32832d70 100644
--- a/Library/Formula/arping.rb
+++ b/Library/Formula/arping.rb
@@ -8,6 +8,11 @@ class Arping <Formula
 
   depends_on 'libnet'
 
+  def patches
+    # Patch removes header conflict with libpcap; arping 2.x uses libnet
+    DATA
+  end
+
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
 
@@ -15,16 +20,10 @@ class Arping <Formula
     inreplace 'Makefile' do |s|
       s.change_make_var! "LIBS", " -lnet"
     end
-  
+
     system "make"
     system "make install"
   end
-
-  def patches
-    # Patch removes header conflict with libpcap
-    # arping 2.x uses libnet
-    DATA
-  end
 end
 
 __END__
diff --git a/Library/Formula/aspell.rb b/Library/Formula/aspell.rb
index 1177c3e38..488eeb565 100644
--- a/Library/Formula/aspell.rb
+++ b/Library/Formula/aspell.rb
@@ -352,9 +352,8 @@ class Aspell <Formula
   md5 'bc80f0198773d5c05086522be67334eb'
 
   def options
-    [
-      ['--lang=XX,...', 'Install dictionary for language XX where language is the 2 or 3 letter country code, e.g.: --lang=en,es'],
-    ]
+    [['--lang=XX,...',
+    'Install dictionary for language XX where language is the 2 or 3 letter country code, e.g.: --lang=en,es']]
   end
 
   def install
@@ -362,24 +361,19 @@ class Aspell <Formula
     system "./configure", "--prefix=#{prefix}"
     system "make install"
 
-    langopt = ARGV.options.select { |v| v =~ /--lang=/ }
-    langopt.uniq.each do |opt|
+    ARGV.options.select { |v| v =~ /--lang=/ }.uniq.each do |opt|
       languages = opt.split('=')[1].split(',')
-      languages.each() do |lang|
-        classname = "Aspell" + lang.capitalize
-        clazz = Object.const_get(classname)
-        formula = clazz.new
+      languages.each do |lang|
+        formula = Object.const_get("Aspell" + lang.capitalize).new
         formula.brew { formula.install }
       end
     end
   end
-  
-  # TODO remove when options works properly
-  def caveats
-    "To install dictionaries, eg:
-    
-    brew install aspell --lang=en
 
-"
+  # TODO remove when options works properly
+  def caveats; <<-EOS
+    To install dictionaries, eg:
+      brew install aspell --lang=en
+    EOS
   end
 end
diff --git a/Library/Formula/astyle.rb b/Library/Formula/astyle.rb
index afc4a3bc0..f6aed85f9 100644
--- a/Library/Formula/astyle.rb
+++ b/Library/Formula/astyle.rb
@@ -1,15 +1,15 @@
 require 'formula'
 
 class Astyle <Formula
-  @url='http://downloads.sourceforge.net/sourceforge/astyle/astyle_1.24_macosx.tar.gz'
-  @md5='9b63dadac58e867f14b3894befbdc9b3'
-  @homepage='http://astyle.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/sourceforge/astyle/astyle_1.24_macosx.tar.gz'
+  md5 '9b63dadac58e867f14b3894befbdc9b3'
+  homepage 'http://astyle.sourceforge.net/'
 
   def install
     Dir.chdir 'src' do
       ENV['prefix']=prefix
       system "make -f ../build/mac/Makefile"
-      bin.install "./bin/astyle"
+      bin.install "bin/astyle"
     end
   end
 end
\ No newline at end of file
diff --git a/Library/Formula/atf.rb b/Library/Formula/atf.rb
index 53f8d8b75..2a6ba0c9a 100644
--- a/Library/Formula/atf.rb
+++ b/Library/Formula/atf.rb
@@ -6,11 +6,10 @@ class Atf <Formula
   md5 'ec5b2cbbc70b0ced4b46e77c9f0b2a1b'
 
   def install
-    system "./configure",
-           "--disable-dependency-tracking",
-           "--prefix=#{prefix}",
-           "--sysconfdir=#{etc}",
-           "--mandir=#{man}"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--sysconfdir=#{etc}",
+                          "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/atk.rb b/Library/Formula/atk.rb
index d0e23d2f3..a6425a58c 100644
--- a/Library/Formula/atk.rb
+++ b/Library/Formula/atk.rb
@@ -7,7 +7,7 @@ class Atk <Formula
 
   depends_on 'pkg-config'
   depends_on 'glib'
-  
+
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/automoc4.rb b/Library/Formula/automoc4.rb
index e9ad3783f..7dcfc3b5d 100644
--- a/Library/Formula/automoc4.rb
+++ b/Library/Formula/automoc4.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Automoc4 <Formula
-  @url='ftp://ftp.kde.org/pub/kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2'
-  @homepage='http://techbase.kde.org/Development/Tools/Automoc4'
-  @md5='91bf517cb940109180ecd07bc90c69ec'
+  url 'ftp://ftp.kde.org/pub/kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2'
+  homepage 'http://techbase.kde.org/Development/Tools/Automoc4'
+  md5 '91bf517cb940109180ecd07bc90c69ec'
 
   depends_on 'cmake'
   depends_on 'qt'
diff --git a/Library/Formula/bcrypt.rb b/Library/Formula/bcrypt.rb
index 86b3a2c6b..9dec190d2 100644
--- a/Library/Formula/bcrypt.rb
+++ b/Library/Formula/bcrypt.rb
@@ -11,7 +11,7 @@ class Bcrypt <Formula
       s.change_make_var! "CFLAGS", ENV['CFLAGS']
       s.change_make_var! "LDFLAGS", "-lz"
     end
-    
+
     system "make"
     bin.install "bcrypt"
     man1.install gzip("bcrypt.1")
diff --git a/Library/Formula/bitlbee.rb b/Library/Formula/bitlbee.rb
index 0a4377d57..abd54cda7 100644
--- a/Library/Formula/bitlbee.rb
+++ b/Library/Formula/bitlbee.rb
@@ -16,9 +16,14 @@ class Bitlbee <Formula
     # magician will know).
     ENV['LD'] = '/usr/bin/ld'
 
-    # Homebrew should handlle the stripping.
+    # Homebrew should handle the stripping.
     # Should we use --config=/usr/local/var/lib/bitlbee/ ?
-    system "./configure", "--debug=0", "--strip=0", "--ssl=gnutls", "--pidfile=#{var}/bitlbee/run/bitlbee.pid", "--config=#{var}/bitlbee/lib/", "--ipsocket=#{var}/bitlbee/run/bitlbee.sock", "--prefix=#{prefix}"
+    system "./configure", "--prefix=#{prefix}",
+                          "--debug=0", "--strip=0",
+                          "--ssl=gnutls",
+                          "--pidfile=#{var}/bitlbee/run/bitlbee.pid",
+                          "--config=#{var}/bitlbee/lib/",
+                          "--ipsocket=#{var}/bitlbee/run/bitlbee.sock"
     # This build depends on make running first.
     system "make"
     system "make install"
@@ -26,7 +31,7 @@ class Bitlbee <Formula
     system "make install-etc"
 
     (var+"bitlbee").mkpath
-    (var+"bitlbee"+"run").mkpath
-    (var+"bitlbee"+"lib").mkpath
+    (var+"bitlbee/run").mkpath
+    (var+"bitlbee/lib").mkpath
   end
 end
diff --git a/Library/Formula/botan.rb b/Library/Formula/botan.rb
index a68129a27..aaf887d0d 100644
--- a/Library/Formula/botan.rb
+++ b/Library/Formula/botan.rb
@@ -7,7 +7,7 @@ class Botan <Formula
 
   def install
     inreplace 'src/build-data/makefile/unix_shr.in' do |s|
-      s.change_make_var! 'SONAME', "#{lib}" + '/$(LIBNAME)-$(SO_VERSION).%{so_suffix}'
+      s.change_make_var! 'SONAME', "#{lib}/$(LIBNAME)-$(SO_VERSION).%{so_suffix}"
     end
 
     system "./configure.py", "--prefix=#{prefix}"
diff --git a/Library/Formula/boxes.rb b/Library/Formula/boxes.rb
index 3e23e93b2..e8566c8e3 100644
--- a/Library/Formula/boxes.rb
+++ b/Library/Formula/boxes.rb
@@ -7,8 +7,8 @@ class Boxes <Formula
 
   def install
     # distro uses /usr/share/boxes change to prefix
-    inreplace 'Makefile' do |contents| 
-      contents.change_make_var! "GLOBALCONF", "#{share}/boxes-config"
+    inreplace 'Makefile' do |s|
+      s.change_make_var! "GLOBALCONF", "#{share}/boxes-config"
     end
 
     system "make"
diff --git a/Library/Formula/cadaver.rb b/Library/Formula/cadaver.rb
index 78133adb8..d9d6f0d14 100644
--- a/Library/Formula/cadaver.rb
+++ b/Library/Formula/cadaver.rb
@@ -8,8 +8,9 @@ class Cadaver <Formula
   depends_on 'gettext'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug",
+    system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--with-ssl"
     system "(cd lib/intl; make)"
     system "make install"
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
index a58a15102..3ffe14ea3 100644
--- a/Library/Formula/cairo.rb
+++ b/Library/Formula/cairo.rb
@@ -10,9 +10,7 @@ class Cairo <Formula
   depends_on 'pixman'
 
   # Comes with Snow Leopard, but not Leopard
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def install
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/calc.rb b/Library/Formula/calc.rb
index 1add35d8f..f0bdceeb3 100644
--- a/Library/Formula/calc.rb
+++ b/Library/Formula/calc.rb
@@ -13,6 +13,7 @@ class Calc <Formula
     ENV['EXTRA_LDFLAGS'] = ENV['LDFLAGS']
     ENV['EXTRA_CFLAGS'] = ENV['CFLAGS']
 
+    readline = Formula.factory('readline')
     inreplace "Makefile" do |s|
       s.change_make_var! "INCDIR", include
       s.change_make_var! "BINDIR", bin
@@ -20,11 +21,12 @@ class Calc <Formula
       s.change_make_var! "MANDIR", man1
       s.change_make_var! "CALC_SHAREDIR", "#{share}/calc"
       s.change_make_var! "USE_READLINE", "-DUSE_READLINE"
-      readline = Formula.factory('readline')
       s.change_make_var! "READLINE_LIB", "-L#{readline.lib} -lreadline"
       s.change_make_var! "READLINE_EXTRAS", "-lhistory -lncurses"
-      s.change_make_var! "LIBCALC_SHLIB", "-single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION}"
-      s.change_make_var! "LIBCUSTCALC_SHLIB", "-single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"
+      s.change_make_var! "LIBCALC_SHLIB",
+        "-single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION}"
+      s.change_make_var! "LIBCUSTCALC_SHLIB",
+        "-single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"
     end
 
     system "make"
diff --git a/Library/Formula/cassandra.rb b/Library/Formula/cassandra.rb
index e3d8af4ca..9ce392a86 100644
--- a/Library/Formula/cassandra.rb
+++ b/Library/Formula/cassandra.rb
@@ -4,7 +4,6 @@ class Cassandra <Formula
   url 'http://www.alliedquotes.com/mirrors/apache/cassandra/0.6.4/apache-cassandra-0.6.4-bin.tar.gz'
   homepage 'http://cassandra.apache.org'
   md5 '3bb41737ef8f1f76cd5d13cb6db5e079'
-  version '0.6.4'
 
   def install
     (var+"lib/cassandra").mkpath
diff --git a/Library/Formula/catdoc.rb b/Library/Formula/catdoc.rb
index a3778ee60..8ab79af48 100644
--- a/Library/Formula/catdoc.rb
+++ b/Library/Formula/catdoc.rb
@@ -3,7 +3,6 @@ require 'formula'
 class Catdoc <Formula
   url 'http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz'
   homepage 'http://wagner.pp.ru/~vitus/software/catdoc/'
-  # Victor Wagner publishes a SHA1 hash, to keep it simple let's use that instead of MD5
   sha1 '50ce9d7cb24ad6b10a856c9c24183e2b0a11ca04'
 
   def install
diff --git a/Library/Formula/cdargs.rb b/Library/Formula/cdargs.rb
index 4bf307a7b..6bc418a4d 100644
--- a/Library/Formula/cdargs.rb
+++ b/Library/Formula/cdargs.rb
@@ -10,7 +10,7 @@ class Cdargs <Formula
     system "make"
     system "make install-strip"
 
-    rm Dir.glob('contrib/Makefile*')
+    rm Dir['contrib/Makefile*']
     prefix.install 'contrib'
 
     bash_completion_dir = etc+'bash_completion.d'
diff --git a/Library/Formula/chcase.rb b/Library/Formula/chcase.rb
index 903d1bb40..8185c1da3 100644
--- a/Library/Formula/chcase.rb
+++ b/Library/Formula/chcase.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Chcase <ScriptFileFormula
-  version '2.0'
   url 'http://www.primaledge.ca/chcase'
+  version '2.0'
   md5 '6d7e35fd597c60ba5ebbdd8d5e57eee7'
   homepage 'http://www.primaledge.ca/chcase.html'
 
diff --git a/Library/Formula/chocolate-doom.rb b/Library/Formula/chocolate-doom.rb
index 97b962ce8..49ee7405d 100644
--- a/Library/Formula/chocolate-doom.rb
+++ b/Library/Formula/chocolate-doom.rb
@@ -15,17 +15,19 @@ class ChocolateDoom <Formula
                           "--disable-dependency-tracking",
                           "--disable-sdltest"
     system "make install"
-    
+
     # This project installs to 'games', but we want it in 'bin' so it symlinks in.
     # Can't find a ./configure switch, so just rename it.
     (prefix+"games").rename bin
   end
-  
-  def caveats
-    "Note that this formula only installs a Doom game engine, and no\n"\
-    "actual levels. The original Doom levels are still under copyright, \n"\
-    "so you can copy them over and play them if you already own them.\n\n"\
-    "Otherwise, there are tons of free levels available online.\n"\
-    "Try starting here:\n\t#{homepage}"
+
+  def caveats; <<-EOS.undent
+    Note that this formula only installs a Doom game engine, and no
+    actual levels. The original Doom levels are still under copyright,
+    so you can copy them over and play them if you already own them.
+    Otherwise, there are tons of free levels available online.
+    Try starting here:
+      #{homepage}
+    EOS
   end
 end
diff --git a/Library/Formula/cksfv.rb b/Library/Formula/cksfv.rb
index 86447fbb9..6dcfa5446 100644
--- a/Library/Formula/cksfv.rb
+++ b/Library/Formula/cksfv.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Cksfv <Formula
-  @url='http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2'
-  @homepage='http://zakalwe.fi/~shd/foss/cksfv/'
-  @md5='138bff42ab23fbba8cca0ae14b2d9e52'
+  url 'http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2'
+  homepage 'http://zakalwe.fi/~shd/foss/cksfv/'
+  md5 '138bff42ab23fbba8cca0ae14b2d9e52'
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/cloc.rb b/Library/Formula/cloc.rb
index 9083813f4..270984605 100644
--- a/Library/Formula/cloc.rb
+++ b/Library/Formula/cloc.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Cloc <ScriptFileFormula
-  version '1.51'
   url "http://cloc.svn.sourceforge.net/viewvc/cloc/tags/1.51/cloc"
   md5 'c491922de2bad911fbc2047b336c91b5'
+  version '1.51'
   homepage 'http://cloc.sourceforge.net/'
 end
diff --git a/Library/Formula/clucene.rb b/Library/Formula/clucene.rb
index b2f8a9de7..0c692aeed 100644
--- a/Library/Formula/clucene.rb
+++ b/Library/Formula/clucene.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Clucene <Formula
-  @url='http://downloads.sourceforge.net/project/clucene/clucene-core-stable/0.9.21/clucene-core-0.9.21.tar.bz2'
-  @homepage='http://sourceforge.net/projects/clucene/'
-  @md5='181cf9a827fd072717d9b09d1a1bda74'
+  url 'http://downloads.sourceforge.net/project/clucene/clucene-core-stable/0.9.21/clucene-core-0.9.21.tar.bz2'
+  homepage 'http://sourceforge.net/projects/clucene/'
+  md5 '181cf9a827fd072717d9b09d1a1bda74'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/clusterit.rb b/Library/Formula/clusterit.rb
index 139ec6bdd..85c6598e7 100644
--- a/Library/Formula/clusterit.rb
+++ b/Library/Formula/clusterit.rb
@@ -4,17 +4,19 @@ class Clusterit <Formula
   url 'http://downloads.sourceforge.net/project/clusterit/clusterit/clusterit-2.5/clusterit-2.5.tar.gz'
   homepage 'http://www.garbled.net/clusterit.html'
   md5 'f0e772e07122e388de629fb57f7237ab'
-  
-  def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
-    system "make install"
-  end
 
   def patches
       DATA
   end
+
+  def install
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make install"
+  end
 end
 
+
 __END__
 diff --git a/Makefile.am b/Makefile.am
 index 63f334e..a7ee923 100644
diff --git a/Library/Formula/coffee-script.rb b/Library/Formula/coffee-script.rb
index b34bab590..7f8d3cb0f 100644
--- a/Library/Formula/coffee-script.rb
+++ b/Library/Formula/coffee-script.rb
@@ -9,7 +9,7 @@ class CoffeeScript <Formula
   # head coffee-script usually depends on head node and
   # since there isn't a way to specify that just remove
   # the depends_on
-  depends_on :node unless ARGV.build_head?
+  depends_on 'node' unless ARGV.build_head?
 
   def caveats
     <<-EOS.undent
diff --git a/Library/Formula/collectd.rb b/Library/Formula/collectd.rb
index 8af9c15e3..dcd6791c9 100644
--- a/Library/Formula/collectd.rb
+++ b/Library/Formula/collectd.rb
@@ -5,9 +5,7 @@ class Collectd <Formula
   homepage 'http://collectd.org/'
   md5 '8cd79b4ebdb9dbeb51ba52d3463a06ef'
 
-  def skip_clean? path
-    true
-  end
+  skip_clean :all
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb
index 8ab7c84cd..9ba9732ec 100644
--- a/Library/Formula/couchdb.rb
+++ b/Library/Formula/couchdb.rb
@@ -1,10 +1,9 @@
 require 'formula'
 
 class Couchdb <Formula
-  url 'git://github.com/apache/couchdb.git'
+  url 'git://github.com/apache/couchdb.git', :tag => "origin/tags/1.0.0"
   homepage "http://couchdb.apache.org/"
   version "1.0.0"
-  @specs = {:tag => "origin/tags/1.0.0"}
 
   depends_on 'spidermonkey'
   depends_on 'icu4c'
diff --git a/Library/Formula/cowsay.rb b/Library/Formula/cowsay.rb
index f8b0ad217..5a782c705 100755
--- a/Library/Formula/cowsay.rb
+++ b/Library/Formula/cowsay.rb
@@ -7,6 +7,6 @@ class Cowsay <Formula
 
   def install
     system "/bin/sh", "install.sh", prefix
-    FileUtils.mv prefix+'man', share
+    mv prefix+'man', share
   end
 end
diff --git a/Library/Formula/cppcheck.rb b/Library/Formula/cppcheck.rb
index d37d32436..384c991af 100644
--- a/Library/Formula/cppcheck.rb
+++ b/Library/Formula/cppcheck.rb
@@ -7,7 +7,7 @@ class Cppcheck < Formula
   head 'git://github.com/danmar/cppcheck.git'
 
   # Do not strip binaries, or else it fails to run.
-  def skip_clean?(path); true end
+  skip_clean :all
 
   def install
     # Pass to make variables.
diff --git a/Library/Formula/cracklib-words.rb b/Library/Formula/cracklib-words.rb
index 042ecfa9b..fbd251aa7 100644
--- a/Library/Formula/cracklib-words.rb
+++ b/Library/Formula/cracklib-words.rb
@@ -1,16 +1,13 @@
 require 'formula'
 
 class CracklibWords <Formula
-  url 'http://downloads.sourceforge.net/project/cracklib/cracklib-words/2008-05-07/cracklib-words-20080507.gz'
+  url 'http://downloads.sourceforge.net/project/cracklib/cracklib-words/2008-05-07/cracklib-words-20080507.gz',
+    :using => NoUnzipCurlDownloadStrategy
   homepage 'http://cracklib.sourceforge.net'
   md5 '7fa6ba0cd50e7f9ccaf4707c810b14f1'
 
   depends_on 'cracklib'
 
-  def download_strategy
-    NoUnzipCurlDownloadStrategy
-  end
-
   def install
     system "gzip", "-d", "cracklib-words-20080507.gz"
     share.install "cracklib-words-20080507" => "cracklib-words"
diff --git a/Library/Formula/csshx.rb b/Library/Formula/csshx.rb
index 8c87f01e3..c8f1a050d 100644
--- a/Library/Formula/csshx.rb
+++ b/Library/Formula/csshx.rb
@@ -7,6 +7,6 @@ class Csshx < Formula
   head 'http://csshx.googlecode.com/svn/trunk/'
 
   def install
-    bin.install 'csshX' 
+    bin.install 'csshX'
   end
 end
diff --git a/Library/Formula/ctags.rb b/Library/Formula/ctags.rb
index 164ef145b..b74299f2e 100755
--- a/Library/Formula/ctags.rb
+++ b/Library/Formula/ctags.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Ctags <Formula
-  @url='http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
-  @homepage='http://ctags.sourceforge.net/'
-  @md5='c00f82ecdcc357434731913e5b48630d'
+  url 'http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
+  homepage 'http://ctags.sourceforge.net/'
+  md5 'c00f82ecdcc357434731913e5b48630d'
 
   def install
     system "./configure", "--prefix=#{prefix}",
diff --git a/Library/Formula/cuetools.rb b/Library/Formula/cuetools.rb
index aa9f6456b..3883c9bd4 100755
--- a/Library/Formula/cuetools.rb
+++ b/Library/Formula/cuetools.rb
@@ -6,7 +6,9 @@ class Cuetools <Formula
   md5 '45575f7a1bdc6615599fa6cb49845cca'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/cups-pdf.rb b/Library/Formula/cups-pdf.rb
index 656672a93..da5b2c6ce 100644
--- a/Library/Formula/cups-pdf.rb
+++ b/Library/Formula/cups-pdf.rb
@@ -17,8 +17,7 @@ class CupsPdf <Formula
     (share+'cups/model').install "extra/CUPS-PDF.ppd"
   end
 
-  def caveats
-    <<EOF
+  def caveats; <<-EOF
     In order to use cups-pdf with the Mac OS X printing system change the file
     permissions, symlink the necessary files to their System location and
     have cupsd re-read its configuration using:
diff --git a/Library/Formula/cvsps.rb b/Library/Formula/cvsps.rb
index 89657388d..f9d074c16 100644
--- a/Library/Formula/cvsps.rb
+++ b/Library/Formula/cvsps.rb
@@ -4,7 +4,6 @@ class Cvsps <Formula
   url 'http://www.cobite.com/cvsps/cvsps-2.2b1.tar.gz'
   homepage 'http://www.cobite.com/cvsps/'
   md5 '997580e8e283034995b9209076858c68'
-  version '2.2b1'
 
   def install
     system "make cvsps"
diff --git a/Library/Formula/d-bus.rb b/Library/Formula/d-bus.rb
index 34fffc05b..6f071deb2 100755
--- a/Library/Formula/d-bus.rb
+++ b/Library/Formula/d-bus.rb
@@ -13,13 +13,15 @@ class DBus <Formula
   def install
     # Fix the TMPDIR to one D-Bus doesn't reject due to odd symbols
     ENV["TMPDIR"] = "/tmp"
-    system "./configure", "--prefix=#{prefix}", "--disable-xml-docs",
-           "--disable-doxygen-docs", "--disable-dependency-tracking",
-	   "--without-x"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-xml-docs",
+                          "--disable-doxygen-docs",
+	                        "--without-x"
     system "make install"
 
     # Generate D-Bus's UUID for this machine
-    system "#{prefix}/bin/dbus-uuidgen", 
+    system "#{prefix}/bin/dbus-uuidgen",
            "--ensure=#{prefix}/var/lib/dbus/machine-id"
   end
 end
diff --git a/Library/Formula/ddclient.rb b/Library/Formula/ddclient.rb
index cd96cab8b..9d055eb39 100644
--- a/Library/Formula/ddclient.rb
+++ b/Library/Formula/ddclient.rb
@@ -5,9 +5,8 @@ class Ddclient <Formula
   homepage 'http://sourceforge.net/apps/trac/ddclient'
   md5 '6cac7a5eb1da781bfd4d98cef0b21f8e'
 
-  def skip_clean? path
-    path == etc or path == var
-  end
+  skip_clean 'etc'
+  skip_clean 'var'
 
   def install
     # Adjust default paths in script
diff --git a/Library/Formula/ddrescue.rb b/Library/Formula/ddrescue.rb
index c43d045e3..bea1153ab 100644
--- a/Library/Formula/ddrescue.rb
+++ b/Library/Formula/ddrescue.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Ddrescue <Formula
-  @url='http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.11.tar.gz'
-  @homepage='http://www.gnu.org/software/ddrescue/ddrescue.html'
-  @md5='7146046bb1851351d1337bb1f5b4e903'
+  url 'http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.11.tar.gz'
+  homepage 'http://www.gnu.org/software/ddrescue/ddrescue.html'
+  md5 '7146046bb1851351d1337bb1f5b4e903'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/despotify.rb b/Library/Formula/despotify.rb
index 454e8f348..42f0287e9 100644
--- a/Library/Formula/despotify.rb
+++ b/Library/Formula/despotify.rb
@@ -10,8 +10,7 @@ class Despotify <Formula
 
   def install
     system "make Makefile.local.mk"
-    inreplace "Makefile.local.mk",
-      "# INSTALL_PREFIX = /usr", "INSTALL_PREFIX = #{prefix}"
+    inreplace "Makefile.local.mk", "# INSTALL_PREFIX = /usr", "INSTALL_PREFIX = #{prefix}"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/devtodo.rb b/Library/Formula/devtodo.rb
index 9420373f8..7479dcc47 100644
--- a/Library/Formula/devtodo.rb
+++ b/Library/Formula/devtodo.rb
@@ -13,7 +13,7 @@ class Devtodo <Formula
 
   def install
     # Rename Regex.h to Regex.hh to avoid case-sensitivity confusion with regex.h
-    FileUtils.mv "util/Regex.h", "util/Regex.hh"
+    mv "util/Regex.h", "util/Regex.hh"
     inreplace ["util/Lexer.h", "util/Makefile.in", "util/Regex.cc"],
       "Regex.h", "Regex.hh"
 
diff --git a/Library/Formula/dict.rb b/Library/Formula/dict.rb
index d0924ba11..dea4de641 100644
--- a/Library/Formula/dict.rb
+++ b/Library/Formula/dict.rb
@@ -20,13 +20,14 @@ server dict.org
 EOS
 
 class Dict <Formula
-  @url='ftp://ftp.dict.org/dict/dictd-1.9.15.tar.gz'
-  @homepage='http://www.dict.org/'
-  @md5='68c1cffa952012ba85a7271311de55e9'
+  url 'ftp://ftp.dict.org/dict/dictd-1.9.15.tar.gz'
+  homepage 'http://www.dict.org/'
+  md5 '68c1cffa952012ba85a7271311de55e9'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--sysconfdir=#{prefix}/etc"
-
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--sysconfdir=#{etc}"
     # install the client
     system "make install.dict"
 
diff --git a/Library/Formula/diction.rb b/Library/Formula/diction.rb
index 7b384ba9c..bdea78566 100755
--- a/Library/Formula/diction.rb
+++ b/Library/Formula/diction.rb
@@ -6,12 +6,8 @@ class Diction <Formula
   md5 '4cbdb115c976d7141f54b223df28012e'
 
   def install
-      configure_args = [
-          "--prefix=#{prefix}",
-          "--disable-debug",
-          "--disable-dependency-tracking",
-      ]
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/discount.rb b/Library/Formula/discount.rb
index a9eeb555c..aa3f32555 100644
--- a/Library/Formula/discount.rb
+++ b/Library/Formula/discount.rb
@@ -6,7 +6,10 @@ class Discount <Formula
   md5 'c05cb804bdf5013aea2e816e5d2233d7'
 
   def install
-    system "./configure.sh", "--prefix=#{prefix}", "--mandir=#{man}", "--enable-dl-tag", "--enable-pandoc-header", "--enable-superscript", "--relaxed-emphasis", "--enable-div", "--enable-alpha-list"
+    system "./configure.sh", "--prefix=#{prefix}", "--mandir=#{man}",
+                             "--enable-dl-tag", "--enable-pandoc-header",
+                             "--enable-superscript", "--relaxed-emphasis",
+                             "--enable-div", "--enable-alpha-list"
     bin.mkdir
     lib.mkdir
     include.mkdir
diff --git a/Library/Formula/djmount.rb b/Library/Formula/djmount.rb
index 02e3a7545..4b5ad75a6 100644
--- a/Library/Formula/djmount.rb
+++ b/Library/Formula/djmount.rb
@@ -13,14 +13,14 @@ class Djmount <Formula
 
   def caveats
     <<-EOS.undent
-    This depends on the MacFUSE installation from http://code.google.com/p/macfuse/
-    MacFUSE must be installed prior to installing this formula.
+      This depends on the MacFUSE installation from http://code.google.com/p/macfuse/
+      MacFUSE must be installed prior to installing this formula.
     EOS
   end
 
   def install
     ENV.append "CFLAGS", "-D__FreeBSD__=10"
-    system "./configure", "--disable-debug", 
+    system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--with-fuse-prefix=/usr/local",
diff --git a/Library/Formula/dmd.rb b/Library/Formula/dmd.rb
index 164877f4a..e11017535 100644
--- a/Library/Formula/dmd.rb
+++ b/Library/Formula/dmd.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Dmd <Formula
-  @homepage='http://www.digitalmars.com/d/'
-  @url='http://ftp.digitalmars.com/dmd.1.060.zip'
-  @md5='fd982f9d1d5d836a02ece476c20e5334'
+  homepage='http://www.digitalmars.com/d/'
+  url 'http://ftp.digitalmars.com/dmd.1.060.zip'
+  md5 'fd982f9d1d5d836a02ece476c20e5334'
 
   def doc
     #use d and not dmd, rationale: meh
@@ -15,9 +15,9 @@ class Dmd <Formula
 
     # clean it up a little first
     Dir['src/*.mak'].each {|f| File.unlink f}
-    FileUtils.mv 'license.txt', 'COPYING'
-    FileUtils.mv 'README.TXT', 'README'
-    FileUtils.mv 'src/phobos/phoboslicense.txt', 'src/phobos/COPYING.phobos'
+    mv 'license.txt', 'COPYING'
+    mv 'README.TXT', 'README'
+    mv 'src/phobos/phoboslicense.txt', 'src/phobos/COPYING.phobos'
 
     prefix.install 'osx/lib'
     prefix.install 'osx/bin'
@@ -25,7 +25,7 @@ class Dmd <Formula
     man.install 'man/man1'
 
     (prefix+'src/dmd').rmtree # we don't need the dmd sources thanks
-    (man+'man5').install man1+'dmd.conf.5' # oops
+    man5.install man1+'dmd.conf.5' # oops
     (prefix+'share/d/examples').install Dir['samples/d/*.d']
 
     (prefix+'bin/dmd.conf').open('w') do |f|
diff --git a/Library/Formula/dnsmasq.rb b/Library/Formula/dnsmasq.rb
index afe166aba..57f3b7c9a 100644
--- a/Library/Formula/dnsmasq.rb
+++ b/Library/Formula/dnsmasq.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Dnsmasq <Formula
-  @url='http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.55.tar.gz'
-  @homepage='http://www.thekelleys.org.uk/dnsmasq/doc.html'
-  @md5='b093d7c6bc7f97ae6fd35d048529232a'
+  url 'http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.55.tar.gz'
+  homepage 'http://www.thekelleys.org.uk/dnsmasq/doc.html'
+  md5 'b093d7c6bc7f97ae6fd35d048529232a'
 
   def install
     ENV.deparallelize
diff --git a/Library/Formula/docbook.rb b/Library/Formula/docbook.rb
index dc662659d..2e159ccaa 100644
--- a/Library/Formula/docbook.rb
+++ b/Library/Formula/docbook.rb
@@ -6,15 +6,6 @@ class Docbook <Formula
   version '5.0'
   homepage 'http://docbook.sourceforge.net/'
 
-  def caveats
-    <<-EOS.undent
-      To use the DocBook package in your XML toolchain, you need to
-      register it with the global XML catalog with this command:
-      
-        sudo docbook-register
-    EOS
-  end
-
   def packages; [
     Docbookxml412,
     Docbookxml42,
@@ -31,6 +22,14 @@ class Docbook <Formula
       pkg.new.brew { |formula| formula.install }
     end
   end
+
+  def caveats; <<-EOS.undent
+    To use the DocBook package in your XML toolchain, you need to
+    register it with the global XML catalog with this command:
+
+      sudo docbook-register
+    EOS
+  end
 end
 
 class Docbookxml <Formula
diff --git a/Library/Formula/dos2unix.rb b/Library/Formula/dos2unix.rb
index 2343a81e6..59416be00 100644
--- a/Library/Formula/dos2unix.rb
+++ b/Library/Formula/dos2unix.rb
@@ -13,7 +13,7 @@ class Dos2unix <Formula
 
     # make install is broken due to INSTALL file, but also it sucks so we'll do it
     # also Ruby 1.8 is broken, it won't allow you to move a symlink that's
-    # target is invalid. FFS very dissapointed with dependability of 
+    # target is invalid. FFS very dissapointed with dependability of
     # fundamental Ruby functions. Maybe we shouldn't use them?
     # Anyway, that is why the symlink is installed first.
     bin.install %w[mac2unix dos2unix]
diff --git a/Library/Formula/dosbox.rb b/Library/Formula/dosbox.rb
index d082f5915..9eb31feee 100644
--- a/Library/Formula/dosbox.rb
+++ b/Library/Formula/dosbox.rb
@@ -5,22 +5,22 @@ class Dosbox <Formula
   url 'http://downloads.sourceforge.net/project/dosbox/dosbox/0.74/dosbox-0.74.tar.gz'
   homepage 'http://www.dosbox.com/'
   md5 'b9b240fa87104421962d14eee71351e8'
-  
+
   depends_on 'sdl'
   depends_on 'sdl_net'
   depends_on 'sdl_sound'
-  
+
   def install
     ENV.libpng
     ENV.fast
-    
+
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
                           "--disable-sdltest",
                           "--enable-core-inline"
     system "make"
-    
+
     bin.install 'src/dosbox'
     man1.install gzip('docs/dosbox.1')
   end
diff --git a/Library/Formula/dovecot.rb b/Library/Formula/dovecot.rb
index 885706501..fc00a2f9e 100644
--- a/Library/Formula/dovecot.rb
+++ b/Library/Formula/dovecot.rb
@@ -43,7 +43,7 @@ For Dovecot to work, you will need to do the following:
 </plist>
 
 Source: http://wiki.dovecot.org/LaunchdInstall
-4) start the server using: sudo launchctl load /Library/LaunchDaemons/org.dovecot.plist 
+4) start the server using: sudo launchctl load /Library/LaunchDaemons/org.dovecot.plist
     EOS
   end
 end
diff --git a/Library/Formula/duff.rb b/Library/Formula/duff.rb
index 6b7e1e489..b0f0a24fb 100644
--- a/Library/Formula/duff.rb
+++ b/Library/Formula/duff.rb
@@ -6,10 +6,8 @@ class Duff <Formula
   md5 '9767e471232c1b4ee553ae40dbe60464'
 
   def install
-    system "./configure", "--disable-debug", 
-                          "--disable-dependency-tracking",
-                          "--mandir=#{man}",
-                          "--prefix=#{prefix}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     # this needs to be executable, but isn't for some reason...
     system "chmod 755 ./install-sh"
     system "make install"
diff --git a/Library/Formula/dvdauthor.rb b/Library/Formula/dvdauthor.rb
index 7be96be51..cb7c6ee6d 100644
--- a/Library/Formula/dvdauthor.rb
+++ b/Library/Formula/dvdauthor.rb
@@ -14,11 +14,9 @@ class Dvdauthor <Formula
   end
 
   def install
-    system "./configure",
-        "--prefix=#{prefix}",
-        "--mandir=#{man}",
-        "--disable-debug",
-        "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system "make"
 
     # regular install will error out due to attempts to create the same
diff --git a/Library/Formula/dvdrtools.rb b/Library/Formula/dvdrtools.rb
index 887ed473a..e749254f0 100644
--- a/Library/Formula/dvdrtools.rb
+++ b/Library/Formula/dvdrtools.rb
@@ -16,17 +16,12 @@ class Dvdrtools < Formula
   def install
     ENV['LIBS'] = '-lIOKit -framework CoreFoundation'
 
-    system "./configure",
-      "--prefix=#{prefix}",
-      "--mandir=#{man}",
-      '--disable-debug',
-      '--disable-dependency-tracking'
-
+    system "./configure", '--disable-debug', '--disable-dependency-tracking',
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system 'make install'
   end
 
-  private
-
   # while homebrew assumes p1, macports patches at p0
   def macports_patches(files)
     { :p0 => files.map { |file| macports_patch_url('sysutils', file) } }
diff --git a/Library/Formula/dwdiff.rb b/Library/Formula/dwdiff.rb
index 036fd453c..91da500f1 100644
--- a/Library/Formula/dwdiff.rb
+++ b/Library/Formula/dwdiff.rb
@@ -12,10 +12,10 @@ class Dwdiff <Formula
   depends_on 'icu4c'
 
   def install
-    gettext_prefix = Formula.factory('gettext').prefix
-    icu4c_prefix = Formula.factory('icu4c').prefix
-    ENV.append "CFLAGS", "-I#{gettext_prefix}/include -I#{icu4c_prefix}/include"
-    ENV.append "LDFLAGS", "-L#{gettext_prefix}/lib -L#{icu4c_prefix}/lib"
+    gettext = Formula.factory('gettext')
+    icu4c = Formula.factory('icu4c')
+    ENV.append "CFLAGS", "-I#{gettext.include} -I#{icu4c.include}"
+    ENV.append "LDFLAGS", "-L#{gettext.lib} -L#{icu4c.lib}"
     system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
diff --git a/Library/Formula/e2fsprogs.rb b/Library/Formula/e2fsprogs.rb
index 2d851d175..c8c1a4f9f 100644
--- a/Library/Formula/e2fsprogs.rb
+++ b/Library/Formula/e2fsprogs.rb
@@ -4,10 +4,8 @@ class E2fsprogs <Formula
   url 'http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/1.41.9/e2fsprogs-1.41.9.tar.gz'
   homepage 'http://e2fsprogs.sourceforge.net/'
   md5 '52f60a9e19a02f142f5546f1b5681927'
-  
-  def keg_only?
-    "This brew installs several commands which override OS X-provided file system commands."
-  end
+
+  keg_only "This brew installs several commands which override OS X-provided file system commands."
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/ecl.rb b/Library/Formula/ecl.rb
index 3c5fe1ce4..cae7247b9 100644
--- a/Library/Formula/ecl.rb
+++ b/Library/Formula/ecl.rb
@@ -7,9 +7,7 @@ class Ecl <Formula
 
   def install
     ENV.deparallelize
-    system "./configure",
-      "--prefix=#{prefix}",
-      "--enable-unicode"
+    system "./configure", "--prefix=#{prefix}", "--enable-unicode"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/eigen.rb b/Library/Formula/eigen.rb
index a74d64485..63498b8ee 100644
--- a/Library/Formula/eigen.rb
+++ b/Library/Formula/eigen.rb
@@ -8,7 +8,7 @@ class Eigen <Formula
   depends_on 'cmake'
 
   def install
-   system "cmake . #{std_cmake_parameters}"
+    system "cmake . #{std_cmake_parameters}"
     system "make install"
   end
 end
diff --git a/Library/Formula/ejabberd.rb b/Library/Formula/ejabberd.rb
index 9d055538d..2d762daf7 100644
--- a/Library/Formula/ejabberd.rb
+++ b/Library/Formula/ejabberd.rb
@@ -1,8 +1,7 @@
 require 'formula'
 
 class Ejabberd <Formula
-  version "2.1.3"
-  url "http://www.process-one.net/downloads/ejabberd/#{version}/ejabberd-#{version}.tar.gz"
+  url "http://www.process-one.net/downloads/ejabberd/2.1.3/ejabberd-2.1.3.tar.gz"
   homepage 'http://www.ejabberd.im'
   md5 'e5c87eda5312a6e8a53df0f9b4844b69'
 
diff --git a/Library/Formula/elasticsearch.rb b/Library/Formula/elasticsearch.rb
index 82e1577d2..8c05b409c 100644
--- a/Library/Formula/elasticsearch.rb
+++ b/Library/Formula/elasticsearch.rb
@@ -6,7 +6,7 @@ class Elasticsearch < Formula
   md5 '0b9f0361163847a6580658c59cbfcc51'
 
   def install
-    FileUtils.rm_f Dir["bin/*.bat"]
+    rm_f Dir["bin/*.bat"]
     prefix.install %w[bin config lib]
   end
 end
diff --git a/Library/Formula/elinks.rb b/Library/Formula/elinks.rb
index 07fac973c..079c989f2 100644
--- a/Library/Formula/elinks.rb
+++ b/Library/Formula/elinks.rb
@@ -1,15 +1,15 @@
 require 'formula'
 
 class Elinks <Formula
-  @homepage='http://elinks.or.cz/'
-  @url='http://elinks.or.cz/download/elinks-0.11.7.tar.bz2'
-  @md5='fcd087a6d2415cd4c6fd1db53dceb646'
+  homepage 'http://elinks.or.cz/'
+  url 'http://elinks.or.cz/download/elinks-0.11.7.tar.bz2'
+  md5 'fcd087a6d2415cd4c6fd1db53dceb646'
 
   def install
-    ENV.deparallelize
     fails_with_llvm
+    ENV.deparallelize
     ENV.delete('LD')
-    system "./configure --prefix='#{prefix}'"
+    system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index e9043f7db..5bcfa1184 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -37,12 +37,6 @@ class Emacs <Formula
       To access texinfo documentation, set your INFOPATH to:
         #{info}
 
-      The Emacs project now uses bazaar for source code versioning. If you
-      last built the Homebrew emacs formula from HEAD prior to their switch
-      from CVS to bazaar, you will have to remove Homebrew's cached download
-      before building from HEAD again:
-        #{HOMEBREW_CACHE}/emacs-HEAD
-
       The initial checkout of the bazaar Emacs repository might take a long
       time. You might find that using the repo.or.cz git mirror is faster,
       even after the initial checkout. To use the repo.or.cz git mirror for
@@ -53,9 +47,6 @@ class Emacs <Formula
       status. The Emacs devs do not provide support for the git mirror, and
       they might reject bug reports filed with git version information. Use
       it at your own risk.
-
-      If you switch between repositories, you'll have to remove the Homebrew
-      emacs cache directory (see above).
     EOS
 
     return s
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index eeecb9a7b..049254f16 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -7,10 +7,9 @@ end
 
 class Erlang <Formula
   # Download from  GitHub repo, which is much faster than using the official tarball
-  url "git://github.com/erlang/otp.git"
+  url "git://github.com/erlang/otp.git", :tag => "OTP_R13B04"
   homepage 'http://www.erlang.org'
   version 'R13B04'
-  @specs = {:tag => "OTP_R13B04"}
 
   # We can't strip the beam executables or any plugins, there isn't really
   # anything else worth stripping and it takes a really, long time to run
diff --git a/Library/Formula/ettercap-ng.rb b/Library/Formula/ettercap-ng.rb
index 914761f05..5755cc7bd 100644
--- a/Library/Formula/ettercap-ng.rb
+++ b/Library/Formula/ettercap-ng.rb
@@ -11,7 +11,7 @@ class EttercapNg < Formula
   #
   # Include various macports patches: http://trac.macports.org/export/61709/trunk/dports/net/ettercap-ng/files/
   # I didn't write the macports patches, but they seem to be necessary.
-  # Associated discussions: 
+  # Associated discussions:
   #   http://thnetos.wordpress.com/2007/08/10/how-to-compile-ettercap-ng-073-on-mac-osx-when-you-get-that-annoying-pthread-error/
   #   http://thnetos.wordpress.com/2007/11/15/compile-ettercap-ng-073-natively-on-leopard-fix/
   #   http://trac.macports.org/ticket/3031
@@ -30,23 +30,17 @@ class EttercapNg < Formula
   end
 
   def install
-    configure_args = [
-     "--prefix=#{prefix}",
-     "--mandir=#{man}",
-     "--infodir=#{prefix}/share/info",
-     '--disable-dependency-tracking',
-     "--disable-gtk",
-     "--disable-debug",
-     "--disable-plugins",
-     "--with-openssl=/usr",
-     "--with-libpcap=/usr",
-     "--with-libncurses=/usr",
-     "--with-libpcre=#{HOMEBREW_PREFIX}",
-     "--with-libnet=#{HOMEBREW_PREFIX}",
-    ]
-
-    system "./configure", *configure_args
-
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}",
+                          "--infodir=#{prefix}/share/info",
+                          "--disable-gtk",
+                          "--disable-plugins",
+                          "--with-openssl=/usr",
+                          "--with-libpcap=/usr",
+                          "--with-libncurses=/usr",
+                          "--with-libpcre=#{HOMEBREW_PREFIX}",
+                          "--with-libnet=#{HOMEBREW_PREFIX}"
     system "make install"
   end
 end
diff --git a/Library/Formula/exif.rb b/Library/Formula/exif.rb
index dad17d2ef..1de0b3cf5 100644
--- a/Library/Formula/exif.rb
+++ b/Library/Formula/exif.rb
@@ -8,7 +8,7 @@ class Exif <Formula
   depends_on 'popt'
   depends_on 'libexif'
   depends_on 'gettext'
-  
+
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/exiftool.rb b/Library/Formula/exiftool.rb
index e8a8bd2cb..ed29cb642 100644
--- a/Library/Formula/exiftool.rb
+++ b/Library/Formula/exiftool.rb
@@ -8,10 +8,10 @@ class Exiftool <Formula
   def install
     system "perl", "Makefile.PL"
     system "make", "test"
-    
+
     # Install privately to the Cellar
     libexec.install ["exiftool", "lib"]
-    
+
     # Link the executable script into "bin"
     bin.mkpath
     (bin + 'exiftool').write <<-EOBIN
diff --git a/Library/Formula/exim.rb b/Library/Formula/exim.rb
index 6c9e3b4b9..aea310521 100644
--- a/Library/Formula/exim.rb
+++ b/Library/Formula/exim.rb
@@ -8,14 +8,14 @@ class Exim <Formula
   depends_on 'pcre'
 
   def install
-    FileUtils.cp 'src/EDITME', 'Local/Makefile'
+    cp 'src/EDITME', 'Local/Makefile'
     inreplace 'Local/Makefile' do |s|
       s.remove_make_var! "EXIM_MONITOR"
       s.change_make_var! "EXIM_USER", ENV['USER']
-      s.change_make_var! "SYSTEM_ALIASES_FILE", etc + 'aliases'
-      s.gsub!('/usr/exim/configure', etc + 'exim.conf')
-      s.gsub!('/usr/exim', prefix)
-      s.gsub!('/var/spool/exim', var + 'spool/exim')
+      s.change_make_var! "SYSTEM_ALIASES_FILE", etc+'aliases'
+      s.gsub! '/usr/exim/configure', etc+'exim.conf'
+      s.gsub! '/usr/exim', prefix
+      s.gsub! '/var/spool/exim', var+'spool/exim'
 
       # For non-/usr/local HOMEBREW_PREFIX
       s << "LOOKUP_INCLUDE=-I#{HOMEBREW_PREFIX}/include\n"
@@ -31,11 +31,11 @@ class Exim <Formula
 
     system "make"
     system "make INSTALL_ARG=-no_chown install"
-    (man + 'man8').install 'doc/exim.8'
-    (bin + 'exim_ctl').write startup_script
+    (man8).install 'doc/exim.8'
+    (bin+'exim_ctl').write startup_script
   end
 
-  #inspired from macports startup script, but with fixed restart issue due to missing setuid
+  # Inspired by MacPorts startup script. Fixes restart issue due to missing setuid.
   def startup_script
     return <<-END
 #!/bin/sh
@@ -61,11 +61,10 @@ esac
 END
   end
 
-  def caveats
-    <<-EOS.undent
-      Start with:
-        exim_ctl start
-      Don't forget to run it as root to be able to bind port 25.
+  def caveats; <<-EOS.undent
+    Start with:
+      exim_ctl start
+    Don't forget to run it as root to be able to bind port 25.
     EOS
   end
 end
diff --git a/Library/Formula/expat.rb b/Library/Formula/expat.rb
index fc251c13f..0fdef35b7 100644
--- a/Library/Formula/expat.rb
+++ b/Library/Formula/expat.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Expat <Formula
-  @url='http://downloads.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz'
-  @homepage='http://expat.sourceforge.net/'
-  @md5='ee8b492592568805593f81f8cdf2a04c'
+  url 'http://downloads.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz'
+  homepage 'http://expat.sourceforge.net/'
+  md5 'ee8b492592568805593f81f8cdf2a04c'
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
@@ -11,7 +11,7 @@ class Expat <Formula
                           "--mandir=#{man}"
     system "make install"
   end
-  
+
   def caveats
     "Note that OS X has Expat 1.5 installed in /usr already."
   end
diff --git a/Library/Formula/exult.rb b/Library/Formula/exult.rb
index ea312e339..bff21f212 100755
--- a/Library/Formula/exult.rb
+++ b/Library/Formula/exult.rb
@@ -1,9 +1,10 @@
 require 'formula'
 
 class Exult <Formula
-  head 'http://exult.svn.sourceforge.net/svnroot/exult/exult/trunk',
-          :revision => '6317'
+  url 'http://exult.svn.sourceforge.net/svnroot/exult/exult/trunk', :revision => '6317'
   homepage 'http://exult.sourceforge.net/'
+  version '1.4pre'
+  head 'http://exult.svn.sourceforge.net/svnroot/exult/exult/trunk'
 
   depends_on 'sdl'
   depends_on 'sdl_mixer'
@@ -14,9 +15,8 @@ class Exult <Formula
     inreplace "autogen.sh", "libtoolize", "glibtoolize"
 
     system "./autogen.sh"
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--disable-sdltest"
 
     system "make"
@@ -24,10 +24,14 @@ class Exult <Formula
     prefix.install "Exult.app"
   end
 
-  def caveats;
-    "Cocoa app installed to #{prefix}\n\n"\
-    "Note that this includes only the game engine; you will need to supply your own\n"\
-    "own legal copy of the Ultima 7 game files. Try here (Amazon.com):\n\n"\
-    "http://bit.ly/8JzovU"
+  def caveats
+    <<-EOS.undent
+      Cocoa app installed to:
+        #{prefix}
+
+      Note that this includes only the game engine; you will need to supply your own
+      own legal copy of the Ultima 7 game files. Try here (Amazon.com):
+        http://bit.ly/8JzovU
+    EOS
   end
 end
diff --git a/Library/Formula/fabricate.rb b/Library/Formula/fabricate.rb
index 6495e7efb..89366d4b6 100644
--- a/Library/Formula/fabricate.rb
+++ b/Library/Formula/fabricate.rb
@@ -1,7 +1,6 @@
 require 'formula'
 
 class Fabricate <ScriptFileFormula
-  @url='http://fabricate.googlecode.com/svn/trunk'
-  @version='HEAD'
-  @homepage='http://code.google.com/p/fabricate'
+  head 'http://fabricate.googlecode.com/svn/trunk'
+  homepage 'http://code.google.com/p/fabricate'
 end
diff --git a/Library/Formula/falcon.rb b/Library/Formula/falcon.rb
index 221e7bcf0..11577e7f7 100644
--- a/Library/Formula/falcon.rb
+++ b/Library/Formula/falcon.rb
@@ -27,19 +27,14 @@ class Falcon <Formula
     system "./build.sh", "-p", "#{prefix}", "-int", "-el"
     system "./build.sh", "-i"
     # install the htmldocs for the core and standard modules (feathers)
-    FalconHtmldocs.new.brew {
-      (doc+'core-doc').install Dir['*']
-    }
-    FalconFeathersHtmldocs.new.brew {
-      (doc+'feathers-doc').install Dir['*']
-    }
+    FalconHtmldocs.new.brew { (doc+'core-doc').install Dir['*'] }
+    FalconFeathersHtmldocs.new.brew { (doc+'feathers-doc').install Dir['*'] }
   end
 
   def caveats; <<-EOS.undent
-    HTML docs for the core and standard libraries (feathers) are 
-    installed in #{doc}/core-doc and 
+    HTML docs for the core and standard libraries (feathers) are
+    installed in #{doc}/core-doc and
     #{doc}/feathers-doc respectively.
-
     EOS
   end
 end
diff --git a/Library/Formula/fastri.rb b/Library/Formula/fastri.rb
index c8eeba856..021790fa4 100644
--- a/Library/Formula/fastri.rb
+++ b/Library/Formula/fastri.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Fastri <Formula
-  @homepage='http://eigenclass.org/hiki/fastri'
-  @url='http://rubyforge.org/frs/download.php/31654/fastri-0.3.1.tar.gz'
-  @md5='3a7d0a64b1c8e230a34ef7b4bad30dbe'
+  homepage 'http://eigenclass.org/hiki/fastri'
+  url 'http://rubyforge.org/frs/download.php/31654/fastri-0.3.1.tar.gz'
+  md5 '3a7d0a64b1c8e230a34ef7b4bad30dbe'
 
   def install
     system "ruby setup.rb all --prefix='#{prefix}'"
diff --git a/Library/Formula/fbida.rb b/Library/Formula/fbida.rb
index 612fcf4a8..18e0a2ead 100644
--- a/Library/Formula/fbida.rb
+++ b/Library/Formula/fbida.rb
@@ -4,7 +4,7 @@ class Fbida <Formula
   url 'http://dl.bytesex.org/releases/fbida/fbida-2.07.tar.gz'
   homepage 'http://linux.bytesex.org/fbida/'
   md5 '3e05910fb7c1d9b2bd3e272d96db069c'
-  
+
   depends_on 'libexif'
   depends_on 'jpeg'
 
diff --git a/Library/Formula/ffmpeg-php.rb b/Library/Formula/ffmpeg-php.rb
index bcb2ce37f..4c483638b 100644
--- a/Library/Formula/ffmpeg-php.rb
+++ b/Library/Formula/ffmpeg-php.rb
@@ -12,17 +12,16 @@ class FfmpegPhp <Formula
                           "--prefix=#{prefix}",
                           "--with-ffmpeg=#{HOMEBREW_PREFIX}"
     system "make"
-    prefix.install 'modules/ffmpeg.so'    
+    prefix.install 'modules/ffmpeg.so'
   end
 
-  def caveats
-   <<-END_CAVEATS
+  def caveats; <<-EOS
  * Add the following line to php.ini:
     extension="#{prefix}/ffmpeg.so"
  * Restart your webserver.
  * Write a PHP page that calls "phpinfo();"
  * Load it in a browser and look for the info on the ffmpeg module.
  * If you see it, you have been successful!
-    END_CAVEATS
+    EOS
   end
 end
diff --git a/Library/Formula/figlet.rb b/Library/Formula/figlet.rb
index 189f3a859..41df5bf1f 100644
--- a/Library/Formula/figlet.rb
+++ b/Library/Formula/figlet.rb
@@ -22,10 +22,6 @@ class Figlet <Formula
     share + "figlet/fonts"
   end
 
-  def man6
-    share + 'man/man6'
-  end
-
   def patches
     DATA
   end
diff --git a/Library/Formula/findutils.rb b/Library/Formula/findutils.rb
index bbb7b4287..329ebc9a1 100644
--- a/Library/Formula/findutils.rb
+++ b/Library/Formula/findutils.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Findutils <Formula
-  @url='http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz'
-  @homepage='http://www.gnu.org/software/findutils/'
-  @md5='351cc4adb07d54877fa15f75fb77d39f'
+  url 'http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz'
+  homepage 'http://www.gnu.org/software/findutils/'
+  md5 '351cc4adb07d54877fa15f75fb77d39f'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/flac.rb b/Library/Formula/flac.rb
index a60f033c1..31dab96f8 100644
--- a/Library/Formula/flac.rb
+++ b/Library/Formula/flac.rb
@@ -13,7 +13,7 @@ class Flac <Formula
   depends_on 'lame'
 
   def install
-    # sadly the asm optimisations won't compile since Leopard, and nobody 
+    # sadly the asm optimisations won't compile since Leopard, and nobody
     # cares or knows how to fix it
     system "./configure", "--disable-debug",
                           "--disable-asm-optimizations",
diff --git a/Library/Formula/flip.rb b/Library/Formula/flip.rb
index a8e5bd793..0d067f64f 100644
--- a/Library/Formula/flip.rb
+++ b/Library/Formula/flip.rb
@@ -5,7 +5,7 @@ class Flip <Formula
   homepage 'https://ccrma.stanford.edu/~craig/utility/flip/'
   md5 '21dc9256584eceffcfc27e137b3f8bc5'
   version '2005.8.21' # It has no version number, I made one up from the last modified date
-  
+
   def install
     system "#{ENV.cxx} #{ENV['CXXFLAGS']} -o flip flip.cpp && strip flip"
     bin.install "flip"
diff --git a/Library/Formula/fltk.rb b/Library/Formula/fltk.rb
index 2dac34826..2631237f8 100644
--- a/Library/Formula/fltk.rb
+++ b/Library/Formula/fltk.rb
@@ -4,7 +4,7 @@ class Fltk <Formula
   url 'http://ftp2.easysw.com/pub/fltk/1.1.10/fltk-1.1.10-source.tar.gz'
   homepage 'http://www.fltk.org/'
   md5 'e6378a76ca1ef073bcb092df1ef3ba55'
-  
+
   def install
     system "./configure", "--prefix=#{prefix}", "--enable-threads"
     system "make install"
diff --git a/Library/Formula/flvstreamer.rb b/Library/Formula/flvstreamer.rb
index 19bc7bd29..2542a7cd2 100644
--- a/Library/Formula/flvstreamer.rb
+++ b/Library/Formula/flvstreamer.rb
@@ -4,7 +4,6 @@ class Flvstreamer <Formula
   url 'http://download.savannah.gnu.org/releases-noredirect/flvstreamer/source/flvstreamer-2.1c1.tar.gz'
   homepage 'http://www.nongnu.org/flvstreamer/'
   md5 '4866387328ad89c957af90a2478e5556'
-  version '2.1c1' 
 
   def install
     system "make posix"
diff --git a/Library/Formula/fondu.rb b/Library/Formula/fondu.rb
index e25fc1a66..678fbaeb6 100644
--- a/Library/Formula/fondu.rb
+++ b/Library/Formula/fondu.rb
@@ -8,9 +8,7 @@ class Fondu <Formula
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make"
-    bin.install 'fondu'
-    bin.install 'ufond'
-    man1.install 'fondu.1'
-    man1.install 'ufond.1'
+    bin.install ['fondu', 'ufond']
+    man1.install ['fondu.1', 'ufond.1']
   end
 end
diff --git a/Library/Formula/fontconfig.rb b/Library/Formula/fontconfig.rb
index a6d9c4520..065b50b44 100644
--- a/Library/Formula/fontconfig.rb
+++ b/Library/Formula/fontconfig.rb
@@ -6,9 +6,7 @@ class Fontconfig <Formula
   md5 '77e15a92006ddc2adbb06f840d591c0e'
 
   # Leopard comes with 2.4.x, which is too old for many packages.
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/foremost.rb b/Library/Formula/foremost.rb
index d20426ceb..810ffd963 100644
--- a/Library/Formula/foremost.rb
+++ b/Library/Formula/foremost.rb
@@ -15,7 +15,7 @@ class Foremost <Formula
     system "make mac"
 
     bin.install "foremost"
-    (man+"man8").install "foremost.8.gz"
+    man8.install "foremost.8.gz"
     etc.install "foremost.conf" => "foremost.conf.sample"
   end
 end
diff --git a/Library/Formula/fortune.rb b/Library/Formula/fortune.rb
index d6ba1826b..40fafa5a0 100644
--- a/Library/Formula/fortune.rb
+++ b/Library/Formula/fortune.rb
@@ -6,9 +6,7 @@ class Fortune <Formula
   md5 '81a87a44f9d94b0809dfc2b7b140a379'
 
   def options
-    [
-      ['--no-offensive', "Don't install potentially offenive fortune files"]
-    ]
+    [['--no-offensive', "Don't install potentially offenive fortune files"]]
   end
 
   def install
diff --git a/Library/Formula/freeimage.rb b/Library/Formula/freeimage.rb
index 496deeb2d..a5ab922b8 100644
--- a/Library/Formula/freeimage.rb
+++ b/Library/Formula/freeimage.rb
@@ -9,15 +9,12 @@ class FreeimageHttpDownloadStrategy <CurlDownloadStrategy
 end
 
 class Freeimage <Formula
-  url 'http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/3.13.1/FreeImage3131.zip'
+  url 'http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/3.13.1/FreeImage3131.zip',
+        :using => FreeimageHttpDownloadStrategy
   version '3.13.1'
   md5 'a2e20b223a2cf6a5791cc47686364e99'
   homepage 'http://sf.net/projects/freeimage'
 
-  def download_strategy
-    FreeimageHttpDownloadStrategy
-  end
-
   def patches
     DATA
   end
diff --git a/Library/Formula/frotz.rb b/Library/Formula/frotz.rb
index c872d6c63..120ea0ad1 100644
--- a/Library/Formula/frotz.rb
+++ b/Library/Formula/frotz.rb
@@ -1,15 +1,15 @@
 require 'formula'
 
 class Frotz <Formula
-  @url='http://downloads.sourceforge.net/project/frotz/frotz/2.43/frotz-2.43.tar.gz'
-  @homepage='http://frotz.sourceforge.net/'
-  @md5='efe51879e012b92bb8d5f4a82e982677'
+  url 'http://downloads.sourceforge.net/project/frotz/frotz/2.43/frotz-2.43.tar.gz'
+  homepage 'http://frotz.sourceforge.net/'
+  md5 'efe51879e012b92bb8d5f4a82e982677'
 
   def install
-    inreplace "Makefile" do |contents|
-      contents.remove_make_var! %w[CC OPTS]
-      contents.change_make_var! "PREFIX", prefix
-      contents.change_make_var! "CONFIG_DIR", etc
+    inreplace "Makefile" do |s|
+      s.remove_make_var! %w[CC OPTS]
+      s.change_make_var! "PREFIX", prefix
+      s.change_make_var! "CONFIG_DIR", etc
     end
 
     system "make frotz"
diff --git a/Library/Formula/fsh.rb b/Library/Formula/fsh.rb
index 8e7cf8245..a792b1788 100644
--- a/Library/Formula/fsh.rb
+++ b/Library/Formula/fsh.rb
@@ -8,13 +8,13 @@ class Fsh <Formula
   def install
     # FCNTL was deprecated and needs to be changed to fcntl
     system "find . -type f -exec sed -i \"\" 's/FCNTL/fcntl/g' {} \\;"
-    
+
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
-    
+
     cd bin do
       inreplace ["fsh", "fshd", "in.fshd"],
-        "#! /usr/local/bin/python", "#!/usr/bin/env python"
+          "#! /usr/local/bin/python", "#!/usr/bin/env python"
     end
   end
 end
diff --git a/Library/Formula/ftgl.rb b/Library/Formula/ftgl.rb
index 7d048da4f..509d943bf 100644
--- a/Library/Formula/ftgl.rb
+++ b/Library/Formula/ftgl.rb
@@ -14,9 +14,7 @@ class Ftgl <Formula
       puts "use \"brew link doxygen\" afterwards to reactivate it."
     end
 
-    # Put freetype-config in path
-    ENV.x11
-    ENV.prepend 'PATH', "/usr/X11/bin", ":"
+    ENV.x11 # Put freetype-config in path
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/gambit-scheme.rb b/Library/Formula/gambit-scheme.rb
index a4040ca74..83e079b3c 100644
--- a/Library/Formula/gambit-scheme.rb
+++ b/Library/Formula/gambit-scheme.rb
@@ -29,7 +29,6 @@ class GambitScheme <Formula
     configure_args << "--enable-shared" if ARGV.include? '--enable-shared'
 
     system "./configure", *configure_args
-
     system "make check" if ARGV.include? '--with-check'
 
     ENV.j1
diff --git a/Library/Formula/gant.rb b/Library/Formula/gant.rb
index 58276487e..bb52ceb45 100644
--- a/Library/Formula/gant.rb
+++ b/Library/Formula/gant.rb
@@ -7,7 +7,7 @@ class Gant <Formula
   md5 '646f29f42793520a3702b1f356f5d4a6'
 
   depends_on 'groovy'
-  
+
   def install
     rm_f Dir["bin/*.bat"]
     # gant-starter.conf is found relative to bin
diff --git a/Library/Formula/gccxml.rb b/Library/Formula/gccxml.rb
index 6bb0f0c6c..75822c43d 100644
--- a/Library/Formula/gccxml.rb
+++ b/Library/Formula/gccxml.rb
@@ -1,18 +1,14 @@
 require 'formula'
 
 class Gccxml <Formula
-  # NOTE you don't need to specify the version, usually it is determined
-  # automatically by examination of the URL, however in this case our auto
-  # determination magic is inadequete
-  version 'HEAD'
   url "cvs://:pserver:anoncvs@www.gccxml.org:/cvsroot/GCC_XML:gccxml"
+  version 'HEAD'
   homepage 'http://www.gccxml.org/HTML/Index.html'
 
   depends_on 'cmake'
 
   def install
-    FileUtils.mkdir 'gccxml-build'
-
+    mkdir 'gccxml-build'
     Dir.chdir 'gccxml-build' do
       system "cmake .. #{std_cmake_parameters}"
       system "make"
diff --git a/Library/Formula/gd.rb b/Library/Formula/gd.rb
index dd996a65d..2916a1450 100755
--- a/Library/Formula/gd.rb
+++ b/Library/Formula/gd.rb
@@ -1,8 +1,7 @@
 require 'formula'
 
 class Gd <Formula
-  version "2.0.36RC1"
-  url "http://www.libgd.org/releases/gd-#{version}.tar.gz"
+  url "http://www.libgd.org/releases/gd-2.0.36RC1.tar.gz"
   homepage "http://www.libgd.org"
   md5 "39ac48e6d5e0012a3bd2248a0102f209"
 
diff --git a/Library/Formula/gerrit-tools.rb b/Library/Formula/gerrit-tools.rb
index be1e7161e..eb3e5a13c 100644
--- a/Library/Formula/gerrit-tools.rb
+++ b/Library/Formula/gerrit-tools.rb
@@ -5,6 +5,6 @@ class GerritTools <Formula
   homepage 'http://github.com/indirect/gerrit-tools'
 
   def install
-    bin.install(Dir["bin/*"])
+    prefix.install 'bin'
   end
 end
diff --git a/Library/Formula/gettext.rb b/Library/Formula/gettext.rb
index 3366711ee..808a90c9c 100644
--- a/Library/Formula/gettext.rb
+++ b/Library/Formula/gettext.rb
@@ -1,34 +1,27 @@
 require 'formula'
 
 class Gettext <Formula
-  @url='http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz'
-  @md5='58a2bc6d39c0ba57823034d55d65d606'
-  @homepage='http://www.gnu.org/software/gettext/'
+  url 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz'
+  md5 '58a2bc6d39c0ba57823034d55d65d606'
+  homepage 'http://www.gnu.org/software/gettext/'
 
   def patches
     'http://gist.github.com/raw/186336/2fe65fab894f94a03aab2f03349ae7f1febcd301/mac-osx-105-environ.patch'
   end
 
-  def keg_only?
-    "OS X provides the BSD gettext library and some software gets confused if both are in the library path."
-  end
+  keg_only "OS X provides the BSD gettext library and some software gets confused if both are in the library path."
 
   def install
     ENV.libxml2
     ENV.O3 # Issues with LLVM & O4 on Mac Pro 10.6
 
-    # TODO seems like this package needs more optmisation
-    # maybe someone can tell me how glib depends on gettext, but gettext 
-    # depends on glib and thus includes its own?!
-    system "./configure", "--disable-debug",
+    system "./configure", "--disable-dependency-tracking", "--disable-debug",
                           "--prefix=#{prefix}",
-                          "--disable-dependency-tracking",
-                        # '--disable-nls ',
-                          '--without-emacs', 
-                          '--without-included-gettext',
-                          '--without-included-glib',
-                          '--without-included-libcroco',
-                          '--without-included-libxml'
+                          "--without-emacs",
+                          "--without-included-gettext",
+                          "--without-included-glib",
+                          "--without-included-libcroco",
+                          "--without-included-libxml"
     system "make"
     ENV.deparallelize # install doesn't support multiple make jobs
     system "make install"
diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb
index 7ecee7ea1..0c7feb961 100644
--- a/Library/Formula/ghc.rb
+++ b/Library/Formula/ghc.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Ghc <Formula
   homepage 'http://haskell.org/ghc/'
+  url "http://darcs.haskell.org/download/dist/6.12.3/GHC-6.12.3-i386.pkg"
   version '6.12.3'
-  url "http://darcs.haskell.org/download/dist/#{version}/GHC-#{version}-i386.pkg"
   md5 '58399e3af68f50a23a847bdfe3de5aca'
 
   # Avoid stripping the Haskell binaries & libraries.
diff --git a/Library/Formula/git-flow.rb b/Library/Formula/git-flow.rb
index 541fbfe77..7e38e3053 100644
--- a/Library/Formula/git-flow.rb
+++ b/Library/Formula/git-flow.rb
@@ -1,12 +1,9 @@
 require 'formula'
 
 class GitFlow <Formula
-  if ARGV.build_head?
-    head 'git://github.com/nvie/gitflow.git', :branch => 'develop'
-  else
-    head 'git://github.com/nvie/gitflow.git', :tag => '0.2.1'
-    version '0.2.1'
-  end
+  url 'git://github.com/nvie/gitflow.git', :tag => '0.2.1'
+  version '0.2.1'
+  head 'git://github.com/nvie/gitflow.git', :branch => 'develop'
 
   homepage 'http://github.com/nvie/gitflow'
 
diff --git a/Library/Formula/git-sh.rb b/Library/Formula/git-sh.rb
index 2befabede..d09863536 100644
--- a/Library/Formula/git-sh.rb
+++ b/Library/Formula/git-sh.rb
@@ -7,7 +7,8 @@ class GitSh < Formula
   version '20100401'
   head 'git://github.com/rtomayko/git-sh.git'
 
-  depends_on 'git'
+  # Not depending on git because people might have it
+  # installed through another means
 
   def install
     system "make"
diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index 857ce114b..0fe88e4cc 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -32,8 +32,8 @@ class Git < Formula
 
     # Install the git bash completion file
     (etc+'bash_completion.d').install 'contrib/completion/git-completion.bash'
-    
-    # Install git-p4 
+
+    # Install git-p4
     bin.install 'contrib/fast-import/git-p4'
 
     # these files are exact copies of the git binary, so like the contents
@@ -50,7 +50,6 @@ class Git < Formula
     # we could build the manpages ourselves, but the build process depends
     # on many other packages, and is somewhat crazy, this way is easier
     GitManuals.new.brew { man.install Dir['*'] }
-    doc = share+'doc/git-doc'
-    GitHtmldocs.new.brew { doc.install Dir['*'] }
+    GitHtmldocs.new.brew { (share+'doc/git-doc').install Dir['*'] }
   end
 end
diff --git a/Library/Formula/glew.rb b/Library/Formula/glew.rb
index 22056fed4..cf901445f 100644
--- a/Library/Formula/glew.rb
+++ b/Library/Formula/glew.rb
@@ -6,8 +6,8 @@ class Glew <Formula
   md5 '3621f27cfd3e33d5dbcc1111ecb5b762'
 
   def install
-    system "mkdir -p #{prefix}/lib/pkgconfig"
-    system "make GLEW_DEST=#{prefix}"
-    system "make GLEW_DEST=#{prefix} install"
+    (lib+'pkgconfig').mkpath
+    system "make", "GLEW_DEST=#{prefix}"
+    system "make", "GLEW_DEST=#{prefix}", "install"
   end
 end
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 0201a0f59..66418ef0b 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -19,7 +19,7 @@ class Glib <Formula
     # Snow Leopard libiconv doesn't have a 64bit version of the libiconv_open
     # function, which breaks things for us, so we build our own
     # http://www.mail-archive.com/gtk-list@gnome.org/msg28747.html
-    
+
     iconvd = Pathname.getwd+'iconv'
     iconvd.mkpath
 
@@ -53,7 +53,7 @@ class Glib <Formula
     inreplace lib+'pkgconfig/glib-2.0.pc' do |s|
       s.gsub! 'Libs: -L${libdir} -lglib-2.0 -lintl',
               "Libs: -L${libdir} -lglib-2.0 -L#{gettext.lib} -lintl"
-      
+
       s.gsub! 'Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include',
               "Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext.include}"
     end
diff --git a/Library/Formula/global.rb b/Library/Formula/global.rb
index 01b4db4bd..74b0d9fc1 100644
--- a/Library/Formula/global.rb
+++ b/Library/Formula/global.rb
@@ -8,10 +8,10 @@ class Global <Formula
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
-    
+
     # we copy these in already
     Dir.chdir(share+'gtags') do
-      FileUtils.rm %w[README COPYING LICENSE INSTALL ChangeLog AUTHORS]
+      rm %w[README COPYING LICENSE INSTALL ChangeLog AUTHORS]
     end
   end
 end
diff --git a/Library/Formula/gloox.rb b/Library/Formula/gloox.rb
index 4a0c8b6e6..80b570d09 100644
--- a/Library/Formula/gloox.rb
+++ b/Library/Formula/gloox.rb
@@ -14,11 +14,11 @@ class Gloox <Formula
   end
 
   def install
-    system "./configure", "--with-openssl", 
+    system "./configure", "--disable-debug",
+                          "--prefix=#{prefix}",
+                          "--with-openssl",
                           "--without-gnutls",
-                          "--with-zlib",
-                          "--disable-debug",
-                          "--prefix=#{prefix}"
+                          "--with-zlib"
     system "make install"
   end
 end
diff --git a/Library/Formula/gmediaserver.rb b/Library/Formula/gmediaserver.rb
index 97b39b7d7..d2fcf6cb0 100644
--- a/Library/Formula/gmediaserver.rb
+++ b/Library/Formula/gmediaserver.rb
@@ -4,27 +4,26 @@ class Gmediaserver < Formula
   url 'http://download.savannah.gnu.org/releases/gmediaserver/gmediaserver-0.13.0.tar.gz'
   homepage 'http://www.gnu.org/software/gmediaserver/'
   md5 'c422de386331e2a1a859d45f6fa270a3'
-  
+
   depends_on 'pkg-config'
   depends_on 'libupnp'
   depends_on 'libmagic'
   depends_on 'id3lib' => :optional
   depends_on 'taglib' => :optional
-  
+
   def patches
     # patching gmediaserver because sigwaitinfo is not available on
     # mac os x snow leopard, using sigwait instead
     DATA
   end
 
-  def install    
-    system "./configure", "--prefix=#{prefix}", 
-                          "--disable-debug", 
-                          "--disable-dependency-tracking"
+  def install
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make"
     system "make install"
   end
-end  
+end
 
 __END__
 --- gmediaserver-0.13.0 CHANGED/src/metadata.c	2007-10-20 11:41:32.000000000 +0200
diff --git a/Library/Formula/gmime.rb b/Library/Formula/gmime.rb
index 07848cfba..8f70aace5 100644
--- a/Library/Formula/gmime.rb
+++ b/Library/Formula/gmime.rb
@@ -8,7 +8,8 @@ class Gmime <Formula
   depends_on 'glib'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--enable-largefile"
     system "make install"
   end
diff --git a/Library/Formula/gnu-chess.rb b/Library/Formula/gnu-chess.rb
index a8b26378c..13c67325a 100644
--- a/Library/Formula/gnu-chess.rb
+++ b/Library/Formula/gnu-chess.rb
@@ -33,16 +33,14 @@ class GnuChess <Formula
     doc.install ['TODO', 'book_1.01.pgn.gz', 'book']
   end
 
-  def caveats
-    <<-EOS.undent
-      The README file contains a manual for use:
-      
-        #{doc}/README
-      
-      This formula also downloads the additional opening book.  The opening
-      book is a gzipped PGN file that can be added using gnuchess commands.
-      The book_*.pgn.gz file is located in the same directory as the README.
-      See the README for using the `book add' command.
+  def caveats; <<-EOS.undent
+    The README file contains a manual for use:
+      #{doc}/README
+
+    This formula also downloads the additional opening book.  The opening
+    book is a gzipped PGN file that can be added using gnuchess commands.
+    The book_*.pgn.gz file is located in the same directory as the README.
+    See the README for using the `book add' command.
     EOS
   end
 end
diff --git a/Library/Formula/gnu-getopt.rb b/Library/Formula/gnu-getopt.rb
index 639692ca9..3f9752b6b 100644
--- a/Library/Formula/gnu-getopt.rb
+++ b/Library/Formula/gnu-getopt.rb
@@ -7,9 +7,7 @@ class GnuGetopt <Formula
 
   depends_on 'gettext'
 
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def install
     inreplace 'Makefile' do |s|
diff --git a/Library/Formula/gnu-go.rb b/Library/Formula/gnu-go.rb
index 1ff880c4c..cd4cbf149 100644
--- a/Library/Formula/gnu-go.rb
+++ b/Library/Formula/gnu-go.rb
@@ -1,12 +1,14 @@
 require 'formula'
 
 class GnuGo <Formula
-  @url='http://ftp.gnu.org/gnu/gnugo/gnugo-3.8.tar.gz'
-  @homepage='http://www.gnu.org/software/gnugo/gnugo.html'
-  @md5='6db0a528df58876d2b0ef1659c374a9a'
+  url 'http://ftp.gnu.org/gnu/gnugo/gnugo-3.8.tar.gz'
+  homepage 'http://www.gnu.org/software/gnugo/gnugo.html'
+  md5 '6db0a528df58876d2b0ef1659c374a9a'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--with-readline=/usr/lib"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-readline=/usr/lib"
     system "make install"
   end
 end
diff --git a/Library/Formula/gnu-prolog.rb b/Library/Formula/gnu-prolog.rb
index 5fdf59c4e..b2bcaa835 100644
--- a/Library/Formula/gnu-prolog.rb
+++ b/Library/Formula/gnu-prolog.rb
@@ -5,11 +5,10 @@ class GnuProlog <Formula
   homepage 'http://www.gprolog.org/'
   md5 '3a0c9994927c8ff9e0a9c6edac0b2e69'
 
-  def skip_clean? path; true; end
+  skip_clean :all
 
   def install
-    # make won't run in parallel
-    ENV.j1
+    ENV.j1 # make won't run in parallel
 
     Dir.chdir 'src' do
       system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/gnu-smalltalk.rb b/Library/Formula/gnu-smalltalk.rb
index 1a24408fc..b883f5e37 100644
--- a/Library/Formula/gnu-smalltalk.rb
+++ b/Library/Formula/gnu-smalltalk.rb
@@ -10,9 +10,9 @@ require 'formula'
 # * gdbm
 
 class GnuSmalltalk <Formula
-  url 'ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.2.tar.gz'
+  url 'ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.2.2.tar.gz'
   homepage 'http://smalltalk.gnu.org/'
-  sha1 'd951714c4fc7d91d06bdc33c20905885e5d2b25f'
+  sha1 'a985d69e4760420614c9dfe4d3605e47c5eb8faa'
 
   # depends_on 'gmp' => :optional # 32/64 built build problems
 
@@ -29,8 +29,8 @@ class GnuSmalltalk <Formula
     ENV['AWK'] = "#{here}/gawk"
 
     ENV['FFI_CFLAGS'] = '-I/usr/include/ffi'
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", 
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--with-readline=/usr/lib"
     system "make"
     ENV.j1 # Parallel install doesn't work
diff --git a/Library/Formula/gnu-tar.rb b/Library/Formula/gnu-tar.rb
index 9ccf01f78..758dec4dc 100644
--- a/Library/Formula/gnu-tar.rb
+++ b/Library/Formula/gnu-tar.rb
@@ -13,7 +13,7 @@ class GnuTar < Formula
     args = [ "--prefix=#{prefix}" , "--mandir=#{man}" ]
     args << "--program-prefix=g" unless ARGV.include? '--default-names'
 
-    system "./configure", *args                      
+    system "./configure", *args
     system "make install"
   end
 end
diff --git a/Library/Formula/gnu-time.rb b/Library/Formula/gnu-time.rb
index b8a0929ea..415a15511 100644
--- a/Library/Formula/gnu-time.rb
+++ b/Library/Formula/gnu-time.rb
@@ -6,10 +6,9 @@ class GnuTime <Formula
   md5 'e38d2b8b34b1ca259cf7b053caac32b3'
 
   def install
-    system "./configure",
-    "--prefix=#{prefix}",
-    "--program-prefix=g",
-    "--mandir=#{man}"
+    system "./configure", "--program-prefix=g",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/gnutls.rb b/Library/Formula/gnutls.rb
index 14000f591..c27b41a13 100644
--- a/Library/Formula/gnutls.rb
+++ b/Library/Formula/gnutls.rb
@@ -1,15 +1,15 @@
 require 'formula'
 
 class Gnutls <Formula
-  @url='http://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.5.tar.bz2'
-  @homepage='http://www.gnu.org/software/gnutls/gnutls.html'
-  @sha1='5121c52efd4718ad3d8b641d28343b0c6abaa571'
+  url 'http://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.5.tar.bz2'
+  homepage 'http://www.gnu.org/software/gnutls/gnutls.html'
+  sha1 '5121c52efd4718ad3d8b641d28343b0c6abaa571'
 
   depends_on 'libgcrypt'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--disable-guile"
     system "make install"
   end
diff --git a/Library/Formula/gource.rb b/Library/Formula/gource.rb
index ea22f3498..6af228662 100644
--- a/Library/Formula/gource.rb
+++ b/Library/Formula/gource.rb
@@ -2,9 +2,8 @@ require 'formula'
 
 class Gource <Formula
   homepage 'http://code.google.com/p/gource/'
-  # Stable version doesn't work on 10.6.3
-  # url 'http://gource.googlecode.com/files/gource-0.26.tar.gz'
-  # sha1 'f2e92a5f806264790f61a988d58dd488d1dc169a'
+  url 'git://github.com/acaudwell/Gource.git', :tag => "24feaee4"
+  version "0.27"
   head 'git://github.com/acaudwell/Gource.git'
 
   depends_on 'pkg-config'
@@ -17,9 +16,7 @@ class Gource <Formula
   depends_on 'glew'
 
   def install
-    # Put freetype-config in path
-    ENV.x11
-    ENV.prepend 'PATH', "/usr/X11/bin", ":"
+    ENV.x11 # Put freetype-config in path
 
     # For non-/usr/local installs
     ENV.append "CXXFLAGS", "-I#{HOMEBREW_PREFIX}/include"
diff --git a/Library/Formula/gphoto2.rb b/Library/Formula/gphoto2.rb
index e1f3ca3ed..5db6fbbd4 100644
--- a/Library/Formula/gphoto2.rb
+++ b/Library/Formula/gphoto2.rb
@@ -11,7 +11,11 @@ class Gphoto2 <Formula
   depends_on 'popt'
 
   def install
-    system "./configure", "--without-readline", "--without-cdk", "--without-aalib", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--without-readline",
+                          "--without-cdk",
+                          "--without-aalib"
     system "make install"
   end
 end
diff --git a/Library/Formula/gpsbabel.rb b/Library/Formula/gpsbabel.rb
index 155ed9ea0..3120cc7b1 100644
--- a/Library/Formula/gpsbabel.rb
+++ b/Library/Formula/gpsbabel.rb
@@ -1,17 +1,14 @@
 require 'formula'
 
 class Gpsbabel <Formula
-  url 'http://www.gpsbabel.org/plan9.php?token=2f4fd3fe&dl=gpsbabel-1.4.1.tar.gz'
+  url 'http://www.gpsbabel.org/plan9.php?token=2f4fd3fe&dl=gpsbabel-1.4.1.tar.gz',
+        :using => :post
   homepage 'http://www.gpsbabel.org'
   md5 '512c4acfb12e20102fa5ceacef45a356'
 
   depends_on 'libusb'
   depends_on 'expat'
 
-  def download_strategy
-    CurlPostDownloadStrategy
-  end
-
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
index c6fbf98e3..bd9b69995 100644
--- a/Library/Formula/graphviz.rb
+++ b/Library/Formula/graphviz.rb
@@ -8,9 +8,7 @@ class Graphviz <Formula
   depends_on 'pkg-config'
 
   def install
-    # Put freetype-config in path
-    ENV.x11
-    ENV.prepend 'PATH', "/usr/X11/bin", ":"
+    ENV.x11 # Put freetype-config in path
 
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/grc.rb b/Library/Formula/grc.rb
index 293b13b06..747182029 100644
--- a/Library/Formula/grc.rb
+++ b/Library/Formula/grc.rb
@@ -1,16 +1,15 @@
 require 'formula'
 
-######################################################################### cook
 class Grc <Formula
-  @homepage='http://korpus.juls.savba.sk/~garabik/software/grc.html'
-  @url='http://korpus.juls.savba.sk/~garabik/software/grc/grc_1.3.tar.gz'
-  @md5='a4814dcee965c3ff67681f6b59e6378c'
+  homepage 'http://korpus.juls.savba.sk/~garabik/software/grc.html'
+  url 'http://korpus.juls.savba.sk/~garabik/software/grc/grc_1.3.tar.gz'
+  md5 'a4814dcee965c3ff67681f6b59e6378c'
 
   def install
     #TODO we should deprefixify since it's python and thus possible
     inreplace ['grc', 'grc.1'], '/etc', etc
     inreplace ['grcat', 'grcat.1'], '/usr/local', prefix
-    
+
     etc.install 'grc.conf'
     bin.install %w[grc grcat]
     (share+'grc').install Dir['conf.*']
@@ -19,12 +18,9 @@ class Grc <Formula
     (etc+'grc.bashrc').write DATA.read rescue RuntimeError
   end
 
-  def caveats
-    <<-EOS
-New shell sessions will start using GRC after you run the following command:
-
-    echo 'source "`brew --prefix`/etc/grc.bashrc"' >> ~/.bashrc
-
+  def caveats; <<-EOS.undent
+    New shell sessions will start using GRC after you run the following command:
+      echo 'source "`brew --prefix`/etc/grc.bashrc"' >> ~/.bashrc
     EOS
   end
 end
diff --git a/Library/Formula/greg.rb b/Library/Formula/greg.rb
index 00f17af88..881d01605 100644
--- a/Library/Formula/greg.rb
+++ b/Library/Formula/greg.rb
@@ -5,8 +5,8 @@ class Greg <Formula
   homepage 'http://github.com/nddrylliog/greg'
 
   def install
-    inreplace 'Makefile' do |contents|
-      contents.change_make_var! "PREFIX", prefix
+    inreplace 'Makefile' do |s|
+      s.change_make_var! "PREFIX", prefix
     end
 
     bin.mkdir
diff --git a/Library/Formula/guile.rb b/Library/Formula/guile.rb
index 2d468ff13..c6299892f 100644
--- a/Library/Formula/guile.rb
+++ b/Library/Formula/guile.rb
@@ -16,7 +16,7 @@ class Guile <Formula
   depends_on 'libunistring'
   depends_on 'bdw-gc'
   depends_on 'gmp'
-  
+
   # GNU Readline is required; libedit won't work.
   depends_on 'readline'
 
diff --git a/Library/Formula/hadoop.rb b/Library/Formula/hadoop.rb
index ea74beeac..73631e878 100644
--- a/Library/Formula/hadoop.rb
+++ b/Library/Formula/hadoop.rb
@@ -7,9 +7,8 @@ class Hadoop < Formula
 
   def shim_script target
     <<-EOS.undent
-      #!/usr/bin/env bash
-      cd #{libexec}/bin
-      ./#{target} $*
+    #!/bin/bash
+    exec #{libexec}/bin/#{target} $*
     EOS
   end
 
diff --git a/Library/Formula/haproxy.rb b/Library/Formula/haproxy.rb
index 82c121e18..1dec2e07b 100644
--- a/Library/Formula/haproxy.rb
+++ b/Library/Formula/haproxy.rb
@@ -6,11 +6,11 @@ class Haproxy <Formula
   homepage 'http://haproxy.1wt.eu'
 
   def install
-    inreplace 'Makefile' do |contents|
-      contents.change_make_var! 'PREFIX', prefix
-      contents.change_make_var! 'DOCDIR', doc
+    inreplace 'Makefile' do |s|
+      s.change_make_var! 'PREFIX', prefix
+      s.change_make_var! 'DOCDIR', doc
       # use our CC, CFLAGS and LDFLAGS
-      contents.remove_make_var! %w[LDFLAGS CFLAGS CC]
+      s.remove_make_var! %w[LDFLAGS CFLAGS CC]
     end
 
     # We build generic since the Makefile.osx doesn't appear to work
diff --git a/Library/Formula/hercules.rb b/Library/Formula/hercules.rb
index 0c7b16b43..3ba860e0b 100644
--- a/Library/Formula/hercules.rb
+++ b/Library/Formula/hercules.rb
@@ -10,9 +10,8 @@ class Hercules <Formula
   def install
     # Since Homebrew optimizes for us, tell Hercules not to.
     # (It gets it wrong anyway.)
-    system "./configure", "--prefix=#{prefix}", 
-                          "--disable-debug", 
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--enable-optimization=no"
     system "make"
     system "make install"
diff --git a/Library/Formula/hevea.rb b/Library/Formula/hevea.rb
index 7b79c7afe..ecaa05363 100644
--- a/Library/Formula/hevea.rb
+++ b/Library/Formula/hevea.rb
@@ -6,10 +6,10 @@ class Hevea <Formula
   md5 '24a631570bee3cc4b8350e9db39be62b'
 
   depends_on 'objective-caml'
-  depends_on 'ghostscript' => :optional 
+  depends_on 'ghostscript' => :optional
 
   def install
-    inreplace 'Makefile', '/usr/local', "#{prefix}"
+    inreplace 'Makefile', '/usr/local', prefix
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/hping.rb b/Library/Formula/hping.rb
index e8314df6c..451fccd28 100644
--- a/Library/Formula/hping.rb
+++ b/Library/Formula/hping.rb
@@ -28,7 +28,7 @@ class Hping <Formula
 
     # Target folders need to exist before installing
     sbin.mkpath
-    (man+"man8").mkpath
+    man8.mkpath
     system "make install"
   end
 end
diff --git a/Library/Formula/html-xml-utils.rb b/Library/Formula/html-xml-utils.rb
index 89ac5f8ac..a34b5f531 100644
--- a/Library/Formula/html-xml-utils.rb
+++ b/Library/Formula/html-xml-utils.rb
@@ -5,7 +5,6 @@ class HtmlXmlUtils <Formula
   homepage 'http://www.w3.org/Tools/HTML-XML-utils/'
   md5 '28c58add86e35a60e602a029c8e2f04b'
 
-
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make"
diff --git a/Library/Formula/httrack.rb b/Library/Formula/httrack.rb
index d6a2639f3..504d717b3 100644
--- a/Library/Formula/httrack.rb
+++ b/Library/Formula/httrack.rb
@@ -13,7 +13,7 @@ class Httrack <Formula
                           "--enable-shared=no"
     system "make install"
     # Don't need Gnome integration
-    rm_rf (share+'applications')
-    rm_rf (share+'pixmaps')
+    rm_rf share+'applications'
+    rm_rf share+'pixmaps'
   end
 end
diff --git a/Library/Formula/icu4c.rb b/Library/Formula/icu4c.rb
index 4b6f4239e..7b9b6b408 100644
--- a/Library/Formula/icu4c.rb
+++ b/Library/Formula/icu4c.rb
@@ -10,9 +10,7 @@ class Icu4c <Formula
     DATA
   end
 
-  def keg_only?
-    "conflicts; see: http://github.com/mxcl/homebrew/issues/issue/167"
-  end
+  keg_only "Conflicts; see: http://github.com/mxcl/homebrew/issues/issue/167"
 
   def install
     ENV.append "LDFLAGS", "-headerpad_max_install_names"
diff --git a/Library/Formula/id3tool.rb b/Library/Formula/id3tool.rb
index 6081091c7..29ebb09bc 100644
--- a/Library/Formula/id3tool.rb
+++ b/Library/Formula/id3tool.rb
@@ -5,7 +5,6 @@ class Id3tool <Formula
   homepage 'http://nekohako.xware.cx/id3tool/'
   md5 '061185562c0d0e6327406d9fc2f194b2'
 
-
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
diff --git a/Library/Formula/id3v2.rb b/Library/Formula/id3v2.rb
index 62f232772..bf2bb9dce 100644
--- a/Library/Formula/id3v2.rb
+++ b/Library/Formula/id3v2.rb
@@ -8,9 +8,11 @@ class Id3v2 <Formula
   depends_on 'id3lib'
 
   def install
-    inreplace 'Makefile', 'c++', ENV.cxx
-    inreplace 'Makefile', '/man/man1', '/share/man/man1'
-    
+    inreplace 'Makefile' do |s|
+      s.gsub! 'c++', ENV.cxx
+      s.gsub! '/man/man1', '/share/man/man1'
+    end
+
     bin.mkpath
     man1.mkpath
     system "make", "install", "PREFIX=#{prefix}"
diff --git a/Library/Formula/iftop.rb b/Library/Formula/iftop.rb
index a65f57dca..55bf090b3 100644
--- a/Library/Formula/iftop.rb
+++ b/Library/Formula/iftop.rb
@@ -6,7 +6,8 @@ class Iftop <Formula
   md5 '062bc8fb3856580319857326e0b8752d'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/ilmbase.rb b/Library/Formula/ilmbase.rb
index b1123c591..b73608697 100644
--- a/Library/Formula/ilmbase.rb
+++ b/Library/Formula/ilmbase.rb
@@ -9,7 +9,7 @@ class Ilmbase <Formula
     DATA
   end
 
-  def install    
+  def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index 0d04dee32..2b6780193 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -41,10 +41,7 @@ class Imagemagick <Formula
   end
 
   def install
-    # Add to PATH for freetype-config on Snow Leopard
-    ENV.prepend 'PATH', '/usr/X11/bin', ':'
-
-    ENV.libpng
+    ENV.x11 # Add to PATH for freetype-config on Snow Leopard
     ENV.O3 # takes forever otherwise
 
     args = [ "--disable-osx-universal-binary",
diff --git a/Library/Formula/innotop.rb b/Library/Formula/innotop.rb
index 75cbce3a3..c7f08fd67 100644
--- a/Library/Formula/innotop.rb
+++ b/Library/Formula/innotop.rb
@@ -4,7 +4,7 @@ class Innotop <Formula
   url 'http://innotop.googlecode.com/files/innotop-1.7.2.tar.gz'
   homepage 'http://code.google.com/p/innotop/'
   md5 '37d8c71fb1eefbc607a733dd4b38af05'
-  
+
   depends_on 'DBD::mysql' => :perl
 
   def install
diff --git a/Library/Formula/intltool.rb b/Library/Formula/intltool.rb
index 4db38785b..b0d22099d 100644
--- a/Library/Formula/intltool.rb
+++ b/Library/Formula/intltool.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Intltool <Formula
-  @url='http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-0.41.0.tar.gz'
-  @homepage='http://www.freedesktop.org/wiki/Software/intltool'
-  @md5='8a6e4afd3fc93637dcd70e36ab899364'
+  url 'http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-0.41.0.tar.gz'
+  homepage 'http://www.freedesktop.org/wiki/Software/intltool'
+  md5 '8a6e4afd3fc93637dcd70e36ab899364'
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/iperf.rb b/Library/Formula/iperf.rb
index 35ab04a40..57972d7ff 100644
--- a/Library/Formula/iperf.rb
+++ b/Library/Formula/iperf.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Iperf <Formula
-  @url='http://downloads.sourceforge.net/project/iperf/iperf/2.0.4%20source/iperf-2.0.4.tar.gz'
-  @homepage='http://iperf.sourceforge.net/'
-  @md5='8c5bc14cc2ea55f18f22afe3c23e3dcb'
+  url 'http://downloads.sourceforge.net/project/iperf/iperf/2.0.4%20source/iperf-2.0.4.tar.gz'
+  homepage 'http://iperf.sourceforge.net/'
+  md5 '8c5bc14cc2ea55f18f22afe3c23e3dcb'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/iphotoexport.rb b/Library/Formula/iphotoexport.rb
index 00d9923ee..b05ff7283 100644
--- a/Library/Formula/iphotoexport.rb
+++ b/Library/Formula/iphotoexport.rb
@@ -6,12 +6,12 @@ class Iphotoexport <Formula
   sha1 '50fa0916cf9689efdfd33cd4680424234b4e9023'
 
   depends_on 'exiftool'
-  
+
   def install
     unzip_dir = @name+'-'+@version
     # Change hardcoded exiftool path
     inreplace "#{unzip_dir}/tilutil/exiftool.py", "/usr/bin/exiftool", "exiftool"
-    
+
     prefix.install Dir[unzip_dir+'/*']
     bin.mkpath
     ln_s prefix+'iphotoexport.py', bin+'iphotoexport'
diff --git a/Library/Formula/john.rb b/Library/Formula/john.rb
index e5d797605..0000a8877 100644
--- a/Library/Formula/john.rb
+++ b/Library/Formula/john.rb
@@ -4,24 +4,24 @@ class John <Formula
   url 'http://www.openwall.com/john/g/john-1.7.3.4.tar.bz2'
   homepage 'http://www.openwall.com/john/'
   md5 '2f2310c49961c3edea6f92b8dcd45ff4'
-  
+
   def patches
     { :p0 => DATA }
   end
-  
+
   def install
     ENV.deparallelize
     fails_with_llvm
     arch = Hardware.is_64_bit? ? '64' : 'sse2'
-    
+
     Dir.chdir 'src' do
       system "make clean macosx-x86-#{arch}"
     end
-    
-    FileUtils.rm 'README'
+
+    rm 'README'
     # using mv over bin.install due to problem moving sym links
-    FileUtils.mv 'run', bin
-    FileUtils.chmod_R 0755, bin
+    mv 'run', bin
+    chmod_R 0755, bin
   end
 end
 
diff --git a/Library/Formula/jsawk.rb b/Library/Formula/jsawk.rb
index 8fb299ee1..4a0d73937 100644
--- a/Library/Formula/jsawk.rb
+++ b/Library/Formula/jsawk.rb
@@ -3,8 +3,7 @@ require 'formula'
 class Jsawk <Formula
   head 'git://github.com/micha/jsawk.git'
   homepage 'http://github.com/micha/jsawk'
-  
-  # Is there a built-in JavaScript interpreter on OS X 10.6 we can use instead?
+
   depends_on 'spidermonkey'
 
   def install
diff --git a/Library/Formula/kde-phonon.rb b/Library/Formula/kde-phonon.rb
index 30a50de6c..89d1fa3e3 100644
--- a/Library/Formula/kde-phonon.rb
+++ b/Library/Formula/kde-phonon.rb
@@ -9,14 +9,12 @@ class KdePhonon <Formula
   depends_on 'qt'
   depends_on 'automoc4'
 
-  def keg_only?
-    "This package is already supplied by Qt and is only needed by KDE packages."
-  end
+  keg_only "This package is already supplied by Qt and is only needed by KDE packages."
 
   def patches
     "http://gitorious.org/phonon/phonon/commit/9556b819b089da67290691f53ce7c1550ed23705.patch"
   end
-  
+
   def install
     system "cmake . #{std_cmake_parameters}"
     system "make install"
diff --git a/Library/Formula/kdelibs.rb b/Library/Formula/kdelibs.rb
index b6b59cd1a..b707fdde3 100644
--- a/Library/Formula/kdelibs.rb
+++ b/Library/Formula/kdelibs.rb
@@ -5,6 +5,7 @@ class Kdelibs <Formula
   homepage 'http://www.kde.org/'
   md5 '44ddba0e31ee3d78da09f0176d3c66db'
 
+  depends_on 'gettext'
   depends_on 'cmake'
   depends_on 'qt'
   depends_on 'automoc4'
@@ -14,7 +15,6 @@ class Kdelibs <Formula
   depends_on 'strigi'
   depends_on 'soprano'
   depends_on 'shared-desktop-ontologies'
-  depends_on 'gettext'
   depends_on 'shared-mime-info'
   depends_on 'attica'
   depends_on 'd-bus'
@@ -27,8 +27,8 @@ class Kdelibs <Formula
 
   def install
     gettext = Formula.factory 'gettext'
-    FileUtils.mkdir('build')
-    FileUtils.cd('build')
+    mkdir('build')
+    cd('build')
     system "cmake .. #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{gettext.prefix} -DBUNDLE_INSTALL_DIR=#{bin}"
     system "make install"
   end
diff --git a/Library/Formula/keychain.rb b/Library/Formula/keychain.rb
index 354c61585..8e89f9be8 100644
--- a/Library/Formula/keychain.rb
+++ b/Library/Formula/keychain.rb
@@ -8,7 +8,6 @@ class Keychain <Formula
   def install
     bin.install "keychain"
     man1.install "keychain.1"
-    doc.install "ChangeLog"
-    doc.install "README.rst"
+    doc.install ["ChangeLog", "README.rst"]
   end
 end
diff --git a/Library/Formula/kumofs.rb b/Library/Formula/kumofs.rb
index b9a759976..8896a7813 100644
--- a/Library/Formula/kumofs.rb
+++ b/Library/Formula/kumofs.rb
@@ -12,8 +12,10 @@ class Kumofs <Formula
   depends_on 'msgpack' => :ruby
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}",
-                          "--with-msgpack=#{prefix}", "--with-tokyocabinet=#{prefix}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-msgpack=#{prefix}",
+                          "--with-tokyocabinet=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/lame.rb b/Library/Formula/lame.rb
index 72c796905..4229e6764 100644
--- a/Library/Formula/lame.rb
+++ b/Library/Formula/lame.rb
@@ -1,12 +1,12 @@
 require 'formula'
 
 class Lame <Formula
-  @homepage='http://lame.sourceforge.net/'
-  @url='http://downloads.sourceforge.net/sourceforge/lame/lame-3.98.4.tar.gz'
-  @md5='8e9866ad6b570c6c95c8cba48060473f'
+  homepage 'http://lame.sourceforge.net/'
+  url 'http://downloads.sourceforge.net/sourceforge/lame/lame-3.98.4.tar.gz'
+  md5 '8e9866ad6b570c6c95c8cba48060473f'
 
   def install
-    system "./configure --disable-debug --prefix='#{prefix}' --enable-nasm"
+    system "./configure", "--disable-debug", "--prefix=#{prefix}", "--enable-nasm"
     system "make install"
   end
 end
\ No newline at end of file
diff --git a/Library/Formula/languagetool.rb b/Library/Formula/languagetool.rb
index 5ce2185fb..40802d57f 100644
--- a/Library/Formula/languagetool.rb
+++ b/Library/Formula/languagetool.rb
@@ -4,7 +4,7 @@ class Languagetool <Formula
   url 'http://www.languagetool.org/download/LanguageTool-1.0.0.oxt'
   homepage 'http://www.languagetool.org/'
   md5 '979b1a1f2ce3a9100d7aa7b1ef245734'
-  
+
   def startup_script
     <<-EOS
 #!/bin/bash
diff --git a/Library/Formula/libao.rb b/Library/Formula/libao.rb
index 3e9e0e3ef..88b640f3d 100644
--- a/Library/Formula/libao.rb
+++ b/Library/Formula/libao.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Libao <Formula
-  @url='http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz'
-  @md5='08283fbe1f587619053a156254afecec'
-  @homepage='http://www.xiph.org/ao/'
+  url 'http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz'
+  md5 '08283fbe1f587619053a156254afecec'
+  homepage 'http://www.xiph.org/ao/'
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
diff --git a/Library/Formula/libassuan.rb b/Library/Formula/libassuan.rb
index 067feca32..1a0ed70b1 100644
--- a/Library/Formula/libassuan.rb
+++ b/Library/Formula/libassuan.rb
@@ -5,7 +5,7 @@ class Libassuan <Formula
   homepage 'http://www.gnupg.org/related_software/libassuan/index.en.html'
   md5 '59bc0ae7194c412d7a522029005684b2'
 
-  depends_on 'libgpg-error'
+	depends_on 'libgpg-error'
 
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/libcroco.rb b/Library/Formula/libcroco.rb
index 674b6a1a0..ec508fafa 100644
--- a/Library/Formula/libcroco.rb
+++ b/Library/Formula/libcroco.rb
@@ -4,7 +4,7 @@ class Libcroco <Formula
   url 'ftp://ftp.gnome.org/pub/GNOME/sources/libcroco/0.6/libcroco-0.6.2.tar.bz2'
   md5 '1429c597aa4b75fc610ab3a542c99209'
   homepage 'http://www.freespiders.org/projects/libcroco/'
-  
+
   depends_on 'pkg-config'
   depends_on 'glib'
   depends_on 'intltool'
diff --git a/Library/Formula/libdvdread.rb b/Library/Formula/libdvdread.rb
index 78dd31f7c..ed19e2d99 100644
--- a/Library/Formula/libdvdread.rb
+++ b/Library/Formula/libdvdread.rb
@@ -6,7 +6,8 @@ class Libdvdread <Formula
   md5 '078788c9241ae16763529e1235502337'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/libevent.rb b/Library/Formula/libevent.rb
index c66dc7ddd..a543dab2e 100644
--- a/Library/Formula/libevent.rb
+++ b/Library/Formula/libevent.rb
@@ -7,9 +7,8 @@ class Libevent <Formula
   head 'git://levent.git.sourceforge.net/gitroot/levent/levent'
 
   def install
-    system "./autogen.sh" if ARGV.build_head?
-
     ENV.j1 # Needed for Mac Pro compilation
+    system "./autogen.sh" if ARGV.build_head?
     system "./configure", "--prefix=#{prefix}"
     system "make install"
   end
diff --git a/Library/Formula/libffi.rb b/Library/Formula/libffi.rb
index 6731722bf..575252ecd 100644
--- a/Library/Formula/libffi.rb
+++ b/Library/Formula/libffi.rb
@@ -1,9 +1,11 @@
 require 'formula'
 
 class Libffi <Formula
-  @url='ftp://sourceware.org/pub/libffi/libffi-3.0.8.tar.gz'
-  @homepage='http://sourceware.org/libffi/'
-  @sha1='ce44d10c39d9a37479c8777e206cac0f36c48712'
+  url 'ftp://sourceware.org/pub/libffi/libffi-3.0.8.tar.gz'
+  homepage 'http://sourceware.org/libffi/'
+  sha1 'ce44d10c39d9a37479c8777e206cac0f36c48712'
+
+  keg_only :provided_by_osx
 
   def patches
     host = "http://trac.macports.org"
diff --git a/Library/Formula/libfixbuf.rb b/Library/Formula/libfixbuf.rb
index 737b06e44..ae6a007a2 100644
--- a/Library/Formula/libfixbuf.rb
+++ b/Library/Formula/libfixbuf.rb
@@ -8,11 +8,9 @@ class Libfixbuf <Formula
   depends_on 'glib'
 
   def install
-    system "./configure",
-        "--disable-debug",
-        "--disable-dependency-tracking",
-        "--prefix=#{prefix}",
-        "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/libftdi.rb b/Library/Formula/libftdi.rb
index c2c4180cc..7c971a436 100644
--- a/Library/Formula/libftdi.rb
+++ b/Library/Formula/libftdi.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Libftdi <Formula
-  @url="http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.17.tar.gz"
-  @homepage='http://www.intra2net.com/en/developer/libftdi'
-  @md5='810c69cfaa078b49795c224ef9b6b851'
+  url "http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.17.tar.gz"
+  homepage 'http://www.intra2net.com/en/developer/libftdi'
+  md5 '810c69cfaa078b49795c224ef9b6b851'
 
   depends_on 'cmake'
   depends_on 'libusb-compat'
@@ -13,8 +13,7 @@ class Libftdi <Formula
   end
 
   def install
-    FileUtils.mkdir 'libftdi-build'
-
+    mkdir 'libftdi-build'
     Dir.chdir 'libftdi-build' do
       system "cmake .. #{std_cmake_parameters}"
       system "make"
diff --git a/Library/Formula/libgadu.rb b/Library/Formula/libgadu.rb
index ef66c8772..e98befdab 100644
--- a/Library/Formula/libgadu.rb
+++ b/Library/Formula/libgadu.rb
@@ -4,7 +4,6 @@ class Libgadu <Formula
   homepage 'http://toxygen.net/libgadu/'
   url 'http://toxygen.net/libgadu/files/libgadu-1.9.0-rc2.tar.gz'
   md5 '2d2a96a98e33d3a0055bc76f67a19f04'
-  version '1.9.0-rc2'
 
   def install
     system './configure', "--prefix=#{prefix}", '--disable-debug', '--disable-dependency-tracking'
diff --git a/Library/Formula/libgarmin.rb b/Library/Formula/libgarmin.rb
index fc6eda401..e366f7110 100644
--- a/Library/Formula/libgarmin.rb
+++ b/Library/Formula/libgarmin.rb
@@ -4,6 +4,10 @@ class Libgarmin <Formula
   head 'http://libgarmin.svn.sourceforge.net/svnroot/libgarmin/libgarmin/dev/'
   homepage 'http://libgarmin.sourceforge.net/'
 
+  def rewrite_version
+    File.open("version.h","w") { |f| f.puts "#define LIBVERSION \"libgarmin 0.1\"" }
+  end
+
   def install
     system "./autosh.sh" unless File.exist? "configure"
     system "./configure", "--prefix=#{prefix}"
@@ -16,17 +20,10 @@ class Libgarmin <Formula
       s.change_make_var! "BUILT_SOURCES", ""
     end
 
-    File.open("version.h","w") do |f|
-      f.puts "#define LIBVERSION \"libgarmin 0.1\""
-    end
-
-    system "make"
-
     # Yep, need to recreate before make and make install
-    File.open("version.h","w") do |f|
-      f.puts "#define LIBVERSION \"libgarmin 0.1\""
-    end
-
+    rewrite_version
+    system "make"
+    rewrite_version
     system "make install"
   end
 end
diff --git a/Library/Formula/libgsf.rb b/Library/Formula/libgsf.rb
index 32a3121b0..ea53e80d0 100644
--- a/Library/Formula/libgsf.rb
+++ b/Library/Formula/libgsf.rb
@@ -11,13 +11,8 @@ class Libgsf <Formula
   depends_on 'glib'
 
   def install
-    configure_args = [
-      "--prefix=#{prefix}",
-      "--disable-debug",
-      "--disable-dependency-tracking",
-      ]
-
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/libidl.rb b/Library/Formula/libidl.rb
index e81b2e031..9e4d07bde 100644
--- a/Library/Formula/libidl.rb
+++ b/Library/Formula/libidl.rb
@@ -6,7 +6,7 @@ class Libidl <Formula
   # homepage 'http://andrewtv.org/libIDL/'
   homepage 'http://ftp.acc.umu.se/pub/gnome/sources/libIDL/0.8/'
   md5 'b43b289a859eb38a710f70622c46e571'
-  
+
   depends_on 'pkg-config'
   depends_on 'gettext'
   depends_on 'glib'
diff --git a/Library/Formula/liblastfm.rb b/Library/Formula/liblastfm.rb
index bccd632dd..62faf088f 100644
--- a/Library/Formula/liblastfm.rb
+++ b/Library/Formula/liblastfm.rb
@@ -1,16 +1,16 @@
 require 'formula'
 
 class Liblastfm <Formula
-  @homepage='http://github.com/mxcl/liblastfm/'
-  @url='http://static.last.fm/src/liblastfm-0.3.0.tar.bz2'
-  @md5='3f73222ebc31635941832b01e7a494b6'
+  homepage 'http://github.com/mxcl/liblastfm/'
+  url 'http://static.last.fm/src/liblastfm-0.3.0.tar.bz2'
+  md5 '3f73222ebc31635941832b01e7a494b6'
 
   depends_on 'qt'
   depends_on 'fftw'
   depends_on 'libsamplerate'
 
   def install
-    system "./configure --release --prefix '#{prefix}'"
+    system "./configure", "--release", "--prefix", prefix
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/libmagic.rb b/Library/Formula/libmagic.rb
index ee2ec80af..5e69d3fb3 100644
--- a/Library/Formula/libmagic.rb
+++ b/Library/Formula/libmagic.rb
@@ -5,9 +5,9 @@ class Libmagic < Formula
   homepage 'http://www.darwinsys.com/file/'
   md5 'accade81ff1cc774904b47c72c8aeea0'
 
-  def keg_only?
-    "This brew provides 'libmagic', but also installs a 'file' command which shadows the OS X-provided one."
-  end
+  keg_only <<-KEG.undent
+    This brew provides 'libmagic', but also installs a 'file' command which shadows the OS X-provided one.
+  KEG
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/libnet.rb b/Library/Formula/libnet.rb
index eed10bc25..d6d09e8d2 100644
--- a/Library/Formula/libnet.rb
+++ b/Library/Formula/libnet.rb
@@ -10,8 +10,8 @@ class Libnet < Formula
     cd 'libnet'
     inreplace "autogen.sh", "libtoolize", "glibtoolize"
     system "./autogen.sh"
-    system "cp", "/usr/share/automake-1.10/config.sub", "."
-    system "cp", "/usr/share/automake-1.10/config.guess", "."
+    cp "/usr/share/libtool/config/config.guess", "."
+    cp "/usr/share/libtool/config/config.sub", "."
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     touch 'doc/man/man3/libnet.3'
     system "make install"
diff --git a/Library/Formula/libogg.rb b/Library/Formula/libogg.rb
index 8b57f51f0..5d5570f61 100644
--- a/Library/Formula/libogg.rb
+++ b/Library/Formula/libogg.rb
@@ -6,8 +6,8 @@ class Libogg <Formula
   md5 'c95b73759acfc30712beef6ce4e88efa'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug",
-                          "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make"
     ENV.deparallelize
     system "make install"
diff --git a/Library/Formula/liboil.rb b/Library/Formula/liboil.rb
index aae40521a..8c31e5ccf 100644
--- a/Library/Formula/liboil.rb
+++ b/Library/Formula/liboil.rb
@@ -17,9 +17,9 @@ class Liboil <Formula
   end
 
   def patches
-    {
-      :p0 => "http://svn.macports.org/repository/macports/trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff",
-      :p0 => "http://svn.macports.org/repository/macports/trunk/dports/devel/liboil/files/host_cpu.diff"
-    }
+    {:p0 => [
+      "http://svn.macports.org/repository/macports/trunk/dports/devel/liboil/files/patch-liboil_liboilcpu-x86.c.diff",
+      "http://svn.macports.org/repository/macports/trunk/dports/devel/liboil/files/host_cpu.diff"
+    ]}
   end
 end
diff --git a/Library/Formula/libpano.rb b/Library/Formula/libpano.rb
index 70bf7fc73..c1ecd1e51 100644
--- a/Library/Formula/libpano.rb
+++ b/Library/Formula/libpano.rb
@@ -6,7 +6,7 @@ class Libpano <Formula
   homepage 'http://panotools.sourceforge.net/'
   md5 'd3708c6c29f6a19b69c74232853e73ae'
 
-  depends_on 'libjpeg'
+  depends_on 'jpeg'
   depends_on 'libtiff'
   depends_on 'libpng'
 
diff --git a/Library/Formula/libplist.rb b/Library/Formula/libplist.rb
index 3d417636a..17ee21290 100644
--- a/Library/Formula/libplist.rb
+++ b/Library/Formula/libplist.rb
@@ -11,7 +11,8 @@ class Libplist <Formula
 
   def install
     # Disable Python bindings.
-    inreplace "CMakeLists.txt", 'OPTION(ENABLE_PYTHON "Enable Python bindings (needs Swig)" ON)', '# Disabled Python Bindings'
+    inreplace "CMakeLists.txt", 'OPTION(ENABLE_PYTHON "Enable Python bindings (needs Swig)" ON)',
+                                '# Disabled Python Bindings'
     system "cmake . #{std_cmake_parameters}"
     system "make install"
 
diff --git a/Library/Formula/libpng.rb b/Library/Formula/libpng.rb
index b033855a5..57a500490 100644
--- a/Library/Formula/libpng.rb
+++ b/Library/Formula/libpng.rb
@@ -5,9 +5,7 @@ class Libpng <Formula
   homepage 'http://www.libpng.org/pub/png/libpng.html'
   md5 '976909556e6613804d810405c1f72ce6'
 
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/libquicktime.rb b/Library/Formula/libquicktime.rb
index 7b9fb3d6d..e8a0117a6 100644
--- a/Library/Formula/libquicktime.rb
+++ b/Library/Formula/libquicktime.rb
@@ -23,7 +23,10 @@ class Libquicktime <Formula
   depends_on 'libvorbis' => :optional
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--enable-gpl", "--without-doxygen"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-gpl",
+                          "--without-doxygen"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/librasterlite.rb b/Library/Formula/librasterlite.rb
index a1a0b3725..5ca05f72d 100644
--- a/Library/Formula/librasterlite.rb
+++ b/Library/Formula/librasterlite.rb
@@ -9,10 +9,8 @@ class Librasterlite <Formula
   depends_on "libspatialite"
 
   def install
-    # For PNG support
-    ENV.x11
-    system "./configure", "--disable-debug", 
-                          "--disable-dependency-tracking", 
+    ENV.libpng
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
   end
diff --git a/Library/Formula/libspatialite.rb b/Library/Formula/libspatialite.rb
index 0c819fa7e..108e0bb45 100644
--- a/Library/Formula/libspatialite.rb
+++ b/Library/Formula/libspatialite.rb
@@ -19,7 +19,7 @@ class Libspatialite <Formula
                           "--prefix=#{prefix}",
                           "--target=macosx"
     system "make install"
-    
+
     InitSpatialite.new.brew do
       (share+'spatialite').install 'init_spatialite-2.4.sql'
     end
diff --git a/Library/Formula/libspotify.rb b/Library/Formula/libspotify.rb
index 6d3782bf4..300f2bf35 100644
--- a/Library/Formula/libspotify.rb
+++ b/Library/Formula/libspotify.rb
@@ -6,17 +6,10 @@ class Libspotify <Formula
   homepage 'http://developer.spotify.com/en/libspotify/overview/'
   md5 'a97552130df26b1aa2228adcf8d4210b'
 
-  def inc
-    include + 'libspotify'
-  end
-  def pc
-    lib+'pkgconfig/libspotify.pc'
-  end
-
   def install
     prefix.install 'share'
-    inc.install "libspotify.framework/Versions/#{version}/Headers/api.h"
-    lib.install "libspotify.framework/Versions/#{version}/libspotify" => 'libspotify.0.0.4.dylib'
+    (include+'libspotify').install "libspotify.framework/Versions/#{version}/Headers/api.h"
+    (include+'libspotify').install "libspotify.framework/Versions/#{version}/libspotify" => 'libspotify.0.0.4.dylib'
     doc.install Dir['doc/*']
 
     cd lib
@@ -27,7 +20,7 @@ class Libspotify <Formula
            "#{HOMEBREW_PREFIX}/lib/libspotify.#{version}.dylib",
            "libspotify.dylib"
 
-    pc.write pc_content
+    (lib+'pkgconfig/libspotify.pc').write pc_content
   end
 
   def pc_content; <<-EOS.undent
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index ca7681634..708e23a4b 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -9,8 +9,8 @@ class Libvorbis <Formula
   depends_on 'libogg'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug",
-                          "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/libwpd.rb b/Library/Formula/libwpd.rb
index 59e928bb9..865257c33 100644
--- a/Library/Formula/libwpd.rb
+++ b/Library/Formula/libwpd.rb
@@ -4,7 +4,7 @@ class Libwpd <Formula
   url 'http://prdownloads.sourceforge.net/libwpd/libwpd-0.8.14.tar.bz2'
   md5 '974784f0cf067900bb8836b4d107101b'
   homepage 'http://libwpd.sourceforge.net/'
-  
+
   depends_on "glib"
   depends_on "libgsf"
 
diff --git a/Library/Formula/libwpg.rb b/Library/Formula/libwpg.rb
index 3ebbf4ac6..ac02ff874 100644
--- a/Library/Formula/libwpg.rb
+++ b/Library/Formula/libwpg.rb
@@ -4,7 +4,7 @@ class Libwpg <Formula
   url 'http://downloads.sourceforge.net/project/libwpg/libwpg/libwpg-0.1.3/libwpg-0.1.3.tar.bz2'
   md5 '1069ad84fdf65f1c47b63b639137613f'
   homepage 'http://libwpg.sourceforge.net/'
-  
+
   depends_on 'libwpd'
 
   def install
diff --git a/Library/Formula/libxml2.rb b/Library/Formula/libxml2.rb
index 17e7850a6..db207ac7b 100644
--- a/Library/Formula/libxml2.rb
+++ b/Library/Formula/libxml2.rb
@@ -5,9 +5,7 @@ class Libxml2 <Formula
   homepage 'http://xmlsoft.org'
   md5 '9abc9959823ca9ff904f1fbcf21df066'
 
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
diff --git a/Library/Formula/lighttpd.rb b/Library/Formula/lighttpd.rb
index 550ad6c2c..f52294c6e 100644
--- a/Library/Formula/lighttpd.rb
+++ b/Library/Formula/lighttpd.rb
@@ -9,9 +9,9 @@ class Lighttpd <Formula
   depends_on 'pcre'
 
   def install
-    args = ["--prefix=#{prefix}", "--disable-dependency-tracking", 
-            "--with-openssl", "--with-ldap"]
-    system "./configure", *args
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-openssl", "--with-ldap"
     system "make install"
   end
 end
diff --git a/Library/Formula/lilypond.rb b/Library/Formula/lilypond.rb
index 2728803cb..4add03526 100644
--- a/Library/Formula/lilypond.rb
+++ b/Library/Formula/lilypond.rb
@@ -15,7 +15,7 @@ class Lilypond <Formula
   depends_on 'fontforge'
   depends_on 'texinfo'
 
-  def skip_clean? path; true; end
+  skip_clean :all
 
   def install
     system "./configure", "--prefix=#{prefix}",
diff --git a/Library/Formula/linklint.rb b/Library/Formula/linklint.rb
index 45db7d4c7..145c89d4c 100644
--- a/Library/Formula/linklint.rb
+++ b/Library/Formula/linklint.rb
@@ -6,7 +6,7 @@ class Linklint <Formula
   md5 'c1ae0860199da59ded28771d1fa7b800'
 
   def install
-    FileUtils.mv 'READ_ME.txt', 'README'
+    mv 'READ_ME.txt', 'README'
     bin.install 'linklint-2.3.5' => 'linklint'
   end
 end
diff --git a/Library/Formula/links.rb b/Library/Formula/links.rb
index b135966b0..ed4a88971 100644
--- a/Library/Formula/links.rb
+++ b/Library/Formula/links.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Links <Formula
-  @url='http://links.twibright.com/download/links-2.2.tar.gz'
-  @homepage='http://links.twibright.com/'
-  @md5='c9937f9ed0061f264973182f871fb667'
+  url 'http://links.twibright.com/download/links-2.2.tar.gz'
+  homepage 'http://links.twibright.com/'
+  md5 'c9937f9ed0061f264973182f871fb667'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/litmus.rb b/Library/Formula/litmus.rb
index c61f6de87..593c25912 100644
--- a/Library/Formula/litmus.rb
+++ b/Library/Formula/litmus.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Litmus <Formula
-  @url='http://www.webdav.org/neon/litmus/litmus-0.12.1.tar.gz'
-  @homepage='http://www.webdav.org/neon/litmus/'
-  @md5='d0bbb717196e835a5759f67f097321fb'
+  url 'http://www.webdav.org/neon/litmus/litmus-0.12.1.tar.gz'
+  homepage 'http://www.webdav.org/neon/litmus/'
+  md5 'd0bbb717196e835a5759f67f097321fb'
 
   def install
     # Just basic options for now. We could use --with-ssl or alternative neon using dependency tracking?
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index 9e40d71bf..fe2c3d510 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -14,9 +14,7 @@ class Llvm <Formula
   md5       'ac322661f20e7d6c810b1869f886ad9b'
 
   def options
-    [
-      ['--with-clang', 'Also build & install clang']
-    ]
+    [['--with-clang', 'Also build & install clang']]
   end
 
   def install
@@ -24,16 +22,14 @@ class Llvm <Formula
 
     if build_clang?
       clang_dir = Pathname.new(Dir.pwd)+'tools/clang'
-      Clang.new.brew do
-        clang_dir.install Dir['*']
-      end
+      Clang.new.brew { clang_dir.install Dir['*'] }
     end
 
     system "./configure", "--prefix=#{prefix}",
                           "--enable-targets=host-only",
                           "--enable-optimized"
-    system "make"
-    system "make install" # seperate steps required, otherwise the build fails
+    system "make" # seperate steps required, otherwise the build fails
+    system "make install"
 
     if build_clang?
       Dir.chdir clang_dir do
diff --git a/Library/Formula/lorem.rb b/Library/Formula/lorem.rb
index b0861f93c..d9ee7ecbe 100755
--- a/Library/Formula/lorem.rb
+++ b/Library/Formula/lorem.rb
@@ -1,13 +1,12 @@
 require 'formula'
 
 class Lorem < Formula
-  url 'http://lorem.googlecode.com/svn-history/r4/trunk/lorem'
+  url 'http://lorem.googlecode.com/svn-history/r4/trunk/lorem',
+        :using => :curl
   version '0.6.1'
   homepage 'http://code.google.com/p/lorem/'
   md5 '1246debbcb718aa56935e52136df17e8'
 
-  def download_strategy; CurlDownloadStrategy; end
-  
   def install
     inreplace "lorem", "!/usr/bin/python", "!/usr/bin/env python"
     bin.install "lorem"
diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb
index 3c6f4a5cf..78ad09a32 100644
--- a/Library/Formula/lua.rb
+++ b/Library/Formula/lua.rb
@@ -6,7 +6,7 @@ class Lua <Formula
   md5 'd0870f2de55d59c1c8419f36e8fac150'
 
   # Skip cleaning both empty folders and bin/libs so external symbols still work.
-  def skip_clean? path; true; end
+  skip_clean :all
 
   def install
     # Apply patch-level 2
diff --git a/Library/Formula/lynx.rb b/Library/Formula/lynx.rb
index 252db75be..d70f1db07 100644
--- a/Library/Formula/lynx.rb
+++ b/Library/Formula/lynx.rb
@@ -6,10 +6,9 @@ class Lynx <Formula
   md5 'cb936aef812e4e463ab86cbbe14d4db9'
 
   def install
-    system "./configure", "--prefix=#{prefix}", 
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--mandir=#{man}",
-                          "--disable-debug", 
-                          "--disable-dependency-tracking",
                           "--disable-echo",
                           "--with-zlib",
                           "--with-bzlib",
diff --git a/Library/Formula/lysp.rb b/Library/Formula/lysp.rb
index 656930c10..97f87d955 100644
--- a/Library/Formula/lysp.rb
+++ b/Library/Formula/lysp.rb
@@ -13,9 +13,7 @@ class Lysp <Formula
 
   def install
     system "make"
-
-    bin.install "lysp"
-    bin.install "gclysp"
+    bin.install ["lysp", "gclysp"]
   end
 end
 
diff --git a/Library/Formula/lzo.rb b/Library/Formula/lzo.rb
index b610f2f42..cf59d8799 100644
--- a/Library/Formula/lzo.rb
+++ b/Library/Formula/lzo.rb
@@ -6,7 +6,10 @@ class Lzo <Formula
   md5 '0c3d078c2e8ea5a88971089a2f02a726'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-asm", "--enable-shared=yes"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-asm",
+                          "--enable-shared=yes"
     system "make install"
   end
 end
diff --git a/Library/Formula/macvim.rb b/Library/Formula/macvim.rb
index 916ef8137..b87eb71ca 100644
--- a/Library/Formula/macvim.rb
+++ b/Library/Formula/macvim.rb
@@ -5,8 +5,8 @@ class Macvim <Formula
   homepage 'http://code.google.com/p/macvim'
 
   def install
-    # MacVim's Xcode project gets confused by $CC, disable it until someone
-    # figures out why it fails.
+    # MacVim's Xcode project gets confused by $CC
+    # Disable it until someone figures out why it fails.
     ENV['CC'] = nil
     ENV['CFLAGS'] = nil
     ENV['CXX'] = nil
diff --git a/Library/Formula/mailtomutt.rb b/Library/Formula/mailtomutt.rb
index 9b7058ac2..50afefb2e 100644
--- a/Library/Formula/mailtomutt.rb
+++ b/Library/Formula/mailtomutt.rb
@@ -10,14 +10,13 @@ class Mailtomutt <Formula
     prefix.install "build/Default/MailtoMutt.app"
   end
 
-  def caveats
-    <<-EOS
-      MaitoMutt.app was installed in:
-        #{prefix}
+  def caveats; <<-EOS.undent
+    MaitoMutt.app was installed in:
+      #{prefix}
 
-      If you have external command enabled, you can do:
-        brew linkapps
-      to symlink into ~/Applications
+    If you have external command enabled, you can do:
+      brew linkapps
+    to symlink into ~/Applications
     EOS
   end
 end
diff --git a/Library/Formula/man2html.rb b/Library/Formula/man2html.rb
index 055153f76..f4613912e 100644
--- a/Library/Formula/man2html.rb
+++ b/Library/Formula/man2html.rb
@@ -9,7 +9,7 @@ class Man2html <Formula
     bin.mkpath
     man1.mkpath
     system "/usr/bin/perl", "install.me", "-batch",
-      "-binpath", bin,
-      "-manpath", man
+                            "-binpath", bin,
+                            "-manpath", man
   end
 end
diff --git a/Library/Formula/mathomatic.rb b/Library/Formula/mathomatic.rb
index 6e80a4e7b..cedafc54b 100644
--- a/Library/Formula/mathomatic.rb
+++ b/Library/Formula/mathomatic.rb
@@ -5,9 +5,8 @@ class Mathomatic <Formula
   homepage 'http://www.mathomatic.org/'
   md5 '24f8c4f80318215f2190daefc1f0e106'
 
-
   def install
-    ENV['prefix'] = "#{prefix}"
+    ENV['prefix'] = prefix
     system "make READLINE=1"
     system "make install"
   end
diff --git a/Library/Formula/mawk.rb b/Library/Formula/mawk.rb
index 29ef9b7fc..636abaf65 100644
--- a/Library/Formula/mawk.rb
+++ b/Library/Formula/mawk.rb
@@ -7,7 +7,9 @@ class Mawk <Formula
   version '1.3.4'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--with-readline=/usr/lib"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-readline=/usr/lib"
     system "make install"
   end
 end
diff --git a/Library/Formula/maxima.rb b/Library/Formula/maxima.rb
index e9899e221..1314cdc8d 100644
--- a/Library/Formula/maxima.rb
+++ b/Library/Formula/maxima.rb
@@ -12,8 +12,9 @@ class Maxima <Formula
 
   def install
     ENV.deparallelize
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}",
-           "--enable-cmucl", "--enable-gettext"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-cmucl", "--enable-gettext"
     system "make install"
   end
 end
diff --git a/Library/Formula/mcabber.rb b/Library/Formula/mcabber.rb
index cc4d80016..913b4ea1d 100644
--- a/Library/Formula/mcabber.rb
+++ b/Library/Formula/mcabber.rb
@@ -13,16 +13,13 @@ class Mcabber <Formula
   depends_on 'libgcrypt' => :optional
 
   def install
-    configure_args = [
-        "--prefix=#{prefix}",
-        "--disable-debug",
-        "--disable-dependency-tracking",
-        "--enable-aspell",
-        "--enable-enchant",
-        "--enable-otr",
-        "--with-ssl"
-    ]
-    system "./configure", *configure_args
+    system "./configure", "--prefix=#{prefix}",
+                          "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--enable-aspell",
+                          "--enable-enchant",
+                          "--enable-otr",
+                          "--with-ssl"
     system "make install"
   end
 end
diff --git a/Library/Formula/mcrypt.rb b/Library/Formula/mcrypt.rb
index 4786f0b66..17c1b901c 100755
--- a/Library/Formula/mcrypt.rb
+++ b/Library/Formula/mcrypt.rb
@@ -5,9 +5,14 @@ class Mcrypt <Formula
   homepage 'http://mcrypt.sourceforge.net'
   md5 '0821830d930a86a5c69110837c55b7da'
 
+  def options
+    [["--universal", "Build a universal binary."]]
+  end
+
   def install
     ENV.universal_binary if ARGV.include? "--universal"
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/mediatomb.rb b/Library/Formula/mediatomb.rb
index e2380299d..c33c687fe 100644
--- a/Library/Formula/mediatomb.rb
+++ b/Library/Formula/mediatomb.rb
@@ -4,7 +4,7 @@ class Mediatomb <Formula
   url 'http://downloads.sourceforge.net/mediatomb/mediatomb-0.12.0.tar.gz'
   homepage 'http://mediatomb.cc'
   md5 'd822a3f33ee109f799d7a6b76d394e05'
-  
+
   def install
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
diff --git a/Library/Formula/memcached.rb b/Library/Formula/memcached.rb
index ea613a28d..f467ab460 100644
--- a/Library/Formula/memcached.rb
+++ b/Library/Formula/memcached.rb
@@ -17,7 +17,7 @@ class Memcached <Formula
   def caveats; <<-EOS
 You can enabled memcached to automatically load on login with:
     cp #{prefix}/com.danga.memcached.plist ~/Library/LaunchAgents/
-    launchctl load -w ~/Library/LaunchAgents/com.danga.memcached.plist 
+    launchctl load -w ~/Library/LaunchAgents/com.danga.memcached.plist
 
 Or start it manually:
     #{HOMEBREW_PREFIX}/bin/memcached
diff --git a/Library/Formula/metalua.rb b/Library/Formula/metalua.rb
index f29cd2216..3c61c853c 100644
--- a/Library/Formula/metalua.rb
+++ b/Library/Formula/metalua.rb
@@ -5,7 +5,6 @@ class Metalua <Formula
   url 'http://github.com/fab13n/metalua/tarball/0.5-rc2'
   homepage 'http://metalua.luaforge.net/'
   md5 'c841976b3a2fe9b7322aaca16927c9e2'
-  version '0.5-rc2'
 
   depends_on 'lua'
 
diff --git a/Library/Formula/metasploit.rb b/Library/Formula/metasploit.rb
index 899c891c5..c76669c88 100644
--- a/Library/Formula/metasploit.rb
+++ b/Library/Formula/metasploit.rb
@@ -1,10 +1,9 @@
 require 'formula'
 
 class Metasploit <Formula
-  head "https://www.metasploit.com/svn/framework3/trunk/", :using => :svn, :revision => "9321"
+  url "https://www.metasploit.com/svn/framework3/trunk/", :using => :svn, :revision => "9321"
   version "3.4.0"
   homepage 'http://www.metasploit.com/framework/'
-  md5 ''
 
   def install
     libexec.install Dir["msf*",'data','external','lib','modules','plugins','scripts','test','tools']
diff --git a/Library/Formula/metis.rb b/Library/Formula/metis.rb
index 031b92279..74ef79ffe 100644
--- a/Library/Formula/metis.rb
+++ b/Library/Formula/metis.rb
@@ -7,7 +7,7 @@ class Metis <Formula
 
   def install
     system "make"
-    bin.install ['pmetis', 'kmetis', 'oemetis', 'onmetis', 'partnmesh', 
+    bin.install ['pmetis', 'kmetis', 'oemetis', 'onmetis', 'partnmesh',
       'partdmesh', 'mesh2nodal', 'mesh2dual', 'graphchk', 'Graphs/mtest']
     lib.install 'libmetis.a'
     include.install ['Lib/metis.h', 'Lib/defs.h', 'Lib/macros.h', 'Lib/rename.h',
diff --git a/Library/Formula/mftrace.rb b/Library/Formula/mftrace.rb
index 18fd4a23a..095f24fc0 100644
--- a/Library/Formula/mftrace.rb
+++ b/Library/Formula/mftrace.rb
@@ -4,7 +4,7 @@ class Mftrace <Formula
   url 'http://lilypond.org/download/sources/mftrace/mftrace-1.2.16.tar.gz'
   homepage 'http://lilypond.org/mftrace/'
   md5 '1c65846471db8f10902b96b7b3120da5'
-  
+
   depends_on 'potrace'
   depends_on 't1utils'
 
diff --git a/Library/Formula/mhash.rb b/Library/Formula/mhash.rb
index 626860f59..b774a588f 100644
--- a/Library/Formula/mhash.rb
+++ b/Library/Formula/mhash.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Mhash <Formula
-  @url='http://downloads.sourceforge.net/project/mhash/mhash/0.9.9.9/mhash-0.9.9.9.tar.gz'
-  @homepage='http://mhash.sourceforge.net/'
-  @md5='ee66b7d5947deb760aeff3f028e27d25'
+  url 'http://downloads.sourceforge.net/project/mhash/mhash/0.9.9.9/mhash-0.9.9.9.tar.gz'
+  homepage 'http://mhash.sourceforge.net/'
+  md5 'ee66b7d5947deb760aeff3f028e27d25'
 
   def install
     system "./configure --prefix=#{prefix} --disable-debug --disable-dependency-tracking"
diff --git a/Library/Formula/minicom.rb b/Library/Formula/minicom.rb
index b1f4dc861..6908b3ce4 100644
--- a/Library/Formula/minicom.rb
+++ b/Library/Formula/minicom.rb
@@ -1,25 +1,24 @@
 require 'formula'
 
 class Minicom <Formula
-  @url='http://alioth.debian.org/frs/download.php/3195/minicom-2.4.tar.gz'
-  @homepage='http://alioth.debian.org/projects/minicom/'
-  @md5='700976a3c2dcc8bbd50ab9bb1c08837b'
+  url 'http://alioth.debian.org/frs/download.php/3195/minicom-2.4.tar.gz'
+  homepage 'http://alioth.debian.org/projects/minicom/'
+  md5 '700976a3c2dcc8bbd50ab9bb1c08837b'
 
   def install
     # There is a silly bug in the Makefile where it forgets to link to iconv. Workaround below.
     ENV['LIBS'] = '-liconv'
-    
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-dependency-tracking",
+
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--mandir=#{man}"
     system "make install"
 
     (prefix + 'etc').mkdir
     (prefix + 'var').mkdir
     (prefix + 'etc/minirc.dfl').write "pu lock #{prefix}/var\npu escape-key Escape (Meta)\n"
-
   end
-  
+
   def caveats; <<-EOS
 Terminal Compatibility
 ======================
@@ -36,5 +35,4 @@ Most development boards require Serial port setup -> Hardware Flow
 Control to be set to "No" to input text.
     EOS
   end
-  
 end
diff --git a/Library/Formula/mmv.rb b/Library/Formula/mmv.rb
index e84d1bed8..33cc189dd 100644
--- a/Library/Formula/mmv.rb
+++ b/Library/Formula/mmv.rb
@@ -16,8 +16,8 @@ class Mmv <Formula
     man1.install 'mmv.1'
 
     %w[mcp mad mln].each do |mxx|
-      FileUtils.ln bin+'mmv', bin+mxx
-      FileUtils.ln man1+'mmv.1', man1+"#{mxx}.1"
+      ln bin+'mmv', bin+mxx
+      ln man1+'mmv.1', man1+"#{mxx}.1"
     end
   end
 end
diff --git a/Library/Formula/mod_python.rb b/Library/Formula/mod_python.rb
index cd4c79db4..73bd29195 100644
--- a/Library/Formula/mod_python.rb
+++ b/Library/Formula/mod_python.rb
@@ -23,7 +23,7 @@ class ModPython <Formula
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
-    
+
     # Explicitly set the arch in CFLAGS so the PSPModule will build against system Python
     # We remove 'ppc' support, so we can pass Intel-optimized CFLAGS.
     archs = archs_for_command("python")
diff --git a/Library/Formula/mod_wsgi.rb b/Library/Formula/mod_wsgi.rb
index d05f893b3..24bc29e35 100644
--- a/Library/Formula/mod_wsgi.rb
+++ b/Library/Formula/mod_wsgi.rb
@@ -32,7 +32,7 @@ class ModWsgi <Formula
     archs = archs_for_command("python")
     archs.delete :ppc7400
     archs.delete :ppc64
-    
+
     inreplace 'Makefile' do |s|
       s.gsub! "-Wc,'-arch x86_64' -Wc,'-arch i386' -Wc,'-arch ppc7400'",
               archs.collect{ |a| "-Wc,'-arch #{a}'" }.join(' ')
diff --git a/Library/Formula/mongodb.rb b/Library/Formula/mongodb.rb
index 5ed63f898..91c2454d5 100755
--- a/Library/Formula/mongodb.rb
+++ b/Library/Formula/mongodb.rb
@@ -14,13 +14,11 @@ class Mongodb <Formula
     version '1.6.0-i386'
   end
 
-  def skip_clean? path
-    true
-  end
+  skip_clean :all
 
   def install
     # Copy the prebuilt binaries to prefix
-    system "cp -prv * #{prefix}"
+    prefix.install Dir['*']
 
     # Create the data and log directories under /var
     (var+'mongodb').mkpath
diff --git a/Library/Formula/most.rb b/Library/Formula/most.rb
index 503514408..98fcfd425 100644
--- a/Library/Formula/most.rb
+++ b/Library/Formula/most.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Most <Formula
-  @url='ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2'
-  @homepage='http://www.jedsoft.org/most/'
-  @md5='4c42abfc8d3ace1b0e0062ea021a5917'
+  url 'ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2'
+  homepage 'http://www.jedsoft.org/most/'
+  md5 '4c42abfc8d3ace1b0e0062ea021a5917'
 
   depends_on 's-lang'
 
diff --git a/Library/Formula/mp3gain.rb b/Library/Formula/mp3gain.rb
index 52fcf0c92..5bc619e7f 100644
--- a/Library/Formula/mp3gain.rb
+++ b/Library/Formula/mp3gain.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Mp3gain <Formula
-  version "1.5.1"
   url 'http://downloads.sourceforge.net/project/mp3gain/mp3gain/1.5.1/mp3gain-1_5_1-src.zip'
+  version "1.5.1"
   homepage 'http://mp3gain.sourceforge.net'
   md5 '71a43bd183bc2a2c37fbf4a633ffb7aa'
 
diff --git a/Library/Formula/mpg123.rb b/Library/Formula/mpg123.rb
index af1f7ebf2..7855332db 100644
--- a/Library/Formula/mpg123.rb
+++ b/Library/Formula/mpg123.rb
@@ -26,7 +26,7 @@ class Mpg123 <Formula
     end
 
     system "./configure", *args
-    
+
     # ./configure incorrectly detects 10.5 as 10.4. Cut that crap out.
     ['.', 'src', 'src/output', 'src/libmpg123'].each do |path|
       inreplace "#{path}/Makefile" do |s|
@@ -34,7 +34,7 @@ class Mpg123 <Formula
         s.change_make_var! "LDFLAGS", "-Wl,-read_only_relocs,suppress"
       end
     end
-    
+
     system "make install"
   end
 end
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 59406431c..0bfc43bed 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -23,7 +23,7 @@ class Mplayer <Formula
     args = ["--prefix=#{prefix}", "--enable-largefiles", "--enable-apple-remote"]
     args << "--target=x86_64-Darwin" if Hardware.is_64_bit? and MACOS_VERSION >= 10.6
 
-    system './configure', *args 
+    system './configure', *args
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/msmtp.rb b/Library/Formula/msmtp.rb
index c7f1030a2..c0fd91d50 100644
--- a/Library/Formula/msmtp.rb
+++ b/Library/Formula/msmtp.rb
@@ -6,21 +6,15 @@ class Msmtp <Formula
   md5 '065042eaaee40c2779cf0bcfffe72aae'
 
   def options
-    [
-      ['--with-macosx-keyring', "Support Mac OS X Keyring"]
-    ]
+    [['--with-macosx-keyring', "Support Mac OS X Keyring"]]
   end
 
   def install
-    configure_args = [
-      "--prefix=#{prefix}",
-      "--disable-debug",
-      "--disable-dependency-tracking",
-    ]
+    args = [ "--disable-dependency-tracking", "--disable-debug",
+             "--prefix=#{prefix}" ]
+    args << "--with-macosx-keyring" if ARGV.include? '--with-macosx-keyring'
 
-    configure_args << "--with-macosx-keyring" if ARGV.include? '--with-macosx-keyring'
-
-    system "./configure", *configure_args
+    system "./configure", *args
     system "make install"
   end
 end
diff --git a/Library/Formula/mtr.rb b/Library/Formula/mtr.rb
index 312665b01..e77b3cac1 100644
--- a/Library/Formula/mtr.rb
+++ b/Library/Formula/mtr.rb
@@ -1,13 +1,13 @@
 require 'formula'
 
 class Mtr <Formula
-  @url='ftp://ftp.bitwizard.nl/mtr/mtr-0.75.tar.gz'
-  @homepage='http://www.bitwizard.nl/mtr/'
-  @md5='23baca52d0922c2ecba7eba05317868c'
+  url 'ftp://ftp.bitwizard.nl/mtr/mtr-0.75.tar.gz'
+  homepage 'http://www.bitwizard.nl/mtr/'
+  md5 '23baca52d0922c2ecba7eba05317868c'
 
   def install
     # We need to add this because nameserver8_compat.h has been removed in Snow Leopard
-    ENV['LIBS']= "-lresolv"
+    ENV['LIBS'] = "-lresolv"
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
diff --git a/Library/Formula/mutt.rb b/Library/Formula/mutt.rb
index f8b256c5f..c56a524d6 100644
--- a/Library/Formula/mutt.rb
+++ b/Library/Formula/mutt.rb
@@ -4,7 +4,7 @@ class Mutt <Formula
   url 'ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz'
   homepage 'http://www.mutt.org/'
   md5 '027cdd9959203de0c3c64149a7ee351c'
-  
+
   depends_on 'tokyo-cabinet'
 
   def options
@@ -15,39 +15,36 @@ class Mutt <Formula
   end
 
   def patches
-    patches = []
+    p = []
+
     if ARGV.include? '--sidebar-patch'
-      patches << 'http://lunar-linux.org/~tchan/mutt/patch-1.5.20.sidebar.20090619.txt'
+      p << 'http://lunar-linux.org/~tchan/mutt/patch-1.5.20.sidebar.20090619.txt'
     end
+
     if ARGV.include? '--trash-patch'
-      patches << 'http://trac.macports.org/export/69644/trunk/dports/mail/mutt-devel/files/patch-1.5.20.bk.trash_folder-purge_message.1'
+      p <<  'http://trac.macports.org/export/69644/trunk/dports/mail/mutt-devel/files/patch-1.5.20.bk.trash_folder-purge_message.1'
     end
-    patches
+
+    return p
   end
 
   def install
-      configure_args = [
-          "--prefix=#{prefix}",
-          "--disable-debug",
-          "--disable-dependency-tracking",
-          "--disable-warnings",
-          "--with-ssl",
-          "--with-sasl",
-          "--with-gnutls",
-          "--with-gss",
-          "--enable-imap",
-          "--enable-smtp",
-          "--enable-pop",
-          "--enable-hcache",
-          "--with-tokyocabinet",
-
-          # This is just a trick to keep 'make install' from trying to chgrp
-          # the mutt_dotlock file (which we can't do if we're running as an
-          # unpriviledged user)
-          "--with-homespool=.mbox"
-      ]
-
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--disable-warnings",
+                          "--prefix=#{prefix}",
+                          "--with-ssl",
+                          "--with-sasl",
+                          "--with-gnutls",
+                          "--with-gss",
+                          "--enable-imap",
+                          "--enable-smtp",
+                          "--enable-pop",
+                          "--enable-hcache",
+                          "--with-tokyocabinet",
+                          # This is just a trick to keep 'make install' from trying to chgrp
+                          # the mutt_dotlock file (which we can't do if we're running as an
+                          # unpriviledged user)
+                          "--with-homespool=.mbox"
     system "make install"
   end
 end
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index 3c8d69ffc..a7aa7b554 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class MysqlConnectorC <Formula
-  @homepage='http://dev.mysql.com/downloads/connector/c/6.0.html'
-  @url='http://mysql.llarian.net/Downloads/Connector-C/mysql-connector-c-6.0.2.tar.gz'
-  @md5='f922b778abdd25f7c1c95a8329144d56'
+  homepage 'http://dev.mysql.com/downloads/connector/c/6.0.html'
+  url 'http://mysql.llarian.net/Downloads/Connector-C/mysql-connector-c-6.0.2.tar.gz'
+  md5 'f922b778abdd25f7c1c95a8329144d56'
 
   depends_on 'cmake'
 
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index fb1346402..df54541e3 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -69,16 +69,16 @@ class Mysql <Formula
         cp #{prefix}/com.mysql.mysqld.plist ~/Library/LaunchAgents
         launchctl load -w ~/Library/LaunchAgents/com.mysql.mysqld.plist
 
-    If this is an upgrade and you already have the com.mysql.mysqld.plist loaded: 
+    If this is an upgrade and you already have the com.mysql.mysqld.plist loaded:
         launchctl unload -w ~/Library/LaunchAgents/com.mysql.mysqld.plist
         cp #{prefix}/com.mysql.mysqld.plist ~/Library/LaunchAgents
         launchctl load -w ~/Library/LaunchAgents/com.mysql.mysqld.plist
 
-    Note on upgrading: 
-        We overwrite any existing com.mysql.mysqld.plist in ~/Library/LaunchAgents 
-        if we are upgrading because previous versions of this brew created the 
+    Note on upgrading:
+        We overwrite any existing com.mysql.mysqld.plist in ~/Library/LaunchAgents
+        if we are upgrading because previous versions of this brew created the
         plist with a version specific program argument.
-    
+
     Or start manually with:
         #{prefix}/share/mysql/mysql.server start
     EOS
diff --git a/Library/Formula/mz-scheme.rb b/Library/Formula/mz-scheme.rb
index 3b5094c5b..7aad7d27f 100644
--- a/Library/Formula/mz-scheme.rb
+++ b/Library/Formula/mz-scheme.rb
@@ -9,10 +9,13 @@ class MzScheme <Formula
   def install
     cd "src"
 
-    options = ["--disable-pthread", "--disable-mred", "--enable-xonx", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"]
-    options << "--enable-mac64" if Hardware.is_64_bit? && MACOS_VERSION >= 10.6
-    system "./configure", *options
+    args = [ "--disable-debug", "--disable-dependency-tracking",
+             "--disable-pthread", "--disable-mred", "--enable-xonx",
+             "--prefix=#{prefix}" ]
 
+    args << "--enable-mac64" if Hardware.is_64_bit? && MACOS_VERSION >= 10.6
+
+    system "./configure", *args
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/n2n.rb b/Library/Formula/n2n.rb
index ff1e0e4f1..d029d2cfe 100644
--- a/Library/Formula/n2n.rb
+++ b/Library/Formula/n2n.rb
@@ -3,23 +3,22 @@ require 'formula'
 class N2n < Formula
   url 'http://www.sideshowcoder.railsplayground.net/files/n2n-2.7.tar.gz'
   homepage 'http://www.ntop.org/n2n/'
-  md5 '8e64e4fd0ebf05c76b942549dc8b6b76' 
+  md5 '8e64e4fd0ebf05c76b942549dc8b6b76'
 
   def install
     system "make"
     system "make", "PREFIX=#{prefix}", "install"
   end
 
-  def caveats
-    <<-EOF.undent
-      To link correctly you need to have access to the /usr/local/sbin
-      and link n2n
+  def caveats; <<-EOF.undent
+    To link correctly you need to have access to the /usr/local/sbin
+    and link n2n
 
-      $ chown `whoami`:staff /usr/local/sbin
-      $ brew link n2n
+    $ chown `whoami`:staff /usr/local/sbin
+    $ brew link n2n
 
-      n2n also requires the tun/tap devices. To get these on OS X:
-        http://tuntaposx.sourceforge.net/download.xhtml
+    n2n also requires the tun/tap devices. To get these on OS X:
+      http://tuntaposx.sourceforge.net/download.xhtml
     EOF
   end
 end
diff --git a/Library/Formula/nasm.rb b/Library/Formula/nasm.rb
index 931a95a9d..769ab8b57 100644
--- a/Library/Formula/nasm.rb
+++ b/Library/Formula/nasm.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Nasm <Formula
-  @url='http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2'
-  @homepage='http://www.nasm.us/'
-  @md5='1e3ebc1289c2be5963571c0937b7a211'
+  url 'http://www.nasm.us/pub/nasm/releasebuilds/2.08.01/nasm-2.08.01.tar.bz2'
+  homepage 'http://www.nasm.us/'
+  md5 '1e3ebc1289c2be5963571c0937b7a211'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/nazghul.rb b/Library/Formula/nazghul.rb
index 1f2d52c20..c609bdcfa 100644
--- a/Library/Formula/nazghul.rb
+++ b/Library/Formula/nazghul.rb
@@ -19,9 +19,10 @@ class Nazghul <Formula
     system "make install"
   end
 
-  def caveats
-    "The built-in game for this engine is called \"Haxima\".\n"+
-    "To run:\n"+
-    "   haxima.sh"
+  def caveats; <<-EOS.undent
+    The built-in game for this engine is called "Haxima".
+    To run:
+      haxima.sh"
+    EOS
   end
 end
diff --git a/Library/Formula/ncftp.rb b/Library/Formula/ncftp.rb
index adb1bc609..d2e3e1260 100644
--- a/Library/Formula/ncftp.rb
+++ b/Library/Formula/ncftp.rb
@@ -1,12 +1,13 @@
 require 'formula'
 
 class Ncftp <Formula
-  @homepage='http://www.ncftp.com'
-  @url='ftp://ftp.ncftp.com/ncftp/ncftp-3.2.4-src.tar.gz'
-  @md5='418f3e660d33c8ae98e8a3dd80fb4e1c'
+  homepage 'http://www.ncftp.com'
+  url 'ftp://ftp.ncftp.com/ncftp/ncftp-3.2.4-src.tar.gz'
+  md5 '418f3e660d33c8ae98e8a3dd80fb4e1c'
 
   def install
-    system "./configure --disable-universal --disable-precomp --prefix='#{prefix}' --mandir='#{man}'"
+    system "./configure", "--disable-universal", "--disable-precomp",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/neon.rb b/Library/Formula/neon.rb
index b41794bb7..bd37b2f3c 100644
--- a/Library/Formula/neon.rb
+++ b/Library/Formula/neon.rb
@@ -7,14 +7,10 @@ class Neon <Formula
 
   depends_on 'pkg-config'
 
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def options
-    [
-      ['--universal', 'Build as a Universal Intel binary.']
-    ]
+    [['--universal', 'Builds a universal binary.']]
   end
 
   def install
diff --git a/Library/Formula/netcdf.rb b/Library/Formula/netcdf.rb
index 7400c1682..b9c410858 100644
--- a/Library/Formula/netcdf.rb
+++ b/Library/Formula/netcdf.rb
@@ -44,7 +44,5 @@ provide support for any issues that arise during
 compilation when Fortran is enabled until a Fortran
 compiler is officially supported.
     EOS
-    
   end
-
 end
diff --git a/Library/Formula/nethack.rb b/Library/Formula/nethack.rb
index 06a86a8c0..1145c06b4 100644
--- a/Library/Formula/nethack.rb
+++ b/Library/Formula/nethack.rb
@@ -11,20 +11,15 @@ require 'formula'
 # done.
 
 class Nethack <Formula
-  @url='http://downloads.sourceforge.net/project/nethack/nethack/3.4.3/nethack-343-src.tgz'
-  @homepage='http://www.nethack.org/index.html'
-  @version='3.4.3'
-  @md5='21479c95990eefe7650df582426457f9'
+  url 'http://downloads.sourceforge.net/project/nethack/nethack/3.4.3/nethack-343-src.tgz'
+  homepage 'http://www.nethack.org/index.html'
+  version '3.4.3'
+  md5 '21479c95990eefe7650df582426457f9'
 
   def patches
     DATA
   end
 
-  def skip_clean? path
-    # Keep the empty save folder
-    path == libexec + "save"
-  end
-
   def install
     fails_with_llvm
     # Build everything in-order; no multi builds.
@@ -32,31 +27,31 @@ class Nethack <Formula
 
     # Symlink makefiles
     system 'sh sys/unix/setup.sh'
-    
+
     inreplace "include/config.h",
       /^#\s*define HACKDIR.*$/,
-      "#define HACKDIR \"#{libexec}\""
-    
+      "#define HACKDIR \"#{var}/nethack\""
+
     # Make the data first, before we munge the CFLAGS
     system "cd dat;make"
-    
+
     Dir.chdir 'dat' do
       %w(perm logfile).each do |f|
         system "touch", f
         libexec.install f
       end
-      
+
       # Stage the data
       libexec.install %w(help hh cmdhelp history opthelp wizhelp dungeon license data oracles options rumors quest.dat)
       libexec.install Dir['*.lev']
     end
-    
+
     # Make the game
     ENV.append_to_cflags "-I../include"
     system 'cd src;make'
-    
+
     bin.install 'src/nethack'
-    (libexec+'save').mkpath
+    (var+'nethack').mkpath
   end
 end
 
diff --git a/Library/Formula/newlisp.rb b/Library/Formula/newlisp.rb
index ed93e8b2e..9b6720481 100644
--- a/Library/Formula/newlisp.rb
+++ b/Library/Formula/newlisp.rb
@@ -15,7 +15,7 @@ class Newlisp <Formula
     bin.install 'newlisp'
   end
 
-  def caveats; <<-EOS
+  def caveats; <<-EOS.undent
     Because of hardcoded paths in the newLISP source,
     this formula does not install the Java-based IDE.
     EOS
diff --git a/Library/Formula/nkf.rb b/Library/Formula/nkf.rb
index a2d3008e3..38b527ab2 100644
--- a/Library/Formula/nkf.rb
+++ b/Library/Formula/nkf.rb
@@ -1,20 +1,19 @@
 require 'formula'
 
 class Nkf < Formula
-
   url 'http://heian.s3.amazonaws.com/nkf-2.1.0.tar.gz'
   homepage 'http://sourceforge.jp/projects/nkf/'
   md5 '1d3fd56ccd2f60768e59dde44ccf095c'
 
+  def patches
+    # Makefile patch
+    'http://heian.s3.amazonaws.com/nkf-2.1.0.patch'
+  end
+
   def install
     ENV['prefix'] = prefix
     system 'make'
     system 'make install'
   end
-
-  def patches
-    # Makefile patch
-    [ 'http://heian.s3.amazonaws.com/nkf-2.1.0.patch' ]
-  end
 end
 
diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb
index e94fcdc54..7333e07c9 100644
--- a/Library/Formula/nmap.rb
+++ b/Library/Formula/nmap.rb
@@ -16,7 +16,7 @@ class Nmap <Formula
     ENV['CXXFLAGS'] = "-m32 -O2"
 
     system "./configure", "--prefix=#{prefix}", "--without-zenmap"
-    system "make"                      
-    system "make install" # seperate steps required otherwise the build fails
+    system "make" # seperate steps required otherwise the build fails
+    system "make install"
   end
 end
diff --git a/Library/Formula/node.rb b/Library/Formula/node.rb
index 3c234ad2e..38cd54e01 100755
--- a/Library/Formula/node.rb
+++ b/Library/Formula/node.rb
@@ -7,9 +7,7 @@ class Node <Formula
   md5 '378307512e380e279969b0936e5ec5cc'
 
   # Stripping breaks dynamic loading
-  def skip_clean? path
-    true
-  end
+  skip_clean :all
 
   def install
     fails_with_llvm
diff --git a/Library/Formula/objective-caml.rb b/Library/Formula/objective-caml.rb
index c02c46cdc..60ab82376 100755
--- a/Library/Formula/objective-caml.rb
+++ b/Library/Formula/objective-caml.rb
@@ -7,7 +7,7 @@ class ObjectiveCaml <Formula
 
   # note it indeed seems necessary to skip cleaning everything
   # see http://github.com/mxcl/homebrew/issues/issue/188
-  def skip_clean? path; true; end
+  skip_clean :all
 
   def install
     system "./configure", "--prefix", prefix, "--mandir", man
diff --git a/Library/Formula/ode.rb b/Library/Formula/ode.rb
index ec283ece6..eac7a2050 100644
--- a/Library/Formula/ode.rb
+++ b/Library/Formula/ode.rb
@@ -2,7 +2,7 @@ require 'formula'
 
 class Ode <Formula
   # Build from svn to get Snow Leopard fixes.
-  head 'https://opende.svn.sourceforge.net/svnroot/opende/trunk', :revision => '1728'
+  url 'https://opende.svn.sourceforge.net/svnroot/opende/trunk', :revision => '1728'
   homepage 'http://www.ode.org/'
 
   def install
diff --git a/Library/Formula/omega.rb b/Library/Formula/omega.rb
index 2a9a30c46..434474de0 100644
--- a/Library/Formula/omega.rb
+++ b/Library/Formula/omega.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Omega <Formula
-  @url='http://www.alcyone.com/binaries/omega/omega-0.80.2-src.tar.gz'
-  @homepage='http://www.alcyone.com/max/projects/omega/'
-  @md5='6d65ec9e0cc87ccf89ab491533ec4b77'
+  url 'http://www.alcyone.com/binaries/omega/omega-0.80.2-src.tar.gz'
+  homepage 'http://www.alcyone.com/max/projects/omega/'
+  md5 '6d65ec9e0cc87ccf89ab491533ec4b77'
 
   def install
     # Set up our target folders
@@ -15,7 +15,7 @@ class Omega <Formula
     inreplace "Makefile" do |s|
       s.remove_make_var! ['CC', 'CFLAGS', 'LDFLAGS']
     end
-    
+
     ENV.append_to_cflags "-DUNIX -DSYSV"
 
     system "make"
diff --git a/Library/Formula/oniguruma.rb b/Library/Formula/oniguruma.rb
index 50c7d9551..04432f2c0 100644
--- a/Library/Formula/oniguruma.rb
+++ b/Library/Formula/oniguruma.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Oniguruma <Formula
-  @url='http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.1.tar.gz'
-  @homepage='http://www.geocities.jp/kosako3/oniguruma/'
-  @md5='5ce5f9bba5e83f0ea6ec24e1ac77091c'
+  url 'http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.1.tar.gz'
+  homepage 'http://www.geocities.jp/kosako3/oniguruma/'
+  md5 '5ce5f9bba5e83f0ea6ec24e1ac77091c'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/open-mpi.rb b/Library/Formula/open-mpi.rb
index 251f49c81..a7397e011 100644
--- a/Library/Formula/open-mpi.rb
+++ b/Library/Formula/open-mpi.rb
@@ -7,7 +7,7 @@ class OpenMpi <Formula
 
   def install
     # Compiler complains about link compatibility with FORTRAN otherwise
-    ENV.delete('CFLAGS') 
+    ENV.delete('CFLAGS')
     ENV.delete('CXXFLAGS')
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/open-tyrian.rb b/Library/Formula/open-tyrian.rb
index a2966540c..7f4e5fd91 100644
--- a/Library/Formula/open-tyrian.rb
+++ b/Library/Formula/open-tyrian.rb
@@ -6,16 +6,14 @@ class OpenTyrianData <Formula
 end
 
 class OpenTyrian <Formula
-  head 'http://opentyrian.googlecode.com/hg/', :revision =>  '9ddcd06e48'
+  url 'http://opentyrian.googlecode.com/hg/', :revision =>  '9ddcd06e48'
   homepage 'http://code.google.com/p/opentyrian/'
-  version 'trunk'
-  
+
   depends_on 'sdl'
   depends_on 'sdl_net'
 
   def install
-    d = libexec
-    OpenTyrianData.new.brew { d.install Dir['*'] }
+    OpenTyrianData.new.brew { libexec.install Dir['*'] }
 
     system "make release"
     libexec.install "opentyrian"
@@ -24,7 +22,7 @@ class OpenTyrian <Formula
   end
 
   def startup_script
-      return <<-END
+<<-END
 #!/bin/bash
 #{libexec}/opentyrian --data=#{libexec} $*
 END
diff --git a/Library/Formula/opencore-amr.rb b/Library/Formula/opencore-amr.rb
index 24d4db13f..688292d4e 100644
--- a/Library/Formula/opencore-amr.rb
+++ b/Library/Formula/opencore-amr.rb
@@ -4,7 +4,7 @@ class OpencoreAmr <Formula
   url 'http://downloads.sourceforge.net/opencore-amr/opencore-amr-0.1.2.tar.gz'
   homepage 'http://opencore-amr.sourceforge.net/'
   md5 '8e8b8b253eb046340ff7b6bf7a6ccd3e'
-  
+
   def install
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
diff --git a/Library/Formula/opencv.rb b/Library/Formula/opencv.rb
index 5277d3d8a..1a11495a5 100644
--- a/Library/Formula/opencv.rb
+++ b/Library/Formula/opencv.rb
@@ -10,18 +10,13 @@ class Opencv <Formula
   depends_on 'cmake'
   depends_on 'pkg-config'
 
-  # Optional.
-  depends_on 'libtiff'
-  depends_on 'jasper'
-  depends_on 'tbb'
+  depends_on 'libtiff' => :optional
+  depends_on 'jasper'  => :optional
+  depends_on 'tbb'     => :optional
 
-  # Very Optional? Pulls in lots of dependencies but maybe not needed unless you're doing video analysis
-  # Video analysis requires a bunch more things which we don't have: libgstreamer, libxine, unicap, libdc1394 2.x (or libdc1394 1.x + libraw1394).
-  # We can leave this disabled for now.
-  # Maybe we could add a flag?
-  #depends_on 'ffmpeg'
-
-  # There are other optional dependencies but they don't currently exist in Homebrew.
+  # Can also depend on ffmpeg, but this pulls in a lot of extra stuff that you don't
+  # need unless you're doing video analysis, and some of it isn't in Homebrew anyway.
+  # depends_on 'ffmpeg'
 
   def install
     system "cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX:PATH=#{prefix} ."
@@ -29,13 +24,11 @@ class Opencv <Formula
     system "make install"
   end
 
-    def caveats
-      return <<-EOS
-  The OpenCV Python module will not work until you edit your PYTHONPATH like so:
-
-    export PYTHONPATH="#{HOMEBREW_PREFIX}/lib/python2.6/site-packages/:$PYTHONPATH"
+  def caveats; <<-EOS.undent
+    The OpenCV Python module will not work until you edit your PYTHONPATH like so:
+      export PYTHONPATH="#{HOMEBREW_PREFIX}/lib/python2.6/site-packages/:$PYTHONPATH"
 
-  To make this permanent, put it in your shell's profile (e.g. ~/.profile).
+    To make this permanent, put it in your shell's profile (e.g. ~/.profile).
     EOS
   end
 end
diff --git a/Library/Formula/openexr.rb b/Library/Formula/openexr.rb
index 78ac2cbe6..e5e5d41e7 100644
--- a/Library/Formula/openexr.rb
+++ b/Library/Formula/openexr.rb
@@ -11,11 +11,10 @@ class Openexr <Formula
   def patches
     DATA
   end
-  
+
   def install
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/openimageio.rb b/Library/Formula/openimageio.rb
index 56c581994..7278afd10 100644
--- a/Library/Formula/openimageio.rb
+++ b/Library/Formula/openimageio.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 class Openimageio <Formula
-  head 'http://svn.openimageio.org/oiio/branches/RB-0.8/', :using => :svn
+  url 'http://svn.openimageio.org/oiio/branches/RB-0.8/', :using => :svn
   version "0.8"
   homepage 'http://openimageio.org'
 
@@ -12,10 +12,10 @@ class Openimageio <Formula
   depends_on 'boost'
 
   # build plugins
-  depends_on 'libpng' => :optional
+  depends_on 'libpng'  => :optional
   depends_on 'libtiff' => :optional
-  depends_on 'jpeg' => :optional
-  depends_on 'jasper' => :optional
+  depends_on 'jpeg'    => :optional
+  depends_on 'jasper'  => :optional
 
   # Qt linking not currently working.
   # # build iv
diff --git a/Library/Formula/openvpn.rb b/Library/Formula/openvpn.rb
index 9336ff80f..530a91a42 100644
--- a/Library/Formula/openvpn.rb
+++ b/Library/Formula/openvpn.rb
@@ -7,9 +7,8 @@ class Openvpn <Formula
 
   depends_on 'lzo' => :recommended
 
-  def skip_clean? path
-    path == etc or path == var
-  end
+  skip_clean 'etc'
+  skip_clean 'var'
 
   def install
     # Build and install binary
diff --git a/Library/Formula/orc.rb b/Library/Formula/orc.rb
index ef2a104fe..e894f2ae7 100644
--- a/Library/Formula/orc.rb
+++ b/Library/Formula/orc.rb
@@ -6,7 +6,9 @@ class Orc <Formula
   md5 'e26e59428b13ec251916f34bea96eee5'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-gtk-doc"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-gtk-doc"
     system "make install"
   end
 end
diff --git a/Library/Formula/orderly.rb b/Library/Formula/orderly.rb
index d004b32ce..aff04795f 100644
--- a/Library/Formula/orderly.rb
+++ b/Library/Formula/orderly.rb
@@ -5,7 +5,7 @@ class Orderly <Formula
   homepage 'http://orderly-json.org/'
   md5 'b416de7d7e90088a7c842cc26ae393ec'
   version '0.0.1'
-  
+
   depends_on 'yajl'
   depends_on 'cmake'
 
diff --git a/Library/Formula/ossp-uuid.rb b/Library/Formula/ossp-uuid.rb
index a31b6022e..c90f85f13 100644
--- a/Library/Formula/ossp-uuid.rb
+++ b/Library/Formula/ossp-uuid.rb
@@ -6,7 +6,7 @@ class OsspUuid <Formula
   md5 '5db0d43a9022a6ebbbc25337ae28942f'
 
   def install
-    system "./configure", "--disable-debug", 
+    system "./configure", "--disable-debug",
                           "--without-perl",
                           "--without-php",
                           "--without-pgsql",
diff --git a/Library/Formula/p0f.rb b/Library/Formula/p0f.rb
index 0c11c9e1e..83784c759 100644
--- a/Library/Formula/p0f.rb
+++ b/Library/Formula/p0f.rb
@@ -7,7 +7,6 @@ class P0f <Formula
   homepage 'http://github.com/skord/p0f'
   md5 '1ccbcd8d4c95ef6dae841120d23c56a5'
 
-
   def install
     inreplace "config.h", "/etc/p0f", "#{etc}/p0f"
     system "make"
diff --git a/Library/Formula/par2.rb b/Library/Formula/par2.rb
index 59c4c1dd4..b179f1254 100644
--- a/Library/Formula/par2.rb
+++ b/Library/Formula/par2.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Par2 <Formula
-  @url='http://downloads.sourceforge.net/project/parchive/par2cmdline/0.4/par2cmdline-0.4.tar.gz'
-  @homepage='http://parchive.sourceforge.net/'
-  @sha1='2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f'
+  url 'http://downloads.sourceforge.net/project/parchive/par2cmdline/0.4/par2cmdline-0.4.tar.gz'
+  homepage 'http://parchive.sourceforge.net/'
+  sha1 '2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f'
 
   def patches
     %w[http://sage.math.washington.edu/home/binegar/src/par2cmdline-0.4-gcc4.patch]
diff --git a/Library/Formula/pbzip2.rb b/Library/Formula/pbzip2.rb
index 331d49266..8595d5492 100644
--- a/Library/Formula/pbzip2.rb
+++ b/Library/Formula/pbzip2.rb
@@ -7,15 +7,15 @@ class Pbzip2 <Formula
 
   def install
     fails_with_llvm
-    
+
     inreplace "Makefile" do |s|
       s.change_make_var! 'PREFIX', prefix
       s.gsub! "/man/", "/share/man/"
-      
+
       # Per fink and macport:
       s.gsub! "-pthread -lpthread", ""
     end
-    
+
     system "make install"
   end
 end
diff --git a/Library/Formula/pdflib-lite.rb b/Library/Formula/pdflib-lite.rb
index e3e4e95f4..8f81cda41 100644
--- a/Library/Formula/pdflib-lite.rb
+++ b/Library/Formula/pdflib-lite.rb
@@ -14,15 +14,19 @@ class PdflibLite <Formula
     # This workaround comes from the MacPorts.org portfile for pdflib.
     ENV['CPPFLAGS'] = "-isystem#{prefix}"
 
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking",
-           "--without-java", "--without-perl", "--without-py", "--without-tcl",
-           "--without-ruby"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--without-java",
+                          "--without-perl",
+                          "--without-py",
+                          "--without-tcl",
+                          "--without-ruby"
     system "make"
     system "make install"
-    
+
     def caveats; <<-EOM
-pdflib-lite is not open source software; usage restrictions apply! Be sure to
-understand and obey the license terms, which can be found at:
+pdflib-lite is not open source software; usage restrictions apply!
+Be sure to understand and obey the license terms, which can be found at:
 http://www.pdflib.com/products/pdflib-family/pdflib-lite/pdflib-lite-licensing/
       EOM
     end
diff --git a/Library/Formula/pdftohtml.rb b/Library/Formula/pdftohtml.rb
index 3516dbb99..13b989670 100644
--- a/Library/Formula/pdftohtml.rb
+++ b/Library/Formula/pdftohtml.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Pdftohtml <Formula
-  @url='http://downloads.sourceforge.net/project/pdftohtml/Experimental%20Versions/pdftohtml%200.40/pdftohtml-0.40a.tar.gz'
-  @homepage='http://pdftohtml.sourceforge.net/'
-  @md5='2d82996faaf2b9439f8395743c1c163d'
+  url 'http://downloads.sourceforge.net/project/pdftohtml/Experimental%20Versions/pdftohtml%200.40/pdftohtml-0.40a.tar.gz'
+  homepage 'http://pdftohtml.sourceforge.net/'
+  md5 '2d82996faaf2b9439f8395743c1c163d'
 
   def install
     system "make"
diff --git a/Library/Formula/pgpool-ii.rb b/Library/Formula/pgpool-ii.rb
index a7ac5b384..364f19457 100644
--- a/Library/Formula/pgpool-ii.rb
+++ b/Library/Formula/pgpool-ii.rb
@@ -10,7 +10,7 @@ class PgpoolIi <Formula
       opoo "No PostgreSQL was detected."
       puts <<-EOS.undent
         This formula uses `pg_config` to detect an installed PostgreSQL instead
-        of \"depends_on 'postgresql'\" so you can use a non-Homebrew version.
+        of "depends_on 'postgresql'" so you can use a non-Homebrew version.
         You may want to `brew install postgresql` if you don't have another
         version already installed.
       EOS
diff --git a/Library/Formula/phoronix-test-suite.rb b/Library/Formula/phoronix-test-suite.rb
index 6eb377c81..d1b27be10 100644
--- a/Library/Formula/phoronix-test-suite.rb
+++ b/Library/Formula/phoronix-test-suite.rb
@@ -7,7 +7,7 @@ class PhoronixTestSuite <Formula
   def patches
     DATA
   end
-  
+
   def install
     system "./install-sh #{prefix}"
   end
diff --git a/Library/Formula/pig.rb b/Library/Formula/pig.rb
index b9505ecc4..40a29e267 100644
--- a/Library/Formula/pig.rb
+++ b/Library/Formula/pig.rb
@@ -13,7 +13,6 @@ class Pig < Formula
     rm_f Dir["bin/*.bat"]
     prefix.install ['bin', 'lib/hadoop20.jar', "pig-#{version}-core.jar"]
   end
-  
 end
 
 # There's something weird with Pig's launch script, it doesn't find the correct
diff --git a/Library/Formula/pigz.rb b/Library/Formula/pigz.rb
index 71078603f..554bb6744 100644
--- a/Library/Formula/pigz.rb
+++ b/Library/Formula/pigz.rb
@@ -7,7 +7,6 @@ class Pigz <Formula
 
   def install
     system "make"
-    bin.install "pigz"
-    bin.install "unpigz"
+    bin.install ["pigz", "unpigz"]
   end
 end
diff --git a/Library/Formula/pkg-config.rb b/Library/Formula/pkg-config.rb
index e25295388..14c38ecfa 100644
--- a/Library/Formula/pkg-config.rb
+++ b/Library/Formula/pkg-config.rb
@@ -5,8 +5,6 @@ class PkgConfig <Formula
   url 'http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz'
   md5 'd922a88782b64441d06547632fd85744'
 
-  #TODO depend on our glib if available. --with-installed-glib
-
   def install
     paths=%W[#{HOMEBREW_PREFIX}/lib/pkgconfig /usr/local/lib/pkgconfig /usr/lib/pkgconfig /usr/X11/lib/pkgconfig].uniq
     system "./configure", "--with-pc-path=#{paths*':'}", "--disable-debug", "--prefix=#{prefix}"
diff --git a/Library/Formula/playdar.rb b/Library/Formula/playdar.rb
index 47af097bc..5348718a0 100644
--- a/Library/Formula/playdar.rb
+++ b/Library/Formula/playdar.rb
@@ -11,18 +11,16 @@ class Playdar <Formula
     system "make all"
     system "make scanner"
 
-    Dir['playdar_modules/*/src'].each{ |fn| FileUtils.rm_rf fn }
-    FileUtils.rm_rf 'playdar_modules/library/priv/taglib_driver/scanner_visual_studio_sln'
+    Dir['playdar_modules/*/src'].each{ |fn| rm_rf fn }
+    rm_rf 'playdar_modules/library/priv/taglib_driver/scanner_visual_studio_sln'
     File.unlink 'playdar_modules/library/priv/taglib_driver/taglib_json_reader.cpp'
 
-    prefix.install 'ebin'
-    prefix.install 'playdar_modules'
-    prefix.install 'priv'
-    prefix.install 'etc' # otherwise playdar crashes
-    
+    # otherwise playdar crashes
+    prefix.install ['ebin', 'playdar_modules', 'priv', 'etc']
+
     inreplace 'playdarctl', 'cd `dirname $0`', "cd #{prefix}"
     inreplace 'playdarctl', 'EBIN=./ebin/', "EBIN=#{prefix}/ebin"
-    
+
     bin.install 'playdarctl'
   end
 end
diff --git a/Library/Formula/plowshare.rb b/Library/Formula/plowshare.rb
index ffe7ed3c5..c374ceba3 100644
--- a/Library/Formula/plowshare.rb
+++ b/Library/Formula/plowshare.rb
@@ -24,11 +24,11 @@ class Plowshare <Formula
 end
 
 
-#This patch makes sure GNUtools are used on OSX. 
+#This patch makes sure GNUtools are used on OSX.
 #gnu-getopt is keg-only hence the backtick expansion.
 #These aliases only exist for the duration of plowshare,
 #inside the plowshare shells. Normal operation of bash is
-#unaffected - getopt will still find the version supplied 
+#unaffected - getopt will still find the version supplied
 #by OSX in other shells, for example.
 __END__
 --- a/src/lib.sh
diff --git a/Library/Formula/png2ico.rb b/Library/Formula/png2ico.rb
index 91481271c..cbc7e2e31 100644
--- a/Library/Formula/png2ico.rb
+++ b/Library/Formula/png2ico.rb
@@ -4,7 +4,7 @@ class Png2ico <Formula
   url 'http://www.winterdrache.de/freeware/png2ico/data/png2ico-src-2002-12-08.tar.gz'
   homepage 'http://www.winterdrache.de/freeware/png2ico/'
   md5 '9b663df81c826cd564638cba2e6bc75b'
-  
+
   depends_on 'libpng'
 
   def install
diff --git a/Library/Formula/pngrewrite.rb b/Library/Formula/pngrewrite.rb
index 1d7ed86e1..91b9088a4 100644
--- a/Library/Formula/pngrewrite.rb
+++ b/Library/Formula/pngrewrite.rb
@@ -7,10 +7,7 @@ class Pngrewrite <Formula
 
   def install
     ENV.libpng
-    
-    system "#{ENV.cc} #{ENV['CFLAGS']} #{ENV['CPPFLAGS']} " +
-           "-o pngrewrite pngrewrite.c " +
-           "#{ENV['LDFLAGS']} -lpng"
+    system "#{ENV.cc} #{ENV['CFLAGS']} #{ENV['CPPFLAGS']} -o pngrewrite pngrewrite.c #{ENV['LDFLAGS']} -lpng"
     bin.install 'pngrewrite'
   end
 end
diff --git a/Library/Formula/poco.rb b/Library/Formula/poco.rb
index 55c478c5d..b40ef9692 100644
--- a/Library/Formula/poco.rb
+++ b/Library/Formula/poco.rb
@@ -9,12 +9,10 @@ class Poco <Formula
   def install
     arch = Hardware.is_64_bit? ? 'Darwin_x86_64': 'Darwin'
 
-    system "./configure",
-        "--disable-debug",
-        "--disable-dependency-tracking",
-        "--config=#{arch}",
-        "--omit=Data/MySQL,Data/ODBC",
-        "--prefix=#{prefix}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--config=#{arch}",
+                          "--omit=Data/MySQL,Data/ODBC",
+                          "--prefix=#{prefix}"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb
index 608ab03fc..2a16f17a1 100644
--- a/Library/Formula/poppler.rb
+++ b/Library/Formula/poppler.rb
@@ -24,14 +24,10 @@ class Poppler <Formula
       ENV['POPPLER_QT4_CFLAGS'] = qt4Flags
     end
 
-    configureArgs = [
-      "--prefix=#{prefix}",
-      "--disable-dependency-tracking"
-    ]
+    args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
+    args << "--disable-poppler-qt4" unless ARGV.include? "--with-qt4"
 
-    configureArgs << "--disable-poppler-qt4" unless ARGV.include? "--with-qt4"
-
-    system "./configure", *configureArgs
+    system "./configure", *args
     system "make install"
 
     # Install poppler font data.
diff --git a/Library/Formula/pos.rb b/Library/Formula/pos.rb
index 514c78df9..fddeb212c 100644
--- a/Library/Formula/pos.rb
+++ b/Library/Formula/pos.rb
@@ -5,13 +5,12 @@ class Pos <Formula
   md5 'c667fb4ca38c96494f888ade9fb4e40a'
   homepage "http://sage.ucsc.edu/~wgscott/xtal/wiki/index.php/Unix_and_OS_X:_The_Absolute_Essentials"
 
-  def cdf_script
-    <<-END
+  def cdf_script; <<-END
 #!/bin/bash
 cd "$(posd)"
 END
   end
-    
+
   def install
     bin.install %w[bin/fdc bin/posd]
     (bin+'cdf').write cdf_script
diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb
index 0366b6286..f35ea0be9 100755
--- a/Library/Formula/postgresql.rb
+++ b/Library/Formula/postgresql.rb
@@ -19,42 +19,37 @@ class Postgresql <Formula
     ]
   end
 
-  def skip_clean? path
-    true
-  end
+  skip_clean :all
 
   def install
     ENV.libxml2 if MACOS_VERSION >= 10.6
 
-    configure_args = [
-        "--enable-thread-safety",
-        "--with-bonjour",
-        "--with-gssapi",
-        "--with-krb5",
-        "--with-openssl",
-        "--with-libxml",
-        "--with-libxslt",
-        "--prefix=#{prefix}",
-        "--disable-debug"
-    ]
+    args = ["--disable-debug",
+            "--prefix=#{prefix}",
+            "--enable-thread-safety",
+            "--with-bonjour",
+            "--with-gssapi",
+            "--with-krb5",
+            "--with-openssl",
+            "--with-libxml", "--with-libxslt"]
 
-    configure_args << "--with-python" unless ARGV.include? '--no-python'
-    configure_args << "--with-perl" unless ARGV.include? '--no-perl'
+    args << "--with-python" unless ARGV.include? '--no-python'
+    args << "--with-perl" unless ARGV.include? '--no-perl'
 
-    configure_args << "--with-ossp-uuid"
+    args << "--with-ossp-uuid"
     ENV.append 'CFLAGS', `uuid-config --cflags`.strip
     ENV.append 'LDFLAGS', `uuid-config --ldflags`.strip
     ENV.append 'LIBS', `uuid-config --libs`.strip
 
     if bits_64? and not ARGV.include? '--no-python'
-      configure_args << "ARCHFLAGS='-arch x86_64'"
+      args << "ARCHFLAGS='-arch x86_64'"
       check_python_arch
     end
 
     # Fails on Core Duo with O4 and O3
     ENV.O2 if Hardware.intel_family == :core
 
-    system "./configure", *configure_args
+    system "./configure", *args
     system "make install"
 
     %w[ adminpack dblink fuzzystrmatch lo uuid-ossp pg_buffercache pg_trgm
diff --git a/Library/Formula/povray.rb b/Library/Formula/povray.rb
index 99da5852b..9a65a450b 100644
--- a/Library/Formula/povray.rb
+++ b/Library/Formula/povray.rb
@@ -8,7 +8,9 @@ class Povray <Formula
   def install
     fails_with_llvm "llvm-gcc: povray fails with 'terminate called after throwing an instance of int'"
 
-    system "./configure", "COMPILED_BY=homebrew", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "COMPILED_BY=homebrew",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/proctools.rb b/Library/Formula/proctools.rb
index f4c1167aa..0158b51a4 100644
--- a/Library/Formula/proctools.rb
+++ b/Library/Formula/proctools.rb
@@ -1,10 +1,10 @@
 require 'formula'
 
 class Proctools <Formula
-  @version='0.4pre1'
-  @url='http://downloads.sourceforge.net/project/proctools/proctools/0.4pre1/proctools-0.4pre1.tar.gz'
-  @homepage='http://proctools.sourceforge.net/'
-  @md5='714e4350749c680a7806635632d524b1'
+  url 'http://downloads.sourceforge.net/project/proctools/proctools/0.4pre1/proctools-0.4pre1.tar.gz'
+  homepage 'http://proctools.sourceforge.net/'
+  version '0.4pre1'
+  md5 '714e4350749c680a7806635632d524b1'
 
   def patches
     base = "http://svn.macports.org/repository/macports/trunk/dports/sysutils/proctools/files"
@@ -18,10 +18,10 @@ class Proctools <Formula
              ].map { |file_name| "#{base}/#{file_name}" }
     }
   end
-  
+
   def install
     system "/usr/bin/bsdmake"
-    
+
     ["pgrep/pgrep", "pkill/pkill", "pfind/pfind"].each do |prog|
       bin.install prog
       man1.install prog + ".1"
diff --git a/Library/Formula/proj.rb b/Library/Formula/proj.rb
index 22776b556..1e895a6b0 100644
--- a/Library/Formula/proj.rb
+++ b/Library/Formula/proj.rb
@@ -19,7 +19,7 @@ class Proj <Formula
 
     # The datum grid files are required to support datum shifting
     d = Dir.getwd
-    ProjDatumgrid.new.brew { FileUtils.cp Dir["*"], "#{d}/nad/" }
+    ProjDatumgrid.new.brew { cp Dir["*"], "#{d}/nad/" }
 
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/protobuf.rb b/Library/Formula/protobuf.rb
index ba1f42597..025c79b44 100644
--- a/Library/Formula/protobuf.rb
+++ b/Library/Formula/protobuf.rb
@@ -1,14 +1,14 @@
 require 'formula'
- 
+
 class Protobuf <Formula
   url 'http://protobuf.googlecode.com/files/protobuf-2.3.0.tar.bz2'
   sha1 'db0fbdc58be22a676335a37787178a4dfddf93c6'
   homepage 'http://code.google.com/p/protobuf/'
- 
+
   def install
     fails_with_llvm
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", 
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--with-zlib"
     system "make"
     system "make install"
diff --git a/Library/Formula/pstree.rb b/Library/Formula/pstree.rb
index d1fd8edef..df40dd2ee 100644
--- a/Library/Formula/pstree.rb
+++ b/Library/Formula/pstree.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Pstree <Formula
-  @url='ftp://ftp.thp.uni-duisburg.de/pub/source/pstree-2.32.tar.gz'
-  @homepage='http://freshmeat.net/projects/pstree/'
-  @md5='ba6e274e06d63910cf9bb8664b932808'
+  url 'ftp://ftp.thp.uni-duisburg.de/pub/source/pstree-2.32.tar.gz'
+  homepage 'http://freshmeat.net/projects/pstree/'
+  md5 'ba6e274e06d63910cf9bb8664b932808'
 
   def install
     system "make pstree"
diff --git a/Library/Formula/ptunnel.rb b/Library/Formula/ptunnel.rb
index 8fd8dbc35..e42720fd0 100644
--- a/Library/Formula/ptunnel.rb
+++ b/Library/Formula/ptunnel.rb
@@ -9,7 +9,7 @@ class Ptunnel <Formula
   def install
     system "make"
     bin.install "ptunnel"
-    (man+'man8').install "ptunnel.8"
+    man8.install "ptunnel.8"
   end
 
   def caveats
diff --git a/Library/Formula/pure.rb b/Library/Formula/pure.rb
index 7e1c0c51a..b72d018de 100644
--- a/Library/Formula/pure.rb
+++ b/Library/Formula/pure.rb
@@ -10,7 +10,9 @@ class Pure < Formula
   depends_on 'readline'
 
   def install
-    system "./configure", "--enable-release", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-release"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/pwgen.rb b/Library/Formula/pwgen.rb
index bc8c414c5..e43cb6260 100644
--- a/Library/Formula/pwgen.rb
+++ b/Library/Formula/pwgen.rb
@@ -6,7 +6,8 @@ class Pwgen <Formula
   md5 '935aebcbe610fbc9de8125e7b7d71297'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--mandir=#{man}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/pwsafe.rb b/Library/Formula/pwsafe.rb
index 02d70fcf4..c0f2c4284 100644
--- a/Library/Formula/pwsafe.rb
+++ b/Library/Formula/pwsafe.rb
@@ -1,14 +1,15 @@
 require 'formula'
 
 class Pwsafe <Formula
-  @url='http://downloads.sourceforge.net/project/pwsafe/pwsafe/0.2.0/pwsafe-0.2.0.tar.gz'
-  @homepage='http://nsd.dyndns.org/pwsafe/'
-  @md5='4bb36538a2772ecbf1a542bc7d4746c0'
+  url 'http://downloads.sourceforge.net/project/pwsafe/pwsafe/0.2.0/pwsafe-0.2.0.tar.gz'
+  homepage 'http://nsd.dyndns.org/pwsafe/'
+  md5 '4bb36538a2772ecbf1a542bc7d4746c0'
 
   depends_on 'readline'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/pyqt.rb b/Library/Formula/pyqt.rb
index 8e1f571a8..61c6b9974 100644
--- a/Library/Formula/pyqt.rb
+++ b/Library/Formula/pyqt.rb
@@ -13,7 +13,7 @@ class Pyqt <Formula
 
   def install
     ENV.prepend 'PYTHONPATH', "#{HOMEBREW_PREFIX}/lib/python", ':'
-    
+
     system "python", "./configure.py", "--confirm-license",
                                        "--bindir=#{bin}",
                                        "--destdir=#{lib}/python",
diff --git a/Library/Formula/qdbm.rb b/Library/Formula/qdbm.rb
index 72334b6e8..62618064a 100644
--- a/Library/Formula/qdbm.rb
+++ b/Library/Formula/qdbm.rb
@@ -6,14 +6,9 @@ class Qdbm <Formula
   md5 '084e07824e231969356ec7cefac97985'
 
   def install
-    configure_args = [
-		"--prefix=#{prefix}",
-		"--disable-debug",
-		"--disable-dependency-tracking",
-		"--mandir=#{man}",
-    ]
-
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                      		"--prefix=#{prefix}",
+                      		"--mandir=#{man}"
     system "make mac"
     system "make install-mac"
   end
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 11c829727..7d5062067 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -12,7 +12,7 @@ class Qt <Formula
       ['--with-qt3support', "Enable deprecated Qt3Support module."],
     ]
   end
-  
+
   def self.x11?
     File.exist? "/usr/X11R6/lib"
   end
@@ -31,7 +31,6 @@ class Qt <Formula
 
     # See: http://github.com/mxcl/homebrew/issues/issue/744
     conf_args << "-system-sqlite" if MACOS_VERSION <= 10.5
-
     conf_args << "-plugin-sql-mysql" if (HOMEBREW_CELLAR+"mysql").directory?
 
     if ARGV.include? '--with-qtdbus'
@@ -61,7 +60,7 @@ class Qt <Formula
     else
       conf_args << '-arch' << 'x86'
     end
-    
+
     system "./configure", *conf_args
     system "make install"
 
@@ -74,7 +73,7 @@ class Qt <Formula
     (bin+'qhelpconverter.app').rmtree
     # remove porting file for non-humans
     (prefix+'q3porting.xml').unlink
-    
+
     # Some config scripts will only find Qt in a "Frameworks" folder
     # VirtualBox is an example of where this is needed
     # See: http://github.com/mxcl/homebrew/issues/issue/745
diff --git a/Library/Formula/quicktree.rb b/Library/Formula/quicktree.rb
index 988207526..e2dc61144 100644
--- a/Library/Formula/quicktree.rb
+++ b/Library/Formula/quicktree.rb
@@ -8,6 +8,6 @@ class Quicktree <Formula
 
   def install
     system "make"
-    bin.install("bin/quicktree")
+    bin.install "bin/quicktree"
   end
 end
diff --git a/Library/Formula/ragel.rb b/Library/Formula/ragel.rb
index 869740c74..f6d50b838 100644
--- a/Library/Formula/ragel.rb
+++ b/Library/Formula/ragel.rb
@@ -6,9 +6,8 @@ class Ragel <Formula
   md5 '5c4366369f4934adc02bd71dc1a4ee1f'
 
   def install
-    system "./configure", 
-            "--prefix=#{prefix}", 
-            "--disable-dependency-tracking"
+    system "./configure", "--disable-dependency-tracking"
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/raptor.rb b/Library/Formula/raptor.rb
index 0b4fbcf48..5c8416215 100644
--- a/Library/Formula/raptor.rb
+++ b/Library/Formula/raptor.rb
@@ -6,7 +6,7 @@ class Raptor <Formula
   md5 '992061488af7a9e2d933df6b694bb876'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/readline.rb b/Library/Formula/readline.rb
index c8e286cb1..e884aa93d 100644
--- a/Library/Formula/readline.rb
+++ b/Library/Formula/readline.rb
@@ -5,12 +5,11 @@ class Readline <Formula
   md5 'b7f65a48add447693be6e86f04a63019'
   homepage 'http://tiswww.case.edu/php/chet/readline/rltop.html'
 
-  def keg_only? ; <<-EOS
+  keg_only <<-EOS
 OS X provides the BSD Readline library. In order to prevent conflicts when
 programs look for libreadline we are defaulting this GNU Readline installation
 to keg-only.
-    EOS
-  end
+EOS
 
   def patches
     patches = (1..5).collect { |n| "ftp://ftp.gnu.org/gnu/readline/readline-6.0-patches/readline60-%03d"%n }
diff --git a/Library/Formula/rename.rb b/Library/Formula/rename.rb
index 98d2fa82f..e3ebbfe6c 100644
--- a/Library/Formula/rename.rb
+++ b/Library/Formula/rename.rb
@@ -1,15 +1,11 @@
 require 'formula'
 
 class Rename <Formula
-  url 'http://plasmasturm.org/code/rename/rename'
+  url 'http://plasmasturm.org/code/rename/rename', :using => :nounzip
   version '0.1.3'
   homepage 'http://plasmasturm.org/code/rename'
   md5 'ce931227630a44d5d4ca4234a1fb8e63'
 
-  def download_strategy
-    NoUnzipCurlDownloadStrategy
-  end
-
   def install
     system 'pod2man', 'rename', 'rename.1'
     bin.install 'rename'
diff --git a/Library/Formula/repl.rb b/Library/Formula/repl.rb
index 62c713045..3e57a62b2 100644
--- a/Library/Formula/repl.rb
+++ b/Library/Formula/repl.rb
@@ -4,7 +4,7 @@ class Repl < Formula
   url 'http://github.com/defunkt/repl/tarball/v0.2.1'
   homepage 'http://github.com/defunkt/repl'
   md5 '5b9d43038f1b561bd3215a01ee3cb766'
-  
+
   depends_on 'rlwrap' => :optional
 
   def install
diff --git a/Library/Formula/riak.rb b/Library/Formula/riak.rb
index 00c6962d9..2e510b36d 100644
--- a/Library/Formula/riak.rb
+++ b/Library/Formula/riak.rb
@@ -1,18 +1,18 @@
 require 'formula'
 
 class Riak <Formula
-  depends_on 'erlang'
-  
   url 'http://downloads.basho.com/riak/riak-0.12/riak-0.12.0.tar.gz'
   homepage 'http://riak.basho.com'
   md5 'b5bbc7aaf115bc6ba518137b733ad8a2'
-  
+
   skip_clean 'libexec/log'
   skip_clean 'libexec/log/sasl'
   skip_clean 'libexec/data'
   skip_clean 'libexec/data/dets'
   skip_clean 'libexec/data/ring'
-  
+
+  depends_on 'erlang'
+
   def install
     ENV.deparallelize
     system "make all rel"
diff --git a/Library/Formula/rinetd.rb b/Library/Formula/rinetd.rb
index d07f0f4ca..5af2c7b42 100644
--- a/Library/Formula/rinetd.rb
+++ b/Library/Formula/rinetd.rb
@@ -7,14 +7,14 @@ class Rinetd <Formula
   version '0.62'
 
   def install
-    inreplace 'rinetd.c' do |contents|
-      contents.gsub! "/etc/rinetd.conf", "#{etc}/rinetd.conf"
-      contents.gsub! "/var/run/rinetd.pid", "#{var}/rinetd.pid"
+    inreplace 'rinetd.c' do |s|
+      s.gsub! "/etc/rinetd.conf", "#{etc}/rinetd.conf"
+      s.gsub! "/var/run/rinetd.pid", "#{var}/rinetd.pid"
     end
 
     system "make"
     bin.install "rinetd"
-    (man+'man8').install "rinetd.8"
+    man8.install "rinetd.8"
     conf = etc+"rinetd.conf"
     conf.write(DATA.read) unless conf.exist?
   end
diff --git a/Library/Formula/rlog.rb b/Library/Formula/rlog.rb
index a07afe0a3..618cd03cb 100644
--- a/Library/Formula/rlog.rb
+++ b/Library/Formula/rlog.rb
@@ -15,7 +15,7 @@ class Rlog <Formula
   end
 end
 
-# This patch solves an OSX build issue, should not be necessary for the next release according to 
+# This patch solves an OSX build issue, should not be necessary for the next release according to
 # http://code.google.com/p/rlog/issues/detail?id=7
 __END__
 --- orig/rlog/common.h.in	2008-06-14 20:10:13.000000000 -0700
diff --git a/Library/Formula/rogue.rb b/Library/Formula/rogue.rb
index cf97e4212..50a6325bf 100644
--- a/Library/Formula/rogue.rb
+++ b/Library/Formula/rogue.rb
@@ -6,19 +6,14 @@ class Rogue <Formula
   version '5.4.4'
   sha1 'aef9e589c4f31eb6d3eeb9d543ab8787b00fb022'
 
-  def skip_clean? path
-    path == libexec
-  end
-  
   def install
     ENV.ncurses_define if MACOS_VERSION == 10.6
 
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+
+    inreplace "config.h", "rogue.scr", "#{var}/rogue/rogue.scr"
 
-    inreplace "config.h", "rogue.scr", "#{libexec}/rogue.scr"
-    
     inreplace "Makefile" do |s|
       # Take out weird man install script and DIY below
       s.gsub! "-if test -d $(man6dir) ; then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(man6dir)/$(PROGRAM).6 ; fi", ""
@@ -26,7 +21,7 @@ class Rogue <Formula
     end
 
     system "make install"
-    (man+'man6').install gzip("rogue.6")
+    man6.install gzip("rogue.6")
     libexec.mkdir
   end
 end
diff --git a/Library/Formula/rtmpdump.rb b/Library/Formula/rtmpdump.rb
index 9bc946a22..eeb9a8aea 100644
--- a/Library/Formula/rtmpdump.rb
+++ b/Library/Formula/rtmpdump.rb
@@ -2,7 +2,6 @@ require 'formula'
 
 class Rtmpdump <Formula
   url 'http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.3.tgz'
-  version '2.3'
   homepage 'http://rtmpdump.mplayerhq.hu'
   md5 'eb961f31cd55f0acf5aad1a7b900ef59'
 
@@ -12,7 +11,7 @@ class Rtmpdump <Formula
 
   def install
     ENV.j1
-    system "make prefix=#{prefix} MANDIR=#{man} SYS=posix install"
+    system "make", "prefix=#{prefix}", "MANDIR=#{man}", "SYS=posix install"
   end
 end
 __END__
diff --git a/Library/Formula/rubinius.rb b/Library/Formula/rubinius.rb
index 567a979f1..457a4d76a 100755
--- a/Library/Formula/rubinius.rb
+++ b/Library/Formula/rubinius.rb
@@ -8,7 +8,7 @@ class Rubinius < Formula
   head 'git://github.com/evanphx/rubinius.git'
 
   # Do not strip binaries, or else it fails to run.
-  def skip_clean?(path); true end
+  skip_clean :all
 
   def install
     # Let Rubinius define its own flags; messing with these causes build breaks.
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index d7ea7dba9..8654582cb 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -17,6 +17,9 @@ class Ruby <Formula
     ]
   end
 
+  # Stripping breaks dynamic linking
+  skip_clean :all
+
   def install
     fails_with_llvm
 
@@ -46,11 +49,4 @@ class Ruby <Formula
     upgrading Ruby will lose all your gems.
     EOS
   end
-
-  def skip_clean? path
-    # TODO only skip the clean for the files that need it, we didn't get a
-    # comment about why we're skipping the clean, so you'll need to figure
-    # that out first --mxcl
-    true
-  end
 end
diff --git a/Library/Formula/runit.rb b/Library/Formula/runit.rb
index 2dbf04254..8d14e2d01 100644
--- a/Library/Formula/runit.rb
+++ b/Library/Formula/runit.rb
@@ -27,8 +27,6 @@ class Runit <Formula
     (var + "service").mkpath
   end
 
-  def man8; man+'man8' end
-
   def caveats
     <<-END_CAVEATS
 This formula does not install runit as a replacement for init.
diff --git a/Library/Formula/rxvt-unicode.rb b/Library/Formula/rxvt-unicode.rb
index 106e7adfb..48182c766 100755
--- a/Library/Formula/rxvt-unicode.rb
+++ b/Library/Formula/rxvt-unicode.rb
@@ -11,18 +11,15 @@ class RxvtUnicode < Formula
   end
 
   def install
-    system "./configure",
-           "--prefix=#{prefix}",
-           "--disable-afterimage",
-           "--enable-perl",
-           "--enable-256-color",
-           "--with-term=rxvt-256color",
-           "--disable-dependency-tracking"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-afterimage",
+                          "--enable-perl",
+                          "--enable-256-color",
+                          "--with-term=rxvt-256color"
     system "make"
-
     # `make` won't work unless we rename this
     system "mv INSTALL README.install"
-
     system "make install"
   end
 
diff --git a/Library/Formula/rzip.rb b/Library/Formula/rzip.rb
index ed9603470..04239918b 100644
--- a/Library/Formula/rzip.rb
+++ b/Library/Formula/rzip.rb
@@ -6,8 +6,8 @@ class Rzip <Formula
   md5 '0a3ba55085661647c12f2b014c51c406'
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", 
-           "--prefix=#{prefix}", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
 
     # --mandir doesn't seem to do anything, so we need to modify the
     # Makefile ourselves
diff --git a/Library/Formula/s-lang.rb b/Library/Formula/s-lang.rb
index a3a90fa77..f77805034 100755
--- a/Library/Formula/s-lang.rb
+++ b/Library/Formula/s-lang.rb
@@ -1,17 +1,18 @@
 require 'formula'
 
 class SLang <Formula
-  @url='ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.2.tar.bz2'
-  @homepage='http://www.s-lang.org/'
-  @md5='974437602a781cfe92ab61433dd16d03'
+  url 'ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.2.tar.bz2'
+  homepage 'http://www.s-lang.org/'
+  md5 '974437602a781cfe92ab61433dd16d03'
 
   depends_on 'pcre' => :optional
   depends_on 'oniguruma' => :optional
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--with-png=/usr/X11R6"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-png=/usr/X11R6"
     system "make"
-    
     ENV.deparallelize
     system "make install"
   end
diff --git a/Library/Formula/s3sync.rb b/Library/Formula/s3sync.rb
index 534f464bd..eacdf8890 100644
--- a/Library/Formula/s3sync.rb
+++ b/Library/Formula/s3sync.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 class S3sync <Formula
-  head 'http://s3sync-s3cmd.googlecode.com/svn/trunk/', :revision => '4'
+  url 'http://s3sync-s3cmd.googlecode.com/svn/trunk/', :revision => '4'
   version '1.2.6'
   homepage 'http://s3sync.net'
 
diff --git a/Library/Formula/saga-cpp.rb b/Library/Formula/saga-cpp.rb
index 7845b62b8..5f2a2480b 100755
--- a/Library/Formula/saga-cpp.rb
+++ b/Library/Formula/saga-cpp.rb
@@ -20,7 +20,6 @@ class SagaCpp <Formula
 
     system "./configure", "--prefix=#{prefix}",
                           "--with-boost=#{HOMEBREW_PREFIX}",
-                          # "--with-postgresql=#{HOMEBREW_PREFIX}",
                           "--with-sqlite3=#{HOMEBREW_PREFIX}"
     system "make install"
   end
diff --git a/Library/Formula/sbcl.rb b/Library/Formula/sbcl.rb
index 21aeb0713..9f475a3dc 100644
--- a/Library/Formula/sbcl.rb
+++ b/Library/Formula/sbcl.rb
@@ -7,7 +7,6 @@ class Sbcl <Formula
     md5 '47c99c60ec44e57070807c0890ba1c90'
   else
     url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.29/sbcl-1.0.29-x86-darwin-binary-r2.tar.bz2'
-  url 'http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.29/sbcl-1.0.29-x86-darwin-binary-r2.tar.bz2'
     md5 '6e6b027a5fd05ef0c8faee30d89ffe54'
   end
   version '1.0.29'
diff --git a/Library/Formula/sbt.rb b/Library/Formula/sbt.rb
index 04e3173b8..2024971db 100644
--- a/Library/Formula/sbt.rb
+++ b/Library/Formula/sbt.rb
@@ -9,10 +9,9 @@ class Sbt <Formula
   def install
     (bin+'sbt').write <<-EOS
 #!/bin/sh
-
-java -Xmx512M -jar #{prefix}/#{JAR} "$@"
+java -Xmx512M -jar #{libexec}/#{JAR} "$@"
 EOS
 
-    prefix.install Dir['*']
+    libexec.install Dir['*']
   end
 end
diff --git a/Library/Formula/scala.rb b/Library/Formula/scala.rb
index d877ef4ca..d59b7ac93 100644
--- a/Library/Formula/scala.rb
+++ b/Library/Formula/scala.rb
@@ -7,8 +7,8 @@ class Scala <Formula
   md5 'f250015d178f05b08bd53baba55c5d46'
 
   def install
+    rm_f Dir["bin/*.bat"]
     man1.install Dir['man/man1/*']
-    FileUtils.rm_f Dir["bin/*.bat"]
     prefix.install Dir['*']
   end
 end
diff --git a/Library/Formula/scalate.rb b/Library/Formula/scalate.rb
index 3053526dd..58639df6c 100644
--- a/Library/Formula/scalate.rb
+++ b/Library/Formula/scalate.rb
@@ -8,7 +8,7 @@ class Scalate <Formula
 
   def startup_script
     <<-EOS.undent
-    #!/usr/bin/env bash
+    #!/bin/bash
     # This startup script for Scalate calls the real startup script installed
     # to Homebrew's cellar. This avoids issues with local vs. absolute symlinks.
 
diff --git a/Library/Formula/scheme48.rb b/Library/Formula/scheme48.rb
index eb7ca1aea..3ab17fe72 100644
--- a/Library/Formula/scheme48.rb
+++ b/Library/Formula/scheme48.rb
@@ -10,7 +10,9 @@ class Scheme48 <Formula
 
   def install
     ENV.deparallelize
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--enable-gc=bibop"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-gc=bibop"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/scons.rb b/Library/Formula/scons.rb
index b976f5bb7..12a5ad148 100644
--- a/Library/Formula/scons.rb
+++ b/Library/Formula/scons.rb
@@ -7,13 +7,10 @@ class Scons <Formula
   version '2.0.0'
 
   def install
-    man1.install gzip('scons-time.1')
-    man1.install gzip('scons.1')
-    man1.install gzip('sconsign.1')
-
+    man1.install [gzip('scons-time.1'), gzip('scons.1'), gzip('sconsign.1')]
     system "python", "setup.py", "install",
-                    "--prefix=#{prefix}",
-                    "--standalone-lib",
-                    "--no-version-script", "--no-install-man"
+                     "--prefix=#{prefix}",
+                     "--standalone-lib",
+                     "--no-version-script", "--no-install-man"
   end
 end
diff --git a/Library/Formula/scsh.rb b/Library/Formula/scsh.rb
index 97fa8d425..2c8dafb72 100644
--- a/Library/Formula/scsh.rb
+++ b/Library/Formula/scsh.rb
@@ -8,14 +8,10 @@ class Scsh <Formula
   def install
     # 4.2 segfaults in building phase
     ENV.gcc_4_0
-    configure_args = [
-      "--prefix=#{prefix}",
-      "--infodir=#{info}",
-      "--mandir=#{man}",
-      "--disable-debug",
-      "--disable-dependency-tracking"
-    ]
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--infodir=#{info}",
+                          "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/scummvm.rb b/Library/Formula/scummvm.rb
index 751db2c60..10d48ba3f 100644
--- a/Library/Formula/scummvm.rb
+++ b/Library/Formula/scummvm.rb
@@ -19,7 +19,7 @@ prefer to use theirs. If so type `brew home scummvm' to visit their site.
   depends_on 'libogg' => :recommended
 
   def install
-    system "./configure --prefix='#{prefix}' --disable-debug"
+    system "./configure", "--prefix=#{prefix}", "--disable-debug"
     system "make install"
     (share+'pixmaps').rmtree
   end
diff --git a/Library/Formula/sdl_mixer.rb b/Library/Formula/sdl_mixer.rb
index b6ff34488..0a1d31634 100644
--- a/Library/Formula/sdl_mixer.rb
+++ b/Library/Formula/sdl_mixer.rb
@@ -9,9 +9,8 @@ class SdlMixer <Formula
   depends_on 'sdl'
   depends_on 'flac' => :optional
   depends_on 'libmikmod' => :optional
-  #depends_on 'smpeg' => :optional  # http://icculus.org/smpeg/
   depends_on 'libvorbis' => :optional
- 
+
   def install
     Sdl.use_homebrew_prefix 'SDL_mixer.pc.in'
 
diff --git a/Library/Formula/sdl_net.rb b/Library/Formula/sdl_net.rb
index ab06e0d65..e6ea9771e 100644
--- a/Library/Formula/sdl_net.rb
+++ b/Library/Formula/sdl_net.rb
@@ -8,9 +8,8 @@ class SdlNet <Formula
   depends_on 'sdl'
 
   def install
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--disable-sdltest"
     system "make install"
   end
diff --git a/Library/Formula/sdl_sound.rb b/Library/Formula/sdl_sound.rb
index 833618e44..09c61ea45 100644
--- a/Library/Formula/sdl_sound.rb
+++ b/Library/Formula/sdl_sound.rb
@@ -4,7 +4,7 @@ class SdlSound <Formula
   url 'http://icculus.org/SDL_sound/downloads/SDL_sound-1.0.3.tar.gz'
   homepage 'http://icculus.org/SDL_sound/'
   md5 'aa09cd52df85d29bee87a664424c94b5'
-  
+
   depends_on 'pkg-config'
   depends_on 'sdl'
   depends_on 'flac' => :optional
diff --git a/Library/Formula/sdl_ttf.rb b/Library/Formula/sdl_ttf.rb
index 771c38c64..3127d9bac 100644
--- a/Library/Formula/sdl_ttf.rb
+++ b/Library/Formula/sdl_ttf.rb
@@ -10,9 +10,8 @@ class SdlTtf <Formula
   def install
     ENV.x11 # For Freetype
 
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--disable-sdltest",
                           "--with-freetype-exec-prefix=/usr/X11"
     system "make install"
diff --git a/Library/Formula/sgrep.rb b/Library/Formula/sgrep.rb
index b2b4aeae8..8a7fbfc82 100644
--- a/Library/Formula/sgrep.rb
+++ b/Library/Formula/sgrep.rb
@@ -6,10 +6,9 @@ class Sgrep <Formula
   md5 '99eb1ed515648f653fc7be45e0896378'
 
   def install
-    system "./configure",
-      "--prefix=#{prefix}",
-      "--mandir=#{man}",
-      "--datadir=#{share}/sgrep"
+    system "./configure", "--prefix=#{prefix}",
+                          "--mandir=#{man}",
+                          "--datadir=#{share}/sgrep"
     system "make install"
   end
 end
diff --git a/Library/Formula/shapefile.rb b/Library/Formula/shapefile.rb
index 5d53507a8..d9278de88 100644
--- a/Library/Formula/shapefile.rb
+++ b/Library/Formula/shapefile.rb
@@ -25,8 +25,8 @@ class Shapefile <Formula
     include.install 'shapefil.h'
 
     Dir.chdir lib do
-      FileUtils.ln_s "libshp.#{version}.dylib", "libshp.#{version.split('.').first}.dylib"
-      FileUtils.ln_s "libshp.#{version}.dylib", "libshp.dylib"
+      ln_s "libshp.#{version}.dylib", "libshp.#{version.split('.').first}.dylib"
+      ln_s "libshp.#{version}.dylib", "libshp.dylib"
     end
   end
 end
diff --git a/Library/Formula/shared-mime-info.rb b/Library/Formula/shared-mime-info.rb
index b038a90f9..8b90206a5 100644
--- a/Library/Formula/shared-mime-info.rb
+++ b/Library/Formula/shared-mime-info.rb
@@ -4,15 +4,17 @@ class SharedMimeInfo <Formula
   url 'http://freedesktop.org/~hadess/shared-mime-info-0.70.tar.bz2'
   homepage 'http://www.freedesktop.org/wiki/Software/shared-mime-info'
   md5 '9032d98f14b8e13e0fea4bf45ca23401'
- 
-  depends_on 'intltool'
-  depends_on 'gettext'
+
   depends_on 'pkg-config'
+  depends_on 'gettext'
+  depends_on 'intltool'
   depends_on 'glib'
 
   def install
     # Disable the post-install update-mimedb due to crash
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-update-mimedb"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-update-mimedb"
     system "make install"
   end
 end
diff --git a/Library/Formula/shorten.rb b/Library/Formula/shorten.rb
index 676ecf2df..ca59025ef 100644
--- a/Library/Formula/shorten.rb
+++ b/Library/Formula/shorten.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Shorten <Formula
-  @url='http://www.etree.org/shnutils/shorten/dist/src/shorten-3.6.1.tar.gz'
-  @homepage='http://www.etree.org/shnutils/shorten/'
-  @md5='fb59c16fcedc4f4865d277f6e45866a7'
+  url 'http://www.etree.org/shnutils/shorten/dist/src/shorten-3.6.1.tar.gz'
+  homepage 'http://www.etree.org/shnutils/shorten/'
+  md5 'fb59c16fcedc4f4865d277f6e45866a7'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/siege.rb b/Library/Formula/siege.rb
index 5ac5978ba..6a273549b 100644
--- a/Library/Formula/siege.rb
+++ b/Library/Formula/siege.rb
@@ -7,7 +7,7 @@ class Siege <Formula
 
   def etc
     # NOTE this is because line 101 in init.c in the source code of Siege
-    # ignores the --sysconfdir setting, and instead looks here. 
+    # ignores the --sysconfdir setting, and instead looks here.
     # So coupled with the fact the etc directory location is a little up in the
     # air currently. This seems like the best solution for now.
     prefix+'etc'
@@ -20,10 +20,10 @@ class Siege <Formula
   end
 
   def caveats; <<-EOS
-You should know that macOSX has only 16K port available that won't be
-released until socket TIME_WAIT is passed. Default timeout for TIME_WAIT is
-15s consider reducing in case of available port bottleneck. You can check
-whether there is a problem with netstat.
+Mac OS X has only 16K ports available that won't be released until socket
+TIME_WAIT is passed. The default timeout for TIME_WAIT is 15 seconds. Consider
+reducing in case of available port bottleneck. You can check whether tis is a
+problem with netstat.
 
     $ sysctl net.inet.tcp.msl
     net.inet.tcp.msl: 15000
diff --git a/Library/Formula/silk.rb b/Library/Formula/silk.rb
index cdf820888..73fa0f253 100644
--- a/Library/Formula/silk.rb
+++ b/Library/Formula/silk.rb
@@ -10,12 +10,11 @@ class Silk <Formula
   depends_on 'yaf'
 
   def install
-    system "./configure",
-        "--disable-dependency-tracking",
-        "--prefix=#{prefix}",
-        "--mandir=#{man}",
-        "--enable-ipv6",
-        "--enable-data-rootdir=#{var}/silk"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}",
+                          "--enable-ipv6",
+                          "--enable-data-rootdir=#{var}/silk"
     system "make"
     system "make install"
 
diff --git a/Library/Formula/simh.rb b/Library/Formula/simh.rb
index edca53d0e..d9da3c956 100644
--- a/Library/Formula/simh.rb
+++ b/Library/Formula/simh.rb
@@ -5,13 +5,12 @@ class Simh <Formula
   version '3.8-1'
   homepage 'http://simh.trailing-edge.com/'
   md5 'e15f65a82e21ea49e14b438326d93d5c'
-  
+
   def install
     ENV['OSTYPE'] = 'darwin'
     mkdir 'BIN'
     inreplace "makefile" do |s|
       # Note: change_make_var! doesn't work for this makefile
-
       s.gsub! "NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a",
               "NETWORK_OPT = -DUSE_NETWORK -lpcap"
 
diff --git a/Library/Formula/sipsak.rb b/Library/Formula/sipsak.rb
index ec57515e0..a49998cc9 100644
--- a/Library/Formula/sipsak.rb
+++ b/Library/Formula/sipsak.rb
@@ -7,7 +7,8 @@ class Sipsak <Formula
   version '0.9.6'
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     system "make install"
   end
 end
diff --git a/Library/Formula/ski.rb b/Library/Formula/ski.rb
index efd5fa981..696ea6c93 100644
--- a/Library/Formula/ski.rb
+++ b/Library/Formula/ski.rb
@@ -7,6 +7,6 @@ class Ski <Formula
 
   def install
     bin.install "ski"
-    (man+"man6").install "ski.6"
+    man6.install "ski.6"
   end
 end
diff --git a/Library/Formula/skipfish.rb b/Library/Formula/skipfish.rb
index 493cc2a30..7ac55a3e0 100644
--- a/Library/Formula/skipfish.rb
+++ b/Library/Formula/skipfish.rb
@@ -14,13 +14,11 @@ class Skipfish <Formula
       "#define ASSETS_DIR	       \"#{libexec}/assets\""
     system "make"
     bin.install "skipfish"
-    (libexec+"dictionaries").install Dir["dictionaries/*"]
-    (libexec+"assets").install Dir["assets/*"]
+    libexec.install ["dictionaries", "assets"]
   end
 
   def caveats; <<-EOS.undent
-
-    NOTE: Skipfish uses dictionary-based probes and will not run until 
+    NOTE: Skipfish uses dictionary-based probes and will not run until
     you have specified a dictionary for it to use.
 
     Please read #{libexec}/dictionaries/README-FIRST
@@ -28,7 +26,6 @@ class Skipfish <Formula
     on the quality of results later on.
 
     "skipfish -h" prints out usage information.
-
     EOS
   end
 end
diff --git a/Library/Formula/sloccount.rb b/Library/Formula/sloccount.rb
index 9e48638a9..f92e5a1e6 100644
--- a/Library/Formula/sloccount.rb
+++ b/Library/Formula/sloccount.rb
@@ -5,12 +5,12 @@ class Sloccount <Formula
   url 'http://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz'
   md5 '09abd6e2a016ebaf7552068a1dba1249'
 
+  depends_on 'md5sha1sum'
+
   def patches
-      DATA
+    DATA
   end
 
-  depends_on 'md5sha1sum'
-
   def install
     rm "makefile.orig" # Delete makefile.orig or patch falls over
     bin.mkpath # Create the install dir or install falls over
diff --git a/Library/Formula/slrn.rb b/Library/Formula/slrn.rb
index 05385622a..888cfbf18 100644
--- a/Library/Formula/slrn.rb
+++ b/Library/Formula/slrn.rb
@@ -9,17 +9,13 @@ class Slrn <Formula
   depends_on 's-lang'
 
   def install
-    configure_args = [
-        "--prefix=#{prefix}",
-        "--disable-debug",
-        "--disable-dependency-tracking",
-        "--with-ssl",
-        "--with-slang=#{HOMEBREW_PREFIX}",
-    ]
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--with-ssl",
+                          "--with-slang=#{HOMEBREW_PREFIX}"
     system "make all slrnpull"
-    bin.mkpath()
-    man1.mkpath()
+    bin.mkpath
+    man1.mkpath
     ENV.j1 # yep, install is broken
     system "make install"
   end
diff --git a/Library/Formula/smpeg.rb b/Library/Formula/smpeg.rb
index 801dd0bf7..159ac93bf 100644
--- a/Library/Formula/smpeg.rb
+++ b/Library/Formula/smpeg.rb
@@ -3,7 +3,7 @@ require 'formula'
 class Smpeg <Formula
   head 'svn://svn.icculus.org/smpeg/trunk'
   homepage 'http://icculus.org/smpeg/'
-  
+
   depends_on 'sdl'
 
   def install
diff --git a/Library/Formula/solr.rb b/Library/Formula/solr.rb
index c5ebd9db5..c74c883fd 100644
--- a/Library/Formula/solr.rb
+++ b/Library/Formula/solr.rb
@@ -1,33 +1,31 @@
 require 'formula'
 
-SOLR_START_SCRIPT = <<-end_script
-#!/bin/sh
-if [ -z "$1" ]; then
-  echo "Usage: $ solr path/to/config/dir"
-else 
-  cd %s/example && java -Dsolr.solr.home=$1 -jar start.jar
-fi
-end_script
-
 class Solr <Formula
   url 'http://apache.deathculture.net/lucene/solr/1.4.1/apache-solr-1.4.1.tgz'
   homepage 'http://lucene.apache.org/solr/'
   md5 '258a020ed8c3f44e13b09e8ae46a1c84'
 
+  def script; <<-EOS.undent
+    #!/bin/sh
+    if [ -z "$1" ]; then
+      echo "Usage: $ solr path/to/config/dir"
+    else
+      cd #{prefix}/example && java -Dsolr.solr.home=$1 -jar start.jar
+    fi
+    EOS
+  end
+
   def install
-    prefix.mkpath
     prefix.install Dir['*']
-    (bin+'solr').write(SOLR_START_SCRIPT % prefix)
+    (bin+'solr').write script
   end
 
-  def caveats
-    <<-END_CAVEATS
-To start solr: 
-    $ solr path/to/solr/config/dir
-
-See the solr homepage for more setup information:
-    $ brew home solr
+  def caveats; <<-EOS.undent
+    To start solr:
+      $ solr path/to/solr/config/dir
 
-    END_CAVEATS
+    See the solr homepage for more setup information:
+      $ brew home solr
+    EOS
   end
 end
diff --git a/Library/Formula/soprano.rb b/Library/Formula/soprano.rb
index 2e87b74ad..981922528 100644
--- a/Library/Formula/soprano.rb
+++ b/Library/Formula/soprano.rb
@@ -13,7 +13,7 @@ class Soprano <Formula
 
   def install
     ENV['CLUCENE_HOME'] = HOMEBREW_PREFIX
-    
+
     system "cmake . #{std_cmake_parameters}"
     system "make install"
   end
diff --git a/Library/Formula/sox.rb b/Library/Formula/sox.rb
index b28ca9f0d..ab2ef21af 100644
--- a/Library/Formula/sox.rb
+++ b/Library/Formula/sox.rb
@@ -8,15 +8,11 @@ class Sox <Formula
   depends_on 'libvorbis' => :optional
 
   def install
-    configure_args = [
-      "--prefix=#{prefix}",
-      "--disable-debug",
-      "--disable-dependency-tracking",
-    ]
     # Linking error 'symbol not found' on 10.6 64-bit '"_gomp_thread_attr", referenced from:'
-    configure_args << "--disable-gomp"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-gomp"
 
-    system "./configure", *configure_args
     system "make install"
   end
 end
diff --git a/Library/Formula/spatialite-tools.rb b/Library/Formula/spatialite-tools.rb
index 9b4c866ee..a39c34ae0 100644
--- a/Library/Formula/spatialite-tools.rb
+++ b/Library/Formula/spatialite-tools.rb
@@ -8,10 +8,9 @@ class SpatialiteTools <Formula
   depends_on 'libspatialite'
 
   def install
-    system "./configure", "--prefix=#{prefix}", 
-                          "--disable-debug",
-                          "--target=macosx",
-                          "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--target=macosx"
     system "make install"
   end
 end
diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb
index 5b172b617..d56880ffe 100644
--- a/Library/Formula/spidermonkey.rb
+++ b/Library/Formula/spidermonkey.rb
@@ -46,7 +46,7 @@ class Spidermonkey <Formula
       inreplace "config/rules.mk", "-install_name @executable_path/$(SHARED_LIBRARY) ", ""
     end
 
-    FileUtils.mkdir "brew-build"
+    mkdir "brew-build"
 
     Dir.chdir "brew-build" do
       system "../js/src/configure", "--prefix=#{prefix}",
diff --git a/Library/Formula/spim.rb b/Library/Formula/spim.rb
index dc4ab6d48..7bbe9d01d 100644
--- a/Library/Formula/spim.rb
+++ b/Library/Formula/spim.rb
@@ -6,7 +6,6 @@ class Spim <Formula
   md5 '146558e8256f2b7577fb825fdc76a04f'
   version '8.0'
 
-
   def install
     Dir.chdir 'spim'
 
@@ -20,7 +19,7 @@ class Spim <Formula
     system "make install"
     system "make install-man"
     system "make test"
-    
+
     mv "#{man1}/spim.man", "#{man1}/spim.1"
   end
 end
diff --git a/Library/Formula/spin.rb b/Library/Formula/spin.rb
index c61c9e5aa..6a101014b 100644
--- a/Library/Formula/spin.rb
+++ b/Library/Formula/spin.rb
@@ -15,7 +15,7 @@ class Spin <Formula
     ENV.deparallelize
 
     # Compile and install the binary.
-    FileUtils.cd("Src#{version}") do
+    cd("Src#{version}") do
       system "make"
       bin.install "spin"
     end
diff --git a/Library/Formula/spring-roo.rb b/Library/Formula/spring-roo.rb
index 02a2647a8..e7c4245f4 100644
--- a/Library/Formula/spring-roo.rb
+++ b/Library/Formula/spring-roo.rb
@@ -9,7 +9,7 @@ class SpringRoo <Formula
   def install
     inreplace 'bin/roo.sh', '$ROO_HOME/lib', '$ROO_HOME/java/lib'
 
-    FileUtils.rm_f Dir["bin/*.bat"]
+    rm_f Dir["bin/*.bat"]
     prefix.install %w[bin dist docs legal]
     (prefix+'java').install 'lib'
   end
diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index a0b13b5d2..c3e4a502e 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -6,9 +6,7 @@ class Sqlite <Formula
   homepage 'http://www.sqlite.org/'
 
   def options
-    [
-      ["--with-rtree", "Enables the R*Tree index module"]
-    ]
+    [["--with-rtree", "Enables the R*Tree index module"]]
   end
 
   def install
diff --git a/Library/Formula/stp.rb b/Library/Formula/stp.rb
index fe4eef5d3..7f301260d 100644
--- a/Library/Formula/stp.rb
+++ b/Library/Formula/stp.rb
@@ -5,15 +5,13 @@ class Stp < Formula
   homepage 'http://sites.google.com/site/stpfastprover/'
 
   def options
-    [
-      ["--32-bit", "Force 32-bit."]
-    ]
+    [["--32-bit", "Force 32-bit."]]
   end
 
   def install
     unless ARGV.include? "--32-bit"
       inreplace "./scripts/Makefile.common" do |s|
-        s.change_make_var! "CFLAGS_M32", ""
+        s.remove_make_var! "CFLAGS_M32"
       end
     end
 
diff --git a/Library/Formula/surfraw.rb b/Library/Formula/surfraw.rb
index 5c0e32e94..e254d5611 100644
--- a/Library/Formula/surfraw.rb
+++ b/Library/Formula/surfraw.rb
@@ -7,8 +7,8 @@ class Surfraw <Formula
 
   def install
     system "./configure", "--prefix=#{prefix}",
-      "--sysconfdir=#{etc}",
-      "--with-graphical-browser=open"
+                          "--sysconfdir=#{etc}",
+                          "--with-graphical-browser=open"
     system "make"
     ENV.j1 # Install using 1 job, or fails on Mac Pro
     system "make install"
diff --git a/Library/Formula/swftools.rb b/Library/Formula/swftools.rb
index d16e9ed68..49e28e6cd 100644
--- a/Library/Formula/swftools.rb
+++ b/Library/Formula/swftools.rb
@@ -9,22 +9,18 @@ class Swftools <Formula
   depends_on 'lame' => :optional
 
   def install
+    ENV.x11 # Add to PATH for freetype-config on Snow Leopard
     ENV.minimal_optimization
 
-    # Add to PATH for freetype-config on Snow Leopard
-    ENV.prepend 'PATH', '/usr/X11/bin', ':'
-    ENV.x11
-
     system "./configure", "--prefix=#{prefix}"
     system "make"
     system "make install"
   end
 
-  def caveats
-    <<-EOS.undent
-      swfc segfaults under Snow Leopard. Please persue this issue
-      with the softare vendor:
-        http://lists.nongnu.org/mailman/listinfo/swftools-common
+  def caveats; <<-EOS.undent
+    `swfc` segfaults under Snow Leopard.
+    Please persue this issue with the softare vendor:
+      http://lists.nongnu.org/mailman/listinfo/swftools-common
     EOS
   end
 end
diff --git a/Library/Formula/tarsnap.rb b/Library/Formula/tarsnap.rb
index 3eb38ce94..2675bdba0 100644
--- a/Library/Formula/tarsnap.rb
+++ b/Library/Formula/tarsnap.rb
@@ -8,7 +8,9 @@ class Tarsnap <Formula
   depends_on 'lzma' => :optional
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--enable-sse2"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-sse2"
     system "make install"
   end
 end
diff --git a/Library/Formula/task.rb b/Library/Formula/task.rb
index 21875d36f..bf90b4bce 100644
--- a/Library/Formula/task.rb
+++ b/Library/Formula/task.rb
@@ -5,13 +5,10 @@ class Task <Formula
   homepage 'http://www.taskwarrior.org/'
   md5 'be98cc74fe03b8336250e0b7ed3cd8c7'
 
-  def skip_clean? path
-    true
-  end
+  skip_clean :all
 
   def install
-    system "./configure", "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make install"
 
diff --git a/Library/Formula/term.rb b/Library/Formula/term.rb
index 8274ecc34..3e4d5b2a2 100644
--- a/Library/Formula/term.rb
+++ b/Library/Formula/term.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Term <ScriptFileFormula
-  @url='http://github.com/liyanage/macosx-shell-scripts/raw/e29f7eaa1eb13d78056dec85dc517626ab1d93e3/term'
-  @md5='1bbf4509a50224b27ac8c20d3fe8682e'
-  @version='2.1'
-  @homepage='http://gist.github.com/116587'
+  url 'http://github.com/liyanage/macosx-shell-scripts/raw/e29f7eaa1eb13d78056dec85dc517626ab1d93e3/term'
+  md5 '1bbf4509a50224b27ac8c20d3fe8682e'
+  version '2.1'
+  homepage 'http://gist.github.com/116587'
 end
\ No newline at end of file
diff --git a/Library/Formula/tesseract.rb b/Library/Formula/tesseract.rb
index b86a9e5cf..65fd27268 100644
--- a/Library/Formula/tesseract.rb
+++ b/Library/Formula/tesseract.rb
@@ -13,25 +13,24 @@ class Tesseract <Formula
 
   depends_on 'libtiff'
 
-  def about
-    <<-EOF
-    Tesseract is an OCR (Optical Character Recognition) engine.
-
-    The easiest way to use it is to convert the source to a Grayscale tiff:
-    `convert source.png -type Grayscale terre_input.tif`
-    then run tesseract:
-    `tesseract terre_input.tif output`
-    EOF
-  end
-
   def install
     fails_with_llvm "Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc", :build => "2206"
 
     # 'make install' expects the language data files in the build directory
     d = Dir.getwd
-    TesseractEnglishData.new.brew { FileUtils.cp Dir["*"], "#{d}/tessdata/" }
+    TesseractEnglishData.new.brew { cp Dir["*"], "#{d}/tessdata/" }
 
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
   end
+
+  def caveats; <<-EOF.undent
+    Tesseract is an OCR (Optical Character Recognition) engine.
+
+    The easiest way to use it is to convert the source to a Grayscale tiff:
+      `convert source.png -type Grayscale terre_input.tif`
+    then run tesseract:
+      `tesseract terre_input.tif output`
+    EOF
+  end
 end
diff --git a/Library/Formula/texinfo.rb b/Library/Formula/texinfo.rb
index e40d1a2e1..56b253d33 100644
--- a/Library/Formula/texinfo.rb
+++ b/Library/Formula/texinfo.rb
@@ -5,9 +5,7 @@ class Texinfo <Formula
   homepage 'http://www.gnu.org/software/texinfo/'
   md5 '71ba711519209b5fb583fed2b3d86fcb'
 
-  def keg_only?
-    :provided_by_osx
-  end
+  keg_only :provided_by_osx
 
   def install
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/thrift.rb b/Library/Formula/thrift.rb
index c0cbe7476..45a32945d 100644
--- a/Library/Formula/thrift.rb
+++ b/Library/Formula/thrift.rb
@@ -1,18 +1,14 @@
 require 'formula'
 
-# TODO Fix java support anyone?
-#
-#
-
 class Thrift <Formula
   homepage 'http://incubator.apache.org/thrift/'
-  head 'http://svn.apache.org/repos/asf/incubator/thrift/trunk'
-  version '0.2.0'
   url 'http://apache.dataphone.se/incubator/thrift/0.2.0-incubating/thrift-0.2.0-incubating.tar.gz'
+  version '0.2.0'
   md5 '9958c57c402c02171ba0bcc96183505c'
+  head 'http://svn.apache.org/repos/asf/incubator/thrift/trunk'
 
   depends_on 'boost'
-  
+
   def install
     cp "/usr/X11/share/aclocal/pkg.m4", "aclocal"
     system "./bootstrap.sh" if version == 'HEAD'
diff --git a/Library/Formula/timedog.rb b/Library/Formula/timedog.rb
index 04a302648..caeb677f9 100644
--- a/Library/Formula/timedog.rb
+++ b/Library/Formula/timedog.rb
@@ -6,6 +6,6 @@ class Timedog <Formula
   homepage 'http://timedog.googlecode.com/'
 
   def install
-    bin.install Dir['timedog']
+    bin.install 'timedog'
   end
 end
diff --git a/Library/Formula/tomcat.rb b/Library/Formula/tomcat.rb
index eb53387c7..1486e4d49 100644
--- a/Library/Formula/tomcat.rb
+++ b/Library/Formula/tomcat.rb
@@ -5,7 +5,7 @@ class Tomcat <Formula
   homepage 'http://tomcat.apache.org/'
   md5 'f9eafa9bfd620324d1270ae8f09a8c89'
 
-  def skip_clean?(path); true; end
+  skip_clean :all
 
   def install
     rm_rf Dir['bin/*.{cmd,bat]}']
@@ -15,15 +15,14 @@ class Tomcat <Formula
     Dir["#{libexec}/bin/*.sh"].each { |f| ln_s f, bin }
   end
 
-  def caveats
-    <<-EOS.undent
-      Note: Some of the support scripts used by Tomcat have very generic names.
-      These are likely to conflict with support scripts used by other Java-based
-      server software.
+  def caveats; <<-EOS.undent
+    Note: Some of the support scripts used by Tomcat have very generic names.
+    These are likely to conflict with support scripts used by other Java-based
+    server software.
 
-      You may want to `brew unlink tomcat` and add:
-        #{bin}
-      to your PATH instead.
+    You may want to `brew unlink tomcat` and add:
+      #{bin}
+    to your PATH instead.
     EOS
   end
 end
diff --git a/Library/Formula/tor.rb b/Library/Formula/tor.rb
index 774bb60cd..7591013d8 100644
--- a/Library/Formula/tor.rb
+++ b/Library/Formula/tor.rb
@@ -4,13 +4,13 @@ class Tor <Formula
   url 'https://www.torproject.org/dist/tor-0.2.1.26.tar.gz'
   homepage 'https://www.torproject.org/'
   md5 'f7b30a144e1da41aa43f496bd47ffba7'
-  
+
   depends_on 'libevent'
-  
+
   def patches
     {:p0 => 'http://gist.github.com/raw/344132/d27d1cd3042d7c58120688d79ed25a2fc959a2de/config.guess-x86_64patch.diff' }
   end
-  
+
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/tre.rb b/Library/Formula/tre.rb
index a5640b83a..0bbce8799 100644
--- a/Library/Formula/tre.rb
+++ b/Library/Formula/tre.rb
@@ -6,10 +6,8 @@ class Tre <Formula
   md5 'b4d3232593dadf6746f4727bdda20b41'
 
   def install
-    system "./configure",
-      "--disable-debug",
-      "--disable-dependency-tracking",
-      "--prefix=#{prefix}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/tree.rb b/Library/Formula/tree.rb
index 080d156e6..1a9de0a07 100644
--- a/Library/Formula/tree.rb
+++ b/Library/Formula/tree.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Tree <Formula
-  @url='ftp://mama.indstate.edu/linux/tree/tree-1.5.3.tgz'
-  @homepage='http://mama.indstate.edu/users/ice/tree/'
-  @md5='c07ce9065667a23f27aca4de8ecccb10'
+  url 'ftp://mama.indstate.edu/linux/tree/tree-1.5.3.tgz'
+  homepage 'http://mama.indstate.edu/users/ice/tree/'
+  md5 'c07ce9065667a23f27aca4de8ecccb10'
 
   def install
     system "#{ENV.cc} #{ENV['CFLAGS']} -o tree tree.c strverscmp.c"
diff --git a/Library/Formula/uif2iso.rb b/Library/Formula/uif2iso.rb
index a5a1500aa..a4c89bd07 100644
--- a/Library/Formula/uif2iso.rb
+++ b/Library/Formula/uif2iso.rb
@@ -7,8 +7,8 @@ class Uif2iso <Formula
   version '0.1.7c'
 
   def install
-    inreplace 'src/Makefile' do |contents| 
-      contents.change_make_var! "prefix", "#{prefix}"
+    inreplace 'src/Makefile' do |s|
+      s.change_make_var! "prefix", prefix
     end
     system "make -C src"
     system "make -C src install"
diff --git a/Library/Formula/unittest.rb b/Library/Formula/unittest.rb
index 80a9c1e35..68c0d0088 100644
--- a/Library/Formula/unittest.rb
+++ b/Library/Formula/unittest.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Unittest <Formula
-  @url='http://unittest.red-bean.com/tar/unittest-0.50-62.tar.gz'
-  @homepage='http://unittest.red-bean.com/'
-  @md5='6eaa2823620c2e21fc745bd8da6a26b2'
+  url 'http://unittest.red-bean.com/tar/unittest-0.50-62.tar.gz'
+  homepage 'http://unittest.red-bean.com/'
+  md5 '6eaa2823620c2e21fc745bd8da6a26b2'
 
   def install
     fails_with_llvm
diff --git a/Library/Formula/unix2dos.rb b/Library/Formula/unix2dos.rb
index 40d473fc6..ba63b13ac 100644
--- a/Library/Formula/unix2dos.rb
+++ b/Library/Formula/unix2dos.rb
@@ -9,7 +9,7 @@ class Unix2dos < Formula
     # we don't use the Makefile as it doesn't optimize
     system "#{ENV.cc} #{ENV['CFLAGS']} unix2dos.c -o unix2dos"
 
-    bin.install %w[unix2dos]
-    man1.install %w[unix2dos.1]
+    bin.install "unix2dos"
+    man1.install "unix2dos.1"
   end
 end
diff --git a/Library/Formula/unixodbc.rb b/Library/Formula/unixodbc.rb
index a6442c130..7517dcac7 100644
--- a/Library/Formula/unixodbc.rb
+++ b/Library/Formula/unixodbc.rb
@@ -1,12 +1,14 @@
 require 'formula'
 
 class Unixodbc < Formula
-  @url = 'http://www.unixodbc.org/unixODBC-2.3.0.tar.gz'
-  @homepage = 'http://www.unixodbc.org/'
-  @md5 = 'f2ad22cbdffe836c58987ed2332c2e99'
+  url 'http://www.unixodbc.org/unixODBC-2.3.0.tar.gz'
+  homepage 'http://www.unixodbc.org/'
+  md5 'f2ad22cbdffe836c58987ed2332c2e99'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--enable-gui=no"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-gui=no"
     system "make install"
   end
 end
diff --git a/Library/Formula/unp.rb b/Library/Formula/unp.rb
index afc6bfa63..e3cd69035 100644
--- a/Library/Formula/unp.rb
+++ b/Library/Formula/unp.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Unp <Formula
-  @url='http://ftp.de.debian.org/debian/pool/main/u/unp/unp_1.0.11.tar.gz'
-  @homepage='http://packages.debian.org/de/etch/unp'
-  @md5='ecea662bd7e7efe7f7e2213bf21d9646'
+  url 'http://ftp.de.debian.org/debian/pool/main/u/unp/unp_1.0.11.tar.gz'
+  homepage 'http://packages.debian.org/de/etch/unp'
+  md5 'ecea662bd7e7efe7f7e2213bf21d9646'
 
   depends_on 'p7zip'
 
@@ -11,8 +11,8 @@ class Unp <Formula
     bin.install %w[unp ucat]
     man1.install "debian/unp.1"
 
-    FileUtils.mv 'debian/README.Debian', 'README'
-    FileUtils.mv 'debian/copyright', 'COPYING'
-    FileUtils.mv 'debian/changelog', 'ChangeLog'
+    mv 'debian/README.Debian', 'README'
+    mv 'debian/copyright', 'COPYING'
+    mv 'debian/changelog', 'ChangeLog'
   end
 end
diff --git a/Library/Formula/unrar.rb b/Library/Formula/unrar.rb
index 21cc0c4dc..ca94bad0c 100644
--- a/Library/Formula/unrar.rb
+++ b/Library/Formula/unrar.rb
@@ -8,7 +8,7 @@ class Unrar <Formula
   def install
     system "make --makefile makefile.unix"
     bin.install 'unrar'
-    
+
     mv 'license.txt', 'COPYING'
     mv 'readme.txt', 'README'
   end
diff --git a/Library/Formula/unyaffs.rb b/Library/Formula/unyaffs.rb
index 4c2918688..41519d62c 100644
--- a/Library/Formula/unyaffs.rb
+++ b/Library/Formula/unyaffs.rb
@@ -8,7 +8,7 @@ class Unyaffs <Formula
       cc_args = ENV['CFLAGS'].split(' ')
       (cc_args << ['-o', 'unyaffs', 'unyaffs.c']).flatten!
       system ENV.cc, *cc_args
-      
+
       bin.install 'unyaffs'
   end
 end
diff --git a/Library/Formula/ut-cache.rb b/Library/Formula/ut-cache.rb
index 59ecbc7f8..fe20bdd73 100644
--- a/Library/Formula/ut-cache.rb
+++ b/Library/Formula/ut-cache.rb
@@ -10,7 +10,7 @@ class UtCache <Formula
 
   def install
     system "curl -o getdelim.c http://gist.github.com/raw/278167/26eae93b355d443693c1e8922a328d4a61b4a176/getdelim.c"
-    
+
     ENV['HOME'] = prefix
     system "make"
     system "mkdir #{prefix}/bin"
diff --git a/Library/Formula/v8.rb b/Library/Formula/v8.rb
index d92edc352..80fbe7642 100644
--- a/Library/Formula/v8.rb
+++ b/Library/Formula/v8.rb
@@ -9,15 +9,14 @@ class V8 <Formula
   def install
     arch = Hardware.is_64_bit? ? 'x64' : 'ia32'
 
-    system "scons",
-            "-j #{Hardware.processor_count}",
-            "arch=#{arch}",
-            "mode=release",
-            "snapshot=on",
-            "library=shared",
-            "visibility=default",
-            "console=readline",
-            "sample=shell"
+    system "scons", "-j #{Hardware.processor_count}",
+                    "arch=#{arch}",
+                    "mode=release",
+                    "snapshot=on",
+                    "library=shared",
+                    "visibility=default",
+                    "console=readline",
+                    "sample=shell"
 
     include.install Dir['include/*']
     lib.install Dir['libv8.*']
diff --git a/Library/Formula/varnish.rb b/Library/Formula/varnish.rb
index 36e790604..cf7b740c8 100644
--- a/Library/Formula/varnish.rb
+++ b/Library/Formula/varnish.rb
@@ -8,10 +8,8 @@ class Varnish <Formula
   depends_on 'pkg-config'
   depends_on 'pcre'
 
-  def skip_clean? path
-    # Do not strip varnish binaries: Otherwise, the magic string end pointer isn't found.
-    true
-  end
+  # Do not strip varnish binaries: Otherwise, the magic string end pointer isn't found.
+  skip_clean :all
 
   def install
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/vcprompt.rb b/Library/Formula/vcprompt.rb
index f02d2150d..73acaf5d1 100644
--- a/Library/Formula/vcprompt.rb
+++ b/Library/Formula/vcprompt.rb
@@ -1,7 +1,6 @@
 require 'formula'
 
 class Vcprompt < Formula
-
   head 'hg://http://vc.gerg.ca/hg/vcprompt/'
   homepage 'http://vc.gerg.ca/hg/vcprompt/'
 
diff --git a/Library/Formula/vice.rb b/Library/Formula/vice.rb
index c9da2dee5..d62ab1f4e 100644
--- a/Library/Formula/vice.rb
+++ b/Library/Formula/vice.rb
@@ -4,37 +4,34 @@ class Vice <Formula
   url "http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz"
   md5 "6737f540806205384e9129026898b0a1"
   homepage 'http://www.viceteam.org/'
-  
+
   def remove_unused_icons
     Pathname.glob libexec+'*.app' do |d|
       appname = File.basename(d, '.app')
-  
+
       Pathname.glob d+'Contents/Resources/x*.icns' do |g|
         File.unlink g if File.basename(g, '.icns') != appname
       end
     end
   end
-  
+
   def install
     fails_with_llvm "Cannot build with LLVM"
     ENV.libpng
 
     # Disable the zlibtest, we know we have it.
     # Use Cocoa instead of X
-    system "./configure", "--prefix=#{prefix}", 
-                          "--disable-debug", 
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--with-cocoa",
                           "--without-x",
                           "--disable-zlibtest"
     system "make"
     system "make bindist"
-    
     prefix.install Dir['vice-macosx-*/*']
-    
     remove_unused_icons
   end
-  
+
   def caveats
     "Cocoa apps for these emulators have been installed to #{prefix}."
   end
diff --git a/Library/Formula/vilistextum.rb b/Library/Formula/vilistextum.rb
index 10c1835e2..09fc46d03 100644
--- a/Library/Formula/vilistextum.rb
+++ b/Library/Formula/vilistextum.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Vilistextum <Formula
-  @url='http://bhaak.dyndns.org/vilistextum/vilistextum-2.6.9.tar.gz'
-  @homepage='http://bhaak.dyndns.org/vilistextum/'
-  @md5='5ba56ffdc56758da716bb46c3e0f517e'
+  url 'http://bhaak.dyndns.org/vilistextum/vilistextum-2.6.9.tar.gz'
+  homepage 'http://bhaak.dyndns.org/vilistextum/'
+  md5 '5ba56ffdc56758da716bb46c3e0f517e'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
diff --git a/Library/Formula/virtuoso.rb b/Library/Formula/virtuoso.rb
index a96045242..96526cf3c 100644
--- a/Library/Formula/virtuoso.rb
+++ b/Library/Formula/virtuoso.rb
@@ -8,20 +8,17 @@ class Virtuoso <Formula
   # If gawk isn't found, make fails deep into the process.
   depends_on 'gawk'
 
-  def skip_clean? path
-    true
-  end
-
-  def caveats
-    <<-EOS.undent
-      NOTE: the Virtuoso server will start up several times on port 1111
-      during the install process.
-    EOS
-  end
+  skip_clean :all
 
   def install
     ENV.m64 if MACOS_VERSION >= 10.6 and Hardware.is_64_bit?
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
   end
+
+  def caveats; <<-EOS.undent
+    NOTE: the Virtuoso server will start up several times on port 1111
+    during the install process.
+    EOS
+  end
 end
diff --git a/Library/Formula/visualboyadvance.rb b/Library/Formula/visualboyadvance.rb
index d75ae8538..620d86247 100644
--- a/Library/Formula/visualboyadvance.rb
+++ b/Library/Formula/visualboyadvance.rb
@@ -4,11 +4,11 @@ class Visualboyadvance <Formula
   url "http://downloads.sourceforge.net/project/vba/VisualBoyAdvance/1.7.2/VisualBoyAdvance-src-1.7.2.tar.gz"
   homepage 'http://vba.ngemu.com/' # This homepage is sketchy
   md5 'cc02339e3fd8efd9f23121b0a2f81fd8'
-  
+
   depends_on 'pkg-config'
   depends_on 'libpng'
   depends_on 'sdl'
-  
+
   def patches
     DATA
   end
@@ -16,9 +16,9 @@ class Visualboyadvance <Formula
   def install
     fails_with_llvm "Video scalers don't link right w/ LLVM"
     ENV.x11 # for libpng
-    
-    system "./configure", "--prefix=#{prefix}", "--disable-debug",
-                          "--disable-dependency-tracking",
+
+    system "./configure", "--disable-dependency-tracking", "--disable-debug",
+                          "--prefix=#{prefix}",
                           # Use straight C, and don't get fancy
                           "--enable-c-core",
                           "--without-mmx",
diff --git a/Library/Formula/voldemort.rb b/Library/Formula/voldemort.rb
index e17477436..2923eb9b1 100644
--- a/Library/Formula/voldemort.rb
+++ b/Library/Formula/voldemort.rb
@@ -21,14 +21,13 @@ EOS
     end
   end
 
-  def caveats
-    <<-EOS.undent
-      You will need to set VOLDEMORT_HOME to:
-        #{libexec}
-        
-      Config files should be placed in:
-        #{libexec}/config
-      or you can set VOL_CONF_DIR to a more reasonable path.
+  def caveats; <<-EOS.undent
+    You will need to set VOLDEMORT_HOME to:
+      #{libexec}
+
+    Config files should be placed in:
+      #{libexec}/config
+    or you can set VOL_CONF_DIR to a more reasonable path.
     EOS
   end
 end
diff --git a/Library/Formula/vorbis-tools.rb b/Library/Formula/vorbis-tools.rb
index ad62b3152..2136d13f4 100644
--- a/Library/Formula/vorbis-tools.rb
+++ b/Library/Formula/vorbis-tools.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class VorbisTools <Formula
-  @url='http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz'
-  @md5='567e0fb8d321b2cd7124f8208b8b90e6'
-  @homepage='http://vorbis.com'
+  url 'http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz'
+  md5 '567e0fb8d321b2cd7124f8208b8b90e6'
+  homepage 'http://vorbis.com'
 
   depends_on 'libogg'
   depends_on 'libvorbis'
diff --git a/Library/Formula/vpnc.rb b/Library/Formula/vpnc.rb
index 109b9532c..6ed743960 100644
--- a/Library/Formula/vpnc.rb
+++ b/Library/Formula/vpnc.rb
@@ -8,19 +8,16 @@ class Vpnc <Formula
   depends_on 'libgcrypt'
   depends_on 'libgpg-error'
 
-  def skip_clean? path
-    path == etc or path == var
-  end
+  skip_clean 'etc'
+  skip_clean 'var'
 
   def options
-    [
-      ["--hybrid", "Use vpnc hybrid authentication."]
-    ]
+    [["--hybrid", "Use vpnc hybrid authentication."]]
   end
 
   def install
     fails_with_llvm
-    ENV.no_optimization 
+    ENV.no_optimization
     ENV.deparallelize
 
     inreplace ["vpnc-script.in", "vpnc-disconnect"] do |s|
@@ -48,11 +45,9 @@ class Vpnc <Formula
     system "make install"
   end
 
-  def caveats
-    <<-END_CAVEATS
-    Formula contribute hybrid option for vpnc hybrid authentification.
-    To install use:
+  def caveats; <<-EOS
+    To use vpnc hybrid authentification:
       brew install vpnc --hybrid
-    END_CAVEATS
+    EOS
   end
 end
diff --git a/Library/Formula/w3m.rb b/Library/Formula/w3m.rb
index ace23cd3e..51f90ce4c 100644
--- a/Library/Formula/w3m.rb
+++ b/Library/Formula/w3m.rb
@@ -9,7 +9,9 @@ class W3m <Formula
 
   def install
     fails_with_llvm
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-image"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-image"
     system "make install"
   end
 end
diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb
index fd3600ddd..26ac00126 100644
--- a/Library/Formula/weechat.rb
+++ b/Library/Formula/weechat.rb
@@ -12,7 +12,7 @@ class Weechat <Formula
   def install
     #FIXME: Compiling perl module doesn't work
     #NOTE: -DPREFIX has to be specified because weechat devs enjoy being non-standard
-    system "cmake", "-DPREFIX=#{prefix}", 
+    system "cmake", "-DPREFIX=#{prefix}",
                     "-DDISABLE_PERL=ON",
                     "-DDISABLE_RUBY:BOOL=ON",
                     std_cmake_parameters, "."
diff --git a/Library/Formula/whohas.rb b/Library/Formula/whohas.rb
index 336f944a1..b61e2439f 100644
--- a/Library/Formula/whohas.rb
+++ b/Library/Formula/whohas.rb
@@ -4,7 +4,7 @@ class Whohas <Formula
   url 'http://www.philippwesche.org/200811/whohas/whohas-0.23.tar.gz'
   homepage 'http://www.philippwesche.org/200811/whohas/intro.html'
   md5 '0895fb6353950fe2e686fa867aaf0416'
-  
+
   depends_on 'LWP::UserAgent' => :perl
 
   def install
diff --git a/Library/Formula/willgit.rb b/Library/Formula/willgit.rb
index f3a1d0e23..8313d74a3 100644
--- a/Library/Formula/willgit.rb
+++ b/Library/Formula/willgit.rb
@@ -6,7 +6,7 @@ class Willgit <Formula
 
   def install
     Dir.chdir 'bin' do
-        bin.install %w[git-publish-branch git-rank-contributors git-show-merges git-wtf]
+      bin.install %w[git-publish-branch git-rank-contributors git-show-merges git-wtf]
     end
   end
 end
diff --git a/Library/Formula/winetricks.rb b/Library/Formula/winetricks.rb
index 2d2fb0347..32113a8bf 100644
--- a/Library/Formula/winetricks.rb
+++ b/Library/Formula/winetricks.rb
@@ -1,22 +1,18 @@
 require 'formula'
 
 class Winetricks < ScriptFileFormula
-  url 'http://winezeug.googlecode.com/svn-history/r1019/trunk/winetricks'
+  url 'http://winezeug.googlecode.com/svn-history/r1019/trunk/winetricks',
+        :using => curl
   version '20100316'
   md5 '79ab153ae51289ec7c25c7b7ed5d68ff'
   homepage 'http://wiki.winehq.org/winetricks'
 
-  head 'http://winezeug.googlecode.com/svn/trunk/winetricks'
+  head 'http://winezeug.googlecode.com/svn/trunk/winetricks',
+        :using => curl
 
-
-  def caveats
-    <<-EOS.undent
+  def caveats; <<-EOS.undent
     winetricks is a set of utilities for wine, which is installed separately:
       brew install wine
     EOS
   end
-
-  def download_strategy
-    CurlDownloadStrategy
-  end
 end
diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb
index 5366ddbd5..22ba9b258 100644
--- a/Library/Formula/wireshark.rb
+++ b/Library/Formula/wireshark.rb
@@ -17,8 +17,8 @@ class Wireshark <Formula
     ENV.j1 # Install failed otherwise.
     system "make install"
   end
-  
+
   def caveats
-    "We don't build the X11 enabled GUI by default"
+    "We don't build the X11-enabled GUI by default"
   end
 end
diff --git a/Library/Formula/wkhtmltopdf.rb b/Library/Formula/wkhtmltopdf.rb
index 0fb2e6472..65bbb542e 100644
--- a/Library/Formula/wkhtmltopdf.rb
+++ b/Library/Formula/wkhtmltopdf.rb
@@ -6,23 +6,23 @@ class Wkhtmltopdf <Formula
   md5 'df2bb84b7d15140ca14732898155dd6a'
 
   depends_on 'qt'
-  
-  def install    
+
+  def install
     # fix that missing TEMP= include
     inreplace 'wkhtmltopdf.pro' do |s|
       s.gsub! 'TEMP = $$[QT_INSTALL_LIBS] libQtGui.prl', ''
       s.gsub! 'include($$join(TEMP, "/"))', ''
     end
-    
+
     # Always creates a uselles .app doh,
-    # AFAIK this is fixed in 0.10.0beta    
+    # AFAIK this is fixed in 0.10.0beta
     wkhtml_bin = 'wkhtmltopdf.app/Contents/MacOS/wkhtmltopdf'
     wkhtml_man = "#{name}.1"
-    
+
     system "qmake"
     system "make"
     system "#{wkhtml_bin} --manpage > #{wkhtml_man}"
-    
+
     # install binary and man file
     bin.install wkhtml_bin
     man1.install wkhtml_man
diff --git a/Library/Formula/woof.rb b/Library/Formula/woof.rb
index aa96f6219..452982fa3 100644
--- a/Library/Formula/woof.rb
+++ b/Library/Formula/woof.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class Woof <ScriptFileFormula
-  version '20091227'
   url "http://www.home.unix-ag.org/simon/woof"
+  version '20091227'
   md5 '4df770eedef7b011fc37d42015c801b9'
   homepage 'http://www.home.unix-ag.org/simon/woof.html'
 end
diff --git a/Library/Formula/wordnet.rb b/Library/Formula/wordnet.rb
index 610e7b53f..8ee4f08a0 100644
--- a/Library/Formula/wordnet.rb
+++ b/Library/Formula/wordnet.rb
@@ -6,7 +6,8 @@ class Wordnet <Formula
   md5 '89b4db7c6840ce69a8e315a3f83d996b'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}", "--mandir=#{man}"
     ENV.deparallelize
     system "make install"
   end
diff --git a/Library/Formula/wrangler.rb b/Library/Formula/wrangler.rb
index 9edcbf294..5c4302c72 100644
--- a/Library/Formula/wrangler.rb
+++ b/Library/Formula/wrangler.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Wrangler <Formula
-  @url='http://www.cs.kent.ac.uk/projects/forse/wrangler/wrangler-0.8/wrangler-0.8.4.tar.gz'
-  @homepage='http://www.cs.kent.ac.uk/projects/forse/'
-  @md5='84466a243b91ea7467296a945fb644fe'
+  url 'http://www.cs.kent.ac.uk/projects/forse/wrangler/wrangler-0.8/wrangler-0.8.4.tar.gz'
+  homepage 'http://www.cs.kent.ac.uk/projects/forse/'
+  md5 '84466a243b91ea7467296a945fb644fe'
 
   depends_on 'erlang'
 
diff --git a/Library/Formula/wtf.rb b/Library/Formula/wtf.rb
index 841796c2a..4a62d675d 100644
--- a/Library/Formula/wtf.rb
+++ b/Library/Formula/wtf.rb
@@ -8,7 +8,7 @@ class Wtf <Formula
   def install
     inreplace %w[wtf wtf.6], "/usr/share", share
     bin.install "wtf"
-    (man+"man6").install "wtf.6"
+    man6.install "wtf.6"
     (share+"misc").install %w[acronyms acronyms.comp]
   end
 end
diff --git a/Library/Formula/wyrd.rb b/Library/Formula/wyrd.rb
index 71f5492ca..da1c22f3c 100644
--- a/Library/Formula/wyrd.rb
+++ b/Library/Formula/wyrd.rb
@@ -9,13 +9,9 @@ class Wyrd <Formula
   depends_on 'objective-caml'
 
   def install
-      configure_args = [
-          "--prefix=#{prefix}",
-          "--disable-debug",
-          "--disable-dependency-tracking",
-          "--enable-utf8",
-      ]
-    system "./configure", *configure_args
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--enable-utf8"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/x264.rb b/Library/Formula/x264.rb
index 5a187d71c..bc5951dc5 100644
--- a/Library/Formula/x264.rb
+++ b/Library/Formula/x264.rb
@@ -2,12 +2,11 @@ require 'formula'
 
 class X264 <Formula
   homepage 'http://www.videolan.org/developers/x264.html'
-  head 'git://git.videolan.org/x264.git',
+  url 'git://git.videolan.org/x264.git',
         :tag => '20fa784d2d9e0d5e524d4e3834699e9ff9b57511'
 
   depends_on 'yasm'
 
-
   def install
     system "./version.sh"
     system "./configure", "--prefix=#{prefix}",
diff --git a/Library/Formula/xar.rb b/Library/Formula/xar.rb
index 56d027c3c..b09bf8fbb 100644
--- a/Library/Formula/xar.rb
+++ b/Library/Formula/xar.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Xar <Formula
-  @url='http://xar.googlecode.com/files/xar-1.5.2.tar.gz'
-  @homepage='http://code.google.com/p/xar/'
-  @md5='8eabb055d3387b8edc30ecfb08d2e80d'
+  url 'http://xar.googlecode.com/files/xar-1.5.2.tar.gz'
+  homepage 'http://code.google.com/p/xar/'
+  md5 '8eabb055d3387b8edc30ecfb08d2e80d'
 
   def patches
     DATA
diff --git a/Library/Formula/xdelta.rb b/Library/Formula/xdelta.rb
index e31dbf067..40c080e7f 100644
--- a/Library/Formula/xdelta.rb
+++ b/Library/Formula/xdelta.rb
@@ -8,6 +8,6 @@ class Xdelta <Formula
 
   def install
     system "make"
-    bin.install("xdelta3")
+    bin.install "xdelta3"
   end
 end
diff --git a/Library/Formula/xpdf.rb b/Library/Formula/xpdf.rb
index 8db23031c..950875b37 100644
--- a/Library/Formula/xpdf.rb
+++ b/Library/Formula/xpdf.rb
@@ -5,20 +5,18 @@ class Xpdf <Formula
   homepage 'http://www.foolabs.com/xpdf/'
   md5 '599dc4cc65a07ee868cf92a667a913d2'
 
+  def patches
+    [ # security patches, applied sequentially
+      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch",
+      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch",
+      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch",
+      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch"
+    ]
+  end
+
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make"
     system "make install"
   end
-  
-  def patches
-    # security patches, applied sequentially
-    [
-      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch", 
-      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch", 
-      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch", 
-      "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch"
-    ]
-  end
-  
 end
\ No newline at end of file
diff --git a/Library/Formula/xu4.rb b/Library/Formula/xu4.rb
index e540e2fb9..113674be8 100755
--- a/Library/Formula/xu4.rb
+++ b/Library/Formula/xu4.rb
@@ -1,9 +1,12 @@
 require 'formula'
 
 class Xu4 <Formula
-  head 'http://xu4.svn.sourceforge.net/svnroot/xu4/trunk/u4',
+  url 'http://xu4.svn.sourceforge.net/svnroot/xu4/trunk/u4',
           :revision => '2725'
   homepage 'http://xu4.sourceforge.net/'
+  version '1.0beta4-pre'
+
+  head 'http://xu4.svn.sourceforge.net/svnroot/xu4/trunk/u4'
 
   depends_on 'sdl'
   depends_on 'sdl_mixer'
@@ -15,7 +18,7 @@ class Xu4 <Formula
   def install
     ENV.libpng
 
-    ultima_zips = [ 
+    ultima_zips = [
       "Ultima%20IV%20for%20DOS/1.01/ultima4-1.01.zip",
       "Ultima%204%20VGA%20Upgrade/1.3/u4upgrad.zip"]
 
diff --git a/Library/Formula/xz.rb b/Library/Formula/xz.rb
index 35fced15c..ac59fcf64 100644
--- a/Library/Formula/xz.rb
+++ b/Library/Formula/xz.rb
@@ -8,7 +8,9 @@ class Xz <Formula
 
   def install
     # Disable the assembly CRC checks they use x86 rather than x86-64 asm and fail to build for x86-64.
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking", "--disable-assembler"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-assembler"
     system "make install"
   end
 end
diff --git a/Library/Formula/yaf.rb b/Library/Formula/yaf.rb
index ce0a341ed..e82563770 100644
--- a/Library/Formula/yaf.rb
+++ b/Library/Formula/yaf.rb
@@ -9,11 +9,9 @@ class Yaf <Formula
   depends_on 'libfixbuf'
 
   def install
-    system "./configure",
-        "--disable-debug",
-        "--disable-dependency-tracking",
-        "--prefix=#{prefix}",
-        "--mandir=#{man}"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--mandir=#{man}"
     system "make"
     system "make install"
   end
diff --git a/Library/Formula/yaws.rb b/Library/Formula/yaws.rb
index 3b801f21a..064e1acf8 100644
--- a/Library/Formula/yaws.rb
+++ b/Library/Formula/yaws.rb
@@ -6,7 +6,7 @@ class Yaws < Formula
   md5 '950f8199592c6490556632e20e59a353'
 
   depends_on 'erlang'
- 
+
   def options
     [["--with-yapp", "Build and install yaws applications"]]
   end
@@ -24,12 +24,11 @@ class Yaws < Formula
       end
     end
   end
-  
-  def caveats
-    <<-EOS.undent
-      Usually you want to build yapp (yaws applications) as well.
-      To do so, use:
-        brew install yaws --with-yapp
+
+  def caveats; <<-EOS.undent
+    Usually you want to build yapp (yaws applications) as well.
+    To do so, use:
+      brew install yaws --with-yapp
     EOS
   end
 end
diff --git a/Library/Formula/yaz.rb b/Library/Formula/yaz.rb
index 7b97c530f..a7dbe2cf7 100644
--- a/Library/Formula/yaz.rb
+++ b/Library/Formula/yaz.rb
@@ -8,8 +8,6 @@ class Yaz <Formula
   homepage 'http://www.indexdata.com/yaz'
   md5 'e72edf163640a6a61fd41c12f2c01d2d'
 
-  # depends_on 'openssl'   # we can suffice with the os x default for now
-
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"
diff --git a/Library/Formula/youtube-dl.rb b/Library/Formula/youtube-dl.rb
index 703b42f7c..ddc291fd0 100644
--- a/Library/Formula/youtube-dl.rb
+++ b/Library/Formula/youtube-dl.rb
@@ -1,12 +1,8 @@
 require 'formula'
 
-class YoutubeDl <Formula
+class YoutubeDl <ScriptFileFormula
   url 'http://bitbucket.org/rg3/youtube-dl/raw/02377503b545/youtube-dl'
   homepage 'http://bitbucket.org/rg3/youtube-dl/overview'
   md5 '50b22dee9387d9d9641366974f809fc3'
   version '2010.07.24'
-
-  def install
-    bin.install 'youtube-dl'
-  end
 end
diff --git a/Library/Formula/zebra.rb b/Library/Formula/zebra.rb
index 53e31c802..676d8bdcc 100644
--- a/Library/Formula/zebra.rb
+++ b/Library/Formula/zebra.rb
@@ -8,9 +8,8 @@ class Zebra <Formula
   depends_on 'yaz'
 
   def install
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-debug",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--enable-mod-text",
                           "--enable-mod-grs-regx",
                           "--enable-mod-grs-marc",
diff --git a/Library/Formula/znc.rb b/Library/Formula/znc.rb
index 12c56754a..7cae42ce2 100644
--- a/Library/Formula/znc.rb
+++ b/Library/Formula/znc.rb
@@ -4,14 +4,14 @@ class Znc <Formula
   url 'http://downloads.sourceforge.net/project/znc/znc/0.092/znc-0.092.tar.gz'
   md5 'e800a70c932dd13bc09b63569b49db3a'
   homepage 'http://en.znc.in/wiki/ZNC'
-  
+
   depends_on 'c-ares'
   depends_on 'pkg-config' => :optional
-  
+
   skip_clean 'bin/znc'
   skip_clean 'bin/znc-config'
   skip_clean 'bin/znc-buildmod'
-  
+
   def install
     # Apparently Snow Leopard's libperl is at /System/Library/Perl/lib/5.10/libperl.dylib
     # but I don't know how to tell znc that. Perl is only used for user plugins, anyway.
diff --git a/Library/Formula/zsh.rb b/Library/Formula/zsh.rb
index 7dca60c6d..d62665d7f 100644
--- a/Library/Formula/zsh.rb
+++ b/Library/Formula/zsh.rb
@@ -1,12 +1,14 @@
 require 'formula'
 
 class Zsh <Formula
-  @url='http://downloads.sourceforge.net/project/zsh/zsh-dev/4.3.10/zsh-4.3.10.tar.gz'
-  @homepage='http://www.zsh.org/'
-  @md5='031efc8c8efb9778ffa8afbcd75f0152'
+  url 'http://downloads.sourceforge.net/project/zsh/zsh-dev/4.3.10/zsh-4.3.10.tar.gz'
+  homepage 'http://www.zsh.org/'
+  md5 '031efc8c8efb9778ffa8afbcd75f0152'
 
   depends_on 'gdbm' => :optional
 
+  skip_clean :all
+
   def install
     system "./configure", "--disable-debug",
                           "--prefix=#{prefix}",
@@ -21,8 +23,4 @@ class Zsh <Formula
 
     system "make install"
   end
-  
-  def skip_clean? path
-    true
-  end
 end
-- 
cgit v1.2.3