Normalize use of MACOS_VERSION

Homebrew · Apr 9, 2011 · b782d9d · b782d9d · camillol · Jun 7, 2011
1 parent b5b6da2
commit b782d9d
Show file tree

Hide file tree

Showing 43 changed files with 97 additions and 92 deletions.
diff --git a/Library/Formula/alpine.rb b/Library/Formula/alpine.rb
@@ -5,16 +5,17 @@ class Alpine < Formula
   homepage 'http://www.washington.edu/alpine/'
   md5 '0f4757167baf5c73aa44f2ffa4860093'
 
-  def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--with-ssl-include-dir=/usr/include/openssl"
+  def patches
+    DATA unless MacOS.snow_leopard?
+  end
 
+  def install
     ENV.j1
+    system "./configure", "--disable-debug",
+                          "--prefix=#{prefix}",
+                          "--with-ssl-include-dir=/usr/include/openssl"
     system "make install"
   end
-
-  def patches
-    DATA if MACOS_VERSION >= 10.6
-  end
 end
 
 __END__

diff --git a/Library/Formula/bdw-gc.rb b/Library/Formula/bdw-gc.rb
@@ -8,13 +8,12 @@ class BdwGc < Formula
   fails_with_llvm "LLVM gives an unsupported inline asm error"
 
   def install
-    if 10.6 <= MACOS_VERSION
-      # ucontext has been deprecated in 10.6
-      # use this flag to force the header to compile
-      ENV.append 'CPPFLAGS', "-D_XOPEN_SOURCE"
-    end
+    # ucontext has been deprecated in 10.6
+    # use this flag to force the header to compile
+    ENV.append 'CPPFLAGS', "-D_XOPEN_SOURCE" if MacOS.snow_leopard?
 
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb
@@ -5,14 +5,16 @@ class Cairomm < Formula
   homepage 'http://cairographics.org/cairomm/'
   md5 '559afbc47484ba3fad265e38a3dafe90'
 
+  # patch for universal compilation from:
+  # http://trac.macports.org/browser/trunk/dports/graphics/cairomm/files/patch-quartz-lp64.diff
   def patches
     { :p0 => DATA }
   end
 
   depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
   # cairo is available on 10.6 via X11 but not on 10.5
-  depends_on 'cairo' if MACOS_VERSION == 10.5
+  depends_on 'cairo' if MacOS.leopard?
 
   def install
     system "./configure", "--disable-dependency-tracking",
@@ -25,8 +27,7 @@ def install
   end
 end
 
-# patch for universal compilation from:
-# http://trac.macports.org/browser/trunk/dports/graphics/cairomm/files/patch-quartz-lp64.diff
+
 __END__
 diff -urN cairomm/quartz_font.cc cairomm-1.8.2/cairomm/quartz_font.cc
 --- cairomm/quartz_font.cc	2008-12-20 18:37:46.000000000 +0100

diff --git a/Library/Formula/collectd.rb b/Library/Formula/collectd.rb
@@ -15,7 +15,7 @@ def install
             "--with-python=/usr/bin",
             "--prefix=#{prefix}",
             "--localstatedir=#{var}"]
-    args << "--disable-embedded-perl" if MACOS_VERSION < 10.6
+    args << "--disable-embedded-perl" if MacOS.leopard?
 
     system "./configure", *args
     system "make install"

diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb
@@ -8,7 +8,7 @@ class Couchdb < Formula
   depends_on 'spidermonkey'
   depends_on 'icu4c'
   depends_on 'erlang'
-  depends_on 'curl' if MACOS_VERSION < 10.6
+  depends_on 'curl' if MacOS.leopard?
 
   def install
     system "./bootstrap" if File.exists? "bootstrap"

diff --git a/Library/Formula/disco.rb b/Library/Formula/disco.rb
@@ -9,7 +9,7 @@ class Disco < Formula
   head 'git://github.com/tuulos/disco.git'
 
   depends_on 'erlang'
-  depends_on 'simplejson' => :python if MACOS_VERSION < 10.6
+  depends_on 'simplejson' => :python if MacOS.leopard?
   depends_on 'libcmph'
 
   def install

diff --git a/Library/Formula/ejabberd.rb b/Library/Formula/ejabberd.rb
@@ -5,7 +5,7 @@ class Ejabberd < Formula
   homepage 'http://www.ejabberd.im'
   md5 '2029ceca45584d704ca821a771d6d928'
 
-  depends_on "openssl" if MACOS_VERSION < 10.6
+  depends_on "openssl" if MacOS.leopard?
   depends_on "erlang"
 
   def install
@@ -18,7 +18,7 @@ def install
               "--sysconfdir=#{etc}",
               "--localstatedir=#{var}"]
 
-      if MACOS_VERSION < 10.6
+      if MacOS.leopard?
         openssl = Formula.factory('openssl')
         args << "--with-openssl=#{openssl.prefix}"
       end

diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
@@ -67,7 +67,7 @@ def install
     args << "--enable-darwin-64bit" if MacOS.prefer_64_bit?
 
     system "./configure", *args
-    system "touch lib/wx/SKIP" if MACOS_VERSION >= 10.6
+    system "touch lib/wx/SKIP" if MacOS.snow_leopard?
     system "make"
     system "make install"
 

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
@@ -40,7 +40,7 @@ def install
 
     # For 32-bit compilation under gcc 4.2, see:
     # http://trac.macports.org/ticket/20938#comment:22
-    if MACOS_VERSION >= 10.6 and Hardware.is_32_bit?
+    if MacOS.snow_leopard? and Hardware.is_32_bit?
       ENV.append_to_cflags "-mdynamic-no-pic"
     end
 

diff --git a/Library/Formula/gerbv.rb b/Library/Formula/gerbv.rb
@@ -7,7 +7,7 @@ class Gerbv < Formula
 
   depends_on 'pkg-config' => :build
   depends_on 'gtk+'
-  depends_on 'cairo' if MACOS_VERSION < 10.6
+  depends_on 'cairo' if MacOS.leopard?
 
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",

diff --git a/Library/Formula/gfortran.rb b/Library/Formula/gfortran.rb
@@ -15,8 +15,7 @@ def stage
 end
 
 class Gfortran < Formula
-  if MACOS_VERSION < 10.6
-    # Leopard
+  if MacOS.leopard?
     url 'http://r.research.att.com/gfortran-42-5577.pkg'
     md5 '30fb495c93cf514003cdfcb7846dc701'
     version "4.2.4-5577"

diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
@@ -51,7 +51,7 @@ def install
             "--prefix=#{prefix}",
             "--enable-shared", "--disable-static"]
     args << "--without-magick-plus-plus" unless ARGV.include? '--with-magick-plus-plus'
-    args << "--disable-openmp" if MACOS_VERSION < 10.6 # libgomp unavailable
+    args << "--disable-openmp" if MacOS.leopard? # libgomp unavailable
     args << "--with-gslib" if ghostscript_srsly?
     args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
               unless ghostscript_fonts?

diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
@@ -9,7 +9,7 @@ class Graphviz < Formula
 
   if ARGV.include? '--with-pdf'
     depends_on 'pango'
-    depends_on 'cairo' if MACOS_VERSION < 10.6
+    depends_on 'cairo' if MacOS.leopard?
   end
 
   def options

diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb
@@ -21,7 +21,7 @@ class Grass < Formula
   depends_on "unixodbc"
   depends_on "fftw"
 
-  depends_on "cairo" if MACOS_VERSION < 10.6
+  depends_on "cairo" if MacOS.leopard?
 
   def patches
     DATA
@@ -38,9 +38,8 @@ def install
     readline = Formula.factory( 'readline' )
     gettext = Formula.factory( 'gettext' )
 
-    configure_args = [
-      "--disable-debug",
-      "--disable-dependency-tracking",
+    args = [
+      "--disable-debug", "--disable-dependency-tracking",
       "--with-libs=/usr/X11/lib #{HOMEBREW_PREFIX}/lib",
       "--with-includes=#{HOMEBREW_PREFIX}/include",
       "--enable-largefile",
@@ -70,32 +69,33 @@ def install
     ]
 
     if MacOS.prefer_64_bit?
-      configure_args << "--enable-64bit"
-      configure_args << "--with-macosx-archs=x86_64"
+      args << "--enable-64bit"
+      args << "--with-macosx-archs=x86_64"
     else
-      configure_args << "--with-macosx-archs=i386"
+      args << "--with-macosx-archs=i386"
     end
 
     # Deal with Cairo support
-    if MACOS_VERSION >= 10.6
-      configure_args << "--with-cairo-includes=/usr/X11/include /usr/X11/include/cairo"
-    else
+    if MacOS.leopard?
       cairo = Formula.factory('cairo')
-      configure_args << "--with-cairo-includes=#{cairo.include + 'cairo'}"
-      configure_args << "--with-cairo-libs=#{cairo.lib}"
+      args << "--with-cairo-includes=#{cairo.include}/cairo"
+      args << "--with-cairo-libs=#{cairo.lib}"
+    else
+      args << "--with-cairo-includes=/usr/X11/include /usr/X11/include/cairo"
     end
-    configure_args << "--with-cairo"
+
+    args << "--with-cairo"
 
     # Database support
-    configure_args << "--with-postgres" if postgres?
+    args << "--with-postgres" if postgres?
     if mysql?
       mysql = Formula.factory('mysql')
-      configure_args << "--with-mysql-includes=#{mysql.include + 'mysql'}"
-      configure_args << "--with-mysql-libs=#{mysql.lib + 'mysql'}"
-      configure_args << "--with-mysql"
+      args << "--with-mysql-includes=#{mysql.include + 'mysql'}"
+      args << "--with-mysql-libs=#{mysql.lib + 'mysql'}"
+      args << "--with-mysql"
     end
 
-    system "./configure", "--prefix=#{prefix}", *configure_args
+    system "./configure", "--prefix=#{prefix}", *args
     system "make" # make and make install must be seperate steps.
     system "make install"
   end

diff --git a/Library/Formula/gtk+.rb b/Library/Formula/gtk+.rb
@@ -13,7 +13,7 @@ class Gtkx < Formula
 
   # Used by pango, but keg-only, so needs to be added to
   # the flags for gtk+ explicitly.
-  depends_on 'cairo' if MACOS_VERSION < 10.6
+  depends_on 'cairo' if MacOS.leopard?
 
   depends_on 'pango'
   depends_on 'jasper' => :optional

diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
@@ -74,7 +74,7 @@ def install
              "--disable-static",
              "--with-modules"]
 
-    args << "--disable-openmp" if MACOS_VERSION < 10.6 or disable_openmp?
+    args << "--disable-openmp" if MacOS.leopard? or disable_openmp?
     args << "--without-gslib" unless ghostscript_srsly?
     args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
                 unless ghostscript_srsly? or ghostscript_fonts?

diff --git a/Library/Formula/iodine.rb b/Library/Formula/iodine.rb
@@ -6,7 +6,7 @@ class Iodine < Formula
   md5 'a15bb4faba020d217016fde6e231074a'
 
   def install
-    if MACOS_VERSION >= 10.6
+    unless MacOS.leopard?
       inreplace ["src/common.c", "src/dns.c", "src/iodine.c", "src/iodined.c"],
         "arpa/nameser8_compat", "arpa/nameser_compat"
     end

diff --git a/Library/Formula/jstalk.rb b/Library/Formula/jstalk.rb
@@ -6,7 +6,7 @@ class Jstalk < Formula
   version '1.0.1'
 
   def install
-    if MACOS_VERSION < 10.6
+    if MacOS.leopard?
       onoe "jstalk requires Mac OS X 10.6+"
       exit 1
     end

diff --git a/Library/Formula/lftp.rb b/Library/Formula/lftp.rb
@@ -11,7 +11,7 @@ class Lftp < Formula
 
   def install
     # Bus error
-    ENV.no_optimization if MACOS_VERSION == 10.5
+    ENV.no_optimization if MacOS.leopard?
 
     system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
     system "make install"

diff --git a/Library/Formula/libmemcached.rb b/Library/Formula/libmemcached.rb
@@ -8,9 +8,7 @@ class Libmemcached < Formula
   depends_on 'memcached'
 
   def install
-    if MACOS_VERSION < 10.6
-      ENV.append_to_cflags "-undefined dynamic_lookup"
-    end
+    ENV.append_to_cflags "-undefined dynamic_lookup" if MacOS.leopard?
 
     system "./configure", "--prefix=#{prefix}"
     system "make install"

diff --git a/Library/Formula/libnet.rb b/Library/Formula/libnet.rb
@@ -11,7 +11,7 @@ def install
     inreplace "autogen.sh", "libtoolize", "glibtoolize"
     system "./autogen.sh"
 
-    if MACOS_VERSION >= 10.6
+    unless MacOS.leopard?
       cp "/usr/share/libtool/config/config.guess", "."
       cp "/usr/share/libtool/config/config.sub", "."
     end

diff --git a/Library/Formula/libsvg-cairo.rb b/Library/Formula/libsvg-cairo.rb
@@ -8,7 +8,7 @@ class LibsvgCairo < Formula
 
   depends_on 'pkg-config' => :build
   depends_on 'libsvg'
-  depends_on 'cairo' if MACOS_VERSION < 10.6
+  depends_on 'cairo' if MacOS.leopard?
 
   def install
     system "./configure", "--disable-dependency-tracking", "--disable-debug", "--prefix=#{prefix}"

diff --git a/Library/Formula/libvirt.rb b/Library/Formula/libvirt.rb
@@ -13,7 +13,7 @@ class Libvirt < Formula
   depends_on "gnutls"
   depends_on "yajl"
 
-  if MACOS_VERSION < 10.6
+  if MacOS.leopard?
     # Definitely needed on Leopard, but not on Snow Leopard.
     depends_on "readline"
     depends_on "libxml2"

diff --git a/Library/Formula/madplay.rb b/Library/Formula/madplay.rb
@@ -18,7 +18,7 @@ def patches
   def install
     configure_flags = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"]
     # Avoid "error: CPU you selected does not support x86-64 instruction set"
-    configure_flags << "--build=x86_64" if Hardware.is_64_bit? and MACOS_VERSION >= 10.6
+    configure_flags << "--build=x86_64" if MacOS.prefer_64_bit?
     system "./configure", *configure_flags
     system "make install"
   end

diff --git a/Library/Formula/mpd.rb b/Library/Formula/mpd.rb
@@ -34,7 +34,7 @@ def install
             "--enable-fluidsynth",
             "--enable-zip",
             "--enable-lame-encoder"]
-    args << "--disable-curl" if MACOS_VERSION <= 10.5
+    args << "--disable-curl" if MacOS.leopard?
     args << "--enable-lastfm" if ARGV.include?("--lastfm")
 
     system "./configure", *args

diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb
@@ -6,7 +6,7 @@ class Nmap < Formula
   md5 '0b80d2cb92ace5ebba8095a4c2850275'
 
   # namp needs newer version of openssl on Leopard
-  depends_on "openssl" if MACOS_VERSION < 10.6
+  depends_on "openssl" if MacOS.leopard?
 
   fails_with_llvm
 
@@ -15,7 +15,7 @@ def install
 
     args = ["--prefix=#{prefix}", "--without-zenmap"]
 
-    if MACOS_VERSION < 10.6
+    if MacOS.leopard?
       openssl = Formula.factory('openssl')
       args << "--with-openssl=#{openssl.prefix}"
     end

diff --git a/Library/Formula/nspr.rb b/Library/Formula/nspr.rb
@@ -10,7 +10,7 @@ def install
     Dir.chdir "mozilla/nsprpub" do
       # Fixes a bug with linking against CoreFoundation, needed to work with SpiderMonkey
       # See: http://openradar.appspot.com/7209349
-      target_frameworks = (Hardware.is_32_bit? or MACOS_VERSION == 10.5) ? "-framework Carbon" : ""
+      target_frameworks = (Hardware.is_32_bit? or MacOS.leopard?) ? "-framework Carbon" : ""
       inreplace "pr/src/Makefile.in", "-framework CoreServices -framework CoreFoundation", target_frameworks
 
       args = ["--prefix=#{prefix}", "--disable-debug", "--enable-strip", "--enable-optimize"]

diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
@@ -10,7 +10,7 @@ class Pango < Formula
 
   fails_with_llvm "Undefined symbols when linking", :build => "2326"
 
-  if MACOS_VERSION < 10.6
+  if MacOS.leopard?
     depends_on 'fontconfig' # Leopard's fontconfig is too old.
     depends_on 'cairo' # Leopard doesn't come with Cairo.
   end

diff --git a/Library/Formula/pbrt.rb b/Library/Formula/pbrt.rb
@@ -27,7 +27,7 @@ def install
       s.change_make_var! "EXR_LIBDIR", "-L#{openexr.lib} -L#{ilmbase.lib}"
 
       # Change settings if we are using a 32bit system
-      if MACOS_VERSION < 10.6 or Hardware.is_32_bit?
+      if MacOS.leopard? or Hardware.is_32_bit?
         s.change_make_var! "MARCH", "-m32 -msse2 -mfpmath=sse"
       end
     end