diff options
| author | Adam Vandenberg | 2013-11-12 21:42:35 -0800 | 
|---|---|---|
| committer | Adam Vandenberg | 2013-11-12 21:42:50 -0800 | 
| commit | 359a47cee098289f7a825944777a09b9ce3e5b54 (patch) | |
| tree | a58c08b6236b74d328061e3a4100bc39543ecc61 | |
| parent | 6b9c752d676be1bfd35a023b39cbe92a145fde63 (diff) | |
| download | homebrew-359a47cee098289f7a825944777a09b9ce3e5b54.tar.bz2 | |
fastbit/salt conflict
| -rw-r--r-- | Library/Formula/fastbit.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/salt.rb | 2 | 
2 files changed, 4 insertions, 0 deletions
| diff --git a/Library/Formula/fastbit.rb b/Library/Formula/fastbit.rb index 19fa9acbc..cdc953dcf 100644 --- a/Library/Formula/fastbit.rb +++ b/Library/Formula/fastbit.rb @@ -5,6 +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`' +    def install      system "./configure", "--disable-debug", "--disable-dependency-tracking",                            "--prefix=#{prefix}" diff --git a/Library/Formula/salt.rb b/Library/Formula/salt.rb index bd85021b8..9382bed96 100644 --- a/Library/Formula/salt.rb +++ b/Library/Formula/salt.rb @@ -7,6 +7,8 @@ class Salt < Formula    depends_on :fortran +  conflicts_with 'fastbit', :because => 'both install `include/filter.h`' +    resource 'SALT2' do      url 'http://supernovae.in2p3.fr/~guy/salt-dev/download/salt2_model_data-2-0.tar.gz'      sha1 '271e67d764c98b423dfaa264b9baf759a46acff1' | 
