diff options
| author | drochner <drochner@pkgsrc.org> | 2011-07-11 18:43:03 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-07-11 18:43:03 +0000 |
| commit | ec929dc8793585c126d008ab34fd81db727d02b3 (patch) | |
| tree | af34e46bfad5f0a0148a6d6d36a98d366cffde6d /print/poppler-glib | |
| parent | b36f6b0e69f1ad0fff55bdaa45f04a7722d123fd (diff) | |
| download | pkgsrc-ec929dc8793585c126d008ab34fd81db727d02b3.tar.gz | |
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
Diffstat (limited to 'print/poppler-glib')
| -rw-r--r-- | print/poppler-glib/Makefile | 10 |
1 files changed, 6 insertions, 4 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" |