include ".../poppler/bl3" before PKG_BUILD_OPTIONS.poppler is checked

for -- this doesn't make a difference in my box (current, modular xorg)
but Matthias Scheler reported problems on his and that this change helps

4 files changed, 21 insertions, 14 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index f302e555b7d..8418495c468 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2011/07/11 10:05:22 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2011/07/11 18:43:03 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -24,12 +24,16 @@ CONFIGURE_ARGS+=	--disable-poppler-qt
 # Don't compile GTK+ test program.
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
+CONFIGURE_ARGS+=	--disable-poppler-cpp
+
+BUILDLINK_API_DEPENDS.poppler+=     poppler-${POPPLER_VERS}{,nb*}
+.include "../../print/poppler/buildlink3.mk"
+
 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
 CONFIGURE_ARGS+=	--enable-cms
 .else
 CONFIGURE_ARGS+=	--disable-cms
 .endif
-CONFIGURE_ARGS+=	--disable-poppler-cpp
 
 BUILD_DIRS=		goo fofi poppler glib
 INSTALL_DIRS=		glib
@@ -43,8 +47,6 @@ post-install:
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler+=     poppler-${POPPLER_VERS}{,nb*}
-.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 2d68e1c9f46..16587161b3e 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/07/11 10:05:22 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2011/07/11 18:43:03 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -14,6 +14,10 @@ CONFIGURE_ARGS+=	--disable-splash-output
 CONFIGURE_ARGS+=	--enable-poppler-qt
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
+
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
+.include "../../print/poppler/buildlink3.mk"
+
 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
 CONFIGURE_ARGS+=	--enable-cms
 .else
@@ -29,8 +33,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc \
 		${DESTDIR}${PREFIX}/lib/pkgconfig
 
-BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
-.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile
index 8d6bbc5cc87..f91c346097d 100644
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/07/11 10:05:22 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2011/07/11 18:43:03 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -13,6 +13,10 @@ CONFIGURE_ARGS+=	--disable-cairo-output
 CONFIGURE_ARGS+=	--enable-poppler-qt4
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
+
+BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
+.include "../../print/poppler/buildlink3.mk"
+
 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
 CONFIGURE_ARGS+=	--enable-cms
 .else
@@ -31,10 +35,8 @@ pre-build:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
-BUILDLINK_API_DEPENDS.poppler+=	poppler>=${POPPLER_VERS}
 BUILDLINK_DEPMETHOD.qt4-tools?=	full
 
-.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 3e61a407f93..78e15cca385 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/07/11 10:05:23 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2011/07/11 18:43:03 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -27,6 +27,10 @@ CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-poppler-glib
 # Enable build and install of the tools
 CONFIGURE_ARGS+=	--enable-utils	# the default
+
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
+.include "../../print/poppler/buildlink3.mk"
+
 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
 CONFIGURE_ARGS+=	--enable-cms
 .else
@@ -35,9 +39,6 @@ CONFIGURE_ARGS+=	--disable-cms
 
 BUILD_DIRS=		utils # implies INSTALL_DIRS too
 
-BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
-.include "../../print/poppler/buildlink3.mk"
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)