summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorreed <reed>2009-06-01 13:48:36 +0000
committerreed <reed>2009-06-01 13:48:36 +0000
commit243c6c1e45e15a1445fc771a6b77a072366f7543 (patch)
treeb075199029631fe90549f16db05669c2eca1c485 /print
parent0b7c6aa9e3146fe7a8cc68be1fac53c2259663f4 (diff)
downloadpkgsrc-243c6c1e45e15a1445fc771a6b77a072366f7543.tar.gz
Add conflict with poppler-utils. And bump package revision.
Diffstat (limited to 'print')
-rw-r--r--print/xpdf/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 6554be10c16..28fe2a8fc6b 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -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 @@ MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
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
HOMEPAGE= http://www.foolabs.com/xpdf/
@@ -21,6 +22,7 @@ MAKE_JOBS_SAFE= no
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