Replace snow_leopard_64? in brews.

Formula/asterisk.rb

@@ -12,7 +12,7 @@ class Asterisk < Formula
   def install
     configure_flags = [ "--prefix=#{prefix}", "--localstatedir=#{var}", "--sysconfdir=#{etc}" ]
     # Avoid "src/add.c:1: error: CPU you selected does not support x86-64 instruction set"
-    configure_flags << "--host=x86_64-darwin" if snow_leopard_64?
+    configure_flags << "--host=x86_64-darwin" if MacOS.prefer_64_bit?
     system "./configure", *configure_flags
     system "make"
     system "make install"

Formula/bigloo.rb

@@ -18,7 +18,7 @@ class Bigloo < Formula
              "--os-macosx" ]
 
     # SRFI 27 is 32-bit only
-    args << "--disable-srfi27" if snow_leopard_64?
+    args << "--disable-srfi27" if MacOS.prefer_64_bit?
 
     system "./configure", *args
     system "make"

Formula/cantera.rb

@@ -16,7 +16,7 @@ class Cantera < Formula
 
   def install
 
-    if snow_leopard_64?
+    if MacOS.prefer_64_bit?
       # There is probably a better way to do this, but this seems to work for my purposes:
       ENV['CFLAGS'] += " -arch x86_64"
       ENV['CXX_OPT'] = "-arch x86_64"

Formula/chicken.rb

@@ -9,7 +9,7 @@ class Chicken < Formula
   def install
     ENV.deparallelize
     args = ["PREFIX=#{prefix}", "PLATFORM=macosx"]
-    args << "ARCH=x86-64" if snow_leopard_64?
+    args << "ARCH=x86-64" if MacOS.prefer_64_bit?
     system "make", *args
     system "make", "install", *args
   end

Formula/clisp.rb

@@ -17,7 +17,7 @@ class Clisp < Formula
 
     # Clisp requires to select word size explicitly this way,
     # set it in CFLAGS won't work.
-    ENV['CC'] = "#{ENV.cc} -m#{snow_leopard_64? ? 64 : 32}"
+    ENV['CC'] = "#{ENV.cc} -m#{MacOS.prefer_64_bit? ? 64 : 32}"
 
     system "./configure", "--prefix=#{prefix}",
                           "--with-readline=yes"

Formula/cppdom.rb

@@ -15,7 +15,7 @@ class Cppdom < Formula
     args = ["prefix=#{prefix}", "build_test=no", "var_type=optimized",
       "BoostBaseDir=#{HOMEBREW_PREFIX}/"]
 
-    if snow_leopard_64?
+    if MacOS.prefer_64_bit?
       args << 'var_arch=x64'
     else
       args << 'var_arch=ia32'

Formula/dcmtk.rb

@@ -14,7 +14,7 @@ class Dcmtk < Formula
 
   def install
     ENV.deparallelize
-    ENV.m64 if snow_leopard_64?
+    ENV.m64 if MacOS.prefer_64_bit?
     ENV.x11
     system "./configure", "--disable-dependency-tracking", "--disable-debug",
                           "--prefix=#{prefix}",

Formula/erlang.rb

@@ -53,7 +53,7 @@ class Erlang < Formula
       args << '--enable-hipe'
     end
 
-    args << "--enable-darwin-64bit" if snow_leopard_64?
+    args << "--enable-darwin-64bit" if MacOS.prefer_64_bit?
 
     system "./configure", *args
     system "touch lib/wx/SKIP" if MACOS_VERSION >= 10.6

Formula/ffmpeg.rb

@@ -46,7 +46,7 @@ class Ffmpeg < Formula
 
     system "./configure", *args
 
-    if snow_leopard_64?
+    if MacOS.prefer_64_bit?
       inreplace 'config.mak' do |s|
         shflags = s.get_make_var 'SHFLAGS'
         s.change_make_var! 'SHFLAGS', shflags.gsub!(' -Wl,-read_only_relocs,suppress', '')

Formula/gdal.rb

@@ -173,7 +173,7 @@ class Gdal < Formula
 
       # `python-config` may try to talk us into building bindings for more
       # architectures than we really should.
-      if snow_leopard_64?
+      if MacOS.prefer_64_bit?
         ENV.append_to_cflags '-arch x86_64'
       else
         ENV.append_to_cflags '-arch i386'

Formula/gnu-smalltalk.rb

@@ -25,7 +25,7 @@ class GnuSmalltalk < Formula
     # 64-bit version doesn't build, so force 32 bits.
     ENV.m32
 
-    if snow_leopard_64? and Formula.factory('gdbm').installed?
+    if MacOS.prefer_64_bit? and Formula.factory('gdbm').installed?
       onoe "A 64-bit gdbm will cause linker errors"
       puts <<-EOS.undent
         GNU Smalltak doesn't compile 64-bit clean on OS X, so having a

Formula/hiredis.rb

@@ -9,7 +9,7 @@ class Hiredis < Formula
 
   def install
     # Architecture isn't detected correctly on 32bit Snow Leopard without help
-    ENV["OBJARCH"] = snow_leopard_64? ? "-arch x86_64" : "-arch i386"
+    ENV["OBJARCH"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
 
     system "make PREFIX=#{prefix}"
     system "make install PREFIX=#{prefix}"

Formula/ical-buddy.rb

@@ -5,7 +5,7 @@ class IcalBuddy < Formula
   head "http://hasseg.org/git-public/icalBuddy.git", :using => :git
 
   def install
-    arch = snow_leopard_64? ? "x86_64" : "i386"
+    arch = MacOS.prefer_64_bit? ? "x86_64" : "i386"
 
     inreplace "Makefile", "-arch i386 -arch x86_64 -arch ppc", "-arch #{arch}"
     system "make icalBuddy icalBuddy.1 icalBuddyLocalization.1 icalBuddyConfig.1"

Formula/icu4c.rb

@@ -15,7 +15,7 @@ class Icu4c < Formula
   def install
     ENV.append "LDFLAGS", "-headerpad_max_install_names"
     config_flags = ["--prefix=#{prefix}", "--disable-samples", "--enable-static"]
-    config_flags << "--with-library-bits=64" if snow_leopard_64?
+    config_flags << "--with-library-bits=64" if MacOS.prefer_64_bit?
     Dir.chdir "source" do
       system "./configure", *config_flags
       system "make"

Formula/mad.rb

@@ -23,7 +23,7 @@ Cflags: -I${includedir}
   end
 
   def install
-    fpm = snow_leopard_64? ? '64bit': 'intel'
+    fpm = MacOS.prefer_64_bit? ? '64bit': 'intel'
     system "./configure", "--disable-debugging", "--enable-fpm=#{fpm}", "--prefix=#{prefix}"
 
     # See: https://github.com/mxcl/homebrew/issues/issue/1263

Formula/mpg123.rb

@@ -17,7 +17,7 @@ class Mpg123 < Formula
             "--with-audio=coreaudio",
             "--with-default-audio=coreaudio"]
 
-    if snow_leopard_64?
+    if MacOS.prefer_64_bit?
       args << "--with-cpu=x86-64"
     else
       args << "--with-cpu=sse_alone"

Formula/mz-scheme.rb

@@ -12,7 +12,7 @@ class MzScheme < Formula
     args = ["--disable-debug", "--disable-dependency-tracking",
             "--disable-pthread", "--disable-mred", "--enable-xonx",
             "--prefix=#{prefix}"]
-    args << "--enable-mac64" if snow_leopard_64?
+    args << "--enable-mac64" if MacOS.prefer_64_bit?
 
     system "./configure", *args
     system "make"

Formula/nspr.rb

@@ -14,7 +14,7 @@ class Nspr < Formula
       inreplace "pr/src/Makefile.in", "-framework CoreServices -framework CoreFoundation", target_frameworks
 
       args = ["--prefix=#{prefix}", "--disable-debug", "--enable-strip", "--enable-optimize"]
-      args << "--enable-64bit" if snow_leopard_64?
+      args << "--enable-64bit" if MacOS.prefer_64_bit?
       system "./configure", *args
 
       # Remove the broken (for anyone but Firefox) install_name

Formula/plt-racket.rb

@@ -16,7 +16,7 @@ class PltRacket < Formula
               "--enable-shared",
               "--prefix=#{prefix}" ]
 
-      if snow_leopard_64?
+      if MacOS.prefer_64_bit?
         args += ["--enable-mac64", "--enable-sgc", "--disable-gracket"]
       end
 

Formula/postgresql.rb

@@ -39,7 +39,7 @@ class Postgresql < Formula
     ENV.append 'LDFLAGS', `uuid-config --ldflags`.strip
     ENV.append 'LIBS', `uuid-config --libs`.strip
 
-    if snow_leopard_64? and not ARGV.include? '--no-python'
+    if MacOS.prefer_64_bit? and not ARGV.include? '--no-python'
       args << "ARCHFLAGS='-arch x86_64'"
       check_python_arch
     end
@@ -116,7 +116,7 @@ And stop with:
     pg_ctl -D #{var}/postgres stop -s -m fast
 EOS
 
-    if snow_leopard_64? then
+    if MacOS.prefer_64_bit? then
       s << <<-EOS
 
 If you want to install the postgres gem, including ARCHFLAGS is recommended:

Formula/pypy.rb

@@ -2,7 +2,7 @@ require 'formula'
 require 'hardware'
 
 class Pypy < Formula
-  if snow_leopard_64?
+  if MacOS.prefer_64_bit?
     url 'http://pypy.org/download/pypy-1.4.1-osx64.tar.bz2'
     md5 '769b3fb134944ee8c22ad0834970de3b'
   else

Formula/qt.rb

@@ -64,11 +64,11 @@ class Qt < Formula
       args << "-I#{Formula.factory('libpng').include}"
     end
 
-    if snow_leopard_64? or ARGV.include? '--universal'
+    if MacOS.prefer_64_bit? or ARGV.include? '--universal'
       args << '-arch' << 'x86_64'
     end
 
-    if !snow_leopard_64? or ARGV.include? '--universal'
+    if !MacOS.prefer_64_bit? or ARGV.include? '--universal'
       args << '-arch' << 'x86'
     end
 

Formula/redis.rb

@@ -10,7 +10,7 @@ class Redis < Formula
     fails_with_llvm "Fails with \"reference out of range from _linenoise\""
 
     # Architecture isn't detected correctly on 32bit Snow Leopard without help
-    ENV["OBJARCH"] = snow_leopard_64? ? "-arch x86_64" : "-arch i386"
+    ENV["OBJARCH"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
 
     # Head and stable have different code layouts
     src = File.exists?('src/Makefile') ? 'src' : '.'

Formula/rrdtool.rb

@@ -39,7 +39,7 @@ class Rrdtool < Formula
     system "./configure", *args
 
     # Needed to build proper Ruby bundle
-    ENV["ARCHFLAGS"] = snow_leopard_64? ? "-arch x86_64" : "-arch i386"
+    ENV["ARCHFLAGS"] = MacOS.prefer_64_bit? ? "-arch x86_64" : "-arch i386"
 
     system "make install"
     prefix.install "bindings/ruby/test.rb"

Formula/ruby-odbc.rb

@@ -19,7 +19,7 @@ class RubyOdbc < Formula
       s.change_make_var! "prefix", prefix
       s.change_make_var! "sitearchdir", lib
 
-      if snow_leopard_64?
+      if MacOS.prefer_64_bit?
         # ruby-odbc still chooses iODBC over unixODBC (even with --with-odbc-dir)
         # apparently because unixODBC is compiled for only x86_64 and ruby-odbc
         # and iODBC are both i386 and x86_64. The solution (which works for me on Snow Leopard)

Formula/tbb.rb

@@ -10,7 +10,7 @@ class Tbb < Formula
     # Override build prefix so we can copy the dylibs out of the same place
     # no matter what system we're on
     args = ['tbb_build_prefix=BUILDPREFIX']
-    args << (snow_leopard_64? ? "arch=intel64" : "arch=ia32")
+    args << (MacOS.prefer_64_bit? ? "arch=intel64" : "arch=ia32")
 
     system "make", *args
     lib.install Dir['build/BUILDPREFIX_release/*.dylib']

Formula/valgrind.rb

@@ -16,7 +16,7 @@ class Valgrind < Formula
     system "./autogen.sh" if File.exists? "autogen.sh"
 
     args = ["--prefix=#{prefix}", "--mandir=#{man}"]
-    if snow_leopard_64?
+    if MacOS.prefer_64_bit?
       args << "--enable-only64bit" << "--build=amd64-darwin"
     end
 

Formula/virtuoso.rb

@@ -11,7 +11,7 @@ class Virtuoso < Formula
   skip_clean :all
 
   def install
-    ENV.m64 if snow_leopard_64?
+    ENV.m64 if MacOS.prefer_64_bit?
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make install"
   end

Formula/x264.rb

@@ -21,7 +21,7 @@ class X264 < Formula
       ldflags = s.get_make_var 'LDFLAGS'
       s.change_make_var! 'LDFLAGS', ldflags.gsub!(' -s', '')
 
-      if snow_leopard_64?
+      if MacOS.prefer_64_bit?
         soflags = s.get_make_var 'SOFLAGS'
         s.change_make_var! 'SOFLAGS', soflags.gsub!(' -Wl,-read_only_relocs,suppress', '')
       end