Use new Xcode module

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

10 files changed, 15 insertions, 15 deletions

diff --git a/Library/Formula/autoconf.rb b/Library/Formula/autoconf.rb
index 0287931bc..ad54dbb02 100644
--- a/Library/Formula/autoconf.rb
+++ b/Library/Formula/autoconf.rb
@@ -6,7 +6,7 @@ class Autoconf < Formula
   mirror 'http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz'
   sha1 '562471cbcb0dd0fa42a76665acf0dbb68479b78a'
 
-  if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/autoconf"
+  if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/autoconf"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Autoconf."
   end
 
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
index 6fa9ac23e..eaf7360cf 100644
--- a/Library/Formula/automake.rb
+++ b/Library/Formula/automake.rb
@@ -9,7 +9,7 @@ class Automake < Formula
   # Always needs a newer autoconf, even on Snow Leopard.
   depends_on 'autoconf'
 
-  if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/automake"
+  if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/automake"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Automake."
   end
 
diff --git a/Library/Formula/bsdmake.rb b/Library/Formula/bsdmake.rb
index 3c6d4f843..a443ab656 100644
--- a/Library/Formula/bsdmake.rb
+++ b/Library/Formula/bsdmake.rb
@@ -5,7 +5,7 @@ class Bsdmake < Formula
   url 'http://opensource.apple.com/tarballs/bsdmake/bsdmake-24.tar.gz'
   md5 '7856e53a7f8b29cd899e2ce98eb4a467'
 
-  if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/bsdmake"
+  if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/bsdmake"
     keg_only "Recent versions of OS X no longer provide this tool."
   end
 
diff --git a/Library/Formula/fontforge.rb b/Library/Formula/fontforge.rb
index e26cc73a7..d1f1286fe 100644
--- a/Library/Formula/fontforge.rb
+++ b/Library/Formula/fontforge.rb
@@ -42,7 +42,7 @@ class Fontforge < Formula
     # Fix hard-coded include file paths. Reported usptream:
     # http://sourceforge.net/mailarchive/forum.php?thread_name=C1A32103-A62D-468B-AD8A-A8E0E7126AA5%40smparkes.net&forum_name=fontforge-devel
     # https://trac.macports.org/ticket/33284
-    header_prefix = MacOS.xcode_prefix
+    header_prefix = MacOS::Xcode.prefix
     inreplace %w(fontforge/macbinary.c fontforge/startui.c gutils/giomime.c) do |s|
       s.gsub! "/Developer", header_prefix
     end
diff --git a/Library/Formula/ganglia.rb b/Library/Formula/ganglia.rb
index 15456cba7..379e896f0 100644
--- a/Library/Formula/ganglia.rb
+++ b/Library/Formula/ganglia.rb
@@ -27,7 +27,7 @@ class Ganglia < Formula
     # Grab the standard autogen.sh and run it twice, to update libtool
     curl "http://buildconf.git.sourceforge.net/git/gitweb.cgi?p=buildconf/buildconf;a=blob_plain;f=autogen.sh;hb=HEAD", "-o", "autogen.sh"
 
-    ENV['LIBTOOLIZE'] = "/usr/bin/glibtoolize" if MacOS.xcode_version < "4.3"
+    ENV['LIBTOOLIZE'] = "/usr/bin/glibtoolize" if MacOS::Xcode.provides_autotools?
     ENV['PROJECT'] = "ganglia"
     system "/bin/sh ./autogen.sh --download"
 
diff --git a/Library/Formula/gfortran.rb b/Library/Formula/gfortran.rb
index fbc90aee0..007c357ef 100644
--- a/Library/Formula/gfortran.rb
+++ b/Library/Formula/gfortran.rb
@@ -34,7 +34,7 @@ class Gfortran < Formula
     end
   else
     # Lion
-    if MacOS.xcode_version >= '4.2'
+    if MacOS::Xcode.version >= '4.2'
       # This version contains an entire Apple-GCC 4.2 (i386/x86_64) build for
       # Lion. After installation, we will remove all compilers other than
       # GFortran.
@@ -64,7 +64,7 @@ class Gfortran < Formula
   skip_clean :all
 
   def install
-    if MacOS.xcode_version >= '4.2' and MACOS_VERSION >= 10.7
+    if MacOS::Xcode.version >= '4.2' and MACOS_VERSION >= 10.7
       ohai "Installing gfortran 4.2.4 for XCode 4.2 (build 5666) or higher"
       safe_system "pax --insecure -rz -f Payload.gz -s ',./usr,#{prefix},'"
 
diff --git a/Library/Formula/gmp.rb b/Library/Formula/gmp.rb
index e2abfe3f6..e09489d6b 100644
--- a/Library/Formula/gmp.rb
+++ b/Library/Formula/gmp.rb
@@ -19,7 +19,7 @@ class Gmp < Formula
     # Also force use of 4.2 on 10.6 in case a user has changed the default
     # Do not force if xcode > 4.2 since it does not have /usr/bin/gcc-4.2 as default
     # FIXME convert this to appropriate fails_with annotations
-    ENV.gcc unless MacOS.xcode_version.to_f >= 4.2
+    ENV.gcc unless MacOS::Xcode.version >= '4.2'
 
     args = %W[--prefix=#{prefix} --enable-cxx]
 
diff --git a/Library/Formula/libtool.rb b/Library/Formula/libtool.rb
index cdb771ff0..160412e1c 100644
--- a/Library/Formula/libtool.rb
+++ b/Library/Formula/libtool.rb
@@ -9,7 +9,7 @@ class Libtool < Formula
   mirror 'http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz'
   sha1 '22b71a8b5ce3ad86e1094e7285981cae10e6ff88'
 
-  if MacOS.xcode_version.to_f < 4.3 or File.file? "/usr/bin/glibtoolize"
+  if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/glibtoolize"
     keg_only "Xcode (up to and including 4.2) provides (a rather old) Libtool."
   end
 
diff --git a/Library/Formula/recode.rb b/Library/Formula/recode.rb
index 16d21fcce..f4cc83b64 100644
--- a/Library/Formula/recode.rb
+++ b/Library/Formula/recode.rb
@@ -15,14 +15,14 @@ class Recode < Formula
   end
 
   def copy_libtool_files!
-    if MacOS.xcode_version >= "4.3"
+    if MacOS::Xcode.version >= "4.3"
       s = Formula.factory('libtool').share
       d = "#{s}/libtool/config"
       cp ["#{d}/config.guess", "#{d}/config.sub"], "."
     elsif MacOS.leopard?
-      cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "."
+      cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config.*"], "."
     else
-      cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "."
+      cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config/config.*"], "."
     end
   end
 
diff --git a/Library/Formula/tcpflow.rb b/Library/Formula/tcpflow.rb
index 183e88326..c0eca3306 100644
--- a/Library/Formula/tcpflow.rb
+++ b/Library/Formula/tcpflow.rb
@@ -6,14 +6,14 @@ class Tcpflow < Formula
   sha1 'e7e71a34afb4d557ebe80e2d589f00d4afd38be4'
 
   def copy_libtool_files!
-    if MacOS.xcode_version >= "4.3"
+    if MacOS::Xcode.version >= "4.3"
       s = Formula.factory('libtool').share
       d = "#{s}/libtool/config"
       cp ["#{d}/config.guess", "#{d}/config.sub"], "."
     elsif MacOS.leopard?
-      cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config.*"], "."
+      cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config.*"], "."
     else
-      cp Dir["#{MacOS.xcode_prefix}/usr/share/libtool/config/config.*"], "."
+      cp Dir["#{MacOS::Xcode.prefix}/usr/share/libtool/config/config.*"], "."
     end
   end