summaryrefslogtreecommitdiff
path: root/print/poppler-glib
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-03-09 01:15:58 +0000
committerreed <reed@pkgsrc.org>2006-03-09 01:15:58 +0000
commitffa729a3a24fb4fdebca9b8677b437fc74a6a60f (patch)
tree8361f52b5075d16d7e62047c455eec7ee47e89e3 /print/poppler-glib
parentd2dcdd231fbb3208e0f3c39c527eb1d21437ee5e (diff)
downloadpkgsrc-ffa729a3a24fb4fdebca9b8677b437fc74a6a60f.tar.gz
Make this conflict to poppler<0.4.5nb1
(since poppler did provide same "glib" files).
Diffstat (limited to 'print/poppler-glib')
-rw-r--r--print/poppler-glib/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 97942b50bcd..799be55fbe4 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/09 01:13:16 reed Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/09 01:15:58 reed Exp $
#
.include "../../print/poppler/Makefile.common"
@@ -6,6 +6,8 @@
PKGNAME= poppler-glib-${POPPLER_VERS}
COMMENT= PDF rendering library (GLib wrapper)
+CONFLICTS+= poppler<0.4.5nb1
+
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.in