diff options
| -rw-r--r-- | Library/Formula/cairo.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/enscript.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/fontconfig.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/freetype.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/libpng.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/pixman.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_support.rb | 6 |
7 files changed, 9 insertions, 9 deletions
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb index 9dc979d4f..9cd76b67c 100644 --- a/Library/Formula/cairo.rb +++ b/Library/Formula/cairo.rb @@ -5,7 +5,7 @@ class Cairo < Formula url 'http://cairographics.org/releases/cairo-1.12.2.tar.xz' sha256 'b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96' - keg_only unless MacOS.version >= :mountain_lion + keg_only :provided_pre_mountain_lion option :universal option 'without-x', 'Build without X11 support' diff --git a/Library/Formula/enscript.rb b/Library/Formula/enscript.rb index 4f5be6fcb..27368020d 100644 --- a/Library/Formula/enscript.rb +++ b/Library/Formula/enscript.rb @@ -8,7 +8,7 @@ class Enscript < Formula head 'git://git.savannah.gnu.org/enscript.git' - keg_only :provided_by_osx unless MacOS.version >= :mountain_lion + keg_only :provided_pre_mountain_lion depends_on 'gettext' diff --git a/Library/Formula/fontconfig.rb b/Library/Formula/fontconfig.rb index 4ce0418ce..c2fdadc3f 100644 --- a/Library/Formula/fontconfig.rb +++ b/Library/Formula/fontconfig.rb @@ -5,7 +5,7 @@ class Fontconfig < Formula url 'http://fontconfig.org/release/fontconfig-2.10.1.tar.gz' sha1 'e377cbe989cd22d3a10020309c906ecbbcac0043' - keg_only unless MacOS.version >= :mountain_lion + keg_only :provided_pre_mountain_lion depends_on :freetype depends_on 'pkg-config' => :build diff --git a/Library/Formula/freetype.rb b/Library/Formula/freetype.rb index 0c1d17622..67334e7a4 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 unless MacOS.version >= :mountain_lion + keg_only :provided_pre_mountain_lion option :universal diff --git a/Library/Formula/libpng.rb b/Library/Formula/libpng.rb index 6deeb5d80..e5b076fcf 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 unless MacOS.version >= :mountain_lion + keg_only :provided_pre_mountain_lion bottle do sha1 '83c6be83e86404f41982e5e1e6877924fe737bdf' => :mountainlion diff --git a/Library/Formula/pixman.rb b/Library/Formula/pixman.rb index 9fc1b13f1..8894a3cdf 100644 --- a/Library/Formula/pixman.rb +++ b/Library/Formula/pixman.rb @@ -7,7 +7,7 @@ class Pixman < Formula depends_on 'pkg-config' => :build - keg_only unless MacOS.version >= :mountain_lion + keg_only :provided_pre_mountain_lion option :universal diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb index b406f2321..1bf3fbc58 100644 --- a/Library/Homebrew/formula_support.rb +++ b/Library/Homebrew/formula_support.rb @@ -133,7 +133,7 @@ class KegOnlyReason @reason = reason @explanation = explanation @valid = case @reason - when :when_xquartz_installed then MacOS::XQuartz.installed? + when :provided_pre_mountain_lion then MacOS.version < :mountain_lion else true end end @@ -150,8 +150,8 @@ class KegOnlyReason #{@explanation} EOS - when :when_xquartz_installed then <<-EOS.undent - XQuartz provides this software. + when :provided_pre_mountain_lion then <<-EOS.undent + Mac OS X already provides this software in versions before Mountain Lion. #{@explanation} EOS |