diff options
| author | Adam Vandenberg | 2013-11-12 20:48:13 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2013-11-12 21:42:49 -0800 |
| commit | fd9355f08146e6cc211f7566cb3e6a9b5d61d81f (patch) | |
| tree | b545e30a448210982577490cf6a59a4454d5085a /Library/Formula | |
| parent | 6d5d887750abc9526cf3a8dab7377d53589013fb (diff) | |
| download | homebrew-fd9355f08146e6cc211f7566cb3e6a9b5d61d81f.tar.bz2 | |
ndiff/nmap conflict
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/ndiff.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/nmap.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Library/Formula/ndiff.rb b/Library/Formula/ndiff.rb index 624a94b89..2fa06fd41 100644 --- a/Library/Formula/ndiff.rb +++ b/Library/Formula/ndiff.rb @@ -5,6 +5,8 @@ class Ndiff < Formula url 'ftp://ftp.math.utah.edu/pub/misc/ndiff-2.00.tar.gz' sha1 'b9ef2eb0de0cd26c3c92e0b3342d0ea4c37e8975' + conflicts_with 'namp', :because => 'both install `ndiff` binaries' + def install ENV.j1 # Install manually as the `install` make target is crufty diff --git a/Library/Formula/nmap.rb b/Library/Formula/nmap.rb index b911e0128..ca4cbbcec 100644 --- a/Library/Formula/nmap.rb +++ b/Library/Formula/nmap.rb @@ -2,14 +2,14 @@ require 'formula' class Nmap < Formula homepage 'http://nmap.org/' + head 'https://guest:@svn.nmap.org/nmap/', :using => :svn url 'http://nmap.org/dist/nmap-6.40.tar.bz2' sha1 'ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb' - head 'https://guest:@svn.nmap.org/nmap/', :using => :svn - - # Leopard's version of OpenSSL isn't new enough depends_on "openssl" if MacOS.version <= :leopard + conflicts_with 'ndiff', :because => 'both install `ndiff` binaries' + fails_with :llvm do build 2334 end |