diff options
| author | Adam Vandenberg | 2013-11-12 22:18:03 -0800 | 
|---|---|---|
| committer | Adam Vandenberg | 2013-11-12 22:18:03 -0800 | 
| commit | befb9b35a11d6664fae5d9ea18733b6b8a1b99f9 (patch) | |
| tree | 668536821f167ce1333844e0cf6de640d731f37f | |
| parent | 4d73e21ab13da1ca485591958e8f19e3eca654b0 (diff) | |
| download | homebrew-befb9b35a11d6664fae5d9ea18733b6b8a1b99f9.tar.bz2 | |
fastbit/pam_yubico conflict
| -rw-r--r-- | Library/Formula/fastbit.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/pam_yubico.rb | 2 | 
2 files changed, 4 insertions, 1 deletions
| diff --git a/Library/Formula/fastbit.rb b/Library/Formula/fastbit.rb index cdc953dcf..3529be0fc 100644 --- a/Library/Formula/fastbit.rb +++ b/Library/Formula/fastbit.rb @@ -5,7 +5,8 @@ class Fastbit < Formula    url 'https://codeforge.lbl.gov/frs/download.php/409/fastbit-ibis1.3.8.tar.gz'    sha1 '3e0feed7932d34be49ca41fdb689f55b0466a28a' -  conflicts_with 'salt', :because => 'both install `include/filter.h`' +  conflicts_with 'fastbit', :because => 'Both install `include/util.h`' +  conflicts_with 'salt', :because => 'Both install `include/filter.h`'    def install      system "./configure", "--disable-debug", "--disable-dependency-tracking", diff --git a/Library/Formula/pam_yubico.rb b/Library/Formula/pam_yubico.rb index 387c75a93..149c66f3f 100644 --- a/Library/Formula/pam_yubico.rb +++ b/Library/Formula/pam_yubico.rb @@ -10,6 +10,8 @@ class PamYubico < Formula    depends_on 'ykclient'    depends_on 'ykpers' +  conflicts_with 'fastbit', :because => 'Both install `include/util.h`" +    def install      system "./configure", "--prefix=#{prefix}",                            "--with-libyubikey-prefix=#{HOMEBREW_PREFIX}", | 
