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, 31 insertions, 30 deletions

diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 3e818e19fb8..8dcf2dc650d 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/02 14:56:07 drochner Exp $
 #
 
-DISTNAME=	gimp-print-4.2.5
-PKGREVISION=	3
+DISTNAME=	gimp-print-4.2.6
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gimp-print/distinfo b/print/gimp-print/distinfo
index c194d1c36bc..3ae351a09f0 100644
--- a/print/gimp-print/distinfo
+++ b/print/gimp-print/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2003/04/23 17:32:59 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) = bfaa771e1c21319f1834edba9605dafea62a21a9
-SHA1 (patch-ab) = 2e7c114dd67e21b861bac405cc1a665460e66867
-SHA1 (patch-ac) = 76e6a85103ce89b1fceb63abdcecf309b352f914
+SHA1 (gimp-print-4.2.6.tar.gz) = 664a77618a51a1d03e6277431bf1f2765b9a1528
+Size (gimp-print-4.2.6.tar.gz) = 5056790 bytes
+SHA1 (patch-aa) = d63b6e25ebfab3bbb84947518a51f865100c2a6a
+SHA1 (patch-ab) = 5f509464f61fa3555179e5c64195df825eea500c
+SHA1 (patch-ac) = 3b02e1b9f03fe3ebc06b58aecd03d9c6e084c4d5
diff --git a/print/gimp-print/patches/patch-aa b/print/gimp-print/patches/patch-aa
index 8af0198abf4..3bcce8eb206 100644
--- a/print/gimp-print/patches/patch-aa
+++ b/print/gimp-print/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/02/15 20:48:07 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 src samples $(NONGIMP_SUBDIRS)
- DISTDIRS = scripts $(NONGIMP_DISTDIRS)
+ 
+-SUBDIRS = intl include lib man src samples test po doc
++SUBDIRS = intl lib src samples
+ DISTDIRS = scripts debian
  
  EXTRA_DIST = configure.in.in autogen.sh
diff --git a/print/gimp-print/patches/patch-ab b/print/gimp-print/patches/patch-ab
index 93837aa6c69..2fd1f0be98a 100644
--- a/print/gimp-print/patches/patch-ab
+++ b/print/gimp-print/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2002/08/05 16:37:51 wiz Exp $
+$NetBSD: patch-ab,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 = gimp
  
  MAINTAINERCLEANFILES = Makefile.in
+ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/print/gimp-print/patches/patch-ac b/print/gimp-print/patches/patch-ac
index f0ce3b0125c..2725792aecb 100644
--- a/print/gimp-print/patches/patch-ac
+++ b/print/gimp-print/patches/patch-ac
@@ -1,12 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2003/04/23 17:32:59 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2004/03/02 14:56:07 drochner Exp $
 
---- src/gimp/Makefile.in.orig	2003-04-03 23:12:43.000000000 +0200
-+++ src/gimp/Makefile.in	2003-04-03 23:15:28.000000000 +0200
-@@ -211,7 +211,7 @@
+--- src/gimp/Makefile.in.orig	2004-01-11 14:02:19.000000000 +0100
++++ src/gimp/Makefile.in
+@@ -204,8 +204,8 @@ EXTRA_PROGRAMS = print
+ 
  print_SOURCES =  	print-image-gimp.c 	print-intl.h 	print.c 	gimp_color_window.c 	gimp_main_window.c 	print_gimp.h
  
- print_LDADD = $(LIBPRINTUT) $(GIMP_LIBS) $(LIBGIMPPRINT_LIBS)
+-print_LDADD = $(LIBPRINTUT) $(GIMP_LIBS) $(LIBGIMPPRINT_LIBS)
 -print_DEPENDENCIES = $(LIBGIMPPRINT_LIBS)
++print_LDADD = $(LIBPRINTUT) $(GIMP_LIBS) -lgimpprint
 +print_DEPENDENCIES =
  
  CLEANFILES = $(EXTRA_PROGRAMS)