update to 0.5.4

changes:
-Automatically read in CJK encoding files
-Speed ups
-let the utils take input on stdin
-Bugs fixed

4 files changed, 37 insertions, 43 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 071be27657d..3f67e7f94ba 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2006/05/31 18:13:54 drochner Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/10/12 14:12:15 drochner Exp $
 #
 
-POPPLER_VERS=		0.5.3
+POPPLER_VERS=		0.5.4
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index ea719e44b2f..e09b9cf5009 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/10/10 20:07:05 rillig Exp $
+$NetBSD: distinfo,v 1.15 2006/10/12 14:12:15 drochner Exp $
 
-SHA1 (poppler-0.5.3.tar.gz) = e197f5cf56f0676b5ca313577dd6456a393c46ec
-RMD160 (poppler-0.5.3.tar.gz) = 3456de23955fc4001842c76d32deba308bd7f968
-Size (poppler-0.5.3.tar.gz) = 1049900 bytes
+SHA1 (poppler-0.5.4.tar.gz) = edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1
+RMD160 (poppler-0.5.4.tar.gz) = f28c89b03388757067505df3c60a1d878626b0dd
+Size (poppler-0.5.4.tar.gz) = 1062401 bytes
 SHA1 (patch-aa) = dba62eabac1d77b5a64c47aaa0ba94208149668b
-SHA1 (patch-ab) = c00be67e0ff6c171c57a1762f7ff23db4b449acf
-SHA1 (patch-ac) = c5efc07d869486e43169c50f30341d29634facf3
+SHA1 (patch-ab) = 5ff54831e530c857b88f90c91108d1a04178579e
+SHA1 (patch-ac) = ba2f2e83897e4c56541da6e9e4f1b61d60fea9b0
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 20618cad3dd..315175e7132 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2006/10/12 14:12:15 drochner Exp $
 
---- utils/Makefile.in.orig	2006-05-22 22:15:21.000000000 +0200
+--- utils/Makefile.in.orig	2006-09-22 02:54:29.000000000 +0200
 +++ utils/Makefile.in
 @@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
@@ -11,33 +11,29 @@ $NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS)
-@@ -61,41 +61,41 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+@@ -60,35 +60,35 @@ am__objects_1 = parseargs.$(OBJEXT)
+ 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 \
-+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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 = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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 = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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 = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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)
@@ -45,24 +41,22 @@ $NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
 +	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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 = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  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 = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -283,12 +283,12 @@ sbindir = @sbindir@
+ am__depfiles_maybe = depfiles
+@@ -278,12 +278,12 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -80,7 +74,7 @@ $NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/utils			\
-@@ -296,8 +296,8 @@ INCLUDES = \
+@@ -291,8 +291,8 @@ INCLUDES = \
  	$(UTILS_CFLAGS)
  
  LDADD = \
diff --git a/print/poppler/patches/patch-ac b/print/poppler/patches/patch-ac
index 976d563b7bf..cb48e8a6f78 100644
--- a/print/poppler/patches/patch-ac
+++ b/print/poppler/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/10/10 20:07:05 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2006/10/12 14:12:15 drochner Exp $
 
---- configure.orig	2006-10-10 21:12:34.000000000 +0200
-+++ configure	2006-10-10 22:05:51.000000000 +0200
-@@ -24856,7 +24856,7 @@ if test "x$qt_libdir" != "xno" ; then
+--- configure.orig	2006-10-12 12:26:10.000000000 +0200
++++ configure
+@@ -25346,7 +25346,7 @@ if test "x$qt_libdir" != "xno" ; then
      fi
  fi
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2006/10/10 20:07:05 rillig Exp $
      ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -25044,7 +25044,7 @@ if test "x$qt_libdir" != "xno" ; then
+@@ -25534,7 +25534,7 @@ if test "x$qt_libdir" != "xno" ; then
      fi
  fi
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.3 2006/10/10 20:07:05 rillig Exp $
      ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -25259,7 +25259,7 @@ if test "x$qt4_libdir" != "xno" ; then
+@@ -25754,7 +25754,7 @@ if test "x$qt4_libdir" != "xno" ; then
      fi
  fi
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.3 2006/10/10 20:07:05 rillig Exp $
      POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
      if test x$windows_qt = xyes; then
  	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
-@@ -25332,7 +25332,7 @@ if test "x$qt4_libdir" != "xno" ; then
+@@ -25827,7 +25827,7 @@ if test "x$qt4_libdir" != "xno" ; then
      fi
  fi
  
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.3 2006/10/10 20:07:05 rillig Exp $
      POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
      if test x$windows_qt = xyes; then
  	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
-@@ -25410,7 +25410,7 @@ if test "x$qt4test_libdir" != "xno" ; th
+@@ -25910,7 +25910,7 @@ if test "x$qt4test_libdir" != "xno" ; th
      fi
  fi