update gimp-print to 4.2.2

changes:
-many bugfixes
-Quad tone grayscale inks, such as the Piezography (TM) inks, are now supported
 for most Epson Stylus printers.  This is not tuned for a particular inkset at
 this time, so the results will not be of top quality yet.  This capability
 should be considered beta.
-Many new Epson Stylus printers are supported.  Please see the complete list of
 printers at the bottom of these release notes.
-A new dither algorithm, EvenTone, has been added.  This algorithm produces
 superior results for photographs and other continuous-tone images, but in its
 current form it may not be as well suited for solid color images and line art.
 This algorithm should be considered beta.

and use buildlink2

12 files changed, 57 insertions, 37 deletions

diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index d73473e3b6b..e517a4a8bf4 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/05/12 10:16:49 abs Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/26 17:28:26 drochner Exp $
 #
 
-DISTNAME=	gimp-print-4.2.1
-PKGNAME=	gimp-print-cups-4.2.1
+DISTNAME=	gimp-print-4.2.2
+PKGNAME=	gimp-print-cups-4.2.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
@@ -10,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	GIMP print plugin
 
-DEPENDS+=	gimp-print-lib-*:../../print/gimp-print-lib
-
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+= --without-samples --without-user-guide
 CONFIGURE_ARGS+= --without-gimp
@@ -22,6 +20,8 @@ CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
 USE_GMAKE=	yes
+USE_BUILDLINK2=	yes
 
-.include "../../print/cups/buildlink.mk"
+.include "../../print/gimp-print-lib/buildlink2.mk"
+.include "../../print/cups/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-cups/PLIST b/print/gimp-print-cups/PLIST
index bf00f206a98..04722202b98 100644
--- a/print/gimp-print-cups/PLIST
+++ b/print/gimp-print-cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/03 12:45:21 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/26 17:28:26 drochner Exp $
 bin/cups-calibrate
 libexec/cups/backend/canon
 libexec/cups/backend/epson
@@ -40,6 +40,8 @@ share/cups/model/C/escp2-1290.ppd.gz
 share/cups/model/C/escp2-1500.ppd.gz
 share/cups/model/C/escp2-1520.ppd.gz
 share/cups/model/C/escp2-2000.ppd.gz
+share/cups/model/C/escp2-2100.ppd.gz
+share/cups/model/C/escp2-2200.ppd.gz
 share/cups/model/C/escp2-3000.ppd.gz
 share/cups/model/C/escp2-400.ppd.gz
 share/cups/model/C/escp2-440.ppd.gz
@@ -61,6 +63,7 @@ share/cups/model/C/escp2-740.ppd.gz
 share/cups/model/C/escp2-750.ppd.gz
 share/cups/model/C/escp2-7500.ppd.gz
 share/cups/model/C/escp2-760.ppd.gz
+share/cups/model/C/escp2-7600.ppd.gz
 share/cups/model/C/escp2-777.ppd.gz
 share/cups/model/C/escp2-780.ppd.gz
 share/cups/model/C/escp2-785.ppd.gz
@@ -69,6 +72,7 @@ share/cups/model/C/escp2-800.ppd.gz
 share/cups/model/C/escp2-810.ppd.gz
 share/cups/model/C/escp2-820.ppd.gz
 share/cups/model/C/escp2-83.ppd.gz
+share/cups/model/C/escp2-830.ppd.gz
 share/cups/model/C/escp2-850.ppd.gz
 share/cups/model/C/escp2-860.ppd.gz
 share/cups/model/C/escp2-870.ppd.gz
@@ -78,15 +82,27 @@ share/cups/model/C/escp2-890.ppd.gz
 share/cups/model/C/escp2-895.ppd.gz
 share/cups/model/C/escp2-900.ppd.gz
 share/cups/model/C/escp2-9000.ppd.gz
+share/cups/model/C/escp2-915.ppd.gz
+share/cups/model/C/escp2-925.ppd.gz
+share/cups/model/C/escp2-950.ppd.gz
 share/cups/model/C/escp2-9500.ppd.gz
+share/cups/model/C/escp2-960.ppd.gz
+share/cups/model/C/escp2-9600.ppd.gz
 share/cups/model/C/escp2-980.ppd.gz
 share/cups/model/C/escp2-c20sx.ppd.gz
 share/cups/model/C/escp2-c20ux.ppd.gz
 share/cups/model/C/escp2-c40sx.ppd.gz
 share/cups/model/C/escp2-c40ux.ppd.gz
+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-c60.ppd.gz
+share/cups/model/C/escp2-c61.ppd.gz
+share/cups/model/C/escp2-c62.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-ex.ppd.gz
 share/cups/model/C/escp2-photo.ppd.gz
 share/cups/model/C/escp2-pro-xl.ppd.gz
diff --git a/print/gimp-print-cups/distinfo b/print/gimp-print-cups/distinfo
index bd7b91a5096..44364a121cd 100644
--- a/print/gimp-print-cups/distinfo
+++ b/print/gimp-print-cups/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/03 12:45:21 drochner Exp $
+$NetBSD: distinfo,v 1.2 2002/09/26 17:28:26 drochner Exp $
 
-SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8
-Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes
+SHA1 (gimp-print-4.2.2.tar.gz) = 48b41c998c2f3deb9016417550cd5aeb49369c24
+Size (gimp-print-4.2.2.tar.gz) = 4843433 bytes
 SHA1 (patch-ab) = 9ed732e755223fcf6cdb87b8d06a29bd834095a8
 SHA1 (patch-ac) = b5acd81d2e6e24eed03ef089ad8c6ef0675c3cc8
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index 23a3dbc0ef5..cd0ee31310d 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/05/03 13:50:12 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/26 17:28:26 drochner Exp $
 #
 
-DISTNAME=	gimp-print-4.2.1
-PKGNAME=	gimp-print-escputil-4.2.1
+DISTNAME=	gimp-print-4.2.2
+PKGNAME=	gimp-print-escputil-4.2.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gimp-print-escputil/distinfo b/print/gimp-print-escputil/distinfo
index ec3c122323e..a2698459443 100644
--- a/print/gimp-print-escputil/distinfo
+++ b/print/gimp-print-escputil/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/08/05 16:37:51 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/26 17:28:26 drochner Exp $
 
-SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8
-Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes
+SHA1 (gimp-print-4.2.2.tar.gz) = 48b41c998c2f3deb9016417550cd5aeb49369c24
+Size (gimp-print-4.2.2.tar.gz) = 4843433 bytes
 SHA1 (patch-aa) = 9ed732e755223fcf6cdb87b8d06a29bd834095a8
 SHA1 (patch-ab) = 420a73ed394c1c37a45bafee387ef06931139ffe
 SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index 7615f6c8cf4..1ba8baa3880 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/11 19:05:26 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/26 17:28:26 drochner Exp $
 
-DISTNAME=	gimp-print-4.2.1
-PKGNAME=	gimp-print-ijs-4.2.1
+DISTNAME=	gimp-print-4.2.2
+PKGNAME=	gimp-print-ijs-4.2.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITES_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gimp-print-ijs/distinfo b/print/gimp-print-ijs/distinfo
index 8d98ca7ccb8..d28061d0781 100644
--- a/print/gimp-print-ijs/distinfo
+++ b/print/gimp-print-ijs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/11 19:05:26 jlam Exp $
+$NetBSD: distinfo,v 1.2 2002/09/26 17:28:26 drochner Exp $
 
-SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8
-Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes
+SHA1 (gimp-print-4.2.2.tar.gz) = 48b41c998c2f3deb9016417550cd5aeb49369c24
+Size (gimp-print-4.2.2.tar.gz) = 4843433 bytes
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index 9e8d7ef2e2c..bcf293fcc8e 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/26 17:28:27 drochner Exp $
 #
 
-DISTNAME=	gimp-print-4.2.1
-PKGNAME=	gimp-print-lib-4.2.1
+DISTNAME=	gimp-print-4.2.2
+PKGNAME=	gimp-print-lib-4.2.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
diff --git a/print/gimp-print-lib/PLIST b/print/gimp-print-lib/PLIST
index cb530461172..479f302fdf0 100644
--- a/print/gimp-print-lib/PLIST
+++ b/print/gimp-print-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/03 12:43:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/26 17:28:27 drochner Exp $
 bin/gimpprint-config
 include/gimp-print/gimp-print.h
 @unexec install-info --delete --info-dir=%D/info %D/info/gimpprint.info
@@ -13,7 +13,7 @@ lib/libgimpprint.a
 lib/libgimpprint.la
 lib/libgimpprint.so
 lib/libgimpprint.so.1
-lib/libgimpprint.so.1.1
+lib/libgimpprint.so.1.2
 man/man1/gimpprint-config.1
 man/man3/gimpprint.3
 share/aclocal/gimpprint.m4
@@ -123,12 +123,15 @@ share/gimp-print/doc/manual-html/print-main.png
 share/gimp-print/doc/manual-html/print-setup.png
 share/gimp-print/doc/users-guide.pdf
 share/locale/da/LC_MESSAGES/gimp-print.mo
+share/locale/de/LC_MESSAGES/gimp-print.mo
 share/locale/el/LC_MESSAGES/gimp-print.mo
 share/locale/en_GB/LC_MESSAGES/gimp-print.mo
+share/locale/es/LC_MESSAGES/gimp-print.mo
 share/locale/fr/LC_MESSAGES/gimp-print.mo
 share/locale/nl/LC_MESSAGES/gimp-print.mo
 share/locale/no/LC_MESSAGES/gimp-print.mo
 share/locale/pl/LC_MESSAGES/gimp-print.mo
+share/locale/pt/LC_MESSAGES/gimp-print.mo
 share/locale/sk/LC_MESSAGES/gimp-print.mo
 share/locale/sv/LC_MESSAGES/gimp-print.mo
 @exec ${MKDIR} %D/share/gimp-print/samples
diff --git a/print/gimp-print-lib/distinfo b/print/gimp-print-lib/distinfo
index ddbb2224e08..350e8c3716f 100644
--- a/print/gimp-print-lib/distinfo
+++ b/print/gimp-print-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/08/25 21:50:30 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/09/26 17:28:27 drochner Exp $
 
-SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8
-Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes
+SHA1 (gimp-print-4.2.2.tar.gz) = 48b41c998c2f3deb9016417550cd5aeb49369c24
+Size (gimp-print-4.2.2.tar.gz) = 4843433 bytes
 SHA1 (patch-aa) = 9302f17215f3ee1dd3fd10dbf48f2bc4a4593aa8
 SHA1 (patch-ab) = ac96c5825c09a8507ce16efd95fa9d24720d6899
 SHA1 (patch-ac) = 2e7c114dd67e21b861bac405cc1a665460e66867
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index c9894f83ba4..c3487506d0d 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/05/03 13:52:14 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/26 17:28:26 drochner Exp $
 #
 
-DISTNAME=	gimp-print-4.2.1
+DISTNAME=	gimp-print-4.2.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
@@ -9,7 +9,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	GIMP print plugin
 
-DEPENDS+=	gimp-print-lib>=4.2.1:../../print/gimp-print-lib
 CONFLICTS+=	gimp<=1.2.3
 
 GNU_CONFIGURE=	YES
@@ -20,6 +19,8 @@ CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
 USE_GMAKE=	yes
+USE_BUILDLINK2=	yes
 
-.include "../../graphics/gimp-base/buildlink.mk"
+.include "../../print/gimp-print-lib/buildlink2.mk"
+.include "../../graphics/gimp-base/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print/distinfo b/print/gimp-print/distinfo
index 5483ed099ed..27859c2773c 100644
--- a/print/gimp-print/distinfo
+++ b/print/gimp-print/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/08/05 16:37:50 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/26 17:28:26 drochner Exp $
 
-SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8
-Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes
+SHA1 (gimp-print-4.2.2.tar.gz) = 48b41c998c2f3deb9016417550cd5aeb49369c24
+Size (gimp-print-4.2.2.tar.gz) = 4843433 bytes
 SHA1 (patch-aa) = bfaa771e1c21319f1834edba9605dafea62a21a9
 SHA1 (patch-ab) = 2e7c114dd67e21b861bac405cc1a665460e66867