diff options
| author | Adam Vandenberg | 2013-06-30 08:49:04 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2013-06-30 08:49:30 -0700 |
| commit | bb7b850d5775cb47195205bb3dfa6fa912df7601 (patch) | |
| tree | e45d67c51161282065e08b7cf557c8343b3b59ed | |
| parent | cd8ad2e9779bc3d3ff425dfb2e7630d95d54c590 (diff) | |
| download | homebrew-bb7b850d5775cb47195205bb3dfa6fa912df7601.tar.bz2 | |
watch and visionmedia-watch conflict
| -rw-r--r-- | Library/Formula/visionmedia-watch.rb | 5 | ||||
| -rw-r--r-- | Library/Formula/watch.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Library/Formula/visionmedia-watch.rb b/Library/Formula/visionmedia-watch.rb index 755ab3dd9..139c65dab 100644 --- a/Library/Formula/visionmedia-watch.rb +++ b/Library/Formula/visionmedia-watch.rb @@ -3,9 +3,12 @@ require 'formula' class VisionmediaWatch < Formula homepage 'https://github.com/visionmedia/watch' url 'https://github.com/visionmedia/watch/archive/0.2.1.tar.gz' - head 'https://github.com/visionmedia/watch.git' sha1 '752006185eadb34a0ec3bdbea259c27359d886d0' + head 'https://github.com/visionmedia/watch.git' + + conflicts_with 'watch' + def install bin.mkdir system "make", "PREFIX=#{prefix}", "install" diff --git a/Library/Formula/watch.rb b/Library/Formula/watch.rb index 07453ea58..94838cd82 100644 --- a/Library/Formula/watch.rb +++ b/Library/Formula/watch.rb @@ -3,8 +3,10 @@ require 'formula' class Watch < Formula homepage 'http://procps.sourceforge.net/' url 'http://procps.sourceforge.net/procps-3.2.8.tar.gz' + version '0.2.0' # watch command itself is version 0.2.0 sha1 'a0c86790569dec26b5d9037e8868ca907acc9829' - version '0.2.0' + + conflicts_with 'visionmedia-watch' def install system "make", "watch", "PKG_LDFLAGS=-Wl" |