Fix the following vulnerabilities:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1788
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1789
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1790
by updating to the latest stable version.

Changes against 0.22.1:
 core:
  * Correct rendering of underline and strike out annotations (Bug #61518)
  * Workaround broken jpeg stream definitions (Bug #61994)
  * SplashOutputDev: Restore CTM on early exits (Bug #61413)
  * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432)
  * Fix latin page labels. (Bug #61034)
  * Fix compilation with jpeglib9
  * Fix minor valgrind warning

 utils:
  * pdfimages: Fix extraction of some images (Bug #61168)

 build system:
  * Fix the build with automake-1.13

Changes against 0.22.0:
core:
 * Fix crash in some pdf files when extracting text (Bug #59561)
 * Fix crashes in wrongly formed files
 * Fix wrong warning when opening some files (Bug #58966)

build system:
 * Improve autoconf jpeglib.h detection (Bug #59186)

Changes against 0.20 include

Release 0.22.0
core:
 * Fix crash in invalid files that define a <= 0 bits per image value
 * Fix a few issues in JPX decoding when not using OpenJPEG
 * TextOutputDev: Use page size for max value in TextPage::visitSelection
 * Fix typo in error message

utils:
 * Fix pdfunite regression (Bug #58569)
 * Demo fixes and improvements

misc:
 * pdf-inspector improvements

Release 0.21.4
core:
 * SplashOutputDev: Fix crash when rendering in monochrome mode
 * SplashOutputDev: Fix line widths in monochrome mode (Bug #57294)
 * PSOutputDev: Fix crop on EPS conversion (Bug #30692)
 * TextOutputDev: Fix minor logic mistake
 * Fix assert on some malformed files (Bug #58257)
 * Move #include "jpeglib.h" into .cc file (Bug #57687)
 * Filter text that may end up being written to the shell
 * Fix windows compile warnings

glib:
 * Add poppler_annot_set_flags (Bug #58015)
 * Demo fixes and improvements

qt4:
 * Fix check_lexer on 32-bit systems

Release 0.21.3
core:
 * Splash: Implement bilinear image scaling (Bug #22138)
 * CairoOutputDev: Update fill and stroke color in startPage (Bug #54526)
 * Fix GooString::insert()
 * Allow large chars in TextPage
 * Fix crash on ActualText::end
 * Don't use memcpy to copy classes
 * Fix warnings

glib:
 * Check if words end with spaces (Bug #54504)
 * Ensure text is only computed on first render
 * Fix warnings while generating introspection file
 * Fix returns tag in PopplerAttachmentSaveFunc api doc
 * Minor demo fixes

Release 0.21.2
core:
 * CairoOutputDev: make drawImage work with images > 32767 in width/height
(Bug #56858)
 * CairoOutputDev: Fix soft mask when image resolution != smask resolution
(Bug #57070)
 * CairoOutputDev: Fix crash in CairoImageOutputDev with
setSoftMaskFromImageMask (Bug #57067)
 * Remove a check on fonts that we don't need (Bug #56753)
 * Misc code cleanups

utils:
 * pdftocairo: Add tiff output support (Bug #57006)
 * pdfunite: Fix -v (Bug #56817)
 * Misc code cleanups

Release 0.21.1
core:
 * Annotation improvements
 * Form improvements
 * CairoImageOutputDev: Support parameterized Gouraud shading (Bug #56463)
 * UTF validation fixes
 * Do not call drawing routines if we don't need non text (Bug #54617)
 * Fix Memory leak in CharCodeToUnicode (Bug #54702)

qt4:
 * Make LinkRendition properties available (Bug #55378)
 * Accessors for FormWidgetChoice::editChoice
 * Implement overprint

Release 0.21.0
core:
 * Support the modification of files with Encrypt
 * Annotation improvements
 * Form improvements
 * Splash: Implement DeviceN support
 * Splash: Avoid bogus memory error for tilingPattern
 * TextOutputDev: Allow multiple fonts in a TextWord
 * Kill the concept of base dir
 * PSOutputDev: Always write HiResBoundingBox (Bug #53159)
 * Convert UTF-16 to UCS-4 when reading toUnicode cmap
 * GooString formatting: add support for uppercase hexadecimal
 * Use error() instead of fprintf(stderr, ...) in Annot::layoutText
 * poppler-config.h: remove WITH_FONTCONFIGURATION_* macros

glib:
 * Annotation improvements
 * Add poppler_page_remove_annot()
 * Add poppler_document_new_from_stream
 * Add poppler_document_new_from_gfile
 * Add poppler_page_find_text_with_options (Bug #2951)
 * Demo improvements
 * Port tests and demo to GTK+3

qt4:
 * Add accessor methods for movie poster information
 * Make 'additional actions' available in Annotation API (Bug #53589)
 * Add whole-page search method to Poppler::Page
 * Small changes in tests

utils:
 * pdftohtml: Make the output more xhtml compliant
 * pdftohtml: Add -fontfullname. (Bug #49872)
 * pdftohtml: Do not invoke gs anymore

build system:
 * Add the possibility of using lcms1 even if lcms2 is installed
 * Remove extra fontconfig CFLAGS and LIBS

12 files changed, 66 insertions, 82 deletions

diff --git a/print/poppler-cpp/Makefile b/print/poppler-cpp/Makefile
index d93cd41e402..0e97cecbd83 100644
--- a/print/poppler-cpp/Makefile
+++ b/print/poppler-cpp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2013/02/16 11:19:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2013/03/24 07:09:25 spz Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-cpp-${POPPLER_VERS}
-PKGREVISION=		3
 
 COMMENT=		PDF rendering library (cpp wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index fda3dc4c20a..e85eead56cc 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2013/02/16 11:19:28 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2013/03/24 07:09:25 spz Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (GLib wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 3de7bc75514..05233552bcf 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2012/07/04 20:26:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/03/24 07:09:26 spz Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -29,6 +29,7 @@ share/gtk-doc/html/poppler/api-index-0-14.html
 share/gtk-doc/html/poppler/api-index-0-16.html
 share/gtk-doc/html/poppler/api-index-0-18.html
 share/gtk-doc/html/poppler/api-index-0-20.html
+share/gtk-doc/html/poppler/api-index-0-22.html
 share/gtk-doc/html/poppler/api-index-deprecated.html
 share/gtk-doc/html/poppler/api-index-full.html
 share/gtk-doc/html/poppler/ch01.html
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index fe92040f066..99c8933438e 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2013/02/16 11:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/03/24 07:09:26 spz Exp $
 #
 
 .include "../../print/poppler016/Makefile.common"
 
 PKGNAME=		poppler-qt-${POPPLER_VERS}
-PKGREVISION=		3
 
 COMMENT=		PDF rendering library (QT wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile
index f3e79a04ca6..8f102b66302 100644
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2013/02/16 11:19:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2013/03/24 07:09:26 spz Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt4-${POPPLER_VERS}
-PKGREVISION=		2
 COMMENT=		PDF rendering library (QT4 wrapper)
 MAINTAINER=		reed@reedmedia.net
 
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 0cdd7b45b0d..d12327dc604 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/02/16 11:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/03/24 07:09:26 spz 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 b30661e9b37..b7299b4586f 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2013/02/16 11:18:13 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2013/03/24 07:09:23 spz Exp $
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=		2
-
 COMMENT=		PDF rendering library
 MAINTAINER=		reed@reedmedia.net
 
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index c3d30de0812..ebd21afe6fe 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2012/10/11 15:12:29 drochner Exp $
+# $NetBSD: Makefile.common,v 1.52 2013/03/24 07:09:24 spz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -6,7 +6,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.20.5
+POPPLER_VERS=		0.22.2
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 3a19cf62233..ebe7d73d16b 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.76 2012/10/11 15:12:29 drochner Exp $
+$NetBSD: distinfo,v 1.77 2013/03/24 07:09:24 spz Exp $
 
-SHA1 (poppler-0.20.5.tar.gz) = 5eb351381e6d7994bdf7f09bb5c1075f41d79381
-RMD160 (poppler-0.20.5.tar.gz) = 97bf72d1832b348409c378b0e74c007aeec8e9b3
-Size (poppler-0.20.5.tar.gz) = 2158387 bytes
-SHA1 (patch-aa) = c5d4bc5d858aaa2a3eca7ccc3623426d35124bdb
-SHA1 (patch-ab) = a90156aebaed91468457780ee256d9a870f11bf8
-SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2
+SHA1 (poppler-0.22.2.tar.gz) = dfecd51fa1172bac565a466b2071c88c4255dd61
+RMD160 (poppler-0.22.2.tar.gz) = cb8dbc3f3d4c09056a3a5d2ea34fcaff06b2a6ca
+Size (poppler-0.22.2.tar.gz) = 2215737 bytes
+SHA1 (patch-aa) = 4ab4cb184ebe121c712a84dcbcfa69ce0c07aafb
+SHA1 (patch-ab) = cae1dd7831d7fbbed32664c6fdd29d168c444c1f
+SHA1 (patch-ag) = abe010cec549f305a53d9a21be6cf66ddc5f1b79
 SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
 SHA1 (patch-ar) = 4799e084c83167fcd54832c172c2662c745cdba1
 SHA1 (patch-as) = f0f4f8d9f5a49173a27e2349be4b7536ed77eaae
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index ca6425b6c6e..f86a5a34a0b 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.11 2012/07/04 20:25:16 drochner Exp $
+$NetBSD: patch-aa,v 1.12 2013/03/24 07:09:24 spz Exp $
 
---- glib/Makefile.in.orig	2011-10-26 12:40:03.000000000 +0000
+--- glib/Makefile.in.orig	2013-02-10 10:48:37.000000000 +0000
 +++ glib/Makefile.in
-@@ -84,7 +84,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -107,7 +107,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la \
 +	$(prefix)/lib/libpoppler.la \
  	$(top_builddir)/poppler/libpoppler-cairo.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
-@@ -435,7 +435,7 @@ libpoppler_glib_la_SOURCES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 = poppler-enums.lo
+@@ -475,7 +475,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.11 2012/07/04 20:25:16 drochner Exp $
 +	$(prefix)/lib/libpoppler.la		\
  	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
+ 	$(FREETYPE_LIBS)
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index a2fa3f86e45..b0f4d74b3f9 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2012/07/04 20:25:16 drochner Exp $
+$NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
 
---- utils/Makefile.in.orig	2012-06-10 18:45:33.000000000 +0000
+--- utils/Makefile.in.orig	2013-02-10 10:48:38.000000000 +0000
 +++ utils/Makefile.in
-@@ -59,7 +59,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -76,7 +76,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
  	$(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@ -11,58 +11,52 @@ $NetBSD: patch-ab,v 1.14 2012/07/04 20:25:16 drochner Exp $
  @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
-@@ -68,7 +68,7 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
+@@ -84,33 +84,33 @@ am__objects_1 = parseargs.$(OBJEXT)
+ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
  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)
+-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfdetach_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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__v_lt_0 = --silent
  am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
  	$(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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)
+-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfseparate_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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)
+-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la
++am__DEPENDENCIES_1 = $(prefix)/lib/libpoppler.la
+ am__DEPENDENCIES_2 =
  @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
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
+@@ -124,29 +124,29 @@ 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_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -73,31 +67,28 @@ $NetBSD: patch-ab,v 1.14 2012/07/04 20:25:16 drochner Exp $
 +	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
  	$(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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)
+-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfunite_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -425,12 +425,12 @@ top_build_prefix = @top_build_prefix@
+ am__depfiles_maybe = depfiles
+@@ -436,12 +436,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
@@ -115,15 +106,14 @@ $NetBSD: patch-ab,v 1.14 2012/07/04 20:25:16 drochner Exp $
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/goo			\
-@@ -441,9 +441,10 @@ INCLUDES = \
+@@ -451,8 +451,9 @@ INCLUDES = \
  	$(PDFTOCAIRO_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
+-	$(UTILS_LIBS)
 +	$(prefix)/lib/libpoppler.la	\
- 	$(UTILS_LIBS)				\
--	$(FONTCONFIG_LIBS)
-+	$(FONTCONFIG_LIBS) \
++	$(UTILS_LIBS)			\
 +	$(PTHREAD_STUBLIB)
  
  @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag
index aa3c36bc76d..35eaa7e7b65 100644
--- a/print/poppler/patches/patch-ag
+++ b/print/poppler/patches/patch-ag
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.8 2010/08/15 11:19:18 drochner Exp $
+$NetBSD: patch-ag,v 1.9 2013/03/24 07:09:25 spz Exp $
 
---- qt4/src/Makefile.in.orig	2010-08-10 18:02:11.000000000 +0000
+--- qt4/src/Makefile.in.orig	2013-02-10 10:48:38.000000000 +0000
 +++ qt4/src/Makefile.in
-@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -102,7 +102,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_qt4_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la \
 +	$(prefix)/lib/libpoppler.la \
  	$(top_builddir)/poppler/libpoppler-arthur.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ 	$(am__DEPENDENCIES_1)
  am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
-@@ -397,7 +397,7 @@ libpoppler_qt4_la_CXXFLAGS = \
+@@ -440,7 +440,7 @@ libpoppler_qt4_la_CXXFLAGS = \
  	-Dpoppler_qt4_EXPORTS
  
  libpoppler_qt4_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	$(prefix)/lib/libpoppler.la	\
  	$(top_builddir)/poppler/libpoppler-arthur.la	\
- 	$(FONTCONFIG_LIBS)				\
  	$(POPPLER_QT4_LIBS)
+