[pkgsrc/trunk]: pkgsrc/print/poppler Remove the conflicst of xpdf now that ut...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d7ee1ab0403
branches:  trunk
changeset: 510658:5d7ee1ab0403
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat Apr 01 19:57:57 2006 +0000

description:
Remove the conflicst of xpdf now that utilities are in a different
package. Ride on same revision from a little earlier.

diffstat:

 print/poppler/Makefile |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r d23c3315ccc3 -r 5d7ee1ab0403 print/poppler/Makefile
--- a/print/poppler/Makefile    Sat Apr 01 19:41:23 2006 +0000
+++ b/print/poppler/Makefile    Sat Apr 01 19:57:57 2006 +0000
@@ -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 @@
 
 COMMENT=               PDF rendering library
 
-CONFLICTS+=            xpdf-[0-9]*
-
 USE_TOOLS+=            gmake
 
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool