diff options
| author | Adam Vandenberg | 2013-11-05 22:09:48 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2013-11-05 22:09:48 -0800 |
| commit | 11ae37b3f22b070b91bab2440863a6b11b04eca5 (patch) | |
| tree | 391257539e8bbe1db2ff229afb42292a8b5fa579 /Library/Formula | |
| parent | bc645b587cce7a388546b4118a13dc3354271285 (diff) | |
| download | homebrew-11ae37b3f22b070b91bab2440863a6b11b04eca5.tar.bz2 | |
add spidermonkey/narwhal conflict
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/narwhal.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/spidermonkey.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Library/Formula/narwhal.rb b/Library/Formula/narwhal.rb index f95572f61..a17d3abbf 100644 --- a/Library/Formula/narwhal.rb +++ b/Library/Formula/narwhal.rb @@ -2,10 +2,11 @@ require 'formula' class Narwhal < Formula homepage 'https://github.com/280north/narwhal' + head 'https://github.com/280north/narwhal.git' url 'https://github.com/280north/narwhal/archive/v0.3.2.tar.gz' sha1 'c93c6ad673e9e58642c1a46f493e16fc808bce60' - head 'https://github.com/280north/narwhal.git' + conflicts_with 'spidermonkey', :because => 'both install a js binary' def install rm Dir['bin/*.cmd'] diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb index cea83c1d8..9e17426e3 100644 --- a/Library/Formula/spidermonkey.rb +++ b/Library/Formula/spidermonkey.rb @@ -8,6 +8,8 @@ class Spidermonkey < Formula head 'https://hg.mozilla.org/tracemonkey/archive/tip.tar.gz' + conflicts_with 'narwhal', :because => 'both install a js binary' + depends_on 'readline' depends_on 'nspr' |