aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2012-08-09 00:21:14 -0500
committerJack Nagel2012-08-09 00:21:14 -0500
commit16aab049c2414b9e5ecd4ad05674d24919b32fde (patch)
tree206ff1e7f0aa85c0217d500e8ae326b0dcfc3a22
parent9bc35da47afb8234709fbf4a0db69ccb27651168 (diff)
downloadhomebrew-16aab049c2414b9e5ecd4ad05674d24919b32fde.tar.bz2
Use X11 module methods where applicable
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Formula/cairo.rb2
-rw-r--r--Library/Formula/fontconfig.rb2
-rw-r--r--Library/Formula/freetype.rb2
-rw-r--r--Library/Formula/libpng.rb2
-rw-r--r--Library/Formula/pixman.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
index b29e79f88..98fbf7a59 100644
--- a/Library/Formula/cairo.rb
+++ b/Library/Formula/cairo.rb
@@ -7,7 +7,7 @@ class Cairo < Formula
keg_only :provided_by_osx,
"The Cairo provided by Leopard is too old for newer software to link against." \
- if MacOS.x11_installed?
+ if MacOS::X11.installed?
# Can't currently pass :recommended to the :x11 dep.
depends_on :libpng # => :recommended
diff --git a/Library/Formula/fontconfig.rb b/Library/Formula/fontconfig.rb
index 06dc2bd57..410100b91 100644
--- a/Library/Formula/fontconfig.rb
+++ b/Library/Formula/fontconfig.rb
@@ -7,7 +7,7 @@ class Fontconfig < Formula
keg_only :provided_by_osx,
"Leopard comes with version 2.4.x, which is too old for many packages." \
- if MacOS.x11_installed?
+ if MacOS::X11.installed?
depends_on :freetype
depends_on 'pkg-config' => :build
diff --git a/Library/Formula/freetype.rb b/Library/Formula/freetype.rb
index 380e57202..513bb3b3b 100644
--- a/Library/Formula/freetype.rb
+++ b/Library/Formula/freetype.rb
@@ -5,7 +5,7 @@ class Freetype < Formula
url 'http://downloads.sf.net/project/freetype/freetype2/2.4.10/freetype-2.4.10.tar.gz'
sha1 '44dba26ff965b1cd1c62e480fdefaeca62ed33da'
- keg_only :provided_by_osx unless MacOS.x11_installed?
+ keg_only :provided_by_osx unless MacOS::X11.installed?
def install
system "./configure", "--disable-debug", "--disable-dependency-tracking",
diff --git a/Library/Formula/libpng.rb b/Library/Formula/libpng.rb
index afdb486ae..8a72044fa 100644
--- a/Library/Formula/libpng.rb
+++ b/Library/Formula/libpng.rb
@@ -5,7 +5,7 @@ class Libpng < Formula
url 'http://downloads.sf.net/project/libpng/libpng15/1.5.12/libpng-1.5.12.tar.gz'
sha1 'c329f3a9b720d7ae14e8205fa6e332236573704b'
- keg_only :provided_by_osx if MacOS.x11_installed?
+ keg_only :provided_by_osx if MacOS::X11.installed?
def install
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
diff --git a/Library/Formula/pixman.rb b/Library/Formula/pixman.rb
index b96cad409..5ed27ffe2 100644
--- a/Library/Formula/pixman.rb
+++ b/Library/Formula/pixman.rb
@@ -9,7 +9,7 @@ class Pixman < Formula
keg_only :provided_by_osx,
"Apple provides an outdated version of libpixman in its X11 distribution." \
- if MacOS.x11_installed?
+ if MacOS::X11.installed?
fails_with :llvm do
build 2336