Updated apsfilter to 7.1.1

* a new apspreview script, that allows you to preview your print session
  using gv, kghostview or ghostview
* a new apsfilter-bug script that assists you in releasing bug reports
* some handbook and manpage updates / fixes
* new drivers
* driver fixes

http://www.apsfilter.org/download/ChangeLog-7.1.1

4 files changed, 293 insertions, 16 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index e413ed04357..6ed0223766f 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:35 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/10 06:53:02 martti Exp $
 #
 
-DISTNAME=	apsfilter-6.1.1
+DISTNAME=	apsfilter-7.1.1
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -22,16 +22,20 @@ DEINSTALL_FILE=	${WRKDIR}/.DEINSTALL
 
 WRKSRC=		${WRKDIR}/apsfilter
 
+HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
 
+CONFIGURE_ARGS+=--prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--with-shell=${SH}
+
 post-patch:
-	for i in bin/apsfilter SETUP tools/prtmgmt; do				\
-		${SED} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/$$i		\
-			> ${WRKSRC}/$$i.done;					\
-		${MV} ${WRKSRC}/$$i.done ${WRKSRC}/$$i;				\
+	for i in bin/apsfilter.in SETUP.in tools/prtmgmt; do		\
+		${SED} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/$$i	\
+			> ${WRKSRC}/$$i.done;				\
+		${MV} ${WRKSRC}/$$i.done ${WRKSRC}/$$i;			\
 	done
 
-	${SED} "s,@LOCALBASE@,${LOCALBASE},g" ${PKGDIR}/DEINSTALL		\
+	${SED} "s,@LOCALBASE@,${LOCALBASE},g" ${PKGDIR}/DEINSTALL	\
 		> ${DEINSTALL_FILE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/apsfilter/PLIST b/print/apsfilter/PLIST
index 65ffd9cd271..1dcc777797b 100644
--- a/print/apsfilter/PLIST
+++ b/print/apsfilter/PLIST
@@ -1,18 +1,262 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/10 06:53:02 martti Exp $
+bin/aps2file
+bin/apsfilter-bug
+bin/apspreview
+man/man1/aps2file.1
+man/man1/apsfilter-bug.1
 man/man1/apsfilter.1
+man/man1/apspreview.1
 man/man5/apsfilterrc.5
 share/apsfilter/SETUP
 share/apsfilter/bin/apsfilter
 share/apsfilter/bin/setup_dvips.sh
+share/apsfilter/driver/MAPPING
+share/apsfilter/driver/PS
+share/apsfilter/driver/PSgs
+share/apsfilter/driver/README
+share/apsfilter/driver/alc2000
+share/apsfilter/driver/ap3250
+share/apsfilter/driver/bitcmyk
+share/apsfilter/driver/bjc600
+share/apsfilter/driver/bjc800
+share/apsfilter/driver/bmp
+share/apsfilter/driver/cdeskjet
+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/hl1240
+share/apsfilter/driver/hl1250
+share/apsfilter/driver/hl7x0
+share/apsfilter/driver/hpdj/500
+share/apsfilter/driver/hpdj/500C
+share/apsfilter/driver/hpdj/550C
+share/apsfilter/driver/hpdj/850C
+share/apsfilter/driver/hpdj/u970
+share/apsfilter/driver/hpdj/unspec
+share/apsfilter/driver/hpijs/AP21xx
+share/apsfilter/driver/hpijs/DJ350
+share/apsfilter/driver/hpijs/DJ6xxP
+share/apsfilter/driver/hpijs/DJ8xx
+share/apsfilter/driver/hpijs/DJ9xx
+share/apsfilter/driver/hpijs/DJ9xxVIP
+share/apsfilter/driver/ijs/APOLLO_P-22
+share/apsfilter/driver/ijs/Apollo-2500-2600
+share/apsfilter/driver/ijs/DESKJET_350
+share/apsfilter/driver/ijs/DESKJET_600
+share/apsfilter/driver/ijs/DESKJET_610
+share/apsfilter/driver/ijs/DESKJET_630
+share/apsfilter/driver/ijs/DESKJET_810
+share/apsfilter/driver/ijs/DESKJET_825
+share/apsfilter/driver/ijs/DESKJET_920
+share/apsfilter/driver/ijs/DESKJET_960
+share/apsfilter/driver/ijs/PHOTOSMART_100
+share/apsfilter/driver/imagen
+share/apsfilter/driver/jpeg
+share/apsfilter/driver/lex3200
+share/apsfilter/driver/lexmark1100
+share/apsfilter/driver/lexmark2030
+share/apsfilter/driver/lexmark2050c
+share/apsfilter/driver/lexmark2070
+share/apsfilter/driver/lexmark2070c
+share/apsfilter/driver/lexmarkZ11
+share/apsfilter/driver/lj250
+share/apsfilter/driver/ljet4
+share/apsfilter/driver/lx5000
+share/apsfilter/driver/lxm3200
+share/apsfilter/driver/md2k
+share/apsfilter/driver/oki182
+share/apsfilter/driver/okiibm
+share/apsfilter/driver/omni/Brother_HJ_100i
+share/apsfilter/driver/omni/Brother_HJ_400
+share/apsfilter/driver/omni/Brother_HL_1240
+share/apsfilter/driver/omni/Brother_HL_4V
+share/apsfilter/driver/omni/Brother_HL_660
+share/apsfilter/driver/omni/Brother_HL_P2000
+share/apsfilter/driver/omni/Brother_M_1309
+share/apsfilter/driver/omni/Brother_M_1809_Color
+share/apsfilter/driver/omni/Brother_M_1824L_Color
+share/apsfilter/driver/omni/Brother_M_1909
+share/apsfilter/driver/omni/Brother_M_1909_Color
+share/apsfilter/driver/omni/Canon_BJC_2000
+share/apsfilter/driver/omni/Canon_BJC_210
+share/apsfilter/driver/omni/Canon_BJC_250J
+share/apsfilter/driver/omni/Canon_BJC_4100
+share/apsfilter/driver/omni/Canon_BJC_4200_Photo
+share/apsfilter/driver/omni/Canon_BJC_4550
+share/apsfilter/driver/omni/Canon_BJC_4650
+share/apsfilter/driver/omni/Canon_BJC_5500
+share/apsfilter/driver/omni/Canon_BJC_600
+share/apsfilter/driver/omni/Canon_BJC_6000
+share/apsfilter/driver/omni/Canon_BJC_600e
+share/apsfilter/driver/omni/Canon_BJC_610
+share/apsfilter/driver/omni/Canon_BJC_7000
+share/apsfilter/driver/omni/Canon_BJC_800
+share/apsfilter/driver/omni/Canon_BJC_820
+share/apsfilter/driver/omni/Canon_BJC_8500
+share/apsfilter/driver/omni/Canon_BJ_100
+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/Epson_24_pin_136_Col
+share/apsfilter/driver/omni/Epson_AP_3250
+share/apsfilter/driver/omni/Epson_AP_3260
+share/apsfilter/driver/omni/Epson_AP_5000
+share/apsfilter/driver/omni/Epson_AP_5500
+share/apsfilter/driver/omni/Epson_AP_800
+share/apsfilter/driver/omni/Epson_DFX_5000_
+share/apsfilter/driver/omni/Epson_DFX_8000
+share/apsfilter/driver/omni/Epson_DFX_8500
+share/apsfilter/driver/omni/Epson_DLQ_2000__360_dpi_
+share/apsfilter/driver/omni/Epson_DLQ_3000_
+share/apsfilter/driver/omni/Epson_EPL_5700
+share/apsfilter/driver/omni/Epson_EPL_N2000
+share/apsfilter/driver/omni/Epson_EX_1000
+share/apsfilter/driver/omni/Epson_EX_800
+share/apsfilter/driver/omni/Epson_FX_1050
+share/apsfilter/driver/omni/Epson_FX_1180
+share/apsfilter/driver/omni/Epson_FX_880
+share/apsfilter/driver/omni/Epson_Generic_ESC_P_24_J84
+share/apsfilter/driver/omni/Epson_Generic_ESC_P_24_J84C
+share/apsfilter/driver/omni/Epson_LQ_2080
+share/apsfilter/driver/omni/Epson_LQ_2500
+share/apsfilter/driver/omni/Epson_MJ_3000C
+share/apsfilter/driver/omni/Epson_MJ_3000CU
+share/apsfilter/driver/omni/Epson_MJ_500C
+share/apsfilter/driver/omni/Epson_MJ_700V2C
+share/apsfilter/driver/omni/Epson_MJ_800C
+share/apsfilter/driver/omni/Epson_MJ_910C
+share/apsfilter/driver/omni/Epson_MX_80__w_GRAFTRAX_80_
+share/apsfilter/driver/omni/Epson_Stylus_300
+share/apsfilter/driver/omni/Epson_Stylus_800
+share/apsfilter/driver/omni/Epson_Stylus_800_
+share/apsfilter/driver/omni/Epson_Stylus_Color_1160
+share/apsfilter/driver/omni/Epson_Stylus_Color_300
+share/apsfilter/driver/omni/Epson_Stylus_Color_400
+share/apsfilter/driver/omni/Epson_Stylus_Color_660
+share/apsfilter/driver/omni/Epson_Stylus_Photo_1200
+share/apsfilter/driver/omni/Epson_Stylus_Photo_1270
+share/apsfilter/driver/omni/Epson_Stylus_Photo_1290
+share/apsfilter/driver/omni/Epson_Stylus_Photo_2000P
+share/apsfilter/driver/omni/Epson_Stylus_Photo_790
+share/apsfilter/driver/omni/Epson_Stylus_Photo_870
+share/apsfilter/driver/omni/HP_Color_LaserJet
+share/apsfilter/driver/omni/HP_Color_LaserJet_4500
+share/apsfilter/driver/omni/HP_Color_LaserJet_8500
+share/apsfilter/driver/omni/HP_Color_LaserJet_8550
+share/apsfilter/driver/omni/HP_LaserJet_1100
+share/apsfilter/driver/omni/HP_LaserJet_1200
+share/apsfilter/driver/omni/HP_LaserJet_2000
+share/apsfilter/driver/omni/HP_LaserJet_2100
+share/apsfilter/driver/omni/HP_LaserJet_4V_4MV
+share/apsfilter/driver/omni/HP_LaserJet_5000
+share/apsfilter/driver/omni/HP_LaserJet_8000
+share/apsfilter/driver/omni/HP_LaserJet_Classic
+share/apsfilter/driver/omni/HP_Mopier_240
+share/apsfilter/driver/omni/IBM_5183_Portable_Printer
+share/apsfilter/driver/omni/KS_24_pin_136_Col
+share/apsfilter/driver/omni/KS_9_pin_136_Col
+share/apsfilter/driver/omni/KS_9_pin_80_Col
+share/apsfilter/driver/omni/Kyocera_FS_1750
+share/apsfilter/driver/omni/Kyocera_FS_5500A_FS_5500
+share/apsfilter/driver/omni/Kyocera_FS_5800C
+share/apsfilter/driver/omni/Kyocera_FS_600
+share/apsfilter/driver/omni/Kyocera_FS_6300
+share/apsfilter/driver/omni/Kyocera_FS_6700
+share/apsfilter/driver/omni/Kyocera_FS_680
+share/apsfilter/driver/omni/Kyocera_FS_7000
+share/apsfilter/driver/omni/Kyocera_F_800A_F_800
+share/apsfilter/driver/omni/OkiPos_425D
+share/apsfilter/driver/omni/Okidata_OL1200
+share/apsfilter/driver/omni/Okidata_OL400e
+share/apsfilter/driver/omni/Panasonic_KX_P1124
+share/apsfilter/driver/pcl3/hpdj
+share/apsfilter/driver/pcl3/hpdj1120c
+share/apsfilter/driver/pcl3/hpdj310
+share/apsfilter/driver/pcl3/hpdj550c
+share/apsfilter/driver/pcl3/hpdj600
+share/apsfilter/driver/pcl3/hpdj680c
+share/apsfilter/driver/pcl3/u970
+share/apsfilter/driver/pcl3/unspec
+share/apsfilter/driver/pcx
+share/apsfilter/driver/pdfwrite
+share/apsfilter/driver/photoex
+share/apsfilter/driver/pips/sc20s
+share/apsfilter/driver/pips/sc40s
+share/apsfilter/driver/pips/sc480
+share/apsfilter/driver/pips/sc580
+share/apsfilter/driver/pips/sc60s
+share/apsfilter/driver/pips/sc680_777
+share/apsfilter/driver/pips/sc880
+share/apsfilter/driver/pips/sc980
+share/apsfilter/driver/pips/sp810_820
+share/apsfilter/driver/png
+share/apsfilter/driver/pnm
+share/apsfilter/driver/ppa/1000
+share/apsfilter/driver/printiva
+share/apsfilter/driver/pxlcolor
+share/apsfilter/driver/pxlmono
+share/apsfilter/driver/samsung85
+share/apsfilter/driver/st800
+share/apsfilter/driver/stcolor
+share/apsfilter/driver/stp/bjc-1000
+share/apsfilter/driver/stp/bjc-2000
+share/apsfilter/driver/stp/bjc-210
+share/apsfilter/driver/stp/bjc-30
+share/apsfilter/driver/stp/bjc-3000
+share/apsfilter/driver/stp/bjc-4400
+share/apsfilter/driver/stp/bjc-7000
+share/apsfilter/driver/stp/bjc-8200
+share/apsfilter/driver/stp/compaq-ij750
+share/apsfilter/driver/stp/escp2
+share/apsfilter/driver/stp/escp2-10000
+share/apsfilter/driver/stp/escp2-1160
+share/apsfilter/driver/stp/escp2-1200
+share/apsfilter/driver/stp/escp2-1280
+share/apsfilter/driver/stp/escp2-1500
+share/apsfilter/driver/stp/escp2-1520
+share/apsfilter/driver/stp/escp2-400
+share/apsfilter/driver/stp/escp2-440
+share/apsfilter/driver/stp/escp2-480
+share/apsfilter/driver/stp/escp2-600
+share/apsfilter/driver/stp/escp2-660
+share/apsfilter/driver/stp/escp2-670
+share/apsfilter/driver/stp/escp2-680
+share/apsfilter/driver/stp/escp2-700
+share/apsfilter/driver/stp/escp2-720
+share/apsfilter/driver/stp/escp2-900
+share/apsfilter/driver/stp/escp2-c70
+share/apsfilter/driver/stp/escp2-photo
+share/apsfilter/driver/stp/escp2-pro
+share/apsfilter/driver/stp/lexmark-4076
+share/apsfilter/driver/stp/lexmark-z52
+share/apsfilter/driver/stp/pcl-1100
+share/apsfilter/driver/stp/pcl-1200
+share/apsfilter/driver/stp/pcl-1220
+share/apsfilter/driver/stp/pcl-600
+share/apsfilter/driver/stp/pcl-690
+share/apsfilter/driver/stp/pcl-750
+share/apsfilter/driver/stp/pcl-810
+share/apsfilter/driver/stylewriter
+share/apsfilter/driver/tiff
 share/apsfilter/setup/README
-share/apsfilter/setup/devices-5.50
 share/apsfilter/setup/devices-6.01
 share/apsfilter/setup/devices-6.50
-share/apsfilter/setup/printer-5.50
+share/apsfilter/setup/devices-7.00
+share/apsfilter/setup/non-printer
 share/apsfilter/setup/printer-6.01
 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-hpdj
+share/apsfilter/setup/printer-hpijs
+share/apsfilter/setup/printer-ijs
+share/apsfilter/setup/printer-lexmark
+share/apsfilter/setup/printer-misc
 share/apsfilter/setup/printer-omni
 share/apsfilter/setup/printer-pcl3
 share/apsfilter/setup/printer-ppa
@@ -27,10 +271,21 @@ share/doc/apsfilter/HOWTO-BUGREPORTS
 share/doc/apsfilter/LICENSE
 share/doc/apsfilter/README.BSD
 share/doc/apsfilter/README.TeX
+share/doc/apsfilter/apsfilter4.gif
 share/doc/apsfilter/handbook.html
 share/doc/apsfilter/paper
-@dirrm share/doc/apsfilter
-@dirrm share/apsfilter/template
-@dirrm share/apsfilter/setup
+@unexec rmdir %D/etc/apsfilter 2>/dev/null || true
 @dirrm share/apsfilter/bin
+@dirrm share/apsfilter/driver/ijs
+@dirrm share/apsfilter/driver/hpdj
+@dirrm share/apsfilter/driver/hpijs
+@dirrm share/apsfilter/driver/omni
+@dirrm share/apsfilter/driver/pcl3
+@dirrm share/apsfilter/driver/pips
+@dirrm share/apsfilter/driver/ppa
+@dirrm share/apsfilter/driver/stp
+@dirrm share/apsfilter/driver
+@dirrm share/apsfilter/setup
+@dirrm share/apsfilter/template
 @unexec rmdir %D/share/apsfilter 2>/dev/null || true
+@dirrm share/doc/apsfilter
diff --git a/print/apsfilter/distinfo b/print/apsfilter/distinfo
index 4b0a8f59be6..ea7f39d86df 100644
--- a/print/apsfilter/distinfo
+++ b/print/apsfilter/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/11 21:57:23 zuntum Exp $
+$NetBSD: distinfo,v 1.2 2002/01/10 06:53:02 martti Exp $
 
-SHA1 (apsfilter-6.1.1.tar.gz) = 552d2a1a440596be1dab72c911fc6aa26859da6f
-Size (apsfilter-6.1.1.tar.gz) = 319900 bytes
+SHA1 (apsfilter-7.1.1.tar.gz) = 112f2ae689b183ce64ae00b9497fec25175b52d5
+Size (apsfilter-7.1.1.tar.gz) = 415716 bytes
+SHA1 (patch-aa) = 1c1874349cfe4f62ee9e64daabd9b0401b92cd90
diff --git a/print/apsfilter/patches/patch-aa b/print/apsfilter/patches/patch-aa
new file mode 100644
index 00000000000..9a4408e7072
--- /dev/null
+++ b/print/apsfilter/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2002/01/10 06:53:02 martti Exp $
+
+--- Makefile.in.orig	Wed Jan  9 16:29:13 2002
++++ Makefile.in	Wed Jan  9 16:29:58 2002
+@@ -17,9 +17,9 @@
+ MKDIR=mkdir -p
+ RM=rm -f
+ 
+-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
+ 
+ all:
+