update to 0.10.6

changes:
* Fix problems that happen when parsing broken JBIG2 files.
  CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180
  CVE-2009-1181, CVE-2009-1182, CVE-2009-1183, CVE-2009-1187, CVE-2009-1188
* Fix parsing of incorrect border arrays. (was patched in pkgsrc)
* Fix clip test for fonts.
* Fix getGlyphAdvance to behave correctly on font size changes.
* Misc build fixes

5 files changed, 106 insertions, 257 deletions

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index f181cfe7431..7ce2fd0efbc 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2009/04/06 09:29:27 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2009/04/17 16:08:17 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=		1
-
 COMMENT=		PDF rendering library
 MAINTAINER=		reed@reedmedia.net
 
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 3ee54534866..e6382e4971f 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2009/03/19 12:12:24 drochner Exp $
+# $NetBSD: Makefile.common,v 1.29 2009/04/17 16:08:17 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.5
+POPPLER_VERS=		0.10.6
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 00e63d0342b..c869cd1827a 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.42 2009/04/06 09:29:27 drochner Exp $
+$NetBSD: distinfo,v 1.43 2009/04/17 16:08:17 drochner Exp $
 
-SHA1 (poppler-0.10.5.tar.gz) = 720b79adbeb6e7b722d3f0f61e165b9310fe61fc
-RMD160 (poppler-0.10.5.tar.gz) = 73e2330c2c874fb58f95c39fcdb5421766b6742c
-Size (poppler-0.10.5.tar.gz) = 1516687 bytes
+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 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = 5a2785bccd71990e20cd81a3cd2697804e31788d
 SHA1 (patch-ag) = 0bf1bc080cad55792fe6cc761bf22ecccba7d13a
-SHA1 (patch-ai) = 614a310e9dabbc52e47fb17b116e139ab8880995
+SHA1 (patch-ai) = b58704153418b5e3b5d65a2e02e5a9b306b00cf7
 SHA1 (patch-aj) = 8bb1fe169bddb76ecc72129cc1dbd32030073dfd
 SHA1 (patch-ak) = ab4d0c91a6f2806b405954f8dab6e3d61a03b054
 SHA1 (patch-al) = b1d76a92a5ffad01543f0072a1a00e74e751a56f
 SHA1 (patch-am) = 2ee61c446ea85acde8c1ee798a0201901e565d55
-SHA1 (patch-bc) = d2f51580ae122545a0f9139714d7a7ff94814698
 SHA1 (patch-ca) = 5bd31c497c8cbfb6c1d6cb5b9183088113bef6e3
 SHA1 (patch-cb) = e8cfb16a0641788759b13cf5fcf97d82f9485adc
diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai
index 011a5a5bb1f..9dd9753f472 100644
--- a/print/poppler/patches/patch-ai
+++ b/print/poppler/patches/patch-ai
@@ -1,17 +1,25 @@
-$NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
+$NetBSD: patch-ai,v 1.8 2009/04/17 16:08:17 drochner Exp $
 
---- configure.orig	2009-03-12 00:15:52.000000000 +0100
+--- configure.orig	2009-04-16 22:21:56.000000000 +0200
 +++ configure
-@@ -948,6 +948,8 @@ BUILD_ABIWORD_OUTPUT_TRUE
- BUILD_ABIWORD_OUTPUT_FALSE
- BUILD_UTILS_TRUE
- BUILD_UTILS_FALSE
-+USE_CMS_TRUE
-+USE_CMS_FALSE
- PC_REQUIRES
- PC_REQUIRES_PRIVATE
+@@ -787,6 +787,8 @@ ac_subst_vars='LTLIBOBJS
  LIBOBJS
-@@ -1597,6 +1599,7 @@ Optional Features:
+ PC_REQUIRES_PRIVATE
+ PC_REQUIRES
++USE_CMS_FALSE
++USE_CMS_TRUE
+ BUILD_UTILS_FALSE
+ BUILD_UTILS_TRUE
+ BUILD_ABIWORD_OUTPUT_FALSE
+@@ -1005,6 +1007,7 @@ enable_gtk_test
+ enable_abiword_output
+ enable_utils
+ enable_compile_warnings
++enable_cms
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1701,6 +1704,7 @@ Optional Features:
    --enable-compile-warnings=[no/yes/kde]
                               Turn on compiler warnings.
  
@@ -19,48 +27,16 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -20355,13 +20358,11 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -20401,13 +20402,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #define _LARGEFILE_SOURCE 1
--#include <sys/types.h> /* for off_t */
--     #include <stdio.h>
-+#include <stdio.h>
- int
- main ()
- {
--int (*fp) (FILE *, off_t, int) = fseeko;
--     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-   ;
-   return 0;
- }
-@@ -24123,7 +24122,7 @@ fi
+@@ -24668,7 +24672,7 @@ fi
  if test x$enable_poppler_qt4 = xyes; then
-   { echo "$as_me:$LINENO: checking for Qt4 moc" >&5
- echo $ECHO_N "checking for Qt4 moc... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for Qt4 moc" >&5
+ $as_echo_n "checking for Qt4 moc... " >&6; }
 -  MOCQT4=`which moc`
 +  MOCQT4=${QTDIR}/bin/moc
    mocversion=`$MOCQT4 -v 2>&1`
    mocversiongrep=`echo $mocversion | grep "Qt 4"`
    if test x"$mocversiongrep" != x"$mocversion"; then
-@@ -24578,6 +24577,249 @@ else
+@@ -25127,6 +25131,259 @@ else
  fi
  
  
@@ -74,10 +50,10 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
 +
 +if test x$enable_cms = xyes; then
 +
-+{ echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
-+echo $ECHO_N "checking for cmsOpenProfileFromFile in -llcms... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5
++$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; }
 +if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-llcms  $LIBS"
@@ -109,33 +85,37 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
 +  ac_cv_lib_lcms_cmsOpenProfileFromFile=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_lcms_cmsOpenProfileFromFile=no
 +fi
 +
++rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
-+echo "${ECHO_T}$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
-+if test $ac_cv_lib_lcms_cmsOpenProfileFromFile = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5
++$as_echo "$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; }
++if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = x""yes; then
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBLCMS 1
 +_ACEOF
@@ -143,28 +123,29 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
 +  LIBS="-llcms $LIBS"
 +
 +else
-+  { { echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5
-+echo "$as_me: error: \"*** lcms library not found ***\"" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5
++$as_echo "$as_me: error: \"*** lcms library not found ***\"" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
 +
 +
 +for ac_header in lcms.h
 +do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
 +else
 +  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -180,32 +161,33 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_compile") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
 +
 +# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -219,74 +201,78 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
 +  ac_header_preproc=yes
 +else
-+  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
 +fi
 +
 +rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +
 +    ;;
 +esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
 +else
 +  eval "$as_ac_Header=\$ac_header_preproc"
 +fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
 +
 +fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
 +  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 +
 +else
-+  { { echo "$as_me:$LINENO: error: \"*** lcms headers not found ***\"" >&5
-+echo "$as_me: error: \"*** lcms headers not found ***\"" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: \"*** lcms headers not found ***\"" >&5
++$as_echo "$as_me: error: \"*** lcms headers not found ***\"" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
 +
@@ -310,65 +296,21 @@ $NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
  if test "x$GCC" != xyes; then
    enable_compile_warnings=no
  fi
-@@ -24849,6 +25091,13 @@ echo "$as_me: error: conditional \"BUILD
+@@ -25399,6 +25656,13 @@ $as_echo "$as_me: error: conditional \"B
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
 +if test -z "${USE_CMS_TRUE}" && test -z "${USE_CMS_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"USE_CMS\" was never defined.
++  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_CMS\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"USE_CMS\" was never defined.
++$as_echo "$as_me: error: conditional \"USE_CMS\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
  
  : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -25984,13 +26233,15 @@ BUILD_ABIWORD_OUTPUT_TRUE!$BUILD_ABIWORD
- BUILD_ABIWORD_OUTPUT_FALSE!$BUILD_ABIWORD_OUTPUT_FALSE$ac_delim
- BUILD_UTILS_TRUE!$BUILD_UTILS_TRUE$ac_delim
- BUILD_UTILS_FALSE!$BUILD_UTILS_FALSE$ac_delim
-+USE_CMS_TRUE!$USE_CMS_TRUE$ac_delim
-+USE_CMS_FALSE!$USE_CMS_FALSE$ac_delim
- PC_REQUIRES!$PC_REQUIRES$ac_delim
- PC_REQUIRES_PRIVATE!$PC_REQUIRES_PRIVATE$ac_delim
- LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -26009,7 +26260,7 @@ fi
- 
- cat >>$CONFIG_STATUS <<_ACEOF
- cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- _ACEOF
- sed '
- s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-@@ -26022,8 +26273,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
- ' >>$CONFIG_STATUS <conf$$subs.sed
- rm -f conf$$subs.sed
- cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
- CEOF$ac_eof
- _ACEOF
- 
-@@ -26277,7 +26526,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
- s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-@@ -27412,6 +27661,7 @@ echo "  use gtk-doc:        $enable_gtk_
+ ac_write_fail=0
+@@ -27938,6 +28202,7 @@ echo "  use gtk-doc:        $enable_gtk_
  echo "  use libjpeg:        $enable_libjpeg"
  echo "  use zlib:           $enable_zlib"
  echo "  use libopenjpeg:    $enable_libopenjpeg"
diff --git a/print/poppler/patches/patch-bc b/print/poppler/patches/patch-bc
deleted file mode 100644
index d3eec7b10cd..00000000000
--- a/print/poppler/patches/patch-bc
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2009/03/19 12:12:24 drochner Exp $
-
---- poppler/Annot.cc.orig	2009-02-09 00:28:40.000000000 +0100
-+++ poppler/Annot.cc
-@@ -456,49 +456,67 @@ AnnotBorderArray::AnnotBorderArray(Array
-   Object obj1;
-   int arrayLength = array->getLength();
- 
--  if (arrayLength >= 3) {
-+  GBool correct = gTrue;
-+  if (arrayLength == 3 || arrayLength == 4) {
-     // implementation note 81 in Appendix H.
- 
-     if (array->get(0, &obj1)->isNum())
-       horizontalCorner = obj1.getNum();
-+    else
-+      correct = gFalse;
-     obj1.free();
- 
-     if (array->get(1, &obj1)->isNum())
-       verticalCorner = obj1.getNum();
-+    else
-+      correct = gFalse;
-     obj1.free();
- 
-     if (array->get(2, &obj1)->isNum())
-       width = obj1.getNum();
-+    else
-+      correct = gFalse;
-     obj1.free();
- 
-     // TODO: check not all zero ? (Line Dash Pattern Page 217 PDF 8.1)
--    if (arrayLength > 3) {
--      GBool correct = gTrue;
--      int tempLength = array->getLength() - 3;
--      double *tempDash = (double *) gmallocn (tempLength, sizeof (double));
-+    if (arrayLength == 4) {
-+      if (array->get(3, &obj1)->isArray()) {
-+        Array *dashPattern = obj1.getArray();
-+        int tempLength = dashPattern->getLength();
-+        double *tempDash = (double *) gmallocn (tempLength, sizeof (double));
-+
-+        for(int i = 0; i < tempLength && i < DASH_LIMIT && correct; i++) {
- 
--      for(int i = 0; i < tempLength && i < DASH_LIMIT && correct; i++) {
-+          if (dashPattern->get(i, &obj1)->isNum()) {
-+            tempDash[i] = obj1.getNum();
- 
--        if (array->get((i + 3), &obj1)->isNum()) {
--          tempDash[i] = obj1.getNum();
-+            if (tempDash[i] < 0)
-+              correct = gFalse;
- 
--          if (tempDash[i] < 0)
-+          } else {
-             correct = gFalse;
-+          }
-+          obj1.free();
-+        }
- 
-+        if (correct) {
-+          dashLength = tempLength;
-+          dash = tempDash;
-+          style = borderDashed;
-         } else {
--          correct = gFalse;
-+          gfree (tempDash);
-         }
--        obj1.free();
--      }
--
--      if (correct) {
--        dashLength = tempLength;
--        dash = tempDash;
--        style = borderDashed;
-       } else {
--        gfree (tempDash);
-+        correct = gFalse;
-       }
-+      obj1.free();
-     }
-+  } else {
-+    correct = gFalse;
-+  }
-+  
-+  if (!correct) {
-+    width = 0;
-   }
- }
-