Clean up MacOS version method usage

The MacOS.version? family of methods (other than "leopard?") are poorly defined and lead to confusing code. Replace them in formulae with more explicit comparisons. "MacOS.version" is a special version object that can be compared to numerics, symbols, and strings using the standard Ruby comparison methods. The old methods were moved to compat when the version comparison code was merged, and they must remain there "forever", but they should not be used in new code. Signed-off-by: Jack Nagel <[email protected]>
cwoodcox · Sep 10, 2012 · 6b8d25f · 6b8d25f
1 parent db74b9b
commit 6b8d25f
Show file tree

Hide file tree

Showing 70 changed files with 94 additions and 90 deletions.
diff --git a/Library/Formula/abyss.rb b/Library/Formula/abyss.rb
@@ -11,7 +11,7 @@ class Abyss < Formula
  depends_on 'google-sparsehash' => :build
 
  # Snow Leopard comes with mpi but Lion does not
- depends_on 'open-mpi' if MacOS.lion?
+ depends_on 'open-mpi' if MacOS.version >= :lion
 
  # strip breaks the ability to read compressed files.
  skip_clean 'bin'

diff --git a/Library/Formula/alpine.rb b/Library/Formula/alpine.rb
@@ -10,7 +10,7 @@ class Alpine < Formula
  # http:https://trac.macports.org/ticket/20971
  def patches
  "https://trac.macports.org/export/89747/trunk/dports/mail/alpine/files/alpine-osx-10.6.patch"
- end if MacOS.snow_leopard?
+ end if MacOS.version >= :snow_leopard
 
  def install
  ENV.j1

diff --git a/Library/Formula/aria2.rb b/Library/Formula/aria2.rb
@@ -8,7 +8,7 @@ class Aria2 < Formula
  depends_on 'pkg-config' => :build
 
  # Leopard's libxml2 is too old.
- depends_on 'libxml2' if MacOS.leopard?
+ depends_on 'libxml2' if MacOS.version == :leopard
 
  def install
  system "./configure", "--disable-dependency-tracking",

diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb
@@ -63,7 +63,7 @@ def install
 
  # For 32-bit compilation under gcc 4.2, see:
  # http:https://trac.macports.org/ticket/20938#comment:22
- if MacOS.leopard? or Hardware.is_32_bit?
+ if MacOS.version == :leopard or Hardware.is_32_bit?
  inreplace 'cmake/admFFmpegBuild.cmake',
  '${CMAKE_INSTALL_PREFIX})',
  '${CMAKE_INSTALL_PREFIX} --extra-cflags=-mdynamic-no-pic)'

diff --git a/Library/Formula/bind.rb b/Library/Formula/bind.rb
@@ -6,7 +6,7 @@ class Bind < Formula
  version '9.9.1-p2'
  sha1 '449b12c32682b5bef64c7b53cd0fc0c6b731c8a7'
 
- depends_on "openssl" if MacOS.leopard?
+ depends_on "openssl" if MacOS.version == :leopard
 
  def install
  ENV.libxml2
@@ -23,7 +23,7 @@ def install
 
  # For Xcode-only systems we help a bit to find openssl.
  # If CLT.installed?, it evaluates to "/usr", which works.
- args << "--with-openssl=#{MacOS.sdk_path.to_s}/usr" unless MacOS.leopard?
+ args << "--with-openssl=#{MacOS.sdk_path.to_s}/usr" unless MacOS.version == :leopard
 
  system "./configure", *args
 

diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
@@ -29,7 +29,7 @@ def install
  ]
 
  args << '--with-x' unless build.include? 'without-x'
- args << '--enable-xcb=no' if MacOS.leopard?
+ args << '--enable-xcb=no' if MacOS.version == :leopard
 
  system "./configure", *args
  system "make install"

diff --git a/Library/Formula/clisp.rb b/Library/Formula/clisp.rb
@@ -42,7 +42,7 @@ def install
  # The ulimit must be set, otherwise `make` will fail and tell you to do so
  system "ulimit -s 16384 && make"
 
- if MacOS.lion?
+ if MacOS.version >= :lion
  opoo "`make check` fails on Lion, so we are skipping it."
  puts "But it probably means there will be other issues too."
  puts "Please take them upstream to the clisp project itself."

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

diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb
@@ -11,7 +11,7 @@ class Couchdb < Formula
  depends_on 'spidermonkey'
  depends_on 'icu4c'
  depends_on 'erlang'
- depends_on 'curl' if MacOS.leopard?
+ depends_on 'curl' if MacOS.version == :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 'https://github.com/tuulos/disco.git'
 
  depends_on 'erlang'
- depends_on 'simplejson' => :python if MacOS.leopard?
+ depends_on 'simplejson' => :python if MacOS.version == :leopard
  depends_on 'libcmph'
 
  def install

diff --git a/Library/Formula/e2fsprogs.rb b/Library/Formula/e2fsprogs.rb
@@ -18,7 +18,7 @@ def patches
  ]}
 
  # MacPorts patch to allow compilation on Leopard.
- if MacOS.leopard?
+ if MacOS.version == :leopard
  p[:p0] << "https://trac.macports.org/export/92117/trunk/dports/sysutils/e2fsprogs/files/patch-lib-ext2fs-inline.c.diff"
  end
 

diff --git a/Library/Formula/ejabberd.rb b/Library/Formula/ejabberd.rb
@@ -5,7 +5,7 @@ class Ejabberd < Formula
  url "http:https://www.process-one.net/downloads/ejabberd/2.1.11/ejabberd-2.1.11.tgz"
  sha1 'ae2c521d5e93fbd5bc826052c5524b5222dcfae6'
 
- depends_on "openssl" if MacOS.leopard?
+ depends_on "openssl" if MacOS.version == :leopard
  depends_on "erlang"
 
  option "32-bit"
@@ -28,7 +28,7 @@ def install
  "--sysconfdir=#{etc}",
  "--localstatedir=#{var}"]
 
- if MacOS.leopard?
+ if MacOS.version == :leopard
  openssl = Formula.factory('openssl')
  args << "--with-openssl=#{openssl.prefix}"
  end

diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
@@ -76,7 +76,7 @@ def install
  "--enable-shared-zlib",
  "--enable-smp-support"]
 
- args << "--with-dynamic-trace=dtrace" unless MacOS.leopard?
+ args << "--with-dynamic-trace=dtrace" unless MacOS.version == :leopard
 
  unless build.include? 'disable-hipe'
  # HIPE doesn't strike me as that reliable on OS X

diff --git a/Library/Formula/ffmbc.rb b/Library/Formula/ffmbc.rb
@@ -17,7 +17,7 @@ class Ffmbc < Formula
  option "with-libvpx", "Enable VP8 video format"
 
  # manpages won't be built without texi2html
- depends_on 'texi2html' => :build if MacOS.mountain_lion?
+ depends_on 'texi2html' => :build if MacOS.version >= :mountain_lion
  depends_on 'yasm' => :build
 
  depends_on 'x264' unless build.include? 'without-x264'

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
@@ -26,7 +26,7 @@ class Ffmpeg < Formula
  option 'with-tools', 'Enable additional FFmpeg tools'
 
  # manpages won't be built without texi2html
- depends_on 'texi2html' => :build if MacOS.mountain_lion?
+ depends_on 'texi2html' => :build if MacOS.version >= :mountain_lion
  depends_on 'yasm' => :build
 
  depends_on 'x264' unless build.include? 'without-x264'
@@ -79,7 +79,7 @@ def install
 
  # For 32-bit compilation under gcc 4.2, see:
  # http:https://trac.macports.org/ticket/20938#comment:22
- ENV.append_to_cflags "-mdynamic-no-pic" if MacOS.leopard? or Hardware.is_32_bit?
+ ENV.append_to_cflags "-mdynamic-no-pic" if MacOS.version == :leopard or Hardware.is_32_bit?
 
  system "./configure", *args
 

diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb
@@ -31,7 +31,7 @@ def install
  # MACOSX_DEPLOYMENT_TARGET fixes ensuing Python 10.7 vs 10.8 clash.
  # Discussed: https://github.com/mxcl/homebrew/pull/14097
  # Reported: Not yet.
- if MacOS.mountain_lion?
+ if MacOS.version >= :mountain_lion
  ENV.macosxsdk("10.7")
  ENV.append "CFLAGS", "-isysroot #{MacOS.sdk_path(10.7)}"
  ENV["MACOSX_DEPLOYMENT_TARGET"] = "10.8"

diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb
@@ -2,7 +2,7 @@
 
 class NeedsSnowLeopard < Requirement
  def satisfied?
- MacOS.snow_leopard?
+ MacOS.version >= :snow_leopard
  end
 
  def message; <<-EOS.undent

diff --git a/Library/Formula/git.rb b/Library/Formula/git.rb
@@ -33,7 +33,7 @@ def install
  ENV['PYTHON_PATH'] = which 'python' # python can be brewed or unbrewed
 
  # Clean XCode 4.x installs don't include Perl MakeMaker
- ENV['NO_PERL_MAKEMAKER'] = '1' if MacOS.lion?
+ ENV['NO_PERL_MAKEMAKER'] = '1' if MacOS.version >= :lion
 
  ENV['BLK_SHA1'] = '1' if build.include? 'with-blk-sha1'
 

diff --git a/Library/Formula/gnunet.rb b/Library/Formula/gnunet.rb
@@ -8,7 +8,7 @@ class Gnunet < Formula
 
  depends_on 'libgcrypt'
  depends_on 'libextractor'
- depends_on 'curl' unless MacOS.lion? # needs >= v7.20.1
+ depends_on 'curl' if MacOS.version < :lion # needs >= v7.20.1
 
  def install
  system "./configure", "--disable-debug",

diff --git a/Library/Formula/google-js-test.rb b/Library/Formula/google-js-test.rb
@@ -6,7 +6,7 @@ def message
  end
 
  def satisfied?
- MacOS.snow_leopard?
+ MacOS.version >= :snow_leopard
  end
 end
 

diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
@@ -56,7 +56,7 @@ def install
  "--prefix=#{prefix}",
  "--enable-shared", "--disable-static"]
  args << "--without-magick-plus-plus" if build.include? 'without-magick-plus-plus'
- args << "--disable-openmp" if MacOS.leopard? or ENV.compiler == :clang # libgomp unavailable
+ args << "--disable-openmp" if MacOS.version == :leopard or ENV.compiler == :clang # 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/grass.rb b/Library/Formula/grass.rb
@@ -14,7 +14,7 @@ def headless?
  #
  # This restriction can be lifted once WxMac hits a stable release that is
  # 64-bit capable.
- ARGV.include? '--without-gui' or MacOS.lion?
+ ARGV.include? '--without-gui' or MacOS.version >= :lion
 end
 
 class Grass < Formula
@@ -31,7 +31,7 @@ class Grass < Formula
  depends_on "libtiff"
  depends_on "unixodbc"
  depends_on "fftw"
- depends_on "cairo" if MacOS.leopard?
+ depends_on "cairo" if MacOS.version == :leopard
  depends_on :x11
 
  # Patches ensure 32 bit system python is used for wxWidgets and that files
@@ -101,7 +101,7 @@ def install
  end
 
  # Deal with Cairo support
- if MacOS.leopard?
+ if MacOS.version == :leopard
  cairo = Formula.factory('cairo')
  args << "--with-cairo-includes=#{cairo.include}/cairo"
  args << "--with-cairo-libs=#{cairo.lib}"

diff --git a/Library/Formula/imap-uw.rb b/Library/Formula/imap-uw.rb
@@ -6,7 +6,7 @@ class ImapUw < Formula
  sha1 '7a82ebd5aae57a5dede96ac4923b63f850ff4fa7'
 
  def patches
- if MacOS.snow_leopard?
+ if MacOS.version >= :snow_leopard
  { :p0 =>
  'https://trac.macports.org/export/63088/trunk/dports/mail/imap-uw/files/patch-snowleopard.diff'
  }

diff --git a/Library/Formula/iodine.rb b/Library/Formula/iodine.rb
@@ -6,7 +6,7 @@ class Iodine < Formula
  sha1 '4fa9a248b8a84df8a727a5d749e669e58136edca'
 
  def install
- unless MacOS.leopard?
+ unless MacOS.version == :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
@@ -2,7 +2,7 @@
 
 class NeedsSnowLeopard < Requirement
  def satisfied?
- MacOS.snow_leopard?
+ MacOS.version >= :snow_leopard
  end
 
  def message

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.leopard?
+ ENV.no_optimization if MacOS.version == :leopard
 
  system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
  system "make install"

diff --git a/Library/Formula/libagg.rb b/Library/Formula/libagg.rb
@@ -11,7 +11,7 @@ class Libagg < Formula
  depends_on 'pkg-config' => :build
  depends_on 'sdl'
  depends_on :freetype => :optional if build.include? "with-freetype"
- depends_on :libtool unless MacOS.mountain_lion?
+ depends_on :libtool unless MacOS.version >= :mountain_lion
 
  fails_with :clang do
  build 421

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

diff --git a/Library/Formula/libmms.rb b/Library/Formula/libmms.rb
@@ -10,7 +10,7 @@ class Libmms < Formula
 
  def patches
  # see https://trac.macports.org/ticket/27988
- if MacOS.leopard?
+ if MacOS.version == :leopard
  { :p0 => "https://trac.macports.org/export/87883/trunk/dports/multimedia/libmms/files/src_mms-common.h.patch" }
  end
  end

diff --git a/Library/Formula/librasterlite.rb b/Library/Formula/librasterlite.rb
@@ -5,7 +5,7 @@ class Librasterlite < Formula
  url 'http:https://www.gaia-gis.it/gaia-sins/librasterlite-sources/librasterlite-1.1c.tar.gz'
  sha1 'c54f38ef2974bc92410e2c2196088af14bd9c21a'
 
- depends_on "pkg-config" => :build unless MacOS.mountain_lion?
+ depends_on "pkg-config" => :build unless MacOS.version >= :mountain_lion
  depends_on :libpng
  depends_on "libgeotiff"
  depends_on "libspatialite"

diff --git a/Library/Formula/librets.rb b/Library/Formula/librets.rb
@@ -6,7 +6,7 @@ class Librets < Formula
  sha1 '2de4d9e9cb26533eb0a9a090b3354a70ed3c41ec'
 
  depends_on 'boost'
- depends_on 'swig' if MacOS.lion?
+ depends_on 'swig' if MacOS.version >= :lion
 
  def install
  system "./configure", "--disable-debug",

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

diff --git a/Library/Formula/libxml++.rb b/Library/Formula/libxml++.rb
@@ -7,7 +7,7 @@ class Libxmlxx < Formula
 
  depends_on 'glibmm'
  # LibXML++ can't compile agains the version of LibXML shipped with Leopard
- depends_on 'libxml2' if MacOS.leopard?
+ depends_on 'libxml2' if MacOS.version == :leopard
 
  def install
  system "./configure", "--disable-dependency-tracking",

diff --git a/Library/Formula/macvim.rb b/Library/Formula/macvim.rb
@@ -25,7 +25,7 @@ def install
 
  # If building for 10.8, make sure that CC is set to "clang".
  # Reference: https://github.com/b4winckler/macvim/wiki/building
- ENV['CC'] = "clang" if MacOS.mountain_lion?
+ ENV['CC'] = "clang" if MacOS.version >= :mountain_lion
 
  args = %W[
  --with-features=huge

diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
@@ -18,7 +18,7 @@ class Mapserver < Formula
  depends_on 'gdal'
 
  depends_on 'geos' if build.include? 'with-geos'
- depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.lion?
+ depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.version >= :lion
  depends_on 'fcgi' if build.include? 'with-fastcgi'
 
  def patches
@@ -41,7 +41,7 @@ def install
  args << "--with-php=/usr/include/php" if build.include? 'with-php'
 
  if build.include? 'with-postgresql'
- if MacOS.lion? # Lion ships with PostgreSQL libs
+ if MacOS.version >= :lion # Lion ships with PostgreSQL libs
  args << "--with-postgis"
  else
  args << "--with-postgis=#{HOMEBREW_PREFIX}/bin/pg_config"

diff --git a/Library/Formula/md.rb b/Library/Formula/md.rb
@@ -6,7 +6,7 @@ class Md < Formula
  sha1 '0128de65a4da2ef9655f3b1e6a94d2f8ae292414'
 
  # OS X up to and including Lion 10.7 includes 'md'
- keg_only :provided_by_osx unless MacOS.mountain_lion?
+ keg_only :provided_by_osx unless MacOS.version >= :mountain_lion
 
  def install
  cd 'md' do

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