Update mad for newer Macs.

Mad won't brew on arrandale CPUs, so include a submitted patch.
While we're at it, enable 64bit where appropriate.

Formula/mad.rb

@@ -5,7 +5,7 @@ class Mad <Formula
   url 'http://downloads.sourceforge.net/project/mad/libmad/0.15.1b/libmad-0.15.1b.tar.gz'
   md5 '1be543bc30c56fb6bea1d7bf6a64e66c'
 
-  aka :libmad
+  aka 'libmad'
 
   def mad_pc
     return <<-EOS
@@ -25,9 +25,22 @@ Cflags: -I${includedir}
   end
 
   def install
-    system "./configure --disable-debugging --enable-fpm=intel --prefix='#{prefix}'"
+    if MACOS_VERSION >= 10.6 and Hardware.is_64_bit?
+      fpm = '64bit'
+    else
+      fpm = 'intel'
+    end
+
+    # See: http://github.com/mxcl/homebrew/issues/issue/1263
+    if Hardware.intel_family == 'arrandale'
+      inreplace "Makefile" do |s|
+        s.remove_make_var! %w{CFLAGS LDFLAGS}
+      end
+    end
+
+    system "./configure", "--disable-debugging", "--enable-fpm=#{fpm}", "--prefix=#{prefix}"
     system "make install"
 
     (lib+'pkgconfig/mad.pc').write mad_pc
   end
-end
+end