diff options
author | jmmv <jmmv@pkgsrc.org> | 2006-03-31 20:37:37 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2006-03-31 20:37:37 +0000 |
commit | bcd8d838ca6f0ed309d1b02aa34168ba9a93540f (patch) | |
tree | 5f477d1110968677b67189b6a5cedeed96abfe7a | |
parent | 73f8ffcf8399c578a0d3b28a2d2ae8a35afa0ff9 (diff) | |
download | pkgsrc-bcd8d838ca6f0ed309d1b02aa34168ba9a93540f.tar.gz |
Create the include/poppler directory from the base poppler package so that
poppler-qt can install its headers properly. Found by tron@.
This also helps in removing this shared directory (used in poppler-qt and
poppler-glib) from a single place.
Bump PKGREVISION of the three packages to 1.
-rw-r--r-- | print/poppler-glib/Makefile | 6 | ||||
-rw-r--r-- | print/poppler-qt/Makefile | 6 | ||||
-rw-r--r-- | print/poppler/Makefile | 5 | ||||
-rw-r--r-- | print/poppler/PLIST | 4 |
4 files changed, 15 insertions, 6 deletions
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile index b1056d7f4be..9a68e5d5da2 100644 --- a/print/poppler-glib/Makefile +++ b/print/poppler-glib/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2006/03/30 21:30:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2006/03/31 20:37:37 jmmv Exp $ # .include "../../print/poppler/Makefile.common" PKGNAME= poppler-glib-${POPPLER_VERS} +PKGREVISION= 1 + COMMENT= PDF rendering library (GLib wrapper) CONFLICTS+= poppler<0.4.5nb1 @@ -34,7 +36,7 @@ post-install: .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -BUILDLINK_DEPENDS.poppler+= poppler>=${POPPLER_VERS} +BUILDLINK_DEPENDS.poppler+= poppler>=${POPPLER_VERS}nb1 .include "../../print/poppler/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile index 9bab3973612..e1bcd03a83b 100644 --- a/print/poppler-qt/Makefile +++ b/print/poppler-qt/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2006/03/30 21:30:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2006/03/31 20:37:37 jmmv Exp $ # .include "../../print/poppler/Makefile.common" PKGNAME= poppler-qt-${POPPLER_VERS} +PKGREVISION= 1 + COMMENT= PDF rendering library (QT wrapper) PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt.pc.in @@ -27,7 +29,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${PREFIX}/include/poppler ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig -BUILDLINK_DEPENDS.poppler+= poppler>=${POPPLER_VERS} +BUILDLINK_DEPENDS.poppler+= poppler>=${POPPLER_VERS}nb1 .include "../../print/poppler/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 2a02efa8a95..5acfc253de3 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2006/03/30 21:30:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/31 20:37:37 jmmv Exp $ # .include "../../print/poppler/Makefile.common" +PKGREVISION= 1 + COMMENT= PDF rendering library USE_TOOLS+= gmake @@ -35,6 +37,7 @@ CONFIGURE_ARGS+= --enable-a4-paper .endif post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/include/poppler ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/poppler/ ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${PREFIX}/share/doc/poppler/ diff --git a/print/poppler/PLIST b/print/poppler/PLIST index e902136c968..a567a2379ec 100644 --- a/print/poppler/PLIST +++ b/print/poppler/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/03/30 21:30:25 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/03/31 20:37:37 jmmv Exp $ bin/pdffonts bin/pdfimages bin/pdfinfo @@ -19,3 +19,5 @@ man/man1/pdftotext.1 share/doc/poppler/README share/doc/poppler/README-XPDF @dirrm share/doc/poppler +@exec ${MKDIR} %D/include/poppler +@dirrm include/poppler |