aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/poppler-utils
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2012-05-12 11:32:08 +0800
committercy <cy@FreeBSD.org>2012-05-12 11:32:08 +0800
commit428f67119a35a408ccc13de39e1d4c5e77aef929 (patch)
treefbb85201a7a28b48610bf2ec548eda0929552c25 /graphics/poppler-utils
parent1f806088d892cf20e049cfa3629a35ebc0ba819a (diff)
downloadfreebsd-ports-gnome-428f67119a35a408ccc13de39e1d4c5e77aef929.tar.gz
freebsd-ports-gnome-428f67119a35a408ccc13de39e1d4c5e77aef929.tar.zst
freebsd-ports-gnome-428f67119a35a408ccc13de39e1d4c5e77aef929.zip
Allow graphics/xpdf and graphics/poppler-utils to co-exist.
Approved by: araujo (xpdf) and kwm (poppler-utils)
Diffstat (limited to 'graphics/poppler-utils')
-rw-r--r--graphics/poppler-utils/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index a7a92bdaa02b..263fca70ea32 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -16,6 +16,4 @@ MASTERDIR= ${.CURDIR}/../../graphics/poppler
SLAVEPORT= utils
PLIST= ${.CURDIR}/pkg-plist
-CONFLICTS= xpdf-3.*
-
.include "${MASTERDIR}/Makefile"