Update hylafax to 4.1.5. Fixes a security hole!

Other changes:

Changelog for HylaFAX 4.1.5 - Oct 21, 2002

* fix lockfile polling race condition (21 Oct 2002)

Changelog for HylaFAX 4.1.4 - Oct 20, 2002

* fix broken polling in Class 1 (08 Oct 2002)
* change pollrcvd to behave similarly to faxrcvd (06 Oct 2002)
* fix faxqclean to not miss certain orphaned files (01 Oct 2002)
* change faxrcvd to only require 4 parameters (01 Oct 2002)
* fix recvstats to handle new Super G3 faxing speeds (01 Oct 2002)
* cause faxgetty to poll for lockfiles while RUNNING (01 Oct 2002)
* cause faxq to explicitly trigger LOCKWAIT for faxgetty (01 Oct 2002)
* replace the select bug workaround with a better fix (01 Oct 2002)
* allow sendfax -z option to accept whitespace in file (22 Sep 2002)
* add -f and -c options to probemodem (20 Sep 2002)
* improve sendfax parsing of '-z' destination file (22 Sept 2002)
* disabled Solaris DSO support due to problems (13 Sep 2002)
* add Class1ResponseWaitCmd to help USR send errors (13 Sep 2002)
* add recognition of most of Japan NSF codes (13 Sep 2002)
* fix notify manpage to not include commid (13 Sep 2002)
* fix +XMonth capability of "at" syntax to use 12 month year (13 Sep 2002)
* fix killtime to allow >= 24 day settings (13 Sep 2002)
* add RingExtended config option (29 Aug 2002)
* pass CID information to faxrcvd when using faxanswer (27 Aug 2002)
* increase the RING timeout setting to six seconds (27 Aug 2002)
* break lucent-isa prototype from lucent (27 Aug 2002)
* add Class1MsgRecvHackCmd otpion (21 Aug 2002)
* add faxqclean -A (force archiving) option (20, 29 Aug 2002)
* fix pdf2fax to be installed properly for custom packaging (19 Aug 2002)
* add Digi AccelePort prototype support (15 Aug 2002)
* number DSOs according to the HylaFAX version (15 Aug 2002)
* make faxalter accept more than one option at a time (14 Aug 2002)
* add recognition of all US and UK NSF codes (14 Aug 2002)
* change ModemBaudRateDelay default to help USRs reset (13 Aug 2002)
* fix xferfaxstats to handle new Super G3 faxing speeds (08 Aug 2002)
* support page counting for PDFs (02 Aug 2002)
* change sendfax to warn users about bad placement of "-d" options (02 Aug 2002)
* fixed faxaddmodem and probemodem for portability (02, 07 Aug 2002)
* corrected some comments in prototype config files (01 Aug 2002)
* added support for new USR Courier modem (01 Aug 2002)

Changelog for HylaFAX 4.1.3 - Jul 27, 2002

* change some comments in the usr-xon and usr-rts (27 Jul 2002)
* synchronize faxd/tif_fax3.h with libtiff's (23 Jul 2002)
* remove the SGI logo from the default coverpage (23 Jul 2002)
* documentation clarification for NoCarrierRetries (22 Jul 2002)
* fix notify.awk to handle jobtag values with colons (19 Jul 2002)
* remove admin-only restriction to the tagline (16 Jul 2002)
* adds prototype support for MultiTech ISI5634PCI (09 Jul 2002)
* caused the wedged script to give exit status (06 Jul 2002)
* allowed faxgetty to identify extended RING data as a RING (06 Jul 2002)
* fixed a buffer overflow when receiving long scan lines (06 Jul 2002)
* enhanced Class1Modem::parseQuery() to parse correctly +FTM responses
  which contain item ranges (dashes) (27 Jun 2002)
* made fixes to enable gcc v3.0 compatibility (15 Jun 2002)
* made minor changes for Sun Forte compiler compatibility (14 Jun 2002)
* fixed hostname format string vulnerabilities in faxrm, faxalter,
  faxstat, sendfax, sendpage, and faxwatch (14 Jun 2002)
* added TagLineFormat option for receiver's name (14 Jun 2002)
* added MultiTech RTFCC support via Class2RTFCC option (11, 28 Jun 2002)
* workaround a Lucent V92 firmware bug in HDLC frame tracing (08 Jun 2002)
* added Class2PTSQueryCmd for broken Class 2.0 firmwares (08 Jun 2002)
* fixed a TSI format string vulnerability in faxgetty (08 Jun 2002)
* fixed faxrcvd creation of PDFs other than letter size (08 Jun 2002)
* added sendfax -z option to read destinations from a file (08 Jun 2002)
* updated 'make clobberconfig' (27 May 2002)
* added support for Solaris DSOs (24 May 2002)
* fixed Class 1 sending CRP handling (24 May 2002)
* changed Class 1 reception protocol to tolerate long syslog
  delays which could be encountered in extremely heavy loads (24 May 2002)
* added prototype support for Sedlbauer Speedfax ISDN (24 May 2002)
* added Class1TCFRecvHack config option (24 May 2002)
* changed Class1SwitchingDelay to Class1SwitchingCmd (24 May 2002)
* more 64-bit system compatibility enhancement (24 May 2002)
* large update added initial Class 2.1 and V.34-fax support in particular
  for the MultiTech MT5634ZBA-V92 and MT5634ZPX-PCI-V92 (23 May, 14 Jun 2002)
* have faxsetup check the fax user home directory (23 May 2002)
* allow server-side usage of DisplayNumber in dialrules (23 May 2002)
* changed various scripts for POSIX compliance (23 May 2002)
* fixed a logging error in faxqclean (23 May 2002)
* added prototype support for RocketModem PCI (10 May 2002)
* changed the options proccessing order to fix Desired* options (03 May 2002)
* added prototype support for Eicon Diva modems (03 May 2002)
* enhanced configure for OSF-5.1A utmp support (03 May 2002)
* fixed a five-second delay when receiving DID (03 May 2002, 27 May 2002)
* added prototype for Davicom modems (03 May 2002)
* fixed faxqclean to keep referenced docs in the doneq (03 May 2002)
* Japanization and 64-bit system enhancement (03 May 2002)
* fixed a configure problem with sed-3.02.80 (03 May 2002, 23 May 2002)
* fixed a copy quality logic error with Class 2 reception (03 May 2002)
* documented the use of "-1" values in sendfax for MaxDials (03 May 2002)
* correct JobReqOther from interfering with other requeing (03 May 2002)
* add preliminary job archiving support (03 May 2002)
* make stripping of binaries in html conditional on HTML=yes (13 Apr 2002)

Changelog for HylaFAX 4.1.2 - Apr 11, 2002

* T.4 incompatability error message more descriptive (11 Apr 2002)
* fix faxcron to prevent it from deleting seqf files (11 Apr 2002)
* alter faxaddmodem to perform regex on the ATI0 result (7 Apr 2002)
* enhance defaults to recognize and configure Mac OS X (7 Apr 2002)
* change PWD usage in configure to PWDCMD (7 Apr 2002)
* add notification message to timedout jobs (7 Apr 2002)
* cleanup previous Topic modem enhancement (7 Apr 2002)
* cleanup previous Digital Unix enhancement (7 Apr 2002)
* cleanup previous "F" status enhancement (7 Apr 2002)
* changed many prototype configs to use 19200 baud instead of 38400
  and to not use the "@" dial-command option (7 Apr 2002)
* fix segfault in faxqclean (28 Feb 2002)

Changelog for HylaFAX 4.1.1 - Feb 24, 2002

* resolve faxsetup and textfmt problems with Ghostscript 6.5
  where Fontmap.GS could not be found (14 Feb 2002)
* fix blocked jobs from getting requeued at the end (14 Feb 2002)
* caused faxgetty to pass CIDName to faxrcvd and enhance
  documentation to include DNIS details (14 Feb 2002)
* gave failed jobs status "F" instead of "D" (14 Feb 2002)
* add Topic modem prototype config support (14 Feb 2002)
* replace Class1Send[EOP|PPM|TCF]Delay with
  Class1[EOP|PPM|TCF]WaitCmd, using +FTS for these pauses,
  resolving some timing issues (14 Feb 2002)
* fix PriorityScheduling and update html for SCO (13 Feb 2002)
* added OpenUNIX support (13 Feb 2002)
* updated config.guess (13 Feb 2002)
* correct ECM detection in Class 2 (2 Feb 2002)
* added ModemSoftResetCmdDelay default and option (2 Feb 2002)
* enhanced Class 1 parseQuery to allow for the use
  of parenthesis (2 Feb 2002)
* added NSF entries for various machine types (2 Feb 2002)
* fixed hfaxd from always exiting nonzero with inetd (2 Feb 2002)
* altered logging to prevent double-double quoting (2 Feb 2002)
* fixed pageSendApp.c++ logging pointer (2 Feb 2002)
* changed the faxaddmodem default to select Class 1 (2 Feb 2002)
* adjusted Class1SwitchingDelay default to fix ISDNs (2 Feb 2002)
* added prototype config support for some Boca, USR, and
  Practical Peripherals modems (2 Feb 2002)
* corrected problems building on Digital UNIX Alphas (2 Feb 2002)
* improved faxgetty glare handling (2 Feb 2002)
* improved some logging verbosity (2 Feb 2002)
* fixed an RTNHandlingMethod typo (16 Dec 2001)
* fixed RTNHandlingMethod brokenness (15 Oct 2001)
* corrected DestControls ability to use numeric arguments and other
  similar DestControls fixes (12 Aug 2001)
* more Lucent and K56 modem prototype config support (12 Aug 2001)
* workaround: stopped trying to utilize NDIS frames (12 Aug 2001)
* added Class1SendMsgDelay (12 Aug 2001)
* enhanced the logging of garbage frames (12 Aug 2001)
* added prototype config support for Hayes Optima (12 Aug 2001)
* fixed faxgetty's parsing of Class 1.0 in +FCLASS=? (12 Aug 2001)
* finally added faxcover "from" options and corrected it to
  function as documented for comments (12 Aug 2001)
* corrected and enhanced earlier QualifyTSI fix (12 Aug 2001)
* updated config.guess, config.sub from gcc-3.0 (18 Jul 2001)
* cause the sequence files to begin at 1 rather than 2 (15 Jul 2001)
* include external MultiTech into lucent-mt-2 (15 Jul 2001)
* apply use of "none" to rc32acl prototype config (15 Jul 2001)
* corrected documentation regarding some defaults (15 Jul 2001)
* fixed stripQuotes for unexpected TSI quoting (15 Jul 2001)
* integrate Linux DSO support (15 Jul 2001)
* fixed bash v2 verbosity in probemodem (15 Jul 2001)
* note to run hfaxd as root if run from inetd (4 Jul 2001)
* remove setuid from hfaxd in pkg (4 Jul 2001)
* add INSTALL to distrules (4 Jul 2001)
* add prototype config for Prometheus (3 Jul 2001)
* correct timing of DCN after failed QualifyTSI check (2 Jul 2001)
* fix Class 1 EOM handling (2 Jul 2001)
* add Class1SendEOPDelay config option and increase the default
  from 95ms to 200ms to prevent modem timeouts (2 Jul 2001)
* enhance faxrcvd to utilize CID, use FILETYPE (for FaxDispatch), and
  other minor faxrcvd enhancments (2 Jul 2001)
* pass CID data through successive rings and to faxrcvd (2 Jul 2001)
* caused bulk faxes to drop in requeue priority (2 Jul 2001)
* fix faxaddmodem from mis-parsing a modem's phone number (2 Jul 2001)
* added 7-bit text support to typerules (2 Jul 2001)
* stop faxqclean from deleting docq files that are in-use (2 Jul 2001)
* fixed a bash barf when VERSION changed (2 Jul 2001)
* caused configure to check zlib before libtiff (2 Jul 2001)
* added prototype config support for AT&T Lucent modem (2 Jul 2001)
* applied the use of "none" in rc288dpi config (2 Jul 2001)

Patch contributed by Andreas Hallmann <Andreas.Hallmann@tiscali.de
in PR 21804.

7 files changed, 123 insertions, 233 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 8c6a4aecca3..b2a19ac055b 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2003/06/02 01:21:22 jschauma Exp $
+# $NetBSD: Makefile,v 1.31 2003/06/27 12:18:11 hubertf Exp $
 #
 
-DISTNAME=	hylafax-4.1
-PKGREVISION=	4
+DISTNAME=	hylafax-4.1.5
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
 
-MAINTAINER=	tech-pkg@netbsd.org
+MAINTAINER=	hallmanns@surfeu.de
 HOMEPAGE=	http://www.hylafax.org/
 COMMENT=	Telecommunication and fax server system
 
diff --git a/comms/hylafax/PLIST b/comms/hylafax/PLIST
index b352e9d5616..5a780db5d55 100644
--- a/comms/hylafax/PLIST
+++ b/comms/hylafax/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/29 05:58:50 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/27 12:18:11 hubertf Exp $
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -6,7 +6,9 @@ bin/faxrm
 bin/faxstat
 bin/sendfax
 bin/sendpage
+etc/rc.d/hylafax
 libdata/hylafax/faxcover.ps
+libdata/hylafax/faxcover_example_sgi.ps
 libdata/hylafax/faxmail.ps
 libdata/hylafax/hfaxd.conf
 libdata/hylafax/pagesizes
@@ -14,6 +16,7 @@ libdata/hylafax/typerules
 libexec/faxgetty
 libexec/faxsend
 libexec/hfaxd
+libexec/hylafax/archive
 libexec/hylafax/faxrcvd
 libexec/hylafax/mkcover
 libexec/hylafax/notify
@@ -30,69 +33,70 @@ libexec/lockname
 libexec/ondelay
 libexec/pagesend
 libexec/textfmt
-man/cat1/faxalter.0.gz
-man/cat1/faxcover.0.gz
-man/cat1/faxmail.0.gz
-man/cat1/faxrm.0.gz
-man/cat1/faxstat.0.gz
-man/cat1/hylafax-client.0.gz
-man/cat1/sendfax.0.gz
-man/cat1/sendpage.0.gz
-man/cat1/sgi2fax.0.gz
-man/cat1/textfmt.0.gz
-man/cat5/cid.0.gz
-man/cat5/destctrls.0.gz
-man/cat5/dialrules.0.gz
-man/cat5/doneq.0.gz
-man/cat5/hosts.hfaxd.0.gz
-man/cat5/hylafax-config.0.gz
-man/cat5/hylafax-info.0.gz
-man/cat5/hylafax-log.0.gz
-man/cat5/hylafax-server.0.gz
-man/cat5/hylafax-shutdown.0.gz
-man/cat5/pagermap.0.gz
-man/cat5/pagesizes.0.gz
-man/cat5/recvq.0.gz
-man/cat5/sendq.0.gz
-man/cat5/status.0.gz
-man/cat5/tsi.0.gz
-man/cat5/typerules.0.gz
-man/cat5/xferfaxlog.0.gz
-man/cat8/choptest.0.gz
-man/cat8/cqtest.0.gz
-man/cat8/dialtest.0.gz
-man/cat8/faxabort.0.gz
-man/cat8/faxaddmodem.0.gz
-man/cat8/faxadduser.0.gz
-man/cat8/faxanswer.0.gz
-man/cat8/faxconfig.0.gz
-man/cat8/faxcron.0.gz
-man/cat8/faxdeluser.0.gz
-man/cat8/faxgetty.0.gz
-man/cat8/faxinfo.0.gz
-man/cat8/faxmodem.0.gz
-man/cat8/faxq.0.gz
-man/cat8/faxqclean.0.gz
-man/cat8/faxquit.0.gz
-man/cat8/faxrcvd.0.gz
-man/cat8/faxsend.0.gz
-man/cat8/faxsetup.0.gz
-man/cat8/faxstate.0.gz
-man/cat8/faxwatch.0.gz
-man/cat8/hfaxd.0.gz
-man/cat8/mkcover.0.gz
-man/cat8/notify.0.gz
-man/cat8/pagesend.0.gz
-man/cat8/pdf2fax.0.gz
-man/cat8/pollrcvd.0.gz
-man/cat8/ps2fax.0.gz
-man/cat8/recvstats.0.gz
-man/cat8/tagtest.0.gz
-man/cat8/tiff2fax.0.gz
-man/cat8/tiffcheck.0.gz
-man/cat8/tsitest.0.gz
-man/cat8/wedged.0.gz
-man/cat8/xferfaxstats.0.gz
+man/cat1/faxalter.0
+man/cat1/faxcover.0
+man/cat1/faxmail.0
+man/cat1/faxrm.0
+man/cat1/faxstat.0
+man/cat1/hylafax-client.0
+man/cat1/sendfax.0
+man/cat1/sendpage.0
+man/cat1/sgi2fax.0
+man/cat1/textfmt.0
+man/cat5/cid.0
+man/cat5/destctrls.0
+man/cat5/dialrules.0
+man/cat5/doneq.0
+man/cat5/hosts.hfaxd.0
+man/cat5/hylafax-config.0
+man/cat5/hylafax-info.0
+man/cat5/hylafax-log.0
+man/cat5/hylafax-server.0
+man/cat5/hylafax-shutdown.0
+man/cat5/pagermap.0
+man/cat5/pagesizes.0
+man/cat5/recvq.0
+man/cat5/sendq.0
+man/cat5/status.0
+man/cat5/tsi.0
+man/cat5/typerules.0
+man/cat5/xferfaxlog.0
+man/cat8/choptest.0
+man/cat8/cqtest.0
+man/cat8/dialtest.0
+man/cat8/faxabort.0
+man/cat8/faxaddmodem.0
+man/cat8/faxadduser.0
+man/cat8/faxanswer.0
+man/cat8/faxconfig.0
+man/cat8/faxcron.0
+man/cat8/faxdeluser.0
+man/cat8/faxgetty.0
+man/cat8/faxinfo.0
+man/cat8/faxlock.0
+man/cat8/faxmodem.0
+man/cat8/faxq.0
+man/cat8/faxqclean.0
+man/cat8/faxquit.0
+man/cat8/faxrcvd.0
+man/cat8/faxsend.0
+man/cat8/faxsetup.0
+man/cat8/faxstate.0
+man/cat8/faxwatch.0
+man/cat8/hfaxd.0
+man/cat8/mkcover.0
+man/cat8/notify.0
+man/cat8/pagesend.0
+man/cat8/pdf2fax.0
+man/cat8/pollrcvd.0
+man/cat8/ps2fax.0
+man/cat8/recvstats.0
+man/cat8/tagtest.0
+man/cat8/tiff2fax.0
+man/cat8/tiffcheck.0
+man/cat8/tsitest.0
+man/cat8/wedged.0
+man/cat8/xferfaxstats.0
 sbin/choptest
 sbin/cqtest
 sbin/dialtest
@@ -104,6 +108,7 @@ sbin/faxconfig
 sbin/faxcron
 sbin/faxdeluser
 sbin/faxinfo
+sbin/faxlock
 sbin/faxmodem
 sbin/faxmsg
 sbin/faxq
@@ -115,6 +120,7 @@ sbin/faxsetup.irix
 sbin/faxsetup.linux
 sbin/faxstate
 sbin/faxwatch
+sbin/hylafax
 sbin/probemodem
 sbin/recvstats
 sbin/tagtest
@@ -129,23 +135,36 @@ share/hylafax/config_template/att-dataport-2.0
 share/hylafax/config_template/att-dpexpress-2
 share/hylafax/config_template/cirrus
 share/hylafax/config_template/class1
+share/hylafax/config_template/class1.0
 share/hylafax/config_template/class2
 share/hylafax/config_template/class2.0
+share/hylafax/config_template/class2.1
+share/hylafax/config_template/davicom-2
+share/hylafax/config_template/digi
+share/hylafax/config_template/digi-2
+share/hylafax/config_template/digi-20
 share/hylafax/config_template/dsi-scout+
 share/hylafax/config_template/e-tech
+share/hylafax/config_template/eicon
+share/hylafax/config_template/eicon-2
 share/hylafax/config_template/elsa-microlink-56k-basic-2.0
 share/hylafax/config_template/everex-2496d
 share/hylafax/config_template/exar
 share/hylafax/config_template/gvc-288
 share/hylafax/config_template/gvc-288-2
+share/hylafax/config_template/hayes
 share/hylafax/config_template/intel-400e
 share/hylafax/config_template/lucent
+share/hylafax/config_template/lucent-isa
 share/hylafax/config_template/lucent-mt-2
+share/hylafax/config_template/lucent-mt-20
+share/hylafax/config_template/lucent-mt-21
 share/hylafax/config_template/moto-288
 share/hylafax/config_template/mt-1432
 share/hylafax/config_template/nuvo-voyager
 share/hylafax/config_template/ppi-pm14400fxmt
 share/hylafax/config_template/ppi-pm14400fxsa
+share/hylafax/config_template/prometheus
 share/hylafax/config_template/rc144ac
 share/hylafax/config_template/rc144ac-1
 share/hylafax/config_template/rc288dpi
@@ -159,6 +178,7 @@ share/hylafax/config_template/skel
 share/hylafax/config_template/telebit-qblazer
 share/hylafax/config_template/telebit-t3000
 share/hylafax/config_template/telebit-wb
+share/hylafax/config_template/topic
 share/hylafax/config_template/tricom2842
 share/hylafax/config_template/uds-fastalk
 share/hylafax/config_template/umc92144
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index fad42a31df4..af57fc52a84 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2001/07/16 13:30:37 wiz Exp $
+$NetBSD: distinfo,v 1.7 2003/06/27 12:18:11 hubertf Exp $
 
-SHA1 (hylafax/hylafax-4.1.tar.gz) = 1b505492788c791a9db6b30e64e02e43117ce832
-Size (hylafax/hylafax-4.1.tar.gz) = 1243832 bytes
+SHA1 (hylafax/hylafax-4.1.5.tar.gz) = fa60a8a51921d42aa36732b5c9ee62d5b0f18dab
+Size (hylafax/hylafax-4.1.5.tar.gz) = 1276511 bytes
 SHA1 (patch-aa) = 74271a248f82daa1d340b83e70eaf679387b4eb0
 SHA1 (patch-ab) = d4cd3bdebfdd9cb13bd9a4feb5115bb918cb2a12
 SHA1 (patch-ac) = a796fe8b5f19cc3fe7f6c9e1f3342670f79014ab
 SHA1 (patch-ad) = f7a05f020bc6e97a8908b1fc938460ac333a029a
-SHA1 (patch-ae) = b0ec8e91250f0bda788dee79503a2f8f1d6ee351
+SHA1 (patch-ae) = e86ae3b1be041a28a4ac5996a915b1d8ae5955f3
 SHA1 (patch-af) = e1e09b2914e4071807ca83f134134bd5cf42519d
 SHA1 (patch-ag) = 75c7c633587a952d7f62e7f450a816b8e6ad298b
 SHA1 (patch-ah) = fbd4d348186e866099d2abb0fd001ec1e9b5a1e0
@@ -16,9 +16,6 @@ SHA1 (patch-ak) = f72d797419ce1c9d50d03f2c5e5db16a0b30e5cb
 SHA1 (patch-al) = e8a7576143b51781fc2aa985e761a19c0e756d13
 SHA1 (patch-am) = 0eb61a129610c59f01282926fa4b3448fa2567ec
 SHA1 (patch-an) = 82b110b055cd768947c60fdae41e478f303c51ae
-SHA1 (patch-ao) = f1c084ca1b4e5fbba29d723bdeaac9d34b2f5289
-SHA1 (patch-ap) = 64a54dd34080fd734bac291ec91785ec36c6f747
 SHA1 (patch-aq) = 04add689446223f5b3541f1100d063b38f6ede0e
-SHA1 (patch-ar) = 1652e72e2e8f33044bf8ef8fc01490433c3fcd39
 SHA1 (patch-as) = 0b169ee8ba8385112e88a7335ff74bd3c0825e69
 SHA1 (patch-at) = 2833cfe9bc94b1fb99cbb6c3015093f274f7f69f
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index faf61dfb212..1090367e14b 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,18 +1,20 @@
-$NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
+$NetBSD: patch-ae,v 1.6 2003/06/27 12:18:12 hubertf Exp $
 
---- configure.orig	Thu May 31 04:29:46 2001
-+++ configure	Sun Jul  8 02:41:07 2001
-@@ -37,22 +37,22 @@
+--- configure.orig	Tue Oct  1 16:05:55 2002
++++ configure
+@@ -37,23 +37,23 @@
  #
  # Setup general configuration parameters.
  #
 -DIR_BIN=/usr/local/bin
 -DIR_SBIN=/usr/local/sbin
 -DIR_LIBDATA=/usr/local/lib/fax
+-DIR_LIB=/usr/local/lib
 -DIR_LIBEXEC=$DIR_SBIN
 +DIR_BIN=${PREFIX}/bin
 +DIR_SBIN=${PREFIX}/sbin
 +DIR_LIBDATA=${PREFIX}/libdata/hylafax
++DIR_LIB=${PREFIX}/lib
 +DIR_LIBEXEC=${PREFIX}/libexec
  DIR_SPOOL=/var/spool/hylafax
 -DIR_HTML=/var/httpd/htdocs/hylafax
@@ -33,7 +35,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  SYSGID=
  DSO=auto
  GETTY=auto
-@@ -71,8 +71,8 @@
+@@ -72,8 +72,8 @@ DPS=no
  GS=no
  IMP=no
  UTMP=auto
@@ -44,7 +46,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  TIFFBIN=
  LIBZ=
  ZLIBINC=
-@@ -80,8 +80,8 @@
+@@ -81,8 +81,8 @@ REGEX=yes
  LIBREGEX='-L${DEPTH}/regex -lregex'
  REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
  DBLIB=no
@@ -52,18 +54,18 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
 -DBLIBINC=/usr/local/include
 +LIBDB="-L${PREFIX}/lib -ldb"
 +DBLIBINC=${PREFIX}/include
- CONFIG_OSFCNH=auto
- MANNUM4_5=4F
- MANNUM1_8=1M
-@@ -208,6 +208,7 @@
+ FAXD=
+ LIBFAXSERVER='libfaxserver.${DSO}'
+ LIBUTIL='${UTIL}/libfaxutil.${DSO}'
+@@ -216,6 +216,7 @@ PKG_EMAIL
  PKG_VENDOR
  PORT
  PORTFUNCS
 +PREFIX
  PROTOTYPES
  PSPACKAGE	PS
- PWD
-@@ -271,7 +272,7 @@
+ PWDCMD
+@@ -279,7 +280,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd	
  test -d /usr/ucb && PATH=$PATH:/usr/ucb			# Sun and others
  test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin	# BSDi
  test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc	# Sun and others
@@ -72,24 +74,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  PATH=$PATH:$OPATH
  
  POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-@@ -652,6 +653,7 @@
- {
-     echo `(for i do
- 	case "$i" in
-+	-Wl*)			echo "$i" ;;
- 	/*|-l*|-l[$]{DEPTH}/*)	echo "$i" ;;
- 	-L|-L/*|-L[$]{DEPTH}/*)	echo "$i" ;;
- 	-I|-I/*|-I[$]{DEPTH}/*)	echo "$i" ;;
-@@ -3004,7 +3006,7 @@
- # Location of TIFF binaries
- #
- if [ -z "$TIFFBIN" ]; then
--    DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
-+    DIRS="${PREFIX}/bin /usr/local/bin /usr/gnu/bin /usr/bin"
-     for i in $DIRS; do
-         test -x $i/tiff2ps && { TIFFBIN=$i; break; }
-     done
-@@ -3036,13 +3038,7 @@
+@@ -3020,13 +3021,7 @@ main()
          printf("old include files: version %u\n", ZLIB_VERSION);
          exit(-1);
      }
@@ -103,15 +88,16 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  }
  EOF
  capture cat t.c
-@@ -3517,6 +3513,7 @@
- if [ -z "$SYSGID" ]; then
-     case $TARGET in
-     *-aix*)	SYSGID=sys;;
-+    *netbsd*)	SYSGID=wheel;;
-     *bsd*)	SYSGID=bin;;
-     *-hpux*)	SYSGID=bin;;
-     *-irix*)	SYSGID=sys;;
-@@ -3603,7 +3600,7 @@
+@@ -3088,7 +3083,7 @@ Note "Checking TIFF support."
+ # Location of TIFF binaries
+ #
+ if [ -z "$TIFFBIN" ]; then
+-    DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
++    DIRS="${PREFIX}/bin /usr/local/bin /usr/gnu/bin /usr/bin"
+     for i in $DIRS; do
+         test -x $i/tiff2ps && { TIFFBIN=$i; break; }
+     done
+@@ -3672,7 +3667,7 @@ fi
  if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_VGETTY" ]; then
@@ -120,7 +106,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  	Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
      else
  	Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
-@@ -3616,7 +3613,7 @@
+@@ -3685,7 +3680,7 @@ fi
  if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_EGETTY" ]; then
@@ -129,7 +115,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  	Note "WARNING, no egetty program found, using $PATH_EGETTY."
      else
  	Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
-@@ -3687,6 +3684,7 @@
+@@ -3756,6 +3751,7 @@ PickRIP()
  {
      if [ -z "$PATH_GSRIP" ]; then
  	GSLOCS="
@@ -137,7 +123,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  	    /usr/local/bin/gs
  	    /usr/contrib/bin/gs
  	    /usr/gnu/bin/gs
-@@ -3734,7 +3732,7 @@
+@@ -3803,7 +3799,7 @@ fax software to operate correctly.  See 
  on building Ghostscript with the necessary TIFF driver.
  
  EOF
@@ -146,7 +132,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  	PATH_GSRIP=$PATH_PSRIP
      fi
  }
-@@ -3801,9 +3799,9 @@
+@@ -3870,9 +3866,9 @@ if [ -z "$PATH_AFM" ]; then
      else
          DIR_AFMS="
  	    /usr/lib/afm
@@ -159,7 +145,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  	    /usr/share/ghostscript/fonts
  	    /usr/gnu/lib/ghostscript/fonts
  	    /opt/gnu/lib/ghostscript/fonts
-@@ -3823,7 +3821,7 @@
+@@ -3892,7 +3888,7 @@ if [ -z "$PATH_AFM" ]; then
  fi
  if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things
@@ -168,7 +154,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
      Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."
  else
-@@ -3842,6 +3840,7 @@
+@@ -3911,6 +3907,7 @@ fi
  #
  if [ -z "$DIR_MAN" ]; then
      MANPATH="
@@ -176,7 +162,7 @@ $NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
  	$MANPATH
  	/usr/local/man
  	/usr/contrib/man
-@@ -3851,7 +3850,7 @@
+@@ -3920,7 +3917,7 @@ if [ -z "$DIR_MAN" ]; then
      for i in $MANPATH; do
  	test -d $i && { DIR_MAN=$i; break; }
      done
diff --git a/comms/hylafax/patches/patch-ao b/comms/hylafax/patches/patch-ao
deleted file mode 100644
index 530c7d44fa4..00000000000
--- a/comms/hylafax/patches/patch-ao
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2001/04/23 15:06:19 abs Exp $
-
---- util/TypeRules.c++.orig	Sun Jun 13 08:41:26 1999
-+++ util/TypeRules.c++
-@@ -36,6 +36,14 @@
- #include <netinet/in.h>
- }
- 
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
- TypeRule::TypeRule() {}
- TypeRule::~TypeRule() {}
- TypeRule::TypeRule(const TypeRule& other)
-@@ -51,7 +59,7 @@
- }
- 
- static const char* typeNames[] =
--    { "ascii", "string", "address", "byte", "short", "long" };
-+    { "ascii", "asciiesc", "string", "address", "byte", "short", "long" };
- static const char* opNames[] =
-     { "<any>", "=", "!=", "<", "<=", ">", ">=", "&", "^", "!" };
- static const char* resultNames[] = { "tiff", "postscript", "error" };
-@@ -68,7 +76,7 @@
- 	);
- 	if (type == STRING)
- 	    printf(" \"%s\"", value.s);
--	else if (type != ASCII) {
-+	else if (type != ASCII && type != ASCIIESC) {
- 	    if (op == ANY)
- 		printf(" <any value>");
- 	    else
-@@ -86,6 +94,7 @@
-     const u_char* cp = (const u_char*) data;
-     switch (type) {
-     case ASCII:
-+      {
- 	u_int i;
- 	for (i = 0; i < size; i++)
- 	    if (!isprint(cp[i]) && !isspace(cp[i])) {
-@@ -95,6 +104,19 @@
- 	    }
- 	ok = true;
- 	goto done;
-+       }
-+    case ASCIIESC:
-+       {
-+	u_int i;
-+	for (i = 0; i < size; i++)
-+	    if (!isprint(cp[i]) && !isspace(cp[i]) && cp[i] != '\033') {
-+		if (verbose)
-+		    printf("failed (unprintable char %#x)\n", cp[i]);
-+		return (FALSE);
-+	    }
-+	ok = TRUE;
-+	goto done;
-+       }
-     case STRING:
- 	ok = (strncmp((const char*)(cp+off), value.s,
- 	    fxmin((u_int) strlen(value.s), (u_int)(size-off))) == 0);
-@@ -311,6 +333,8 @@
- 	    rule.type = TypeRule::STRING;
- 	else if (strncasecmp(tp, "ascii", cp-tp) == 0)
- 	    rule.type = TypeRule::ASCII;
-+	else if (strncasecmp(tp, "asciiesc", cp-tp) == 0)
-+	    rule.type = TypeRule::ASCIIESC;
- 	else if (strncasecmp(tp, "addr", cp-tp) == 0)
- 	    rule.type = TypeRule::ADDR;
- 	else {
-@@ -321,7 +345,8 @@
- 	    cp++;
- 	rule.op = TypeRule::EQ;		// default is '='
- 	const char* vp = cp;
--	if (rule.type != TypeRule::STRING && rule.type != TypeRule::ASCII) {
-+	if (rule.type != TypeRule::STRING && rule.type != TypeRule::ASCII
-+	 && rule.type != TypeRule::ASCIIESC) {
- 	    // numeric value
- 	    switch (*vp) {
- 	    case '=':	rule.op = TypeRule::EQ;	cp++; break;
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
deleted file mode 100644
index 68eb9a8d664..00000000000
--- a/comms/hylafax/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.5 2001/04/23 15:06:19 abs Exp $
-
---- util/TypeRules.h.orig	Sun Jun 13 08:41:26 1999
-+++ util/TypeRules.h
-@@ -130,6 +130,7 @@
-     bool	cont;	// continuation
-     enum {
- 	ASCII,		// ascii-only string
-+	ASCIIESC,	// ascii-only string + escape char (iso-2022 variants)
- 	STRING,		// byte string
- 	ADDR,		// address of match
- 	BYTE,		// 8 bits
diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar
deleted file mode 100644
index f4b1af51b5a..00000000000
--- a/comms/hylafax/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.5 2001/07/08 13:32:15 bad Exp $
-
---- util/typerules.orig	Sun Apr 15 06:58:06 2001
-+++ util/typerules	Sun Jul  8 00:48:02 2001
-@@ -134,6 +134,11 @@
- >15     string          ascii		ps	%F/textfmt -B -f Courier-Bold\
- 						-Ml=0.4in -p 11 -s %s >%o <%i
- #
-+# Japanization (should help other iso-2022 variants too)
-+#
-+#>15	string		asciiesc	ps	a2ps-j -l '' -p -ns -nt <%i >%o
-+#0	asciiesc	x		ps	a2ps-j -l '' -p -ns -nt <%i >%o
-+#
- # This causes anything else with ascii-only data to be treated as text.
- #
- 0	ascii		x		ps	%F/textfmt -B -f Courier-Bold\