Update poppler, poppler-glib and poppler-qt to 0.5.1.

This is a development version but is needed to update evince to 0.5.2,
which is part of GNOME 2.14.0.

Release 0.5.1

	- Support for embedded files.
	- Handle 0-width lines correctly.
	- Avoid external file use when opening fonts.
	- Only use vector fonts returned from fontconfig (#5758).
	- Fix scaled 1x1 pixmaps use for drawing lines (#3387).
	- drawSoftMaskedImage support in cairo backend.
	- Misc bug fixes: #5922, #5946, #5749, #5952, #4030, #5420.

Release 0.5.0

	- Font matching code for non embedded fonts now use fontconfig
          instead of hard coded list of fonts.
	- Merge in Xpdf 3.01 changes.
	- Add command line tools from Xpdf.
	- Make install of Xpdf header files ./configure'able.

10 files changed, 77 insertions, 125 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 799be55fbe4..b1056d7f4be 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/09 01:15:58 reed Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/30 21:30:25 jmmv Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -13,21 +13,27 @@ USE_TOOLS+=		gmake
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/poppler-glib.pc.in
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-# Don't build the cairo graphics backend.
-CONFIGURE_ARGS+=	--disable-cairo-output
+# Build the cairo graphics backend, required by glib.
+CONFIGURE_ARGS+=	--enable-cairo-output
+# Don't build the splash graphics backend.
+CONFIGURE_ARGS+=	--disable-splash-output
 # Don't compile poppler qt wrapper.
 CONFIGURE_ARGS+=	--disable-poppler-qt
 # Don't compile GTK+ test program.
 CONFIGURE_ARGS+=        --disable-gtk-test
 
-do-build:
-	cd ${WRKSRC}/glib && ${SETENV} ${MAKE_ENV} ${GMAKE}
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-do-install:
-	cd ${WRKSRC}/glib && ${SETENV} ${MAKE_ENV} ${GMAKE} install
+BUILD_DIRS=		${WRKSRC}/goo ${WRKSRC}/fofi ${WRKSRC}/poppler \
+			${WRKSRC}/glib
+INSTALL_DIRS=		${WRKSRC}/glib
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/poppler-cairo.pc ${PREFIX}/lib/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/lib/pkgconfig
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 3362ef2261c..8fc9877b646 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,9 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/09 01:13:16 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/30 21:30:25 jmmv 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-page.h
 include/poppler/glib/poppler.h
 lib/libpoppler-glib.la
+lib/pkgconfig/poppler-cairo.pc
 lib/pkgconfig/poppler-glib.pc
+share/doc/poppler/ch01.html
+share/doc/poppler/home.png
+share/doc/poppler/index.html
+share/doc/poppler/index.sgml
+share/doc/poppler/left.png
+share/doc/poppler/poppler-poppler-action.html
+share/doc/poppler/poppler-poppler-document.html
+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/right.png
+share/doc/poppler/style.css
+share/doc/poppler/up.png
+@dirrm share/doc/poppler
 @dirrm include/poppler/glib
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index ea2c6ed1aa9..8dc3b845196 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/03/09 01:13:16 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/03/30 21:30:25 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POPPLER_GLIB_BUILDLINK3_MK:=	${POPPLER_GLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npoppler-glib}
 BUILDLINK_PACKAGES+=	poppler-glib
 
 .if !empty(POPPLER_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-glib+=	poppler-glib>=0.4.5
+BUILDLINK_DEPENDS.poppler-glib+=	poppler-glib>=0.5.1
 BUILDLINK_PKGSRCDIR.poppler-glib?=	../../print/poppler-glib
 .endif	# POPPLER_GLIB_BUILDLINK3_MK
 
diff --git a/print/poppler-glib/patches/patch-aa b/print/poppler-glib/patches/patch-aa
index 4b302cb2a4a..2c6d6d8708b 100644
--- a/print/poppler-glib/patches/patch-aa
+++ b/print/poppler-glib/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/03/09 01:13:16 reed Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/30 21:30:25 jmmv Exp $
 
---- glib/Makefile.in.orig	2006-03-08 16:43:11.000000000 -0800
-+++ glib/Makefile.in	2006-03-08 16:47:11.000000000 -0800
-@@ -63,7 +63,7 @@
+--- glib/Makefile.in.orig	2006-02-28 23:51:30.000000000 +0100
++++ glib/Makefile.in
+@@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
--	$(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 \
-@@ -73,7 +73,7 @@
+-	$(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)
  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.1.1.1 2006/03/09 01:13:16 reed Exp $
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -277,7 +277,7 @@
+@@ -306,7 +306,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(cairo_libs)
-@@ -286,7 +286,7 @@
+-	$(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 = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 247a821cd9a..9bab3973612 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2006/03/09 01:29:46 reed Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/30 21:30:25 jmmv Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt-${POPPLER_VERS}
-PKGREVISION=		1
 COMMENT=		PDF rendering library (QT wrapper)
 
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-qt.pc.in
 
-INCS=-I. `pkg-config poppler --cflags` -I${QTDIR}/include
+INCS=-I. -I.. -I../poppler `pkg-config poppler --cflags` -I${QTDIR}/include
 
 do-build:
 	(cd ${WRKSRC}/qt; \
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index cb46e9bba9f..2a02efa8a95 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 01:19:16 reed Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/30 21:30:25 jmmv Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=		1
-
 COMMENT=		PDF rendering library
 
 USE_TOOLS+=		gmake
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index fda353264b1..928c42bca6b 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2006/02/15 18:08:35 drochner Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/03/30 21:30:25 jmmv Exp $
 #
 
-POPPLER_VERS=		0.4.5
+POPPLER_VERS=		0.5.1
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/PLIST b/print/poppler/PLIST
index 8cb69c076ef..e902136c968 100644
--- a/print/poppler/PLIST
+++ b/print/poppler/PLIST
@@ -1,89 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/09 01:19:16 reed Exp $
-include/poppler/Annot.h
-include/poppler/Array.h
-include/poppler/BaseFile.h
-include/poppler/BuiltinFont.h
-include/poppler/BuiltinFontTables.h
-include/poppler/CMap.h
-include/poppler/Catalog.h
-include/poppler/CharCodeToUnicode.h
-include/poppler/CharTypes.h
-include/poppler/CompactFontTables.h
-include/poppler/Decrypt.h
-include/poppler/Dict.h
-include/poppler/Error.h
-include/poppler/ErrorCodes.h
-include/poppler/FontEncodingTables.h
-include/poppler/FontInfo.h
-include/poppler/Function.cc
-include/poppler/Function.h
-include/poppler/Gfx.h
-include/poppler/GfxFont.h
-include/poppler/GfxState.h
-include/poppler/GlobalParams.h
-include/poppler/JArithmeticDecoder.h
-include/poppler/JBIG2Stream.h
-include/poppler/JPXStream.h
-include/poppler/Lexer.h
-include/poppler/Link.h
-include/poppler/NameToCharCode.h
-include/poppler/NameToUnicodeTable.h
-include/poppler/Object.h
-include/poppler/Outline.h
-include/poppler/OutputDev.h
-include/poppler/PDFDoc.h
-include/poppler/PDFDocEncoding.h
-include/poppler/PSOutputDev.h
-include/poppler/PSTokenizer.h
-include/poppler/Page.h
-include/poppler/Parser.h
-include/poppler/SplashOutputDev.h
-include/poppler/Stream-CCITT.h
-include/poppler/Stream.h
-include/poppler/TextOutputDev.h
-include/poppler/UTF8.h
-include/poppler/UnicodeMap.h
-include/poppler/UnicodeMapTables.h
-include/poppler/UnicodeTypeTable.h
-include/poppler/XRef.h
-include/poppler/goo/GooHash.h
-include/poppler/goo/GooList.h
-include/poppler/goo/GooMutex.h
-include/poppler/goo/GooString.h
-include/poppler/goo/GooTimer.h
-include/poppler/goo/gfile.h
-include/poppler/goo/gmem.h
-include/poppler/goo/gtypes.h
-include/poppler/poppler-config.h
-include/poppler/splash/Splash.h
-include/poppler/splash/SplashBitmap.h
-include/poppler/splash/SplashClip.h
-include/poppler/splash/SplashErrorCodes.h
-include/poppler/splash/SplashFTFont.h
-include/poppler/splash/SplashFTFontEngine.h
-include/poppler/splash/SplashFTFontFile.h
-include/poppler/splash/SplashFont.h
-include/poppler/splash/SplashFontEngine.h
-include/poppler/splash/SplashFontFile.h
-include/poppler/splash/SplashFontFileID.h
-include/poppler/splash/SplashGlyphBitmap.h
-include/poppler/splash/SplashMath.h
-include/poppler/splash/SplashPath.h
-include/poppler/splash/SplashPattern.h
-include/poppler/splash/SplashScreen.h
-include/poppler/splash/SplashState.h
-include/poppler/splash/SplashT1Font.h
-include/poppler/splash/SplashT1FontEngine.h
-include/poppler/splash/SplashT1FontFile.h
-include/poppler/splash/SplashTypes.h
-include/poppler/splash/SplashXPath.h
-include/poppler/splash/SplashXPathScanner.h
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 21:30:25 jmmv Exp $
+bin/pdffonts
+bin/pdfimages
+bin/pdfinfo
+bin/pdftohtml
+bin/pdftoppm
+bin/pdftops
+bin/pdftotext
 lib/libpoppler.la
 lib/pkgconfig/poppler-splash.pc
 lib/pkgconfig/poppler.pc
+man/man1/pdffonts.1
+man/man1/pdfimages.1
+man/man1/pdfinfo.1
+man/man1/pdftohtml.1
+man/man1/pdftoppm.1
+man/man1/pdftops.1
+man/man1/pdftotext.1
 share/doc/poppler/README
 share/doc/poppler/README-XPDF
 @dirrm share/doc/poppler
-@dirrm include/poppler/splash
-@dirrm include/poppler/goo
-@dirrm include/poppler
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index b235e06edcd..361201cb714 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/09 01:19:16 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 21:30:25 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPPLER_BUILDLINK3_MK:=	${POPPLER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npoppler}
 BUILDLINK_PACKAGES+=	poppler
 
 .if !empty(POPPLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler+=	poppler>=0.4.5nb1
+BUILDLINK_DEPENDS.poppler+=	poppler>=0.5.1
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 .endif	# POPPLER_BUILDLINK3_MK
 
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 41ebc0aa6c1..112f6eb21f8 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/03/09 01:39:09 reed Exp $
+$NetBSD: distinfo,v 1.8 2006/03/30 21:30:25 jmmv Exp $
 
-SHA1 (poppler-0.4.5.tar.gz) = 5c2240c8cbcd8139188287e4c59396b318d548aa
-RMD160 (poppler-0.4.5.tar.gz) = 766cf03d0c731b505496241ce8d2ca867a29ac03
-Size (poppler-0.4.5.tar.gz) = 783752 bytes
-SHA1 (patch-aa) = 870c774796fc64410f66f37c7c6f6907fe29c816
+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