[pkgsrc/trunk]: pkgsrc/print/poppler This conflicts with xpdf for the utilities.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/778226140983
branches:  trunk
changeset: 510646:778226140983
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat Apr 01 17:58:03 2006 +0000

description:
This conflicts with xpdf for the utilities.
Bump PKGREVISION.

diffstat:

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

diffs (20 lines):

diff -r 6e4f1bb28fbe -r 778226140983 print/poppler/Makefile
--- a/print/poppler/Makefile    Sat Apr 01 17:50:46 2006 +0000
+++ b/print/poppler/Makefile    Sat Apr 01 17:58:03 2006 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2006/03/31 20:37:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/01 17:58:03 reed Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=           1
+PKGREVISION=           2
 
 COMMENT=               PDF rendering library
 
+CONFLICTS+=            xpdf-[0-9]*
+
 USE_TOOLS+=            gmake
 
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool