diff options
| author | Peter Aronoff | 2014-01-05 12:39:07 -0500 |
|---|---|---|
| committer | Mike McQuaid | 2014-01-05 17:50:01 +0000 |
| commit | 24073dc04b67ab065b5c3988c9cc2517705f889c (patch) | |
| tree | f4a6fa4ac680cb571a8d352e59595c354250c9a8 /Library/Formula | |
| parent | 0b0302107e4641f9b930c3af7ec1915b19c9d854 (diff) | |
| download | homebrew-24073dc04b67ab065b5c3988c9cc2517705f889c.tar.bz2 | |
ex-vi, vim: mark conflict.
Since both install `bin/ex` and `bin/view`, they should conflict. This
should fix #25657.
Ideally, this is a temporary fix. I would like to find out if it's possible
to have `ex-vi` install `bin/ex` and `bin/view` with a prefix (à la GNU's
`coreutils`). If so, it would be possible to have it all.
Closes #25663.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/ex-vi.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/vim.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Library/Formula/ex-vi.rb b/Library/Formula/ex-vi.rb index 3e36504d8..ea087100a 100644 --- a/Library/Formula/ex-vi.rb +++ b/Library/Formula/ex-vi.rb @@ -5,6 +5,9 @@ class ExVi < Formula url 'http://sourceforge.net/projects/ex-vi/files/ex-vi/050325/ex-050325.tar.bz2' sha1 '573501d15fa4be59f136641957c7f893e86bac82' + conflicts_with 'vim', + :because => 'ex-vi and vim both install bin/ex and bin/view' + def install system "make", "install", "INSTALL=/usr/bin/install", "PREFIX=#{prefix}", diff --git a/Library/Formula/vim.rb b/Library/Formula/vim.rb index 580064e61..9c5fa9b1f 100644 --- a/Library/Formula/vim.rb +++ b/Library/Formula/vim.rb @@ -31,6 +31,9 @@ class Vim < Formula depends_on 'lua' => :optional depends_on 'gtk+' if build.with? 'client-server' + conflicts_with 'ex-vi', + :because => 'vim and ex-vi both install bin/ex and bin/view' + # First patch: vim uses the obsolete Apple-only -no-cpp-precomp flag, which # FSF GCC can't understand; reported upstream: # https://groups.google.com/forum/#!topic/vim_dev/X5yG3-IiUp8 |
