diff options
| author | Adam Vandenberg | 2013-11-15 23:43:19 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2013-11-15 23:43:19 -0800 |
| commit | 915d44030f95ce23b144992d46fde5f4085e5100 (patch) | |
| tree | da21e0c80be95de54c890372c9eae6f05720948c | |
| parent | 2a0097ecd9f512cf4bb6fc92590ff31e36077926 (diff) | |
| download | homebrew-915d44030f95ce23b144992d46fde5f4085e5100.tar.bz2 | |
fastbit/iniparser conflict
| -rw-r--r-- | Library/Formula/fastbit.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/iniparser.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Library/Formula/fastbit.rb b/Library/Formula/fastbit.rb index f13ef8162..49be69555 100644 --- a/Library/Formula/fastbit.rb +++ b/Library/Formula/fastbit.rb @@ -5,6 +5,7 @@ class Fastbit < Formula url 'https://codeforge.lbl.gov/frs/download.php/409/fastbit-ibis1.3.8.tar.gz' sha1 '3e0feed7932d34be49ca41fdb689f55b0466a28a' + conflicts_with 'iniparser', :because => 'Both install `include/dictionary.h`' conflicts_with 'salt', :because => 'Both install `include/filter.h`' def install diff --git a/Library/Formula/iniparser.rb b/Library/Formula/iniparser.rb index 80a71ace3..535522e34 100644 --- a/Library/Formula/iniparser.rb +++ b/Library/Formula/iniparser.rb @@ -2,10 +2,11 @@ require 'formula' class Iniparser < Formula homepage 'http://ndevilla.free.fr/iniparser/' + head 'https://github.com/ndevilla/iniparser.git' url 'http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz' sha1 '41eae7b414cad9cd42ae2c2a64394c10d7ab655e' - head 'https://github.com/ndevilla/iniparser.git' + conflicts_with 'fastbit', :because => 'Both install `include/dictionary.h`' def install # Only make the *.a file; the *.so target is useless (and fails). |