- depend on net/samba3 instead of old, forbiden net/samba [1] [2]

- pet portlint [3]
- pkg-message -> files/pkg-message.in and add to SUB_LIST [3]
- bump PROTREVISION for depends change [3]

PR:		ports/98456 [1], ports/99066 [2]
Submitted by:	Shaun Amott <shaun@inerd.com> [1],
		Gerard E. Seibert <ges@seibercom.net> [2]
		itetcu (me) [3]
Approved by:	andreas@ (maintainer, implicit because unreachable at the
		moment)

3 files changed, 337 insertions, 336 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index f30ccbc2ee69..73dc90f3701d 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apsfilter
 PORTVERSION=	7.2.7
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.apsfilter.org/download/
 
@@ -27,7 +28,7 @@ NO_X=		yes
 # XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
 # (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
 # sure that NO_X is defined *and* has a value.
-MAKE_ENV+=      NO_X=true
+MAKE_ENV+=	NO_X=true
 .endif
 
 #
@@ -44,7 +45,7 @@ USE_GHOSTSCRIPT_RUN=	yes
 # - WITHOUT_X11		toggles not to build tools that need X11, even if
 #			APSFILTER_ALL is set
 # - PAPERSIZE		Use PAPERSIZE as in a2ps port, default to letter.
-PAPERSIZE?=     letter
+PAPERSIZE?=	letter
 
 .if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter && ${PAPERSIZE} != letterdj
 .BEGIN:
@@ -96,7 +97,7 @@ RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig
 .endif
 # all possible remote printing support
 RUN_DEPENDS+=	pap:${PORTSDIR}/net/netatalk
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
 .elif defined(BATCH)
 #
 # in normal batch/portbuilding mode (without building all)
diff --git a/print/apsfilter/pkg-message b/print/apsfilter/files/pkg-message.in
index f2ca29929119..7fd4c4d5c3fc 100644
--- a/print/apsfilter/pkg-message
+++ b/print/apsfilter/files/pkg-message.in
@@ -2,12 +2,12 @@
 ************ Post Installation Tasks *******************
 ========================================================
 *** Printer installation / apsfilter setup         ***  
-    root# cd /usr/local/share/apsfilter; ./SETUP               
+    root# cd %%PREFIX%%/share/apsfilter; ./SETUP               
 --------------------------------------------------------
 *** In any case of trouble please read             ***  
     the apsfilter handbook: handbook.html                
     (FAQ included), HOWTO-BUGREPORTS                            
-    under /usr/local/share/doc/apsfilter/                 
+    under %%DOCSDIR%%/apsfilter/                 
 --------------------------------------------------------
 *** Support only over apsfilter mailinglists       ***  
     please don't contact authors directly !!!
diff --git a/print/apsfilter/pkg-plist b/print/apsfilter/pkg-plist
index 0501bd4510e6..22c5127cbf5c 100644
--- a/print/apsfilter/pkg-plist
+++ b/print/apsfilter/pkg-plist
@@ -2,335 +2,335 @@ bin/aps2file
 bin/apsfilter-bug
 bin/apspreview
 etc/apsfilter/basedir
-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/bjc4000
-share/apsfilter/driver/bjc50
-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
-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/ljet4l
-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/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
-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/sc70s
-share/apsfilter/driver/pips/sc80s
-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-2
-share/apsfilter/driver/stp/pcl-4
-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-6.50
-share/apsfilter/setup/devices-7.00
-share/apsfilter/setup/non-printer
-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
-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
-share/apsfilter/setup/printer-stp
-share/apsfilter/setup/test.ps
-share/apsfilter/template/README
-share/apsfilter/template/apsfilterrc
-share/doc/apsfilter/ANNOUNCE
-share/doc/apsfilter/FAQ
-share/doc/apsfilter/HOWTO-BUGREPORTS
-share/doc/apsfilter/LICENSE
-share/doc/apsfilter/README.BSD
-share/doc/apsfilter/README.TeX
-share/doc/apsfilter/apsfilter4.png
-share/doc/apsfilter/handbook.html
-share/doc/apsfilter/paper
+%%DATADIR%%/SETUP
+%%DATADIR%%/bin/apsfilter
+%%DATADIR%%/bin/setup_dvips.sh
+%%DATADIR%%/driver/MAPPING
+%%DATADIR%%/driver/PS
+%%DATADIR%%/driver/PSgs
+%%DATADIR%%/driver/README
+%%DATADIR%%/driver/alc2000
+%%DATADIR%%/driver/ap3250
+%%DATADIR%%/driver/bitcmyk
+%%DATADIR%%/driver/bjc4000
+%%DATADIR%%/driver/bjc50
+%%DATADIR%%/driver/bjc600
+%%DATADIR%%/driver/bjc70
+%%DATADIR%%/driver/bjc7000
+%%DATADIR%%/driver/bjc800
+%%DATADIR%%/driver/bmp
+%%DATADIR%%/driver/cdeskjet
+%%DATADIR%%/driver/cdj670
+%%DATADIR%%/driver/cdj970
+%%DATADIR%%/driver/cdjcolor
+%%DATADIR%%/driver/cdjmono
+%%DATADIR%%/driver/cjet
+%%DATADIR%%/driver/cljet5
+%%DATADIR%%/driver/deskjet
+%%DATADIR%%/driver/gimp/bjc-1000
+%%DATADIR%%/driver/gimp/bjc-2000
+%%DATADIR%%/driver/gimp/bjc-210
+%%DATADIR%%/driver/gimp/bjc-30
+%%DATADIR%%/driver/gimp/bjc-3000
+%%DATADIR%%/driver/gimp/bjc-4400
+%%DATADIR%%/driver/gimp/bjc-7000
+%%DATADIR%%/driver/gimp/bjc-8200
+%%DATADIR%%/driver/gimp/escp2
+%%DATADIR%%/driver/gimp/escp2-10000
+%%DATADIR%%/driver/gimp/escp2-1160
+%%DATADIR%%/driver/gimp/escp2-1200
+%%DATADIR%%/driver/gimp/escp2-1280
+%%DATADIR%%/driver/gimp/escp2-1500
+%%DATADIR%%/driver/gimp/escp2-1520
+%%DATADIR%%/driver/gimp/escp2-400
+%%DATADIR%%/driver/gimp/escp2-440
+%%DATADIR%%/driver/gimp/escp2-480
+%%DATADIR%%/driver/gimp/escp2-600
+%%DATADIR%%/driver/gimp/escp2-660
+%%DATADIR%%/driver/gimp/escp2-670
+%%DATADIR%%/driver/gimp/escp2-680
+%%DATADIR%%/driver/gimp/escp2-700
+%%DATADIR%%/driver/gimp/escp2-720
+%%DATADIR%%/driver/gimp/escp2-900
+%%DATADIR%%/driver/gimp/escp2-c70
+%%DATADIR%%/driver/gimp/escp2-photo
+%%DATADIR%%/driver/gimp/escp2-pro
+%%DATADIR%%/driver/gimp/lexmark-4076
+%%DATADIR%%/driver/gimp/lexmark-z52
+%%DATADIR%%/driver/gimp/pcl-1100
+%%DATADIR%%/driver/gimp/pcl-1200
+%%DATADIR%%/driver/gimp/pcl-1220
+%%DATADIR%%/driver/gimp/pcl-2
+%%DATADIR%%/driver/gimp/pcl-4
+%%DATADIR%%/driver/gimp/pcl-500
+%%DATADIR%%/driver/gimp/pcl-600
+%%DATADIR%%/driver/gimp/pcl-690
+%%DATADIR%%/driver/gimp/pcl-750
+%%DATADIR%%/driver/gimp/pcl-810
+%%DATADIR%%/driver/hl1240
+%%DATADIR%%/driver/hl1250
+%%DATADIR%%/driver/hl7x0
+%%DATADIR%%/driver/hpdj/500
+%%DATADIR%%/driver/hpdj/500C
+%%DATADIR%%/driver/hpdj/550C
+%%DATADIR%%/driver/hpdj/850C
+%%DATADIR%%/driver/hpdj/u970
+%%DATADIR%%/driver/hpdj/unspec
+%%DATADIR%%/driver/hpijs/AP21xx
+%%DATADIR%%/driver/hpijs/DJ350
+%%DATADIR%%/driver/hpijs/DJ6xxP
+%%DATADIR%%/driver/hpijs/DJ8xx
+%%DATADIR%%/driver/hpijs/DJ9xx
+%%DATADIR%%/driver/hpijs/DJ9xxVIP
+%%DATADIR%%/driver/ijs/APOLLO_P-22
+%%DATADIR%%/driver/ijs/Apollo-2500-2600
+%%DATADIR%%/driver/ijs/DESKJET_350
+%%DATADIR%%/driver/ijs/DESKJET_600
+%%DATADIR%%/driver/ijs/DESKJET_610
+%%DATADIR%%/driver/ijs/DESKJET_630
+%%DATADIR%%/driver/ijs/DESKJET_810
+%%DATADIR%%/driver/ijs/DESKJET_825
+%%DATADIR%%/driver/ijs/DESKJET_920
+%%DATADIR%%/driver/ijs/DESKJET_960
+%%DATADIR%%/driver/ijs/PHOTOSMART_100
+%%DATADIR%%/driver/imagen
+%%DATADIR%%/driver/jpeg
+%%DATADIR%%/driver/lex3200
+%%DATADIR%%/driver/lexmark1100
+%%DATADIR%%/driver/lexmark2030
+%%DATADIR%%/driver/lexmark2050c
+%%DATADIR%%/driver/lexmark2070
+%%DATADIR%%/driver/lexmark2070c
+%%DATADIR%%/driver/lexmarkZ11
+%%DATADIR%%/driver/lj250
+%%DATADIR%%/driver/ljet4
+%%DATADIR%%/driver/ljet4l
+%%DATADIR%%/driver/lx5000
+%%DATADIR%%/driver/lxm3200
+%%DATADIR%%/driver/md2k
+%%DATADIR%%/driver/oki182
+%%DATADIR%%/driver/okiibm
+%%DATADIR%%/driver/omni/Brother_HJ_100i
+%%DATADIR%%/driver/omni/Brother_HJ_400
+%%DATADIR%%/driver/omni/Brother_HL_1240
+%%DATADIR%%/driver/omni/Brother_HL_4V
+%%DATADIR%%/driver/omni/Brother_HL_660
+%%DATADIR%%/driver/omni/Brother_HL_P2000
+%%DATADIR%%/driver/omni/Brother_M_1309
+%%DATADIR%%/driver/omni/Brother_M_1809_Color
+%%DATADIR%%/driver/omni/Brother_M_1824L_Color
+%%DATADIR%%/driver/omni/Brother_M_1909
+%%DATADIR%%/driver/omni/Brother_M_1909_Color
+%%DATADIR%%/driver/omni/Canon_BJC_2000
+%%DATADIR%%/driver/omni/Canon_BJC_210
+%%DATADIR%%/driver/omni/Canon_BJC_250J
+%%DATADIR%%/driver/omni/Canon_BJC_4100
+%%DATADIR%%/driver/omni/Canon_BJC_4200_Photo
+%%DATADIR%%/driver/omni/Canon_BJC_4550
+%%DATADIR%%/driver/omni/Canon_BJC_4650
+%%DATADIR%%/driver/omni/Canon_BJC_5500
+%%DATADIR%%/driver/omni/Canon_BJC_600
+%%DATADIR%%/driver/omni/Canon_BJC_6000
+%%DATADIR%%/driver/omni/Canon_BJC_600e
+%%DATADIR%%/driver/omni/Canon_BJC_610
+%%DATADIR%%/driver/omni/Canon_BJC_7000
+%%DATADIR%%/driver/omni/Canon_BJC_800
+%%DATADIR%%/driver/omni/Canon_BJC_820
+%%DATADIR%%/driver/omni/Canon_BJC_8500
+%%DATADIR%%/driver/omni/Canon_BJ_100
+%%DATADIR%%/driver/omni/Canon_BJ_230
+%%DATADIR%%/driver/omni/Canon_BJ_30
+%%DATADIR%%/driver/omni/Canon_BJ_F600
+%%DATADIR%%/driver/omni/Canon_BJ_F6000
+%%DATADIR%%/driver/omni/Canon_S450
+%%DATADIR%%/driver/omni/Epson_24_pin_136_Col
+%%DATADIR%%/driver/omni/Epson_AP_3250
+%%DATADIR%%/driver/omni/Epson_AP_3260
+%%DATADIR%%/driver/omni/Epson_AP_5000
+%%DATADIR%%/driver/omni/Epson_AP_5500
+%%DATADIR%%/driver/omni/Epson_AP_800
+%%DATADIR%%/driver/omni/Epson_DFX_5000_
+%%DATADIR%%/driver/omni/Epson_DFX_8000
+%%DATADIR%%/driver/omni/Epson_DFX_8500
+%%DATADIR%%/driver/omni/Epson_DLQ_2000__360_dpi_
+%%DATADIR%%/driver/omni/Epson_DLQ_3000_
+%%DATADIR%%/driver/omni/Epson_EPL_5700
+%%DATADIR%%/driver/omni/Epson_EPL_N2000
+%%DATADIR%%/driver/omni/Epson_EX_1000
+%%DATADIR%%/driver/omni/Epson_EX_800
+%%DATADIR%%/driver/omni/Epson_FX_1050
+%%DATADIR%%/driver/omni/Epson_FX_1180
+%%DATADIR%%/driver/omni/Epson_FX_880
+%%DATADIR%%/driver/omni/Epson_Generic_ESC_P_24_J84
+%%DATADIR%%/driver/omni/Epson_Generic_ESC_P_24_J84C
+%%DATADIR%%/driver/omni/Epson_LQ_2080
+%%DATADIR%%/driver/omni/Epson_LQ_2500
+%%DATADIR%%/driver/omni/Epson_MJ_3000C
+%%DATADIR%%/driver/omni/Epson_MJ_3000CU
+%%DATADIR%%/driver/omni/Epson_MJ_500C
+%%DATADIR%%/driver/omni/Epson_MJ_700V2C
+%%DATADIR%%/driver/omni/Epson_MJ_800C
+%%DATADIR%%/driver/omni/Epson_MJ_910C
+%%DATADIR%%/driver/omni/Epson_MX_80__w_GRAFTRAX_80_
+%%DATADIR%%/driver/omni/Epson_Stylus_300
+%%DATADIR%%/driver/omni/Epson_Stylus_800
+%%DATADIR%%/driver/omni/Epson_Stylus_800_
+%%DATADIR%%/driver/omni/Epson_Stylus_Color_1160
+%%DATADIR%%/driver/omni/Epson_Stylus_Color_300
+%%DATADIR%%/driver/omni/Epson_Stylus_Color_400
+%%DATADIR%%/driver/omni/Epson_Stylus_Color_660
+%%DATADIR%%/driver/omni/Epson_Stylus_Photo_1200
+%%DATADIR%%/driver/omni/Epson_Stylus_Photo_1270
+%%DATADIR%%/driver/omni/Epson_Stylus_Photo_1290
+%%DATADIR%%/driver/omni/Epson_Stylus_Photo_2000P
+%%DATADIR%%/driver/omni/Epson_Stylus_Photo_790
+%%DATADIR%%/driver/omni/Epson_Stylus_Photo_870
+%%DATADIR%%/driver/omni/HP_Color_LaserJet
+%%DATADIR%%/driver/omni/HP_Color_LaserJet_4500
+%%DATADIR%%/driver/omni/HP_Color_LaserJet_8500
+%%DATADIR%%/driver/omni/HP_Color_LaserJet_8550
+%%DATADIR%%/driver/omni/HP_LaserJet_1100
+%%DATADIR%%/driver/omni/HP_LaserJet_1200
+%%DATADIR%%/driver/omni/HP_LaserJet_2000
+%%DATADIR%%/driver/omni/HP_LaserJet_2100
+%%DATADIR%%/driver/omni/HP_LaserJet_4V_4MV
+%%DATADIR%%/driver/omni/HP_LaserJet_5000
+%%DATADIR%%/driver/omni/HP_LaserJet_8000
+%%DATADIR%%/driver/omni/HP_LaserJet_Classic
+%%DATADIR%%/driver/omni/HP_Mopier_240
+%%DATADIR%%/driver/omni/IBM_5183_Portable_Printer
+%%DATADIR%%/driver/omni/KS_24_pin_136_Col
+%%DATADIR%%/driver/omni/KS_9_pin_136_Col
+%%DATADIR%%/driver/omni/KS_9_pin_80_Col
+%%DATADIR%%/driver/omni/Kyocera_FS_1750
+%%DATADIR%%/driver/omni/Kyocera_FS_5500A_FS_5500
+%%DATADIR%%/driver/omni/Kyocera_FS_5800C
+%%DATADIR%%/driver/omni/Kyocera_FS_600
+%%DATADIR%%/driver/omni/Kyocera_FS_6300
+%%DATADIR%%/driver/omni/Kyocera_FS_6700
+%%DATADIR%%/driver/omni/Kyocera_FS_680
+%%DATADIR%%/driver/omni/Kyocera_FS_7000
+%%DATADIR%%/driver/omni/Kyocera_F_800A_F_800
+%%DATADIR%%/driver/omni/OkiPos_425D
+%%DATADIR%%/driver/omni/Okidata_OL1200
+%%DATADIR%%/driver/omni/Okidata_OL400e
+%%DATADIR%%/driver/omni/Panasonic_KX_P1124
+%%DATADIR%%/driver/pcl3/hpdj
+%%DATADIR%%/driver/pcl3/hpdj1120c
+%%DATADIR%%/driver/pcl3/hpdj310
+%%DATADIR%%/driver/pcl3/hpdj550c
+%%DATADIR%%/driver/pcl3/hpdj600
+%%DATADIR%%/driver/pcl3/hpdj680c
+%%DATADIR%%/driver/pcl3/u970
+%%DATADIR%%/driver/pcl3/unspec
+%%DATADIR%%/driver/pcx
+%%DATADIR%%/driver/pdfwrite
+%%DATADIR%%/driver/photoex
+%%DATADIR%%/driver/pips/sc20s
+%%DATADIR%%/driver/pips/sc40s
+%%DATADIR%%/driver/pips/sc480
+%%DATADIR%%/driver/pips/sc580
+%%DATADIR%%/driver/pips/sc60s
+%%DATADIR%%/driver/pips/sc680_777
+%%DATADIR%%/driver/pips/sc70s
+%%DATADIR%%/driver/pips/sc80s
+%%DATADIR%%/driver/pips/sc880
+%%DATADIR%%/driver/pips/sc980
+%%DATADIR%%/driver/pips/sp810_820
+%%DATADIR%%/driver/png
+%%DATADIR%%/driver/pnm
+%%DATADIR%%/driver/ppa/1000
+%%DATADIR%%/driver/printiva
+%%DATADIR%%/driver/pxlcolor
+%%DATADIR%%/driver/pxlmono
+%%DATADIR%%/driver/samsung85
+%%DATADIR%%/driver/st800
+%%DATADIR%%/driver/stcolor
+%%DATADIR%%/driver/stp/bjc-1000
+%%DATADIR%%/driver/stp/bjc-2000
+%%DATADIR%%/driver/stp/bjc-210
+%%DATADIR%%/driver/stp/bjc-30
+%%DATADIR%%/driver/stp/bjc-3000
+%%DATADIR%%/driver/stp/bjc-4400
+%%DATADIR%%/driver/stp/bjc-7000
+%%DATADIR%%/driver/stp/bjc-8200
+%%DATADIR%%/driver/stp/compaq-ij750
+%%DATADIR%%/driver/stp/escp2
+%%DATADIR%%/driver/stp/escp2-10000
+%%DATADIR%%/driver/stp/escp2-1160
+%%DATADIR%%/driver/stp/escp2-1200
+%%DATADIR%%/driver/stp/escp2-1280
+%%DATADIR%%/driver/stp/escp2-1500
+%%DATADIR%%/driver/stp/escp2-1520
+%%DATADIR%%/driver/stp/escp2-400
+%%DATADIR%%/driver/stp/escp2-440
+%%DATADIR%%/driver/stp/escp2-480
+%%DATADIR%%/driver/stp/escp2-600
+%%DATADIR%%/driver/stp/escp2-660
+%%DATADIR%%/driver/stp/escp2-670
+%%DATADIR%%/driver/stp/escp2-680
+%%DATADIR%%/driver/stp/escp2-700
+%%DATADIR%%/driver/stp/escp2-720
+%%DATADIR%%/driver/stp/escp2-900
+%%DATADIR%%/driver/stp/escp2-c70
+%%DATADIR%%/driver/stp/escp2-photo
+%%DATADIR%%/driver/stp/escp2-pro
+%%DATADIR%%/driver/stp/lexmark-4076
+%%DATADIR%%/driver/stp/lexmark-z52
+%%DATADIR%%/driver/stp/pcl-1100
+%%DATADIR%%/driver/stp/pcl-1200
+%%DATADIR%%/driver/stp/pcl-1220
+%%DATADIR%%/driver/stp/pcl-2
+%%DATADIR%%/driver/stp/pcl-4
+%%DATADIR%%/driver/stp/pcl-600
+%%DATADIR%%/driver/stp/pcl-690
+%%DATADIR%%/driver/stp/pcl-750
+%%DATADIR%%/driver/stp/pcl-810
+%%DATADIR%%/driver/stylewriter
+%%DATADIR%%/driver/tiff
+%%DATADIR%%/setup/README
+%%DATADIR%%/setup/devices-6.50
+%%DATADIR%%/setup/devices-7.00
+%%DATADIR%%/setup/non-printer
+%%DATADIR%%/setup/printer-6.50
+%%DATADIR%%/setup/printer-7.00
+%%DATADIR%%/setup/printer-cdj
+%%DATADIR%%/setup/printer-epson
+%%DATADIR%%/setup/printer-gimp
+%%DATADIR%%/setup/printer-hpdj
+%%DATADIR%%/setup/printer-hpijs
+%%DATADIR%%/setup/printer-ijs
+%%DATADIR%%/setup/printer-lexmark
+%%DATADIR%%/setup/printer-misc
+%%DATADIR%%/setup/printer-omni
+%%DATADIR%%/setup/printer-pcl3
+%%DATADIR%%/setup/printer-ppa
+%%DATADIR%%/setup/printer-stp
+%%DATADIR%%/setup/test.ps
+%%DATADIR%%/template/README
+%%DATADIR%%/template/apsfilterrc
+%%DOCSDIR%%/ANNOUNCE
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/HOWTO-BUGREPORTS
+%%DOCSDIR%%/LICENSE
+%%DOCSDIR%%/README.BSD
+%%DOCSDIR%%/README.TeX
+%%DOCSDIR%%/apsfilter4.png
+%%DOCSDIR%%/handbook.html
+%%DOCSDIR%%/paper
 @dirrm etc/apsfilter
-@dirrm share/apsfilter/bin
-@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
-@dirrm share/apsfilter/driver/ppa
-@dirrm share/apsfilter/driver/stp
-@dirrm share/apsfilter/driver
-@dirrm share/apsfilter/setup
-@dirrm share/apsfilter/template
-@dirrm share/apsfilter
-@dirrm share/doc/apsfilter
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/driver/gimp
+@dirrm %%DATADIR%%/driver/hpdj
+@dirrm %%DATADIR%%/driver/hpijs
+@dirrm %%DATADIR%%/driver/ijs
+@dirrm %%DATADIR%%/driver/omni
+@dirrm %%DATADIR%%/driver/pcl3
+@dirrm %%DATADIR%%/driver/pips
+@dirrm %%DATADIR%%/driver/ppa
+@dirrm %%DATADIR%%/driver/stp
+@dirrm %%DATADIR%%/driver
+@dirrm %%DATADIR%%/setup
+@dirrm %%DATADIR%%/template
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%