diff options
author | reed <reed> | 2006-03-09 01:19:16 +0000 |
---|---|---|
committer | reed <reed> | 2006-03-09 01:19:16 +0000 |
commit | adbe9659eedd1e5d837fb514382cb071ded2ef58 (patch) | |
tree | ce0b0af796d943bf0a609f5fd695c96b3ca2bfe6 /print/poppler | |
parent | 0090c6749fc2c7cad87e41ccefffb1f7687b9e6c (diff) | |
download | pkgsrc-adbe9659eedd1e5d837fb514382cb071ded2ef58.tar.gz |
Remove the support for installing the "glib" wrapper files.
A new package, print/poppler-glib, now provides this.
And this means X11 (and GTK2) is no longer needed for libpoppler.
Bump PKGREVISION.
In buildlink3.mk file, remove the BUILDLINK_RECOMMENDED.poppler
and increase the BUILDLINK_DEPENDS.poppler to this latest version
so packages don't accidently attempt to depend on old poppler
and poppler-glib at same time.
Also include the fontconfig buildlink3.mk at joerg's request.
Diffstat (limited to 'print/poppler')
-rw-r--r-- | print/poppler/Makefile | 11 | ||||
-rw-r--r-- | print/poppler/PLIST | 10 | ||||
-rw-r--r-- | print/poppler/buildlink3.mk | 7 |
3 files changed, 10 insertions, 18 deletions
diff --git a/print/poppler/Makefile b/print/poppler/Makefile index bacae277914..cb46e9bba9f 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,15 +1,16 @@ -# $NetBSD: Makefile,v 1.11 2006/02/15 18:08:35 drochner Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/09 01:19:16 reed Exp $ # .include "../../print/poppler/Makefile.common" +PKGREVISION= 1 + COMMENT= PDF rendering library USE_TOOLS+= gmake LIBTOOL_OVERRIDE= ${WRKSRC}/libtool #PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in -PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-glib.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in GNU_CONFIGURE= yes @@ -26,8 +27,8 @@ CONFIGURE_ARGS+= --disable-cairo-output CONFIGURE_ARGS+= --disable-poppler-qt # Don't compile GTK+ test program. CONFIGURE_ARGS+= --disable-gtk-test -# maybe glib wrapper is only part needing gtk?? -# --disable-poppler-glib Don't compile poppler glib wrapper. +# Don't compile GLib wrapper which also needs gtk2 +CONFIGURE_ARGS+= --disable-poppler-glib .include "../../mk/bsd.prefs.mk" @@ -39,9 +40,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/poppler/ ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${PREFIX}/share/doc/poppler/ -.include "../../devel/glib2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/poppler/PLIST b/print/poppler/PLIST index e61bf524779..8cb69c076ef 100644 --- a/print/poppler/PLIST +++ b/print/poppler/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/08 20:31:34 reed Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/03/09 01:19:16 reed Exp $ include/poppler/Annot.h include/poppler/Array.h include/poppler/BaseFile.h @@ -46,11 +46,6 @@ include/poppler/UnicodeMap.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/XRef.h -include/poppler/glib/poppler-action.h -include/poppler/glib/poppler-document.h -include/poppler/glib/poppler-enums.h -include/poppler/glib/poppler-page.h -include/poppler/glib/poppler.h include/poppler/goo/GooHash.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h @@ -83,9 +78,7 @@ include/poppler/splash/SplashT1FontFile.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h -lib/libpoppler-glib.la lib/libpoppler.la -lib/pkgconfig/poppler-glib.pc lib/pkgconfig/poppler-splash.pc lib/pkgconfig/poppler.pc share/doc/poppler/README @@ -93,5 +86,4 @@ share/doc/poppler/README-XPDF @dirrm share/doc/poppler @dirrm include/poppler/splash @dirrm include/poppler/goo -@dirrm include/poppler/glib @dirrm include/poppler diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 5ccd7517b85..b235e06edcd 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/03/09 01:19:16 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ POPPLER_BUILDLINK3_MK:= ${POPPLER_BUILDLINK3_MK}+ @@ -11,9 +11,10 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler} BUILDLINK_PACKAGES+= poppler .if !empty(POPPLER_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.poppler+= poppler>=0.4.1 -BUILDLINK_RECOMMENDED.poppler+= poppler>=0.4.4nb2 +BUILDLINK_DEPENDS.poppler+= poppler>=0.4.5nb1 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler .endif # POPPLER_BUILDLINK3_MK +.include "../../fonts/fontconfig/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |