aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library/Formula/autoconf.rb4
-rw-r--r--Library/Formula/automake.rb4
-rw-r--r--Library/Formula/bsdmake.rb4
-rw-r--r--Library/Formula/cvs.rb2
-rw-r--r--Library/Formula/libtool.rb4
-rw-r--r--Library/Homebrew/formula_support.rb8
6 files changed, 13 insertions, 13 deletions
diff --git a/Library/Formula/autoconf.rb b/Library/Formula/autoconf.rb
index 1d79e68ed..271170624 100644
--- a/Library/Formula/autoconf.rb
+++ b/Library/Formula/autoconf.rb
@@ -13,9 +13,7 @@ class Autoconf < Formula
sha1 "7d31f63e5ddd1bbbf0397b0b70df1ff9e70f998b" => :lion
end
- 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
+ keg_only :provided_until_xcode43
def install
ENV['PERL'] = '/usr/bin/perl'
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
index 10fd6e63f..ae31a1448 100644
--- a/Library/Formula/automake.rb
+++ b/Library/Formula/automake.rb
@@ -15,9 +15,7 @@ class Automake < Formula
# Always needs a newer autoconf, even on Snow Leopard.
depends_on 'autoconf' => :run
- 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
+ keg_only :provided_until_xcode43
def install
ENV['PERL'] = '/usr/bin/perl'
diff --git a/Library/Formula/bsdmake.rb b/Library/Formula/bsdmake.rb
index 67cfb8239..a6368c7ca 100644
--- a/Library/Formula/bsdmake.rb
+++ b/Library/Formula/bsdmake.rb
@@ -5,9 +5,7 @@ class Bsdmake < Formula
url 'http://opensource.apple.com/tarballs/bsdmake/bsdmake-24.tar.gz'
sha1 '9ce3c3fc01e0eb47d82827b1eb227eb371fefd5c'
- if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/bsdmake"
- keg_only "Recent versions of OS X no longer provide this tool."
- end
+ keg_only :provided_until_xcode43
# MacPorts patches to make bsdmake play nice with our prefix system
# Also a MacPorts patch to circumvent setrlimit error
diff --git a/Library/Formula/cvs.rb b/Library/Formula/cvs.rb
index a6e313741..97a5d7f4d 100644
--- a/Library/Formula/cvs.rb
+++ b/Library/Formula/cvs.rb
@@ -10,7 +10,7 @@ class Cvs < Formula
url 'http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2'
sha1 '93a8dacc6ff0e723a130835713235863f1f5ada9'
- keg_only "Xcode (< 5.0) provides CVS" if MacOS::Xcode.provides_cvs?
+ keg_only :provided_until_xcode5
{
"PR5178707" => "372385b34a346753249a7808e8d5db0a6cadd3ee",
diff --git a/Library/Formula/libtool.rb b/Library/Formula/libtool.rb
index 97a16b2e6..233804068 100644
--- a/Library/Formula/libtool.rb
+++ b/Library/Formula/libtool.rb
@@ -16,9 +16,7 @@ class Libtool < Formula
sha1 '6873a7b72e86f369f43125c0e29ae5cdbc2d67c1' => :lion
end
- if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/glibtoolize"
- keg_only "Xcode 4.2 and below provide glibtool."
- end
+ keg_only :provided_until_xcode43
option :universal
diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb
index 7efda3564..587a5f3ce 100644
--- a/Library/Homebrew/formula_support.rb
+++ b/Library/Homebrew/formula_support.rb
@@ -14,6 +14,10 @@ class KegOnlyReason
case @reason
when :provided_pre_mountain_lion
MacOS.version < :mountain_lion
+ when :provided_until_xcode43
+ MacOS::Xcode.version < "4.3"
+ when :provided_until_xcode5
+ MacOS::Xcode.version < "5.0"
else
true
end
@@ -32,6 +36,10 @@ class KegOnlyReason
#{@explanation}
EOS
+ when :provided_until_xcode43
+ "Xcode provides this software prior to version 4.3.\n\n#{explanation}"
+ when :provided_until_xcode5
+ "Xcode provides this software prior to version 5.\n\n#{explanation}"
else
@reason
end.strip