3 files changed, 392 insertions, 179 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index dbb06dab5610..c5b4d70d2444 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	hylafax
-PORTVERSION=	4.3.0
+PORTVERSION=	4.3.2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
 MAINTAINER=	W.J.Zwart@NescioLudens.nl
 COMMENT=	Fax software
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm \
-		gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
 
 # no dependency on ghostscript because we don't know which
 # version the user prefers
 LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-
 DIST_SUBDIR=	hylafax
 
 CONFIGURE_ARGS=	--with-INSTALL="" \
@@ -31,8 +28,7 @@ CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-TIFFINC="${LOCALBASE}/include" \
 		--with-GCOPTS=" " --with-GCXXOPTS=" " \
 		--with-REGEX=no --with-LIBREGEX='' --with-REGEXINC=none \
-		--with-DIR_HTML="${DOCSDIR}" \
-		--with-AWK="${LOCALBASE}/bin/gawk"
+		--with-DIR_HTML="${DOCSDIR}"
 
 SUB_FILES=	pkg-message hylafax.sh.sample
 
@@ -47,7 +43,7 @@ CONFIGURE_ARGS+=--disable-pam
 .endif
 
 # Want HTML documentation?
-.if defined(WITH_HTMLDOC)
+.if !defined(NOPORTDOCS)
 CONFIGURE_ARGS+=--with-HTML=yes
 PLIST_SUB+=	PORTDOCS=""
 .else
@@ -58,6 +54,12 @@ PLIST_SUB+=	PORTDOCS="@comment "
 CONFIGURE_ARGS+=--nointeractive
 .endif
 
+.if defined(WITH_GAWK)
+BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+CONFIGURE_ARGS+=--with-AWK="${LOCALBASE}/bin/gawk"
+.endif
+
 MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index fda6d70a3876..1ce0bac6bbd5 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,3 +1,3 @@
-MD5 (hylafax/hylafax-4.3.0.tar.gz) = 15fbb3eb5fdf6def379799442a68da4e
-SHA256 (hylafax/hylafax-4.3.0.tar.gz) = a50512bfe6ae60573084dadfb5a629de78db30d19ac59ad6750bd621e138817c
-SIZE (hylafax/hylafax-4.3.0.tar.gz) = 1468136
+MD5 (hylafax/hylafax-4.3.2.tar.gz) = 5fd10cf19b2ade2ca823276e732ca377
+SHA256 (hylafax/hylafax-4.3.2.tar.gz) = 7c31f972022e69048e2273836c265b8b55399b907de0db495b01fcb923de0c8e
+SIZE (hylafax/hylafax-4.3.2.tar.gz) = 1521085
diff --git a/comms/hylafax/pkg-plist b/comms/hylafax/pkg-plist
index 5d25a36990ed..2cff994edad5 100644
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@@ -19,204 +19,206 @@ lib/fax/pagesizes-dist
 lib/fax/typerules-dist
 @exec [ -f %B/typerules ] || cp %B/%f %B/typerules
 @dirrm lib/fax
-sbin/choptest
-sbin/cqtest
-sbin/dialtest
-sbin/edit-faxcover
-sbin/faxabort
-sbin/faxaddmodem
+sbin/textfmt
+sbin/faxmsg
 sbin/faxadduser
-sbin/faxanswer
 sbin/faxconfig
-sbin/faxcron
 sbin/faxdeluser
-sbin/faxgetty
+sbin/faxmodem
+sbin/faxstate
+sbin/faxwatch
 sbin/faxinfo
+sbin/tiffcheck
+sbin/faxabort
+sbin/faxanswer
+sbin/faxquit
 sbin/faxlock
-sbin/faxmodem
-sbin/faxmsg
+sbin/dialtest
+sbin/typetest
+sbin/xferfaxstats
+sbin/recvstats
+sbin/faxcron
+sbin/edit-faxcover
 sbin/faxq
 sbin/faxqclean
-sbin/faxquit
+sbin/faxgetty
 sbin/faxsend
+sbin/pagesend
+sbin/tsitest
+sbin/tagtest
+sbin/cqtest
+sbin/choptest
+sbin/hfaxd
+sbin/faxaddmodem
 sbin/faxsetup
 sbin/faxsetup.bsdi
 sbin/faxsetup.irix
 sbin/faxsetup.linux
-sbin/faxstate
-sbin/faxwatch
-sbin/hfaxd
-sbin/hylafax
+sbin/probemodem
 sbin/lockname
 sbin/ondelay
-sbin/pagesend
-sbin/probemodem
-sbin/recvstats
-sbin/tagtest
-sbin/textfmt
-sbin/tiffcheck
-sbin/tsitest
-sbin/typetest
-sbin/xferfaxstats
-%%PORTDOCS%%share/doc/hylafax/acknowledge.html
-%%PORTDOCS%%share/doc/hylafax/binary.html
-%%PORTDOCS%%share/doc/hylafax/building.html
-%%PORTDOCS%%share/doc/hylafax/cgi-bin/man2html
-%%PORTDOCS%%share/doc/hylafax/cgi-bin/manpage
-%%PORTDOCS%%share/doc/hylafax/cgi-bin/unquote
-%%PORTDOCS%%share/doc/hylafax/class1.html
-%%PORTDOCS%%share/doc/hylafax/class2.html
-%%PORTDOCS%%share/doc/hylafax/class2.0.html
-%%PORTDOCS%%share/doc/hylafax/contrib.html
-%%PORTDOCS%%share/doc/hylafax/copyright.html
-%%PORTDOCS%%share/doc/hylafax/documentation.html
-%%PORTDOCS%%share/doc/hylafax/faxgateway.html
-%%PORTDOCS%%share/doc/hylafax/ftpmail-help.html
-%%PORTDOCS%%share/doc/hylafax/ghostscript.html
-%%PORTDOCS%%share/doc/hylafax/HOWTO.html
-%%PORTDOCS%%share/doc/hylafax/hylafax.gif
-%%PORTDOCS%%share/doc/hylafax/hylafax3.0.html
-%%PORTDOCS%%share/doc/hylafax/hylafax4.0.html
-%%PORTDOCS%%share/doc/hylafax/icons/at_work_icon.gif
-%%PORTDOCS%%share/doc/hylafax/icons/back.gif
-%%PORTDOCS%%share/doc/hylafax/icons/ball_blue_icon.gif
-%%PORTDOCS%%share/doc/hylafax/icons/button.excl.gif
-%%PORTDOCS%%share/doc/hylafax/icons/contents.gif
-%%PORTDOCS%%share/doc/hylafax/icons/frog.gif
-%%PORTDOCS%%share/doc/hylafax/icons/improved.gif
-%%PORTDOCS%%share/doc/hylafax/icons/info_icon.gif
-%%PORTDOCS%%share/doc/hylafax/icons/new.gif
-%%PORTDOCS%%share/doc/hylafax/icons/next.gif
-%%PORTDOCS%%share/doc/hylafax/icons/smiley.gif
-%%PORTDOCS%%share/doc/hylafax/icons/warning_icon.gif
-%%PORTDOCS%%share/doc/hylafax/index.html
-%%PORTDOCS%%share/doc/hylafax/install-source.html
-%%PORTDOCS%%share/doc/hylafax/ixotap.html
-%%PORTDOCS%%share/doc/hylafax/mailing-lists.html
-%%PORTDOCS%%share/doc/hylafax/Majordomo/help.html
-%%PORTDOCS%%share/doc/hylafax/matthias.gif
-%%PORTDOCS%%share/doc/hylafax/matthias.html
-%%PORTDOCS%%share/doc/hylafax/modems.html
-%%PORTDOCS%%share/doc/hylafax/Modems/Hayes/hayes.html
-%%PORTDOCS%%share/doc/hylafax/Modems/Supra/class1.html
-%%PORTDOCS%%share/doc/hylafax/Modems/Supra/class2.html
-%%PORTDOCS%%share/doc/hylafax/Modems/Telebit/faxcmds.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ZyXEL/autodetect.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ZyXEL/codes.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ZyXEL/commands.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ZyXEL/compression.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ZyXEL/examples.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ZyXEL/voice.html
-%%PORTDOCS%%share/doc/hylafax/Modems/att-dataport.html
-%%PORTDOCS%%share/doc/hylafax/Modems/digicom-scout.html
-%%PORTDOCS%%share/doc/hylafax/Modems/everex-2496d.html
-%%PORTDOCS%%share/doc/hylafax/Modems/hayes-accura288.html
-%%PORTDOCS%%share/doc/hylafax/Modems/hayes-optima2400.html
-%%PORTDOCS%%share/doc/hylafax/Modems/index.html
-%%PORTDOCS%%share/doc/hylafax/Modems/multitech-1432.html
-%%PORTDOCS%%share/doc/hylafax/Modems/multitech-1932.html
-%%PORTDOCS%%share/doc/hylafax/Modems/multitech-2834.html
-%%PORTDOCS%%share/doc/hylafax/Modems/nuvo-96424pfx.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ppi-pm14400fxmt.html
-%%PORTDOCS%%share/doc/hylafax/Modems/rockwell-56k.html
-%%PORTDOCS%%share/doc/hylafax/Modems/supra-v32bis.html
-%%PORTDOCS%%share/doc/hylafax/Modems/telebit-t3000.html
-%%PORTDOCS%%share/doc/hylafax/Modems/twincom-144df.html
-%%PORTDOCS%%share/doc/hylafax/Modems/ucom-traveller96.html
-%%PORTDOCS%%share/doc/hylafax/Modems/usr-courier.html
-%%PORTDOCS%%share/doc/hylafax/Modems/usr-sportster.html
-%%PORTDOCS%%share/doc/hylafax/Modems/zyxel-1496.html
-%%PORTDOCS%%share/doc/hylafax/Modems/zyxel-elite.html
-%%PORTDOCS%%share/doc/hylafax/Modems/zyxel-omni.html
-%%PORTDOCS%%share/doc/hylafax/namechange.html
-%%PORTDOCS%%share/doc/hylafax/operation.html
-%%PORTDOCS%%share/doc/hylafax/overview.html
-%%PORTDOCS%%share/doc/hylafax/sam.gif
-%%PORTDOCS%%share/doc/hylafax/sam.html
-%%PORTDOCS%%share/doc/hylafax/setup-advanced.html
-%%PORTDOCS%%share/doc/hylafax/setup-client.html
-%%PORTDOCS%%share/doc/hylafax/setup.html
-%%PORTDOCS%%share/doc/hylafax/source.html
-%%PORTDOCS%%share/doc/hylafax/toc.html
-%%PORTDOCS%%share/doc/hylafax/troubleshooting.html
-%%PORTDOCS%%share/doc/hylafax/upgrade4.0.html
-%%PORTDOCS%%share/doc/hylafax/v2.3beta036.html
-%%PORTDOCS%%share/doc/hylafax/v2.3beta036special.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta096.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta100.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta108.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta110.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta111.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta112.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta113.html
-%%PORTDOCS%%share/doc/hylafax/v3.0beta114.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta005.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta006.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta007.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta008.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta009.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta010.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta011.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta012.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta013.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta014.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta015.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta018.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta020.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta021.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta022.html
-%%PORTDOCS%%share/doc/hylafax/v4.0beta023.html
-%%PORTDOCS%%share/doc/hylafax/version.html
-%%PORTDOCS%%@dirrm share/doc/hylafax/cgi-bin
-%%PORTDOCS%%@dirrm share/doc/hylafax/icons
-%%PORTDOCS%%@dirrm share/doc/hylafax/Majordomo
-%%PORTDOCS%%@dirrm share/doc/hylafax/Modems/Hayes
-%%PORTDOCS%%@dirrm share/doc/hylafax/Modems/Supra
-%%PORTDOCS%%@dirrm share/doc/hylafax/Modems/Telebit
-%%PORTDOCS%%@dirrm share/doc/hylafax/Modems/ZyXEL
-%%PORTDOCS%%@dirrm share/doc/hylafax/Modems
-%%PORTDOCS%%@dirrm share/doc/hylafax
+sbin/hylafax
+%%PORTDOCS%%%%DOCSDIR%%/icons/at_work_icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/ball_blue_icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/button.excl.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/back.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/frog.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/improved.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/info_icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/next.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/smiley.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/warning_icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/contents.gif
+%%PORTDOCS%%%%DOCSDIR%%/Modems/Telebit/faxcmds.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/Supra/class1.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/Supra/class2.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ZyXEL/autodetect.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ZyXEL/codes.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ZyXEL/commands.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ZyXEL/compression.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ZyXEL/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ZyXEL/voice.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/Hayes/hayes.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/att-dataport.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/digicom-scout.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/everex-2496d.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/hayes-optima2400.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/index.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/multitech-1432.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/multitech-1932.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/nuvo-96424pfx.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ppi-pm14400fxmt.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/supra-v32bis.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/telebit-t3000.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/twincom-144df.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/ucom-traveller96.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/usr-courier.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/usr-sportster.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/zyxel-1496.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/zyxel-elite.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/zyxel-omni.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/rockwell-56k.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/multitech-2834.html
+%%PORTDOCS%%%%DOCSDIR%%/Modems/hayes-accura288.html
+%%PORTDOCS%%%%DOCSDIR%%/Majordomo/help.html
+%%PORTDOCS%%%%DOCSDIR%%/acknowledge.html
+%%PORTDOCS%%%%DOCSDIR%%/binary.html
+%%PORTDOCS%%%%DOCSDIR%%/building.html
+%%PORTDOCS%%%%DOCSDIR%%/class1.html
+%%PORTDOCS%%%%DOCSDIR%%/class2.0.html
+%%PORTDOCS%%%%DOCSDIR%%/class2.html
+%%PORTDOCS%%%%DOCSDIR%%/contrib.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/faxgateway.html
+%%PORTDOCS%%%%DOCSDIR%%/ftpmail-help.html
+%%PORTDOCS%%%%DOCSDIR%%/ghostscript.html
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO.html
+%%PORTDOCS%%%%DOCSDIR%%/hylafax3.0.html
+%%PORTDOCS%%%%DOCSDIR%%/hylafax4.0.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install-source.html
+%%PORTDOCS%%%%DOCSDIR%%/ixotap.html
+%%PORTDOCS%%%%DOCSDIR%%/mailing-lists.html
+%%PORTDOCS%%%%DOCSDIR%%/modems.html
+%%PORTDOCS%%%%DOCSDIR%%/namechange.html
+%%PORTDOCS%%%%DOCSDIR%%/operation.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/sam.html
+%%PORTDOCS%%%%DOCSDIR%%/matthias.html
+%%PORTDOCS%%%%DOCSDIR%%/setup-advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/setup-client.html
+%%PORTDOCS%%%%DOCSDIR%%/setup.html
+%%PORTDOCS%%%%DOCSDIR%%/source.html
+%%PORTDOCS%%%%DOCSDIR%%/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrade4.0.html
+%%PORTDOCS%%%%DOCSDIR%%/v2.3beta036.html
+%%PORTDOCS%%%%DOCSDIR%%/v2.3beta036special.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta096.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta100.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta108.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta110.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta111.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta112.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta113.html
+%%PORTDOCS%%%%DOCSDIR%%/v3.0beta114.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta005.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta006.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta007.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta008.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta009.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta010.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta011.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta012.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta013.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta014.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta015.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta018.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta020.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta021.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta022.html
+%%PORTDOCS%%%%DOCSDIR%%/v4.0beta023.html
+%%PORTDOCS%%%%DOCSDIR%%/version.html
+%%PORTDOCS%%%%DOCSDIR%%/sam.gif
+%%PORTDOCS%%%%DOCSDIR%%/matthias.gif
+%%PORTDOCS%%%%DOCSDIR%%/hylafax.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Modems/ZyXEL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Modems/Telebit
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Modems/Supra
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Modems/Hayes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Modems
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Majordomo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @cwd /var/spool
 hylafax/COPYRIGHT
 @exec mkfifo %D/hylafax/FIFO
 @exec chown uucp:dialer %D/hylafax/FIFO
 @exec chmod 0600 %D/hylafax/FIFO
-@unexec rm %D/hylafax/FIFO
+@unexec rm %D/hylafax/FIFO 2>&1 >/dev/null || true
 @exec mkdir %D/hylafax/archive
 @exec chown uucp:dialer %D/hylafax/archive
 @exec chmod 0700 %D/hylafax/archive
-hylafax/bin/archive
-hylafax/bin/faxrcvd
-hylafax/bin/mkcover
-hylafax/bin/notify
-hylafax/bin/notify-4.1
-hylafax/bin/notify.awk
-hylafax/bin/pcl2fax
-@unexec if [ -f %D/hylafax/bin/pdf2fax ]; then rm %D/hylafax/bin/pdf2fax; fi
-hylafax/bin/pdf2fax.gs
-hylafax/bin/pollrcvd
-@unexec if [ -f %D/hylafax/bin/ps2fax ]; then rm %D/hylafax/bin/ps2fax; fi
-hylafax/bin/ps2fax.dps
 hylafax/bin/ps2fax.gs
+hylafax/bin/ps2fax.dps
 hylafax/bin/ps2fax.imp
+hylafax/bin/pdf2fax.gs
+hylafax/bin/pcl2fax
 hylafax/bin/tiff2fax
 hylafax/bin/tiff2pdf
+hylafax/bin/notify
+hylafax/bin/notify-4.1
+hylafax/bin/notify-4.2
+hylafax/bin/archive
+hylafax/bin/common-functions
+hylafax/bin/dictionary
+hylafax/bin/notify.awk
+hylafax/bin/qp-encode.awk
+hylafax/bin/b64-encode.awk
+hylafax/bin/faxrcvd
+hylafax/bin/pollrcvd
+hylafax/bin/mkcover
 hylafax/bin/wedged
+@unexec if [ -f %D/hylafax/bin/pdf2fax ]; then rm %D/hylafax/bin/pdf2fax; fi
+@unexec if [ -f %D/hylafax/bin/ps2fax ]; then rm %D/hylafax/bin/ps2fax; fi
 @exec mkdir %D/hylafax/client
 @exec chown uucp:dialer %D/hylafax/client
 @exec chmod 0755 %D/hylafax/client
+hylafax/config/class1
+hylafax/config/class1.0
+hylafax/config/class2
+hylafax/config/class2.0
+hylafax/config/class2.1
+hylafax/config/skel
 hylafax/config/agere-mp-2
 hylafax/config/agere-mp-21
-hylafax/config/att-dataport
 hylafax/config/att-dataport-2
 hylafax/config/att-dataport-2.0
+hylafax/config/att-dataport
 hylafax/config/att-dpexpress-2
 hylafax/config/cirrus
-hylafax/config/class1
-hylafax/config/class1.0
-hylafax/config/class2
-hylafax/config/class2.0
-hylafax/config/class2.1
 hylafax/config/conexant-1.0
 hylafax/config/digi
 hylafax/config/digi-2
@@ -232,13 +234,15 @@ hylafax/config/exar
 hylafax/config/gvc-288
 hylafax/config/gvc-288-2
 hylafax/config/hayes
+hylafax/config/iaxmodem
 hylafax/config/intel-400e
+hylafax/config/linux-isdn-2
 hylafax/config/lucent
 hylafax/config/lucent-isa
-hylafax/config/lucent-mt-10
 hylafax/config/lucent-mt-2
 hylafax/config/lucent-mt-20
 hylafax/config/lucent-mt-21
+hylafax/config/lucent-mt-10
 hylafax/config/moto-288
 hylafax/config/mt-1432
 hylafax/config/nuvo-voyager
@@ -253,11 +257,9 @@ hylafax/config/rc32acl
 hylafax/config/rc32acl-1
 hylafax/config/rockwell-k56
 hylafax/config/rockwell-rc
-hylafax/config/sierra
-hylafax/config/skel
 hylafax/config/t38modem
-hylafax/config/telebit-qblazer
 hylafax/config/telebit-t3000
+hylafax/config/telebit-qblazer
 hylafax/config/telebit-wb
 hylafax/config/topic
 hylafax/config/tricom2842
@@ -271,6 +273,7 @@ hylafax/config/zyxel-1496e
 hylafax/config/zyxel-1496e-1
 hylafax/config/zyxel-1496e-2.0
 hylafax/config/zyxel-2864
+hylafax/config/sierra
 @exec mkdir %D/hylafax/dev
 @exec chown uucp:dialer %D/hylafax/dev
 @exec chmod 0755 %D/hylafax/dev
@@ -280,12 +283,220 @@ hylafax/config/zyxel-2864
 @exec mkdir %D/hylafax/doneq
 @exec chown uucp:dialer %D/hylafax/doneq
 @exec chmod 0700 %D/hylafax/doneq
+hylafax/etc/dpsprinter.ps
 hylafax/etc/cover.templ
+hylafax/etc/xferfaxlog
+hylafax/etc/hosts.hfaxd
 hylafax/etc/dialrules
-hylafax/etc/dialrules.europe
 hylafax/etc/dialrules.sf-ba
-hylafax/etc/dpsprinter.ps
+hylafax/etc/dialrules.europe
 hylafax/etc/lutRS18.pcf
+hylafax/etc/templates/README
+hylafax/etc/templates/en/faxrcvd-error.txt
+hylafax/etc/templates/en/faxrcvd-failure.txt
+hylafax/etc/templates/en/faxrcvd-notify-error.txt
+hylafax/etc/templates/en/faxrcvd-notify-success.txt
+hylafax/etc/templates/en/faxrcvd-success.txt
+hylafax/etc/templates/en/notify-blocked.txt
+hylafax/etc/templates/en/notify-done-page.txt
+hylafax/etc/templates/en/notify-done.txt
+hylafax/etc/templates/en/notify-failed-page.txt
+hylafax/etc/templates/en/notify-failed.txt
+hylafax/etc/templates/en/notify-format_failed.txt
+hylafax/etc/templates/en/notify-killed.txt
+hylafax/etc/templates/en/notify-no_formatter.txt
+hylafax/etc/templates/en/notify-poll_failed.txt
+hylafax/etc/templates/en/notify-poll_no_document.txt
+hylafax/etc/templates/en/notify-poll_rejected.txt
+hylafax/etc/templates/en/notify-reject.txt
+hylafax/etc/templates/en/notify-removed.txt
+hylafax/etc/templates/en/notify-requeued.txt
+hylafax/etc/templates/en/notify-timedout.txt
+hylafax/etc/templates/fr/faxrcvd-error.txt
+hylafax/etc/templates/fr/faxrcvd-failure.txt
+hylafax/etc/templates/fr/faxrcvd-notify-error.txt
+hylafax/etc/templates/fr/faxrcvd-notify-success.txt
+hylafax/etc/templates/fr/faxrcvd-success.txt
+hylafax/etc/templates/fr/notify-blocked.txt
+hylafax/etc/templates/fr/notify-done-page.txt
+hylafax/etc/templates/fr/notify-done.txt
+hylafax/etc/templates/fr/notify-failed-page.txt
+hylafax/etc/templates/fr/notify-failed.txt
+hylafax/etc/templates/fr/notify-format_failed.txt
+hylafax/etc/templates/fr/notify-killed.txt
+hylafax/etc/templates/fr/notify-no_formatter.txt
+hylafax/etc/templates/fr/notify-poll_failed.txt
+hylafax/etc/templates/fr/notify-poll_no_document.txt
+hylafax/etc/templates/fr/notify-poll_rejected.txt
+hylafax/etc/templates/fr/notify-reject.txt
+hylafax/etc/templates/fr/notify-removed.txt
+hylafax/etc/templates/fr/notify-requeued.txt
+hylafax/etc/templates/fr/notify-timedout.txt
+hylafax/etc/templates/de/faxrcvd-error.txt
+hylafax/etc/templates/de/faxrcvd-failure.txt
+hylafax/etc/templates/de/faxrcvd-notify-error.txt
+hylafax/etc/templates/de/faxrcvd-notify-success.txt
+hylafax/etc/templates/de/faxrcvd-success.txt
+hylafax/etc/templates/de/notify-blocked.txt
+hylafax/etc/templates/de/notify-done-page.txt
+hylafax/etc/templates/de/notify-done.txt
+hylafax/etc/templates/de/notify-failed-page.txt
+hylafax/etc/templates/de/notify-failed.txt
+hylafax/etc/templates/de/notify-format_failed.txt
+hylafax/etc/templates/de/notify-killed.txt
+hylafax/etc/templates/de/notify-no_formatter.txt
+hylafax/etc/templates/de/notify-poll_failed.txt
+hylafax/etc/templates/de/notify-poll_no_document.txt
+hylafax/etc/templates/de/notify-poll_rejected.txt
+hylafax/etc/templates/de/notify-reject.txt
+hylafax/etc/templates/de/notify-removed.txt
+hylafax/etc/templates/de/notify-requeued.txt
+hylafax/etc/templates/de/notify-timedout.txt
+hylafax/etc/templates/ro/faxrcvd-error.txt
+hylafax/etc/templates/ro/faxrcvd-failure.txt
+hylafax/etc/templates/ro/faxrcvd-notify-error.txt
+hylafax/etc/templates/ro/faxrcvd-notify-success.txt
+hylafax/etc/templates/ro/faxrcvd-success.txt
+hylafax/etc/templates/ro/notify-blocked.txt
+hylafax/etc/templates/ro/notify-done-page.txt
+hylafax/etc/templates/ro/notify-done.txt
+hylafax/etc/templates/ro/notify-failed-page.txt
+hylafax/etc/templates/ro/notify-failed.txt
+hylafax/etc/templates/ro/notify-format_failed.txt
+hylafax/etc/templates/ro/notify-killed.txt
+hylafax/etc/templates/ro/notify-no_formatter.txt
+hylafax/etc/templates/ro/notify-poll_failed.txt
+hylafax/etc/templates/ro/notify-poll_no_document.txt
+hylafax/etc/templates/ro/notify-poll_rejected.txt
+hylafax/etc/templates/ro/notify-reject.txt
+hylafax/etc/templates/ro/notify-removed.txt
+hylafax/etc/templates/ro/notify-requeued.txt
+hylafax/etc/templates/ro/notify-timedout.txt
+hylafax/etc/templates/pt_BR/faxrcvd-error.txt
+hylafax/etc/templates/pt_BR/faxrcvd-failure.txt
+hylafax/etc/templates/pt_BR/faxrcvd-notify-error.txt
+hylafax/etc/templates/pt_BR/faxrcvd-notify-success.txt
+hylafax/etc/templates/pt_BR/faxrcvd-success.txt
+hylafax/etc/templates/pt_BR/notify-blocked.txt
+hylafax/etc/templates/pt_BR/notify-done-page.txt
+hylafax/etc/templates/pt_BR/notify-done.txt
+hylafax/etc/templates/pt_BR/notify-failed-page.txt
+hylafax/etc/templates/pt_BR/notify-failed.txt
+hylafax/etc/templates/pt_BR/notify-format_failed.txt
+hylafax/etc/templates/pt_BR/notify-killed.txt
+hylafax/etc/templates/pt_BR/notify-no_formatter.txt
+hylafax/etc/templates/pt_BR/notify-poll_failed.txt
+hylafax/etc/templates/pt_BR/notify-poll_no_document.txt
+hylafax/etc/templates/pt_BR/notify-poll_rejected.txt
+hylafax/etc/templates/pt_BR/notify-reject.txt
+hylafax/etc/templates/pt_BR/notify-removed.txt
+hylafax/etc/templates/pt_BR/notify-requeued.txt
+hylafax/etc/templates/pt_BR/notify-timedout.txt
+hylafax/etc/templates/pt/faxrcvd-error.txt
+hylafax/etc/templates/pt/faxrcvd-failure.txt
+hylafax/etc/templates/pt/faxrcvd-notify-error.txt
+hylafax/etc/templates/pt/faxrcvd-notify-success.txt
+hylafax/etc/templates/pt/faxrcvd-success.txt
+hylafax/etc/templates/pt/notify-blocked.txt
+hylafax/etc/templates/pt/notify-done-page.txt
+hylafax/etc/templates/pt/notify-done.txt
+hylafax/etc/templates/pt/notify-failed-page.txt
+hylafax/etc/templates/pt/notify-failed.txt
+hylafax/etc/templates/pt/notify-format_failed.txt
+hylafax/etc/templates/pt/notify-killed.txt
+hylafax/etc/templates/pt/notify-no_formatter.txt
+hylafax/etc/templates/pt/notify-poll_failed.txt
+hylafax/etc/templates/pt/notify-poll_no_document.txt
+hylafax/etc/templates/pt/notify-poll_rejected.txt
+hylafax/etc/templates/pt/notify-reject.txt
+hylafax/etc/templates/pt/notify-removed.txt
+hylafax/etc/templates/pt/notify-requeued.txt
+hylafax/etc/templates/pt/notify-timedout.txt
+hylafax/etc/templates/es/faxrcvd-error.txt
+hylafax/etc/templates/es/faxrcvd-failure.txt
+hylafax/etc/templates/es/faxrcvd-notify-error.txt
+hylafax/etc/templates/es/faxrcvd-notify-success.txt
+hylafax/etc/templates/es/faxrcvd-success.txt
+hylafax/etc/templates/es/notify-blocked.txt
+hylafax/etc/templates/es/notify-done-page.txt
+hylafax/etc/templates/es/notify-done.txt
+hylafax/etc/templates/es/notify-failed-page.txt
+hylafax/etc/templates/es/notify-failed.txt
+hylafax/etc/templates/es/notify-format_failed.txt
+hylafax/etc/templates/es/notify-killed.txt
+hylafax/etc/templates/es/notify-no_formatter.txt
+hylafax/etc/templates/es/notify-poll_failed.txt
+hylafax/etc/templates/es/notify-poll_no_document.txt
+hylafax/etc/templates/es/notify-poll_rejected.txt
+hylafax/etc/templates/es/notify-reject.txt
+hylafax/etc/templates/es/notify-removed.txt
+hylafax/etc/templates/es/notify-requeued.txt
+hylafax/etc/templates/es/notify-timedout.txt
+hylafax/etc/templates/it/faxrcvd-error.txt
+hylafax/etc/templates/it/faxrcvd-failure.txt
+hylafax/etc/templates/it/faxrcvd-notify-error.txt
+hylafax/etc/templates/it/faxrcvd-notify-success.txt
+hylafax/etc/templates/it/faxrcvd-success.txt
+hylafax/etc/templates/it/notify-blocked.txt
+hylafax/etc/templates/it/notify-done-page.txt
+hylafax/etc/templates/it/notify-done.txt
+hylafax/etc/templates/it/notify-failed-page.txt
+hylafax/etc/templates/it/notify-failed.txt
+hylafax/etc/templates/it/notify-format_failed.txt
+hylafax/etc/templates/it/notify-killed.txt
+hylafax/etc/templates/it/notify-no_formatter.txt
+hylafax/etc/templates/it/notify-poll_failed.txt
+hylafax/etc/templates/it/notify-poll_no_document.txt
+hylafax/etc/templates/it/notify-poll_rejected.txt
+hylafax/etc/templates/it/notify-reject.txt
+hylafax/etc/templates/it/notify-removed.txt
+hylafax/etc/templates/it/notify-requeued.txt
+hylafax/etc/templates/it/notify-timedout.txt
+hylafax/etc/templates/pl/faxrcvd-error.txt
+hylafax/etc/templates/pl/faxrcvd-failure.txt
+hylafax/etc/templates/pl/faxrcvd-notify-error.txt
+hylafax/etc/templates/pl/faxrcvd-notify-success.txt
+hylafax/etc/templates/pl/faxrcvd-success.txt
+hylafax/etc/templates/pl/notify-blocked.txt
+hylafax/etc/templates/pl/notify-done-page.txt
+hylafax/etc/templates/pl/notify-done.txt
+hylafax/etc/templates/pl/notify-failed-page.txt
+hylafax/etc/templates/pl/notify-failed.txt
+hylafax/etc/templates/pl/notify-format_failed.txt
+hylafax/etc/templates/pl/notify-killed.txt
+hylafax/etc/templates/pl/notify-no_formatter.txt
+hylafax/etc/templates/pl/notify-poll_failed.txt
+hylafax/etc/templates/pl/notify-poll_no_document.txt
+hylafax/etc/templates/pl/notify-poll_rejected.txt
+hylafax/etc/templates/pl/notify-reject.txt
+hylafax/etc/templates/pl/notify-removed.txt
+hylafax/etc/templates/pl/notify-requeued.txt
+hylafax/etc/templates/pl/notify-timedout.txt
+hylafax/etc/templates/html-sample1/css.inc
+hylafax/etc/templates/html-sample1/divider.inc
+hylafax/etc/templates/html-sample1/fax-attach.inc
+hylafax/etc/templates/html-sample1/fax-data.inc
+hylafax/etc/templates/html-sample1/fax-dispatched.inc
+hylafax/etc/templates/html-sample1/faxrcvd-error.txt
+hylafax/etc/templates/html-sample1/faxrcvd-failure.txt
+hylafax/etc/templates/html-sample1/faxrcvd-notify-error.txt
+hylafax/etc/templates/html-sample1/faxrcvd-notify-success.txt
+hylafax/etc/templates/html-sample1/faxrcvd-success.txt
+hylafax/etc/templates/html-sample1/footer.inc
+hylafax/etc/templates/html-sample1/header.inc
+hylafax/etc/templates/html-sample1/hook.sh
+hylafax/etc/templates/html-sample1/job-data.inc
+hylafax/etc/templates/html-sample1/notify-blocked.txt
+hylafax/etc/templates/html-sample1/notify-done.txt
+hylafax/etc/templates/html-sample1/notify-failed.txt
+hylafax/etc/templates/html-sample1/notify-format_failed.txt
+hylafax/etc/templates/html-sample1/session_log.inc
+hylafax/etc/templates/html-sample1/notify-killed.txt
+hylafax/etc/templates/html-sample1/notify-no_formatter.txt
+hylafax/etc/templates/html-sample1/notify-rejected.txt
+hylafax/etc/templates/html-sample1/notify-removed.txt
+hylafax/etc/templates/html-sample1/notify-requeued.txt
+hylafax/etc/templates/html-sample1/notify-timedout.txt
 @exec mkdir %D/hylafax/info
 @exec chown uucp:dialer %D/hylafax/info
 @exec chmod 755 %D/hylafax/info