update to 0.14.1

this is a new major branch, many fixes and improvements

16 files changed, 65 insertions, 61 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index f769e550743..4c0501d8b68 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/07/14 17:04:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (GLib wrapper)
 MAINTAINER=		reed@reedmedia.net
@@ -26,6 +25,7 @@ CONFIGURE_ARGS+=	--disable-poppler-qt
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
 CONFIGURE_ARGS+=	--disable-cms
+CONFIGURE_ARGS+=	--disable-poppler-cpp
 
 BUILD_DIRS=		goo fofi poppler glib
 INSTALL_DIRS=		glib
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 128371937d4..22cd204d5f9 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/09/09 19:57:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/07/14 17:04:23 drochner Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -8,6 +8,8 @@ include/poppler/glib/poppler-enums.h
 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.la
@@ -20,7 +22,6 @@ share/gtk-doc/html/poppler/index.sgml
 share/gtk-doc/html/poppler/left.png
 share/gtk-doc/html/poppler/poppler-poppler-action.html
 share/gtk-doc/html/poppler/poppler-poppler-annot.html
-share/gtk-doc/html/poppler/poppler-poppler-attachment.html
 share/gtk-doc/html/poppler/poppler-poppler-document.html
 share/gtk-doc/html/poppler/poppler-poppler-enums.html
 share/gtk-doc/html/poppler/poppler-poppler-features.html
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index 6321ceb18e4..294a8201376 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:45:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/07/14 17:04:23 drochner Exp $
 
 BUILDLINK_TREE+=	poppler-glib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-glib
 POPPLER_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler-glib+=	poppler-glib>=0.12.4nb1
+BUILDLINK_ABI_DEPENDS.poppler-glib+=	poppler-glib>=0.14.1
 BUILDLINK_PKGSRCDIR.poppler-glib?=	../../print/poppler-glib
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/print/poppler-includes/Makefile b/print/poppler-includes/Makefile
index 2e6fd3cd144..ad608e74404 100644
--- a/print/poppler-includes/Makefile
+++ b/print/poppler-includes/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/14 17:04:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-includes-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		Poppler Xpdf includes (unsupported)
 MAINTAINER=		dillo@NetBSD.org
diff --git a/print/poppler-includes/PLIST b/print/poppler-includes/PLIST
index 36d7c4ab1e6..f4ec9dcbd39 100644
--- a/print/poppler-includes/PLIST
+++ b/print/poppler-includes/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2009/09/09 19:57:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/07/14 17:04:23 drochner Exp $
 include/poppler/Annot.h
 include/poppler/Array.h
 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
@@ -27,6 +28,7 @@ include/poppler/JArithmeticDecoder.h
 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
@@ -35,7 +37,9 @@ include/poppler/OptionalContent.h
 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
@@ -44,9 +48,12 @@ include/poppler/Parser.h
 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
@@ -66,12 +73,13 @@ 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
 include/poppler/goo/gfile.h
 include/poppler/goo/gmem.h
 include/poppler/goo/gstrtod.h
 include/poppler/goo/gtypes.h
-include/poppler/poppler-config.h
 include/poppler/splash/Splash.h
 include/poppler/splash/SplashBitmap.h
 include/poppler/splash/SplashClip.h
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 5cdf23caace..da3c0fbb7ab 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/07/14 17:04:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (QT wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile
index af691e8e623..acdd583eb76 100644
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/07/14 17:04:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt4-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (QT4 wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-qt4/PLIST b/print/poppler-qt4/PLIST
index d09b374b81f..5985fb54e90 100644
--- a/print/poppler-qt4/PLIST
+++ b/print/poppler-qt4/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:11:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/07/14 17:04:23 drochner Exp $
 include/poppler/qt4/poppler-annotation.h
 include/poppler/qt4/poppler-export.h
 include/poppler/qt4/poppler-form.h
 include/poppler/qt4/poppler-link.h
 include/poppler/qt4/poppler-optcontent.h
-include/poppler/qt4/poppler-page-transition-private.h
 include/poppler/qt4/poppler-page-transition.h
 include/poppler/qt4/poppler-qt4.h
 lib/libpoppler-qt4.la
diff --git a/print/poppler-qt4/buildlink3.mk b/print/poppler-qt4/buildlink3.mk
index 8de86b165f2..5cb60d61895 100644
--- a/print/poppler-qt4/buildlink3.mk
+++ b/print/poppler-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/07/14 17:04:23 drochner Exp $
 
 BUILDLINK_TREE+=	poppler-qt4
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-qt4
 POPPLER_QT4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-qt4+=	poppler-qt4>=0.6.1
-BUILDLINK_ABI_DEPENDS.poppler-qt4?=	poppler-qt4>=0.12.3nb1
+BUILDLINK_ABI_DEPENDS.poppler-qt4?=	poppler-qt4>=0.14.1
 BUILDLINK_PKGSRCDIR.poppler-qt4?=	../../print/poppler-qt4
 
 .include "../../print/poppler/buildlink3.mk"
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 621664877c1..fd41c0f921f 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/07/14 17:04:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-utils-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF utilities (from poppler)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 98f8f3e302f..86284563a91 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/07/14 17:04:22 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library
 MAINTAINER=		reed@reedmedia.net
@@ -30,6 +29,7 @@ CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-poppler-glib
 # Don't build and install the tools
 CONFIGURE_ARGS+=	--disable-utils
+CONFIGURE_ARGS+=	--disable-poppler-cpp
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.poppler
 PKG_SUPPORTED_OPTIONS=	poppler-cms
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 9f44df8d844..d44d842af75 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2010/02/23 20:11:58 drochner Exp $
+# $NetBSD: Makefile.common,v 1.36 2010/07/14 17:04:22 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.12.4
+POPPLER_VERS=		0.14.1
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 4a2d08562e6..7b837eac817 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/07/14 17:04:22 drochner Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler
 POPPLER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.12.3nb1
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.14.1
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
 pkgbase := poppler
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 832fb6d718c..4a301e19d0a 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.54 2010/02/23 20:11:58 drochner Exp $
+$NetBSD: distinfo,v 1.55 2010/07/14 17:04:22 drochner Exp $
 
-SHA1 (poppler-0.12.4.tar.gz) = 306507e0fbf47736b456218618f043a216c263ef
-RMD160 (poppler-0.12.4.tar.gz) = 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b
-Size (poppler-0.12.4.tar.gz) = 1674400 bytes
-SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
+SHA1 (poppler-0.14.1.tar.gz) = 28229f897451feba5682d74defe7d67361eeee11
+RMD160 (poppler-0.14.1.tar.gz) = 7b8d084b05ccc374e9add9771b781a88948907a7
+Size (poppler-0.14.1.tar.gz) = 1782771 bytes
+SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
 SHA1 (patch-ab) = 441308aec73c66a34c00ee1fad30a38748c89a7d
 SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
-SHA1 (patch-ag) = 58d01b019daec19de80867ce0941e5160591bf62
+SHA1 (patch-ag) = 7ef9ccdb1a6719510c6941864b8c7db3cc0255f1
 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-ap) = fc985510d4ebabe097e55bc4cbb0477267e95a7d
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index 133b3232899..5ac69892790 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.9 2008/04/15 19:57:00 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2010/07/14 17:04:23 drochner Exp $
 
---- glib/Makefile.in.orig	2008-03-26 19:40:19.000000000 +0100
+--- glib/Makefile.in.orig	2010-07-08 18:57:56.000000000 +0000
 +++ glib/Makefile.in
-@@ -62,7 +62,7 @@ am__DEPENDENCIES_1 =
- @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
+@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/poppler/libpoppler.la \
++	$(prefix)/lib/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
-@@ -79,7 +79,7 @@ am__test_poppler_glib_SOURCES_DIST = tes
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -105,7 +105,7 @@ am__test_poppler_glib_SOURCES_DIST = tes
  @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 =  \
@@ -19,17 +19,17 @@ $NetBSD: patch-aa,v 1.9 2008/04/15 19:57:00 drochner Exp $
 +@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/libpoppler.la \
  @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
  @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
-@@ -318,7 +318,7 @@ libpoppler_glib_la_SOURCES = \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1)
+@@ -438,7 +438,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
 +	$(prefix)/lib/libpoppler.la		\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
  	$(GDK_LIBS)					\
- 	$(FREETYPE_LIBS)				\
-@@ -330,7 +330,7 @@ libpoppler_glib_la_LDFLAGS = -version-in
+@@ -450,7 +450,7 @@ libpoppler_glib_la_LDFLAGS = -version-in
  @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
  
  @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag
index 0053ef4fd6c..d0c4d51d0c5 100644
--- a/print/poppler/patches/patch-ag
+++ b/print/poppler/patches/patch-ag
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.6 2009/10/21 10:18:57 drochner Exp $
+$NetBSD: patch-ag,v 1.7 2010/07/14 17:04:23 drochner Exp $
 
---- qt4/src/Makefile.in.orig	2009-10-18 01:28:48.000000000 +0200
+--- qt4/src/Makefile.in.orig	2010-07-08 18:57:57.000000000 +0000
 +++ qt4/src/Makefile.in
-@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_qt4_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__append_1)
+-	$(top_builddir)/poppler/libpoppler.la \
++	$(prefix)/lib/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 \
-@@ -373,7 +373,7 @@ libpoppler_qt4_la_SOURCES = \
- 	poppler-export.h			\
- 	poppler-private.h
+@@ -384,7 +384,7 @@ libpoppler_qt4_la_SOURCES = \
+ 	poppler-page-transition-private.h
  
--libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
-+libpoppler_qt4_la_LIBADD = $(prefix)/lib/libpoppler.la \
- 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
- libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2 @create_shared_lib@
- all: all-am
+ libpoppler_qt4_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	$(prefix)/lib/libpoppler.la	\
+ 	$(top_builddir)/poppler/libpoppler-arthur.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)