aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorAdam Vandenberg2013-11-12 20:50:13 -0800
committerAdam Vandenberg2013-11-12 21:42:49 -0800
commitbd5fd985f806a76c9b80e45dc9d747759109b01d (patch)
treee00cefac318e8066c24849c02764238e21b93516 /Library/Formula
parentfd9355f08146e6cc211f7566cb3e6a9b5d61d81f (diff)
downloadhomebrew-bd5fd985f806a76c9b80e45dc9d747759109b01d.tar.bz2
pdftohtml/poppler conflict
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/pdftohtml.rb2
-rw-r--r--Library/Formula/poppler.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/Library/Formula/pdftohtml.rb b/Library/Formula/pdftohtml.rb
index 863f17b69..d10285257 100644
--- a/Library/Formula/pdftohtml.rb
+++ b/Library/Formula/pdftohtml.rb
@@ -5,6 +5,8 @@ class Pdftohtml < Formula
url 'http://downloads.sourceforge.net/project/pdftohtml/Experimental%20Versions/pdftohtml%200.40/pdftohtml-0.40a.tar.gz'
sha1 '409572da65cf5234d026a5b199a81a26e75ca4d8'
+ conflicts_with 'poppler', :beacuse => 'both install `pdftohtml` binaries'
+
def install
system "make"
bin.install "src/pdftohtml"
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb
index e97980794..4992522be 100644
--- a/Library/Formula/poppler.rb
+++ b/Library/Formula/poppler.rb
@@ -18,6 +18,8 @@ class Poppler < Formula
depends_on 'glib' => :optional
depends_on 'cairo' if build.with? 'glib' # Needs a newer Cairo build than OS X 10.6.7 provides
+ conflicts_with 'pdftohtml', :beacuse => 'both install `pdftohtml` binaries'
+
conflicts_with 'pdf2image', 'xpdf',
:because => 'poppler, pdf2image, and xpdf install conflicting executables'