aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-05-01 01:58:04 +0800
committermarcus <marcus@FreeBSD.org>2006-05-01 01:58:04 +0800
commit40a68483d16416c6e921b5891e49cb02d61e7a3d (patch)
tree934319418f72577d876e54a0a18f010bf64c4f93 /graphics
parent28ec62ea80c9d55df7105c9bb34bc87245362522 (diff)
downloadfreebsd-ports-gnome-40a68483d16416c6e921b5891e49cb02d61e7a3d.tar.gz
freebsd-ports-gnome-40a68483d16416c6e921b5891e49cb02d61e7a3d.tar.zst
freebsd-ports-gnome-40a68483d16416c6e921b5891e49cb02d61e7a3d.zip
xpdf now conflicts with poppler.
Diffstat (limited to 'graphics')
-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