diff options
| author | Jack Nagel | 2012-12-24 11:41:46 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-12-24 11:41:50 -0600 |
| commit | 9df46609159d5134233a9dc0a33c2369307d3acf (patch) | |
| tree | e3c273a6ee8e96593650bc33fadc2c8bac2c5796 /Library | |
| parent | 6cdd56bf9cb9bcf68d7bd091a37c84f57e38994b (diff) | |
| download | homebrew-9df46609159d5134233a9dc0a33c2369307d3acf.tar.bz2 | |
parallel and moreutils conflict
Closes #16719.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/moreutils.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/parallel.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Library/Formula/moreutils.rb b/Library/Formula/moreutils.rb index f6fc4a36d..d530319f2 100644 --- a/Library/Formula/moreutils.rb +++ b/Library/Formula/moreutils.rb @@ -6,6 +6,9 @@ class Moreutils < Formula mirror 'http://ftp.us.debian.org/debian/pool/main/m/moreutils/moreutils_0.47.tar.gz' sha1 '0459608fdb37bc59605d7a476717693afd133e00' + conflicts_with 'parallel', + :because => "both install a 'parallel' executable." + def install # Building the man pages requires DocBook, so we skip them. scripts = %w[chronic combine ts vidir vipe zrun] diff --git a/Library/Formula/parallel.rb b/Library/Formula/parallel.rb index eb1f2b90b..8edc37230 100644 --- a/Library/Formula/parallel.rb +++ b/Library/Formula/parallel.rb @@ -6,6 +6,9 @@ class Parallel < Formula mirror 'http://ftp.gnu.org/gnu/parallel/parallel-20121222.tar.bz2' sha256 '0ce96ad4e36734baae7ce6c8d99d004810fbfdf5209d6f86d5b5fc9a92dc17f8' + conflicts_with 'moreutils', + :because => "both install a 'parallel' executable." + def install system "./configure", "--prefix=#{prefix}" system "make install" |