aboutsummaryrefslogtreecommitdiff
path: root/graphics/xpdf
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-04-30 17:58:04 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-04-30 17:58:04 +0000
commit6ae76cb965f3accc6ded65a47f9faccfe398cf14 (patch)
tree28919e4f9b46c257580d74599260ad6062790bec /graphics/xpdf
parent6ee6ffc58966317fb4d225aade931c704c515fbf (diff)
xpdf now conflicts with poppler.
Notes
Notes: svn path=/head/; revision=160932
Diffstat (limited to 'graphics/xpdf')
-rw-r--r--graphics/xpdf/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 1215a9c766f1..aea2f72400a2 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -47,6 +47,8 @@ MAN1= pdffonts.1 \
pdftotext.1
MAN5= xpdfrc.5
+CONFLICTS= poppler-[0-9]*
+
.if defined(WITHOUT_X11)
PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+= --without-x