update to 0.10.7

changes: bugfixes

3 files changed, 19 insertions, 19 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index e6382e4971f..5e060abad15 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2009/04/17 16:08:17 drochner Exp $
+# $NetBSD: Makefile.common,v 1.30 2009/05/25 21:05:23 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.10.6
+POPPLER_VERS=		0.10.7
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index c869cd1827a..e9bf5c33e2c 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.43 2009/04/17 16:08:17 drochner Exp $
+$NetBSD: distinfo,v 1.44 2009/05/25 21:05:23 drochner Exp $
 
-SHA1 (poppler-0.10.6.tar.gz) = 0bab946444788ee9f21bdfeba6d3d635a618b809
-RMD160 (poppler-0.10.6.tar.gz) = e4faec8cc22f25a73c1dea054df1d43a364a5e1a
-Size (poppler-0.10.6.tar.gz) = 1527715 bytes
+SHA1 (poppler-0.10.7.tar.gz) = 891284d3fcac9bb250218e3439e596778c7f5edb
+RMD160 (poppler-0.10.7.tar.gz) = a275742a11df1965e4b7d06115f071f67d781d8f
+Size (poppler-0.10.7.tar.gz) = 1531154 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
-SHA1 (patch-ab) = 5a2785bccd71990e20cd81a3cd2697804e31788d
+SHA1 (patch-ab) = 096382d2f7c240c7fbf5eee88d7ba5af5cf7cd1b
 SHA1 (patch-ag) = 0bf1bc080cad55792fe6cc761bf22ecccba7d13a
 SHA1 (patch-ai) = b58704153418b5e3b5d65a2e02e5a9b306b00cf7
 SHA1 (patch-aj) = 8bb1fe169bddb76ecc72129cc1dbd32030073dfd
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 4dd3c69eb00..650a1ab9910 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2008/10/24 23:28:53 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2009/05/25 21:05:24 drochner Exp $
 
---- utils/Makefile.in.orig	2008-10-09 19:13:22.000000000 +0000
+--- utils/Makefile.in.orig	2009-05-16 17:40:51.000000000 +0200
 +++ utils/Makefile.in
-@@ -49,7 +49,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -51,7 +51,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
  	$(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.9 2008/10/24 23:28:53 wiz Exp $
  @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -59,19 +59,19 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+@@ -61,19 +61,19 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.9 2008/10/24 23:28:53 wiz Exp $
  	$(am__DEPENDENCIES_1)
  am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
  @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
-@@ -84,25 +84,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
+@@ -88,25 +88,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -66,7 +66,7 @@ $NetBSD: patch-ab,v 1.9 2008/10/24 23:28:53 wiz Exp $
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -293,12 +293,12 @@ target_alias = @target_alias@
+@@ -307,12 +307,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
@@ -81,10 +81,10 @@ $NetBSD: patch-ab,v 1.9 2008/10/24 23:28:53 wiz Exp $
 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
 +pdftoppm_binary = pdftoppm
 +pdftoppm_manpage = pdftoppm.1
- @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
- @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\
- @BUILD_ABIWORD_OUTPUT_TRUE@	$(common)
-@@ -313,9 +313,10 @@ INCLUDES = \
+ INCLUDES = \
+ 	-I$(top_srcdir)				\
+ 	-I$(top_srcdir)/utils			\
+@@ -322,9 +322,10 @@ INCLUDES = \
  	$(ABIWORD_CFLAGS)
  
  LDADD = \
@@ -95,5 +95,5 @@ $NetBSD: patch-ab,v 1.9 2008/10/24 23:28:53 wiz Exp $
 +	$(FONTCONFIG_LIBS) \
 +	$(PTHREAD_STUBLIB)
  
- dist_man1_MANS = \
- 	pdffonts.1				\
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\