Wed Aug 18 16:32:45 2010 UTC ()
poppler-glib (and poppler-cairo) pkgconfig configurations require
same poppler version. So make the BUILDLINK_API_DEPENDS.poppler
an exact match.
(Noticed pkgconfig error when building evince with a poppler
and poppler-glib with different versions.)


(reed)
diff -r1.27 -r1.28 pkgsrc/print/poppler-glib/Makefile
cvs diff -r1.27 -r1.28 pkgsrc/print/poppler-glib/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-glib/Makefile 2010/07/14 17:04:23 1.27
+++ pkgsrc/print/poppler-glib/Makefile 2010/08/18 16:32:44 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2010/07/14 17:04:23 drochner Exp $ 1# $NetBSD: Makefile,v 1.28 2010/08/18 16:32:44 reed Exp $
2# 2#
3 3
4.include "../../print/poppler/Makefile.common" 4.include "../../print/poppler/Makefile.common"
5 5
6PKGNAME= poppler-glib-${POPPLER_VERS} 6PKGNAME= poppler-glib-${POPPLER_VERS}
7 7
8COMMENT= PDF rendering library (GLib wrapper) 8COMMENT= PDF rendering library (GLib wrapper)
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10 10
11CONFLICTS+= poppler<0.4.5nb1 11CONFLICTS+= poppler<0.4.5nb1
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
@@ -33,18 +33,18 @@ INSTALL_DIRS= glib @@ -33,18 +33,18 @@ INSTALL_DIRS= glib
33INSTALLATION_DIRS+= lib/pkgconfig 33INSTALLATION_DIRS+= lib/pkgconfig
34 34
35post-install: 35post-install:
36 ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 36 ${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
37 ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 37 ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
38 38
39# Workaround for Upstream Bug#562310. 39# Workaround for Upstream Bug#562310.
40# for more detail, see also PR#41475. 40# for more detail, see also PR#41475.
41TOOLS_NOOP+= gtkdoc-rebase 41TOOLS_NOOP+= gtkdoc-rebase
42 42
43.include "../../devel/glib2/buildlink3.mk" 43.include "../../devel/glib2/buildlink3.mk"
44.include "../../graphics/cairo/buildlink3.mk" 44.include "../../graphics/cairo/buildlink3.mk"
45.include "../../graphics/jpeg/buildlink3.mk" 45.include "../../graphics/jpeg/buildlink3.mk"
46BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} 46BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}
47.include "../../print/poppler/buildlink3.mk" 47.include "../../print/poppler/buildlink3.mk"
48.include "../../x11/gtk2/buildlink3.mk" 48.include "../../x11/gtk2/buildlink3.mk"
49.include "../../mk/pthread.buildlink3.mk" 49.include "../../mk/pthread.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"