10 files changed, 122 insertions, 203 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 6d620b323d6c..fedc9b71128a 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.30 2006/09/30 04:55:20 ahze Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.35 2007/06/26 16:33:29 ahze Exp $
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.5.4
-PORTREVISION?=	3
+PORTVERSION=	0.5.9
+PORTREVISION?=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -19,11 +19,12 @@ RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	gnomehack gnometarget libxml2
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
-		--with-html-dir=${DOCSDIR}
+		--with-html-dir=${DOCSDIR} \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
@@ -45,7 +46,13 @@ CONFIGURE_ARGS+=--enable-poppler-qt
 USE_QT_VER+=	3
 BUILD_WRKSRC=	${WRKSRC}/qt
 INSTALL_WRKSRC=	${WRKSRC}/qt
-# blah.. USE_QT_VER can't be defined after bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.elif ${SLAVEPORT}=="qt4"
+CONFIGURE_ARGS+=--enable-poppler-qt4
+USE_QT_VER+=	4
+QT_COMPONENTS=	gui corelib xml qtestlib
+BUILD_WRKSRC=	${WRKSRC}/qt4
+INSTALL_WRKSRC=	${WRKSRC}/qt4
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .elif ${SLAVEPORT}=="utils"
 CONFIGURE_ARGS+=--enable-utils
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 58d7459cd7e7..61fdc353cd71 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.4.tar.gz) = 053fdfd70533ecce1a06353fa945f061
-SHA256 (poppler-0.5.4.tar.gz) = ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
-SIZE (poppler-0.5.4.tar.gz) = 1062401
+MD5 (poppler-0.5.9.tar.gz) = 8d1ac008614c0e413bcac95b8102fa07
+SHA256 (poppler-0.5.9.tar.gz) = bee251e5149ac9dd8824aac316456b78a82f4e1954eb3c1a94db3625340ef61e
+SIZE (poppler-0.5.9.tar.gz) = 1169002
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
deleted file mode 100644
index 2af4940c3582..000000000000
--- a/graphics/poppler/files/patch-configure
+++ /dev/null
@@ -1,119 +0,0 @@
---- configure.orig	Sat Sep 30 00:27:43 2006
-+++ configure	Sat Sep 30 00:30:00 2006
-@@ -24957,12 +24957,12 @@
-         pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
-+  pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -24975,12 +24975,12 @@
-         pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
--  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
-+  pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -24999,14 +24999,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
-+	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
-         else
--	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
-+	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$POPPLER_GLIB_PKG_ERRORS" >&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
- 
- $POPPLER_GLIB_PKG_ERRORS
- 
-@@ -25017,7 +25017,7 @@
- and POPPLER_GLIB_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
-+echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
- 
- $POPPLER_GLIB_PKG_ERRORS
- 
-@@ -25298,10 +25298,10 @@
-   enable_poppler_qt="try"
- fi;
- 
--if test x$enable_poppler_qt = xyes; then
-+if test "$enable_poppler_qt" = xyes; then
- 
--qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
--qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
-+qt_incdirs="$QTINC /usr/X11R6/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
-+qt_libdirs="$QTLIB /usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
- if test -n "$QTDIR" ; then
-     qt_incdirs="$QTDIR/include $qt_incdirs"
-     qt_libdirs="$QTDIR/lib $qt_libdirs"
-@@ -25488,8 +25488,8 @@
- 
- elif test x$enable_poppler_qt = xtry; then
- 
--qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
--qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
-+qt_incdirs="$QTINC /usr/X11R6/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
-+qt_libdirs="$QTLIB /usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
- if test -n "$QTDIR" ; then
-     qt_incdirs="$QTDIR/include $qt_incdirs"
-     qt_libdirs="$QTDIR/lib $qt_libdirs"
-@@ -25700,8 +25700,8 @@
- if test x$enable_poppler_qt4 = xyes; then
- 
- have_qt4=no
--qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
--qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
-+qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
-+qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
- 
- if test -n "$QTDIR" ; then
-     qt4_incdirs="$QTDIR/include $qt4_incdirs"
-@@ -25773,8 +25773,8 @@
- elif test x$enable_poppler_qt4 = xtry; then
- 
- have_qt4=no
--qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
--qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
-+qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
-+qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
- 
- if test -n "$QTDIR" ; then
-     qt4_incdirs="$QTDIR/include $qt4_incdirs"
-@@ -25863,8 +25863,8 @@
- 
- have_qt4testlib=no
- 
--qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
--qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
-+qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
-+qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
- 
- if test -n "$QTDIR" ; then
-     qt4_incdirs="$QTDIR/include $qt4_incdirs"
diff --git a/graphics/poppler/files/patch-fix_inverted_text b/graphics/poppler/files/patch-fix_inverted_text
deleted file mode 100644
index 8821c68fc11b..000000000000
--- a/graphics/poppler/files/patch-fix_inverted_text
+++ /dev/null
@@ -1,32 +0,0 @@
---- poppler/CairoOutputDev.cc	2006/09/21 00:56:33	1.44
-+++ poppler/CairoOutputDev.cc	2006/11/07 23:53:31	1.45
-@@ -263,8 +263,6 @@
- 
- void CairoOutputDev::updateFont(GfxState *state) {
-   cairo_font_face_t *font_face;
--  double m11, m12, m21, m22;
--  double w;
-   cairo_matrix_t matrix;
- 
-   LOG(printf ("updateFont() font=%s\n", state->getFont()->getName()->getCString()));
-@@ -278,9 +276,6 @@
- 
-   if (!currentFont)
-     return;
--  state->getFontTransMat(&m11, &m12, &m21, &m22);
--  m11 *= state->getHorizScaling();
--  m12 *= state->getHorizScaling();
- 
-   LOG(printf ("font matrix: %f %f %f %f\n", m11, m12, m21, m22));
-   
-@@ -289,8 +284,8 @@
-  
-   double fontSize = state->getFontSize();
-   double *m = state->getTextMat();
--  matrix.xx = m[0] * fontSize;
--  matrix.yx = m[1] * fontSize;
-+  matrix.xx = m[0] * fontSize * state->getHorizScaling();
-+  matrix.yx = m[1] * fontSize * state->getHorizScaling();
-   matrix.xy = -m[2] * fontSize;
-   matrix.yy = -m[3] * fontSize;
-   matrix.x0 = 0;
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index ccf1f8d15e8c..a073bf3e692c 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,15 +1,14 @@
---- glib/Makefile.in.orig	Tue May 23 08:12:00 2006
-+++ glib/Makefile.in	Tue May 23 08:13:09 2006
-@@ -66,7 +66,7 @@
+--- glib/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ glib/Makefile.in	Wed Jun 20 07:30:35 2007
+@@ -66,7 +66,6 @@
  @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 $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ 	$(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 @@
+@@ -78,7 +77,7 @@
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
@@ -18,7 +17,7 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -310,7 +310,7 @@
+@@ -319,7 +318,7 @@
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -26,8 +25,8 @@
 +	-lpoppler					\
  	$(POPPLER_GLIB_LIBS)				\
  	$(FREETYPE_LIBS)				\
- 	$(cairo_libs)
-@@ -320,7 +320,7 @@
+ 	$(FONTCONFIG_LIBS)				\
+@@ -330,7 +329,7 @@
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/graphics/poppler/files/patch-qt4_Makefile.in b/graphics/poppler/files/patch-qt4_Makefile.in
new file mode 100644
index 000000000000..13f33860ca17
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_Makefile.in
@@ -0,0 +1,11 @@
+--- qt4/Makefile.in.orig	Tue Jun 26 10:47:02 2007
++++ qt4/Makefile.in	Tue Jun 26 10:47:17 2007
+@@ -220,7 +220,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = src tests
++SUBDIRS = src
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in
new file mode 100644
index 000000000000..316d56611bd3
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -0,0 +1,34 @@
+--- qt4/src/Makefile.in.orig	Tue Jun 26 10:39:41 2007
++++ qt4/src/Makefile.in	Tue Jun 26 10:44:32 2007
+@@ -37,8 +37,8 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@BUILD_SPLASH_OUTPUT_TRUE@am__append_1 = \
+-@BUILD_SPLASH_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-arthur.la
++@BUILD_SPLASH_OUTPUT_TRUE@am__append_1 =
++@BUILD_SPLASH_OUTPUT_TRUE@
+ 
+ subdir = qt4/src
+ DIST_COMMON = $(poppler_include_HEADERS) $(srcdir)/Makefile.am \
+@@ -64,9 +64,9 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-arthur.la
++@BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_2 = 
+ libpoppler_qt4_la_DEPENDENCIES =  \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
+ 	poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
+@@ -295,7 +295,7 @@
+ 	poppler-link-extractor-private.h	\
+ 	poppler-private.h
+ 
+-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt4_la_LIBADD = -lpoppler -lm \
+ 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
+ libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0
+ all: all-am
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index 756621674b26..4ad2d0c3da9d 100644
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -1,15 +1,16 @@
---- qt/Makefile.in.orig	Sat Sep 30 00:10:34 2006
-+++ qt/Makefile.in	Sat Sep 30 00:11:29 2006
-@@ -63,16 +63,14 @@
+--- qt/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ qt/Makefile.in	Wed Jun 20 07:30:01 2007
+@@ -63,8 +63,7 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+libpoppler_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++libpoppler_qt_la_DEPENDENCIES = 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
  am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
  	poppler-link.lo poppler-page.lo poppler-page-transition.lo
- libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS)
+@@ -72,8 +71,7 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
  test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
@@ -19,16 +20,16 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -281,7 +279,7 @@
+@@ -286,7 +284,7 @@
  	poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler -lqt-mt			\
  	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)
- 
-@@ -290,7 +288,7 @@
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -296,7 +294,7 @@
         test-poppler-qt.cpp
  
  test_poppler_qt_LDADD = \
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 547c93f81559..ffc289c45ab2 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,54 +1,69 @@
---- utils/Makefile.in.orig	Sat Sep 30 00:11:46 2006
-+++ utils/Makefile.in	Sat Sep 30 00:13:02 2006
-@@ -60,35 +60,35 @@
- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
+--- utils/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ utils/Makefile.in	Wed Jun 20 07:29:29 2007
+@@ -62,49 +62,41 @@
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES = 
+ am__DEPENDENCIES_1 =
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdffonts_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES = 
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdfimages_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES = 
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdfinfo_DEPENDENCIES =	$(am__DEPENDENCIES_1)
+ am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
+ @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+ pdftoabw_LDADD = $(LDADD)
+-pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftoabw_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftohtml_DEPENDENCIES =
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftohtml_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
  @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
  @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES =
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftoppm_DEPENDENCIES =	$(am__DEPENDENCIES_1)
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES =
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftops_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES =
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftotext_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -291,7 +291,7 @@
- 	$(UTILS_CFLAGS)
+@@ -318,7 +310,7 @@
+ 	$(ABIWORD_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler				\
- 	$(UTILS_LIBS)
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
  
- dist_man1_MANS = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 1f06ace7eeda..8a998462d061 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -14,6 +14,7 @@ include/poppler/Error.h
 include/poppler/ErrorCodes.h
 include/poppler/FontEncodingTables.h
 include/poppler/FontInfo.h
+include/poppler/Form.h
 include/poppler/Function.cc
 include/poppler/Function.h
 include/poppler/Gfx.h
@@ -35,14 +36,16 @@ include/poppler/PDFDocEncoding.h
 include/poppler/PSOutputDev.h
 include/poppler/PSTokenizer.h
 include/poppler/Page.h
+include/poppler/PageTransition.h
 include/poppler/Parser.h
+include/poppler/PreScanOutputDev.h
 include/poppler/ProfileData.h
 include/poppler/SecurityHandler.h
+include/poppler/Sound.h
 include/poppler/SplashOutputDev.h
 include/poppler/Stream-CCITT.h
 include/poppler/Stream.h
 include/poppler/TextOutputDev.h
-include/poppler/UGooString.h
 include/poppler/UTF8.h
 include/poppler/UnicodeCClassTables.h
 include/poppler/UnicodeCompTables.h