summaryrefslogtreecommitdiff
path: root/print/poppler
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-04-01 19:57:57 +0000
committerreed <reed@pkgsrc.org>2006-04-01 19:57:57 +0000
commit4f71d8fc8b3a608e1924beaa6dc93df367a28de6 (patch)
treef26422a876190347a6acd9d903c9c18a67ffb00d /print/poppler
parent9b1ba6acf9051b437e1b25b287f12c9b7922f825 (diff)
downloadpkgsrc-4f71d8fc8b3a608e1924beaa6dc93df367a28de6.tar.gz
Remove the conflicst of xpdf now that utilities are in a different
package. Ride on same revision from a little earlier.
Diffstat (limited to 'print/poppler')
-rw-r--r--print/poppler/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index b64fe91e289..8547631d5a6 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/01 19:08:40 reed Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/01 19:57:57 reed Exp $
#
.include "../../print/poppler/Makefile.common"
@@ -7,8 +7,6 @@ PKGREVISION= 3
COMMENT= PDF rendering library
-CONFLICTS+= xpdf-[0-9]*
-
USE_TOOLS+= gmake
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool