Update to 0.8.0

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10837 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 30 insertions, 32 deletions

diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index 4ad2d0c3d..d872262ea 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 ffc289c45..72154021d 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 = \