[pkgsrc/trunk]: pkgsrc/print/xpdf Add conflict with poppler-utils. And bump p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0672826c582a
branches:  trunk
changeset: 559822:0672826c582a
user:      reed <reed%pkgsrc.org@localhost>
date:      Mon Jun 01 13:48:36 2009 +0000

description:
Add conflict with poppler-utils. And bump package revision.

diffstat:

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

diffs (25 lines):

diff -r f1e7b23ea5f0 -r 0672826c582a print/xpdf/Makefile
--- a/print/xpdf/Makefile       Mon Jun 01 11:59:29 2009 +0000
+++ b/print/xpdf/Makefile       Mon Jun 01 13:48:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2009/04/17 12:09:35 tron Exp $
+# $NetBSD: Makefile,v 1.67 2009/06/01 13:48:36 reed Exp $
 
 DISTNAME=      xpdf-3.02
 PKGNAME=       xpdf-3.02pl3
@@ -9,6 +9,7 @@
 PATCH_SITES=   ${MASTER_SITES}
 PATCHFILES=    xpdf-3.02pl1.patch xpdf-3.02pl2.patch xpdf-3.02pl3.patch
 PATCH_DIST_STRIP=      -p1
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.foolabs.com/xpdf/
@@ -21,6 +22,7 @@
 DEPENDS+=      ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
 
 CONFLICTS=     xpdf-crypto-[0-9]*
+CONFLICTS+=    poppler-utils-[0-9]*
 
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes