update to 0.20.4

changes:
-Improvements regarding embedded file handling
-bugfixes
-cleanup

pkgsrc note: shlib major changes, revbumps needed. also switch to
 lcms2 for the "cms" option

4 files changed, 11 insertions, 11 deletions

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 454c49e2e19..37123640b2e 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2012/07/04 20:25:16 drochner Exp $
+# $NetBSD: Makefile,v 1.57 2012/09/14 12:15:01 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -36,7 +36,7 @@ PKG_SUGGESTED_OPTIONS=	poppler-cms
 
 .if !empty(PKG_OPTIONS:Mpoppler-cms)
 CONFIGURE_ARGS+=	--enable-cms
-.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cms
 .endif
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 9f5cc3b0089..0fb9100213d 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2012/08/13 11:19:39 drochner Exp $
+# $NetBSD: Makefile.common,v 1.49 2012/09/14 12:15:01 drochner 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.3
+POPPLER_VERS=		0.20.4
 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 76aca50f15e..4e97ce75b91 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2012/08/13 11:19:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2012/09/14 12:15:01 drochner Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -6,13 +6,13 @@ BUILDLINK_TREE+=	poppler
 POPPLER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.20.3
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.20.4
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
 pkgbase := poppler
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
-.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .endif
 
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 5421ada9675..cab05aa2cb3 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.74 2012/08/13 11:19:39 drochner Exp $
+$NetBSD: distinfo,v 1.75 2012/09/14 12:15:01 drochner Exp $
 
-SHA1 (poppler-0.20.3.tar.gz) = b3b01216fb4d2f4dfe2d29f91fff996dcf864a75
-RMD160 (poppler-0.20.3.tar.gz) = d7270e5fd55334b95c53b9012f9393a4bc5bb687
-Size (poppler-0.20.3.tar.gz) = 2144857 bytes
+SHA1 (poppler-0.20.4.tar.gz) = fd808cfcd249b7079a09a97f99ffb08db8c62b93
+RMD160 (poppler-0.20.4.tar.gz) = fc0b2f82b6102f4d9af3b3e589b22b05527e3bc5
+Size (poppler-0.20.4.tar.gz) = 2154257 bytes
 SHA1 (patch-aa) = c5d4bc5d858aaa2a3eca7ccc3623426d35124bdb
 SHA1 (patch-ab) = a90156aebaed91468457780ee256d9a870f11bf8
 SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2