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

4 files changed, 24 insertions, 25 deletions

diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index 9c77ad2b3a6..4b881256f72 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/02 14:56:07 drochner Exp $
 
-DISTNAME=	gimp-print-4.2.5
-PKGNAME=	gimp-print-escputil-4.2.5
-PKGREVISION=	3
+DISTNAME=	gimp-print-4.2.6
+PKGNAME=	gimp-print-escputil-4.2.6
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gimp-print-escputil/distinfo b/print/gimp-print-escputil/distinfo
index 91092c65459..a9a7a88a641 100644
--- a/print/gimp-print-escputil/distinfo
+++ b/print/gimp-print-escputil/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2003/04/23 17:33:00 drochner Exp $
+$NetBSD: distinfo,v 1.8 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-aa) = 9ed732e755223fcf6cdb87b8d06a29bd834095a8
+SHA1 (gimp-print-4.2.6.tar.gz) = 664a77618a51a1d03e6277431bf1f2765b9a1528
+Size (gimp-print-4.2.6.tar.gz) = 5056790 bytes
+SHA1 (patch-aa) = a2ba195b5558da80203cc390dce529d20a253e25
 SHA1 (patch-ab) = aa856c2f622be592b6f8341c81431b0ad7ccbcc4
-SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867
+SHA1 (patch-ac) = 58814878ccd60f65eeda8be00226ee525a3fbdd0
diff --git a/print/gimp-print-escputil/patches/patch-aa b/print/gimp-print-escputil/patches/patch-aa
index 4148e8c6e99..072a2bc5456 100644
--- a/print/gimp-print-escputil/patches/patch-aa
+++ b/print/gimp-print-escputil/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/02/15 20:49:24 drochner Exp $
+$NetBSD: patch-aa,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
+ DISTDIRS = scripts debian
  
  EXTRA_DIST = configure.in.in autogen.sh
diff --git a/print/gimp-print-escputil/patches/patch-ac b/print/gimp-print-escputil/patches/patch-ac
index ee99127f233..b98c1ecb27e 100644
--- a/print/gimp-print-escputil/patches/patch-ac
+++ b/print/gimp-print-escputil/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2002/08/05 16:37:52 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2004/03/02 14:56:07 drochner Exp $
 
---- src/Makefile.in.orig	Fri Apr 26 20:56:31 2002
+--- src/Makefile.in.orig	2004-01-11 14:02:16.000000000 +0100
 +++ src/Makefile.in
-@@ -192,7 +192,7 @@
- AUTOMAKE_OPTIONS = 1.4 gnu
+@@ -192,7 +192,7 @@ AUTOMAKE_OPTIONS = 1.4 gnu
  
  MAINT_CHARSET = latin1
--NONGIMP_SUBDIRS = cups foomatic ghost testpattern
-+NONGIMP_SUBDIRS = # cups foomatic ghost testpattern
- SUBDIRS = printdef main escputil gimp $(NONGIMP_SUBDIRS)
+ NONGIMP_SUBDIRS = cups foomatic ghost testpattern
+-SUBDIRS = printdef main escputil gimp $(NONGIMP_SUBDIRS)
++SUBDIRS = escputil
  
  MAINTAINERCLEANFILES = Makefile.in
+ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs