update to 0.8.5

changes:
-fix some crashes and memory leaks
-pdftohtml improvements

4 files changed, 6 insertions, 34 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 8f4f447b16e..52078f5f34c 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.17 2008/07/15 10:34:21 drochner Exp $
+# $NetBSD: Makefile.common,v 1.18 2008/08/06 18:44:25 drochner Exp $
 # used by print/poppler/Makefile
 # used by print/poppler-qt4/Makefile
 
-POPPLER_VERS=		0.8.4
+POPPLER_VERS=		0.8.5
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 33a482d2d71..56f2d20c14e 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.31 2008/07/15 10:34:21 drochner Exp $
+$NetBSD: distinfo,v 1.32 2008/08/06 18:44:25 drochner Exp $
 
-SHA1 (poppler-0.8.4.tar.gz) = 2ad0acfea3a8787b19c2882a2eac2f9d0afd5a48
-RMD160 (poppler-0.8.4.tar.gz) = 96a5109d03211575c00a49d3efe1d583dd710dec
-Size (poppler-0.8.4.tar.gz) = 1465322 bytes
+SHA1 (poppler-0.8.5.tar.gz) = 993c7ac0e12c20674908a44542f49b43bd417574
+RMD160 (poppler-0.8.5.tar.gz) = 26634a62d77471ed668507bd0c287bfff291f881
+Size (poppler-0.8.5.tar.gz) = 1466503 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = e3d413ec50a098af06cb2efc2fac2042064498dd
 SHA1 (patch-ag) = 258b8bff3d167914539e40c3263d36ce55e2ea01
-SHA1 (patch-ah) = decbe82914bb0e710389b0b35bfd360942edf123
 SHA1 (patch-ai) = d3d4411092b5c6dd61d3f197c01c3bcdad88cc0e
-SHA1 (patch-aj) = 7599a5c14b4d2bdd83283275e71c5a720360f362
diff --git a/print/poppler/patches/patch-ah b/print/poppler/patches/patch-ah
deleted file mode 100644
index d0e09caa22d..00000000000
--- a/print/poppler/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2008/07/15 10:34:21 drochner Exp $
-
---- poppler/Page.cc.orig	2008-07-02 15:45:43.000000000 +0200
-+++ poppler/Page.cc
-@@ -466,7 +466,7 @@ GBool Page::loadThumb(unsigned char **da
- 
-   /* Get stream dict */
-   thumb.fetch(xref, &fetched_thumb);
--  if (fetched_thumb.isNull()) {
-+  if (!fetched_thumb.isStream()) {
-     fetched_thumb.free();
-     return gFalse;
-   }
diff --git a/print/poppler/patches/patch-aj b/print/poppler/patches/patch-aj
deleted file mode 100644
index 9e17c1045ad..00000000000
--- a/print/poppler/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2008/07/09 10:30:37 drochner Exp $
-
---- poppler/Page.cc.orig	2008-07-09 12:02:41.000000000 +0200
-+++ poppler/Page.cc
-@@ -230,7 +230,7 @@ GBool PageAttrs::readBox(Dict *dict, cha
- 
- Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) {
-   Object tmp;
--	
-+  pageWidgets =	NULL;  //Security fix
-   ok = gTrue;
-   xref = xrefA;
-   num = numA;