Update to 5.2.7. Notable changes from 5.2.6 (see release announcement

for full details):

  1) New printers supported in this release:

     - Canon inkjet printers (many):

     - Epson inkjet printers (many):

     - Dye sublimation printers:

       Kodak EasyShare G600 Printer Dock
       Kodak PD-4000
       Kodak PD-6000
       Kodak Photo Printer
       Kodak Photo Printer 500
       Kodak Printer Dock Plus
       Kodak Printer Dock Plus S3

  2) Corrected color matching profile used for Mac OS X 10.5.x.
     sRGB will now be used instead of Generic RGB.  Users with work-
     flows dependant on the previously used Generic RGB can select
     this color profile in the print window by using ColorSync to
     choose the profile rather than using VendorMatching.

  9) Corrected base density for Photo Paper on printers using Claria
     ink (use 20% less ink).  The default results in heavy ink
     puddling in some cases.

 12) A problem whereby certain malformed PPD files would cause the
     PostScript driver to crash has been fixed.  In addition, the
     PostScript driver now runs considerably faster.

4 files changed, 65 insertions, 70 deletions

diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 67336628faf..96901e1b1e9 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2011/04/22 13:44:32 obache Exp $
+# $NetBSD: Makefile,v 1.26 2011/05/05 23:39:24 gdt Exp $
 
-VERSION=	5.2.6
+VERSION=	5.2.7
 DISTNAME=	gutenprint-${VERSION}
 PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,17 +22,16 @@ PRINT_PLIST_AWK+=	{ gsub(".${INSTALLVERSION}$$", \
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# Not sure if this works.
-#PKG_DESTDIR_SUPPORT=	user-destdir
-
 USE_TOOLS+=		gmake lex pkg-config perl:run
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 
-USE_LANGUAGES+=		c99
 # gcc 3.3.3 either can't compile this, or needs huge amounts of RAM (0.5G+).
 # Observed on NetBSD/i386 3 and confirmed with upstream.  Apparently it's
-# just 3.3.3 - there are no known issues with 2.95.
+# just 3.3.3 - there are no known issues with 2.95 or 4.x.
+USE_LANGUAGES+=		c99
+
+GNU_CONFIGURE=		YES
 
 # gutenprint has many options, and really should be split into
 # multiple packages.  Splitting is difficult because of the structure
@@ -41,59 +39,63 @@ USE_LANGUAGES+=		c99
 # everything that gdt wants, because that seems more useful to users
 # than not having gutenprint in pkgsrc.
 
-GNU_CONFIGURE=		YES
-
-# XXX Make command.types be a CONF_FILE
-
 # Adjust configure to disable components that we don't want.  Note
-# components that should eventually be in split packages.
+# components that should eventually be in split packages.  Options
+# that are on by default are commented out.  Options that default to
+# on or off and are not particularly interesting are not mentioned.
 
-# GTK1 ui and gimp1 plugin.  These are obsolete and will not
-# be supported.
-CONFIGURE_ARGS+=	--disable-libgutenprintui
-CONFIGURE_ARGS+=	--without-gimp
+# gdt doesn't understand what this means.
+# --enable-nls-macosx     build CUPS PPD files [(automatic)]
 
-# CUPS support, on by default.  This should be in a split package.
-#CONFIGURE_ARGS+=	--with-cups
-#CONFIGURE_ARGS+=	--enable-cups-1_2-enhancements
+# cups ppds (separate from cups support, probably)
+# Note that the default is to install a program which generates ppds,
+# rather than large numbers of ppds.
 #CONFIGURE_ARGS+=	--enable-cups-ppds
-# TODO: check status of translated cups ppds
-#CONFIGURE_ARGS+=	--disable-translated-cups-ppds
-
-# Ghostscript support.  This should be in a split package, if at all.
-CONFIGURE_ARGS+=	--without-ghost
-
-# GTK2 ui, and gimp plugin
-#CONFIGURE_ARGS+=	--enable-libgutenprintui2
-#CONFIGURE_ARGS+=	--with-gimp2
-# By default, the gimp2 plugin is named gutenprint
-#CONFIGURE_ARGS+=	--with-gimp2-as-gutenprint
-
-# Foomatic support.  This should be in a split package, if at all.
-CONFIGURE_ARGS+=	--without-foomatic
-#CONFIGURE_ARGS+=	--with-foomatic3
-
+#CONFIGURE_ARGS+=	--enable-cups-1_2-enhancements
 # Disable translated ppds.  Without this option, there are dozens of
 # copies of each printer, differing in the CUPS UI only by a language
 # code.  The awkwardness seems to outweigh the benefit.
-CONFIGURE_ARGS+=	--without-translated-ppds
+CONFIGURE_ARGS+=	--disable-translated-cups-ppds
+# --enable-globalized-cups-ppds (auto)
+
+# Respect upstream's judgement about this issue, without understanding.
+# --enable-static-genppd
+
+# GTK2 ui (on by default)
+#CONFIGURE_ARGS+=	--enable-libgutenprintui2
 
-# Sample images are small so there seems to be no point in omitting
-# them.
+# Sample images are small, so let them be included.
 #CONFIGURE_ARGS+=	--enable-samples
 
 # escputil is a utility for Epson printers.  It should arguably be in
-# a split package, but it is so small that there is no point, and it's
-# very useful.
-#CONFIGURE_ARGS+=	--enable-escputil
+# a split package, but it's small and useful so splitting isn't worth
+# the effort.
+CONFIGURE_ARGS+= --enable-escputil
+
+# test pattern generator.  Small, so let it be built
+#CONFIGURE_ARGS+=	--enable-test
+#CONFIGURE_ARGS+=	--enable-testpattern
+
+# CUPS support, on by default.  This should be in a split package.
+#CONFIGURE_ARGS+=	--with-cups
+
+# 201105: Reevaluate what this means and whether we want it.
+# Foomatic support.  This should be in a split package, if at all.
+CONFIGURE_ARGS+=	--without-foomatic
+CONFIGURE_ARGS+=	--without-foomatic3
+
+# Ghostscript support.  This should be in a split package, if at all.
+CONFIGURE_ARGS+=	--without-ghostscript
 
 # Something in gutenprint seems to use readline, but it's not clear
 # why, so just disable it to reduce dependencies.
 CONFIGURE_ARGS+=	--without-readline
 
-# test pattern generator.
-#CONFIGURE_ARGS+=	--disable-test
-#CONFIGURE_ARGS+=	--disable-testpattern
+# gimp2 plugin, on by default, and named gutenprint
+#CONFIGURE_ARGS+=	--with-gimp2
+#CONFIGURE_ARGS+=	--with-gimp2-as-gutenprint
+
+# XXX Make command.types be a CONF_FILE
 
 TEST_TARGET=		check
 
diff --git a/print/gutenprint-lib/PLIST b/print/gutenprint-lib/PLIST
index da812107afc..4013165c78c 100644
--- a/print/gutenprint-lib/PLIST
+++ b/print/gutenprint-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/08/12 12:15:08 gdt Exp $
+@comment $NetBSD: PLIST,v 1.11 2011/05/05 23:39:24 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -67,6 +67,7 @@ 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/f360_ultrachrome_k3v_2.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
@@ -82,7 +83,9 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_gen2.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/inks/pro_pigment.xml
 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_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/ultrachrome.xml
@@ -159,7 +162,15 @@ share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_104.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_105.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_106.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_107.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_108.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_109.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_11.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_110.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_111.xml
+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_12.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_13.xml
 share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_14.xml
@@ -334,6 +345,8 @@ 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/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/zh_TW/LC_MESSAGES/gutenprint.mo
diff --git a/print/gutenprint-lib/distinfo b/print/gutenprint-lib/distinfo
index 2a3c670e54f..a451891ecb5 100644
--- a/print/gutenprint-lib/distinfo
+++ b/print/gutenprint-lib/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2010/08/12 12:22:44 gdt Exp $
+$NetBSD: distinfo,v 1.10 2011/05/05 23:39:24 gdt Exp $
 
-SHA1 (gutenprint-5.2.6.tar.bz2) = 9fbe1ab899d5e83f34e21534cc5c1b8921c9039b
-RMD160 (gutenprint-5.2.6.tar.bz2) = ede2dea11742c77fede450880685efcde3a91967
-Size (gutenprint-5.2.6.tar.bz2) = 5283223 bytes
+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 (patch-aa) = 42ed47e6f577b6bf562d05f9685f8ff77dc45f88
-SHA1 (patch-ab) = ad519c74b450fee72f0f60b7b968e8fc425ce488
diff --git a/print/gutenprint-lib/patches/patch-ab b/print/gutenprint-lib/patches/patch-ab
deleted file mode 100644
index 11c9e35f9c4..00000000000
--- a/print/gutenprint-lib/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2010/08/12 12:22:44 gdt Exp $
-
-2008-12-20:
-Don't use -O6 and -O3 because some gcc versions choke.
-From Bernd Ernesti in private mail.
-2010-08-12:
-It is not clear if this is still true. -gdt
-
---- configure.orig	2009-07-26 22:36:34.000000000 +0200
-+++ configure	2009-08-09 17:13:18.000000000 +0200
-@@ -18101,7 +18101,7 @@
- 
-   else
- 
--  for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
-+  for stp_ac_arg in -O2 -O1 -O ; do
-     stp_ac_save_CFLAGS="${CFLAGS}"
- 
-   { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5