Update to 5.2.10.

Gutenprint 5.2.10 no longer supports Macintosh OS X 10.4 or earlier.

[See NEWS for the list of printers; ~1000 lines were omitted from this
commit message.]

  1) Added a unified CUPS backend to support selected dye sublimation
     printers.

  2) New printers supported in this release:

     [many]

  3) The following Canon printer models were not added, as they cannot
     currently be supported, even experimentally, owing to an as-yet
     unknown command format or other issues:

     [several]

  4) Corrected page dimensions for borderless printing with Canon
     inkjet printers.

  5) Added duplex support for the EPSON WorkForce 630, 635, and 645,
     and NX635

  6) Expanded printable area at the bottom of the page for the Epson
     Stylus Pro 3800 and 3880.

  7) Added IEEE1284 device IDs for the following printers.

     [many]

  8) Added Catalan, Turkish, and Vietnamese translations.

4 files changed, 31 insertions, 16 deletions

diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 2e0c9fa21b5..f80c0e56f14 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2015/09/10 00:10:24 gdt Exp $
 
-VERSION=	5.2.9
+VERSION=	5.2.10
 DISTNAME=	gutenprint-${VERSION}
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	22
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST
index f345d8aff07..aa8999c598f 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/06/13 23:19:19 gdt Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/09/10 00:10:24 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -85,9 +85,11 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k34.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v10.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_ultrachrome_k3v4.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/standard_gen0.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/sx445.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/ultrachrome.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf40.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/wf500.xml
@@ -98,6 +100,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_cutter_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cd_roll_feed.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/cutter_roll_feed.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default-duplex.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/default.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro3880.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots/pro_cutter_roll_feed.xml
@@ -109,6 +112,7 @@ 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/inputslots/wf7000.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
@@ -144,6 +148,7 @@ 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/pro_ultrachrome_k3v.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_ultrachrome_k3v10.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
@@ -173,7 +178,11 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_114.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_115.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_116.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_117.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_118.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_119.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_12.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_120.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_121.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_13.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_15.xml
@@ -291,9 +300,9 @@ share/gutenprint/doc/gutenprint-users-manual.odt
 share/gutenprint/doc/gutenprint-users-manual.pdf
 share/gutenprint/doc/gutenprint.pdf
 share/gutenprint/doc/reference-html/book1.html
-share/gutenprint/doc/reference-html/c1717.html
+share/gutenprint/doc/reference-html/c1715.html
 share/gutenprint/doc/reference-html/c194.html
-share/gutenprint/doc/reference-html/c1968.html
+share/gutenprint/doc/reference-html/c1966.html
 share/gutenprint/doc/reference-html/c200.html
 share/gutenprint/doc/reference-html/c39.html
 share/gutenprint/doc/reference-html/c464.html
@@ -303,17 +312,19 @@ share/gutenprint/doc/reference-html/f14.html
 share/gutenprint/doc/reference-html/gpl-terms.html
 share/gutenprint/doc/reference-html/gpl.html
 share/gutenprint/doc/reference-html/ln10.html
-share/gutenprint/doc/reference-html/x1669.html
-share/gutenprint/doc/reference-html/x1734.html
+share/gutenprint/doc/reference-html/x1667.html
+share/gutenprint/doc/reference-html/x1732.html
 share/gutenprint/doc/reference-html/x271.html
 share/gutenprint/doc/reference-html/x67.html
 share/gutenprint/doc/reference-html/x79.html
-share/gutenprint/doc/reference-html/x955.html
+share/gutenprint/doc/reference-html/x953.html
 share/gutenprint/samples/colorbars4.png
 share/gutenprint/samples/colorsweep.png
 share/gutenprint/samples/extended.sample
 share/gutenprint/samples/profile.jpg
 share/gutenprint/samples/testpattern.sample
+share/locale/ca/LC_MESSAGES/gutenprint.mo
+share/locale/ca/gutenprint_ca.po
 share/locale/cs/LC_MESSAGES/gutenprint.mo
 share/locale/cs/gutenprint_cs.po
 share/locale/da/LC_MESSAGES/gutenprint.mo
@@ -354,8 +365,12 @@ share/locale/sl/LC_MESSAGES/gutenprint.mo
 share/locale/sl/gutenprint_sl.po
 share/locale/sv/LC_MESSAGES/gutenprint.mo
 share/locale/sv/gutenprint_sv.po
+share/locale/tr/LC_MESSAGES/gutenprint.mo
+share/locale/tr/gutenprint_tr.po
 share/locale/uk/LC_MESSAGES/gutenprint.mo
 share/locale/uk/gutenprint_uk.po
+share/locale/vi/LC_MESSAGES/gutenprint.mo
+share/locale/vi/gutenprint_vi.po
 share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
 share/locale/zh_CN/gutenprint_zh_CN.po
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index f02125c0b5e..e86f352b250 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2012/07/08 11:34:14 gdt Exp $
+$NetBSD: distinfo,v 1.14 2015/09/10 00:10:24 gdt Exp $
 
-SHA1 (gutenprint-5.2.9.tar.bz2) = ecfd3757c5f8ddc994e4e60f713f5b9561b8cf28
-RMD160 (gutenprint-5.2.9.tar.bz2) = 4239535bfde87937c678d3942cdd3e37d8905765
-Size (gutenprint-5.2.9.tar.bz2) = 5720450 bytes
-SHA1 (patch-aa) = 42ed47e6f577b6bf562d05f9685f8ff77dc45f88
+SHA1 (gutenprint-5.2.10.tar.bz2) = 9690f9bf0a4c4c6c5a35b43d889ca8a3216c766c
+RMD160 (gutenprint-5.2.10.tar.bz2) = 46d214b3371eaa8aa0fc746eba362068668211ab
+Size (gutenprint-5.2.10.tar.bz2) = 6241585 bytes
+SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
+SHA1 (patch-src_main_print-olympus.c) = 48b421344f35216fdd663da075e40ce4fac0382b
diff --git a/print/gutenprint-lib/patches/patch-aa b/print/gutenprint-lib/patches/patch-aa
index 7a7daaba62c..6725f104f32 100644
--- a/print/gutenprint-lib/patches/patch-aa
+++ b/print/gutenprint-lib/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2010/08/12 12:22:44 gdt Exp $
+$NetBSD: patch-aa,v 1.3 2015/09/10 00:10:24 gdt Exp $
 
 Force, somewhat hackishly, the use of cups lpstat.  Probably upstream
 should find these paths at configure time.
 
---- src/gutenprintui2/plist.c.orig	2008-02-02 11:06:55.000000000 -0500
+--- src/gutenprintui2/plist.c.orig	2014-01-04 00:38:09.000000000 +0000
 +++ src/gutenprintui2/plist.c
 @@ -96,7 +96,7 @@ static const print_system_t default_prin
  static print_system_t known_printing_systems[] =