6 files changed, 163 insertions, 57 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 2187c2dbe9e8..99a265f5326f 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.23 2006/04/12 17:10:20 ahze Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.30 2006/09/30 04:55:20 ahze Exp $
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 PORTREVISION?=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -15,11 +15,12 @@ MASTER_SITES=	http://poppler.freedesktop.org/
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A PDF rendering library
 
+RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
+
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--with-html-dir=${DOCSDIR}
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 19f573b59e7f..58d7459cd7e7 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.3.tar.gz) = d06207536555f5711e7bc61711c1b8a0
-SHA256 (poppler-0.5.3.tar.gz) = 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
-SIZE (poppler-0.5.3.tar.gz) = 1049900
+MD5 (poppler-0.5.4.tar.gz) = 053fdfd70533ecce1a06353fa945f061
+SHA256 (poppler-0.5.4.tar.gz) = ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
+SIZE (poppler-0.5.4.tar.gz) = 1062401
diff --git a/graphics/poppler/files/patch-Makefile.in b/graphics/poppler/files/patch-Makefile.in
index a93d4d7c840d..02c8919d0713 100644
--- a/graphics/poppler/files/patch-Makefile.in
+++ b/graphics/poppler/files/patch-Makefile.in
@@ -1,20 +1,24 @@
---- Makefile.in.orig	Tue May 23 07:59:21 2006
-+++ Makefile.in	Tue May 23 08:00:41 2006
+--- Makefile.in.orig	Thu Sep 21 20:54:29 2006
++++ Makefile.in	Sat Sep 30 10:51:57 2006
 @@ -76,7 +76,7 @@
  DATA = $(pkgconfig_DATA)
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4
-+DIST_SUBDIRS = goo fofi splash poppler utils glib qt qt4
++DIST_SUBDIRS = goo fofi splash poppler utils glib qt
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -254,7 +254,7 @@
- @BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
+@@ -254,10 +254,10 @@
+ @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
+ @BUILD_POPPLER_QT_TRUE@qt_subdir = qt
+ @BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
+-@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
++@BUILD_POPPLER_QT4_TRUE@qt4_subdir =
  @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
  @BUILD_UTILS_TRUE@utils_subdir = utils
 -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) $(qt4_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir)
  EXTRA_DIST = \
  	README-XPDF				\
  	poppler.pc.in				\
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
index c8c36c268cea..2af4940c3582 100644
--- a/graphics/poppler/files/patch-configure
+++ b/graphics/poppler/files/patch-configure
@@ -1,11 +1,119 @@
---- configure.orig	Tue May 23 08:07:51 2006
-+++ configure	Tue May 23 08:08:07 2006
-@@ -24856,7 +24856,7 @@
-     fi
+--- 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 "x$have_qt" == "xyes"; then
-+if test "x$have_qt" = "xyes"; then
-     ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ if test -n "$QTDIR" ; then
+     qt4_incdirs="$QTDIR/include $qt4_incdirs"
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index 29d9a5fa298f..756621674b26 100644
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -1,5 +1,5 @@
---- qt/Makefile.in.orig	Thu Jan 12 21:37:56 2006
-+++ qt/Makefile.in	Thu Jan 12 21:38:47 2006
+--- 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 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -8,32 +8,32 @@
 -	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 +libpoppler_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
- 	poppler-page.lo poppler-page-transition.lo
+ 	poppler-link.lo poppler-page.lo poppler-page-transition.lo
  libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS)
  PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
  test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
 -test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++test_poppler_qt_DEPENDENCIES = 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -273,7 +271,7 @@
+@@ -281,7 +279,7 @@
  	poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler -lqt-mt			\
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)
  
-@@ -281,7 +279,7 @@
+@@ -290,7 +288,7 @@
         test-poppler-qt.cpp
  
  test_poppler_qt_LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler -lqt-mt			\
  	libpoppler-qt.la			\
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 88cf20d30f1f..547c93f81559 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,56 +1,49 @@
---- utils/Makefile.in.orig	Sat May  6 22:21:41 2006
-+++ utils/Makefile.in	Sat May  6 22:22:56 2006
-@@ -61,42 +61,35 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+--- 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)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdffonts_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = 
  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 \
--	$(am__DEPENDENCIES_1)
-+pdfimages_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = 
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdfinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = 
  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 \
--	$(am__DEPENDENCIES_1)
-+pdftohtml_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES =
  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 \
--	$(am__DEPENDENCIES_1)
-+pdftoppm_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES =
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdftops_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES =
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdftotext_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES =
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -294,7 +287,7 @@ INCLUDES = \
+@@ -291,7 +291,7 @@
  	$(UTILS_CFLAGS)
  
  LDADD = \
@@ -58,4 +51,4 @@
 +	-lpoppler				\
  	$(UTILS_LIBS)
  
- 
+ dist_man1_MANS = \