Update to 5.1.7.

Find CUPS lpstat in /usr/pkg (not quite right, but better).

   1) New printers supported in this release:

      * Epson inkjet printers:

	EPSON PictureMate 100
	EPSON PictureMate 210 (Corrected)
	EPSON PictureMate 240 (Corrected)
	EPSON PictureMate 250 (Corrected)
	EPSON PictureMate 260
	EPSON PictureMate 270
	EPSON PictureMate 280 (Corrected)
	EPSON PictureMate 290
	EPSON PictureMate 500
	EPSON PictureMate 2005
	EPSON PictureMate Dash
	EPSON PictureMate Flash (Corrected)
	EPSON PictureMate Pal (Corrected)
	EPSON PictureMate Snap (Corrected)
	EPSON E 150 (Corrected)
	EPSON E 300
	EPSON E 520
	EPSON E 500
	EPSON E 720
	EPSON E 700
	EPSON Stylus D92
	EPSON Stylus DX4400
	EPSON Stylus DX4450
	EPSON Stylus DX7000F
	EPSON Stylus DX7400
	EPSON Stylus DX7450
	EPSON Stylus DX8400
	EPSON Stylus DX8450
	EPSON Stylus Photo R280
	EPSON Stylus Photo R285
	EPSON Stylus Photo RX585
	EPSON Stylus Photo RX680
	EPSON Stylus Photo RX685

	(Note that a number of the PictureMate printers that were
	previously included generated grossly incorrect output.  Not
	all of the PictureMate printers have been fully tuned at this
	point.)

      * Canon inkjet printers:
        Canon PIXMA MP520 (#1872394)
	Canon PIXMA iP6000D

   2) Printing for the Canon PIXMA iP4500 has been fixed (#1834153).

   3) Printing near the bottom of the page has been improved for many
      modern Epson inkjet printers.  In addition, we have determined
      that most of these printers can print with consistent high
      quality at 2880x2880 and 5760x2880 DPI.  Therefore, these
      resolutions will be used for Ultra Photo and Best qualities
      respectively on these printers.

      Printers affected include:

      * Stylus Photo R800, R1800, PM-G820

      * Stylus Photo R2400

      * All printers using Claria ink

   4) Full bleed printing now works properly on the Epson Stylus Photo
      R2400.

   5) The Epson Stylus C120 now allows printing at 2880x2880 and
      5760x2880.  However, print quality near the bottom of the page
      may be poor, and these settings are therefore not used for Ultra
      Photo and Best quality.

   5) The ink drop sizes on the Epson Stylus Photo printers using
      Claria ink have been retuned, yielding improved quality at lower
      resolutions.

   6) A problem with determining the system printer queues in the GIMP
      plugin on certain systems using languages other than English has
      been fixed.

   7) Envelope paper sizes are now offered in both portrait and
      landscape form factor, as some printers expect envelopes to be
      fed long edge first while some expect them to be fed short edge
      first.

   8) PCL laser printers now offer paper trays with adjustable guides.
      Many laser printers use adjustable guides for manual feed of
      papers narrower than letter size.

   9) The GIMP plugin now offers reset buttons for individual
      settings, so it is possible to reset a single setting to its
      default without resetting all settings.

   9) Various new controls and settings have been added to assist in
      printer calibration.  While the tools for using these controls
      are not yet created, these tools will assist in calibrating
      printers in the future.

      * The Epson driver now offers additional controls for adjusting
      	the relationship between light and dark ink:

	+ The Value parameters (such as Light Cyan Value) specify the
	  relative darkness of the light vs. dark inks.

	+ The Cutoff parameters now specify the point at which the
	  darker ink is first used, relative to the value of the light
	  ink.

	+ The Scale parameters now specify the amount of light ink
	  used (essentially the density of the light ink).  This is
	  the same as the parameters previously called Cutoff.

      * The Epson driver now exposes as defaults the actual GCR
        settings used for the printer, paper, and ink combination in
        use.

      * The Epson driver now allows passing low level settings such as
        printer base resolution, ink drop size selection, and relative
        ink drop size as parameters.  The ink drop size can be
        accessed in the GIMP plugin, while the base resolution and ink
        drop size selection can only be used via the test pattern
        generator or other application that allows setting integer
        parameters.

      * Two new dither algorithms, Segmented and Segmented New, have
	been added.  These are not intended for normal use, and will
	normally behave like Ordered and Ordered New.  However, if Raw
	color correction is selected and a printer with multiple drop
	sizes is used, the range of input will be divided up such that
	the high order bits will select the drop size to be used and
	the lower bits will specify the amount of ink.  High order
	bits of 0 indicate that all drop sizes should be used.

	For example, if a printer offers 3 drop sizes (2 bits), the
	range of 0-16383 will print all drop sizes normally (with the
	range of 0-16383 being scaled to 0-65535), 16384-32767 will
	use the small drop size, and so forth.

	This is intended to assist in tuning ink drop sizes.

      * A new parameter allowing dumping out of color correction state
	(lookup tables, GCR data, curves, etc.) has been added, and is
	accessible in the GIMP plugin.  At present, this data cannot
	be used directly, but it is intended that in the future this
	mechanism be used to allow calibration information to be saved
	and restored.

3 files changed, 25 insertions, 9 deletions

diff --git a/print/gutenprint51-lib/Makefile b/print/gutenprint51-lib/Makefile
index cd117099f86..5dace6137f4 100644
--- a/print/gutenprint51-lib/Makefile
+++ b/print/gutenprint51-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2008/03/06 14:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/09 01:23:54 gdt Exp $
 
-VERSION=	5.1.6
+VERSION=	5.1.7
 DISTNAME=	gutenprint-${VERSION}
 EXTRACT_SUFX=	.tar.bz2
 PKGNAME=	gutenprint-lib-${VERSION}
@@ -19,7 +19,10 @@ USE_TOOLS+=		gmake lex pkg-config
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 
-USE_LANGUAGES+=		c99 c++
+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.
 
 # gutenprint has many options, and really should be split into
 # multiple packages.  Splitting is difficult because of the structure
@@ -81,8 +84,7 @@ CONFIGURE_ARGS+=	--without-readline
 #CONFIGURE_ARGS+=	--disable-test
 #CONFIGURE_ARGS+=	--disable-testpattern
 
-# iconv?
-
+# A libintl is optional in gutenprint.
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 # gutenprint-gimp: gimp plugin
diff --git a/print/gutenprint51-lib/distinfo b/print/gutenprint51-lib/distinfo
index 4ccac06c2ee..a1ca7672727 100644
--- a/print/gutenprint51-lib/distinfo
+++ b/print/gutenprint51-lib/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/01/11 12:41:23 gdt Exp $
+$NetBSD: distinfo,v 1.2 2008/03/09 01:23:54 gdt Exp $
 
-SHA1 (gutenprint-5.1.6.tar.bz2) = 087652d95bbc7eb293c26865a0d38d6afab2cbf2
-RMD160 (gutenprint-5.1.6.tar.bz2) = 04936803ddd31d0d5ed85c9b2e6092f29ce34a52
-Size (gutenprint-5.1.6.tar.bz2) = 4668619 bytes
+SHA1 (gutenprint-5.1.7.tar.bz2) = 7fb93b8b7a0ef1e5f7cf83700cb96b2448241195
+RMD160 (gutenprint-5.1.7.tar.bz2) = 7f85d64823006899dc41165fcdc97872f6519616
+Size (gutenprint-5.1.7.tar.bz2) = 4703590 bytes
+SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579
diff --git a/print/gutenprint51-lib/patches/patch-aa b/print/gutenprint51-lib/patches/patch-aa
new file mode 100644
index 00000000000..989d5683c2c
--- /dev/null
+++ b/print/gutenprint51-lib/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2008/03/09 01:23:54 gdt Exp $
+
+--- src/gutenprintui2/plist.c.orig	2008-02-02 11:06:55.000000000 -0500
++++ src/gutenprintui2/plist.c
+@@ -96,7 +96,7 @@ static const print_system_t default_prin
+ static print_system_t known_printing_systems[] =
+ {
+   { "CUPS", N_("CUPS"), "lp -s", "-d", "-oraw", "/usr/sbin/cupsd",
+-    "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'",
++    "/usr/pkg/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'",
+     "-n" },
+   { "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp",
+     "/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print $3}'",