Update to 5.2.3, from Bernd Ernesti.

* Changes from 5.2.2

   1) CUPS PPD files in non-English locales are now generated
      correctly when the CUPS driver interface is used (with CUPS 1.2
      and above).

   2) Epson inkjet printers that support duplex printing now use less
      restrictive margins (allowing use of more of the page) when
      duplex printing is not used.

   3) Printing to the following Epson printers has been corrected:

      EPSON Artisan 700
      EPSON Artisan 800
      EPSON BX300F
      EPSON EP-801A
      EPSON EP-901A
      EPSON EP-901F
      EPSON ME 300
      EPSON ME Office 360
      EPSON PX-401A
      EPSON Stylus NX100
      EPSON Stylus NX105
      EPSON Stylus Photo PX700FW
      EPSON Stylus Photo PX800FW
      EPSON Stylus Photo TX700W
      EPSON Stylus Photo TX800W
      EPSON Stylus S20
      EPSON Stylus SX100
      EPSON Stylus SX105
      EPSON Stylus T20
      EPSON Stylus TX100
      EPSON Stylus TX101
      EPSON Stylus TX102
      EPSON Stylus TX103
      EPSON Stylus TX105
      EPSON Stylus TX106
      EPSON Stylus TX109
      EPSON TX300F

      These printers should all be fully functional, but may be
      further tuned in the future.

   4) Duplex printing has been enabled on the Epson Stylus RX680,
      RX685, RX690, PM-A940, and PM-T960.  Support for these printers
      is still considered experimental.

   5) Support has been added for the Canon MULTIPASS MP220.

   6) Preliminary support has been added for the Canon PIXMA iP4600.

3 files changed, 17 insertions, 13 deletions

diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 197ea39df6e..2fc7e523a49 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/12/20 18:08:07 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2008/12/24 00:53:14 gdt Exp $
 
-VERSION=	5.2.2
+VERSION=	5.2.3
 DISTNAME=	gutenprint-${VERSION}
 EXTRACT_SUFX=	.tar.bz2
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST
index 5d8c44d5e9b..37aa1890aae 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/12/20 15:57:02 gdt Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/12/24 00:53:14 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -49,6 +49,7 @@ share/cups/calibrate.ppm
 share/gutenprint/${INSTALLVERSION}/xml/dither-matrix-1x1.xml
 share/gutenprint/${INSTALLVERSION}/xml/dither-matrix-2x1.xml
 share/gutenprint/${INSTALLVERSION}/xml/dither-matrix-4x1.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/artisan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/b500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/c120.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/c64.xml
@@ -83,9 +84,10 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard_gen0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/ultrachrome.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/x80.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf40.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf500.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/x80.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/artisan.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/b500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_cutter_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_roll_feed.xml
@@ -94,6 +96,7 @@ 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/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
@@ -113,6 +116,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/nx100.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen1.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen2.xml
@@ -127,12 +131,12 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_gen2.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_pigment.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/r800.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard_gen0.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/media/r800.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/ultrachrome.xml
-share/gutenprint/${INSTALLVERSION}/xml/escp2/media/x80.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/media/wf500.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/x80.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/mediasizes/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_0.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_1.xml
@@ -231,8 +235,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_93.xml
 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/papers.xml
-share/gutenprint/${INSTALLVERSION}/xml/printers.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_97.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
@@ -242,6 +245,8 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/pro7000.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/pro7500.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/pro7600.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/weaves/standard.xml
+share/gutenprint/${INSTALLVERSION}/xml/papers.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers.xml
 share/gutenprint/doc/AUTHORS
 share/gutenprint/doc/COPYING
 share/gutenprint/doc/ChangeLog
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index 4b735983652..f40581dc239 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/12/20 19:16:27 rillig Exp $
+$NetBSD: distinfo,v 1.5 2008/12/24 00:53:14 gdt Exp $
 
-SHA1 (gutenprint-5.2.2.tar.bz2) = 0efaadf2db4c67ecb66e79f5405315975dd1d11b
-RMD160 (gutenprint-5.2.2.tar.bz2) = eac1ce4304f044e9aadfc4081c0408f038f685bd
-Size (gutenprint-5.2.2.tar.bz2) = 4913895 bytes
+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 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579
 SHA1 (patch-ab) = 2c250e13a96dbfcaf09e68ae36d3e6d23380d906