From c729fb2d325b224c49750400fe8936d7cfe2d93b Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 26 Aug 2011 14:30:27 -0500
Subject: [PATCH 01/41] Add support for xz-compressed tarballs

Rationale: some software (e.g. GNU Coreutils, GnuTLS 3.x), have started
distributing _only_ xz-compressed tarballs. There is no system XZ
utility provided by OS X, but it is necessary so that we can continue to
provide formulae for this software.

If XZUtils isn't installed, we abort and prompt the user to `brew
install xz`.

The `xz` command itself doesn't do any untarring, so we write the
decompressed archive to stdout and pipe it to tar.
---
 Library/Homebrew/download_strategy.rb | 8 ++++++--
 Library/Homebrew/extend/pathname.rb   | 4 ++--
 Library/Homebrew/test/test_bucket.rb  | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 58221c28f2ab..625dbaf9aff8 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -76,8 +76,8 @@ def stage
       # Use more than 4 characters to not clash with magicbytes
       magic_bytes = "____pkg"
     else
-      # get the first four bytes
-      File.open(@tarball_path) { |f| magic_bytes = f.read(4) }
+      # get the first six bytes
+      File.open(@tarball_path) { |f| magic_bytes = f.read(6) }
     end
 
     # magic numbers stolen from /usr/share/file/magic/
@@ -89,6 +89,10 @@ def stage
       # TODO check if it's really a tar archive
       safe_system '/usr/bin/tar', 'xf', @tarball_path
       chdir
+    when /^\xFD7zXZ\x00/ # xz compressed
+      raise "You must install XZutils: brew install xz" unless system "/usr/bin/which -s xz"
+      safe_system "xz -dc #{@tarball_path} | /usr/bin/tar xf -"
+      chdir
     when '____pkg'
       safe_system '/usr/sbin/pkgutil', '--expand', @tarball_path, File.basename(@url)
       chdir
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 65d34d4500fc..018547ff80cc 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -62,9 +62,9 @@ def cp dst
     return dst
   end
 
-  # extended to support the double extensions .tar.gz and .tar.bz2
+  # extended to support the double extensions .tar.gz, .tar.bz2, and .tar.xz
   def extname
-    /(\.tar\.(gz|bz2))$/.match to_s
+    /(\.tar\.(gz|bz2|xz))$/.match to_s
     return $1 if $1
     return File.extname(to_s)
   end
diff --git a/Library/Homebrew/test/test_bucket.rb b/Library/Homebrew/test/test_bucket.rb
index 010c06761d47..f328dacca191 100644
--- a/Library/Homebrew/test/test_bucket.rb
+++ b/Library/Homebrew/test/test_bucket.rb
@@ -32,8 +32,10 @@ def test_supported_compressed_types
     assert_nothing_raised do
       MockFormula.new 'test-0.1.tar.gz'
       MockFormula.new 'test-0.1.tar.bz2'
+      MockFormula.new 'test-0.1.tar.xz'
       MockFormula.new 'test-0.1.tgz'
       MockFormula.new 'test-0.1.bgz'
+      MockFormula.new 'test-0.1.txz'
       MockFormula.new 'test-0.1.zip'
     end
   end

From 1ac81695c7d3d24c54918d844caf55705aa772bb Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 14 Oct 2011 00:24:26 -0500
Subject: [PATCH 02/41] coreutils 8.14

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/coreutils.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Formula/coreutils.rb b/Library/Formula/coreutils.rb
index a7f87749aa01..c3b1a2e36b97 100644
--- a/Library/Formula/coreutils.rb
+++ b/Library/Formula/coreutils.rb
@@ -27,9 +27,9 @@ def coreutils_aliases
 
 class Coreutils < Formula
   homepage 'http://www.gnu.org/software/coreutils'
-  url 'http://ftpmirror.gnu.org/coreutils/coreutils-8.12.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz'
-  sha256 '9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8'
+  url 'http://ftpmirror.gnu.org/coreutils/coreutils-8.14.tar.xz'
+  mirror 'http://ftp.gnu.org/gnu/coreutils/coreutils-8.14.tar.xz'
+  sha256 '0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d'
 
   def options
     [['--default-names', "Do NOT prepend 'g' to the binary; will override system utils."]]

From 2b3a6503decd44228f1223a68ceb8d0b8d5d2de0 Mon Sep 17 00:00:00 2001
From: Rui Pereira <rui.pereira@gmail.com>
Date: Fri, 9 Dec 2011 15:20:36 +0100
Subject: [PATCH 03/41] cfitsio 3.29

Closes #9063.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/cfitsio.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Formula/cfitsio.rb b/Library/Formula/cfitsio.rb
index dcb9728eab1a..dd8cac5f848d 100644
--- a/Library/Formula/cfitsio.rb
+++ b/Library/Formula/cfitsio.rb
@@ -7,10 +7,10 @@ class CfitsioExamples < Formula
 end
 
 class Cfitsio < Formula
-  url 'ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3280.tar.gz'
+  url 'ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3290.tar.gz'
   homepage 'http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html'
-  md5 'fdb9c0f51678b47e78592c70fb5dc793'
-  version '3.28'
+  md5 'd0d460c5e314a15fa6905b2096159827'
+  version '3.29'
 
   def options
     [
@@ -34,7 +34,7 @@ def install
         Dir.glob('*.c').each do |f|
           # compressed_fits.c does not work (obsolete function call)
           if f != 'compress_fits.c'
-            system "#{ENV.compiler} #{f} -I#{include} -L#{lib} -lcfitsio -lm -o bin/#{f.sub('.c','')}"
+            system "#{ENV.cc} #{f} -I#{include} -L#{lib} -lcfitsio -lm -o bin/#{f.sub('.c','')}"
           end
         end
         bin.install Dir['bin/*']

From 040a2d449eaec5daabeb00def543e7e99de9156d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Berjo=CC=81n?= <asuranceturix@gmail.com>
Date: Thu, 8 Dec 2011 19:18:05 +0100
Subject: [PATCH 04/41] libmpdclient 2.6

Closes #9057.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/libmpdclient.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/libmpdclient.rb b/Library/Formula/libmpdclient.rb
index 9c7eb2b12417..684ae14fb1f3 100644
--- a/Library/Formula/libmpdclient.rb
+++ b/Library/Formula/libmpdclient.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Libmpdclient < Formula
-  url 'http://downloads.sourceforge.net/project/musicpd/libmpdclient/2.5/libmpdclient-2.5.tar.bz2'
+  url 'http://downloads.sourceforge.net/project/musicpd/libmpdclient/2.6/libmpdclient-2.6.tar.bz2'
   homepage 'http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
-  sha1 '4e3c0925c92c27ddcb13113adc7ebe6dc975abc6'
+  sha1 '00d88152c0e8599f56d01625da41b55d3a43c264'
 
   def options
     [[ '--universal', 'Build a universal library.' ]]

From 8b439bf2e2663bbb312da6a5a7da9170398ba6c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Berjo=CC=81n?= <asuranceturix@gmail.com>
Date: Fri, 9 Dec 2011 13:19:24 +0100
Subject: [PATCH 05/41] mpd 0.16.6

Closes #9056.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/mpd.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/mpd.rb b/Library/Formula/mpd.rb
index d51675857789..1893e40aae12 100644
--- a/Library/Formula/mpd.rb
+++ b/Library/Formula/mpd.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Mpd < Formula
-  url 'http://downloads.sourceforge.net/project/musicpd/mpd/0.16.5/mpd-0.16.5.tar.bz2'
+  url 'http://sourceforge.net/projects/musicpd/files/mpd/0.16.6/mpd-0.16.6.tar.gz'
   homepage 'http://mpd.wikia.com'
-  md5 'f7564cff12035f6a1112cce770655df7'
+  md5 '8fd6266dc313bddad406f876a845157f'
 
   depends_on 'pkg-config' => :build
   depends_on 'glib'

From 94ebf819f17a11eaaa6e5c6b17a7da73c20bc955 Mon Sep 17 00:00:00 2001
From: Carlos Borroto <carlos.borroto@gmail.com>
Date: Fri, 9 Dec 2011 15:54:58 -0500
Subject: [PATCH 06/41] tophat 1.3.3

Closes #9067.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/tophat.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/tophat.rb b/Library/Formula/tophat.rb
index 0cd5b0f6c10a..60d64ae9e9a4 100644
--- a/Library/Formula/tophat.rb
+++ b/Library/Formula/tophat.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Tophat < Formula
-  url 'http://tophat.cbcb.umd.edu/downloads/tophat-1.3.2.tar.gz'
+  url 'http://tophat.cbcb.umd.edu/downloads/tophat-1.3.3.tar.gz'
   homepage 'http://tophat.cbcb.umd.edu/'
-  md5 'b214c54928805eb1095828b1c7c1bbab'
+  md5 '5858f423fb9736aac5186953d5c5778f'
 
   depends_on 'samtools'
 

From 9a7c0e7b41873f3344d580d659e89d0334ddc996 Mon Sep 17 00:00:00 2001
From: Nibbles 2bits <nibbles@speakeasy.net>
Date: Mon, 24 Oct 2011 02:02:15 -0700
Subject: [PATCH 07/41] libmikmod: 3.2.0b2, use git build head only

libmikmod built from tarball is 3.2.0-beta2.
libmikmod built from cvs is called 3.2.0b2 in their code.

The final work on libmikmod was left in cvs and includes numerous
bug fixes and improvements done over the course of a year after
the tarball came out.  This adds the option to build head,
the final version.  No work has been done in five years.

Patches from Macports were merged upstream during that time.
One patch was not and is still in this formula.  Another
patch is included against the cvs version to fix a duplicate
symbol problem with vc_callback().

The 2005 era code is in need of an autoreconf -ivf, which is
done after setting an environment variable to pickup glibtoolize.
The build is done out of source according to the directions.

This builds static and shared native libraries using llvm-2335.9,
gcc-4.2.1(v5666), and clang-2.0, tested on 64bit OSX Snow Leopard.
It also builds without error on Lion.

EDIT: Builds from clone of cvs in mistydemeo with inline patches

Closes #8274.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/libmikmod.rb | 125 +++++++++++++++++++++--------------
 1 file changed, 77 insertions(+), 48 deletions(-)

diff --git a/Library/Formula/libmikmod.rb b/Library/Formula/libmikmod.rb
index b7e8984f957a..cd55ee65118b 100644
--- a/Library/Formula/libmikmod.rb
+++ b/Library/Formula/libmikmod.rb
@@ -1,61 +1,90 @@
 require 'formula'
 
 class Libmikmod < Formula
-  url 'http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.bz2'
+  url 'https://github.com/mistydemeo/libmikmod.git', :tag => '446324a45a6d165b1941a4758f6cd221301b479e'
   homepage 'http://mikmod.raphnet.net/'
-  md5 '5b05f3b1167eba7855b8e38bde2b8070'
+  version '3.2.0b2'
+
+  def options
+    [[ '--with-debug', 'Enable debugging symbols and build without optimization' ]]
+  end
 
-  # MacPorts patches to fix broken audio in 64-bit, crash on accessing samples menu
   def patches
-    DATA
+    # When aclocal is run on configure.in, it is told to use a macro AM_PATH_ESD that
+    # only exists if esound is installed.  Here CoreAudio is used not esound.
+    DATA unless Formula.factory('esound').installed?
   end
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}", "--mandir=#{man}",
-                          "--infodir=#{info}"
-    system "make install"
+    ENV.no_optimization if ARGV.include? '--with-debug'  # leave code unoptimzed 4 debug
+    ENV['LIBTOOLIZE'] = '/usr/bin/glibtoolize'           # system libtoolize for autoreconf
+    acpath = "#{HOMEBREW_PREFIX}/share/aclocal"          # esd.m4 if installed would be here
+    ENV['ACLOCAL'] = "/usr/bin/aclocal -I #{acpath}" if Formula.factory('esound').installed?
+
+    # Macports patched libmikmod-3.2.0-beta2.tar.bz2 in 2004.  Most of their work
+    # was merged into the upstream source by 2005 when the devs moved to sourceforge.
+    # Development stopped a year later, after many more bug fixes and improvements.
+    # The version was never changed. It is still called 3.2.0b2 inside their code.
+    # This formula builds 3.2.0b2 from cvs, the final libmikmod at this time.
+
+    # The patch below is the only one from Macports the devs didn't merge.  It
+    # prevents a crash on accessing the samples menu in Mikmod. Check if Samples[]
+    # exists before letting the subsequent code try to access the array items.
+
+    # Also in cvs is one error that stops the build.  Below is a new patch
+    # that fixes the error when linking libmikmod.dylib, where the build outputs:
+    #      ld: duplicate symbol _vc_callback in .libs/virtch2.o and .libs/virtch.o
+    # Problem: vc_callback is declared twice globally and once as an extern.
+    # Solution: Switch it to declared once globally and twice as extern.
+
+    # And finally in cvs the function vc_callback() is defined to use unsigned char*.
+    # With this patch, virtch2.c and virtch.c will use vc_callback() identically.
+
+    inreplace 'playercode/virtch_common.c', '(handle<MAXSAMPLEHANDLES)',
+                                            '(Samples && handle<MAXSAMPLEHANDLES)'
+
+    inreplace 'playercode/mdriver.c', 'extern MikMod_callback_t vc_callback',
+                                      'MikMod_callback_t vc_callback'
+    inreplace 'playercode/virtch_common.c', 'MikMod_callback_t vc_callback',
+                                            'extern MikMod_callback_t vc_callback'
+
+    inreplace 'playercode/virtch2.c', 'vc_callback((char*)vc_tickbuf, portion)',
+                                      'vc_callback((unsigned char*)vc_tickbuf, portion)'
+
+
+    # OSX has CoreAudio, but ALSA is not for this OS nor is SAM9407 nor ULTRA.
+    # The osx and x11 tests may work automatically. They are explicit to be thorough.
+    args = ["--prefix=#{prefix}",
+            "--mandir=#{man}",
+            "--infodir=#{info}",
+            "--disable-alsa",
+            "--disable-sam9407",
+            "--disable-ultra",
+            "--enable-osx",
+            "--with-x",
+            "--x-includes=/usr/X11/include",
+            "--x-libraries=/usr/X11/lib"]
+    args << ((ARGV.include? '--with-debug') ? '--enable-debug' : '--disable-debug')
+    # autoreconf w/glibtoolize will fix PIC flags, flat_namespace from 2005 era code.
+    system "autoreconf -ivf"
+    # An oos build is recommended in the documentation.
+    Dir.mkdir 'macbuild'
+    Dir.chdir 'macbuild' do
+      system "../configure", *args
+      system "make"
+      system "make install"
+    end
   end
 end
 
-
 __END__
-diff --git a/include/mikmod.h.in b/include/mikmod.h.in
-index 9b98f43..c39f779 100644
---- a/include/mikmod.h.in
-+++ b/include/mikmod.h.in
-@@ -85,7 +85,7 @@ typedef char CHAR;
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(_LP64)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
-diff --git a/include/mikmod_internals.h b/include/mikmod_internals.h
-index c61dab1..4fab08d 100644
---- a/include/mikmod_internals.h
-+++ b/include/mikmod_internals.h
-@@ -50,7 +50,7 @@ extern "C" {
- /*========== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(_LP64)
- typedef long		SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
-diff --git a/playercode/virtch_common.c b/playercode/virtch_common.c
-index 17ffaac..9b4f976 100644
---- a/playercode/virtch_common.c
-+++ b/playercode/virtch_common.c
-@@ -351,7 +351,7 @@ void VC1_VoiceSetPanning(UBYTE voice,ULONG pan)
- 
- void VC1_SampleUnload(SWORD handle)
- {
--	if (handle<MAXSAMPLEHANDLES) {
-+	if (Samples && handle<MAXSAMPLEHANDLES) {
- 		if (Samples[handle])
- 			free(Samples[handle]);
- 		Samples[handle]=NULL;
+--- a/configure.in	2007-12-03 12:50:05.000000000 -0800
++++ b/configure.in	2011-11-18 22:08:41.000000000 -0800
+@@ -331,7 +331,6 @@
+ if test $libmikmod_driver_esd = yes
+ then
+ 	libmikmod_driver_esd=no
+-	AM_PATH_ESD(0.2.6,libmikmod_driver_esd=yes)
+ # We also need to know if esd is compiled with alsa support
+ 	if test $libmikmod_driver_esd = yes
+ 	then

From 669ff272b7184e4d65fd0a26f613f757a4835990 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 9 Dec 2011 17:21:43 -0600
Subject: [PATCH 08/41] lua: use correct install name when generating dylib

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/lua.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb
index 1830bd28e204..75e2a381842f 100644
--- a/Library/Formula/lua.rb
+++ b/Library/Formula/lua.rb
@@ -92,7 +92,7 @@ def install
  $(LUA_A): $(CORE_O) $(LIB_O)
 -	$(AR) $@ $?
 -	$(RANLIB) $@
-+	$(CC) -dynamiclib -install_name /usr/local/lib/liblua.5.1.dylib \
++	$(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.1.dylib \
 +		-compatibility_version 5.1 -current_version 5.1.4 \
 +		-o liblua.5.1.4.dylib $^
  

From 6e498234064db9519061209c505a939f0c5a6411 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 9 Dec 2011 17:49:23 -0600
Subject: [PATCH 09/41] Use ENV.cc and ENV.cxx where appropriate

Cursory testing shows that these all build with llvm and those that have
binaries work. Formulae should be marked 'fails_with_llvm' if there are
issues found later.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/connect.rb  | 2 +-
 Library/Formula/cups-pdf.rb | 2 +-
 Library/Formula/gforth.rb   | 2 +-
 Library/Formula/ldid.rb     | 2 +-
 Library/Formula/tth.rb      | 2 +-
 Library/Formula/yamdi.rb    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Formula/connect.rb b/Library/Formula/connect.rb
index 5d6ab409637e..1c8dcb7f0ca9 100644
--- a/Library/Formula/connect.rb
+++ b/Library/Formula/connect.rb
@@ -7,7 +7,7 @@ class Connect < Formula
   md5 '5165e2fcd2cf58899f34878fe6b447c6'
 
   def install
-    system "gcc", "connect.c", "-o", "connect", "-lresolv"
+    system "#{ENV.cc}", "connect.c", "-o", "connect", "-lresolv"
     bin.install "connect"
   end
 end
diff --git a/Library/Formula/cups-pdf.rb b/Library/Formula/cups-pdf.rb
index bf4f5eb58b45..7f118e1df30b 100644
--- a/Library/Formula/cups-pdf.rb
+++ b/Library/Formula/cups-pdf.rb
@@ -9,7 +9,7 @@ class CupsPdf < Formula
   def patches; DATA; end
 
   def install
-    system "gcc -O9 -o cups-pdf src/cups-pdf.c"
+    system "#{ENV.cc} #{ENV.cflags} -o cups-pdf src/cups-pdf.c"
 
     (etc+'cups').install "extra/cups-pdf.conf"
     (lib+'cups/backend').install "cups-pdf"
diff --git a/Library/Formula/gforth.rb b/Library/Formula/gforth.rb
index 19381a7dce01..b3937d438c68 100644
--- a/Library/Formula/gforth.rb
+++ b/Library/Formula/gforth.rb
@@ -9,7 +9,7 @@ def install
     ENV.j1 # Parallel builds won't work
     # Install 32-bit only, even on Snow Leopard. See:
     # http://www.groupsrv.com/computers/about648918.html
-    ENV['CC'] = "gcc -m32"
+    ENV['CC'] = "#{ENV.cc} -m32"
     system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make" # Separate build steps.
     system "make install"
diff --git a/Library/Formula/ldid.rb b/Library/Formula/ldid.rb
index 18fc4bc04a4c..a80c6196d9fe 100644
--- a/Library/Formula/ldid.rb
+++ b/Library/Formula/ldid.rb
@@ -6,7 +6,7 @@ class Ldid < Formula
   md5 '634c2f8b8a084046883e3793f6580e07'
 
   def install
-    system "g++ -I . -o util/ldid{,.cpp} -x c util/{lookup2,sha1}.c"
+    system "#{ENV.cxx} -I . -o util/ldid{,.cpp} -x c util/{lookup2,sha1}.c"
     bin.install ["util/ldid"]
   end
 end
diff --git a/Library/Formula/tth.rb b/Library/Formula/tth.rb
index 3a0f71278251..adb2b5f07738 100644
--- a/Library/Formula/tth.rb
+++ b/Library/Formula/tth.rb
@@ -7,7 +7,7 @@ class Tth < Formula
   version '4.00'
 
   def install
-    system 'gcc -Os -o tth tth.c'
+    system "#{ENV.cc} -o tth tth.c"
     bin.install %w(tth latex2gif ps2gif ps2png)
     man1.install 'tth.1'
   end
diff --git a/Library/Formula/yamdi.rb b/Library/Formula/yamdi.rb
index ecc04212dca7..f4cf269f4a85 100644
--- a/Library/Formula/yamdi.rb
+++ b/Library/Formula/yamdi.rb
@@ -6,7 +6,7 @@ class Yamdi < Formula
   md5 '3f8395373e941f235015a92d4da047c8'
 
   def install
-    system "gcc yamdi.c -o yamdi -O2 -Wall"
+    system "#{ENV.cc} #{ENV.cflags} yamdi.c -o yamdi"
     bin.install "yamdi"
     man1.install "man1/yamdi.1"
   end

From b2f133751221b45ad35e778442a4dadd0018de60 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 9 Dec 2011 17:59:14 -0600
Subject: [PATCH 10/41] rsyslog: simplify environment setup

This builds and runs correctly, universal and otherwise, without
changing the compiler environment variables manually.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/rsyslog.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Library/Formula/rsyslog.rb b/Library/Formula/rsyslog.rb
index 03bf1eae9287..ae7e42246e43 100644
--- a/Library/Formula/rsyslog.rb
+++ b/Library/Formula/rsyslog.rb
@@ -12,16 +12,8 @@ def options
   end
 
   def install
-    if ARGV.build_universal?
-      ENV['CC'] = "gcc -arch i386 -arch x86_64"
-      ENV['CXX'] = "g++ -arch i386 -arch x86_64"
-      ENV['CPP'] = "gcc -E"
-      ENV['CXXCPP'] = "g++ -E"
-      system "./configure", "--prefix=#{prefix}"
-    else
-      system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
-    end
-
+    ENV.universal_binary if ARGV.build_universal?
+    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make"
     system "make install"
   end

From 44e2e4932ae238a956df37eb7a6283b0ffeb9a8e Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 9 Dec 2011 21:09:55 -0600
Subject: [PATCH 11/41] sqlite 3.7.9

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/sqlite.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index 085c13319097..085594d390cf 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -8,9 +8,9 @@ class SqliteFunctions < Formula
 
 class Sqlite < Formula
   homepage 'http://sqlite.org/'
-  url 'http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz'
-  md5 '554026fe7fac47b1cf61c18d5fe43419'
-  version '3.7.7.1'
+  url 'http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
+  sha1 'a9da98a4bde4d9dae5c29a969455d11a03600e11'
+  version '3.7.9'
 
   def options
   [

From c9eca803d676961ead136b07ab145cc1e826b314 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 9 Dec 2011 21:10:10 -0600
Subject: [PATCH 12/41] sqlite: rework compilation options

This enables a couple more compile-time options, along with some minor
style cleanups.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/sqlite.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index 085594d390cf..a0881aa11a83 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -14,10 +14,10 @@ class Sqlite < Formula
 
   def options
   [
-    ["--with-rtree", "Enables the R*Tree index module"],
-    ["--with-fts", "Enables the FTS Module"],
-    ["--universal", "Build a universal binary."],
-    ["--with-functions", "Enables more math and string functions for SQL queries."]
+    ["--with-rtree", "Enable the R*Tree index module"],
+    ["--with-fts", "Enable the FTS Module"],
+    ["--universal", "Build a universal binary"],
+    ["--with-functions", "Enable more math and string functions for SQL queries"]
   ]
   end
 
@@ -25,8 +25,14 @@ def install
     # O2 and O3 leads to corrupt/invalid rtree indexes
     # http://groups.google.com/group/spatialite-users/browse_thread/thread/8e1cfa79f2d02a00#
     ENV.Os
-    ENV.append "CFLAGS", "-DSQLITE_ENABLE_RTREE=1" if ARGV.include? "--with-rtree"
-    ENV.append "CPPFLAGS","-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if ARGV.include? "--with-fts"
+
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_RTREE" if ARGV.include? "--with-rtree"
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS" if ARGV.include? "--with-fts"
+
+    # enable these options by default
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_COLUMN_METADATA"
+    ENV.append 'CPPFLAGS', "-DSQLITE_ENABLE_STAT3"
+
     ENV.universal_binary if ARGV.build_universal?
 
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking",

From 70a6fb702016b99435cb4e9cd0227aa6fd331f32 Mon Sep 17 00:00:00 2001
From: David Turnbull <david@broodax.net>
Date: Mon, 28 Nov 2011 11:20:32 +1100
Subject: [PATCH 13/41] pig 0.9.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/pig.rb | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Library/Formula/pig.rb b/Library/Formula/pig.rb
index 36a6e3b9cb69..d8071eb24db2 100644
--- a/Library/Formula/pig.rb
+++ b/Library/Formula/pig.rb
@@ -10,25 +10,30 @@ def patches
   end
 
   def install
-    rm_f Dir["bin/*.bat"]
-    prefix.install ['bin', "pig-#{version}.jar"]
+    bin.install 'bin/pig'
+    prefix.install "pig-#{version}.jar"
+    prefix.install "pig-#{version}-withouthadoop.jar"
   end
 end
 
 # There's something weird with Pig's launch script, it doesn't find the correct
-# path. This patch removes a test that should fail, but doesn't.
+# path. This patch finds PIG_HOME from the pig binary path's symlink.
 __END__
-diff --git a/bin/pig b/bin/pig
-index 97fc649..79056cf 100644
---- a/bin/pig
-+++ b/bin/pig
-@@ -61,6 +61,10 @@
- script="$(basename -- "$this")"
- this="$bin/$script"
+diff -u a/bin/pig b/bin/pig
+--- a/bin/pig 2011-09-30 08:55:58.000000000 +1000
++++ b/bin/pig 2011-11-28 11:18:36.000000000 +1100
+@@ -55,11 +55,8 @@
+
+ # resolve links - $0 may be a softlink
+ this="${BASH_SOURCE-$0}"
+-
+-# convert relative path to absolute path
+-bin=$(cd -P -- "$(dirname -- "$this")">/dev/null && pwd -P)
+-script="$(basename -- "$this")"
+-this="$bin/$script"
++here=$(dirname $this)
++this="$here"/$(readlink $this)
 
-+ls=`ls -ld "$this"`
-+link=`expr "$ls" : '.*-> \(.*\)$'`
-+this=`dirname "$this"`/"$link"
-+
  # the root of the Pig installation
  export PIG_HOME=`dirname "$this"`/..
+

From d628e96761956b1b4123fcc8d162f3c354e16688 Mon Sep 17 00:00:00 2001
From: Rui Pereira <rui.pereira@gmail.com>
Date: Sat, 10 Dec 2011 17:17:24 +0100
Subject: [PATCH 14/41] gv 3.7.3.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/gv.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Library/Formula/gv.rb b/Library/Formula/gv.rb
index ae605d917093..52bc4ff20bb4 100644
--- a/Library/Formula/gv.rb
+++ b/Library/Formula/gv.rb
@@ -1,21 +1,16 @@
 require 'formula'
 
 class Gv < Formula
-  url 'http://ftpmirror.gnu.org/gv/gv-3.7.2.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/gv/gv-3.7.2.tar.gz'
+  url 'http://ftpmirror.gnu.org/gv/gv-3.7.3.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/gv/gv-3.7.3.tar.gz'
   homepage 'http://www.gnu.org/s/gv/'
-  md5 'eb47d465755b7291870af66431c6f2e1'
+  md5 '98ae3e9ce338b64ba5ab622389c5960e'
 
   depends_on 'ghostscript'
   depends_on 'xaw3d'
 
   skip_clean 'share/gv/safe-gs-workdir'
 
-  def patches
-    # apply MacPorts typedef patch
-    { :p0 => "https://trac.macports.org/export/83941/trunk/dports/print/gv/files/patch-src-callbacks.c.diff" }
-  end
-
   def install
     ENV.x11
     system "./configure", "--disable-dependency-tracking",

From db35cfbff4d22833f1590094d58eacd129bedd79 Mon Sep 17 00:00:00 2001
From: Darell Tan <darell.tan@gmail.com>
Date: Fri, 14 Oct 2011 17:16:57 +0800
Subject: [PATCH 15/41] ldid: Added support for armv7 binaries used in newer
 iOS versions.

---
 Library/Formula/ldid.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Library/Formula/ldid.rb b/Library/Formula/ldid.rb
index 18fc4bc04a4c..6dc8003b4a99 100644
--- a/Library/Formula/ldid.rb
+++ b/Library/Formula/ldid.rb
@@ -5,8 +5,25 @@ class Ldid < Formula
   homepage 'http://www.saurik.com/id/8'
   md5 '634c2f8b8a084046883e3793f6580e07'
 
+  def patches
+    DATA
+  end
+
   def install
     system "g++ -I . -o util/ldid{,.cpp} -x c util/{lookup2,sha1}.c"
     bin.install ["util/ldid"]
   end
 end
+
+__END__
+diff -ur ldid-1.0.610/util/ldid.cpp ldid-1.0.610-p/util/ldid.cpp
+--- ldid-1.0.610/util/ldid.cpp	2009-05-20 14:33:45.000000000 +0800
++++ ldid-1.0.610-gm/util/ldid.cpp	2011-10-14 16:58:56.000000000 +0800
+@@ -557,6 +557,7 @@
+                     case 12: switch (framework->cpusubtype) {
+                         case 0: arch = "arm"; break;
+                         case 6: arch = "armv6"; break;
++                        case 9: arch = "armv7"; break;
+                         default: arch = NULL; break;
+                     } break;
+ 

From f9d9cdb099ce869721fd1ab68dc05c2bdacb0769 Mon Sep 17 00:00:00 2001
From: David Turnbull <david@broodax.net>
Date: Mon, 28 Nov 2011 11:20:32 +1100
Subject: [PATCH 16/41] pig 0.9.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/pig.rb | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/Library/Formula/pig.rb b/Library/Formula/pig.rb
index 36a6e3b9cb69..d8071eb24db2 100644
--- a/Library/Formula/pig.rb
+++ b/Library/Formula/pig.rb
@@ -10,25 +10,30 @@ def patches
   end
 
   def install
-    rm_f Dir["bin/*.bat"]
-    prefix.install ['bin', "pig-#{version}.jar"]
+    bin.install 'bin/pig'
+    prefix.install "pig-#{version}.jar"
+    prefix.install "pig-#{version}-withouthadoop.jar"
   end
 end
 
 # There's something weird with Pig's launch script, it doesn't find the correct
-# path. This patch removes a test that should fail, but doesn't.
+# path. This patch finds PIG_HOME from the pig binary path's symlink.
 __END__
-diff --git a/bin/pig b/bin/pig
-index 97fc649..79056cf 100644
---- a/bin/pig
-+++ b/bin/pig
-@@ -61,6 +61,10 @@
- script="$(basename -- "$this")"
- this="$bin/$script"
+diff -u a/bin/pig b/bin/pig
+--- a/bin/pig 2011-09-30 08:55:58.000000000 +1000
++++ b/bin/pig 2011-11-28 11:18:36.000000000 +1100
+@@ -55,11 +55,8 @@
+
+ # resolve links - $0 may be a softlink
+ this="${BASH_SOURCE-$0}"
+-
+-# convert relative path to absolute path
+-bin=$(cd -P -- "$(dirname -- "$this")">/dev/null && pwd -P)
+-script="$(basename -- "$this")"
+-this="$bin/$script"
++here=$(dirname $this)
++this="$here"/$(readlink $this)
 
-+ls=`ls -ld "$this"`
-+link=`expr "$ls" : '.*-> \(.*\)$'`
-+this=`dirname "$this"`/"$link"
-+
  # the root of the Pig installation
  export PIG_HOME=`dirname "$this"`/..
+

From 58e19013528b00924af415a26c10d570a006ae61 Mon Sep 17 00:00:00 2001
From: Rui Pereira <rui.pereira@gmail.com>
Date: Sat, 10 Dec 2011 17:17:24 +0100
Subject: [PATCH 17/41] gv 3.7.3.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/gv.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Library/Formula/gv.rb b/Library/Formula/gv.rb
index ae605d917093..52bc4ff20bb4 100644
--- a/Library/Formula/gv.rb
+++ b/Library/Formula/gv.rb
@@ -1,21 +1,16 @@
 require 'formula'
 
 class Gv < Formula
-  url 'http://ftpmirror.gnu.org/gv/gv-3.7.2.tar.gz'
-  mirror 'http://ftp.gnu.org/gnu/gv/gv-3.7.2.tar.gz'
+  url 'http://ftpmirror.gnu.org/gv/gv-3.7.3.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/gv/gv-3.7.3.tar.gz'
   homepage 'http://www.gnu.org/s/gv/'
-  md5 'eb47d465755b7291870af66431c6f2e1'
+  md5 '98ae3e9ce338b64ba5ab622389c5960e'
 
   depends_on 'ghostscript'
   depends_on 'xaw3d'
 
   skip_clean 'share/gv/safe-gs-workdir'
 
-  def patches
-    # apply MacPorts typedef patch
-    { :p0 => "https://trac.macports.org/export/83941/trunk/dports/print/gv/files/patch-src-callbacks.c.diff" }
-  end
-
   def install
     ENV.x11
     system "./configure", "--disable-dependency-tracking",

From f4847b50318a2626968474f49ad4cf39f2ccf3ee Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Sat, 10 Dec 2011 11:54:38 -0600
Subject: [PATCH 18/41] libpano 13-2.9.18

Fixes: #9073.
---
 Library/Formula/libpano.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Formula/libpano.rb b/Library/Formula/libpano.rb
index 0e6b7f14a5c0..67f0acc70f09 100644
--- a/Library/Formula/libpano.rb
+++ b/Library/Formula/libpano.rb
@@ -1,10 +1,10 @@
 require 'formula'
 
 class Libpano < Formula
-  url 'http://downloads.sourceforge.net/project/panotools/libpano13/libpano13-2.9.17/libpano13-2.9.17.tar.gz'
-  version '13-2.9.17'
+  url 'http://downloads.sourceforge.net/project/panotools/libpano13/libpano13-2.9.18/libpano13-2.9.18.tar.gz'
+  version '13-2.9.18'
   homepage 'http://panotools.sourceforge.net/'
-  md5 '54ec7c505cf38521f2fbb6e2acd2c433'
+  md5 '9c3a4fce8b6f1d79e395896ce5d8776e'
 
   depends_on 'jpeg'
   depends_on 'libtiff'

From 4b8e0ce6544462f95b643c39b2e212d2ff8cd3e6 Mon Sep 17 00:00:00 2001
From: Justin Clift <jclift@redhat.com>
Date: Sun, 11 Dec 2011 06:53:10 +1100
Subject: [PATCH 19/41] New formula: gnome-doc-utils

Closes #9066.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/gnome-doc-utils.rb | 35 ++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 Library/Formula/gnome-doc-utils.rb

diff --git a/Library/Formula/gnome-doc-utils.rb b/Library/Formula/gnome-doc-utils.rb
new file mode 100644
index 000000000000..4c6e66845737
--- /dev/null
+++ b/Library/Formula/gnome-doc-utils.rb
@@ -0,0 +1,35 @@
+require 'formula'
+
+class GnomeDocUtils < Formula
+  homepage 'https://live.gnome.org/GnomeDocUtils'
+  url 'ftp://ftp.gnome.org/pub/gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.6.tar.bz2'
+  sha256 '091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf'
+
+  depends_on 'pkg-config' => :build
+  depends_on 'intltool'
+  depends_on 'docbook'
+  depends_on 'libxml2' # --with-python
+  depends_on 'gettext'
+
+  fails_with_llvm "Undefined symbols when linking", :build => "2326"
+
+  def install
+    args = ["--prefix=#{prefix}",
+            "--disable-scrollkeeper",
+            "--enable-build-utils=yes"]
+
+    system "./configure", *args
+
+    # Compilation doesn't work right if we jump straight to make install
+    system "make"
+    system "make install"
+  end
+
+  def caveats; <<-EOS.undent
+  Gnome-doc-utils requires libxml2 to be compiled
+  with the python modules enabled, to do so:
+    $ brew install libxml2 --with-python
+  EOS
+  end
+end
+

From 959c34c63a50d28b2360e82e6a1c9415dfd41810 Mon Sep 17 00:00:00 2001
From: Robin Heggelund Hansen <skinneyz89@gmail.com>
Date: Sat, 10 Dec 2011 00:11:04 +0100
Subject: [PATCH 20/41] vala 0.14.1

Closes #9071.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/vala.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/vala.rb b/Library/Formula/vala.rb
index 2ee8fccef74c..74f8ff17a73f 100644
--- a/Library/Formula/vala.rb
+++ b/Library/Formula/vala.rb
@@ -2,9 +2,9 @@
 
 class Vala < Formula
   head 'git://git.gnome.org/vala'
-  url 'http://download.gnome.org/sources/vala/0.11/vala-0.11.7.tar.bz2'
+  url 'http://download.gnome.org/sources/vala/0.14/vala-0.14.1.tar.xz'
   homepage 'http://live.gnome.org/Vala'
-  md5 '5515f32552ee45ed5c7541c119009caa'
+  sha256 'bef8c803e6e84d6dd2c6e771b72245ae268f49f554f3d00b2c4a0b7a28f4a439'
 
   depends_on 'pkg-config' => :build
   depends_on 'gettext'

From ba917c0fed4639137af0cdb4add4ae2a1e9b58ba Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sat, 10 Dec 2011 14:31:42 -0600
Subject: [PATCH 21/41] libmms: apply patch for Leopard

See https://trac.macports.org/ticket/27988

Fixes #9074.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/libmms.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Library/Formula/libmms.rb b/Library/Formula/libmms.rb
index 6e473e452569..895ddc41517d 100644
--- a/Library/Formula/libmms.rb
+++ b/Library/Formula/libmms.rb
@@ -8,6 +8,13 @@ class Libmms < Formula
   depends_on 'pkg-config' => :build
   depends_on 'glib'
 
+  def patches
+    # see https://trac.macports.org/ticket/27988
+    if MacOS.leopard?
+      { :p0 => "https://svn.macports.org/repository/macports/!svn/bc/87883/trunk/dports/multimedia/libmms/files/src_mms-common.h.patch" }
+    end
+  end
+
   def install
     ENV.append 'LDFLAGS', '-liconv'
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"

From 94995df0f936674a11274e9d4f9257051ce8867f Mon Sep 17 00:00:00 2001
From: Jay Levitt <jay@jay.fm>
Date: Fri, 9 Dec 2011 17:35:55 -0500
Subject: [PATCH 22/41] PostgreSQL 9.1.2

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/postgresql.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb
index a96c9f6fcd92..66b5e253819d 100644
--- a/Library/Formula/postgresql.rb
+++ b/Library/Formula/postgresql.rb
@@ -3,8 +3,8 @@
 
 class Postgresql < Formula
   homepage 'http://www.postgresql.org/'
-  url 'http://ftp.postgresql.org/pub/source/v9.1.1/postgresql-9.1.1.tar.bz2'
-  md5 '061a9f17323117c9358ed60f33ecff78'
+  url 'http://ftp.postgresql.org/pub/source/v9.1.2/postgresql-9.1.2.tar.bz2'
+  md5 '7dbff52221954c46595313eb7f92c3e0'
 
   depends_on 'readline'
   depends_on 'libxml2' if MacOS.leopard? # Leopard libxml is too old

From 29cbb4f6d4029542322be199a1b7d78b9a7f1d90 Mon Sep 17 00:00:00 2001
From: Krzysztof Urbaniak <urban@fail.pl>
Date: Fri, 9 Dec 2011 00:21:39 +0100
Subject: [PATCH 23/41] uwsgi 0.9.9.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/uwsgi.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/uwsgi.rb b/Library/Formula/uwsgi.rb
index 94ab03b82d3e..fff6cf8a1c43 100644
--- a/Library/Formula/uwsgi.rb
+++ b/Library/Formula/uwsgi.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Uwsgi < Formula
-  url 'http://projects.unbit.it/downloads/uwsgi-0.9.9.2.tar.gz'
+  url 'http://projects.unbit.it/downloads/uwsgi-0.9.9.3.tar.gz'
   homepage 'http://projects.unbit.it/uwsgi/'
-  md5 'fafecf7dc86a36f003d2fadaa44483f1'
+  md5 'bbf4ac40901fb9d26c8286e7637b77f5'
 
   def install
     # Find the arch for the Python we are building against.

From cdb00fad5198f74cfc2f20541f24d86e13466b48 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sat, 10 Dec 2011 19:54:02 -0600
Subject: [PATCH 24/41] sqlite: "optionally" depend on readline

Using readline rather than libedit allows, among other things, the
sharing of the same line-editing config file (.inputrc) across BSDish
and Linux systems. And I'm lazy, and don't want to learn how to
configure editline.

We currently just throw away :optional when processing dependencies, so
if someone really wants libedit instead, we can either make this into an
install option (--with-readline) or vice-versa (--with-libedit).

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/sqlite.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index a0881aa11a83..e802bf1484c0 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -12,6 +12,8 @@ class Sqlite < Formula
   sha1 'a9da98a4bde4d9dae5c29a969455d11a03600e11'
   version '3.7.9'
 
+  depends_on 'readline' => :optional
+
   def options
   [
     ["--with-rtree", "Enable the R*Tree index module"],

From 40d670bba1b3b5f58d87338e0380ac2d6d33e01a Mon Sep 17 00:00:00 2001
From: Matthew King <matthew.y.king@gmail.com>
Date: Sat, 10 Dec 2011 17:56:34 -0500
Subject: [PATCH 25/41] ruby: Remove unrecognized option

Closes #9082.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/ruby.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb
index 016f2bfc848e..11ef1702b94c 100644
--- a/Library/Formula/ruby.rb
+++ b/Library/Formula/ruby.rb
@@ -41,9 +41,7 @@ def install
 
     system "autoconf" unless File.exists? 'configure'
 
-    # Configure claims that "--with-readline-dir" is unused, but it works.
     args = ["--prefix=#{prefix}",
-            "--with-readline-dir=#{Formula.factory('readline').prefix}",
             "--disable-debug",
             "--disable-dependency-tracking",
             "--enable-shared"]

From 5958852971c3b4bb938583f1b14859245cd5450e Mon Sep 17 00:00:00 2001
From: Walter McGinnis <walter@katipo.co.nz>
Date: Sun, 11 Dec 2011 18:01:49 +1300
Subject: [PATCH 26/41] yaz 4.2.22

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/yaz.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Library/Formula/yaz.rb b/Library/Formula/yaz.rb
index d29c380786d9..ea6f91f8a2ee 100644
--- a/Library/Formula/yaz.rb
+++ b/Library/Formula/yaz.rb
@@ -1,12 +1,9 @@
 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.
-
 class Yaz < Formula
-  url 'http://ftp.indexdata.dk/pub/yaz/yaz-4.2.7.tar.gz'
+  url 'http://ftp.indexdata.dk/pub/yaz/yaz-4.2.22.tar.gz'
   homepage 'http://www.indexdata.com/yaz'
-  md5 '7bb9d007ce288b6c4095bd3a1f9ef627'
+  md5 'b28ecda4073a950a1f915829475e5238'
 
   depends_on 'pkg-config' => :build
 

From 72a6120c104e4d8c4429173b97b3b3946e095887 Mon Sep 17 00:00:00 2001
From: Walter McGinnis <walter@katipo.co.nz>
Date: Sun, 11 Dec 2011 18:05:01 +1300
Subject: [PATCH 27/41] zebra 2.0.50

Closes #9085.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/zebra.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/zebra.rb b/Library/Formula/zebra.rb
index 80768054ec7f..0cd84477787b 100644
--- a/Library/Formula/zebra.rb
+++ b/Library/Formula/zebra.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Zebra < Formula
-  url 'http://ftp.indexdata.dk/pub/zebra/idzebra-2.0.45.tar.gz'
+  url 'http://ftp.indexdata.dk/pub/zebra/idzebra-2.0.50.tar.gz'
   homepage 'http://www.indexdata.com/zebra'
-  md5 '50aa282d76b4fa86a02c28e6dad4e24b'
+  md5 '4393217c9973bf5959396ad4150ee24e'
 
   depends_on 'yaz'
 

From 7cf07cb2b6f3eac5b14600c9e829498bfd42574c Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Sun, 11 Dec 2011 01:43:57 -0600
Subject: [PATCH 28/41] audiofile 0.3.2

---
 Library/Formula/audiofile.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 96da368fc5a3ff4edcbb7fab6d6dc789c565ed85 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 11 Dec 2011 01:29:15 -0600
Subject: [PATCH 29/41] completion: complete multiple formula arguments

We make the assumption that the first non-option word is the command
being invoked.

Originally I was trying to allow command completion for non-standard
command lines like

    $ brew --verbose inst<TAB>

but right now executing something like that doesn't actually work. Which
is interesting, because the man page implies that it should. Either the
man page is incorrect, or something was broken between then and now.

Anyway, it would probably be safe to just assume that COMP_WORDS[1] is
the command, and we do make that assumption in other places. But if we
ever do allow things like "brew --option command", this will be useful.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Contributions/brew_bash_completion.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 0289204717df..97b3791909a1 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -205,7 +205,14 @@ _brew_to_completion()
         esac
     fi
 
-    case "$prev" in
+    # find the index of the *first* non-switch word
+    # we can use this to allow completion for multiple formula arguments
+    local cmd_index=1
+    while [[ ${COMP_WORDS[cmd_index]} == -* ]]; do
+        cmd_index=$((++cmd_index))
+    done
+
+    case "${COMP_WORDS[cmd_index]}" in
     # Commands that take a formula
     cat|deps|edit|fetch|home|homepage|info|install|log|missing|options|uses|versions)
         local ff=$(\ls $(brew --repository)/Library/Formula 2> /dev/null | sed "s/\.rb//g")

From 078fa4b37a9a1f8d10b3d1c5773ed24bce876835 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 11 Dec 2011 01:30:15 -0600
Subject: [PATCH 30/41] completion: audit takes formula arguments

 - Also remove `--strict` completion since that option was removed.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Contributions/brew_bash_completion.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
index 97b3791909a1..355d6443f85a 100644
--- a/Library/Contributions/brew_bash_completion.sh
+++ b/Library/Contributions/brew_bash_completion.sh
@@ -63,11 +63,6 @@ _brew_to_completion()
     # handle subcommand options
     if [[  "$cur" == --* ]]; then
         case "${COMP_WORDS[1]}" in
-        audit)
-            local opts=$([[ "${COMP_WORDS[*]}" =~ "--strict" ]] || echo "--strict")
-            COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
-            return
-            ;;
         cleanup)
             local opts=$([[ "${COMP_WORDS[*]}" =~ "--force" ]] || echo "--force")
             COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
@@ -214,7 +209,7 @@ _brew_to_completion()
 
     case "${COMP_WORDS[cmd_index]}" in
     # Commands that take a formula
-    cat|deps|edit|fetch|home|homepage|info|install|log|missing|options|uses|versions)
+    audit|cat|deps|edit|fetch|home|homepage|info|install|log|missing|options|uses|versions)
         local ff=$(\ls $(brew --repository)/Library/Formula 2> /dev/null | sed "s/\.rb//g")
         local af=$(\ls $(brew --repository)/Library/Aliases 2> /dev/null | sed "s/\.rb//g")
         COMPREPLY=( $(compgen -W "${ff} ${af}" -- ${cur}) )

From 285c16b1463d55e3300f4589f255c4707d6d78e8 Mon Sep 17 00:00:00 2001
From: Robin Heggelund Hansen <skinneyz89@gmail.com>
Date: Sat, 10 Dec 2011 23:57:36 +0100
Subject: [PATCH 31/41] Updated libgee to 0.6.3

Closes #9081.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/libgee.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Formula/libgee.rb b/Library/Formula/libgee.rb
index a7da7ec31438..f43896d491f2 100644
--- a/Library/Formula/libgee.rb
+++ b/Library/Formula/libgee.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Libgee < Formula
-  url 'http://download.gnome.org/sources/libgee/0.6/libgee-0.6.1.tar.bz2'
+  url 'http://download.gnome.org/sources/libgee/0.6/libgee-0.6.3.tar.bz2'
   homepage 'http://live.gnome.org/Libgee'
-  md5 '9cf60f41f3aa10ac7f1f7e1d094e05a1'
+  sha256 'fc3479d692752289c6c1e312fdd79d1f9fdf5322d16fa8f4faf0d6a5e61c5af8'
 
   depends_on 'vala'
 

From d7acdf18e7fa3f1f031304ee0cbcf81cd89ef155 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 11 Dec 2011 14:07:08 -0600
Subject: [PATCH 32/41] sqlite: add option to install HTML docs

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/sqlite.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Library/Formula/sqlite.rb b/Library/Formula/sqlite.rb
index e802bf1484c0..9063e062d6ae 100644
--- a/Library/Formula/sqlite.rb
+++ b/Library/Formula/sqlite.rb
@@ -6,6 +6,12 @@ class SqliteFunctions < Formula
   version '2010-01-06'
 end
 
+class SqliteDocs < Formula
+  url 'http://www.sqlite.org/sqlite-doc-3070900.zip'
+  sha1 '2d4a25f75cc6b7251f1b49b828f9fd1d699fc8a2'
+  version '3.7.9'
+end
+
 class Sqlite < Formula
   homepage 'http://sqlite.org/'
   url 'http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz'
@@ -16,6 +22,7 @@ class Sqlite < Formula
 
   def options
   [
+    ["--with-docs", "Install HTML documentation"],
     ["--with-rtree", "Enable the R*Tree index module"],
     ["--with-fts", "Enable the FTS Module"],
     ["--universal", "Build a universal binary"],
@@ -47,6 +54,8 @@ def install
       system ENV.cc, "-fno-common", "-dynamiclib", "extension-functions.c", "-o", "libsqlitefunctions.dylib", *ENV.cflags.split
       lib.install "libsqlitefunctions.dylib"
     end
+
+    SqliteDocs.new.brew { doc.install Dir['*'] } if ARGV.include? "--with-docs"
   end
 
   if ARGV.include? "--with-functions"

From 2c8e0aec27e5b9f6df1c410481a875f5219e22f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?iXo=CC=82?= <ixo@kawaiyume.net>
Date: Thu, 21 Jul 2011 20:45:23 +0200
Subject: [PATCH 33/41] libid3tag: add patches to correct memory leaks

libid3tag has some serious memory leaks which are unlikely to be
corrected upstream, since the original project hasn't updated since
2004. These Gentoo patches resolve the issues.

Closes #6517.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/libid3tag.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Library/Formula/libid3tag.rb b/Library/Formula/libid3tag.rb
index 79423b33929b..07c34b6511c1 100644
--- a/Library/Formula/libid3tag.rb
+++ b/Library/Formula/libid3tag.rb
@@ -26,6 +26,28 @@ def homepage
     Formula.factory('mad').homepage
   end
 
+  # Fixes serious memory leaks; see https://bugs.launchpad.net/mixxx/+bug/403586
+  def patches
+    base = "http://mirror.ovh.net/gentoo-portage/media-libs/libid3tag/files/0.15.1b/"
+    # patch for utf-16 (memory leaks)
+    { :p1 => ["libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch",
+              "libid3tag-0.15.1b-unknown-encoding.patch",
+              "libid3tag-0.15.1b-compat.patch",
+              "libid3tag-0.15.1b-file-write.patch",
+              ].map { |file_name| "#{base}/#{file_name}" },
+
+      # typedef for 64-bit long + buffer overflow
+      :p0 => ["libid3tag-0.15.1b-64bit-long.patch",
+              "libid3tag-0.15.1b-fix_overflow.patch",
+              "libid3tag-0.15.1b-tag.patch",
+             ].map { |file_name| "#{base}/#{file_name}" },
+
+      # corrects "a cappella" typo
+      :p2 => ["libid3tag-0.15.1b-a_capella.patch",
+             ].map { |file_name| "#{base}/#{file_name}" }
+    }
+  end
+
   def install
     system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
     system "make install"

From 70c51030f1a441a3cb8021da6592ae24e18ec2ed Mon Sep 17 00:00:00 2001
From: Nibbles 2bits <nibbles@speakeasy.net>
Date: Fri, 28 Oct 2011 23:33:41 -0700
Subject: [PATCH 34/41] New Formula: field3d

This creates a new formula for Field3D, an open source library for
storing voxel data. It provides C++ classes that handle in-memory
storage and a file format based on HDF5 that allows the C++ objects
to be written to and read from disk.

The field3d.rb formula depends on scons to configure and build the
software, and cmake to build the docs.  Deps on boost, ilmbase,
and hdf5 round out the requirements, setting the stage for handling
HDR images from International Light and Magic.  Field3d will be a
dep in the upcoming openimageio formula.

This compiles and passes its unit tests with all three compilers,
llvm-2335.9, gcc-4.2.1.5666, and clang-2.0.139 from XCode 4.0.2
on 64bit OSX Snow Leopard.

Closes #8362.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/field3d.rb | 50 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 Library/Formula/field3d.rb

diff --git a/Library/Formula/field3d.rb b/Library/Formula/field3d.rb
new file mode 100644
index 000000000000..a7fda67b647c
--- /dev/null
+++ b/Library/Formula/field3d.rb
@@ -0,0 +1,50 @@
+require 'formula'
+
+class Field3d < Formula
+  url 'https://github.com/imageworks/Field3D/tarball/v1.2.0'
+  homepage 'https://sites.google.com/site/field3d/'
+  sha1 '1bbd1c7cadca96d5f0d58f3f2a27241d481e205f'
+
+  depends_on 'cmake' => :build
+  depends_on 'scons' => :build
+  depends_on 'doxygen' => :build
+  depends_on 'boost'
+  depends_on 'ilmbase'
+  depends_on 'hdf5'
+
+  def install
+    # Set the compilers for Homebrew - was fixed to gcc & g++
+    inreplace 'SConstruct', 'env = Environment()',
+                <<-EOS.undent
+                  env = Environment()\n
+                  env.Replace(CC = "#{ENV.cc}")
+                  env.Replace(CXX = "#{ENV.cxx}")
+                EOS
+    # Set the systemIncludePaths and systemLibPaths that get searched.
+    inreplace 'BuildSupport.py', '/opt/local/include', "#{HOMEBREW_PREFIX}/include"
+    inreplace 'BuildSupport.py', '/opt/local/lib', "#{HOMEBREW_PREFIX}/lib"
+    # Merge Homebrew's CFLAGS into the build's CCFLAGS passed to CC and CXX.
+    inreplace 'BuildSupport.py',
+                'env.Append(CCFLAGS = ["-Wall"])',
+                "env.MergeFlags(['#{ENV.cflags}'])"
+
+    # Build the software with scons.
+    system "scons" unless MacOS.prefer_64_bit?
+    system "scons do64=1" if MacOS.prefer_64_bit?
+    # Build the docs with cmake
+    mkdir 'macbuild'
+    Dir.chdir 'macbuild' do
+      system "cmake .."
+      system "make doc"
+    end
+    # Install the libraries and docs.
+    b = 'install/darwin/m64/release/' if MacOS.prefer_64_bit?
+    b = 'install/darwin/m32/release/' unless MacOS.prefer_64_bit?
+    l = b+'lib/*'
+    i = b+'include/*'
+    lib.install Dir[l]
+    include.install Dir[i]
+    prefix.install %w{ README CHANGES COPYING }
+    doc.install Dir['docs/html/*']
+  end
+end

From 36efc01319ad4b4e748d9f4e608ad78fd5ae8ddb Mon Sep 17 00:00:00 2001
From: Lance Parsons <lparsons@genomics.princeton.edu>
Date: Fri, 30 Sep 2011 17:28:49 -0400
Subject: [PATCH 35/41] New formula: vcftools

Closes #7920.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/vcftools.rb | 57 +++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 Library/Formula/vcftools.rb

diff --git a/Library/Formula/vcftools.rb b/Library/Formula/vcftools.rb
new file mode 100644
index 000000000000..725c8b6155b0
--- /dev/null
+++ b/Library/Formula/vcftools.rb
@@ -0,0 +1,57 @@
+require 'formula'
+
+class Vcftools < Formula
+  url 'http://downloads.sourceforge.net/project/vcftools/vcftools_0.1.7.tar.gz'
+  homepage 'http://vcftools.sourceforge.net/index.html'
+  md5 'd3e68027a7fe40d3f8cb28c3006c7248'
+
+  def install
+    system "make install PREFIX=#{prefix} CPP=#{ENV.cxx}"
+  end
+
+  def test
+    system "vcftools"
+  end
+
+  def caveats; <<-EOS.undent
+    To use the Perl modules, make sure Vcf.pm, VcfStats.pm, and FaSlice.pm
+    are included in your PERL5LIB environment variable:
+      export PERL5LIB=#{HOMEBREW_PREFIX}/lib/perl5/site_perl:${PERL5LIB}
+    EOS
+  end
+
+  def patches
+    # Install Perl modules to /lib/perl5/site_perl and ensure VcfStats.pm is installed
+    # This is fixed in vcf source tree, will not be needed after version 0.1.7
+    DATA
+  end
+end
+
+__END__
+diff --git a/Makefile b/Makefile
+index 39c042b..055afd0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ ifndef PREFIX
+     export PREFIX = $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+ endif
+ export BINDIR = ${PREFIX}/bin
+-export MODDIR = ${PREFIX}/lib
++export MODDIR = ${PREFIX}/lib/perl5/site_perl
+ 
+ DIRS = cpp perl
+ install:
+
+diff --git a/perl/Makefile b/perl/Makefile
+index 222b75d..2e8b49f 100644
+--- a/perl/Makefile
++++ b/perl/Makefile
+@@ -1,7 +1,7 @@
+ 
+ BIN = vcf-compare fill-aa vcf-annotate vcf-merge vcf-isec vcf-stats vcf-to-tab fill-an-ac \
+     vcf-query vcf-convert vcf-subset vcf-validator vcf-concat vcf-sort
+-MOD = FaSlice.pm Vcf.pm
++MOD = FaSlice.pm Vcf.pm VcfStats.pm
+ 
+ install:
+ 	    @for i in $(BIN); do cp $(CURDIR)/$$i $(BINDIR)/$$i; done; \

From 193f9ebb827c0cfab4fae45003fab86ce78809f4 Mon Sep 17 00:00:00 2001
From: Arnaud Lafon <arnaud.lafon@gmail.com>
Date: Fri, 28 Oct 2011 14:06:27 +0200
Subject: [PATCH 36/41] mcrypt-php 5.3.6

Added mcrypt support for php.
Works for php 5.3.6 (which seems to be the default version on Lion)

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/mcrypt-php.rb | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Library/Formula/mcrypt-php.rb

diff --git a/Library/Formula/mcrypt-php.rb b/Library/Formula/mcrypt-php.rb
new file mode 100644
index 000000000000..bc78a2e43c74
--- /dev/null
+++ b/Library/Formula/mcrypt-php.rb
@@ -0,0 +1,28 @@
+require 'formula'
+
+class McryptPhp < Formula
+  url 'http://us.php.net/get/php-5.3.6.tar.gz/from/fr.php.net/mirror'
+  homepage 'http://php.net/manual/fr/book.mcrypt.php'
+  md5 '88a2b00047bc53afbbbdf10ebe28a57e'
+  version '5.3.6'
+
+  depends_on 'mcrypt'
+
+  def install
+    Dir.chdir "ext/mcrypt"
+    system "phpize"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make"
+    prefix.install 'modules/mcrypt.so'
+  end
+
+  def caveats; <<-EOS.undent
+    To finish mcrypt-php installation, you need to add the
+    following line into php.ini:
+      extension="#{prefix}/mcrypt.so"
+    Then, restart your webserver and check in phpinfo if
+    you're able to see something about mcrypt
+    EOS
+  end
+end

From 9791aa9dd52103b6a48217b517a3682b415aeeda Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 11 Dec 2011 21:45:20 -0600
Subject: [PATCH 37/41] Formula idioms

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/field3d.rb  | 39 ++++++++++++++++++++++---------------
 Library/Formula/vcftools.rb | 12 ++++++------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Library/Formula/field3d.rb b/Library/Formula/field3d.rb
index a7fda67b647c..aff6f8e57148 100644
--- a/Library/Formula/field3d.rb
+++ b/Library/Formula/field3d.rb
@@ -20,31 +20,38 @@ def install
                   env.Replace(CC = "#{ENV.cc}")
                   env.Replace(CXX = "#{ENV.cxx}")
                 EOS
-    # Set the systemIncludePaths and systemLibPaths that get searched.
-    inreplace 'BuildSupport.py', '/opt/local/include', "#{HOMEBREW_PREFIX}/include"
-    inreplace 'BuildSupport.py', '/opt/local/lib', "#{HOMEBREW_PREFIX}/lib"
-    # Merge Homebrew's CFLAGS into the build's CCFLAGS passed to CC and CXX.
-    inreplace 'BuildSupport.py',
-                'env.Append(CCFLAGS = ["-Wall"])',
-                "env.MergeFlags(['#{ENV.cflags}'])"
+
+    inreplace 'BuildSupport.py' do |s|
+      s.gsub! '/opt/local/include', "#{HOMEBREW_PREFIX}/include"
+      s.gsub! '/opt/local/lib', "#{HOMEBREW_PREFIX}/lib"
+      # Merge Homebrew's CFLAGS into the build's CCFLAGS passed to CC and CXX
+      s.gsub! 'env.Append(CCFLAGS = ["-Wall"])', "env.MergeFlags(['#{ENV.cflags}'])"
+    end
 
     # Build the software with scons.
-    system "scons" unless MacOS.prefer_64_bit?
-    system "scons do64=1" if MacOS.prefer_64_bit?
+    if MacOS.prefer_64_bit?
+      system "scons do64=1"
+    else
+      system "scons"
+    end
+
     # Build the docs with cmake
     mkdir 'macbuild'
     Dir.chdir 'macbuild' do
       system "cmake .."
       system "make doc"
     end
+
     # Install the libraries and docs.
-    b = 'install/darwin/m64/release/' if MacOS.prefer_64_bit?
-    b = 'install/darwin/m32/release/' unless MacOS.prefer_64_bit?
-    l = b+'lib/*'
-    i = b+'include/*'
-    lib.install Dir[l]
-    include.install Dir[i]
-    prefix.install %w{ README CHANGES COPYING }
+    b = if MacOS.prefer_64_bit?
+      'install/darwin/m64/release/'
+    else
+      'install/darwin/m32/release/'
+    end
+
+    lib.install Dir[b+'lib/*']
+    include.install Dir[b+'include/*']
+    prefix.install 'CHANGES'
     doc.install Dir['docs/html/*']
   end
 end
diff --git a/Library/Formula/vcftools.rb b/Library/Formula/vcftools.rb
index 725c8b6155b0..e3a7401be6d5 100644
--- a/Library/Formula/vcftools.rb
+++ b/Library/Formula/vcftools.rb
@@ -5,6 +5,12 @@ class Vcftools < Formula
   homepage 'http://vcftools.sourceforge.net/index.html'
   md5 'd3e68027a7fe40d3f8cb28c3006c7248'
 
+  def patches
+    # Install Perl modules to /lib/perl5/site_perl and ensure VcfStats.pm is installed
+    # This is fixed in vcf source tree, will not be needed after version 0.1.7
+    DATA
+  end
+
   def install
     system "make install PREFIX=#{prefix} CPP=#{ENV.cxx}"
   end
@@ -19,12 +25,6 @@ def caveats; <<-EOS.undent
       export PERL5LIB=#{HOMEBREW_PREFIX}/lib/perl5/site_perl:${PERL5LIB}
     EOS
   end
-
-  def patches
-    # Install Perl modules to /lib/perl5/site_perl and ensure VcfStats.pm is installed
-    # This is fixed in vcf source tree, will not be needed after version 0.1.7
-    DATA
-  end
 end
 
 __END__

From e15e01c1ec24d31c56cbd54328568ba5e3fca01d Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 11 Dec 2011 21:59:30 -0600
Subject: [PATCH 38/41] 'CHANGES' is also a meta file

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/cvs2svn.rb | 2 +-
 Library/Formula/field3d.rb | 1 -
 Library/Homebrew/global.rb | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Library/Formula/cvs2svn.rb b/Library/Formula/cvs2svn.rb
index 9e4b06f54b09..e698828bb775 100644
--- a/Library/Formula/cvs2svn.rb
+++ b/Library/Formula/cvs2svn.rb
@@ -17,7 +17,7 @@ def install
     system "python", "setup.py", "install", "--prefix=#{prefix}"
     system "make man"
     man1.install gzip('cvs2svn.1', 'cvs2git.1', 'cvs2bzr.1')
-    prefix.install %w[ BUGS CHANGES COMMITTERS HACKING
+    prefix.install %w[ BUGS COMMITTERS HACKING
       cvs2bzr-example.options cvs2git-example.options cvs2hg-example.options
       cvs2svn-example.options contrib ]
 
diff --git a/Library/Formula/field3d.rb b/Library/Formula/field3d.rb
index aff6f8e57148..1e9891fbe6ab 100644
--- a/Library/Formula/field3d.rb
+++ b/Library/Formula/field3d.rb
@@ -51,7 +51,6 @@ def install
 
     lib.install Dir[b+'lib/*']
     include.install Dir[b+'include/*']
-    prefix.install 'CHANGES'
     doc.install Dir['docs/html/*']
   end
 end
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index bded2114301c..fda41c5d327c 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -56,7 +56,7 @@ module Homebrew extend self
   include FileUtils
 end
 
-FORMULA_META_FILES = %w[README README.md ChangeLog COPYING LICENSE LICENCE COPYRIGHT AUTHORS]
+FORMULA_META_FILES = %w[README README.md ChangeLog CHANGES COPYING LICENSE LICENCE COPYRIGHT AUTHORS]
 ISSUES_URL = "https://github.com/mxcl/homebrew/wiki/checklist-before-filing-a-new-issue"
 
 unless ARGV.include? "--no-compat" or ENV['HOMEBREW_NO_COMPAT']

From f1bea3992c20e09c4dff271fa1d57f88e61cb86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trung=20L=C3=AA?= <joneslee85@gmail.com>
Date: Tue, 8 Nov 2011 13:32:18 +1100
Subject: [PATCH 39/41] New formula: ocp (open-cubic-player)

Closes #8503.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/ocp.rb | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 Library/Formula/ocp.rb

diff --git a/Library/Formula/ocp.rb b/Library/Formula/ocp.rb
new file mode 100644
index 000000000000..711eed67fdb6
--- /dev/null
+++ b/Library/Formula/ocp.rb
@@ -0,0 +1,40 @@
+require "formula"
+
+class Ocp < Formula
+  url "http://downloads.sourceforge.net/project/opencubicplayer/ocp-0.1.21/ocp-0.1.21.tar.bz2"
+  md5 '558a6eacfadfd9c60c97a6e9c7f83f47'
+  homepage "http://sourceforge.net/p/opencubicplayer/home/"
+
+  depends_on "mad" unless ARGV.include? "--without-mad"
+  depends_on "flac" unless ARGV.include? "--without-flac"
+  depends_on "adplug" if ARGV.include? "--with-adplug"
+
+  def options
+    [
+      ["--without-mad", "disable mad mpeg audio support"],
+      ["--without-flac", "disable FLAC support"],
+      ["--with-adplug", "enable adplug support"],
+    ]
+  end
+
+  def install
+    ENV.deparallelize
+
+    args = ["--prefix=#{prefix}",
+            "--without-x11",
+            "--without-sdl",
+            "--without-desktop_file_install"]
+
+    if ARGV.include? "--without-mad"
+      args << "--without-mad"
+    elsif ARGV.include? "--without-flac"
+      args << "--without-flac"
+    elsif ARGV.include? "--with-adplug"
+      args << "--with-adplug"
+    end
+
+    system "./configure", *args
+    system "make"
+    system "make install"
+  end
+end

From bb99486fcf996fe4c42de183e9de17d3c9d940b3 Mon Sep 17 00:00:00 2001
From: Camillo Lugaresi <camillo.lugaresi@gmail.com>
Date: Sat, 10 Dec 2011 16:50:54 -0600
Subject: [PATCH 40/41] wine 1.3.34

Closes #9080.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Formula/wine.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 55df718b7bd2..24e9b07064ea 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -1,8 +1,8 @@
 require 'formula'
 
 class WineGecko < Formula
-  url 'http://downloads.sourceforge.net/wine/wine_gecko-1.2.0-x86.msi', :using => :nounzip
-  sha1 '6964d1877668ab7da07a60f6dcf23fb0e261a808'
+  url 'http://downloads.sourceforge.net/wine/wine_gecko-1.4-x86.msi', :using => :nounzip
+  sha1 'c30aa99621e98336eb4b7e2074118b8af8ea2ad5'
 end
 
 class WineGeckoOld < Formula
@@ -14,8 +14,8 @@ class Wine < Formula
   homepage 'http://winehq.org/'
 
   if ARGV.build_devel?
-    url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.3.33.tar.bz2'
-    sha256 'd49b96e3f999a7380898c3c09cf3d920c369756cb735d9c05295b5bb73c19f8c'
+    url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.3.34.tar.bz2'
+    sha256 'ac597a63c289bfedd75dcdc1cfaf342ad816669167868ad97490d0c08b7f1c52'
   else
     url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.2.3.tar.bz2'
     sha256 '3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f'
@@ -29,7 +29,7 @@ class Wine < Formula
   # gnutls not needed since 1.3.16
   depends_on 'gnutls' unless ARGV.build_devel? or ARGV.build_head?
 
-  fails_with_llvm 'Wine dies with an "Unhandled exception code" when built with LLVM'
+  fails_with_llvm 'Wine dies with an "Unhandled exception code" when built with LLVM', :build => 2336
 
   # the following libraries are currently not specified as dependencies, or not built as 32-bit:
   # configure: libsane, libv4l, libgphoto2, liblcms, gstreamer-0.10, libcapi20, libgsm, libtiff

From fbd51c114613c8b8b65039c37545dd9bf008f06c Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Mon, 12 Dec 2011 01:21:16 -0600
Subject: [PATCH 41/41] libksba: remove unused configure switch

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/libksba.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Formula/libksba.rb b/Library/Formula/libksba.rb
index b226df978cb9..7c262747f41f 100644
--- a/Library/Formula/libksba.rb
+++ b/Library/Formula/libksba.rb
@@ -8,7 +8,7 @@ class Libksba < Formula
   depends_on 'libgpg-error'
 
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
   end
 end