sync w/ base pkg update

6 files changed, 27 insertions, 19 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index c38c027270f..c04c13a1f8a 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2011/01/13 13:36:21 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2011/01/31 16:58:42 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
-PKGREVISION=		3
 
 COMMENT=		PDF rendering library (GLib wrapper)
 MAINTAINER=		reed@reedmedia.net
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 22cd204d5f9..c74f3b3905e 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/07/14 17:04:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2011/01/31 16:58:42 drochner Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -15,19 +15,27 @@ include/poppler/glib/poppler.h
 lib/libpoppler-glib.la
 lib/pkgconfig/poppler-cairo.pc
 lib/pkgconfig/poppler-glib.pc
+share/gtk-doc/html/poppler/PopplerAnnot.html
+share/gtk-doc/html/poppler/PopplerAttachment.html
+share/gtk-doc/html/poppler/PopplerDocument.html
+share/gtk-doc/html/poppler/PopplerFormField.html
+share/gtk-doc/html/poppler/PopplerLayer.html
+share/gtk-doc/html/poppler/PopplerMedia.html
+share/gtk-doc/html/poppler/PopplerMovie.html
+share/gtk-doc/html/poppler/PopplerPage.html
+share/gtk-doc/html/poppler/annotation-glossary.html
+share/gtk-doc/html/poppler/api-index-0-12.html
+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-deprecated.html
+share/gtk-doc/html/poppler/api-index-full.html
 share/gtk-doc/html/poppler/ch01.html
 share/gtk-doc/html/poppler/home.png
 share/gtk-doc/html/poppler/index.html
 share/gtk-doc/html/poppler/index.sgml
 share/gtk-doc/html/poppler/left.png
-share/gtk-doc/html/poppler/poppler-poppler-action.html
-share/gtk-doc/html/poppler/poppler-poppler-annot.html
-share/gtk-doc/html/poppler/poppler-poppler-document.html
-share/gtk-doc/html/poppler/poppler-poppler-enums.html
-share/gtk-doc/html/poppler/poppler-poppler-features.html
-share/gtk-doc/html/poppler/poppler-poppler-form-field.html
-share/gtk-doc/html/poppler/poppler-poppler-layer.html
-share/gtk-doc/html/poppler/poppler-poppler-page.html
+share/gtk-doc/html/poppler/poppler-PopplerAction.html
+share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
 share/gtk-doc/html/poppler/poppler-poppler.html
 share/gtk-doc/html/poppler/poppler.devhelp
 share/gtk-doc/html/poppler/poppler.devhelp2
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index d6a2082a1d5..2816e97a8cc 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2011/01/13 13:36:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2011/01/31 16:58:42 drochner Exp $
 
 BUILDLINK_TREE+=	poppler-glib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-glib
 POPPLER_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler-glib+=	poppler-glib>=0.14.5nb3
+BUILDLINK_ABI_DEPENDS.poppler-glib+=	poppler-glib>=0.16.2
 BUILDLINK_PKGSRCDIR.poppler-glib?=	../../print/poppler-glib
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/print/poppler-includes/PLIST b/print/poppler-includes/PLIST
index 47630764b92..b36235072c7 100644
--- a/print/poppler-includes/PLIST
+++ b/print/poppler-includes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/07/15 11:33:26 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/01/31 16:58:42 drochner Exp $
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BuiltinFont.h
@@ -24,9 +24,11 @@ include/poppler/GfxFont.h
 include/poppler/GfxState.h
 include/poppler/GfxState_helpers.h
 include/poppler/GlobalParams.h
+include/poppler/Hints.h
 include/poppler/JArithmeticDecoder.h
 include/poppler/JBIG2Stream.h
 include/poppler/Lexer.h
+include/poppler/Linearization.h
 include/poppler/Link.h
 include/poppler/LocalPDFDocBuilder.h
 include/poppler/Movie.h
@@ -68,11 +70,11 @@ include/poppler/XRef.h
 include/poppler/XpdfPluginAPI.h
 include/poppler/goo/FixedPoint.h
 include/poppler/goo/GooHash.h
+include/poppler/goo/GooLikely.h
 include/poppler/goo/GooList.h
 include/poppler/goo/GooMutex.h
 include/poppler/goo/GooString.h
 include/poppler/goo/GooTimer.h
-include/poppler/goo/GooVector.h
 include/poppler/goo/ImgWriter.h
 include/poppler/goo/JpegWriter.h
 include/poppler/goo/PNGWriter.h
diff --git a/print/poppler-qt4/buildlink3.mk b/print/poppler-qt4/buildlink3.mk
index e4af219e794..b3fae9364a0 100644
--- a/print/poppler-qt4/buildlink3.mk
+++ b/print/poppler-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/08/15 11:19:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2011/01/31 16:58:42 drochner Exp $
 
 BUILDLINK_TREE+=	poppler-qt4
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler-qt4
 POPPLER_QT4_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler-qt4+=	poppler-qt4>=0.6.1
-BUILDLINK_ABI_DEPENDS.poppler-qt4?=	poppler-qt4>=0.14.2
+BUILDLINK_ABI_DEPENDS.poppler-qt4?=	poppler-qt4>=0.16.2
 BUILDLINK_PKGSRCDIR.poppler-qt4?=	../../print/poppler-qt4
 
 .include "../../print/poppler/buildlink3.mk"
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 2357e3a257c..d416a23647e 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2011/01/13 13:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2011/01/31 16:58:42 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-utils-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF utilities (from poppler)
 MAINTAINER=		reed@reedmedia.net