Update Hylafax to 4.1 release.

Because the beta package was named 4.1b3 name this 4.1nb1.

Note that the spool directory has moved from /var/spool/fax to
/var/spool/hylafax.  Notify the user about this from faxsetup if appropriate.

Use root:wheel as SYSUID:SYSGID so the install does not mess up the
permissions on $PREFIX/{bin,sbin} etc.

Changelog for HylaFAX 4.1 - Jul 1, 2001
* tidied up README & INSTALL for full release (01 Jul 2001)
* repaired dangling references to recently renamed manpages (01 Jul 2001)
* no other changes - 4.1rc2 basically promoted to 4.1

Changelog for HylaFAX 4.1rc2 - Jun 17, 2001

* corrected some default JobReq* values (17 Jun 2001)
* clarified documentation on sendfax -k option (17 Jun 2001)
* added prototype configs for Courier and Zyxel models (17 Jun 2001)
* added "Modem" option to DestControls (17 Jun 2001)
* fix a segfault when processing null HDLC frames (17 Jun 2001)
* continue manpage naming transition of 03 Jun (13 Jun 2001)
* fix minor flaw in PriorityScheduling documentation (13 Jun 2001)
* improve faxsetup onClient routines (07, 14 Jun 2001)
* impose a T2 timeout on faxgetty vulnerability (07 Jun 2001)
* updates for HTML documentation (07 Jun 2001)

Changelog for HylaFAX 4.1rc1 - Jun 04, 2001

* remove use of /sbin/killall, problematic on Tru64 (04 Jun 2001)
* fix ModemServer.c++ for OpenBSD (04 Jun 2001)
* change manpage names: config to hylafax-config, info to
  hylafax-info, log to hylafax-log, and shutdown to
  hylafax-shutdown (03 Jun 2001)
* add configs for UMC9624 and MT5634ZPX-PCI modems (03 Jun 2001)
* fix TimeOfDay race if using bad syntax (03 Jun 2001)
* break the initialization string apart and
  remove ModemOnHookCmd from it (03 Jun 2001)
* allow use of "none" in five config options (03 Jun 2001)
* add HylaFAX version and device usage in logs (30 May 2001)
* rearrangements in configure to fix HP sed (30 May 2001)
* change default spool dir to /var/spool/hylafax (29 May 2001)
* make ModemServer attempt resets twice, if needed (29 May 2001)
* fixes for building outside of source tree (27 May 2001)
* fixes for 'make package' (27 May 2001)
* removed a goto in faxd/Class1Send.c++ which
  caused compile errors for some (27 May 2001)
* improved error handling for:  (20 May 2001)
  - DLE+ETX
  - ERROR after AT+FRM (instead of +FCERROR)
  - faxgetty training hangups
* added ModemDTRDropDelay config option and default,
  correcting some "Can not setup modem" issues (20 May 2001)
* improved logging verbosity for SEND FAILED (20 May 2001)
* updated various documentation antiquities (20 May 2001)
* added Lucent (LT) Winmodem prototype config (20 May 2001)
* added default status/any.info creation by faxsetup (20, 27 May 2001)
* added PriorityScheduling option and POSIX function (20 May 2001)
* fixed previous utmp update for libc5 (20 May 2001)
* added Class1SwitchingDelay config option and default,
  correcting some timeout errors (20 May 2001)
* fixed file gid numbering (20 May 2001)
* Adjusted faxq to load-balance modems with equal priority (22 Apr 2001)
* Added new CONTRIBUTORS (14 Apr 2001)
* Merged performance-rts into rc288dpi-1 config file (14/19 Apr 2001)
* Fixed vix.com reference in hylafax-server man page (14 Apr 2001)
* Fixed \(dg character mis-recognition in faxwatch man page (14 Apr 2001)
* Fixed hard-coded man page numbers in scripts (14/16 Apr 2001)
* Clarify documentation of MaxConcurrentJobs (14 Apr 2001)
* Alter install of hfaxd to not be suid (13 Apr 2001)
* Fix hfaxd -q format string vulnerability (13 Apr 2001)
* Add more NSF codes to known-NSF list (26 Mar 2001, 14 Apr 2001)
* Fix to allow null-TSI matching (19 Mar 2001)
* Fix USR default use of Class2APQueryCmd (19 Mar 2001)
* Added server-side PDF conversion (19 Mar 2001, 14/17 Apr 2001)
* Correct a typo in wedged man page (08 Mar 2001)
* Fixed incorrect paths in some man pages (08 Mar 2001)
* Various utmpx, LOCKS, and IXO_XMITTIMEOUT fixes (08 Mar 2001)

9 files changed, 100 insertions, 77 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 005c898f62e..8b62c838b06 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2001/07/07 22:40:31 bad Exp $
+# $NetBSD: Makefile,v 1.20 2001/07/08 13:32:14 bad Exp $
 #
 
-DISTNAME=	hylafax-4.1beta3
-PKGNAME=	hylafax-4.1b3
+DISTNAME=	hylafax-4.1
+PKGNAME=	hylafax-4.1nb1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source
 
-PATCH_SITES=   http://www.hylafax.org/patches/
-PATCHFILES=    hfaxd-vulnerability.patch
-
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.hylafax.org/
 COMMENT=	Telecommunication and fax server system
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index f435aa724be..8bcb50373a6 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,26 +1,24 @@
-$NetBSD: distinfo,v 1.4 2001/05/10 21:00:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2001/07/08 13:32:14 bad Exp $
 
-SHA1 (hylafax/hylafax-4.1beta3.tar.gz) = a54eab5a92b59a82699d08185433ea83b7647bd1
-Size (hylafax/hylafax-4.1beta3.tar.gz) = 1233050 bytes
-SHA1 (hylafax/hfaxd-vulnerability.patch) = b5f1cecc19b529342815607c3f9d3da195313a58
-Size (hylafax/hfaxd-vulnerability.patch) = 813 bytes
+SHA1 (hylafax/hylafax-4.1.tar.gz) = 1b505492788c791a9db6b30e64e02e43117ce832
+Size (hylafax/hylafax-4.1.tar.gz) = 1243832 bytes
 SHA1 (patch-aa) = 74271a248f82daa1d340b83e70eaf679387b4eb0
 SHA1 (patch-ab) = d4cd3bdebfdd9cb13bd9a4feb5115bb918cb2a12
-SHA1 (patch-ac) = 8085488a52793e653b70f32026ce8061573b6557
+SHA1 (patch-ac) = a796fe8b5f19cc3fe7f6c9e1f3342670f79014ab
 SHA1 (patch-ad) = f7a05f020bc6e97a8908b1fc938460ac333a029a
-SHA1 (patch-ae) = 5ebc7e58f51d67dc6555292f635e3274b67e25dd
-SHA1 (patch-af) = 7271d4c6f2c521da14f4f8d041ec93723a0c1a7a
+SHA1 (patch-ae) = b0ec8e91250f0bda788dee79503a2f8f1d6ee351
+SHA1 (patch-af) = e1e09b2914e4071807ca83f134134bd5cf42519d
 SHA1 (patch-ag) = 75c7c633587a952d7f62e7f450a816b8e6ad298b
 SHA1 (patch-ah) = fbd4d348186e866099d2abb0fd001ec1e9b5a1e0
-SHA1 (patch-ai) = 1a2c68a52f703a54b293b977fd923e2373941b40
+SHA1 (patch-ai) = 5c21f46f9e861784b7e060d7cf8938bf34ff4f39
 SHA1 (patch-aj) = 86520589dc1be4517e0c0f0b349b04a04bed41d9
 SHA1 (patch-ak) = f72d797419ce1c9d50d03f2c5e5db16a0b30e5cb
 SHA1 (patch-al) = e8a7576143b51781fc2aa985e761a19c0e756d13
 SHA1 (patch-am) = 0eb61a129610c59f01282926fa4b3448fa2567ec
-SHA1 (patch-an) = 40abb2e767a65a7d54e8773118700e20a32d90d8
+SHA1 (patch-an) = 82b110b055cd768947c60fdae41e478f303c51ae
 SHA1 (patch-ao) = f1c084ca1b4e5fbba29d723bdeaac9d34b2f5289
 SHA1 (patch-ap) = 64a54dd34080fd734bac291ec91785ec36c6f747
 SHA1 (patch-aq) = 04add689446223f5b3541f1100d063b38f6ede0e
-SHA1 (patch-ar) = 63b47f7f5197dea10b8c542b04eff61b2cd03ed4
+SHA1 (patch-ar) = 1652e72e2e8f33044bf8ef8fc01490433c3fcd39
 SHA1 (patch-as) = 0b169ee8ba8385112e88a7335ff74bd3c0825e69
 SHA1 (patch-at) = 2833cfe9bc94b1fb99cbb6c3015093f274f7f69f
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac
index 028e31bfe84..0e26e6844c8 100644
--- a/comms/hylafax/patches/patch-ac
+++ b/comms/hylafax/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2001/04/23 15:06:13 abs Exp $
+$NetBSD: patch-ac,v 1.5 2001/07/08 13:32:15 bad Exp $
 
---- config/Makefile.in.orig	Fri Jun 23 08:58:41 2000
-+++ config/Makefile.in
-@@ -100,6 +100,7 @@
+--- config/Makefile.in.orig	Mon Jun  4 07:40:04 2001
++++ config/Makefile.in	Sun Jul  8 00:48:02 2001
+@@ -102,6 +102,7 @@
  PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
  
  install: default ${CONFIGFILES}
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index b1a341d2f21..faf61dfb212 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
+$NetBSD: patch-ae,v 1.5 2001/07/08 13:32:15 bad Exp $
 
---- configure.orig	Tue Feb  6 04:54:05 2001
-+++ configure
-@@ -37,21 +37,19 @@
+--- configure.orig	Thu May 31 04:29:46 2001
++++ configure	Sun Jul  8 02:41:07 2001
+@@ -37,22 +37,22 @@
  #
  # Setup general configuration parameters.
  #
@@ -14,11 +14,11 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
 +DIR_SBIN=${PREFIX}/sbin
 +DIR_LIBDATA=${PREFIX}/libdata/hylafax
 +DIR_LIBEXEC=${PREFIX}/libexec
- DIR_SPOOL=/var/spool/fax
+ DIR_SPOOL=/var/spool/hylafax
 -DIR_HTML=/var/httpd/htdocs/hylafax
 -DIR_CGI=/var/httpd/cgi-bin
-+DIR_HTML=${PREFIX}/http/htdocs/hylafax
-+DIR_CGI=${PREFIX}/http/cgi-bin
++DIR_HTML=${RPEFIX}/http/htdocs/hylafax
++DIR_CGI=${RPEFIX}/http/cgi-bin
  PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
 -PATH_IMPRIP=/usr/lib/print/psrip
 +PATH_IMPRIP=${PREFIX}/lib/print/psrip
@@ -26,12 +26,14 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  CGIPATH=/cgi-bin
  DEFVRES=98
  PAGESIZE="North American Letter"
--FAXUID=uucp
--FAXGID=
- SYSUID=bin
+ FAXUID=uucp
+ FAXGID=
+-SYSUID=bin
++SYSUID=root
  SYSGID=
  DSO=auto
-@@ -71,8 +69,8 @@
+ GETTY=auto
+@@ -71,8 +71,8 @@
  GS=no
  IMP=no
  UTMP=auto
@@ -42,7 +44,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  TIFFBIN=
  LIBZ=
  ZLIBINC=
-@@ -80,8 +78,8 @@
+@@ -80,8 +80,8 @@
  LIBREGEX='-L${DEPTH}/regex -lregex'
  REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
  DBLIB=no
@@ -53,15 +55,15 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  CONFIG_OSFCNH=auto
  MANNUM4_5=4F
  MANNUM1_8=1M
-@@ -208,6 +206,7 @@
+@@ -208,6 +208,7 @@
  PKG_VENDOR
  PORT
  PORTFUNCS
 +PREFIX
+ PROTOTYPES
  PSPACKAGE	PS
- REGEX
- RM		RMCMD
-@@ -264,7 +263,7 @@
+ PWD
+@@ -271,7 +272,7 @@
  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
@@ -70,7 +72,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  PATH=$PATH:$OPATH
  
  POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-@@ -644,6 +643,7 @@
+@@ -652,6 +653,7 @@
  {
      echo `(for i do
  	case "$i" in
@@ -78,7 +80,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  	/*|-l*|-l[$]{DEPTH}/*)	echo "$i" ;;
  	-L|-L/*|-L[$]{DEPTH}/*)	echo "$i" ;;
  	-I|-I/*|-I[$]{DEPTH}/*)	echo "$i" ;;
-@@ -2992,7 +2992,7 @@
+@@ -3004,7 +3006,7 @@
  # Location of TIFF binaries
  #
  if [ -z "$TIFFBIN" ]; then
@@ -87,7 +89,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
      for i in $DIRS; do
          test -x $i/tiff2ps && { TIFFBIN=$i; break; }
      done
-@@ -3024,13 +3024,7 @@
+@@ -3036,13 +3038,7 @@
          printf("old include files: version %u\n", ZLIB_VERSION);
          exit(-1);
      }
@@ -101,7 +103,15 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  }
  EOF
  capture cat t.c
-@@ -3591,7 +3585,7 @@
+@@ -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 @@
  if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_VGETTY" ]; then
@@ -110,7 +120,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs 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."
-@@ -3604,7 +3598,7 @@
+@@ -3616,7 +3613,7 @@
  if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_EGETTY" ]; then
@@ -119,7 +129,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs 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."
-@@ -3675,6 +3669,7 @@
+@@ -3687,6 +3684,7 @@
  {
      if [ -z "$PATH_GSRIP" ]; then
  	GSLOCS="
@@ -127,7 +137,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  	    /usr/local/bin/gs
  	    /usr/contrib/bin/gs
  	    /usr/gnu/bin/gs
-@@ -3722,7 +3717,7 @@
+@@ -3734,7 +3732,7 @@
  on building Ghostscript with the necessary TIFF driver.
  
  EOF
@@ -136,7 +146,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  	PATH_GSRIP=$PATH_PSRIP
      fi
  }
-@@ -3789,9 +3784,9 @@
+@@ -3801,9 +3799,9 @@
      else
          DIR_AFMS="
  	    /usr/lib/afm
@@ -149,7 +159,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  	    /usr/share/ghostscript/fonts
  	    /usr/gnu/lib/ghostscript/fonts
  	    /opt/gnu/lib/ghostscript/fonts
-@@ -3811,7 +3806,7 @@
+@@ -3823,7 +3821,7 @@
  fi
  if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things
@@ -158,7 +168,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
      Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."
  else
-@@ -3830,6 +3825,7 @@
+@@ -3842,6 +3840,7 @@
  #
  if [ -z "$DIR_MAN" ]; then
      MANPATH="
@@ -166,7 +176,7 @@ $NetBSD: patch-ae,v 1.4 2001/04/23 15:06:13 abs Exp $
  	$MANPATH
  	/usr/local/man
  	/usr/contrib/man
-@@ -3839,7 +3835,7 @@
+@@ -3851,7 +3850,7 @@
      for i in $MANPATH; do
  	test -d $i && { DIR_MAN=$i; break; }
      done
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index 5b7f2b03363..c6605a1e5f0 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.4 2001/04/23 15:06:14 abs Exp $
+$NetBSD: patch-af,v 1.5 2001/07/08 13:32:15 bad Exp $
 
---- defs.in.orig	Sun Feb 11 03:29:06 2001
-+++ defs.in
+--- defs.in.orig	Thu Mar  8 07:44:17 2001
++++ defs.in	Sun Jul  8 00:48:02 2001
 @@ -44,6 +44,7 @@
  # to insufficient; you are better off rerunning the
  # configure script so that all uses are set correctly.
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.4 2001/04/23 15:06:14 abs Exp $
  SPOOL		= @SPOOL@
  SBIN		= @SBIN@
  BIN		= @BIN@
-@@ -256,7 +257,7 @@
+@@ -257,7 +258,7 @@
  LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
  LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
  
diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai
index 1def3a02c8e..92b9772a6db 100644
--- a/comms/hylafax/patches/patch-ai
+++ b/comms/hylafax/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.5 2001/04/23 15:06:15 abs Exp $
+$NetBSD: patch-ai,v 1.6 2001/07/08 13:32:15 bad Exp $
 
---- etc/faxsetup.sh.in.orig	Tue Feb  6 04:54:07 2001
-+++ etc/faxsetup.sh.in
+--- etc/faxsetup.sh.in.orig	Thu Jun 14 07:36:16 2001
++++ etc/faxsetup.sh.in	Sun Jul  8 01:25:48 2001
 @@ -41,7 +41,9 @@
  # This script interactively prepares and verifies 
  # a HylaFAX client and/or server machine for use.
@@ -37,19 +37,32 @@ $NetBSD: patch-ai,v 1.5 2001/04/23 15:06:15 abs Exp $
  MKFIFO
  MV
  PATH
-@@ -747,6 +751,48 @@
+@@ -747,6 +751,61 @@
      bitch "Sorry, but you must run this script as the super-user!"
      boom
  fi
 +
 +createspool()
 +{
++    old_spool="`dirname ${DIR_SPOOL}`/fax"
++    if [ -d "${old_spool}" ]; then
++	cat <<EOF
++=================================================================
++
++  Found an existing ${old_spool}, probably from an older version
++  of the HylaFax package.
++  You might want to copy you customizations to @SPOOL@ after
++  faxsetup is done.
++
++=================================================================
++EOF
++    fi
 +    if [ -d "${DIR_SPOOL}" ]; then
 +	cat <<EOF
 +=================================================================
 +
 +  @SPOOL@ already exists, probably from a previous run of
-+  faxsetup.sh --  I'm not touching it!
++  faxsetup  --  I'm not touching it!
 +
 +  If you encounter problems, deinstall the HylaFax package,
 +  remove @SPOOL@ and reinstall the package.
diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an
index 129ec5d8211..4629efea04f 100644
--- a/comms/hylafax/patches/patch-an
+++ b/comms/hylafax/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.4 2001/04/23 15:06:18 abs Exp $
+$NetBSD: patch-an,v 1.5 2001/07/08 13:32:15 bad Exp $
 
---- util/Makefile.in.orig	Sun Sep  3 04:39:34 2000
-+++ util/Makefile.in
+--- util/Makefile.in.orig	Wed May 30 04:04:39 2001
++++ util/Makefile.in	Sun Jul  8 01:12:54 2001
 @@ -154,7 +154,7 @@
  PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
  PUTSERVER	= ${INSTALL} -idb ${PRODUCT}.sw.server
@@ -16,13 +16,13 @@ $NetBSD: patch-an,v 1.4 2001/04/23 15:06:18 abs Exp $
  	${PUTSBIN} -m 755 -src recvstats.sh -O recvstats
  	${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron
 +	-${MKDIR} -m 755 ${LIBEXEC}/hylafax
- 	${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.gs.sh -O ps2fax.gs
- 	${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.dps.sh -O ps2fax.dps
- 	${PUTSUPD} -m 755 -src ${SRCDIR}/ps2fax.imp.sh -O ps2fax.imp
-@@ -182,9 +183,11 @@
- 	${PUTSUPD} -m 755 -src ${SRCDIR}/pollrcvd.sh -O pollrcvd
- 	${PUTSUPD} -m 755 -src ${SRCDIR}/mkcover.sh -O mkcover
- 	${PUTSUPD} -m 755 -src ${SRCDIR}/wedged.sh -O wedged
+ 	${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs
+ 	${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps
+ 	${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp
+@@ -183,9 +184,11 @@
+ 	${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
+ 	${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
+ 	${PUTSUPD} -m 755 -src wedged.sh -O wedged
 -	${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \
 +	-${MKDIR} -m 755 ${PREFIX}/share/hylafax
 +	-${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar
index 4ebd4fe310b..f4b1af51b5a 100644
--- a/comms/hylafax/patches/patch-ar
+++ b/comms/hylafax/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.4 2001/04/23 15:06:20 abs Exp $
+$NetBSD: patch-ar,v 1.5 2001/07/08 13:32:15 bad Exp $
 
---- util/typerules.orig	Mon Sep  4 06:57:44 2000
-+++ util/typerules
-@@ -129,6 +129,11 @@
+--- 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
  #
diff --git a/comms/hylafax/pkg/PLIST b/comms/hylafax/pkg/PLIST
index 77303da9cb1..5a77ea4c98d 100644
--- a/comms/hylafax/pkg/PLIST
+++ b/comms/hylafax/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/07/07 22:12:33 bad Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/07/08 13:32:15 bad Exp $
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -8,6 +8,7 @@ bin/sendfax
 bin/sendpage
 etc/rc.d/hylafax
 libdata/hylafax/hfaxd.conf
+libdata/hylafax/faxcover.ps
 libdata/hylafax/faxmail.ps
 libdata/hylafax/pagesizes
 libdata/hylafax/typerules
@@ -20,6 +21,7 @@ libexec/hylafax/notify
 libexec/hylafax/notify.awk
 libexec/hylafax/pcl2fax
 libexec/hylafax/pollrcvd
+libexec/hylafax/pdf2fax.gs
 libexec/hylafax/ps2fax.dps
 libexec/hylafax/ps2fax.gs
 libexec/hylafax/ps2fax.imp
@@ -40,19 +42,19 @@ man/cat1/sendpage.0.gz
 man/cat1/sgi2fax.0.gz
 man/cat1/textfmt.0.gz
 man/cat5/cid.0.gz
-man/cat5/config.0.gz
+man/cat5/hylafax-config.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-server.0.gz
-man/cat5/info.0.gz
-man/cat5/log.0.gz
+man/cat5/hylafax-info.0.gz
+man/cat5/hylafax-log.0.gz
 man/cat5/pagermap.0.gz
 man/cat5/pagesizes.0.gz
 man/cat5/recvq.0.gz
 man/cat5/sendq.0.gz
-man/cat5/shutdown.0.gz
+man/cat5/hylafax-shutdown.0.gz
 man/cat5/status.0.gz
 man/cat5/tsi.0.gz
 man/cat5/typerules.0.gz
@@ -83,6 +85,7 @@ man/cat8/mkcover.0.gz
 man/cat8/notify.0.gz
 man/cat8/pagesend.0.gz
 man/cat8/pollrcvd.0.gz
+man/cat8/pdf2fax.0.gz
 man/cat8/ps2fax.0.gz
 man/cat8/recvstats.0.gz
 man/cat8/tagtest.0.gz
@@ -137,10 +140,11 @@ share/hylafax/config_template/exar
 share/hylafax/config_template/gvc-288
 share/hylafax/config_template/gvc-288-2
 share/hylafax/config_template/intel-400e
+share/hylafax/config_template/lucent
+share/hylafax/config_template/lucent-mt-2
 share/hylafax/config_template/moto-288
 share/hylafax/config_template/mt-1432
 share/hylafax/config_template/nuvo-voyager
-share/hylafax/config_template/performance-rts
 share/hylafax/config_template/ppi-pm14400fxmt
 share/hylafax/config_template/ppi-pm14400fxsa
 share/hylafax/config_template/rc144ac
@@ -158,6 +162,7 @@ share/hylafax/config_template/telebit-t3000
 share/hylafax/config_template/telebit-wb
 share/hylafax/config_template/tricom2842
 share/hylafax/config_template/uds-fastalk
+share/hylafax/config_template/umc9624
 share/hylafax/config_template/umc92144
 share/hylafax/config_template/usr-2.0
 share/hylafax/config_template/usr-rts