Update to 5.2.0beta3. Many minor changes and bugfixes omitted; see

NEWS in the distfile.

* CHANGES FROM GUTENPRINT 5.2.0-BETA2:

  4) Printing speed, and possibly quality, have been improved in
     certain cases on newer Epson inkjet printers (C120, Stylus Photo
     2400, RX700, and all printers using Claria ink).  The speed
     improvement should be most noticeable with plain paper at lower
     resolutions.  Quality improvements may or may not be noticeable.

  5) The Epson driver is in the process of being converted to use data
     stored in files external to the binary library.  While this
     should have no impact on end-user use, it is a substantial change
     that people should be aware of.  Please report any issues.

  6) Test coverage has been significantly increased.

  7) New printers supported in this release:

     (450+ lines of printers omitted)

* GENERAL CHANGES FROM GUTENPRINT 5.0:

   1) Gutenprint 5.2 and beyond no longer support GIMP 1.2.  Please
      ensure that you are using GIMP 2.0 or above.

   2) The PostScript driver has been rewritten, offering enhanced
      functionality approaching that of the native printer drivers.
      This driver is used by the enhanced Print plugin for the GIMP,
      and by other packages (such as PhotoPrint) that utilize
      Gutenprint.  In particular, the following specific functionality
      has been added:

      - All PPD file options are now offered.

      - CMYK input is now handled correctly.

      - The PostScript driver recognizes Gutenprint PPD files (from
        the native CUPS driver, not from Foomatic) and presents
        floating point options correctly.

	Note that this driver does not offer the curve options offered
	by the native drivers.

----------------

* CHANGES FROM GUTENPRINT 5.0.2 AND 5.1.7:

   1) cups-genppdupdate is no longer versioned, as it was in 5.0 and
      5.1 (cups-genppdupdate.5.0 and cups-genppdupdate.5.1).  It also
      supports the following options:

      -r Specify the major.minor version to update to, e. g. 5.0 or
         5.1.

      -f Bypass ownership/permissions checks on update PPD files.

      -i Interactively ask whether to update each PPD file.

   2) The performance of cups-genppdupdate has been improved
      significantly.

   3) cups-genppdupdate no longer updates PPD files that differ only
      in case of the file extension (e. g. printer.ppd and
      printer.PPD).  This avoids updating PPD files twice on
      filesystems that are case insensitive, such as OS X.

   4) cups-genppdconfig has been removed from this release.  This
      command was used to configure CUPS printer queues, but is not
      necessary as there are ample other tools available to configure
      printer queues.

   8) L-size photo paper (3 1/2x5 inches) has been added.

3 files changed, 170 insertions, 26 deletions

diff --git a/print/gutenprint51-lib/Makefile b/print/gutenprint51-lib/Makefile
index ec4ee253b14..6485cedd584 100644
--- a/print/gutenprint51-lib/Makefile
+++ b/print/gutenprint51-lib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2008/07/14 12:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/07/18 00:13:40 gdt Exp $
 
-VERSION=	5.1.7
+VERSION=	5.2.0-beta3
 DISTNAME=	gutenprint-${VERSION}
 EXTRACT_SUFX=	.tar.bz2
-PKGNAME=	gutenprint-lib-${VERSION}
-PKGREVISION=	3
+PKGNAME=	gutenprint-lib-5.2.0b3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
@@ -12,6 +11,9 @@ MAINTAINER=	gdt@NetBSD.org
 COMMENT=	Drivers for Canon, Epson, Lexmark, and PCL printers
 HOMEPAGE=	http://gutenprint.sourceforge.net/
 
+INSTALLVERSION=	5.2
+PLIST_SUBST+=	INSTALLVERSION=${INSTALLVERSION}
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # Not sure if this works.
diff --git a/print/gutenprint51-lib/PLIST b/print/gutenprint51-lib/PLIST
index 37fd7230a58..b7d09ffea28 100644
--- a/print/gutenprint51-lib/PLIST
+++ b/print/gutenprint51-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/01/11 12:41:23 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/07/18 00:13:40 gdt Exp $
 bin/cups-calibrate
 bin/escputil
 bin/testpattern
@@ -31,31 +31,158 @@ include/gutenprintui2/gammacurve.h
 include/gutenprintui2/gutenprintui.h
 include/gutenprintui2/typebuiltins.h
 lib/gimp/2.0/plug-ins/gutenprint
-lib/pkgconfig/gutenprint.pc
-lib/pkgconfig/gutenprintui2.pc
 lib/libgutenprint.la
 lib/libgutenprintui2.la
-libexec/cups/driver/gutenprint.5.1
+lib/pkgconfig/gutenprint.pc
+lib/pkgconfig/gutenprintui2.pc
+libexec/cups/driver/gutenprint.${INSTALLVERSION}
 libexec/cups/filter/commandtocanon
 libexec/cups/filter/commandtoepson
-libexec/cups/filter/rastertogutenprint.5.1
+libexec/cups/filter/rastertogutenprint.${INSTALLVERSION}
 man/man1/escputil.1
 man/man8/cups-calibrate.8
 man/man8/cups-genppd.8
-man/man8/cups-genppdconfig.8
 man/man8/cups-genppdupdate.8
-sbin/cups-genppd.5.1
-sbin/cups-genppdconfig.5.1
-sbin/cups-genppdupdate.5.1
+sbin/cups-genppd.${INSTALLVERSION}
+sbin/cups-genppdupdate
 share/cups/calibrate.ppm
-share/gutenprint/samples/colorbars4.png
-share/gutenprint/samples/colorsweep.png
-share/gutenprint/samples/profile.jpg
-share/gutenprint/${PKGVERSION}/xml/dither-matrix-1x1.xml
-share/gutenprint/${PKGVERSION}/xml/dither-matrix-2x1.xml
-share/gutenprint/${PKGVERSION}/xml/dither-matrix-4x1.xml
-share/gutenprint/${PKGVERSION}/xml/papers.xml
-share/gutenprint/${PKGVERSION}/xml/printers.xml
+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/inputslots/b500.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.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/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/media/b500.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c120.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c64.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c80.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/c82.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/claria.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/claria1400.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/cmy.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/cmykrb.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/cx3650.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/f360.xml
+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/photo_gen0.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen1.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen2.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen3.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen3_4.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_gen4.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/photo_pigment.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/picturemate_4.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/picturemate_6.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/pro_gen1.xml
+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/standard.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/standard_gen0.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/media/ultrachrome.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
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_10.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_11.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
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_15.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_16.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_17.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_18.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_19.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_2.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_20.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_21.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_22.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_23.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_24.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_25.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_26.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_27.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_28.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_29.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_3.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_30.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_31.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_32.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_33.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_34.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_35.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_36.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_37.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_38.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_39.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_4.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_40.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_41.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_42.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_43.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_44.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_45.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_46.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_47.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_48.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_49.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_5.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_50.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_51.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_52.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_53.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_54.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_55.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_56.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_57.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_58.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_59.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_6.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_60.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_61.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_62.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_63.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_64.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_65.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_66.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_67.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_68.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_69.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_7.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_70.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_71.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_72.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_73.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_74.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_75.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_76.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_77.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_78.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_79.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_8.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_80.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_81.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_82.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_83.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_84.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_85.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_86.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_87.xml
+share/gutenprint/${INSTALLVERSION}/xml/escp2/model/model_9.xml
+share/gutenprint/${INSTALLVERSION}/xml/papers.xml
+share/gutenprint/${INSTALLVERSION}/xml/printers.xml
 share/gutenprint/doc/FAQ.html
 share/gutenprint/doc/gutenprint-users-manual.odt
 share/gutenprint/doc/gutenprint-users-manual.pdf
@@ -79,7 +206,10 @@ 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/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/cs/LC_MESSAGES/gutenprint.mo
 share/locale/da/LC_MESSAGES/gutenprint.mo
@@ -100,5 +230,17 @@ share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
 @dirrm share/gutenprint/samples
 @dirrm share/gutenprint/doc/reference-html
 @dirrm share/gutenprint/doc
-@dirrm share/gutenprint/${PKGVERSION}/xml
+@dirrm share/gutenprint/${INSTALLVERSION}/xml/escp2/model
+@dirrm share/gutenprint/${INSTALLVERSION}/xml/escp2/mediasizes
+@dirrm share/gutenprint/${INSTALLVERSION}/xml/escp2/media
+@dirrm share/gutenprint/${INSTALLVERSION}/xml/escp2/inputslots
+@dirrm share/gutenprint/${INSTALLVERSION}/xml/escp2
+@dirrm share/gutenprint/${INSTALLVERSION}/xml
+@dirrm share/gutenprint/${INSTALLVERSION}
+@dirrm share/gutenprint
+@exec ${MKDIR} %D/lib/gutenprint/${INSTALLVERSION}/modules
+@dirrm lib/gutenprint/${INSTALLVERSION}/modules
+@dirrm lib/gutenprint/${INSTALLVERSION}
+@dirrm lib/gutenprint
+@dirrm include/gutenprintui2
 @dirrm include/gutenprint
diff --git a/print/gutenprint51-lib/distinfo b/print/gutenprint51-lib/distinfo
index a1ca7672727..a0f8a7fa589 100644
--- a/print/gutenprint51-lib/distinfo
+++ b/print/gutenprint51-lib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/03/09 01:23:54 gdt Exp $
+$NetBSD: distinfo,v 1.3 2008/07/18 00:13:40 gdt Exp $
 
-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 (gutenprint-5.2.0-beta3.tar.bz2) = 6b55255f6660c01d83e8f6773129867f4ecce40b
+RMD160 (gutenprint-5.2.0-beta3.tar.bz2) = c1c4214b7a57bdb4032211b988581d4d82cbffce
+Size (gutenprint-5.2.0-beta3.tar.bz2) = 4902358 bytes
 SHA1 (patch-aa) = b085bcf736d230c7f05d7b27bd1831165f958579