Update to 5.2.4 from Bernd Ernesti.

* Changes from 5.2.3

   1) New printers supported in this release:

      Canon PIXMA iX4000
      Canon SELPHY CP-520
      EPSON Stylus Photo R2880
      EPSON Stylus DX4000

   2) Printing to the Epson PM-D600 has been corrected.

   3) Printing using the manual sheet guide on the Epson Stylus Photo
      R2400 has been corrected.

   4) Printing to the EPSON Artisan 700 and 800 and Stylus Photo
      P/TX700 and 800 series printers has been corrected.  Among other
      issues, it should now be possible to print reliably using the
      photo tray.

   5) The names of the following Epson printers have been corrected:

      EPSON Stylus Photo PX700W
      EPSON Stylus Photo TX700W
      EPSON Stylus Photo PX800FW
      EPSON Stylus Photo TX800FW

   6) The names of various Ricoh and Ricoh-based printers have been
      corrected to match Ricoh's model names and the OpenPrinting
      database.

   7) The EPSON inkjet utility, escputil, now correctly prints the
      color name for low ink warnings.

   8) Printing resolution names have been fixed in non-English locales
      in CUPS PPD files.

   9) A Russian translation has been added.  The Danish and Italian
      translations have been updated.

   10) Support has been added for L-size paper with tear-off borders.

   11) The ordering of inks in quadtone ink sets on Epson printers has
      been corrected.  In addition, support has been added for MIS
      quadtone and 6 tone inks.

   12) It is now possible to adjust the ink parameters for quadtone
      inks in CUPS.  Previously, these parameters could only be
      adjusted in the enhanced Print plugin for GIMP and other native
      Gutenprint applications.

   13) Updating CUPS PPD files is now faster.

4 files changed, 20 insertions, 13 deletions

diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 4d763fbacce..ccd38ba0990 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2009/05/02 16:21:45 reed Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/19 00:19:06 gdt Exp $
 
-VERSION=	5.2.3
+VERSION=	5.2.4
 DISTNAME=	gutenprint-${VERSION}
 EXTRACT_SUFX=	.tar.bz2
 PKGNAME=	gutenprint-lib-${VERSION}
diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST
index 7f359efa86c..86a9ef2e98c 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:16:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/08/19 00:19:06 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -66,6 +66,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/f360_photo.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/f360_photo7_japan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/f360_ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/f360_ultrachrome_k3.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/f360_ultrachrome_k3v.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/nx100.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/photo_gen0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/photo_gen1.xml
@@ -96,10 +97,12 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/r1800.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/r2400.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/r2880.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/rx680.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/rx700.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/spro5000.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/standard_roll_feed.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/artisan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/b500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c120.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c64.xml
@@ -116,6 +119,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/media/f360_photo.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/f360_photo7_japan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/f360_ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/f360_ultrachrome_k3.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/f360_ultrachrome_k3v.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/nx100.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen1.xml
@@ -236,6 +240,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_94.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_95.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_96.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_97.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_98.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/p1_5.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/picturemate.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/standard.xml
@@ -308,6 +313,8 @@ share/locale/pl/LC_MESSAGES/gutenprint.mo
 share/locale/pl/gutenprint_pl.po
 share/locale/pt/LC_MESSAGES/gutenprint.mo
 share/locale/pt/gutenprint_pt.po
+share/locale/ru/LC_MESSAGES/gutenprint.mo
+share/locale/ru/gutenprint_ru.po
 share/locale/sk/LC_MESSAGES/gutenprint.mo
 share/locale/sk/gutenprint_sk.po
 share/locale/sv/LC_MESSAGES/gutenprint.mo
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index f40581dc239..457d63026c5 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2008/12/24 00:53:14 gdt Exp $
+$NetBSD: distinfo,v 1.6 2009/08/19 00:19:06 gdt Exp $
 
-SHA1 (gutenprint-5.2.3.tar.bz2) = e4ddb21665578835d58267d59b57d8d970c3ee86
-RMD160 (gutenprint-5.2.3.tar.bz2) = ae6edf1dea2cd88572736bf0784a4353b59e7113
-Size (gutenprint-5.2.3.tar.bz2) = 4929205 bytes
+SHA1 (gutenprint-5.2.4.tar.bz2) = ae680314650dd9a52df5fd11cd0282cc6f9662e6
+RMD160 (gutenprint-5.2.4.tar.bz2) = c42cfc847d3886c2a299a30dbcdf66a119a282de
+Size (gutenprint-5.2.4.tar.bz2) = 5119559 bytes
 SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579
-SHA1 (patch-ab) = 2c250e13a96dbfcaf09e68ae36d3e6d23380d906
+SHA1 (patch-ab) = bc9633845555e1bfeeddb94eb1b45353dd96ba7b
diff --git a/print/gutenprint-lib/patches/patch-ab b/print/gutenprint-lib/patches/patch-ab
index 93be028b279..71bcc0b6ad9 100644
--- a/print/gutenprint-lib/patches/patch-ab
+++ b/print/gutenprint-lib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2008/12/20 19:16:27 rillig Exp $
+$NetBSD: patch-ab,v 1.3 2009/08/19 00:19:06 gdt Exp $
 
---- ./configure.orig	2008-11-14 13:49:21.000000000 +0100
-+++ ./configure	2008-12-19 21:23:35.000000000 +0100
-@@ -26682,7 +26682,7 @@
+--- configure.orig	2009-07-26 22:36:34.000000000 +0200
++++ configure	2009-08-09 17:13:18.000000000 +0200
+@@ -18101,7 +18101,7 @@
  
    else
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.2 2008/12/20 19:16:27 rillig Exp $
 +  for stp_ac_arg in -O2 -O1 -O ; do
      stp_ac_save_CFLAGS="${CFLAGS}"
  
-   { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+   { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5