Update to 0.26.2:

Release 0.26.2
        core:
         * Make sure we have an xref before using. KDE Bug #335413

        build system:
         * autoconf: Fix typo in configure.ac

        utils:
         * pdftohtml: exit with 0 with -v and -h

4 files changed, 10 insertions, 29 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index c44b7cb0f43..2f1dfb452f7 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2014/06/07 08:56:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.66 2014/07/22 12:13:28 wiz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -8,7 +8,7 @@
 # used by print/poppler-qt5/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.26.1
+POPPLER_VERS=		0.26.2
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 9cbe8f44d2b..7a54bb95f5f 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.93 2014/06/07 08:56:20 wiz Exp $
+$NetBSD: distinfo,v 1.94 2014/07/22 12:13:28 wiz Exp $
 
-SHA1 (poppler-0.26.1.tar.xz) = 69911065030200bb7233a1f051b2e4695bbc386c
-RMD160 (poppler-0.26.1.tar.xz) = b7c229a197ee89f7195f629b96fcca770aaf94e6
-Size (poppler-0.26.1.tar.xz) = 1592884 bytes
+SHA1 (poppler-0.26.2.tar.xz) = d4a3a5c2f97217a5de250d53ef810f26ab581673
+RMD160 (poppler-0.26.2.tar.xz) = b03f456031bacdcfc4c148abe52c28302ddc1303
+Size (poppler-0.26.2.tar.xz) = 1592696 bytes
 SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7
 SHA1 (patch-ab) = fc2e9e5dbbc2cda25b79d8342e82c10d542211a6
 SHA1 (patch-ag) = 7a3e0cb67bfb3856b3c5fbb581572a113eeb9fe5
-SHA1 (patch-aq) = b1e1cd6e234a68ebc352d76dbf89ed4e3cb7b3c0
+SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
 SHA1 (patch-ar) = c3f9c4d0176f215cfee6127d2ac077a26c23ffa2
 SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d
-SHA1 (patch-configure) = a2488314e1da41c94bc78c327795e126515bdde5
 SHA1 (patch-qt5_src_Makefile.in) = 3bbe51eca4f10fd91f6afd4f8e4cee05b04e98c3
diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq
index ecd4b0188cb..02f6b8149f8 100644
--- a/print/poppler/patches/patch-aq
+++ b/print/poppler/patches/patch-aq
@@ -1,4 +1,6 @@
-$NetBSD: patch-aq,v 1.6 2013/12/29 22:29:35 bsiegert Exp $
+$NetBSD: patch-aq,v 1.7 2014/07/22 12:13:28 wiz Exp $
+
+Add workaround for lack of fmax/fmin on NetBSD<6 and DragonFly before 200204.
 
 --- poppler/TextOutputDev.cc.orig	Mon Jan 24 19:06:00 2011
 +++ poppler/TextOutputDev.cc
diff --git a/print/poppler/patches/patch-configure b/print/poppler/patches/patch-configure
deleted file mode 100644
index 2e722b424a2..00000000000
--- a/print/poppler/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/10/26 15:10:57 joerg Exp $
-
---- configure.orig	2013-10-17 17:09:13.000000000 +0000
-+++ configure
-@@ -24746,13 +24746,13 @@ if test "x$GCC" != xyes; then
- fi
- case "$enable_compile_warnings" in
-   no)	;;
--  yes)	CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS";
-+  yes)	CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-common $CXXFLAGS";
-         CFLAGS="-Wall $CFLAGS" ;;
-   kde)	CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
- 		-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
- 		-Wconversion -Wall -W -Wpointer-arith \
- 		-Wwrite-strings -O2 -Wformat-security \
--		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
-+		-Wmissing-format-attribute -fno-exceptions \
- 		-fno-common $CXXFLAGS" ;;
- esac
- CXXFLAGS="-fPIC $CXXFLAGS";