Update to 0.22.5.

Use "lcms" option instead of package-specific "poppler-cms" one.
Add backwards compat for this.

Add comments to most patches.

Changes:

Release 0.22.5
        core:
         * PSOutputDev: Make sure that Title: doesn't contain \n or \r (Bug #63862)
         * Fix slowlyness reading malformed files (Bug #46703)
         * Fix infinite loop while feeding wrong data in stdin (Bug #64967)
         * Fix crash on malformed file (Bug #65221)
         * Fix mismatched delete (Bug #65553)

        qt4:
         * Fix mismatched delete (Bug #65551)

        utils:
         * pdftohtml: Fix memory leak

7 files changed, 43 insertions, 28 deletions

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 0355c61b82a..03a26f2b3e7 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2013/06/04 22:16:59 tron Exp $
+# $NetBSD: Makefile,v 1.63 2013/07/04 13:13:55 wiz Exp $
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=		2
 COMMENT=		PDF rendering library
 MAINTAINER=		reed@reedmedia.net
 
@@ -30,11 +29,14 @@ CONFIGURE_ARGS+=	--disable-utils
 CONFIGURE_ARGS+=	--disable-poppler-cpp
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.poppler
-PKG_SUPPORTED_OPTIONS=	poppler-cms
-PKG_SUGGESTED_OPTIONS=	poppler-cms
+PKG_SUPPORTED_OPTIONS=	lcms
+PKG_SUGGESTED_OPTIONS=	lcms
+# remove after pkgsrc-2013Q3 is tagged
+PKG_OPTIONS_LEGACY_OPTS=	poppler-cms:lcms
+
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mpoppler-cms)
+.if !empty(PKG_OPTIONS:Mlcms)
 CONFIGURE_ARGS+=	--enable-cms
 .include "../../graphics/lcms2/buildlink3.mk"
 .else
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 6e299ec2bd0..9639a8193db 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2013/05/25 14:44:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.55 2013/07/04 13:13:55 wiz 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.22.4
+POPPLER_VERS=		0.22.5
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 6ab4cafde7c..7a97b1822d6 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.79 2013/05/25 14:44:48 wiz Exp $
+$NetBSD: distinfo,v 1.80 2013/07/04 13:13:55 wiz Exp $
 
-SHA1 (poppler-0.22.4.tar.gz) = 26586bcd41a01adca00bf5929e11c49419bd21fa
-RMD160 (poppler-0.22.4.tar.gz) = e272fa83b6b3c7dfc7cf8f5265a603250e36a683
-Size (poppler-0.22.4.tar.gz) = 2222528 bytes
-SHA1 (patch-aa) = 4ab4cb184ebe121c712a84dcbcfa69ce0c07aafb
-SHA1 (patch-ab) = cae1dd7831d7fbbed32664c6fdd29d168c444c1f
+SHA1 (poppler-0.22.5.tar.gz) = 9491bb33788d7f0ee67da572dc4798004f98323a
+RMD160 (poppler-0.22.5.tar.gz) = 6220e723a87f153f9c9ccc7329133d04191a3c8a
+Size (poppler-0.22.5.tar.gz) = 2239107 bytes
+SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7
+SHA1 (patch-ab) = 758c541fa14c82cb44a247cbc37e1582b0167229
 SHA1 (patch-ag) = abe010cec549f305a53d9a21be6cf66ddc5f1b79
 SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
-SHA1 (patch-ar) = 4799e084c83167fcd54832c172c2662c745cdba1
-SHA1 (patch-as) = f0f4f8d9f5a49173a27e2349be4b7536ed77eaae
+SHA1 (patch-ar) = f72681a2148ec846a334774339836d468925b20c
+SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index f86a5a34a0b..58468f7d859 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.12 2013/03/24 07:09:24 spz Exp $
+$NetBSD: patch-aa,v 1.13 2013/07/04 13:13:55 wiz Exp $
+
+Use installed copy of poppler library so we can have a separate
+poppler-glib package.
 
 --- glib/Makefile.in.orig	2013-02-10 10:48:37.000000000 +0000
 +++ glib/Makefile.in
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index b0f4d74b3f9..d418bea8251 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
+$NetBSD: patch-ab,v 1.16 2013/07/04 13:13:55 wiz Exp $
 
---- utils/Makefile.in.orig	2013-02-10 10:48:38.000000000 +0000
+Use installed poppler library so we can have a separate poppler-utils
+package.
+
+--- utils/Makefile.in.orig	2013-06-16 16:24:11.000000000 +0000
 +++ utils/Makefile.in
-@@ -76,7 +76,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -103,7 +103,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
  	$(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@ -11,7 +14,7 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
  @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
-@@ -84,33 +84,33 @@ am__objects_1 = parseargs.$(OBJEXT)
+@@ -111,7 +111,7 @@ am__objects_1 = parseargs.$(OBJEXT)
  am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
@@ -20,6 +23,7 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
+@@ -119,26 +119,26 @@ am__v_lt_1 = 
  am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
@@ -51,7 +55,7 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
  am__DEPENDENCIES_2 =
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
-@@ -124,29 +124,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+@@ -152,29 +152,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
  	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -85,10 +89,10 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
  pdfunite_LDADD = $(LDADD)
 -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
- am__depfiles_maybe = depfiles
-@@ -436,12 +436,12 @@ top_build_prefix = @top_build_prefix@
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -491,12 +491,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
@@ -106,7 +110,7 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/goo			\
-@@ -451,8 +451,9 @@ INCLUDES = \
+@@ -506,8 +506,9 @@ INCLUDES = \
  	$(PDFTOCAIRO_CFLAGS)
  
  LDADD = \
diff --git a/print/poppler/patches/patch-ar b/print/poppler/patches/patch-ar
index dda772fb3bc..0e2bc3b9548 100644
--- a/print/poppler/patches/patch-ar
+++ b/print/poppler/patches/patch-ar
@@ -1,4 +1,7 @@
-$NetBSD: patch-ar,v 1.4 2012/07/04 20:25:16 drochner Exp $
+$NetBSD: patch-ar,v 1.5 2013/07/04 13:13:55 wiz Exp $
+
+Use installed poppler library so we can have a separate poppler-cpp
+package.
 
 --- cpp/Makefile.in.orig	2011-10-26 12:40:03.000000000 +0000
 +++ cpp/Makefile.in
diff --git a/print/poppler/patches/patch-as b/print/poppler/patches/patch-as
index cf8a0020012..a80f5de7a34 100644
--- a/print/poppler/patches/patch-as
+++ b/print/poppler/patches/patch-as
@@ -1,4 +1,7 @@
-$NetBSD: patch-as,v 1.3 2011/10/20 16:32:57 drochner Exp $
+$NetBSD: patch-as,v 1.4 2013/07/04 13:13:55 wiz Exp $
+
+Use installed poppler library so we can have a separate poppler-cpp
+package.
 
 --- cpp/tests/Makefile.in.orig	2011-06-27 18:45:14.000000000 +0000
 +++ cpp/tests/Makefile.in