6 files changed, 84 insertions, 83 deletions

diff --git a/graphics/poppler/files/patch-Makefile.in b/graphics/poppler/files/patch-Makefile.in
deleted file mode 100644
index 02c8919d0713..000000000000
--- a/graphics/poppler/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -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)
- EXTRA_DIST = \
- 	README-XPDF				\
- 	poppler.pc.in				\
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index 1df868bc4b3c..94d7703cd62b 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,23 +1,22 @@
---- glib/Makefile.in.orig	2007-09-10 23:46:36.000000000 -0400
-+++ glib/Makefile.in	2007-09-10 23:49:39.000000000 -0400
-@@ -66,7 +66,6 @@ am__DEPENDENCIES_1 =
+--- glib/Makefile.in.orig	2008-03-24 09:03:54.000000000 -0400
++++ glib/Makefile.in	2008-03-24 09:04:38.000000000 -0400
+@@ -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_2)
  am__objects_1 = poppler-enums.lo
-@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
- am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
+@@ -80,7 +79,6 @@
+ @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
- test_poppler_glib_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
-+	libpoppler-glib.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_2)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -285,7 +284,7 @@ win32_libs = @win32_libs@
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
+ @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
+@@ -295,7 +293,7 @@
  @BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la	\
  @BUILD_CAIRO_OUTPUT_TRUE@	$(CAIRO_LIBS)
  
@@ -26,21 +25,21 @@
  INCLUDES = \
  	-DG_LOG_DOMAIN=\"Poppler\"		\
  	-I$(top_srcdir)				\
-@@ -323,7 +322,7 @@ libpoppler_glib_la_SOURCES = \
+@@ -336,7 +334,7 @@
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
 +	-lpoppler					\
  	$(POPPLER_GLIB_LIBS)				\
+ 	$(GDK_LIBS)					\
  	$(FREETYPE_LIBS)				\
- 	$(FONTCONFIG_LIBS)				\
-@@ -334,7 +333,7 @@ test_poppler_glib_SOURCES = \
-        test-poppler-glib.c
+@@ -348,7 +346,7 @@
+ @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
  
- test_poppler_glib_LDADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-glib.la			\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(FREETYPE_LIBS)			\
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
++@BUILD_WITH_GDK_TRUE@	-lpoppler				\
+ @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
+ @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
+ @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
diff --git a/graphics/poppler/files/patch-qt4_Makefile.in b/graphics/poppler/files/patch-qt4_Makefile.in
index d23d6319a3f0..ffb4777b4074 100644
--- a/graphics/poppler/files/patch-qt4_Makefile.in
+++ b/graphics/poppler/files/patch-qt4_Makefile.in
@@ -1,10 +1,10 @@
---- qt4/Makefile.in.orig	2007-08-27 20:43:27.000000000 -0400
-+++ qt4/Makefile.in	2007-08-27 20:43:46.000000000 -0400
-@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@
+--- qt4/Makefile.in.orig	2008-03-24 08:30:49.000000000 -0400
++++ qt4/Makefile.in	2008-03-24 08:30:34.000000000 -0400
+@@ -223,7 +223,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  win32_libs = @win32_libs@
--SUBDIRS = src tests
+-SUBDIRS = src tests demos
 +SUBDIRS = src
  all: all-recursive
  
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..b63f278d1b8b
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -0,0 +1,28 @@
+--- qt4/src/Makefile.in.orig	2008-06-20 11:27:32.000000000 -0500
++++ qt4/src/Makefile.in	2008-06-20 11:29:36.000000000 -0500
+@@ -62,7 +62,6 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libpoppler_qt4_la_DEPENDENCIES =  \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__append_1)
+ am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
+ 	poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
+@@ -302,7 +301,7 @@
+ 	poppler-export.h			\
+ 	poppler-private.h
+ 
+-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt4_la_LIBADD = -lpoppler \
+ 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
+ libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0
+ all: all-am
+@@ -620,7 +619,7 @@
+ 
+ # This rule lets GNU make create any *.moc from the equivalent *.h
+ .h.moc:
+-	moc -i $< -o $@
++	moc-qt4 -i $< -o $@
+ 
+ poppler-optcontent.lo: poppler-optcontent.moc
+ 
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index 4ad2d0c3da9d..d872262ea020 100644
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- qt/Makefile.in.orig	2008-03-27 08:17:35.000000000 -0400
++++ qt/Makefile.in	2008-03-27 08:18:20.000000000 -0400
+@@ -59,8 +59,7 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -10,17 +10,16 @@
  	$(am__DEPENDENCIES_1)
  am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
  	poppler-link.lo poppler-page.lo poppler-page-transition.lo
-@@ -72,8 +71,7 @@
+@@ -71,7 +70,7 @@
  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)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
++test_poppler_qt_DEPENDENCIES = \
+ 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -286,7 +284,7 @@
+@@ -273,7 +272,7 @@
  	poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
@@ -29,7 +28,7 @@
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)			\
  	$(FONTCONFIG_LIBS)
-@@ -296,7 +294,7 @@
+@@ -283,7 +282,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 ffc289c45ab2..72154021da8d 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,64 +1,63 @@
---- 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 @@
+--- utils/Makefile.in.orig	2008-03-27 08:18:44.000000000 -0400
++++ utils/Makefile.in	2008-03-27 08:19:51.000000000 -0400
+@@ -58,48 +58,48 @@
  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 = \
+ 	$(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 \
--	$(am__DEPENDENCIES_1)
-+pdfimages_DEPENDENCIES =	$(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 \
--	$(am__DEPENDENCIES_1)
-+pdfinfo_DEPENDENCIES =	$(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)
++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 \
--	$(am__DEPENDENCIES_1)
-+pdftohtml_DEPENDENCIES = 	$(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 \
--	$(am__DEPENDENCIES_1)
-+pdftoppm_DEPENDENCIES =	$(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 \
--	$(am__DEPENDENCIES_1)
-+pdftops_DEPENDENCIES = 	$(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 \
--	$(am__DEPENDENCIES_1)
-+pdftotext_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
++pdftotext_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -318,7 +310,7 @@
+@@ -302,7 +302,7 @@
  	$(ABIWORD_CFLAGS)
  
  LDADD = \