From c893c3aec9cc12127ede7f24b63282473de68113 Mon Sep 17 00:00:00 2001 From: Samuel Cochran Date: Mon, 30 May 2011 10:48:10 +0800 Subject: [PATCH] Better explanation of libxml2 and libxslt in blacklists. Bundling explanation of X11 and libxslt is a bit odd and confusing, bundle libxml2 and libxslt instead extracted from X11 and /usr/lib requirements. Signed-off-by: Adam Vandenberg --- Library/Homebrew/blacklist.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/blacklist.rb b/Library/Homebrew/blacklist.rb index 726a1343cf..4b219d1fe7 100644 --- a/Library/Homebrew/blacklist.rb +++ b/Library/Homebrew/blacklist.rb @@ -3,13 +3,18 @@ def blacklisted? name when 'vim', 'screen', /^rubygems?$/ then <<-EOS.undent Apple distributes #{name} with OS X, you can find it in /usr/bin. EOS - when 'libxml', 'libarchive', 'libpcap' then <<-EOS.undent + when 'libarchive', 'libpcap' then <<-EOS.undent Apple distributes #{name} with OS X, you can find it in /usr/lib. EOS - when 'libxlst', 'freetype', 'libpng' then <<-EOS.undent + when 'libxml', 'libxlst' then <<-EOS.undent + Apple distributes #{name} with OS X, you can find it in /usr/lib. + However not all build scripts look for these hard enough, so you may need + to call ENV.libxml2 in your formula's install function. + EOS + when 'freetype', 'libpng' then <<-EOS.undent Apple distributes #{name} with OS X, you can find it in /usr/X11/lib. - However not all build scripts look here, so you may need to call ENV.x11 or - ENV.libxml2 in your formula's install function. + However not all build scripts look here, so you may need to call ENV.x11 + in your formula's install function. EOS when 'wxwidgets' then <<-EOS.undent An old version of wxWidgets can be found in /usr/X11/lib. However, Homebrew