update to 0.5.3

changes:
-improved Qt bindings
-Cairo backend now supports masked images
-make glib bindings more language binding friendly
-Search now works with ligatures
-glib bindings now has an entry point to render to a cairo_t
-GCC 4.1 and MSVC compilation fixes
-bugfixes and cleanup

9 files changed, 41 insertions, 44 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index bfc6014b6ac..ff53389995d 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:46 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/05/31 18:13:54 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
-PKGREVISION=		3
 
 COMMENT=		PDF rendering library (GLib wrapper)
 
@@ -36,7 +35,7 @@ post-install:
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb1
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 432791ce530..b1bb764fd7f 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/01 17:23:14 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/31 18:13:54 drochner Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-attachment.h
 include/poppler/glib/poppler-document.h
 include/poppler/glib/poppler-enums.h
+include/poppler/glib/poppler-features.h
 include/poppler/glib/poppler-page.h
 include/poppler/glib/poppler.h
 lib/libpoppler-glib.la
@@ -19,6 +20,7 @@ share/doc/poppler/poppler-poppler-enums.html
 share/doc/poppler/poppler-poppler-page.html
 share/doc/poppler/poppler-poppler.html
 share/doc/poppler/poppler.devhelp
+share/doc/poppler/poppler.devhelp2
 share/doc/poppler/right.png
 share/doc/poppler/style.css
 share/doc/poppler/up.png
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 0134353ba1c..5758dcc0b39 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:46 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/05/31 18:13:54 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt-${POPPLER_VERS}
-PKGREVISION=		3
 
 COMMENT=		PDF rendering library (QT wrapper)
 
@@ -31,7 +30,7 @@ do-install:
 		${PREFIX}/include/poppler
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig
 
-BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb1
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 46d2ce60816..1a24cf8a997 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/04/06 18:25:39 reed Exp $
+# $NetBSD: Makefile,v 1.4 2006/05/31 18:13:54 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-utils-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF utilities (from poppler)
 
@@ -30,7 +29,7 @@ CONFIGURE_ARGS+=        --enable-utils	# the default
 
 BUILD_DIRS=		utils # implies INSTALL_DIRS too
 
-BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb3
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 8547631d5a6..677f85d12c5 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/04/01 19:57:57 reed Exp $
+# $NetBSD: Makefile,v 1.18 2006/05/31 18:13:54 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=		3
-
 COMMENT=		PDF rendering library
 
 USE_TOOLS+=		gmake
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 7efcabea8bd..071be27657d 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2006/05/09 16:31:56 joerg Exp $
+# $NetBSD: Makefile.common,v 1.6 2006/05/31 18:13:54 drochner Exp $
 #
 
-POPPLER_VERS=		0.5.1
+POPPLER_VERS=		0.5.3
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index cac11b571b4..c23662b30ac 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2006/04/03 21:20:06 reed Exp $
+$NetBSD: distinfo,v 1.13 2006/05/31 18:13:54 drochner Exp $
 
-SHA1 (poppler-0.5.1.tar.gz) = 8d654a0f8eb6ad8c8cb08ced24a06f1f5b13c711
-RMD160 (poppler-0.5.1.tar.gz) = ffd39323da0e0c487a6e7de48d8a607385189ddd
-Size (poppler-0.5.1.tar.gz) = 954930 bytes
-SHA1 (patch-aa) = 49ddf46f27dd2df065f5122fcc1bdb2a5ce3e546
-SHA1 (patch-ab) = ae239eb4c7fbec78b54e6f68a9e21ddf3d95dc7d
+SHA1 (poppler-0.5.3.tar.gz) = e197f5cf56f0676b5ca313577dd6456a393c46ec
+RMD160 (poppler-0.5.3.tar.gz) = 3456de23955fc4001842c76d32deba308bd7f968
+Size (poppler-0.5.3.tar.gz) = 1049900 bytes
+SHA1 (patch-aa) = dba62eabac1d77b5a64c47aaa0ba94208149668b
+SHA1 (patch-ab) = c00be67e0ff6c171c57a1762f7ff23db4b449acf
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index 880e171cf75..e3d257c4d40 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2006/04/01 17:22:12 reed Exp $
+$NetBSD: patch-aa,v 1.6 2006/05/31 18:13:54 drochner Exp $
 
---- glib/Makefile.in.orig	2006-02-28 23:51:30.000000000 +0100
+--- glib/Makefile.in.orig	2006-05-22 22:15:15.000000000 +0200
 +++ glib/Makefile.in
-@@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+@@ -66,7 +66,7 @@ am__DEPENDENCIES_1 =
+ @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la \
-+	$(prefix)/lib/libpoppler.la \
- 	$(top_builddir)/poppler/libpoppler-cairo.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_2)
-@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS)
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
++	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am__objects_1 = poppler-enums.lo
+ am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \
+@@ -77,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
@@ -20,16 +20,16 @@ $NetBSD: patch-aa,v 1.5 2006/04/01 17:22:12 reed Exp $
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -306,7 +306,7 @@ libpoppler_glib_la_SOURCES = \
+@@ -310,7 +310,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
 +	$(prefix)/lib/libpoppler.la		\
- 	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
  	$(FREETYPE_LIBS)				\
-@@ -317,7 +317,7 @@ test_poppler_glib_SOURCES = \
+ 	$(cairo_libs)
+@@ -320,7 +320,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index d44325b0ae6..20618cad3dd 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2006/04/03 21:20:06 reed Exp $
+$NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
 
---- utils/Makefile.in.orig	2006-02-28 14:51:35.000000000 -0800
-+++ utils/Makefile.in	2006-04-03 14:10:58.000000000 -0700
-@@ -52,7 +52,7 @@
+--- utils/Makefile.in.orig	2006-05-22 22:15:21.000000000 +0200
++++ utils/Makefile.in
+@@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
  	$(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/03 21:20:06 reed Exp $
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS)
-@@ -61,41 +61,41 @@
+@@ -61,41 +61,41 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -62,7 +62,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/03 21:20:06 reed Exp $
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -281,12 +281,12 @@
+@@ -283,12 +283,12 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.4 2006/04/03 21:20:06 reed Exp $
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/utils			\
-@@ -294,8 +294,8 @@
+@@ -296,8 +296,8 @@ INCLUDES = \
  	$(UTILS_CFLAGS)
  
  LDADD = \
@@ -89,5 +89,5 @@ $NetBSD: patch-ab,v 1.4 2006/04/03 21:20:06 reed Exp $
 +	$(prefix)/lib/libpoppler.la	\
 +	$(UTILS_LIBS) $(PTHREAD_STUBLIB)
  
- 
- # Yay, automake!  It should be able to figure out that it has to dist
+ dist_man1_MANS = \
+ 	pdffonts.1				\