Updated to gimp-print-lib 4.2.7

8 files changed, 69 insertions, 45 deletions

diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index 5058ce24e60..d083efa2981 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:04 tv Exp $
-#
+# $NetBSD: Makefile,v 1.18 2004/11/25 14:13:32 adam Exp $
 
-DISTNAME=	gimp-print-4.2.6
-PKGNAME=	gimp-print-cups-4.2.6
-PKGREVISION=	2
+DISTNAME=	gimp-print-4.2.7
+PKGNAME=	gimp-print-cups-4.2.7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
@@ -11,18 +9,22 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	GIMP print plugin
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+= --without-samples --without-user-guide
-CONFIGURE_ARGS+= --without-gimp
-CONFIGURE_ARGS+= --with-cups=${PREFIX}
-CONFIGURE_ARGS+= --without-translated-ppds
-CONFIGURE_ARGS+= --enable-escputil=no
-CONFIGURE_ARGS+= --enable-libgimpprint=no
-USE_LIBTOOL=	yes
-USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	yes
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-escputil=no --enable-libgimpprint=no
+CONFIGURE_ARGS+=	--with-cups=${PREFIX}
+CONFIGURE_ARGS+=	--without-samples --without-user-guide
+CONFIGURE_ARGS+=	--without-gimp --without-translated-ppds
+CONFIGURE_ARGS+=	--sysconfdir=${EGDIR}
+PKG_SYSCONFSUBDIR=	cups
+
+EGDIR=		${PREFIX}/share/examples/cups
+CONF_FILES=	${EGDIR}/config.types ${PKG_SYSCONFDIR}/config.types
 
-.include "../../print/gimp-print-lib/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
+.include "../../print/gimp-print-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-cups/PLIST b/print/gimp-print-cups/PLIST
index ab39374afba..97b93c3982d 100644
--- a/print/gimp-print-cups/PLIST
+++ b/print/gimp-print-cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/02 14:56:07 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/25 14:13:32 adam Exp $
 bin/cups-calibrate
 libexec/cups/backend/canon
 libexec/cups/backend/epson
@@ -91,6 +91,7 @@ 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-935.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
@@ -121,6 +122,8 @@ 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-cx5300.ppd.gz
+share/cups/model/C/escp2-cx5400.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
@@ -166,11 +169,17 @@ 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-pmd750.ppd.gz
+share/cups/model/C/escp2-pmg700.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-r200.ppd.gz
+share/cups/model/C/escp2-r300.ppd.gz
+share/cups/model/C/escp2-rx500.ppd.gz
+share/cups/model/C/escp2-rx600.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
@@ -232,3 +241,4 @@ share/cups/model/C/pcl-desnj-450.ppd.gz
 share/cups/model/C/pcl-desnj-455.ppd.gz
 share/cups/model/C/pcl-desnj-488.ppd.gz
 share/cups/model/C/pcl-desnj-700.ppd.gz
+share/examples/cups/command.types
diff --git a/print/gimp-print-cups/distinfo b/print/gimp-print-cups/distinfo
index 0c2b87fdd23..f70192dd9b8 100644
--- a/print/gimp-print-cups/distinfo
+++ b/print/gimp-print-cups/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/03/02 14:56:07 drochner Exp $
+$NetBSD: distinfo,v 1.7 2004/11/25 14:13:32 adam Exp $
 
-SHA1 (gimp-print-4.2.6.tar.gz) = 664a77618a51a1d03e6277431bf1f2765b9a1528
-Size (gimp-print-4.2.6.tar.gz) = 5056790 bytes
+SHA1 (gimp-print-4.2.7.tar.gz) = 5a928b7fa8e83d2858d15e2bd22d143c2cd35bd8
+Size (gimp-print-4.2.7.tar.gz) = 5178122 bytes
+SHA1 (patch-aa) = 05d405f4f46a390b9d644b5af6b1d2cdf203b5fe
 SHA1 (patch-ab) = 306d09eff013a3fd1c4b944aca5c785e0bac010d
-SHA1 (patch-ac) = cd9ba17a9f64ee4a64e1f3136b463ea09818ae8c
+SHA1 (patch-ac) = 6423b4677e7c1ad0fe10da9ffeb16c1287fbfa46
 SHA1 (patch-ad) = 6f61645d1fa914915e26ca75819b90421f81e016
diff --git a/print/gimp-print-cups/patches/patch-aa b/print/gimp-print-cups/patches/patch-aa
new file mode 100644
index 00000000000..b7cc32dd7b5
--- /dev/null
+++ b/print/gimp-print-cups/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/11/25 14:13:53 adam Exp $
+
+--- src/cups/Makefile.in.orig	2004-11-25 14:41:06.000000000 +0000
++++ src/cups/Makefile.in
+@@ -184,7 +184,7 @@ bindir = @cups_bindir@
+ 
+ pkgdatadir = $(cups_conf_datadir)
+ pkglibdir = $(cups_conf_serverbin)
+-pkgsysconfdir = $(cups_conf_serverroot)
++pkgsysconfdir = $(sysconfdir)
+ 
+ cupsexec_backenddir = $(pkglibdir)/backend
+ cupsexec_filterdir = $(pkglibdir)/filter
diff --git a/print/gimp-print-cups/patches/patch-ac b/print/gimp-print-cups/patches/patch-ac
index 73c9ead00f8..d9aa7587cf1 100644
--- a/print/gimp-print-cups/patches/patch-ac
+++ b/print/gimp-print-cups/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2002/11/27 16:12:35 drochner Exp $
+$NetBSD: patch-ac,v 1.4 2004/11/25 14:13:32 adam Exp $
 
---- man/Makefile.in.orig	Tue Nov 26 03:16:33 2002
-+++ man/Makefile.in	Wed Nov 27 16:17:34 2002
-@@ -197,7 +197,7 @@
+--- man/Makefile.in.orig	2004-07-16 00:18:54.000000000 +0000
++++ man/Makefile.in
+@@ -194,7 +194,7 @@ MAINT_CHARSET = latin1
  
  # Conditional installation of manpages is currently broken in automake 1.4
  
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index d8cf80fd445..d65dc6e784d 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:04 tv Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/25 14:14:26 adam Exp $
 
-DISTNAME=	gimp-print-4.2.6
-PKGNAME=	gimp-print-escputil-4.2.6
-PKGREVISION=	1
+DISTNAME=	gimp-print-4.2.7
+PKGNAME=	gimp-print-escputil-4.2.7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gimp-print/}
 
@@ -14,14 +13,13 @@ COMMENT=	Epson Stylus inkjet printer tool
 BUILDLINK_DEPMETHOD.gimp-print-lib=	build
 CONFLICTS+=	gimp<=1.2.3
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+= --without-samples --without-user-guide
-CONFIGURE_ARGS+= --without-gimp
-CONFIGURE_ARGS+= --without-cups --without-translated-ppds
-CONFIGURE_ARGS+= --enable-libgimpprint=no
-USE_LIBTOOL=	yes
-USE_GNU_TOOLS+=	make
-USE_BUILDLINK3=	yes
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-libgimpprint=no
+CONFIGURE_ARGS+=	--without-cups --without-gimp --without-samples
+CONFIGURE_ARGS+=	--without-translated-ppds --without-user-guide
 
 .include "../../print/gimp-print-lib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/print/gimp-print-escputil/distinfo b/print/gimp-print-escputil/distinfo
index a9a7a88a641..91142b20aa0 100644
--- a/print/gimp-print-escputil/distinfo
+++ b/print/gimp-print-escputil/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2004/03/02 14:56:07 drochner Exp $
+$NetBSD: distinfo,v 1.9 2004/11/25 14:14:26 adam Exp $
 
-SHA1 (gimp-print-4.2.6.tar.gz) = 664a77618a51a1d03e6277431bf1f2765b9a1528
-Size (gimp-print-4.2.6.tar.gz) = 5056790 bytes
+SHA1 (gimp-print-4.2.7.tar.gz) = 5a928b7fa8e83d2858d15e2bd22d143c2cd35bd8
+Size (gimp-print-4.2.7.tar.gz) = 5178122 bytes
 SHA1 (patch-aa) = a2ba195b5558da80203cc390dce529d20a253e25
-SHA1 (patch-ab) = aa856c2f622be592b6f8341c81431b0ad7ccbcc4
+SHA1 (patch-ab) = d0852e813f900c05940138a3a6e9406b8f052845
 SHA1 (patch-ac) = 58814878ccd60f65eeda8be00226ee525a3fbdd0
diff --git a/print/gimp-print-escputil/patches/patch-ab b/print/gimp-print-escputil/patches/patch-ab
index abe853bc19b..114d624f5c2 100644
--- a/print/gimp-print-escputil/patches/patch-ab
+++ b/print/gimp-print-escputil/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/11/27 16:12:36 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2004/11/25 14:14:26 adam Exp $
 
---- man/Makefile.in.orig	Tue Nov 26 03:16:33 2002
-+++ man/Makefile.in	Tue Nov 26 22:11:12 2002
-@@ -197,7 +197,7 @@
+--- man/Makefile.in.orig	2004-07-16 00:18:54.000000000 +0000
++++ man/Makefile.in
+@@ -194,7 +194,7 @@ MAINT_CHARSET = latin1
  
  # Conditional installation of manpages is currently broken in automake 1.4