Update to 5.2.8.

* Changes from 5.2.7

  1) The Canon driver has been significantly overhauled for this
     release, and output (and in some cases functionality) may be
     significantly different from previous releases.  We expect to
     perform further work in future releases.  Specific changes
     include:

     [Massive list of Canon printers with changes]

  2) New printers supported in this release:

     [many]

  3) A problem whereby printing did not work at all on some Linux
     distributions has been fixed (3299815 CUPS PPD broken on Linux).

  4) A crash with the EPSON Stylus Photo R3000 has been fixed.

  5) Printing on the Epson Stylus NX200, SX200, and SX205 is believed
     to be corrected.

  6) A build problem with libgutenprintui2 and testpattern on certain
     platforms has been fixed.

  7) Chinese (Mandarin), Galician, and Ukrainian translations have
     been added.

  8) (API) Added function stp_vars_copy_from() to override settings in
     one settings object with those in another.

5 files changed, 16 insertions, 34 deletions

diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 44e12b64546..04ec5c0619f 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2012/03/03 00:13:50 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/06/13 23:19:19 gdt Exp $
 
-VERSION=	5.2.7
+VERSION=	5.2.8
 DISTNAME=	gutenprint-${VERSION}
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	3
 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 4013165c78c..f345d8aff07 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2011/05/05 23:39:24 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/06/13 23:19:19 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -171,6 +171,8 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_112.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_113.xml
 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_12.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_13.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
@@ -269,6 +271,7 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_98.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_99.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/p1_5.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/picturemate.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/prox900.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/standard.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/v2880.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/qualitypresets/wf40.xml
@@ -327,6 +330,8 @@ share/locale/fi/LC_MESSAGES/gutenprint.mo
 share/locale/fi/gutenprint_fi.po
 share/locale/fr/LC_MESSAGES/gutenprint.mo
 share/locale/fr/gutenprint_fr.po
+share/locale/gl/LC_MESSAGES/gutenprint.mo
+share/locale/gl/gutenprint_gl.po
 share/locale/hu/LC_MESSAGES/gutenprint.mo
 share/locale/hu/gutenprint_hu.po
 share/locale/it/LC_MESSAGES/gutenprint.mo
@@ -349,6 +354,10 @@ 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/uk/LC_MESSAGES/gutenprint.mo
+share/locale/uk/gutenprint_uk.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
 share/locale/zh_TW/gutenprint_zh_TW.po
 @pkgdir lib/gutenprint/${INSTALLVERSION}/modules
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index 2a7ad1b902b..f145e2b710f 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.11 2011/11/25 22:17:07 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/06/13 23:19:19 gdt Exp $
 
-SHA1 (gutenprint-5.2.7.tar.bz2) = e49c259607dc6372d4f6316a26fb146715c437c8
-RMD160 (gutenprint-5.2.7.tar.bz2) = 63c6dbc136ac7095c06accf48979a379a923b7de
-Size (gutenprint-5.2.7.tar.bz2) = 5498414 bytes
+SHA1 (gutenprint-5.2.8.tar.bz2) = 5948919a0077d411b89669cd45a280a7f6f90186
+RMD160 (gutenprint-5.2.8.tar.bz2) = 4c6f14b8a43dd95193b4074857c43c61a8e62e79
+Size (gutenprint-5.2.8.tar.bz2) = 5691472 bytes
 SHA1 (patch-aa) = 42ed47e6f577b6bf562d05f9685f8ff77dc45f88
-SHA1 (patch-src_cups_commandtocanon.c) = 3c71c0dff780dabbf50d818478f51df0fe069a5a
-SHA1 (patch-src_cups_commandtoepson.c) = fa07ef366537ae2f39b3327e0a9bab309c44e52d
diff --git a/print/gutenprint-lib/patches/patch-src_cups_commandtocanon.c b/print/gutenprint-lib/patches/patch-src_cups_commandtocanon.c
deleted file mode 100644
index 2cce02f739a..00000000000
--- a/print/gutenprint-lib/patches/patch-src_cups_commandtocanon.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_cups_commandtocanon.c,v 1.1 2011/11/25 22:17:08 joerg Exp $
-
---- src/cups/commandtocanon.c.orig	2011-11-25 18:21:02.000000000 +0000
-+++ src/cups/commandtocanon.c
-@@ -13,6 +13,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- 
- 
diff --git a/print/gutenprint-lib/patches/patch-src_cups_commandtoepson.c b/print/gutenprint-lib/patches/patch-src_cups_commandtoepson.c
deleted file mode 100644
index 3d89fdd1ff1..00000000000
--- a/print/gutenprint-lib/patches/patch-src_cups_commandtoepson.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_cups_commandtoepson.c,v 1.1 2011/11/25 22:17:08 joerg Exp $
-
---- src/cups/commandtoepson.c.orig	2011-11-25 18:20:47.000000000 +0000
-+++ src/cups/commandtoepson.c
-@@ -30,6 +30,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-