Index: graphics/poppler/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/poppler/Makefile,v retrieving revision 1.58 diff -a -u -r1.58 Makefile --- graphics/poppler/Makefile 10 May 2010 21:18:17 -0000 1.58 +++ graphics/poppler/Makefile 25 Oct 2010 12:41:12 -0000 @@ -2,12 +2,12 @@ # Date created: 03 March 2005 # Whom: marcus@FreeBSD.org # -# $FreeBSD: ports/graphics/poppler/Makefile,v 1.58 2010/05/10 21:18:17 kwm Exp $ -# $MCom: ports/graphics/poppler/Makefile,v 1.58 2010/03/14 22:08:42 kwm Exp $ +# $FreeBSD$ +# $MCom: ports/graphics/poppler/Makefile,v 1.65 2010/10/04 21:01:34 kwm Exp $ # PORTNAME= poppler -PORTVERSION= 0.12.4 +PORTVERSION= 0.14.3 PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -20,9 +20,12 @@ lcms.1:${PORTSDIR}/graphics/lcms RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USE_GMAKE= yes USE_GNOME= gnomehack gnometarget libxml2 ltverhack USE_AUTOTOOLS= libtool:22 +MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ @@ -40,7 +43,7 @@ .include .if defined(SLAVEPORT) -LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler +LIB_DEPENDS+= poppler.6:${PORTSDIR}/graphics/poppler .if ${SLAVEPORT}=="gtk" CONFIGURE_ARGS+=--enable-poppler-glib @@ -110,11 +113,13 @@ .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}|; \ s|/usr/local/qt/lib|${LOCALBASE}/lib|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${WRKSRC}/configure .endif .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4" @${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \ Index: graphics/poppler/distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/poppler/distinfo,v retrieving revision 1.30 diff -a -u -r1.30 distinfo --- graphics/poppler/distinfo 10 May 2010 21:18:17 -0000 1.30 +++ graphics/poppler/distinfo 25 Oct 2010 12:41:12 -0000 @@ -1,3 +1,3 @@ -MD5 (poppler-0.12.4.tar.gz) = 4155346f9369b192569ce9184ff73e43 -SHA256 (poppler-0.12.4.tar.gz) = 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a -SIZE (poppler-0.12.4.tar.gz) = 1674400 +MD5 (poppler-0.14.3.tar.gz) = 1024c608a8a7c1d6ec301bddf11f3af9 +SHA256 (poppler-0.14.3.tar.gz) = ca807bab3e88eebc25b56f02d7d04a482ba9d220fbaf172d3e48845939fae8c3 +SIZE (poppler-0.14.3.tar.gz) = 1791880 Index: graphics/poppler/pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/poppler/pkg-plist,v retrieving revision 1.14 diff -a -u -r1.14 pkg-plist --- graphics/poppler/pkg-plist 28 Nov 2009 20:05:44 -0000 1.14 +++ graphics/poppler/pkg-plist 25 Oct 2010 12:41:12 -0000 @@ -3,6 +3,7 @@ include/poppler/BuiltinFont.h include/poppler/BuiltinFontTables.h include/poppler/CMap.h +include/poppler/CachedFile.h include/poppler/Catalog.h include/poppler/CharCodeToUnicode.h include/poppler/CharTypes.h @@ -26,6 +27,7 @@ include/poppler/JBIG2Stream.h include/poppler/Lexer.h include/poppler/Link.h +include/poppler/LocalPDFDocBuilder.h include/poppler/Movie.h include/poppler/NameToCharCode.h include/poppler/NameToUnicodeTable.h @@ -34,7 +36,9 @@ include/poppler/Outline.h include/poppler/OutputDev.h include/poppler/PDFDoc.h +include/poppler/PDFDocBuilder.h include/poppler/PDFDocEncoding.h +include/poppler/PDFDocFactory.h include/poppler/PSOutputDev.h include/poppler/PSTokenizer.h include/poppler/Page.h @@ -43,9 +47,12 @@ include/poppler/PopplerCache.h include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h +include/poppler/Rendition.h include/poppler/SecurityHandler.h include/poppler/Sound.h include/poppler/SplashOutputDev.h +include/poppler/StdinCachedFile.h +include/poppler/StdinPDFDocBuilder.h include/poppler/Stream-CCITT.h include/poppler/Stream.h include/poppler/TextOutputDev.h @@ -58,6 +65,15 @@ include/poppler/UnicodeTypeTable.h include/poppler/XRef.h include/poppler/XpdfPluginAPI.h +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-page-transition.h +include/poppler/cpp/poppler-page.h +include/poppler/cpp/poppler-rectangle.h +include/poppler/cpp/poppler-toc.h +include/poppler/cpp/poppler-version.h include/poppler/fofi/FoFiBase.h include/poppler/fofi/FoFiEncodings.h include/poppler/fofi/FoFiTrueType.h @@ -70,6 +86,8 @@ 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 include/poppler/goo/gfile.h include/poppler/goo/gmem.h @@ -99,14 +117,20 @@ include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h +lib/libpoppler-cpp.a +lib/libpoppler-cpp.la +lib/libpoppler-cpp.so +lib/libpoppler-cpp.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.5 +lib/libpoppler.so.6 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc +libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc @dirrm include/poppler/splash @dirrm include/poppler/goo @dirrm include/poppler/fofi +@dirrm include/poppler/cpp @dirrm include/poppler Index: graphics/poppler/files/patch-glib_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/poppler/files/patch-glib_Makefile.in,v retrieving revision 1.5 diff -a -u -r1.5 patch-glib_Makefile.in --- graphics/poppler/files/patch-glib_Makefile.in 30 Jun 2008 20:16:19 -0000 1.5 +++ graphics/poppler/files/patch-glib_Makefile.in 25 Oct 2010 12:41:12 -0000 @@ -1,40 +1,42 @@ ---- glib/Makefile.in.orig 2008-03-24 09:03:54.000000000 -0400 -+++ glib/Makefile.in 2008-03-24 09:04:38.000000000 -0400 -@@ -66,7 +66,6 @@ - @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) +--- glib/Makefile.in.orig 2010-08-14 16:50:48.000000000 +0200 ++++ glib/Makefile.in 2010-08-14 16:50:48.000000000 +0200 +@@ -82,7 +82,6 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ +- $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-cairo.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) - am__objects_1 = poppler-enums.lo -@@ -80,7 +79,6 @@ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@@ -105,8 +104,7 @@ @BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT) test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \ -@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ - @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ +-@BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ ++@BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ -@@ -295,7 +293,7 @@ - @BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(CAIRO_LIBS) - + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler +@@ -386,7 +384,7 @@ + top_srcdir = @top_srcdir@ + win32_libs = @win32_libs@ + AM_LDFLAGS = @auto_import_flags@ -SUBDIRS = . reference demo +SUBDIRS = . reference INCLUDES = \ -DG_LOG_DOMAIN=\"Poppler\" \ -I$(top_srcdir) \ -@@ -336,7 +334,7 @@ +@@ -439,7 +437,7 @@ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-cairo.la \ $(POPPLER_GLIB_LIBS) \ $(GDK_LIBS) \ - $(FREETYPE_LIBS) \ -@@ -348,7 +346,7 @@ +@@ -451,7 +449,7 @@ @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \ Index: graphics/poppler/files/patch-qt4_src_Makefile.in =================================================================== RCS file: /home/pcvs/ports/graphics/poppler/files/patch-qt4_src_Makefile.in,v retrieving revision 1.4 diff -a -u -r1.4 patch-qt4_src_Makefile.in --- graphics/poppler/files/patch-qt4_src_Makefile.in 2 Jul 2008 19:59:23 -0000 1.4 +++ graphics/poppler/files/patch-qt4_src_Makefile.in 25 Oct 2010 12:41:12 -0000 @@ -1,19 +1,19 @@ ---- qt4/src/Makefile.in.orig 2008-07-02 14:06:32.000000000 -0500 -+++ qt4/src/Makefile.in 2008-07-02 14:07:35.000000000 -0500 -@@ -62,7 +62,6 @@ +--- qt4/src/Makefile.in.orig 2010-07-07 14:22:29.000000000 +0200 ++++ qt4/src/Makefile.in 2010-07-07 14:23:40.000000000 +0200 +@@ -79,7 +79,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__append_1) +- $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-arthur.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ - poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ -@@ -303,7 +302,7 @@ - poppler-export.h \ - poppler-private.h +@@ -384,7 +383,7 @@ + poppler-page-transition-private.h --libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \ -+libpoppler_qt4_la_LIBADD = -lpoppler \ - $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1) - libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0 - all: all-am + libpoppler_qt4_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(top_builddir)/poppler/libpoppler-arthur.la \ + $(FONTCONFIG_LIBS) \ + $(POPPLER_QT4_LIBS) Index: graphics/poppler-gtk/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/poppler-gtk/Makefile,v retrieving revision 1.14 diff -a -u -r1.14 Makefile --- graphics/poppler-gtk/Makefile 31 May 2010 22:52:32 -0000 1.14 +++ graphics/poppler-gtk/Makefile 25 Oct 2010 12:41:12 -0000 @@ -2,11 +2,11 @@ # Date created: 2006-01-12 # Whom: Michael Johnson # -# $FreeBSD: ports/graphics/poppler-gtk/Makefile,v 1.14 2010/05/31 22:52:32 marcus Exp $ -# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.18 2010/03/14 22:08:42 kwm Exp $ +# $FreeBSD$ +# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.20 2010/07/07 13:03:19 kwm Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -gtk MAINTAINER= gnome@FreeBSD.org Index: graphics/poppler-gtk/pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/poppler-gtk/pkg-plist,v retrieving revision 1.7 diff -a -u -r1.7 pkg-plist --- graphics/poppler-gtk/pkg-plist 28 Nov 2009 20:05:45 -0000 1.7 +++ graphics/poppler-gtk/pkg-plist 25 Oct 2010 12:41:12 -0000 @@ -7,12 +7,14 @@ include/poppler/glib/poppler-features.h include/poppler/glib/poppler-form-field.h include/poppler/glib/poppler-layer.h +include/poppler/glib/poppler-media.h +include/poppler/glib/poppler-movie.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler.h lib/libpoppler-glib.a lib/libpoppler-glib.la lib/libpoppler-glib.so -lib/libpoppler-glib.so.4 +lib/libpoppler-glib.so.5 libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/ch01.html %%DOCSDIR%%/poppler/home.png @@ -21,7 +23,6 @@ %%DOCSDIR%%/poppler/left.png %%DOCSDIR%%/poppler/poppler-poppler-action.html %%DOCSDIR%%/poppler/poppler-poppler-annot.html -%%DOCSDIR%%/poppler/poppler-poppler-attachment.html %%DOCSDIR%%/poppler/poppler-poppler-document.html %%DOCSDIR%%/poppler/poppler-poppler-enums.html %%DOCSDIR%%/poppler/poppler-poppler-features.html Index: graphics/poppler-qt/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/poppler-qt/Makefile,v retrieving revision 1.13 diff -a -u -r1.13 Makefile --- graphics/poppler-qt/Makefile 10 May 2010 21:18:18 -0000 1.13 +++ graphics/poppler-qt/Makefile 25 Oct 2010 12:41:12 -0000 @@ -2,8 +2,8 @@ # Date created: 2006-01-12 # Whom: Michael Johnson # -# $FreeBSD: ports/graphics/poppler-qt/Makefile,v 1.13 2010/05/10 21:18:18 kwm Exp $ -# $MCom: ports/graphics/poppler-qt/Makefile,v 1.11 2010/03/14 22:08:43 kwm Exp $ +# $FreeBSD$ +# $MCom: ports/graphics/poppler-qt/Makefile,v 1.13 2010/07/07 13:03:19 kwm Exp $ # PORTREVISION= 0 Index: graphics/poppler-qt4/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/poppler-qt4/Makefile,v retrieving revision 1.16 diff -a -u -r1.16 Makefile --- graphics/poppler-qt4/Makefile 10 May 2010 21:18:18 -0000 1.16 +++ graphics/poppler-qt4/Makefile 25 Oct 2010 12:41:12 -0000 @@ -2,8 +2,8 @@ # Date created: June 26, 2007 # Whom: Michael Johnson # -# $FreeBSD: ports/graphics/poppler-qt4/Makefile,v 1.16 2010/05/10 21:18:18 kwm Exp $ -# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.13 2010/03/14 22:08:43 kwm Exp $ +# $FreeBSD$ +# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $ # PORTREVISION= 0 Index: graphics/poppler-qt4/pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/poppler-qt4/pkg-plist,v retrieving revision 1.5 diff -a -u -r1.5 pkg-plist --- graphics/poppler-qt4/pkg-plist 10 Apr 2009 05:56:00 -0000 1.5 +++ graphics/poppler-qt4/pkg-plist 25 Oct 2010 12:41:12 -0000 @@ -4,7 +4,6 @@ include/poppler/qt4/poppler-link.h include/poppler/qt4/poppler-optcontent.h include/poppler/qt4/poppler-page-transition.h -include/poppler/qt4/poppler-page-transition-private.h include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.a lib/libpoppler-qt4.la Index: graphics/poppler-utils/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/poppler-utils/Makefile,v retrieving revision 1.10 diff -a -u -r1.10 Makefile --- graphics/poppler-utils/Makefile 28 Mar 2010 06:37:37 -0000 1.10 +++ graphics/poppler-utils/Makefile 25 Oct 2010 12:41:12 -0000 @@ -2,11 +2,11 @@ # Date created: 2006-05-01 # Whom: Michael Nottebrock # -# $FreeBSD: ports/graphics/poppler-utils/Makefile,v 1.10 2010/03/28 06:37:37 dinoex Exp $ -# $MCom: ports/graphics/poppler-utils/Makefile,v 1.3 2009/08/27 14:48:12 kwm Exp $ +# $FreeBSD$ +# $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -utils MAINTAINER= gnome@FreeBSD.org