update to 4.2.6

changes:
-bugfixes
-inproved device support (newer Epson Stylus, Canon S200)
-European 10x15 cm and US Engineering C paper sizes
-CUPS driver: normal and reversed paper order
-quality improvements

5 files changed, 53 insertions, 24 deletions

diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index 6e4bcd2075f..bec794761ea 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/02 14:56:07 drochner Exp $
 #
 
-DISTNAME=	gimp-print-4.2.5
-PKGNAME=	gimp-print-cups-4.2.5
-PKGREVISION=	2
+DISTNAME=	gimp-print-4.2.6
+PKGNAME=	gimp-print-cups-4.2.6
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gimp-print-cups/PLIST b/print/gimp-print-cups/PLIST
index 27a93bf63b5..ab39374afba 100644
--- a/print/gimp-print-cups/PLIST
+++ b/print/gimp-print-cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/11/27 16:12:35 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/02 14:56:07 drochner Exp $
 bin/cups-calibrate
 libexec/cups/backend/canon
 libexec/cups/backend/epson
@@ -27,6 +27,7 @@ share/cups/model/C/bjc-7100.ppd.gz
 share/cups/model/C/bjc-80.ppd.gz
 share/cups/model/C/bjc-8200.ppd.gz
 share/cups/model/C/bjc-85.ppd.gz
+share/cups/model/C/bjc-s200.ppd.gz
 share/cups/model/C/bjc-s400.ppd.gz
 share/cups/model/C/bjc-s450.ppd.gz
 share/cups/model/C/bjc-s4500.ppd.gz
@@ -98,16 +99,32 @@ share/cups/model/C/escp2-c41sx.ppd.gz
 share/cups/model/C/escp2-c41ux.ppd.gz
 share/cups/model/C/escp2-c42sx.ppd.gz
 share/cups/model/C/escp2-c42ux.ppd.gz
+share/cups/model/C/escp2-c43sx.ppd.gz
+share/cups/model/C/escp2-c43ux.ppd.gz
+share/cups/model/C/escp2-c44sx.ppd.gz
+share/cups/model/C/escp2-c44ux.ppd.gz
+share/cups/model/C/escp2-c50.ppd.gz
 share/cups/model/C/escp2-c60.ppd.gz
 share/cups/model/C/escp2-c61.ppd.gz
 share/cups/model/C/escp2-c62.ppd.gz
+share/cups/model/C/escp2-c63.ppd.gz
+share/cups/model/C/escp2-c64.ppd.gz
 share/cups/model/C/escp2-c70.ppd.gz
 share/cups/model/C/escp2-c80.ppd.gz
 share/cups/model/C/escp2-c82.ppd.gz
+share/cups/model/C/escp2-c83.ppd.gz
+share/cups/model/C/escp2-c84.ppd.gz
 share/cups/model/C/escp2-cl700.ppd.gz
 share/cups/model/C/escp2-cl750.ppd.gz
+share/cups/model/C/escp2-cl760.ppd.gz
+share/cups/model/C/escp2-cx3100.ppd.gz
 share/cups/model/C/escp2-cx3200.ppd.gz
+share/cups/model/C/escp2-cx5100.ppd.gz
 share/cups/model/C/escp2-cx5200.ppd.gz
+share/cups/model/C/escp2-cx6300.ppd.gz
+share/cups/model/C/escp2-cx6400.ppd.gz
+share/cups/model/C/escp2-cx8300.ppd.gz
+share/cups/model/C/escp2-cx8400.ppd.gz
 share/cups/model/C/escp2-em900c.ppd.gz
 share/cups/model/C/escp2-em930c.ppd.gz
 share/cups/model/C/escp2-ex.ppd.gz
@@ -121,6 +138,7 @@ share/cups/model/C/escp2-mj5100c.ppd.gz
 share/cups/model/C/escp2-mj6000c.ppd.gz
 share/cups/model/C/escp2-mj8000c.ppd.gz
 share/cups/model/C/escp2-mj930c.ppd.gz
+share/cups/model/C/escp2-ph900.ppd.gz
 share/cups/model/C/escp2-photo.ppd.gz
 share/cups/model/C/escp2-pm10000.ppd.gz
 share/cups/model/C/escp2-pm2000c.ppd.gz
@@ -128,11 +146,13 @@ share/cups/model/C/escp2-pm2200c.ppd.gz
 share/cups/model/C/escp2-pm3000c.ppd.gz
 share/cups/model/C/escp2-pm3300c.ppd.gz
 share/cups/model/C/escp2-pm3500c.ppd.gz
+share/cups/model/C/escp2-pm3700c.ppd.gz
 share/cups/model/C/escp2-pm4000px.ppd.gz
 share/cups/model/C/escp2-pm5000c.ppd.gz
 share/cups/model/C/escp2-pm7000c.ppd.gz
 share/cups/model/C/escp2-pm700c.ppd.gz
 share/cups/model/C/escp2-pm730c.ppd.gz
+share/cups/model/C/escp2-pm740c.ppd.gz
 share/cups/model/C/escp2-pm750c.ppd.gz
 share/cups/model/C/escp2-pm760c.ppd.gz
 share/cups/model/C/escp2-pm770c.ppd.gz
@@ -140,13 +160,17 @@ share/cups/model/C/escp2-pm780c.ppd.gz
 share/cups/model/C/escp2-pm790pt.ppd.gz
 share/cups/model/C/escp2-pm800c.ppd.gz
 share/cups/model/C/escp2-pm850pt.ppd.gz
+share/cups/model/C/escp2-pm870c.ppd.gz
 share/cups/model/C/escp2-pm880c.ppd.gz
 share/cups/model/C/escp2-pm9000c.ppd.gz
+share/cups/model/C/escp2-pm930c.ppd.gz
 share/cups/model/C/escp2-pm950c.ppd.gz
+share/cups/model/C/escp2-pm970c.ppd.gz
 share/cups/model/C/escp2-pro-xl.ppd.gz
 share/cups/model/C/escp2-pro.ppd.gz
 share/cups/model/C/escp2-px7000.ppd.gz
 share/cups/model/C/escp2-px9000.ppd.gz
+share/cups/model/C/escp2-pxv500.ppd.gz
 share/cups/model/C/escp2-scan2000.ppd.gz
 share/cups/model/C/escp2-scan2500.ppd.gz
 share/cups/model/C/escp2.ppd.gz
@@ -163,6 +187,7 @@ share/cups/model/C/pcl-1600.ppd.gz
 share/cups/model/C/pcl-2.ppd.gz
 share/cups/model/C/pcl-2000.ppd.gz
 share/cups/model/C/pcl-2500.ppd.gz
+share/cups/model/C/pcl-2p.ppd.gz
 share/cups/model/C/pcl-3.ppd.gz
 share/cups/model/C/pcl-340.ppd.gz
 share/cups/model/C/pcl-4.ppd.gz
@@ -195,6 +220,9 @@ share/cups/model/C/pcl-895.ppd.gz
 share/cups/model/C/pcl-900.ppd.gz
 share/cups/model/C/pcl-P1000.ppd.gz
 share/cups/model/C/pcl-P1100.ppd.gz
+share/cups/model/C/pcl-apple-4100.ppd.gz
+share/cups/model/C/pcl-apple-4500.ppd.gz
+share/cups/model/C/pcl-apple-6500.ppd.gz
 share/cups/model/C/pcl-desnj-230.ppd.gz
 share/cups/model/C/pcl-desnj-250.ppd.gz
 share/cups/model/C/pcl-desnj-2500.ppd.gz
diff --git a/print/gimp-print-cups/distinfo b/print/gimp-print-cups/distinfo
index 755b3d438e5..0c2b87fdd23 100644
--- a/print/gimp-print-cups/distinfo
+++ b/print/gimp-print-cups/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/04/23 17:33:00 drochner Exp $
+$NetBSD: distinfo,v 1.6 2004/03/02 14:56:07 drochner Exp $
 
-SHA1 (gimp-print-4.2.5.tar.gz) = d1c25aed4412837888cf24be3e8b4aed8a407a49
-Size (gimp-print-4.2.5.tar.gz) = 4992416 bytes
-SHA1 (patch-ab) = 9ed732e755223fcf6cdb87b8d06a29bd834095a8
+SHA1 (gimp-print-4.2.6.tar.gz) = 664a77618a51a1d03e6277431bf1f2765b9a1528
+Size (gimp-print-4.2.6.tar.gz) = 5056790 bytes
+SHA1 (patch-ab) = 306d09eff013a3fd1c4b944aca5c785e0bac010d
 SHA1 (patch-ac) = cd9ba17a9f64ee4a64e1f3136b463ea09818ae8c
-SHA1 (patch-ad) = e1eacfff8fc134fdbf9098897c4473d3330761a4
+SHA1 (patch-ad) = 6f61645d1fa914915e26ca75819b90421f81e016
diff --git a/print/gimp-print-cups/patches/patch-ab b/print/gimp-print-cups/patches/patch-ab
index 3988e0df493..5ed1ea48258 100644
--- a/print/gimp-print-cups/patches/patch-ab
+++ b/print/gimp-print-cups/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/03 12:45:21 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/02 14:56:07 drochner Exp $
 
---- Makefile.in.orig	Fri Feb 15 20:27:02 2002
-+++ Makefile.in	Fri Feb 15 20:28:00 2002
-@@ -189,7 +189,7 @@
+--- Makefile.in.orig	2004-01-11 14:02:13.000000000 +0100
++++ Makefile.in
+@@ -192,7 +192,7 @@ AUTOMAKE_OPTIONS = 1.4 gnu
+ 
  MAINT_CHARSET = latin1
- NONGIMP_SUBDIRS = test
- NONGIMP_DISTDIRS = debian
--SUBDIRS = include intl lib man src samples $(NONGIMP_SUBDIRS) po doc
-+SUBDIRS = include intl lib man src samples $(NONGIMP_SUBDIRS)
- DISTDIRS = scripts $(NONGIMP_DISTDIRS)
+ 
+-SUBDIRS = intl include lib man src samples test po doc
++SUBDIRS = intl lib man src samples test
+ DISTDIRS = scripts debian
  
  EXTRA_DIST = configure.in.in autogen.sh
diff --git a/print/gimp-print-cups/patches/patch-ad b/print/gimp-print-cups/patches/patch-ad
index 5fc9cd3abfb..ec44609fc39 100644
--- a/print/gimp-print-cups/patches/patch-ad
+++ b/print/gimp-print-cups/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.1 2002/11/27 16:12:35 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/02 14:56:07 drochner Exp $
 
---- src/Makefile.in.orig	Wed Nov 27 16:41:28 2002
-+++ src/Makefile.in	Wed Nov 27 16:42:06 2002
-@@ -194,7 +194,7 @@
+--- src/Makefile.in.orig	2004-01-11 14:02:16.000000000 +0100
++++ src/Makefile.in
+@@ -191,8 +191,8 @@ gimpprint_libs = @gimpprint_libs@
  AUTOMAKE_OPTIONS = 1.4 gnu
  
  MAINT_CHARSET = latin1
 -NONGIMP_SUBDIRS = cups foomatic ghost testpattern
+-SUBDIRS = printdef main escputil gimp $(NONGIMP_SUBDIRS)
 +NONGIMP_SUBDIRS = cups foomatic testpattern
- SUBDIRS = printdef main escputil gimp $(NONGIMP_SUBDIRS)
++SUBDIRS = printdef escputil gimp $(NONGIMP_SUBDIRS)
  
  MAINTAINERCLEANFILES = Makefile.in
+ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs