diff options
| -rw-r--r-- | graphics/poppler-gtk/pkg-plist | 28 | ||||
| -rw-r--r-- | graphics/poppler-qt/pkg-plist | 2 | ||||
| -rw-r--r-- | graphics/poppler/Makefile | 14 | ||||
| -rw-r--r-- | graphics/poppler/distinfo | 4 | ||||
| -rw-r--r-- | graphics/poppler/files/patch-utils_Makefile.in | 10 | ||||
| -rw-r--r-- | graphics/poppler/pkg-plist | 8 |
6 files changed, 38 insertions, 28 deletions
diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist index 239a7305dc28..5e4d115c12f2 100644 --- a/graphics/poppler-gtk/pkg-plist +++ b/graphics/poppler-gtk/pkg-plist @@ -11,30 +11,40 @@ include/poppler/glib/poppler-media.h include/poppler/glib/poppler-movie.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler.h +lib/girepository-1.0/Poppler-0.16.typelib lib/libpoppler-glib.a lib/libpoppler-glib.la lib/libpoppler-glib.so -lib/libpoppler-glib.so.5 +lib/libpoppler-glib.so.6 libdata/pkgconfig/poppler-glib.pc +%%DOCSDIR%%/poppler/PopplerAnnot.html +%%DOCSDIR%%/poppler/PopplerAttachment.html +%%DOCSDIR%%/poppler/PopplerDocument.html +%%DOCSDIR%%/poppler/PopplerFormField.html +%%DOCSDIR%%/poppler/PopplerLayer.html +%%DOCSDIR%%/poppler/PopplerMedia.html +%%DOCSDIR%%/poppler/PopplerMovie.html +%%DOCSDIR%%/poppler/PopplerPage.html +%%DOCSDIR%%/poppler/annotation-glossary.html +%%DOCSDIR%%/poppler/api-index-0-12.html +%%DOCSDIR%%/poppler/api-index-0-14.html +%%DOCSDIR%%/poppler/api-index-0-16.html +%%DOCSDIR%%/poppler/api-index-deprecated.html +%%DOCSDIR%%/poppler/api-index-full.html %%DOCSDIR%%/poppler/ch01.html %%DOCSDIR%%/poppler/home.png %%DOCSDIR%%/poppler/index.html %%DOCSDIR%%/poppler/index.sgml %%DOCSDIR%%/poppler/left.png -%%DOCSDIR%%/poppler/poppler-poppler-action.html -%%DOCSDIR%%/poppler/poppler-poppler-annot.html -%%DOCSDIR%%/poppler/poppler-poppler-document.html -%%DOCSDIR%%/poppler/poppler-poppler-enums.html -%%DOCSDIR%%/poppler/poppler-poppler-features.html -%%DOCSDIR%%/poppler/poppler-poppler-form-field.html -%%DOCSDIR%%/poppler/poppler-poppler-layer.html -%%DOCSDIR%%/poppler/poppler-poppler-page.html +%%DOCSDIR%%/poppler/poppler-PopplerAction.html +%%DOCSDIR%%/poppler/poppler-Version-and-Features-Information.html %%DOCSDIR%%/poppler/poppler-poppler.html %%DOCSDIR%%/poppler/poppler.devhelp %%DOCSDIR%%/poppler/poppler.devhelp2 %%DOCSDIR%%/poppler/right.png %%DOCSDIR%%/poppler/style.css %%DOCSDIR%%/poppler/up.png +share/gir-1.0/Poppler-0.16.gir @dirrmtry %%DOCSDIR%%/poppler @dirrmtry %%DOCSDIR%% @dirrm include/poppler/glib diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist index 77f6db2e22e8..945777bec848 100644 --- a/graphics/poppler-qt/pkg-plist +++ b/graphics/poppler-qt/pkg-plist @@ -4,6 +4,6 @@ include/poppler/qt3/poppler-qt.h lib/libpoppler-qt.a lib/libpoppler-qt.la lib/libpoppler-qt.so -lib/libpoppler-qt.so.2 +lib/libpoppler-qt.so.3 libdata/pkgconfig/poppler-qt.pc @dirrm include/poppler/qt3 diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 2ae633c0fbf6..f4b72e4e420c 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,11 +3,11 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.66 2010/11/17 15:03:00 kwm Exp $ +# $MCom: ports/graphics/poppler/Makefile,v 1.74 2011/08/05 14:05:23 kwm Exp $ # PORTNAME= poppler -PORTVERSION= 0.14.5 +PORTVERSION= 0.16.7 PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -40,10 +40,10 @@ OPTIONS= CAIRO "Enable cairo output backend" on \ OPENJPEG "Enable JPEG 2000 support" on .endif -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(SLAVEPORT) -LIB_DEPENDS+= poppler.6:${PORTSDIR}/graphics/poppler +LIB_DEPENDS+= poppler.13:${PORTSDIR}/graphics/poppler .if ${SLAVEPORT}=="gtk" CONFIGURE_ARGS+=--enable-poppler-glib @@ -61,7 +61,6 @@ CONFIGURE_ARGS+=--enable-poppler-qt USE_QT_VER+= 3 BUILD_WRKSRC= ${WRKSRC}/qt INSTALL_WRKSRC= ${WRKSRC}/qt -.include "${PORTSDIR}/Mk/bsd.kde.mk" .else CONFIGURE_ARGS+=--disable-poppler-qt .endif @@ -75,7 +74,6 @@ QT_COMPONENTS= gui corelib xml qtestlib moc_build # can read more PDF files than without, tested with demos's poppler_qt4viewer. #BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 -.include "${PORTSDIR}/Mk/bsd.qt.mk" .else CONFIGURE_ARGS+=--disable-poppler-qt4 .endif @@ -113,8 +111,6 @@ LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg .endif post-patch: - @${REINPLACE_CMD} -e 's|7:0:0|6:0:0|' ${WRKSRC}/poppler/Makefile.in - .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt" @${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \ s|$$QTDIR|${QT_PREFIX}|; \ @@ -137,4 +133,4 @@ post-install: .endif .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index d34cf4192e34..24b6b668852b 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -SHA256 (poppler-0.14.5.tar.gz) = c805317c4c1a7080098ae8c7c2a1c1b8e2c784858fc2e04941878eeb8164814c -SIZE (poppler-0.14.5.tar.gz) = 1798194 +SHA256 (poppler-0.16.7.tar.gz) = fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd +SIZE (poppler-0.16.7.tar.gz) = 1952179 diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in index 4a621ba6eec3..94606516664d 100644 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ b/graphics/poppler/files/patch-utils_Makefile.in @@ -1,5 +1,5 @@ ---- utils/Makefile.in.orig 2009-10-22 20:33:17.000000000 +0200 -+++ utils/Makefile.in 2009-10-22 20:33:49.000000000 +0200 +--- utils/Makefile.in.orig 2011-01-05 13:06:04.000000000 +0100 ++++ utils/Makefile.in 2011-01-05 13:06:26.000000000 +0100 @@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) @@ -23,7 +23,7 @@ -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ +pdfinfo_DEPENDENCIES = \ $(am__DEPENDENCIES_1) - am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h + am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \ @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__objects_1) pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS) @@ -39,7 +39,7 @@ -pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ +pdftohtml_DEPENDENCIES = \ $(am__DEPENDENCIES_1) - am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h + am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ @BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) @@ -62,7 +62,7 @@ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -382,7 +382,7 @@ INCLUDES = \ +@@ -405,7 +405,7 @@ INCLUDES = \ $(ABIWORD_CFLAGS) LDADD = \ diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 92af8cb0eaf5..9ce414c391e6 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -23,9 +23,11 @@ include/poppler/GfxFont.h include/poppler/GfxState.h include/poppler/GfxState_helpers.h include/poppler/GlobalParams.h +include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h include/poppler/Lexer.h +include/poppler/Linearization.h include/poppler/Link.h include/poppler/LocalPDFDocBuilder.h include/poppler/Movie.h @@ -69,6 +71,8 @@ include/poppler/cpp/poppler-document.h include/poppler/cpp/poppler-embedded-file.h include/poppler/cpp/poppler-font.h include/poppler/cpp/poppler-global.h +include/poppler/cpp/poppler-image.h +include/poppler/cpp/poppler-page-renderer.h include/poppler/cpp/poppler-page-transition.h include/poppler/cpp/poppler-page.h include/poppler/cpp/poppler-rectangle.h @@ -81,11 +85,11 @@ include/poppler/fofi/FoFiType1.h include/poppler/fofi/FoFiType1C.h include/poppler/goo/FixedPoint.h include/poppler/goo/GooHash.h +include/poppler/goo/GooLikely.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h -include/poppler/goo/GooVector.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h include/poppler/goo/PNGWriter.h @@ -124,7 +128,7 @@ lib/libpoppler-cpp.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.6 +lib/libpoppler.so.13 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc |