update to 0.20.1

This switches to the 0.20 release branch - many fixes and improvements.
(0.18 was skipped)
The qt3 frontend isn't supported anymore - the poppler016 pkg is kept
for now for KDE3. Atm, it conflicts with newer popper pkgs. This can be
fixed by renaming include paths and libraries, but this would need
modifications of the KDE3 pkgs.

9 files changed, 67 insertions, 105 deletions

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index d6e6d77c24b..454c49e2e19 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2011/11/01 06:02:27 sbd Exp $
+# $NetBSD: Makefile,v 1.56 2012/07/04 20:25:16 drochner Exp $
 #
 
-PKGREVISION=		1
-
 .include "../../print/poppler/Makefile.common"
 
 COMMENT=		PDF rendering library
@@ -23,8 +21,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-splash-output
 # Don't build the cairo graphics backend.
 CONFIGURE_ARGS+=	--disable-cairo-output
-# Don't compile poppler qt wrapper.
-CONFIGURE_ARGS+=	--disable-poppler-qt
 # Don't compile GTK+ test program.
 CONFIGURE_ARGS+=	--disable-gtk-test
 # Don't compile GLib wrapper which also needs gtk2
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index ac2eed442d6..5671ec17a28 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.common,v 1.45 2011/07/11 10:05:22 drochner Exp $
+# $NetBSD: Makefile.common,v 1.46 2012/07/04 20:25:16 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
 # used by print/poppler-includes/Makefile
-# used by print/poppler-qt/Makefile
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.16.7
+POPPLER_VERS=		0.20.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 c30c3f96a36..836b1eab4d0 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2011/11/01 06:02:27 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2012/07/04 20:25:16 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.16.7
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.20.1
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
 pkgbase := poppler
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 82bef3d1d1f..cfb04413d95 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.71 2011/10/20 16:32:57 drochner Exp $
+$NetBSD: distinfo,v 1.72 2012/07/04 20:25:16 drochner Exp $
 
-SHA1 (poppler-0.16.7.tar.gz) = 26c735f863688f62b57d5159863fdad4272be89f
-RMD160 (poppler-0.16.7.tar.gz) = 279330e6feaf97a207f3396eab1af836d3d1f16c
-Size (poppler-0.16.7.tar.gz) = 1952179 bytes
-SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
-SHA1 (patch-ab) = 145cd675a46d56455021660b0a732daf4ec52ec2
+SHA1 (poppler-0.20.1.tar.gz) = a2b09ffe216dbe5f259d71e81327e00edf8c1229
+RMD160 (poppler-0.20.1.tar.gz) = c33e085faba20764500c20a0ecca9b837c07f099
+Size (poppler-0.20.1.tar.gz) = 2141147 bytes
+SHA1 (patch-aa) = c5d4bc5d858aaa2a3eca7ccc3623426d35124bdb
+SHA1 (patch-ab) = a90156aebaed91468457780ee256d9a870f11bf8
 SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
 SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2
-SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
-SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
-SHA1 (patch-ar) = d24b92939deaccde42bbb0be48930b37d0f1a87f
+SHA1 (patch-ar) = 4799e084c83167fcd54832c172c2662c745cdba1
 SHA1 (patch-as) = f0f4f8d9f5a49173a27e2349be4b7536ed77eaae
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index 5ac69892790..ca6425b6c6e 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2010/07/14 17:04:23 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2012/07/04 20:25:16 drochner Exp $
 
---- glib/Makefile.in.orig	2010-07-08 18:57:56.000000000 +0000
+--- glib/Makefile.in.orig	2011-10-26 12:40:03.000000000 +0000
 +++ glib/Makefile.in
-@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -84,7 +84,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
@@ -10,17 +10,8 @@ $NetBSD: patch-aa,v 1.10 2010/07/14 17:04:23 drochner Exp $
 +	$(prefix)/lib/libpoppler.la \
  	$(top_builddir)/poppler/libpoppler-cairo.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(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 =  \
--@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
-+@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)
-@@ -438,7 +438,7 @@ libpoppler_glib_la_SOURCES = \
+ 	$(am__DEPENDENCIES_1)
+@@ -435,7 +435,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -28,13 +19,4 @@ $NetBSD: patch-aa,v 1.10 2010/07/14 17:04:23 drochner Exp $
 +	$(prefix)/lib/libpoppler.la		\
  	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
- 	$(GDK_LIBS)					\
-@@ -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 = \
--@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
-+@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/libpoppler.la	\
- @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
- @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
- @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 39cb129710b..a2fa3f86e45 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,26 +1,33 @@
-$NetBSD: patch-ab,v 1.13 2011/01/31 16:55:29 drochner Exp $
+$NetBSD: patch-ab,v 1.14 2012/07/04 20:25:16 drochner Exp $
 
---- utils/Makefile.in.orig	2011-01-27 19:32:04.000000000 +0000
+--- utils/Makefile.in.orig	2012-06-10 18:45:33.000000000 +0000
 +++ utils/Makefile.in
-@@ -55,7 +55,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -59,7 +59,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
  	$(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
 -@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
 +am__EXEEXT_1 = pdftoppm$(EXEEXT)
- @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
+ @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
-@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+@@ -68,7 +68,7 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
+ pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
+ pdfdetach_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfdetach_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -76,30 +76,30 @@ am__v_lt_0 = --silent
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
 -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  	$(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
+ am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
@@ -34,22 +41,31 @@ $NetBSD: patch-ab,v 1.13 2011/01/31 16:55:29 drochner Exp $
 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  	$(am__DEPENDENCIES_1)
- 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)
+ am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
+ pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
+ pdfseparate_LDADD = $(LDADD)
+-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfseparate_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
+ am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h
+ @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__objects_1)
+ pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
 -am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
 +am__DEPENDENCIES_2 = $(prefix)/lib/libpoppler.la \
  	$(am__DEPENDENCIES_1)
- @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
- @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
-@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
- 	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_1)
+@@ -113,33 +113,33 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+ 	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
 -pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  	$(am__DEPENDENCIES_1)
+ pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
+ 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  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)
@@ -73,9 +89,15 @@ $NetBSD: patch-ab,v 1.13 2011/01/31 16:55:29 drochner Exp $
 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  	$(am__DEPENDENCIES_1)
+ am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
+ pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
+ pdfunite_LDADD = $(LDADD)
+-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfunite_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -389,12 +389,12 @@ top_build_prefix = @top_build_prefix@
+@@ -425,12 +425,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
@@ -93,8 +115,8 @@ $NetBSD: patch-ab,v 1.13 2011/01/31 16:55:29 drochner Exp $
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/goo			\
-@@ -405,9 +405,10 @@ INCLUDES = \
- 	$(ABIWORD_CFLAGS)
+@@ -441,9 +441,10 @@ INCLUDES = \
+ 	$(PDFTOCAIRO_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
@@ -104,5 +126,5 @@ $NetBSD: patch-ab,v 1.13 2011/01/31 16:55:29 drochner Exp $
 +	$(FONTCONFIG_LIBS) \
 +	$(PTHREAD_STUBLIB)
  
- @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
- @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\
+ @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
+ @BUILD_CAIRO_OUTPUT_TRUE@	pdftocairo.cc				\
diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai
deleted file mode 100644
index a07dd344f06..00000000000
--- a/print/poppler/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.10 2009/10/21 10:18:57 drochner Exp $
-
---- configure.orig	2009-10-18 01:28:46.000000000 +0200
-+++ configure
-@@ -20647,7 +20647,7 @@ fi
- if test x$enable_poppler_qt4 = xyes; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5
- $as_echo_n "checking for Qt4 moc... " >&6; }
--  MOCQT4=`which moc`
-+  MOCQT4=${QTDIR}/bin/moc
-   mocversion=`$MOCQT4 -v 2>&1`
-   mocversiongrep=`echo $mocversion | grep "Qt 4"`
-   if test x"$mocversiongrep" != x"$mocversion"; then
diff --git a/print/poppler/patches/patch-ao b/print/poppler/patches/patch-ao
deleted file mode 100644
index 188ff2f717e..00000000000
--- a/print/poppler/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2009/10/21 10:18:57 drochner Exp $
-
---- qt/Makefile.in.orig	2009-10-18 01:28:47.000000000 +0200
-+++ qt/Makefile.in
-@@ -80,7 +80,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- 	"$(DESTDIR)$(poppler_includedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+libpoppler_qt_la_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
-@@ -349,7 +349,7 @@ libpoppler_qt_la_SOURCES = \
- 	poppler-private.h
- 
- libpoppler_qt_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(FONTCONFIG_LIBS)
diff --git a/print/poppler/patches/patch-ar b/print/poppler/patches/patch-ar
index e0ea6b8ea2c..dda772fb3bc 100644
--- a/print/poppler/patches/patch-ar
+++ b/print/poppler/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.3 2011/10/20 16:32:57 drochner Exp $
+$NetBSD: patch-ar,v 1.4 2012/07/04 20:25:16 drochner Exp $
 
---- cpp/Makefile.in.orig	2011-06-27 18:45:13.000000000 +0000
+--- cpp/Makefile.in.orig	2011-10-26 12:40:03.000000000 +0000
 +++ cpp/Makefile.in
 @@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -8,10 +8,10 @@ $NetBSD: patch-ar,v 1.3 2011/10/20 16:32:57 drochner Exp $
  libpoppler_cpp_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
 +	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
- am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \
+ am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-PNMWriter.lo \
+ 	libpoppler_cpp_la-poppler-document.lo \
  	libpoppler_cpp_la-poppler-embedded-file.lo \
- 	libpoppler_cpp_la-poppler-font.lo \
-@@ -430,7 +430,7 @@ libpoppler_cpp_la_CXXFLAGS = \
+@@ -426,7 +426,7 @@ libpoppler_cpp_la_CXXFLAGS = \
  	-Dpoppler_cpp_EXPORTS
  
  libpoppler_cpp_la_LIBADD = \