Updated apsfilter to 7.2.5

* bug fixes
* new drivers

6 files changed, 70 insertions, 38 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 89a47fedc0d..fe297f918d0 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/04/15 09:25:04 martti Exp $
 #
 
-DISTNAME=	apsfilter-7.2.2
-PKGREVISION=	2
+DISTNAME=	apsfilter-7.2.5
 WRKSRC=		${WRKDIR}/apsfilter
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.apsfilter.org/
-COMMENT=	number one magic filter for printing under Unix environment
+COMMENT=	Number one magic filter for printing under Unix environment
 
 DEPENDS=	recode-[0-9]*:../../converters/recode
 #DEPENDS+=	html2ps-[0-9]*:../../print/html2ps
diff --git a/print/apsfilter/PLIST b/print/apsfilter/PLIST
index ccb93d3643c..f2151b69bcc 100644
--- a/print/apsfilter/PLIST
+++ b/print/apsfilter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/09 16:01:37 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/04/15 09:25:04 martti Exp $
 bin/aps2file
 bin/apsfilter-bug
 bin/apspreview
@@ -19,18 +19,59 @@ share/apsfilter/driver/ap3250
 share/apsfilter/driver/bitcmyk
 share/apsfilter/driver/bjc4000
 share/apsfilter/driver/bjc50
-share/apsfilter/driver/bjc70
 share/apsfilter/driver/bjc600
+share/apsfilter/driver/bjc70
 share/apsfilter/driver/bjc7000
 share/apsfilter/driver/bjc800
 share/apsfilter/driver/bmp
 share/apsfilter/driver/cdeskjet
+share/apsfilter/driver/cdj670
 share/apsfilter/driver/cdj970
 share/apsfilter/driver/cdjcolor
 share/apsfilter/driver/cdjmono
 share/apsfilter/driver/cjet
 share/apsfilter/driver/cljet5
 share/apsfilter/driver/deskjet
+share/apsfilter/driver/gimp/bjc-1000
+share/apsfilter/driver/gimp/bjc-2000
+share/apsfilter/driver/gimp/bjc-210
+share/apsfilter/driver/gimp/bjc-30
+share/apsfilter/driver/gimp/bjc-3000
+share/apsfilter/driver/gimp/bjc-4400
+share/apsfilter/driver/gimp/bjc-7000
+share/apsfilter/driver/gimp/bjc-8200
+share/apsfilter/driver/gimp/escp2
+share/apsfilter/driver/gimp/escp2-10000
+share/apsfilter/driver/gimp/escp2-1160
+share/apsfilter/driver/gimp/escp2-1200
+share/apsfilter/driver/gimp/escp2-1280
+share/apsfilter/driver/gimp/escp2-1500
+share/apsfilter/driver/gimp/escp2-1520
+share/apsfilter/driver/gimp/escp2-400
+share/apsfilter/driver/gimp/escp2-440
+share/apsfilter/driver/gimp/escp2-480
+share/apsfilter/driver/gimp/escp2-600
+share/apsfilter/driver/gimp/escp2-660
+share/apsfilter/driver/gimp/escp2-670
+share/apsfilter/driver/gimp/escp2-680
+share/apsfilter/driver/gimp/escp2-700
+share/apsfilter/driver/gimp/escp2-720
+share/apsfilter/driver/gimp/escp2-900
+share/apsfilter/driver/gimp/escp2-c70
+share/apsfilter/driver/gimp/escp2-photo
+share/apsfilter/driver/gimp/escp2-pro
+share/apsfilter/driver/gimp/lexmark-4076
+share/apsfilter/driver/gimp/lexmark-z52
+share/apsfilter/driver/gimp/pcl-1100
+share/apsfilter/driver/gimp/pcl-1200
+share/apsfilter/driver/gimp/pcl-1220
+share/apsfilter/driver/gimp/pcl-2
+share/apsfilter/driver/gimp/pcl-4
+share/apsfilter/driver/gimp/pcl-500
+share/apsfilter/driver/gimp/pcl-600
+share/apsfilter/driver/gimp/pcl-690
+share/apsfilter/driver/gimp/pcl-750
+share/apsfilter/driver/gimp/pcl-810
 share/apsfilter/driver/hl1240
 share/apsfilter/driver/hl1250
 share/apsfilter/driver/hl7x0
@@ -106,6 +147,7 @@ share/apsfilter/driver/omni/Canon_BJ_230
 share/apsfilter/driver/omni/Canon_BJ_30
 share/apsfilter/driver/omni/Canon_BJ_F600
 share/apsfilter/driver/omni/Canon_BJ_F6000
+share/apsfilter/driver/omni/Canon_S450
 share/apsfilter/driver/omni/Epson_24_pin_136_Col
 share/apsfilter/driver/omni/Epson_AP_3250
 share/apsfilter/driver/omni/Epson_AP_3260
@@ -259,6 +301,7 @@ share/apsfilter/setup/printer-6.50
 share/apsfilter/setup/printer-7.00
 share/apsfilter/setup/printer-cdj
 share/apsfilter/setup/printer-epson
+share/apsfilter/setup/printer-gimp
 share/apsfilter/setup/printer-hpdj
 share/apsfilter/setup/printer-hpijs
 share/apsfilter/setup/printer-ijs
@@ -282,9 +325,10 @@ share/doc/apsfilter/handbook.html
 share/doc/apsfilter/paper
 @unexec ${RMDIR} %D/etc/apsfilter 2>/dev/null || ${TRUE}
 @dirrm share/apsfilter/bin
-@dirrm share/apsfilter/driver/ijs
+@dirrm share/apsfilter/driver/gimp
 @dirrm share/apsfilter/driver/hpdj
 @dirrm share/apsfilter/driver/hpijs
+@dirrm share/apsfilter/driver/ijs
 @dirrm share/apsfilter/driver/omni
 @dirrm share/apsfilter/driver/pcl3
 @dirrm share/apsfilter/driver/pips
diff --git a/print/apsfilter/distinfo b/print/apsfilter/distinfo
index 054c797a9af..736b09cbc2a 100644
--- a/print/apsfilter/distinfo
+++ b/print/apsfilter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/11/26 11:26:33 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/04/15 09:25:04 martti Exp $
 
-SHA1 (apsfilter-7.2.2.tar.gz) = be43c7651cbec09cef09d6855c8e9b0fb59fb3c6
-Size (apsfilter-7.2.2.tar.gz) = 352011 bytes
-SHA1 (patch-aa) = 200031f114ae994843c1961eba49b09a20fdb970
-SHA1 (patch-ab) = 0da86a8669845a62ea356a61ad97bc961e2d01b8
+SHA1 (apsfilter-7.2.5.tar.gz) = 0b747511052471de8b4eec2b773304628bef959d
+Size (apsfilter-7.2.5.tar.gz) = 362675 bytes
+SHA1 (patch-aa) = e79f596952e30bb70121168a8d1dfba819716e62
+SHA1 (patch-ab) = ded3f5a28fd09eda8515676423e7fa24c91cad16
 SHA1 (patch-ac) = a8ace4d2f9fcdf049981bb8f2c3f48b28e4f4cf9
-SHA1 (patch-ad) = 4a692324f2452aee9c588bd4ba8b15e3529de710
+SHA1 (patch-ad) = 27df89568fa6c0e194fcd8af7ed884c45588a53b
diff --git a/print/apsfilter/patches/patch-aa b/print/apsfilter/patches/patch-aa
index 9e084dbc589..7b84aaab60e 100644
--- a/print/apsfilter/patches/patch-aa
+++ b/print/apsfilter/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2002/11/26 11:26:34 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2003/04/15 09:25:05 martti Exp $
 
---- Makefile.in.orig	Sun Feb 24 21:47:45 2002
-+++ Makefile.in
-@@ -12,15 +12,15 @@ docdir=${DESTDIR}@docdir@
+--- Makefile.in.orig	2002-10-28 00:05:19.000000000 +0200
++++ Makefile.in	2003-04-15 08:56:15.000000000 +0300
+@@ -12,7 +12,7 @@
  
  APSSHARE=${datadir}/apsfilter
  APSDOC=${docdir}/apsfilter
@@ -11,18 +11,7 @@ $NetBSD: patch-aa,v 1.3 2002/11/26 11:26:34 jmmv Exp $
  
  MKDIR=mkdir -p
  RM=rm -f
- LN=ln -sfn
- 
--INSTALL_PRG=install -s -m 555
--INSTALL_SCRIPT=install -m 555
--INSTALL_DATA=install -m 444
-+INSTALL_PRG=install -c -s -m 555
-+INSTALL_SCRIPT=install -c -m 555
-+INSTALL_DATA=install -c -m 444
- 
- .PHONY: all install update clean distclean
- 
-@@ -33,7 +33,6 @@ update:
+@@ -33,7 +33,6 @@
  	${MKDIR} ${mandir}/man1
  	${MKDIR} ${mandir}/man5
  	${MKDIR} ${APSDOC}
@@ -30,7 +19,7 @@ $NetBSD: patch-aa,v 1.3 2002/11/26 11:26:34 jmmv Exp $
  	${MKDIR} ${APSSHARE}
  	${MKDIR} ${APSSHARE}/bin
  	${MKDIR} ${APSSHARE}/setup
-@@ -79,7 +78,6 @@ update:
+@@ -80,7 +79,6 @@
  	${INSTALL_DATA}   man/apsfilter-bug.1	${mandir}/man1/apsfilter-bug.1
  	${INSTALL_DATA}   man/apsfilterrc.5	${mandir}/man5/apsfilterrc.5
  	tar cf - driver | ( cd ${APSSHARE} && tar xf -)
diff --git a/print/apsfilter/patches/patch-ab b/print/apsfilter/patches/patch-ab
index 731cd7bff25..d3e9ded6111 100644
--- a/print/apsfilter/patches/patch-ab
+++ b/print/apsfilter/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2002/05/14 17:27:26 tron Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/15 09:25:05 martti Exp $
 
---- bin/apsfilter.in.orig	Tue May 14 19:23:24 2002
-+++ bin/apsfilter.in	Tue May 14 19:25:02 2002
-@@ -1028,9 +1028,9 @@
+--- bin/apsfilter.in.orig	2002-11-09 18:54:23.000000000 +0200
++++ bin/apsfilter.in	2003-04-15 08:56:50.000000000 +0300
+@@ -1041,9 +1041,9 @@
  
      cat > "$APS_TMPDIR/pdf"
      if find_filter acroread4; then
diff --git a/print/apsfilter/patches/patch-ad b/print/apsfilter/patches/patch-ad
index 7a3e8791225..9b5e62ca967 100644
--- a/print/apsfilter/patches/patch-ad
+++ b/print/apsfilter/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2002/11/26 11:26:35 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2003/04/15 09:25:05 martti Exp $
 
---- SETUP.in.orig	Sun Feb 24 21:47:45 2002
-+++ SETUP.in
-@@ -1816,7 +1816,7 @@ fail()
+--- SETUP.in.orig	2002-11-22 20:32:54.000000000 +0200
++++ SETUP.in	2003-04-15 08:57:18.000000000 +0300
+@@ -1832,7 +1832,7 @@
  
  export APS_BASEDIR="@datadir@/apsfilter"
  cd "$APS_BASEDIR"