aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/abuse.rb2
-rw-r--r--Library/Formula/ack.rb2
-rw-r--r--Library/Formula/activemq.rb2
-rw-r--r--Library/Formula/advancecomp.rb2
-rw-r--r--Library/Formula/angband.rb2
-rw-r--r--Library/Formula/ant.rb2
-rw-r--r--Library/Formula/antiword.rb2
-rw-r--r--Library/Formula/apachetop.rb2
-rw-r--r--Library/Formula/app-engine-java-sdk.rb2
-rw-r--r--Library/Formula/aria2.rb2
-rw-r--r--Library/Formula/asciidoc.rb2
-rw-r--r--Library/Formula/aspell.rb2
-rw-r--r--Library/Formula/asterisk.rb2
-rw-r--r--Library/Formula/astyle.rb2
-rw-r--r--Library/Formula/atomicparsley.rb2
-rw-r--r--Library/Formula/automoc4.rb2
-rw-r--r--Library/Formula/axel.rb2
-rw-r--r--Library/Formula/bash-completion.rb2
-rw-r--r--Library/Formula/bash.rb2
-rw-r--r--Library/Formula/bchunk.rb2
-rw-r--r--Library/Formula/bdw-gc.rb2
-rw-r--r--Library/Formula/beanstalk.rb2
-rw-r--r--Library/Formula/berkeley-db.rb2
-rw-r--r--Library/Formula/boost.rb2
-rw-r--r--Library/Formula/c-ares.rb2
-rw-r--r--Library/Formula/cadaver.rb2
-rw-r--r--Library/Formula/ccache.rb2
-rw-r--r--Library/Formula/chicken.rb2
-rw-r--r--Library/Formula/chocolate-doom.rb2
-rw-r--r--Library/Formula/cksfv.rb2
-rw-r--r--Library/Formula/clojure.rb2
-rw-r--r--Library/Formula/clucene.rb2
-rw-r--r--Library/Formula/cmake.rb2
-rw-r--r--Library/Formula/colordiff.rb2
-rw-r--r--Library/Formula/coreutils.rb2
-rw-r--r--Library/Formula/couchdb.rb2
-rw-r--r--Library/Formula/cscope.rb2
-rw-r--r--Library/Formula/ctags.rb2
-rw-r--r--Library/Formula/d-bus.rb2
-rw-r--r--Library/Formula/darwinbuild.rb2
-rw-r--r--Library/Formula/dcraw.rb2
-rw-r--r--Library/Formula/ddrescue.rb2
-rw-r--r--Library/Formula/dict.rb2
-rw-r--r--Library/Formula/dirac.rb2
-rw-r--r--Library/Formula/dmd.rb2
-rw-r--r--Library/Formula/dnsmasq.rb2
-rw-r--r--Library/Formula/dos2unix.rb2
-rw-r--r--Library/Formula/dovecot.rb2
-rw-r--r--Library/Formula/ec2-api-tools.rb2
-rw-r--r--Library/Formula/elinks.rb2
-rw-r--r--Library/Formula/emacs.rb2
-rw-r--r--Library/Formula/erlang.rb2
-rw-r--r--Library/Formula/expat.rb2
-rw-r--r--Library/Formula/faac.rb2
-rw-r--r--Library/Formula/faad2.rb2
-rw-r--r--Library/Formula/fabricate.rb2
-rw-r--r--Library/Formula/factor.rb2
-rw-r--r--Library/Formula/fastri.rb2
-rw-r--r--Library/Formula/ffmpeg.rb2
-rw-r--r--Library/Formula/fftw.rb2
-rw-r--r--Library/Formula/findutils.rb2
-rw-r--r--Library/Formula/fish.rb2
-rw-r--r--Library/Formula/flac.rb2
-rw-r--r--Library/Formula/fondu.rb2
-rw-r--r--Library/Formula/fop.rb2
-rw-r--r--Library/Formula/fossil.rb2
-rw-r--r--Library/Formula/fribidi.rb2
-rw-r--r--Library/Formula/frotz.rb2
-rw-r--r--Library/Formula/gawk.rb2
-rw-r--r--Library/Formula/gccxml.rb2
-rw-r--r--Library/Formula/gd.rb2
-rw-r--r--Library/Formula/geoip.rb2
-rw-r--r--Library/Formula/geos.rb2
-rw-r--r--Library/Formula/gettext.rb2
-rw-r--r--Library/Formula/ghostscript.rb2
-rw-r--r--Library/Formula/git.rb2
-rw-r--r--Library/Formula/glib.rb2
-rw-r--r--Library/Formula/global.rb2
-rw-r--r--Library/Formula/gloox.rb2
-rw-r--r--Library/Formula/glpk.rb2
-rw-r--r--Library/Formula/gmp.rb2
-rw-r--r--Library/Formula/gnu-go.rb2
-rw-r--r--Library/Formula/gnu-sed.rb2
-rw-r--r--Library/Formula/gnu-smalltalk.rb2
-rw-r--r--Library/Formula/gnu-tar.rb2
-rw-r--r--Library/Formula/gnupg.rb2
-rw-r--r--Library/Formula/gnuplot.rb2
-rw-r--r--Library/Formula/gnutls.rb2
-rw-r--r--Library/Formula/google-perftools.rb2
-rw-r--r--Library/Formula/graphviz.rb2
-rw-r--r--Library/Formula/grc.rb2
-rw-r--r--Library/Formula/guile.rb2
-rw-r--r--Library/Formula/hercules.rb2
-rw-r--r--Library/Formula/httperf.rb2
-rw-r--r--Library/Formula/icu4c.rb2
-rw-r--r--Library/Formula/id3lib.rb2
-rw-r--r--Library/Formula/ilmbase.rb2
-rw-r--r--Library/Formula/imagemagick.rb2
-rw-r--r--Library/Formula/intltool.rb2
-rw-r--r--Library/Formula/iperf.rb2
-rw-r--r--Library/Formula/ircii.rb2
-rw-r--r--Library/Formula/irssi.rb2
-rw-r--r--Library/Formula/jasper.rb2
-rw-r--r--Library/Formula/jpeg.rb2
-rw-r--r--Library/Formula/jruby.rb2
-rw-r--r--Library/Formula/lame.rb2
-rw-r--r--Library/Formula/lbdb.rb2
-rw-r--r--Library/Formula/lftp.rb2
-rw-r--r--Library/Formula/libao.rb2
-rw-r--r--Library/Formula/libcddb.rb2
-rw-r--r--Library/Formula/libcdio.rb2
-rw-r--r--Library/Formula/libdvbpsi.rb2
-rw-r--r--Library/Formula/libdvdcss.rb2
-rw-r--r--Library/Formula/libevent.rb2
-rw-r--r--Library/Formula/libffi.rb2
-rw-r--r--Library/Formula/libgcrypt.rb2
-rw-r--r--Library/Formula/libgee.rb2
-rw-r--r--Library/Formula/libgpg-error.rb2
-rw-r--r--Library/Formula/libidn.rb2
-rw-r--r--Library/Formula/liblastfm.rb2
-rw-r--r--Library/Formula/liblcms.rb2
-rw-r--r--Library/Formula/libmusicbrainz.rb2
-rw-r--r--Library/Formula/libogg.rb2
-rw-r--r--Library/Formula/libpng.rb2
-rw-r--r--Library/Formula/libqrencode.rb2
-rw-r--r--Library/Formula/libsamplerate.rb2
-rw-r--r--Library/Formula/libssh2.rb2
-rw-r--r--Library/Formula/libtiff.rb2
-rw-r--r--Library/Formula/libunistring.rb2
-rw-r--r--Library/Formula/libvorbis.rb2
-rw-r--r--Library/Formula/libwmf.rb2
-rw-r--r--Library/Formula/libyaml.rb2
-rw-r--r--Library/Formula/lightning.rb2
-rw-r--r--Library/Formula/lighttpd.rb2
-rw-r--r--Library/Formula/links.rb2
-rw-r--r--Library/Formula/litmus.rb2
-rw-r--r--Library/Formula/little-cms.rb2
-rw-r--r--Library/Formula/llvm.rb2
-rw-r--r--Library/Formula/logrotate.rb2
-rw-r--r--Library/Formula/lua.rb2
-rw-r--r--Library/Formula/luarocks.rb2
-rw-r--r--Library/Formula/lynx.rb2
-rw-r--r--Library/Formula/lysp.rb2
-rw-r--r--Library/Formula/macfuse.rb2
-rw-r--r--Library/Formula/mad.rb2
-rw-r--r--Library/Formula/mairix.rb2
-rw-r--r--Library/Formula/maven.rb2
-rw-r--r--Library/Formula/mawk.rb2
-rw-r--r--Library/Formula/mcrypt.rb2
-rw-r--r--Library/Formula/mediatomb.rb2
-rw-r--r--Library/Formula/memcached.rb2
-rw-r--r--Library/Formula/mg.rb2
-rw-r--r--Library/Formula/mhash.rb2
-rw-r--r--Library/Formula/mmv.rb2
-rw-r--r--Library/Formula/mod_wsgi.rb2
-rw-r--r--Library/Formula/mongodb.rb2
-rw-r--r--Library/Formula/monit.rb2
-rw-r--r--Library/Formula/most.rb2
-rw-r--r--Library/Formula/mpg123.rb2
-rw-r--r--Library/Formula/mplayer.rb2
-rw-r--r--Library/Formula/mrtg.rb2
-rw-r--r--Library/Formula/mtr.rb2
-rw-r--r--Library/Formula/mutt.rb2
-rw-r--r--Library/Formula/mysql-connector-c.rb2
-rw-r--r--Library/Formula/mysql.rb2
-rw-r--r--Library/Formula/nasm.rb2
-rw-r--r--Library/Formula/ncftp.rb2
-rw-r--r--Library/Formula/ncursesw.rb2
-rw-r--r--Library/Formula/neon.rb2
-rw-r--r--Library/Formula/netcat.rb2
-rw-r--r--Library/Formula/nethack.rb2
-rw-r--r--Library/Formula/nginx.rb2
-rw-r--r--Library/Formula/nmap.rb2
-rw-r--r--Library/Formula/node.rb2
-rw-r--r--Library/Formula/nspr.rb2
-rw-r--r--Library/Formula/objective-caml.rb2
-rw-r--r--Library/Formula/oggz.rb2
-rw-r--r--Library/Formula/omega.rb2
-rw-r--r--Library/Formula/oniguruma.rb2
-rw-r--r--Library/Formula/openexr.rb2
-rw-r--r--Library/Formula/orc.rb2
-rw-r--r--Library/Formula/osm2pgsql.rb2
-rw-r--r--Library/Formula/p7zip.rb2
-rw-r--r--Library/Formula/par2.rb2
-rw-r--r--Library/Formula/parrot.rb2
-rw-r--r--Library/Formula/pcre.rb2
-rw-r--r--Library/Formula/pdftohtml.rb2
-rw-r--r--Library/Formula/perforce.rb2
-rw-r--r--Library/Formula/pkg-config.rb2
-rw-r--r--Library/Formula/playdar.rb2
-rw-r--r--Library/Formula/pngcrush.rb2
-rw-r--r--Library/Formula/popt.rb2
-rw-r--r--Library/Formula/portaudio.rb2
-rw-r--r--Library/Formula/postgis.rb2
-rw-r--r--Library/Formula/postgresql.rb2
-rw-r--r--Library/Formula/proctools.rb2
-rw-r--r--Library/Formula/proj.rb2
-rw-r--r--Library/Formula/protobuf.rb2
-rw-r--r--Library/Formula/pstree.rb2
-rw-r--r--Library/Formula/pv.rb2
-rw-r--r--Library/Formula/pwgen.rb2
-rw-r--r--Library/Formula/pwsafe.rb2
-rw-r--r--Library/Formula/python.rb2
-rw-r--r--Library/Formula/qt.rb2
-rw-r--r--Library/Formula/quassel.rb2
-rw-r--r--Library/Formula/rabbitmq.rb2
-rw-r--r--Library/Formula/ragel.rb2
-rw-r--r--Library/Formula/raptor.rb2
-rw-r--r--Library/Formula/rasqal.rb2
-rw-r--r--Library/Formula/readline.rb2
-rw-r--r--Library/Formula/redis.rb2
-rw-r--r--Library/Formula/redland.rb2
-rw-r--r--Library/Formula/rogue.rb2
-rw-r--r--Library/Formula/rsync.rb2
-rw-r--r--Library/Formula/ruby-enterprise-edition.rb2
-rw-r--r--Library/Formula/ruby.rb2
-rw-r--r--Library/Formula/s-lang.rb2
-rw-r--r--Library/Formula/sbt.rb2
-rw-r--r--Library/Formula/scala.rb2
-rw-r--r--Library/Formula/scummvm.rb2
-rw-r--r--Library/Formula/sdl.rb2
-rw-r--r--Library/Formula/sdl_image.rb2
-rw-r--r--Library/Formula/sdl_mixer.rb2
-rw-r--r--Library/Formula/sdl_net.rb2
-rw-r--r--Library/Formula/sdl_ttf.rb2
-rw-r--r--Library/Formula/shorten.rb2
-rw-r--r--Library/Formula/siege.rb2
-rw-r--r--Library/Formula/sloccount.rb2
-rw-r--r--Library/Formula/soprano.rb2
-rw-r--r--Library/Formula/speex.rb2
-rw-r--r--Library/Formula/sphinx.rb2
-rw-r--r--Library/Formula/spidermonkey.rb2
-rw-r--r--Library/Formula/sqlite.rb2
-rw-r--r--Library/Formula/sshfs.rb2
-rw-r--r--Library/Formula/strigi.rb2
-rw-r--r--Library/Formula/subversion.rb2
-rw-r--r--Library/Formula/swig.rb2
-rw-r--r--Library/Formula/taglib.rb2
-rw-r--r--Library/Formula/term.rb2
-rw-r--r--Library/Formula/theora.rb2
-rw-r--r--Library/Formula/thrift.rb2
-rw-r--r--Library/Formula/tig.rb2
-rw-r--r--Library/Formula/timedog.rb2
-rw-r--r--Library/Formula/tintin.rb2
-rw-r--r--Library/Formula/tmux.rb2
-rw-r--r--Library/Formula/tokyo-cabinet.rb2
-rw-r--r--Library/Formula/tree.rb2
-rw-r--r--Library/Formula/unittest.rb2
-rw-r--r--Library/Formula/unixodbc.rb2
-rw-r--r--Library/Formula/unp.rb2
-rw-r--r--Library/Formula/unrar.rb2
-rw-r--r--Library/Formula/vala.rb2
-rw-r--r--Library/Formula/vbindiff.rb2
-rw-r--r--Library/Formula/vice.rb2
-rw-r--r--Library/Formula/vilistextum.rb2
-rw-r--r--Library/Formula/vorbis-tools.rb2
-rw-r--r--Library/Formula/w3m.rb2
-rw-r--r--Library/Formula/watch.rb2
-rw-r--r--Library/Formula/weechat.rb2
-rw-r--r--Library/Formula/wget.rb2
-rw-r--r--Library/Formula/wine.rb2
-rw-r--r--Library/Formula/wireshark.rb2
-rw-r--r--Library/Formula/wordnet.rb2
-rw-r--r--Library/Formula/wrangler.rb2
-rw-r--r--Library/Formula/x264.rb2
-rw-r--r--Library/Formula/xar.rb2
-rw-r--r--Library/Formula/xdebug.rb2
-rw-r--r--Library/Formula/xerces-c.rb2
-rw-r--r--Library/Formula/xmlrpc-c.rb2
-rw-r--r--Library/Formula/xpdf.rb2
-rw-r--r--Library/Formula/xu4.rb2
-rw-r--r--Library/Formula/yajl.rb2
-rw-r--r--Library/Formula/yasm.rb2
-rw-r--r--Library/Formula/yaz.rb2
-rw-r--r--Library/Formula/zebra.rb2
-rw-r--r--Library/Formula/znc.rb2
-rw-r--r--Library/Formula/zsh.rb2
-rw-r--r--Library/Homebrew/brew.h.rb2
-rw-r--r--Library/Homebrew/brewkit.rb4
-rw-r--r--Library/Homebrew/formula.rb2
-rwxr-xr-xLibrary/Homebrew/install.rb6
-rwxr-xr-xLibrary/Homebrew/unittest.rb2
282 files changed, 286 insertions, 284 deletions
diff --git a/Library/Formula/abuse.rb b/Library/Formula/abuse.rb
index c2fd88014..18ed40cef 100644
--- a/Library/Formula/abuse.rb
+++ b/Library/Formula/abuse.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class AbuseGameData <Formula
url 'http://abuse.zoy.org/raw/Downloads/abuse-data-2.00.tar.gz'
diff --git a/Library/Formula/ack.rb b/Library/Formula/ack.rb
index eb0e7eea1..e8930a634 100644
--- a/Library/Formula/ack.rb
+++ b/Library/Formula/ack.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ack <ScriptFileFormula
# NOTE you don't need to specify the version, usually it is determined
diff --git a/Library/Formula/activemq.rb b/Library/Formula/activemq.rb
index cee32dd27..93273cb19 100644
--- a/Library/Formula/activemq.rb
+++ b/Library/Formula/activemq.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Activemq <Formula
@url='http://www.apache.org/dist/activemq/apache-activemq/5.2.0/apache-activemq-5.2.0-bin.tar.gz'
diff --git a/Library/Formula/advancecomp.rb b/Library/Formula/advancecomp.rb
index f0d342d30..8c242f000 100644
--- a/Library/Formula/advancecomp.rb
+++ b/Library/Formula/advancecomp.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Advancecomp <Formula
url 'http://prdownloads.sourceforge.net/advancemame/advancecomp-1.15.tar.gz'
diff --git a/Library/Formula/angband.rb b/Library/Formula/angband.rb
index 5eea82b50..789dce27e 100644
--- a/Library/Formula/angband.rb
+++ b/Library/Formula/angband.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Angband <Formula
@url='http://rephial.org/downloads/3.0/angband-3.0.9b-src.tar.gz'
diff --git a/Library/Formula/ant.rb b/Library/Formula/ant.rb
index d6b98cd19..abd392201 100644
--- a/Library/Formula/ant.rb
+++ b/Library/Formula/ant.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO common aliases: 'apache ant'
diff --git a/Library/Formula/antiword.rb b/Library/Formula/antiword.rb
index b47c26d1a..e94a61fc5 100644
--- a/Library/Formula/antiword.rb
+++ b/Library/Formula/antiword.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Antiword <Formula
@url='http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz'
diff --git a/Library/Formula/apachetop.rb b/Library/Formula/apachetop.rb
index cc763124d..66f79353a 100644
--- a/Library/Formula/apachetop.rb
+++ b/Library/Formula/apachetop.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Apachetop <Formula
url 'http://www.webta.org/apachetop/apachetop-0.12.6.tar.gz'
diff --git a/Library/Formula/app-engine-java-sdk.rb b/Library/Formula/app-engine-java-sdk.rb
index a07d361f1..ae7db862c 100644
--- a/Library/Formula/app-engine-java-sdk.rb
+++ b/Library/Formula/app-engine-java-sdk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class AppEngineJavaSdk <Formula
@url='http://googleappengine.googlecode.com/files/appengine-java-sdk-1.2.5.zip'
diff --git a/Library/Formula/aria2.rb b/Library/Formula/aria2.rb
index 33ee0d5e7..021b1dd8f 100644
--- a/Library/Formula/aria2.rb
+++ b/Library/Formula/aria2.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Aria2 <Formula
@url='http://kent.dl.sourceforge.net/project/aria2/stable/aria2-1.5.2/aria2-1.5.2.tar.bz2'
diff --git a/Library/Formula/asciidoc.rb b/Library/Formula/asciidoc.rb
index 748ad2af8..6706748b4 100644
--- a/Library/Formula/asciidoc.rb
+++ b/Library/Formula/asciidoc.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Asciidoc <Formula
@url='http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.4.5/asciidoc-8.4.5.tar.gz'
diff --git a/Library/Formula/aspell.rb b/Library/Formula/aspell.rb
index 199032ad3..d0bba8815 100644
--- a/Library/Formula/aspell.rb
+++ b/Library/Formula/aspell.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Aspell <Formula
url 'ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.6.tar.gz'
diff --git a/Library/Formula/asterisk.rb b/Library/Formula/asterisk.rb
index 17456cb65..808705933 100644
--- a/Library/Formula/asterisk.rb
+++ b/Library/Formula/asterisk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Asterisk <Formula
url 'http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.6.1.6.tar.gz'
diff --git a/Library/Formula/astyle.rb b/Library/Formula/astyle.rb
index 81b7fa52f..e8cddf1c2 100644
--- a/Library/Formula/astyle.rb
+++ b/Library/Formula/astyle.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Astyle <Formula
@url='http://kent.dl.sourceforge.net/sourceforge/astyle/astyle_1.23_macosx.tar.gz'
diff --git a/Library/Formula/atomicparsley.rb b/Library/Formula/atomicparsley.rb
index adb350624..35d4d7e8d 100644
--- a/Library/Formula/atomicparsley.rb
+++ b/Library/Formula/atomicparsley.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Atomicparsley <Formula
@url='http://downloads.sourceforge.net/project/atomicparsley/atomicparsley/AtomicParsley%20v0.9.0/AtomicParsley-source-0.9.0.zip'
diff --git a/Library/Formula/automoc4.rb b/Library/Formula/automoc4.rb
index 1ca0b01bd..17ed6b2f1 100644
--- a/Library/Formula/automoc4.rb
+++ b/Library/Formula/automoc4.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Automoc4 <Formula
@url='http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2'
diff --git a/Library/Formula/axel.rb b/Library/Formula/axel.rb
index c58a8e956..7cae08031 100644
--- a/Library/Formula/axel.rb
+++ b/Library/Formula/axel.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Axel <Formula
url 'http://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2'
diff --git a/Library/Formula/bash-completion.rb b/Library/Formula/bash-completion.rb
index 190a44646..75cf6b697 100644
--- a/Library/Formula/bash-completion.rb
+++ b/Library/Formula/bash-completion.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class BashCompletion <Formula
@url='http://bash-completion.alioth.debian.org/files/bash-completion-1.1.tar.bz2'
diff --git a/Library/Formula/bash.rb b/Library/Formula/bash.rb
index ca8334830..4787f57de 100644
--- a/Library/Formula/bash.rb
+++ b/Library/Formula/bash.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Bash <Formula
@url='http://ftp.gnu.org/gnu/bash/bash-4.0.tar.gz'
diff --git a/Library/Formula/bchunk.rb b/Library/Formula/bchunk.rb
index 350349c30..782459509 100644
--- a/Library/Formula/bchunk.rb
+++ b/Library/Formula/bchunk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Bchunk <Formula
url 'http://he.fi/bchunk/bchunk-1.2.0.tar.gz'
diff --git a/Library/Formula/bdw-gc.rb b/Library/Formula/bdw-gc.rb
index 027e2ac4d..b8a511bff 100644
--- a/Library/Formula/bdw-gc.rb
+++ b/Library/Formula/bdw-gc.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class BdwGc <Formula
@url='http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz'
diff --git a/Library/Formula/beanstalk.rb b/Library/Formula/beanstalk.rb
index a99476f7c..3f9aa5f3a 100644
--- a/Library/Formula/beanstalk.rb
+++ b/Library/Formula/beanstalk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO alias: beanstalkd
diff --git a/Library/Formula/berkeley-db.rb b/Library/Formula/berkeley-db.rb
index eaa64ec50..36e7aba95 100644
--- a/Library/Formula/berkeley-db.rb
+++ b/Library/Formula/berkeley-db.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class BerkeleyDb <Formula
@url='http://download.oracle.com/berkeley-db/db-4.8.24.tar.gz'
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index d491b5f0a..d0dc6c7eb 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Boost <Formula
@homepage='http://www.boost.org'
diff --git a/Library/Formula/c-ares.rb b/Library/Formula/c-ares.rb
index 642f26d56..ad6cc4b41 100644
--- a/Library/Formula/c-ares.rb
+++ b/Library/Formula/c-ares.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class CAres <Formula
@url='http://c-ares.haxx.se/c-ares-1.6.0.tar.gz'
diff --git a/Library/Formula/cadaver.rb b/Library/Formula/cadaver.rb
index 40f486e74..fdea19901 100644
--- a/Library/Formula/cadaver.rb
+++ b/Library/Formula/cadaver.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Cadaver <Formula
@url='http://www.webdav.org/cadaver/cadaver-0.23.2.tar.gz'
diff --git a/Library/Formula/ccache.rb b/Library/Formula/ccache.rb
index 25aa37faf..5a6adf36b 100644
--- a/Library/Formula/ccache.rb
+++ b/Library/Formula/ccache.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ccache <Formula
@url='http://samba.org/ftp/ccache/ccache-2.4.tar.gz'
diff --git a/Library/Formula/chicken.rb b/Library/Formula/chicken.rb
index 1ce576079..243dce847 100644
--- a/Library/Formula/chicken.rb
+++ b/Library/Formula/chicken.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Chicken <Formula
@url='http://www.call-with-current-continuation.org/chicken-4.2.0.tar.gz'
diff --git a/Library/Formula/chocolate-doom.rb b/Library/Formula/chocolate-doom.rb
index f7b3612a0..e6ebba35d 100644
--- a/Library/Formula/chocolate-doom.rb
+++ b/Library/Formula/chocolate-doom.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class ChocolateDoom <Formula
url 'http://downloads.sourceforge.net/project/chocolate-doom/chocolate-doom/1.2.1/chocolate-doom-1.2.1.tar.gz'
diff --git a/Library/Formula/cksfv.rb b/Library/Formula/cksfv.rb
index 2d1235277..86447fbb9 100644
--- a/Library/Formula/cksfv.rb
+++ b/Library/Formula/cksfv.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Cksfv <Formula
@url='http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2'
diff --git a/Library/Formula/clojure.rb b/Library/Formula/clojure.rb
index fdd0d7cb2..99ec04a20 100644
--- a/Library/Formula/clojure.rb
+++ b/Library/Formula/clojure.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Clojure <Formula
url 'http://clojure.googlecode.com/files/clojure_1.0.0.zip'
diff --git a/Library/Formula/clucene.rb b/Library/Formula/clucene.rb
index 8b240578e..45b3f2cbc 100644
--- a/Library/Formula/clucene.rb
+++ b/Library/Formula/clucene.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Clucene <Formula
@url='http://kent.dl.sourceforge.net/project/clucene/clucene-core-stable/0.9.21/clucene-core-0.9.21.tar.bz2'
diff --git a/Library/Formula/cmake.rb b/Library/Formula/cmake.rb
index 1a3415c5c..280fd25a5 100644
--- a/Library/Formula/cmake.rb
+++ b/Library/Formula/cmake.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Cmake <Formula
@url='http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz'
diff --git a/Library/Formula/colordiff.rb b/Library/Formula/colordiff.rb
index b3185da87..d54f5478e 100644
--- a/Library/Formula/colordiff.rb
+++ b/Library/Formula/colordiff.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Colordiff <Formula
url 'http://colordiff.sourceforge.net/colordiff-1.0.9.tar.gz'
diff --git a/Library/Formula/coreutils.rb b/Library/Formula/coreutils.rb
index 67e11b25c..c44e8a182 100644
--- a/Library/Formula/coreutils.rb
+++ b/Library/Formula/coreutils.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
COREUTILS_ALIASES=<<-EOS
brew_prefix=`brew --prefix`
diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb
index dac18ae70..1b40d163e 100644
--- a/Library/Formula/couchdb.rb
+++ b/Library/Formula/couchdb.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Couchdb <Formula
@url='http://apache.multihomed.net/couchdb/0.10.0/apache-couchdb-0.10.0.tar.gz'
diff --git a/Library/Formula/cscope.rb b/Library/Formula/cscope.rb
index 4e1357aa7..0ff41596b 100644
--- a/Library/Formula/cscope.rb
+++ b/Library/Formula/cscope.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Cscope <Formula
@url='http://downloads.sourceforge.net/sourceforge/cscope/cscope-15.7a.tar.bz2'
diff --git a/Library/Formula/ctags.rb b/Library/Formula/ctags.rb
index f494bb343..dea689412 100644
--- a/Library/Formula/ctags.rb
+++ b/Library/Formula/ctags.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO keywords for search include 'exuberant'
diff --git a/Library/Formula/d-bus.rb b/Library/Formula/d-bus.rb
index 84b1c85b4..09bf6486d 100644
--- a/Library/Formula/d-bus.rb
+++ b/Library/Formula/d-bus.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class DBus <Formula
url 'http://dbus.freedesktop.org/releases/dbus/dbus-1.2.16.tar.gz'
diff --git a/Library/Formula/darwinbuild.rb b/Library/Formula/darwinbuild.rb
index 08db081af..ceef44496 100644
--- a/Library/Formula/darwinbuild.rb
+++ b/Library/Formula/darwinbuild.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Darwinbuild <Formula
head 'http://svn.macosforge.org/repository/darwinbuild/trunk/'
diff --git a/Library/Formula/dcraw.rb b/Library/Formula/dcraw.rb
index d35775725..f14346af2 100644
--- a/Library/Formula/dcraw.rb
+++ b/Library/Formula/dcraw.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Dcraw <Formula
head 'http://www.cybercom.net/~dcoffin/dcraw/dcraw.c'
diff --git a/Library/Formula/ddrescue.rb b/Library/Formula/ddrescue.rb
index a186b4a71..c43d045e3 100644
--- a/Library/Formula/ddrescue.rb
+++ b/Library/Formula/ddrescue.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ddrescue <Formula
@url='http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.11.tar.gz'
diff --git a/Library/Formula/dict.rb b/Library/Formula/dict.rb
index 8333c09fe..d0924ba11 100644
--- a/Library/Formula/dict.rb
+++ b/Library/Formula/dict.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
DICT_CONF=<<-EOS
# /etc/dict.conf Written by Bob Hilliard <hilliard@debian.org>
diff --git a/Library/Formula/dirac.rb b/Library/Formula/dirac.rb
index 7abdeda1d..4f778f557 100644
--- a/Library/Formula/dirac.rb
+++ b/Library/Formula/dirac.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Dirac <Formula
url 'http://diracvideo.org/download/dirac-research/dirac-1.0.2.tar.gz'
diff --git a/Library/Formula/dmd.rb b/Library/Formula/dmd.rb
index bc156b839..c820852f9 100644
--- a/Library/Formula/dmd.rb
+++ b/Library/Formula/dmd.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Dmd <Formula
@homepage='http://www.digitalmars.com/d/'
diff --git a/Library/Formula/dnsmasq.rb b/Library/Formula/dnsmasq.rb
index e6fb14694..293e755bd 100644
--- a/Library/Formula/dnsmasq.rb
+++ b/Library/Formula/dnsmasq.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Dnsmasq <Formula
@url='http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.50.tar.gz'
diff --git a/Library/Formula/dos2unix.rb b/Library/Formula/dos2unix.rb
index bba4a31b3..2343a81e6 100644
--- a/Library/Formula/dos2unix.rb
+++ b/Library/Formula/dos2unix.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Dos2unix <Formula
url 'http://www.sfr-fresh.com/linux/misc/old/dos2unix-3.1.tar.gz'
diff --git a/Library/Formula/dovecot.rb b/Library/Formula/dovecot.rb
index 26d5ede7b..242cc3d1a 100644
--- a/Library/Formula/dovecot.rb
+++ b/Library/Formula/dovecot.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Dovecot <Formula
@url='http://www.dovecot.org/releases/1.2/dovecot-1.2.4.tar.gz'
diff --git a/Library/Formula/ec2-api-tools.rb b/Library/Formula/ec2-api-tools.rb
index 58239bb6d..e79dadd02 100644
--- a/Library/Formula/ec2-api-tools.rb
+++ b/Library/Formula/ec2-api-tools.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ec2ApiTools <Formula
@homepage='http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351'
diff --git a/Library/Formula/elinks.rb b/Library/Formula/elinks.rb
index 6d44ef0ff..a6367b575 100644
--- a/Library/Formula/elinks.rb
+++ b/Library/Formula/elinks.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Elinks <Formula
@homepage='http://elinks.or.cz/'
diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index 995ec0c61..99d13aeec 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Emacs <Formula
head 'git://git.savannah.gnu.org/emacs.git'
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index c7c1b2d83..029c8b214 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class ErlangManuals <Formula
url 'http://www.erlang.org/download/otp_doc_man_R13B02-1.tar.gz'
diff --git a/Library/Formula/expat.rb b/Library/Formula/expat.rb
index cfe6af859..cc297608f 100644
--- a/Library/Formula/expat.rb
+++ b/Library/Formula/expat.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Expat <Formula
@url='http://softlayer.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz'
diff --git a/Library/Formula/faac.rb b/Library/Formula/faac.rb
index 67cab252d..26ccdb7c9 100644
--- a/Library/Formula/faac.rb
+++ b/Library/Formula/faac.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Faac <Formula
url 'http://surfnet.dl.sourceforge.net/project/faac/faac-src/faac-1.28/faac-1.28.tar.gz'
diff --git a/Library/Formula/faad2.rb b/Library/Formula/faad2.rb
index 0e1eba23b..bea0b2cec 100644
--- a/Library/Formula/faad2.rb
+++ b/Library/Formula/faad2.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Faad2 <Formula
url 'http://surfnet.dl.sourceforge.net/project/faac/faad2-src/faad2-2.7/faad2-2.7.tar.bz2'
diff --git a/Library/Formula/fabricate.rb b/Library/Formula/fabricate.rb
index 8d75d586a..6495e7efb 100644
--- a/Library/Formula/fabricate.rb
+++ b/Library/Formula/fabricate.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fabricate <ScriptFileFormula
@url='http://fabricate.googlecode.com/svn/trunk'
diff --git a/Library/Formula/factor.rb b/Library/Formula/factor.rb
index 6cf791873..66cdbf175 100644
--- a/Library/Formula/factor.rb
+++ b/Library/Formula/factor.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# This formula installs Factor TRUNK, as there is no
# good stable release. It also takes up to and including
diff --git a/Library/Formula/fastri.rb b/Library/Formula/fastri.rb
index 67badbf0d..c8eeba856 100644
--- a/Library/Formula/fastri.rb
+++ b/Library/Formula/fastri.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fastri <Formula
@homepage='http://eigenclass.org/hiki/fastri'
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 38d99bd32..4af472757 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ffmpeg <Formula
head 'svn://svn.ffmpeg.org/ffmpeg/trunk'
diff --git a/Library/Formula/fftw.rb b/Library/Formula/fftw.rb
index 68aacc45c..4ba2e761e 100644
--- a/Library/Formula/fftw.rb
+++ b/Library/Formula/fftw.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fftw <Formula
@homepage='http://www.fftw.org'
diff --git a/Library/Formula/findutils.rb b/Library/Formula/findutils.rb
index fe15720ef..bbb7b4287 100644
--- a/Library/Formula/findutils.rb
+++ b/Library/Formula/findutils.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Findutils <Formula
@url='http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz'
diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index 0f4d71b79..4bea4234f 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fish <Formula
url='http://downloads.sourceforge.net/project/fish/fish/1.23.1/fish-1.23.1.tar.bz2'
diff --git a/Library/Formula/flac.rb b/Library/Formula/flac.rb
index eaca70344..fd1134de8 100644
--- a/Library/Formula/flac.rb
+++ b/Library/Formula/flac.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Flac2Mp3 <GithubGistFormula
@url='http://gist.github.com/raw/124242/79857936f1d72824be0fb5d2ac845c02322abea0/flac2mp3'
diff --git a/Library/Formula/fondu.rb b/Library/Formula/fondu.rb
index 7f0a51695..e25fc1a66 100644
--- a/Library/Formula/fondu.rb
+++ b/Library/Formula/fondu.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fondu <Formula
url 'http://fondu.sourceforge.net/fondu_src-060102.tgz'
diff --git a/Library/Formula/fop.rb b/Library/Formula/fop.rb
index b74bf410b..4f4faccea 100644
--- a/Library/Formula/fop.rb
+++ b/Library/Formula/fop.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO common aliases: apache-fop
diff --git a/Library/Formula/fossil.rb b/Library/Formula/fossil.rb
index f5b4343c4..f4e828538 100644
--- a/Library/Formula/fossil.rb
+++ b/Library/Formula/fossil.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fossil <Formula
@url='http://www.fossil-scm.org/download/fossil-src-20090914165629.tar.gz'
diff --git a/Library/Formula/fribidi.rb b/Library/Formula/fribidi.rb
index a80edd0b4..ce21f05c7 100644
--- a/Library/Formula/fribidi.rb
+++ b/Library/Formula/fribidi.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Fribidi <Formula
url 'http://fribidi.org/download/fribidi-0.10.9.tar.gz'
diff --git a/Library/Formula/frotz.rb b/Library/Formula/frotz.rb
index 5d4cbd559..9a63ee828 100644
--- a/Library/Formula/frotz.rb
+++ b/Library/Formula/frotz.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Frotz <Formula
@url='http://downloads.sourceforge.net/project/frotz/frotz/2.43/frotz-2.43.tar.gz'
diff --git a/Library/Formula/gawk.rb b/Library/Formula/gawk.rb
index 03dee8d66..3f45f0981 100644
--- a/Library/Formula/gawk.rb
+++ b/Library/Formula/gawk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gawk <Formula
@url='http://ftp.gnu.org/gnu/gawk/gawk-3.1.7.tar.bz2'
diff --git a/Library/Formula/gccxml.rb b/Library/Formula/gccxml.rb
index 8835fb1a3..6bb0f0c6c 100644
--- a/Library/Formula/gccxml.rb
+++ b/Library/Formula/gccxml.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gccxml <Formula
# NOTE you don't need to specify the version, usually it is determined
diff --git a/Library/Formula/gd.rb b/Library/Formula/gd.rb
index 023675d7f..f1336c48d 100644
--- a/Library/Formula/gd.rb
+++ b/Library/Formula/gd.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gd <Formula
version "2.0.36RC1"
diff --git a/Library/Formula/geoip.rb b/Library/Formula/geoip.rb
index 41d1e9e5d..5539d89d6 100644
--- a/Library/Formula/geoip.rb
+++ b/Library/Formula/geoip.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO common aliases libgeoip
diff --git a/Library/Formula/geos.rb b/Library/Formula/geos.rb
index 25cd463d8..bb1b0657f 100644
--- a/Library/Formula/geos.rb
+++ b/Library/Formula/geos.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Geos <Formula
url 'http://download.osgeo.org/geos/geos-3.1.1.tar.bz2'
diff --git a/Library/Formula/gettext.rb b/Library/Formula/gettext.rb
index c52e99d74..3d2e118f5 100644
--- a/Library/Formula/gettext.rb
+++ b/Library/Formula/gettext.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gettext <Formula
@url='http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz'
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
index af8e1697d..4821b2b01 100644
--- a/Library/Formula/ghostscript.rb
+++ b/Library/Formula/ghostscript.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GhostscriptFonts <Formula
url 'http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz'
diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
index 5efafbe5e..0b19d27de 100644
--- a/Library/Formula/git.rb
+++ b/Library/Formula/git.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GitManuals <Formula
url 'http://kernel.org/pub/software/scm/git/git-manpages-1.6.5.tar.bz2'
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 758f78b11..f7d0b4822 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libiconv <Formula
@url='http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz'
diff --git a/Library/Formula/global.rb b/Library/Formula/global.rb
index b81f58a99..5048dccff 100644
--- a/Library/Formula/global.rb
+++ b/Library/Formula/global.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Global <Formula
@url='http://ftp.gnu.org/gnu/global/global-5.6.tar.gz'
diff --git a/Library/Formula/gloox.rb b/Library/Formula/gloox.rb
index 66abb6c89..a5725feec 100644
--- a/Library/Formula/gloox.rb
+++ b/Library/Formula/gloox.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gloox <Formula
@url='http://camaya.net/download/gloox-1.0-beta7.tar.bz2'
diff --git a/Library/Formula/glpk.rb b/Library/Formula/glpk.rb
index f73b42a82..8bfbfa279 100644
--- a/Library/Formula/glpk.rb
+++ b/Library/Formula/glpk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Glpk <Formula
url 'http://ftp.gnu.org/gnu/glpk/glpk-4.39.tar.gz'
diff --git a/Library/Formula/gmp.rb b/Library/Formula/gmp.rb
index 6603e3b09..312bd0940 100644
--- a/Library/Formula/gmp.rb
+++ b/Library/Formula/gmp.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gmp <Formula
url 'ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.bz2'
diff --git a/Library/Formula/gnu-go.rb b/Library/Formula/gnu-go.rb
index af7c2885e..1ff880c4c 100644
--- a/Library/Formula/gnu-go.rb
+++ b/Library/Formula/gnu-go.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GnuGo <Formula
@url='http://ftp.gnu.org/gnu/gnugo/gnugo-3.8.tar.gz'
diff --git a/Library/Formula/gnu-sed.rb b/Library/Formula/gnu-sed.rb
index 1a215ec61..24ce88b38 100644
--- a/Library/Formula/gnu-sed.rb
+++ b/Library/Formula/gnu-sed.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GnuSed <Formula
@url='http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.bz2'
diff --git a/Library/Formula/gnu-smalltalk.rb b/Library/Formula/gnu-smalltalk.rb
index f6b7852e9..5f87721b2 100644
--- a/Library/Formula/gnu-smalltalk.rb
+++ b/Library/Formula/gnu-smalltalk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GnuSmalltalk <Formula
@url='ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-3.1.tar.gz'
diff --git a/Library/Formula/gnu-tar.rb b/Library/Formula/gnu-tar.rb
index 29f1c6b58..f86771191 100644
--- a/Library/Formula/gnu-tar.rb
+++ b/Library/Formula/gnu-tar.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GnuTar < Formula
@url='ftp://ftp.gnu.org/gnu/tar/tar-1.22.tar.gz'
diff --git a/Library/Formula/gnupg.rb b/Library/Formula/gnupg.rb
index 6202b93bd..ede1b9ac2 100644
--- a/Library/Formula/gnupg.rb
+++ b/Library/Formula/gnupg.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gnupg <Formula
@url='ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.10.tar.bz2'
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index 708852782..e4b3a112f 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gnuplot <Formula
@url='http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.2.6/gnuplot-4.2.6.tar.gz'
diff --git a/Library/Formula/gnutls.rb b/Library/Formula/gnutls.rb
index f4229ea98..38d388cb6 100644
--- a/Library/Formula/gnutls.rb
+++ b/Library/Formula/gnutls.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Gnutls <Formula
@url='http://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.3.tar.bz2'
diff --git a/Library/Formula/google-perftools.rb b/Library/Formula/google-perftools.rb
index edb7f73d1..0b782c114 100644
--- a/Library/Formula/google-perftools.rb
+++ b/Library/Formula/google-perftools.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class GooglePerftools <Formula
url 'http://google-perftools.googlecode.com/files/google-perftools-1.4.tar.gz'
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
index 4ecbb895b..d56f6298d 100644
--- a/Library/Formula/graphviz.rb
+++ b/Library/Formula/graphviz.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Graphviz <Formula
url 'http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.24.0.tar.gz'
diff --git a/Library/Formula/grc.rb b/Library/Formula/grc.rb
index 527798214..0d474ccbd 100644
--- a/Library/Formula/grc.rb
+++ b/Library/Formula/grc.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
######################################################################### cook
class Grc <Formula
diff --git a/Library/Formula/guile.rb b/Library/Formula/guile.rb
index 00e07cefb..cc76a6fdd 100644
--- a/Library/Formula/guile.rb
+++ b/Library/Formula/guile.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Guile <Formula
@url='ftp://alpha.gnu.org/gnu/guile/guile-1.9.3.tar.gz'
diff --git a/Library/Formula/hercules.rb b/Library/Formula/hercules.rb
index ee2f9971f..2851e0ca9 100644
--- a/Library/Formula/hercules.rb
+++ b/Library/Formula/hercules.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Hercules <Formula
url 'http://www.hercules-390.org/hercules-3.06.tar.gz'
diff --git a/Library/Formula/httperf.rb b/Library/Formula/httperf.rb
index 41f830289..9f4659e59 100644
--- a/Library/Formula/httperf.rb
+++ b/Library/Formula/httperf.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Httperf <Formula
url 'ftp://ftp.hpl.hp.com/pub/httperf/httperf-0.9.0.tar.gz'
diff --git a/Library/Formula/icu4c.rb b/Library/Formula/icu4c.rb
index e943f4960..56b6e4eab 100644
--- a/Library/Formula/icu4c.rb
+++ b/Library/Formula/icu4c.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Icu4c <Formula
@url='http://download.icu-project.org/files/icu4c/4.3.1/icu4c-4_3_1-src.tgz'
diff --git a/Library/Formula/id3lib.rb b/Library/Formula/id3lib.rb
index 42f5c9728..91ef67b07 100644
--- a/Library/Formula/id3lib.rb
+++ b/Library/Formula/id3lib.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Id3lib <Formula
@url='http://voxel.dl.sourceforge.net/project/id3lib/id3lib/3.8.3/id3lib-3.8.3.tar.gz'
diff --git a/Library/Formula/ilmbase.rb b/Library/Formula/ilmbase.rb
index c06e16ef9..b1123c591 100644
--- a/Library/Formula/ilmbase.rb
+++ b/Library/Formula/ilmbase.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ilmbase <Formula
url 'http://download.savannah.gnu.org/releases/openexr/ilmbase-1.0.1.tar.gz'
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index ff5211d90..105972c6d 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# some credit to http://github.com/maddox/magick-installer
diff --git a/Library/Formula/intltool.rb b/Library/Formula/intltool.rb
index 1d7af988c..4db38785b 100644
--- a/Library/Formula/intltool.rb
+++ b/Library/Formula/intltool.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Intltool <Formula
@url='http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-0.41.0.tar.gz'
diff --git a/Library/Formula/iperf.rb b/Library/Formula/iperf.rb
index ffc9e4b3f..35ab04a40 100644
--- a/Library/Formula/iperf.rb
+++ b/Library/Formula/iperf.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Iperf <Formula
@url='http://downloads.sourceforge.net/project/iperf/iperf/2.0.4%20source/iperf-2.0.4.tar.gz'
diff --git a/Library/Formula/ircii.rb b/Library/Formula/ircii.rb
index 0fdf930b2..4982b1f11 100644
--- a/Library/Formula/ircii.rb
+++ b/Library/Formula/ircii.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ircii <Formula
url 'ftp://ircii.warped.com//pub/ircII//ircii-20081115.tar.bz2'
diff --git a/Library/Formula/irssi.rb b/Library/Formula/irssi.rb
index ba79607d0..9d688d535 100644
--- a/Library/Formula/irssi.rb
+++ b/Library/Formula/irssi.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Irssi <Formula
@url='http://irssi.org/files/irssi-0.8.14.tar.bz2'
diff --git a/Library/Formula/jasper.rb b/Library/Formula/jasper.rb
index 78c7b6a7a..50a6b1796 100644
--- a/Library/Formula/jasper.rb
+++ b/Library/Formula/jasper.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Jasper <Formula
url 'http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip'
diff --git a/Library/Formula/jpeg.rb b/Library/Formula/jpeg.rb
index 4f5ce8037..ccab9c314 100644
--- a/Library/Formula/jpeg.rb
+++ b/Library/Formula/jpeg.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Jpeg <Formula
@url='http://www.ijg.org/files/jpegsrc.v7.tar.gz'
diff --git a/Library/Formula/jruby.rb b/Library/Formula/jruby.rb
index 58103e225..5ea85f987 100644
--- a/Library/Formula/jruby.rb
+++ b/Library/Formula/jruby.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# My god! 20,000 files?!
# TODO trim that a bit? Seems crazy.
diff --git a/Library/Formula/lame.rb b/Library/Formula/lame.rb
index 2c248285c..77f1afedd 100644
--- a/Library/Formula/lame.rb
+++ b/Library/Formula/lame.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lame <Formula
@homepage='http://lame.sourceforge.net/'
diff --git a/Library/Formula/lbdb.rb b/Library/Formula/lbdb.rb
index f3697cf83..4f32f46ce 100644
--- a/Library/Formula/lbdb.rb
+++ b/Library/Formula/lbdb.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lbdb <Formula
url 'http://www.spinnaker.de/debian/lbdb_0.36.tar.gz'
diff --git a/Library/Formula/lftp.rb b/Library/Formula/lftp.rb
index 2cd13ee63..ebafb4f61 100644
--- a/Library/Formula/lftp.rb
+++ b/Library/Formula/lftp.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lftp <Formula
@url='http://ftp.yars.free.net/pub/source/lftp/lftp-3.7.15.tar.gz'
diff --git a/Library/Formula/libao.rb b/Library/Formula/libao.rb
index 36a50044b..ea6cbe381 100644
--- a/Library/Formula/libao.rb
+++ b/Library/Formula/libao.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libao <Formula
@url='http://downloads.xiph.org/releases/ao/libao-0.8.8.tar.gz'
diff --git a/Library/Formula/libcddb.rb b/Library/Formula/libcddb.rb
index 950ec2b44..c58a6337a 100644
--- a/Library/Formula/libcddb.rb
+++ b/Library/Formula/libcddb.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libcddb <Formula
url 'http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2'
diff --git a/Library/Formula/libcdio.rb b/Library/Formula/libcdio.rb
index 1daa590a4..ed3d14637 100644
--- a/Library/Formula/libcdio.rb
+++ b/Library/Formula/libcdio.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libcdio <Formula
url 'http://ftp.gnu.org/gnu/libcdio/libcdio-0.81.tar.gz'
diff --git a/Library/Formula/libdvbpsi.rb b/Library/Formula/libdvbpsi.rb
index 896935aac..00d9af449 100644
--- a/Library/Formula/libdvbpsi.rb
+++ b/Library/Formula/libdvbpsi.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libdvbpsi <Formula
url 'http://download.videolan.org/pub/libdvbpsi/0.1.6/libdvbpsi5-0.1.6.tar.bz2'
diff --git a/Library/Formula/libdvdcss.rb b/Library/Formula/libdvdcss.rb
index aed957aea..84afc997d 100644
--- a/Library/Formula/libdvdcss.rb
+++ b/Library/Formula/libdvdcss.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libdvdcss <Formula
url 'http://download.videolan.org/pub/libdvdcss/1.2.9/libdvdcss-1.2.9.tar.bz2'
diff --git a/Library/Formula/libevent.rb b/Library/Formula/libevent.rb
index 5b6c82783..9d57a287e 100644
--- a/Library/Formula/libevent.rb
+++ b/Library/Formula/libevent.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libevent <Formula
@version='1.4.12'
diff --git a/Library/Formula/libffi.rb b/Library/Formula/libffi.rb
index 528ebe816..6731722bf 100644
--- a/Library/Formula/libffi.rb
+++ b/Library/Formula/libffi.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libffi <Formula
@url='ftp://sourceware.org/pub/libffi/libffi-3.0.8.tar.gz'
diff --git a/Library/Formula/libgcrypt.rb b/Library/Formula/libgcrypt.rb
index 6495acb2d..678916654 100644
--- a/Library/Formula/libgcrypt.rb
+++ b/Library/Formula/libgcrypt.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libgcrypt <Formula
@url='ftp://ftp.gnupg.org//gcrypt/libgcrypt/libgcrypt-1.4.4.tar.bz2'
diff --git a/Library/Formula/libgee.rb b/Library/Formula/libgee.rb
index a5a015069..1aaa56436 100644
--- a/Library/Formula/libgee.rb
+++ b/Library/Formula/libgee.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libgee <Formula
@url='http://ftp.gnome.org/pub/GNOME/sources/libgee/0.3/libgee-0.3.0.tar.bz2'
diff --git a/Library/Formula/libgpg-error.rb b/Library/Formula/libgpg-error.rb
index d9eb1653c..2d9d75d4f 100644
--- a/Library/Formula/libgpg-error.rb
+++ b/Library/Formula/libgpg-error.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class LibgpgError <Formula
@url='ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.7.tar.bz2'
diff --git a/Library/Formula/libidn.rb b/Library/Formula/libidn.rb
index 0db21a831..93251dfb5 100644
--- a/Library/Formula/libidn.rb
+++ b/Library/Formula/libidn.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libidn <Formula
@url='http://ftp.gnu.org/gnu/libidn/libidn-1.9.tar.gz'
diff --git a/Library/Formula/liblastfm.rb b/Library/Formula/liblastfm.rb
index fabdf637b..7026c5c9a 100644
--- a/Library/Formula/liblastfm.rb
+++ b/Library/Formula/liblastfm.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Liblastfm <Formula
@homepage='http://github.com/mxcl/liblastfm/'
diff --git a/Library/Formula/liblcms.rb b/Library/Formula/liblcms.rb
index 045555139..d9fa4c530 100644
--- a/Library/Formula/liblcms.rb
+++ b/Library/Formula/liblcms.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Liblcms <Formula
url 'http://www.littlecms.com/lcms-1.18a.tar.gz'
diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb
index b7869abca..0200a2591 100644
--- a/Library/Formula/libmusicbrainz.rb
+++ b/Library/Formula/libmusicbrainz.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libmusicbrainz <Formula
@url='http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.2.tar.gz'
diff --git a/Library/Formula/libogg.rb b/Library/Formula/libogg.rb
index 19d8ccfc5..ecb9dfa27 100644
--- a/Library/Formula/libogg.rb
+++ b/Library/Formula/libogg.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libogg <Formula
@homepage='http://www.xiph.org/ogg/'
diff --git a/Library/Formula/libpng.rb b/Library/Formula/libpng.rb
index b9dae2826..09b738c2b 100644
--- a/Library/Formula/libpng.rb
+++ b/Library/Formula/libpng.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libpng <Formula
@url='http://prdownloads.sourceforge.net/libpng/libpng-1.2.40.tar.gz'
diff --git a/Library/Formula/libqrencode.rb b/Library/Formula/libqrencode.rb
index b5e6f83fb..395d38af8 100644
--- a/Library/Formula/libqrencode.rb
+++ b/Library/Formula/libqrencode.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libqrencode <Formula
url 'http://megaui.net/fukuchi/works/qrencode/qrencode-3.1.0.tar.gz'
diff --git a/Library/Formula/libsamplerate.rb b/Library/Formula/libsamplerate.rb
index d6dedc6c7..10a91b07d 100644
--- a/Library/Formula/libsamplerate.rb
+++ b/Library/Formula/libsamplerate.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libsamplerate <Formula
@homepage='http://www.mega-nerd.com/SRC'
diff --git a/Library/Formula/libssh2.rb b/Library/Formula/libssh2.rb
index ec7f6a4cb..1cd0a5f81 100644
--- a/Library/Formula/libssh2.rb
+++ b/Library/Formula/libssh2.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libssh2 <Formula
url 'http://www.libssh2.org/download/libssh2-1.2.1.tar.gz'
diff --git a/Library/Formula/libtiff.rb b/Library/Formula/libtiff.rb
index e7ed54eb6..005e90db0 100644
--- a/Library/Formula/libtiff.rb
+++ b/Library/Formula/libtiff.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libtiff <Formula
@url='ftp://ftp.remotesensing.org/libtiff/tiff-3.8.2.tar.gz'
diff --git a/Library/Formula/libunistring.rb b/Library/Formula/libunistring.rb
index 47506561c..1151fd25a 100644
--- a/Library/Formula/libunistring.rb
+++ b/Library/Formula/libunistring.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libunistring <Formula
@url='http://www.de-mirrors.de/gnuftp/libunistring/libunistring-0.9.1.1.tar.gz'
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index 0cdb09236..d937bfab4 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libvorbis <Formula
@url='http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.bz2'
diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb
index f1a3ba1a1..373868f3e 100644
--- a/Library/Formula/libwmf.rb
+++ b/Library/Formula/libwmf.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libwmf <Formula
@url='http://downloads.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz'
diff --git a/Library/Formula/libyaml.rb b/Library/Formula/libyaml.rb
index 259dbecc7..9bd9df1b9 100644
--- a/Library/Formula/libyaml.rb
+++ b/Library/Formula/libyaml.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Libyaml <Formula
url 'http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz'
diff --git a/Library/Formula/lightning.rb b/Library/Formula/lightning.rb
index 13d792264..fbff8dd6f 100644
--- a/Library/Formula/lightning.rb
+++ b/Library/Formula/lightning.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lightning <Formula
url 'http://ftp.gnu.org/gnu/lightning/lightning-1.2.tar.gz'
diff --git a/Library/Formula/lighttpd.rb b/Library/Formula/lighttpd.rb
index ce2b8a286..fa3170e11 100644
--- a/Library/Formula/lighttpd.rb
+++ b/Library/Formula/lighttpd.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lighttpd <Formula
@url='http://www.lighttpd.net/download/lighttpd-1.4.23.tar.bz2'
diff --git a/Library/Formula/links.rb b/Library/Formula/links.rb
index 9f7432e35..b135966b0 100644
--- a/Library/Formula/links.rb
+++ b/Library/Formula/links.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Links <Formula
@url='http://links.twibright.com/download/links-2.2.tar.gz'
diff --git a/Library/Formula/litmus.rb b/Library/Formula/litmus.rb
index e33530350..c61f6de87 100644
--- a/Library/Formula/litmus.rb
+++ b/Library/Formula/litmus.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Litmus <Formula
@url='http://www.webdav.org/neon/litmus/litmus-0.12.1.tar.gz'
diff --git a/Library/Formula/little-cms.rb b/Library/Formula/little-cms.rb
index a3efd783b..15a2810a8 100644
--- a/Library/Formula/little-cms.rb
+++ b/Library/Formula/little-cms.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class LittleCms <Formula
@url='http://www.littlecms.com/lcms-1.17.tar.gz'
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index 8a6a5e7d2..8cfdb06c0 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Llvm <Formula
@url='http://llvm.org/releases/2.5/llvm-2.5.tar.gz'
diff --git a/Library/Formula/logrotate.rb b/Library/Formula/logrotate.rb
index aa9c09339..50a6aac83 100644
--- a/Library/Formula/logrotate.rb
+++ b/Library/Formula/logrotate.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Logrotate <Formula
url 'http://ftp.de.debian.org/debian/pool/main/l/logrotate/logrotate_3.7.8.orig.tar.gz'
diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb
index 3421ebfdd..7fa5c6aa2 100644
--- a/Library/Formula/lua.rb
+++ b/Library/Formula/lua.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lua <Formula
@url='http://www.lua.org/ftp/lua-5.1.4.tar.gz'
diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb
index a8165f7c6..b8161c32b 100644
--- a/Library/Formula/luarocks.rb
+++ b/Library/Formula/luarocks.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Luarocks <Formula
@url='http://luaforge.net/frs/download.php/3981/luarocks-1.0.1.tar.gz'
diff --git a/Library/Formula/lynx.rb b/Library/Formula/lynx.rb
index 1317f9304..ed3611a56 100644
--- a/Library/Formula/lynx.rb
+++ b/Library/Formula/lynx.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lynx <Formula
url 'http://lynx.isc.org/release/lynx2.8.7.tar.bz2'
diff --git a/Library/Formula/lysp.rb b/Library/Formula/lysp.rb
index f428625af..656930c10 100644
--- a/Library/Formula/lysp.rb
+++ b/Library/Formula/lysp.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Lysp <Formula
url 'http://www.piumarta.com/software/lysp/lysp-1.0.tar.gz'
diff --git a/Library/Formula/macfuse.rb b/Library/Formula/macfuse.rb
index 3ccad9741..b2d339cea 100644
--- a/Library/Formula/macfuse.rb
+++ b/Library/Formula/macfuse.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
def first_dir
Pathname.getwd.children.find { |d| d.directory? }
diff --git a/Library/Formula/mad.rb b/Library/Formula/mad.rb
index 68c811ade..7f5dff81e 100644
--- a/Library/Formula/mad.rb
+++ b/Library/Formula/mad.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mad <Formula
homepage 'http://www.underbit.com/products/mad/'
diff --git a/Library/Formula/mairix.rb b/Library/Formula/mairix.rb
index 51c238ac6..52f4b27df 100644
--- a/Library/Formula/mairix.rb
+++ b/Library/Formula/mairix.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mairix <Formula
homepage 'http://www.rpcurnow.force9.co.uk/mairix/'
diff --git a/Library/Formula/maven.rb b/Library/Formula/maven.rb
index 161cc774e..c533a57a5 100644
--- a/Library/Formula/maven.rb
+++ b/Library/Formula/maven.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Maven <Formula
@url='http://apache.mirrors.timporter.net/maven/binaries/apache-maven-2.2.1-bin.tar.gz'
diff --git a/Library/Formula/mawk.rb b/Library/Formula/mawk.rb
index 91c8c43fd..1b0fb3a67 100644
--- a/Library/Formula/mawk.rb
+++ b/Library/Formula/mawk.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mawk <Formula
@url='http://invisible-island.net/datafiles/release/mawk.tar.gz'
diff --git a/Library/Formula/mcrypt.rb b/Library/Formula/mcrypt.rb
index a69935875..6ce5e47a6 100644
--- a/Library/Formula/mcrypt.rb
+++ b/Library/Formula/mcrypt.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mcrypt <Formula
@url='ftp://mirror.internode.on.net/pub/gentoo/distfiles/libmcrypt-2.5.8.tar.gz'
diff --git a/Library/Formula/mediatomb.rb b/Library/Formula/mediatomb.rb
index 1fe9f2cc3..9faf27775 100644
--- a/Library/Formula/mediatomb.rb
+++ b/Library/Formula/mediatomb.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mediatomb <Formula
@url='http://downloads.sourceforge.net/mediatomb/mediatomb-0.11.0.tar.gz'
diff --git a/Library/Formula/memcached.rb b/Library/Formula/memcached.rb
index 3b942615f..d7a24b204 100644
--- a/Library/Formula/memcached.rb
+++ b/Library/Formula/memcached.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Memcached <Formula
@url='http://memcached.googlecode.com/files/memcached-1.4.0.tar.gz'
diff --git a/Library/Formula/mg.rb b/Library/Formula/mg.rb
index a9347f57d..9e469fd17 100644
--- a/Library/Formula/mg.rb
+++ b/Library/Formula/mg.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mg <Formula
url 'http://www.dds.nl/~han/software/mg/mg-20090107.tar.gz'
diff --git a/Library/Formula/mhash.rb b/Library/Formula/mhash.rb
index 585189439..ba02d9bc3 100644
--- a/Library/Formula/mhash.rb
+++ b/Library/Formula/mhash.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mhash <Formula
@url='http://sourceforge.net/projects/mhash/files/mhash/0.9.9.9/mhash-0.9.9.9.tar.gz'
diff --git a/Library/Formula/mmv.rb b/Library/Formula/mmv.rb
index b28e49b31..45039c645 100644
--- a/Library/Formula/mmv.rb
+++ b/Library/Formula/mmv.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mmv <Formula
version '1.01b'
diff --git a/Library/Formula/mod_wsgi.rb b/Library/Formula/mod_wsgi.rb
index 790854215..3f0cd4d59 100644
--- a/Library/Formula/mod_wsgi.rb
+++ b/Library/Formula/mod_wsgi.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class ModWsgi <Formula
@url='http://modwsgi.googlecode.com/files/mod_wsgi-2.5.tar.gz'
diff --git a/Library/Formula/mongodb.rb b/Library/Formula/mongodb.rb
index 35733ae4e..2b4d6614d 100644
--- a/Library/Formula/mongodb.rb
+++ b/Library/Formula/mongodb.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mongodb <Formula
url 'http://downloads.mongodb.org/osx/mongodb-osx-x86_64-1.1.1.tgz'
diff --git a/Library/Formula/monit.rb b/Library/Formula/monit.rb
index 3ea1e4fb5..b3b98c7e7 100644
--- a/Library/Formula/monit.rb
+++ b/Library/Formula/monit.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Monit <Formula
url 'http://mmonit.com/monit/dist/monit-5.0.3.tar.gz'
diff --git a/Library/Formula/most.rb b/Library/Formula/most.rb
index 2d24b533e..81417ca83 100644
--- a/Library/Formula/most.rb
+++ b/Library/Formula/most.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Most <Formula
@url='ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2'
diff --git a/Library/Formula/mpg123.rb b/Library/Formula/mpg123.rb
index e81e94b38..cc1ce28d8 100644
--- a/Library/Formula/mpg123.rb
+++ b/Library/Formula/mpg123.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mpg123 <Formula
@url='http://sourceforge.net/projects/mpg123/files/mpg123/mpg123-1.8.1.tar.bz2'
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 68ef0fa00..fedb26c82 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mplayer <Formula
@homepage='http://www.mplayerhq.hu/'
diff --git a/Library/Formula/mrtg.rb b/Library/Formula/mrtg.rb
index 3b644f9c9..58d07992a 100644
--- a/Library/Formula/mrtg.rb
+++ b/Library/Formula/mrtg.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mrtg <Formula
url 'http://oss.oetiker.ch/mrtg/pub/mrtg-2.16.2.zip'
diff --git a/Library/Formula/mtr.rb b/Library/Formula/mtr.rb
index 5714cfac7..ff2d489e1 100644
--- a/Library/Formula/mtr.rb
+++ b/Library/Formula/mtr.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mtr <Formula
@url='ftp://ftp.bitwizard.nl/mtr/mtr-0.75.tar.gz'
diff --git a/Library/Formula/mutt.rb b/Library/Formula/mutt.rb
index 8c94af4bc..5eee70272 100644
--- a/Library/Formula/mutt.rb
+++ b/Library/Formula/mutt.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mutt <Formula
@url='ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz'
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index f1b767696..5bf45368c 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class MysqlConnectorC <Formula
@homepage='http://dev.mysql.com/downloads/connector/c/6.0.html'
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 321d64032..3e1dd2180 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Mysql <Formula
@homepage='http://dev.mysql.com/doc/refman/5.1/en/'
diff --git a/Library/Formula/nasm.rb b/Library/Formula/nasm.rb
index a5b8cb70b..261648aee 100644
--- a/Library/Formula/nasm.rb
+++ b/Library/Formula/nasm.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Nasm <Formula
@url='http://www.nasm.us/pub/nasm/releasebuilds/2.07/nasm-2.07.tar.bz2'
diff --git a/Library/Formula/ncftp.rb b/Library/Formula/ncftp.rb
index 4c2307bbc..1c3677997 100644
--- a/Library/Formula/ncftp.rb
+++ b/Library/Formula/ncftp.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ncftp <Formula
@homepage='http://www.ncftp.com'
diff --git a/Library/Formula/ncursesw.rb b/Library/Formula/ncursesw.rb
index 0a1a4887d..959d9c92e 100644
--- a/Library/Formula/ncursesw.rb
+++ b/Library/Formula/ncursesw.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ncursesw <Formula
url 'http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.7.tar.gz'
diff --git a/Library/Formula/neon.rb b/Library/Formula/neon.rb
index 2a100e328..2b7686492 100644
--- a/Library/Formula/neon.rb
+++ b/Library/Formula/neon.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Neon <Formula
@url='http://www.webdav.org/neon/neon-0.29.0.tar.gz'
diff --git a/Library/Formula/netcat.rb b/Library/Formula/netcat.rb
index c65276adb..be62bed5a 100644
--- a/Library/Formula/netcat.rb
+++ b/Library/Formula/netcat.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Netcat <Formula
url 'http://downloads.sourceforge.net/sourceforge/netcat/netcat-0.7.1.tar.bz2'
diff --git a/Library/Formula/nethack.rb b/Library/Formula/nethack.rb
index 811f37100..ef3329e4e 100644
--- a/Library/Formula/nethack.rb
+++ b/Library/Formula/nethack.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# Nethack the way God intended it to be played: from a terminal.
# This build script was created referencing:
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 795df8609..6f7f5c98c 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Nginx < Formula
@url='http://sysoev.ru/nginx/nginx-0.7.62.tar.gz'
diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb
index 343208073..f8b5baf17 100644
--- a/Library/Formula/nmap.rb
+++ b/Library/Formula/nmap.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Nmap <Formula
@url='http://nmap.org/dist/nmap-5.00.tar.bz2'
diff --git a/Library/Formula/node.rb b/Library/Formula/node.rb
index 660f5fa80..9bd27fa17 100644
--- a/Library/Formula/node.rb
+++ b/Library/Formula/node.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Node <Formula
url 'http://s3.amazonaws.com/four.livejournal/20091009/node-v0.1.14.tar.gz'
diff --git a/Library/Formula/nspr.rb b/Library/Formula/nspr.rb
index b3deb84fd..a21b977a7 100644
--- a/Library/Formula/nspr.rb
+++ b/Library/Formula/nspr.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Nspr <Formula
@url='https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.7.5/src/nspr-4.7.5.tar.gz'
diff --git a/Library/Formula/objective-caml.rb b/Library/Formula/objective-caml.rb
index eebbea737..1b6661b09 100644
--- a/Library/Formula/objective-caml.rb
+++ b/Library/Formula/objective-caml.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class ObjectiveCaml <Formula
@url='http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.1.tar.bz2'
diff --git a/Library/Formula/oggz.rb b/Library/Formula/oggz.rb
index a53a3436f..a47745b7c 100644
--- a/Library/Formula/oggz.rb
+++ b/Library/Formula/oggz.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO alias: liboggz
diff --git a/Library/Formula/omega.rb b/Library/Formula/omega.rb
index 67cc7161c..add68fc07 100644
--- a/Library/Formula/omega.rb
+++ b/Library/Formula/omega.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Omega <Formula
@url='http://www.alcyone.com/binaries/omega/omega-0.80.2-src.tar.gz'
diff --git a/Library/Formula/oniguruma.rb b/Library/Formula/oniguruma.rb
index 103bacc30..50c7d9551 100644
--- a/Library/Formula/oniguruma.rb
+++ b/Library/Formula/oniguruma.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Oniguruma <Formula
@url='http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.1.tar.gz'
diff --git a/Library/Formula/openexr.rb b/Library/Formula/openexr.rb
index af109358a..28b20616c 100644
--- a/Library/Formula/openexr.rb
+++ b/Library/Formula/openexr.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Openexr <Formula
url 'http://download.savannah.gnu.org/releases/openexr/openexr-1.6.1.tar.gz'
diff --git a/Library/Formula/orc.rb b/Library/Formula/orc.rb
index bd9045e0f..a0fecb36f 100644
--- a/Library/Formula/orc.rb
+++ b/Library/Formula/orc.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Orc <Formula
head 'git://code.entropywave.com/git/orc.git'
diff --git a/Library/Formula/osm2pgsql.rb b/Library/Formula/osm2pgsql.rb
index 4bb5e20c9..9434f7e5e 100644
--- a/Library/Formula/osm2pgsql.rb
+++ b/Library/Formula/osm2pgsql.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
require 'date'
class Osm2pgsql <Formula
diff --git a/Library/Formula/p7zip.rb b/Library/Formula/p7zip.rb
index d519e8e5d..094916b6d 100644
--- a/Library/Formula/p7zip.rb
+++ b/Library/Formula/p7zip.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class P7zip <Formula
@url='http://kent.dl.sourceforge.net/sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2'
diff --git a/Library/Formula/par2.rb b/Library/Formula/par2.rb
index 89839b323..59c4c1dd4 100644
--- a/Library/Formula/par2.rb
+++ b/Library/Formula/par2.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Par2 <Formula
@url='http://downloads.sourceforge.net/project/parchive/par2cmdline/0.4/par2cmdline-0.4.tar.gz'
diff --git a/Library/Formula/parrot.rb b/Library/Formula/parrot.rb
index 0ca887544..9e3ab4be1 100644
--- a/Library/Formula/parrot.rb
+++ b/Library/Formula/parrot.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Parrot <Formula
url 'ftp://ftp.parrot.org//pub/parrot/releases/devel/1.6.0/parrot-1.6.0.tar.gz'
diff --git a/Library/Formula/pcre.rb b/Library/Formula/pcre.rb
index 9915c98aa..6ef09a8c5 100644
--- a/Library/Formula/pcre.rb
+++ b/Library/Formula/pcre.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Pcre <Formula
@url='ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.bz2'
diff --git a/Library/Formula/pdftohtml.rb b/Library/Formula/pdftohtml.rb
index 673301c9b..3516dbb99 100644
--- a/Library/Formula/pdftohtml.rb
+++ b/Library/Formula/pdftohtml.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Pdftohtml <Formula
@url='http://downloads.sourceforge.net/project/pdftohtml/Experimental%20Versions/pdftohtml%200.40/pdftohtml-0.40a.tar.gz'
diff --git a/Library/Formula/perforce.rb b/Library/Formula/perforce.rb
index d487f3c04..1d276271a 100644
--- a/Library/Formula/perforce.rb
+++ b/Library/Formula/perforce.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Perforce <Formula
@url='http://filehost.perforce.com/perforce/r09.1/bin.macosx104u/p4'
diff --git a/Library/Formula/pkg-config.rb b/Library/Formula/pkg-config.rb
index c21d8d483..abda0b2a4 100644
--- a/Library/Formula/pkg-config.rb
+++ b/Library/Formula/pkg-config.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class PkgConfig <Formula
@homepage='http://pkgconfig.freedesktop.org'
diff --git a/Library/Formula/playdar.rb b/Library/Formula/playdar.rb
index 5ec5c0639..414f88e72 100644
--- a/Library/Formula/playdar.rb
+++ b/Library/Formula/playdar.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Playdar <Formula
@homepage='http://www.playdar.org'
diff --git a/Library/Formula/pngcrush.rb b/Library/Formula/pngcrush.rb
index 7bff4266b..decc007ff 100644
--- a/Library/Formula/pngcrush.rb
+++ b/Library/Formula/pngcrush.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Pngcrush <Formula
homepage 'http://pmt.sourceforge.net/pngcrush/'
diff --git a/Library/Formula/popt.rb b/Library/Formula/popt.rb
index bb558d8a6..fe68e9b45 100644
--- a/Library/Formula/popt.rb
+++ b/Library/Formula/popt.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Popt <Formula
@url='http://rpm5.org/files/popt/popt-1.14.tar.gz'
diff --git a/Library/Formula/portaudio.rb b/Library/Formula/portaudio.rb
index e7a87b836..fb633b04d 100644
--- a/Library/Formula/portaudio.rb
+++ b/Library/Formula/portaudio.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Portaudio <Formula
url 'http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz'
diff --git a/Library/Formula/postgis.rb b/Library/Formula/postgis.rb
index 002944243..6e9be1362 100644
--- a/Library/Formula/postgis.rb
+++ b/Library/Formula/postgis.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Postgis <Formula
url 'http://postgis.refractions.net/download/postgis-1.4.0.tar.gz'
diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb
index 35d2da54c..474bb1a97 100644
--- a/Library/Formula/postgresql.rb
+++ b/Library/Formula/postgresql.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Postgresql <Formula
@homepage='http://www.postgresql.org/'
diff --git a/Library/Formula/proctools.rb b/Library/Formula/proctools.rb
index ebe6a23a4..b0ca504f2 100644
--- a/Library/Formula/proctools.rb
+++ b/Library/Formula/proctools.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Proctools <Formula
@version='0.4pre1'
diff --git a/Library/Formula/proj.rb b/Library/Formula/proj.rb
index 54c3b1ba8..816ac0d60 100644
--- a/Library/Formula/proj.rb
+++ b/Library/Formula/proj.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class ProjDatumgrid <Formula
url 'ftp://ftp.remotesensing.org/pub/proj/proj-datumgrid-1.5.zip'
diff --git a/Library/Formula/protobuf.rb b/Library/Formula/protobuf.rb
index dd61940ec..18d4dc8a3 100644
--- a/Library/Formula/protobuf.rb
+++ b/Library/Formula/protobuf.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Protobuf <Formula
@url='http://protobuf.googlecode.com/files/protobuf-2.2.0.tar.bz2'
diff --git a/Library/Formula/pstree.rb b/Library/Formula/pstree.rb
index a2bd51575..d1fd8edef 100644
--- a/Library/Formula/pstree.rb
+++ b/Library/Formula/pstree.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Pstree <Formula
@url='ftp://ftp.thp.uni-duisburg.de/pub/source/pstree-2.32.tar.gz'
diff --git a/Library/Formula/pv.rb b/Library/Formula/pv.rb
index cf50c66b1..d06fe969c 100644
--- a/Library/Formula/pv.rb
+++ b/Library/Formula/pv.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO other names include Pipe Viewer
diff --git a/Library/Formula/pwgen.rb b/Library/Formula/pwgen.rb
index e60562ac9..3a94ef23e 100644
--- a/Library/Formula/pwgen.rb
+++ b/Library/Formula/pwgen.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Pwgen <Formula
url 'http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz'
diff --git a/Library/Formula/pwsafe.rb b/Library/Formula/pwsafe.rb
index cd52aacea..bd252fb05 100644
--- a/Library/Formula/pwsafe.rb
+++ b/Library/Formula/pwsafe.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Pwsafe <Formula
@url='http://downloads.sourceforge.net/project/pwsafe/pwsafe/0.2.0/pwsafe-0.2.0.tar.gz'
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 8b5e6afcf..5d00ae252 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Python <Formula
url 'http://python.org/ftp/python/2.6.3/Python-2.6.3.tar.bz2'
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index c12479d7b..1722c9f34 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Qt <Formula
@url='http://get.qt.nokia.com/qt/source/qt-mac-opensource-src-4.5.2.tar.gz'
diff --git a/Library/Formula/quassel.rb b/Library/Formula/quassel.rb
index 89cacc85d..32384719a 100644
--- a/Library/Formula/quassel.rb
+++ b/Library/Formula/quassel.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Quassel <Formula
head 'git://git.quassel-irc.org/quassel.git'
diff --git a/Library/Formula/rabbitmq.rb b/Library/Formula/rabbitmq.rb
index 6e0ea9302..6f357ee65 100644
--- a/Library/Formula/rabbitmq.rb
+++ b/Library/Formula/rabbitmq.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Rabbitmq <Formula
homepage 'http://rabbitmq.com'
diff --git a/Library/Formula/ragel.rb b/Library/Formula/ragel.rb
index dcc896b2f..0f0941b55 100644
--- a/Library/Formula/ragel.rb
+++ b/Library/Formula/ragel.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Ragel <Formula
url 'http://www.complang.org/ragel/ragel-6.5.tar.gz'
diff --git a/Library/Formula/raptor.rb b/Library/Formula/raptor.rb
index 3e7eb439e..2ce2d5e69 100644
--- a/Library/Formula/raptor.rb
+++ b/Library/Formula/raptor.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Raptor <Formula
@url='http://download.librdf.org/source/raptor-1.4.19.tar.gz'
diff --git a/Library/Formula/rasqal.rb b/Library/Formula/rasqal.rb
index 61adb873a..a49d4f0c2 100644
--- a/Library/Formula/rasqal.rb
+++ b/Library/Formula/rasqal.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Rasqal <Formula
@url='http://download.librdf.org/source/rasqal-0.9.16.tar.gz'
diff --git a/Library/Formula/readline.rb b/Library/Formula/readline.rb
index 3c32982ce..56f0cc01c 100644
--- a/Library/Formula/readline.rb
+++ b/Library/Formula/readline.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Readline <Formula
@url='ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz'
diff --git a/Library/Formula/redis.rb b/Library/Formula/redis.rb
index ac98057a2..026e558a3 100644
--- a/Library/Formula/redis.rb
+++ b/Library/Formula/redis.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
REDIS_CONF=<<-EOS
# Redis configuration file example
diff --git a/Library/Formula/redland.rb b/Library/Formula/redland.rb
index a0828addd..a8febccf0 100644
--- a/Library/Formula/redland.rb
+++ b/Library/Formula/redland.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Redland <Formula
@url='http://download.librdf.org/source/redland-1.0.9.tar.gz'
diff --git a/Library/Formula/rogue.rb b/Library/Formula/rogue.rb
index e724d551f..78dafbf6f 100644
--- a/Library/Formula/rogue.rb
+++ b/Library/Formula/rogue.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Rogue <Formula
url 'http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz'
diff --git a/Library/Formula/rsync.rb b/Library/Formula/rsync.rb
index 3d7c92a34..3f26428c0 100644
--- a/Library/Formula/rsync.rb
+++ b/Library/Formula/rsync.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Rsync <Formula
url 'http://rsync.samba.org/ftp/rsync/rsync-3.0.6.tar.gz'
diff --git a/Library/Formula/ruby-enterprise-edition.rb b/Library/Formula/ruby-enterprise-edition.rb
index 88dfc46cd..9b33ea6d3 100644
--- a/Library/Formula/ruby-enterprise-edition.rb
+++ b/Library/Formula/ruby-enterprise-edition.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class RubyEnterpriseEdition <Formula
url 'http://rubyforge.org/frs/download.php/64475/ruby-enterprise-1.8.7-20090928.tar.gz'
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index 110481e48..e9efe6c02 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO de-version the include and lib directories
diff --git a/Library/Formula/s-lang.rb b/Library/Formula/s-lang.rb
index 572b6c0cd..2ef6fcb3f 100644
--- a/Library/Formula/s-lang.rb
+++ b/Library/Formula/s-lang.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class SLang <Formula
@url='ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.1.tar.gz'
diff --git a/Library/Formula/sbt.rb b/Library/Formula/sbt.rb
index ee9173a7d..ea18fe1e8 100644
--- a/Library/Formula/sbt.rb
+++ b/Library/Formula/sbt.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# even though "file -b" reports this as a zip archive, it's just a binary
class SbtHttpDownloadStrategy <CurlDownloadStrategy
diff --git a/Library/Formula/scala.rb b/Library/Formula/scala.rb
index a2cffb37e..08ce54d38 100644
--- a/Library/Formula/scala.rb
+++ b/Library/Formula/scala.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Scala <Formula
@homepage='http://www.scala-lang.org/'
diff --git a/Library/Formula/scummvm.rb b/Library/Formula/scummvm.rb
index 46a7fe6a1..14dce14a7 100644
--- a/Library/Formula/scummvm.rb
+++ b/Library/Formula/scummvm.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Scummvm <Formula
@url='http://downloads.sourceforge.net/project/scummvm/scummvm/1.0.0rc1/scummvm-1.0.0rc1.tar.bz2'
diff --git a/Library/Formula/sdl.rb b/Library/Formula/sdl.rb
index 1cfae8008..021af2314 100644
--- a/Library/Formula/sdl.rb
+++ b/Library/Formula/sdl.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Sdl <Formula
@url='http://www.libsdl.org/release/SDL-1.2.13.tar.gz'
diff --git a/Library/Formula/sdl_image.rb b/Library/Formula/sdl_image.rb
index 147f94936..9645e51f1 100644
--- a/Library/Formula/sdl_image.rb
+++ b/Library/Formula/sdl_image.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class SdlImage <Formula
url 'http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.7.tar.gz'
diff --git a/Library/Formula/sdl_mixer.rb b/Library/Formula/sdl_mixer.rb
index 6e709108f..7e28c713c 100644
--- a/Library/Formula/sdl_mixer.rb
+++ b/Library/Formula/sdl_mixer.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class SdlMixer <Formula
url 'http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8.tar.gz'
diff --git a/Library/Formula/sdl_net.rb b/Library/Formula/sdl_net.rb
index 4c5c1e892..c4bc9dc96 100644
--- a/Library/Formula/sdl_net.rb
+++ b/Library/Formula/sdl_net.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class SdlNet <Formula
url 'http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.7.tar.gz'
diff --git a/Library/Formula/sdl_ttf.rb b/Library/Formula/sdl_ttf.rb
index 05b5f24f5..1bce31d0f 100644
--- a/Library/Formula/sdl_ttf.rb
+++ b/Library/Formula/sdl_ttf.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class SdlTtf <Formula
url 'http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz'
diff --git a/Library/Formula/shorten.rb b/Library/Formula/shorten.rb
index 9e5881e77..676ecf2df 100644
--- a/Library/Formula/shorten.rb
+++ b/Library/Formula/shorten.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Shorten <Formula
@url='http://www.etree.org/shnutils/shorten/dist/src/shorten-3.6.1.tar.gz'
diff --git a/Library/Formula/siege.rb b/Library/Formula/siege.rb
index 705a8274d..5ac5978ba 100644
--- a/Library/Formula/siege.rb
+++ b/Library/Formula/siege.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Siege <Formula
url "ftp://ftp.joedog.org/pub/siege/siege-2.69.tar.gz"
diff --git a/Library/Formula/sloccount.rb b/Library/Formula/sloccount.rb
index 7223fc310..4c16c279b 100644
--- a/Library/Formula/sloccount.rb
+++ b/Library/Formula/sloccount.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Sloccount <Formula
@url='http://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz'
diff --git a/Library/Formula/soprano.rb b/Library/Formula/soprano.rb
index 8cc05ef2e..d2e2c3e44 100644
--- a/Library/Formula/soprano.rb
+++ b/Library/Formula/soprano.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Soprano <Formula
@url='http://surfnet.dl.sourceforge.net/project/soprano/Soprano/2.3.1/soprano-2.3.1.tar.bz2'
diff --git a/Library/Formula/speex.rb b/Library/Formula/speex.rb
index fe2cd6b3b..efc523f03 100644
--- a/Library/Formula/speex.rb
+++ b/Library/Formula/speex.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Speex <Formula
url 'http://downloads.us.xiph.org/releases/speex/speex-1.0.5.tar.gz'
diff --git a/Library/Formula/sphinx.rb b/Library/Formula/sphinx.rb
index d0627d77b..d4f792edd 100644
--- a/Library/Formula/sphinx.rb
+++ b/Library/Formula/sphinx.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Sphinx <Formula
@url='http://www.sphinxsearch.com/downloads/sphinx-0.9.8.1.tar.gz'
diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb
index b54a8132b..fcacd03ad 100644
--- a/Library/Formula/spidermonkey.rb
+++ b/Library/Formula/spidermonkey.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Spidermonkey <Formula
url "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz"
diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index 2f210e053..a29efcaf6 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Sqlite <Formula
@url='http://www.sqlite.org/sqlite-amalgamation-3.6.17.tar.gz'
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index b0ebb757e..c228abc33 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Sshfs <Formula
@url='http://downloads.sourceforge.net/project/fuse/sshfs-fuse/2.2/sshfs-fuse-2.2.tar.gz'
diff --git a/Library/Formula/strigi.rb b/Library/Formula/strigi.rb
index 9100a86cd..dee5b3e98 100644
--- a/Library/Formula/strigi.rb
+++ b/Library/Formula/strigi.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Strigi <Formula
@url='http://surfnet.dl.sourceforge.net/project/strigi/strigi/strigi-0.6.4/strigi-0.6.4.tar.bz2'
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 867ba4ef4..bd22f287f 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Subversion <Formula
@url='http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2'
diff --git a/Library/Formula/swig.rb b/Library/Formula/swig.rb
index ced3a1206..89f444930 100644
--- a/Library/Formula/swig.rb
+++ b/Library/Formula/swig.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Swig <Formula
url 'http://downloads.sourceforge.net/swig/swig-1.3.40.tar.gz'
diff --git a/Library/Formula/taglib.rb b/Library/Formula/taglib.rb
index 7da720b2c..32c57baaa 100644
--- a/Library/Formula/taglib.rb
+++ b/Library/Formula/taglib.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Taglib <Formula
@url='http://developer.kde.org/~wheeler/files/src/taglib-1.6.tar.gz'
diff --git a/Library/Formula/term.rb b/Library/Formula/term.rb
index f8a32c8be..8274ecc34 100644
--- a/Library/Formula/term.rb
+++ b/Library/Formula/term.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Term <ScriptFileFormula
@url='http://github.com/liyanage/macosx-shell-scripts/raw/e29f7eaa1eb13d78056dec85dc517626ab1d93e3/term'
diff --git a/Library/Formula/theora.rb b/Library/Formula/theora.rb
index 0adbeb500..0a2c090bc 100644
--- a/Library/Formula/theora.rb
+++ b/Library/Formula/theora.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Theora <Formula
url 'http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2'
diff --git a/Library/Formula/thrift.rb b/Library/Formula/thrift.rb
index 61d75907b..9d3b636ea 100644
--- a/Library/Formula/thrift.rb
+++ b/Library/Formula/thrift.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# TODO Fix java support anyone?
#
diff --git a/Library/Formula/tig.rb b/Library/Formula/tig.rb
index 4e2dd82c1..489e4c761 100644
--- a/Library/Formula/tig.rb
+++ b/Library/Formula/tig.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Tig <Formula
@url='http://jonas.nitro.dk/tig/releases/tig-0.14.1.tar.gz'
diff --git a/Library/Formula/timedog.rb b/Library/Formula/timedog.rb
index 7f6a693b1..04a302648 100644
--- a/Library/Formula/timedog.rb
+++ b/Library/Formula/timedog.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Timedog <Formula
url 'http://timedog.googlecode.com/files/timedog-1.2.zip'
diff --git a/Library/Formula/tintin.rb b/Library/Formula/tintin.rb
index df1c12552..e9715c715 100644
--- a/Library/Formula/tintin.rb
+++ b/Library/Formula/tintin.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Tintin <Formula
url 'http://downloads.sourceforge.net/project/tintin/TinTin%2B%2B%20Source%20Code/1.99.7/tintin-1.99.7.tar.gz'
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index 3ca58a4b0..f60548819 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Tmux <Formula
url 'http://downloads.sourceforge.net/tmux/tmux-1.0.tar.gz'
diff --git a/Library/Formula/tokyo-cabinet.rb b/Library/Formula/tokyo-cabinet.rb
index c6d151fab..05d3f7ea1 100644
--- a/Library/Formula/tokyo-cabinet.rb
+++ b/Library/Formula/tokyo-cabinet.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class TokyoCabinet <Formula
@url='http://1978th.net/tokyocabinet/tokyocabinet-1.4.33.tar.gz'
diff --git a/Library/Formula/tree.rb b/Library/Formula/tree.rb
index 87db1beb8..4898b3345 100644
--- a/Library/Formula/tree.rb
+++ b/Library/Formula/tree.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Tree <Formula
@url='ftp://mama.indstate.edu/linux/tree/tree-1.5.2.2.tgz'
diff --git a/Library/Formula/unittest.rb b/Library/Formula/unittest.rb
index 342b0cbb1..0b668fb93 100644
--- a/Library/Formula/unittest.rb
+++ b/Library/Formula/unittest.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Unittest <Formula
@url='http://unittest.red-bean.com/tar/unittest-0.50-62.tar.gz'
diff --git a/Library/Formula/unixodbc.rb b/Library/Formula/unixodbc.rb
index 43281b38f..80631f92a 100644
--- a/Library/Formula/unixodbc.rb
+++ b/Library/Formula/unixodbc.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Unixodbc <Formula
@url='http://www.unixodbc.org/unixODBC-2.2.14.tar.gz'
diff --git a/Library/Formula/unp.rb b/Library/Formula/unp.rb
index d01b7a36e..d7bb3fbd2 100644
--- a/Library/Formula/unp.rb
+++ b/Library/Formula/unp.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Unp <Formula
@url='http://ftp.de.debian.org/debian/pool/main/u/unp/unp_1.0.11.tar.gz'
diff --git a/Library/Formula/unrar.rb b/Library/Formula/unrar.rb
index fd7db4098..c342564b4 100644
--- a/Library/Formula/unrar.rb
+++ b/Library/Formula/unrar.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
ALL_CPP=<<-EOS
#include "errhnd.cpp"
diff --git a/Library/Formula/vala.rb b/Library/Formula/vala.rb
index 08e215d0a..a8fb59464 100644
--- a/Library/Formula/vala.rb
+++ b/Library/Formula/vala.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Vala <Formula
@url='http://download.gnome.org/sources/vala/0.7/vala-0.7.7.tar.bz2'
diff --git a/Library/Formula/vbindiff.rb b/Library/Formula/vbindiff.rb
index d5b7d4601..e4c543886 100644
--- a/Library/Formula/vbindiff.rb
+++ b/Library/Formula/vbindiff.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Vbindiff <Formula
url 'http://www.cjmweb.net/vbindiff/vbindiff-3.0_beta4.tar.gz'
diff --git a/Library/Formula/vice.rb b/Library/Formula/vice.rb
index 30a003f44..5928871de 100644
--- a/Library/Formula/vice.rb
+++ b/Library/Formula/vice.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Vice <Formula
@url='http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz'
diff --git a/Library/Formula/vilistextum.rb b/Library/Formula/vilistextum.rb
index bf9a2c267..10c1835e2 100644
--- a/Library/Formula/vilistextum.rb
+++ b/Library/Formula/vilistextum.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Vilistextum <Formula
@url='http://bhaak.dyndns.org/vilistextum/vilistextum-2.6.9.tar.gz'
diff --git a/Library/Formula/vorbis-tools.rb b/Library/Formula/vorbis-tools.rb
index f0c6b634f..ddc3ab6c9 100644
--- a/Library/Formula/vorbis-tools.rb
+++ b/Library/Formula/vorbis-tools.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class VorbisTools <Formula
@url='http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz'
diff --git a/Library/Formula/w3m.rb b/Library/Formula/w3m.rb
index bbf6406c1..9216f931a 100644
--- a/Library/Formula/w3m.rb
+++ b/Library/Formula/w3m.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class W3m <Formula
url 'http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.2/w3m-0.5.2.tar.gz'
diff --git a/Library/Formula/watch.rb b/Library/Formula/watch.rb
index a1a21f19f..caabde978 100644
--- a/Library/Formula/watch.rb
+++ b/Library/Formula/watch.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Watch <Formula
homepage 'http://procps.sourceforge.net/'
diff --git a/Library/Formula/weechat.rb b/Library/Formula/weechat.rb
index 416bd4090..d4cf04fc8 100644
--- a/Library/Formula/weechat.rb
+++ b/Library/Formula/weechat.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Weechat <Formula
@url='http://www.weechat.org/files/src/weechat-0.3.0.tar.bz2'
diff --git a/Library/Formula/wget.rb b/Library/Formula/wget.rb
index 418013bf3..f451f37ad 100644
--- a/Library/Formula/wget.rb
+++ b/Library/Formula/wget.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Wget <Formula
homepage 'http://www.gnu.org/software/wget/'
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index ec7630335..5068ca80b 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Wine <Formula
url 'http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.1.31.tar.bz2'
diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb
index 2027e8778..7e9d199a1 100644
--- a/Library/Formula/wireshark.rb
+++ b/Library/Formula/wireshark.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Wireshark <Formula
@url='http://media-2.cacetech.com/wireshark/src/wireshark-1.0.8.tar.bz2'
diff --git a/Library/Formula/wordnet.rb b/Library/Formula/wordnet.rb
index 36a1a5418..8293c1973 100644
--- a/Library/Formula/wordnet.rb
+++ b/Library/Formula/wordnet.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Wordnet <Formula
url 'http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.bz2'
diff --git a/Library/Formula/wrangler.rb b/Library/Formula/wrangler.rb
index e14a20cca..b55ca1cbd 100644
--- a/Library/Formula/wrangler.rb
+++ b/Library/Formula/wrangler.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Wrangler <Formula
@url='http://www.cs.kent.ac.uk/projects/forse/wrangler/wrangler-0.8/wrangler-0.8.1.tar.gz'
diff --git a/Library/Formula/x264.rb b/Library/Formula/x264.rb
index 2e9f0f13a..21cb24f20 100644
--- a/Library/Formula/x264.rb
+++ b/Library/Formula/x264.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class X264 <Formula
head 'git://git.videolan.org/x264.git'
diff --git a/Library/Formula/xar.rb b/Library/Formula/xar.rb
index 1e3f8a543..56d027c3c 100644
--- a/Library/Formula/xar.rb
+++ b/Library/Formula/xar.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Xar <Formula
@url='http://xar.googlecode.com/files/xar-1.5.2.tar.gz'
diff --git a/Library/Formula/xdebug.rb b/Library/Formula/xdebug.rb
index b00f4940a..ec4040c62 100644
--- a/Library/Formula/xdebug.rb
+++ b/Library/Formula/xdebug.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Xdebug <Formula
url 'http://xdebug.org/files/xdebug-2.0.5.tgz'
diff --git a/Library/Formula/xerces-c.rb b/Library/Formula/xerces-c.rb
index df647bc47..fa984b836 100644
--- a/Library/Formula/xerces-c.rb
+++ b/Library/Formula/xerces-c.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class XercesC <Formula
@url='http://www.osnt.org/apache/xerces/c/3/sources/xerces-c-3.0.1.tar.gz'
diff --git a/Library/Formula/xmlrpc-c.rb b/Library/Formula/xmlrpc-c.rb
index db25f10c0..fe8e495b9 100644
--- a/Library/Formula/xmlrpc-c.rb
+++ b/Library/Formula/xmlrpc-c.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class XmlrpcC <Formula
@url='http://kent.dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-c-1.06.33.tgz'
diff --git a/Library/Formula/xpdf.rb b/Library/Formula/xpdf.rb
index 3163bee61..db459ba8d 100644
--- a/Library/Formula/xpdf.rb
+++ b/Library/Formula/xpdf.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Xpdf <Formula
url 'ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz'
diff --git a/Library/Formula/xu4.rb b/Library/Formula/xu4.rb
index 63acdaa91..bae1b76ee 100644
--- a/Library/Formula/xu4.rb
+++ b/Library/Formula/xu4.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Xu4 <Formula
url 'cvs://:pserver:anonymous@xu4.cvs.sourceforge.net:/cvsroot/xu4:u4'
diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index f47a454e4..483e2758d 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Yajl <Formula
@homepage='http://lloyd.github.com/yajl/'
diff --git a/Library/Formula/yasm.rb b/Library/Formula/yasm.rb
index 78a3dcb10..b40fa1070 100644
--- a/Library/Formula/yasm.rb
+++ b/Library/Formula/yasm.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Yasm <Formula
@url='http://www.tortall.net/projects/yasm/releases/yasm-0.8.0.tar.gz'
diff --git a/Library/Formula/yaz.rb b/Library/Formula/yaz.rb
index d8887830d..0601be060 100644
--- a/Library/Formula/yaz.rb
+++ b/Library/Formula/yaz.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
# NOTE this formula conflicts with icu4c on Snow Leopard at the moment
# if this is a problem for you then please fix it! Thanks.
diff --git a/Library/Formula/zebra.rb b/Library/Formula/zebra.rb
index 070958cc4..53e31c802 100644
--- a/Library/Formula/zebra.rb
+++ b/Library/Formula/zebra.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Zebra <Formula
url 'http://ftp.indexdata.dk/pub/zebra/idzebra-2.0.42.tar.gz'
diff --git a/Library/Formula/znc.rb b/Library/Formula/znc.rb
index 28e247bd7..ec41ea675 100644
--- a/Library/Formula/znc.rb
+++ b/Library/Formula/znc.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Znc <Formula
url 'http://downloads.sourceforge.net/project/znc/znc/0.076/znc-0.076.tar.gz'
diff --git a/Library/Formula/zsh.rb b/Library/Formula/zsh.rb
index b923e681e..8c541f0cb 100644
--- a/Library/Formula/zsh.rb
+++ b/Library/Formula/zsh.rb
@@ -1,4 +1,4 @@
-require 'brewkit'
+require 'formula'
class Zsh <Formula
@url='http://downloads.sourceforge.net/project/zsh/zsh-dev/4.3.10/zsh-4.3.10.tar.gz'
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 83cb79c50..24f9046a9 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -30,7 +30,7 @@ def __make url, name
raise "#{path} already exists" if path.exist?
template=<<-EOS
- require 'brewkit'
+ require 'formula'
class #{Formula.class_s name} <Formula
url '#{url}'
diff --git a/Library/Homebrew/brewkit.rb b/Library/Homebrew/brewkit.rb
index 0a966a317..843ac023d 100644
--- a/Library/Homebrew/brewkit.rb
+++ b/Library/Homebrew/brewkit.rb
@@ -21,10 +21,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-require 'fileutils'
-require 'formula'
-require 'download_strategy'
-require 'hardware'
# TODO
# 1. Indeed, there should be an option to build 32 or 64 bit binaries
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 8e4771cd1..4330b812f 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -21,6 +21,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+require 'download_strategy'
+
class ExecutionError <RuntimeError
def initialize cmd, args=[]
super "Failure while executing: #{cmd} #{args*' '}"
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 75a63ac32..9509a56b8 100755
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -1,8 +1,12 @@
#!/usr/bin/ruby
require 'global'
+
+require 'brew.h'
+require 'brewkit'
+require 'fileutils'
require 'formula'
+require 'hardware'
require 'keg'
-require 'brew.h'
show_summary_heading = false
diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb
index 8faeb4f43..dfbf0e101 100755
--- a/Library/Homebrew/unittest.rb
+++ b/Library/Homebrew/unittest.rb
@@ -365,7 +365,7 @@ class BeerTasting <Test::Unit::TestCase
path.dirname.mkpath
File.open(path, 'w') do |f|
f << %{
- require 'brewkit'
+ require 'formula'
class #{classname} < Formula
@url=''
def initialize(*args)