- Install template config files in share/hylafax/*_template/, and then copy

  into /var/spool/fax, rather than trying to use symlinks which break under
  chroot().
- Add basic rc.d/hylafax.sh startup script
- Use tiff-3.5-interfaces.patch, pointed out by Bernd Proissl <news@proissl.de>
Update to hylafax-4.1b2nb2

24 files changed, 372 insertions, 391 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index d6042ab20fb..95786858e54 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2000/08/29 17:08:37 abs Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/30 09:50:44 abs Exp $
 #
 
 DISTNAME=	hylafax-4.1beta2
-PKGNAME=	hylafax-4.1b2nb1
+PKGNAME=	hylafax-4.1b2nb2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/hylafax/source/BETA/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/BETA/ \
 		ftp://ftp.sisis.de/pub/hylafax/source/BETA/ \
 		ftp://ftp.uni-bremen.de/pub/mirrors/ftp.hylafax.org/pub/hylafax/source/BETA/
 
+PATCH_SITES=	http://www.hylafax.org/patches/
+PATCHFILES=	tiff-3.5-interfaces.patch
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.hylafax.org/
 
@@ -17,6 +20,8 @@ DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	mawk>=1.2.2:../../lang/mawk
 DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 
+DIST_SUBDIR=	hylafax
+
 CONFLICTS=	mgetty-*
 
 FAXUSER?=	uucp
@@ -35,4 +40,12 @@ post-install:
 	${CHOWN} ${FAXUSER} ${SUID_EXES}
 	${CHMOD} 4555 ${SUID_EXES}
 
+post-build:
+	${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \
+	    -e 's#@PREFIX@#${PREFIX}#g' \
+	    <${FILESDIR}/hylafax.sh >${WRKDIR}/hylafax.sh; \
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/hylafax.sh ${PREFIX}/etc/rc.d/hylafax.sh
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/hylafax/files/hylafax.sh b/comms/hylafax/files/hylafax.sh
new file mode 100755
index 00000000000..1199028f413
--- /dev/null
+++ b/comms/hylafax/files/hylafax.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# $NetBSD: hylafax.sh,v 1.1 2000/08/30 09:50:45 abs Exp $
+#
+
+command=${1:-start}
+
+case ${command} in
+start)
+	if [ -x @PREFIX@/libexec/hfaxd -a -f /var/spool/fax/etc/config ] ; then
+	    echo -n 'Starting hfaxd'
+	    @PREFIX@/libexec/hfaxd -i 4559 -o 4557 -s 444 
+
+	    echo ' faxq.'
+	    @PREFIX@/sbin/faxq
+	fi
+	;;
+stop)
+	PIDS=`ps -ax -o pid,command|egrep '[ /](faxq|hfaxd) '|awk '{printf " " $1}'`
+	if [ -n "$PIDS" ];then
+		echo "Stopping hylafax pids$PIDS."
+		kill -TERM $PIDS
+	else
+		echo "hylafax not running?"
+	fi
+	;;
+restart)
+	( $0 stop )
+	sleep 1
+	$0 start
+	;;
+esac
+exit 0
diff --git a/comms/hylafax/files/md5 b/comms/hylafax/files/md5
index 10453a7851c..02387774275 100644
--- a/comms/hylafax/files/md5
+++ b/comms/hylafax/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.2 1999/08/30 08:16:50 rh Exp $
+$NetBSD: md5,v 1.3 2000/08/30 09:50:45 abs Exp $
 
-MD5 (hylafax-4.1beta2.tar.gz) = d8560726e4f75093b9d6c7d1403694ce
+MD5 (hylafax/hylafax-4.1beta2.tar.gz) = d8560726e4f75093b9d6c7d1403694ce
+MD5 (hylafax/tiff-3.5-interfaces.patch) = c1d2847c9967a10961bb7fe123ecd8e6
diff --git a/comms/hylafax/files/patch-sum b/comms/hylafax/files/patch-sum
index bddad2690c1..4b474ef5518 100644
--- a/comms/hylafax/files/patch-sum
+++ b/comms/hylafax/files/patch-sum
@@ -1,21 +1,20 @@
-$NetBSD: patch-sum,v 1.6 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/30 09:50:45 abs Exp $
 
 MD5 (patch-aa) = af1eaed470ea49ebd06591e67955a045
 MD5 (patch-ab) = 9c7b1f0e3269855e76d32894a9422e78
-MD5 (patch-ac) = 8c3b38e8e32b8a3e21d1e8e3479ec6f5
+MD5 (patch-ac) = 5ba7a5f5ea87053179bc0597bda6209f
 MD5 (patch-ad) = 545902d326c0ab33726e06a34f85d6c8
 MD5 (patch-ae) = 45b8451f42eba548ae10c8c6c03aa6be
 MD5 (patch-af) = 48a451cbfab2e1095cffb7df306a8224
-MD5 (patch-ag) = b844d42a9ae576b1282fa15f065cd553
+MD5 (patch-ag) = 2ff656f18e5cbac1e2eb21ee1899feea
 MD5 (patch-ah) = 5e7f432b0fcb4eddfb9fc2fb3cc357e0
-MD5 (patch-ai) = 79e5001b72042dfcb90b14bc9813acce
+MD5 (patch-ai) = 1d3a24c26e56429d8d591b403ff7bd4e
 MD5 (patch-aj) = f388602375109aa51d966ada33c6ca69
 MD5 (patch-ak) = 2ea7c2abe863a808fe3d509495d8b413
 MD5 (patch-al) = 58be55add6aafb6c8b1ac9fea26d6e8b
-MD5 (patch-am) = 3f930bc3815eff5d274fb29c6d8d4a0f
-MD5 (patch-an) = 2d09d45d3716dc8be7843867140fcafe
-MD5 (patch-ao) = 4472e9c915083555e000884ed6141892
-MD5 (patch-ap) = 8d150f745e4eb58759579a7311e93e98
-MD5 (patch-aq) = 42cb829a91de9f483cab6da3a9fc9e49
-MD5 (patch-ar) = e6339d04368fc7af3aadf09908857153
-MD5 (patch-as) = b879bedc1ce0092c0423b5125cda31a7
+MD5 (patch-am) = 2d09d45d3716dc8be7843867140fcafe
+MD5 (patch-an) = 09f889b6b2d408d74c87c081ea8e74dc
+MD5 (patch-ao) = 8d150f745e4eb58759579a7311e93e98
+MD5 (patch-ap) = 42cb829a91de9f483cab6da3a9fc9e49
+MD5 (patch-aq) = e6339d04368fc7af3aadf09908857153
+MD5 (patch-ar) = b879bedc1ce0092c0423b5125cda31a7
diff --git a/comms/hylafax/patches/patch-aa b/comms/hylafax/patches/patch-aa
index fbb9278a53c..cb704f26396 100644
--- a/comms/hylafax/patches/patch-aa
+++ b/comms/hylafax/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-aa,v 1.6 2000/08/30 09:50:45 abs Exp $
 
 --- Makefile.in.orig	Fri Mar 19 04:11:05 1999
 +++ Makefile.in
diff --git a/comms/hylafax/patches/patch-ab b/comms/hylafax/patches/patch-ab
index a466c4b3012..1c4164b99b1 100644
--- a/comms/hylafax/patches/patch-ab
+++ b/comms/hylafax/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ab,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- config.h.in.orig	Thu Aug  5 12:11:41 1999
 +++ config.h.in
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac
index 8305c936c15..c677263cbb2 100644
--- a/comms/hylafax/patches/patch-ac
+++ b/comms/hylafax/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ac,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- config/Makefile.in.orig	Mon Oct 12 21:47:47 1998
 +++ config/Makefile.in
@@ -6,8 +6,8 @@ $NetBSD: patch-ac,v 1.2 2000/08/29 17:08:38 abs Exp $
  PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
  
  install: default ${CONFIGFILES}
-+	-${MKDIR} -p -m 0755 ${PREFIX}/etc/hylafax/modem
++	-${MKDIR} -p -m 0755 ${PREFIX}/share/hylafax/config_template
  	for i in ${CONFIGFILES}; do \
 -	    ${PUTSERVER} -F ${SPOOL}/config -m 444 -src ${SRCDIR}/$$i -O $$i; \
-+	    ${PUTSERVER} -F ${PREFIX}/etc/hylafax/modem -m 444 -src ${SRCDIR}/$$i -O $$i; \
++	    ${PUTSERVER} -F ${PREFIX}/share/hylafax/config_template -m 444 -src ${SRCDIR}/$$i -O $$i; \
  	done
diff --git a/comms/hylafax/patches/patch-ad b/comms/hylafax/patches/patch-ad
index 2ac863e280e..81a851b547b 100644
--- a/comms/hylafax/patches/patch-ad
+++ b/comms/hylafax/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ad,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- config/skel.orig	Sun Jan 10 09:09:38 1999
 +++ config/skel
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index 238dc661e68..fb925fbbdc1 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ae,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- configure.orig	Mon Jul 26 15:57:29 1999
 +++ configure
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index e18785bac8c..b6446a97c4d 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-af,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- defs.in.orig	Mon Jan  4 09:17:09 1999
 +++ defs.in
diff --git a/comms/hylafax/patches/patch-ag b/comms/hylafax/patches/patch-ag
index f345f80c0fb..6b76081957e 100644
--- a/comms/hylafax/patches/patch-ag
+++ b/comms/hylafax/patches/patch-ag
@@ -1,24 +1,25 @@
-$NetBSD: patch-ag,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ag,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- etc/Makefile.in.orig	Thu Aug  5 12:11:42 1999
 +++ etc/Makefile.in
-@@ -78,14 +78,15 @@
+@@ -78,14 +78,16 @@
  		-src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
  	done
  	${PUTSERVER} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
 -	${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -o xferfaxlog
 -	${PUTSAMPLE} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
-+	-${MKDIR} -m 755 ${PREFIX}/etc/hylafax
-+	${PUTSAMPLE} -F ${PREFIX}/etc/hylafax -m 644 -o xferfaxlog
-+	${PUTSAMPLE} -F ${PREFIX}/etc/hylafax -m 600 -o hosts.hfaxd
++	-${MKDIR} -m 755 ${PREFIX}/share/hylafax
++	-${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
++	${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 644 -o xferfaxlog
++	${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 600 -o hosts.hfaxd
  	for i in ${DIALRULES}; do \
 -	    ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
-+	    ${PUTSERVER} -F ${PREFIX}/etc/hylafax -m 444 -src ${SRCDIR}/$$i \
++	    ${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -m 444 -src ${SRCDIR}/$$i \
  		-idb "config(update)" -O $$i; \
  	done
  	${PUTSERVER} -F ${LIBEXEC} -m 755 -O lockname ondelay
 -	${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -idb nostrip \
-+	${PUTSAMPLE} -F ${PREFIX}/etc/hylafax -m 644 -idb nostrip \
++	${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 644 -idb nostrip \
  	    -src ${SRCDIR}/lutRS18.pcf -O lutRS18.pcf
  
  #
diff --git a/comms/hylafax/patches/patch-ah b/comms/hylafax/patches/patch-ah
index 72817a2776e..da64759778c 100644
--- a/comms/hylafax/patches/patch-ah
+++ b/comms/hylafax/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ah,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- etc/faxaddmodem.sh.in.orig	Thu Jul 15 11:48:43 1999
 +++ etc/faxaddmodem.sh.in
diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai
index c09488d1ce9..46597672308 100644
--- a/comms/hylafax/patches/patch-ai
+++ b/comms/hylafax/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ai,v 1.3 2000/08/30 09:50:45 abs Exp $
 
 --- etc/faxsetup.sh.in.orig	Thu Aug  5 12:11:42 1999
 +++ etc/faxsetup.sh.in
@@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.2 2000/08/29 17:08:38 abs Exp $
  MKFIFO
  MV
  PATH
-@@ -741,6 +745,40 @@
+@@ -741,6 +745,48 @@
      bitch "Sorry, but you must run this script as the super-user!"
      boom
  fi
@@ -62,12 +62,20 @@ $NetBSD: patch-ai,v 1.2 2000/08/29 17:08:38 abs Exp $
 +	for i in archive docq doneq pollq sendq tmp ; do
 +	    ${MKDIR} -m 0700 ${DIR_SPOOL}/$i
 +	done
-+	for i in client cover dev info log recvq status ; do
++	for i in bin client cover dev info log recvq status ; do
 +	    ${MKDIR} -m 0755 ${DIR_SPOOL}/$i
 +	done
-+	${LN} ${LN_S} ${PREFIX}/etc/hylafax ${DIR_SPOOL}/etc
-+	${LN} ${LN_S} ${PREFIX}/etc/hylafax/modem ${DIR_SPOOL}/config
-+	${LN} ${LN_S} ${PREFIX}/libexec/hylafax ${DIR_SPOOL}/bin
++	for i in `ls ${PREFIX}/share/hylafax/etc_template` ; do
++	    ${CP} -p  ${PREFIX}/share/hylafax/etc_template/$i \
++							${DIR_SPOOL}/etc/$i
++	done
++	for i in `ls ${PREFIX}/share/hylafax/config_template` ; do
++	    ${CP} -p  ${PREFIX}/share/hylafax/config_template/$i \
++							${DIR_SPOOL}/config/$i
++	done
++	for i in `ls ${PREFIX}/libexec/hylafax` ; do
++	    ${CP} -p  ${PREFIX}/libexec/hylafax/$i ${DIR_SPOOL}/bin/$i
++	done
 +	${CHOWN} -R ${PROTOUID}:${PROTOGID} ${DIR_SPOOL}
 +    fi
 +}
diff --git a/comms/hylafax/patches/patch-aj b/comms/hylafax/patches/patch-aj
index bf294f68400..a966e796cac 100644
--- a/comms/hylafax/patches/patch-aj
+++ b/comms/hylafax/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-aj,v 1.3 2000/08/30 09:50:46 abs Exp $
 
 --- faxd/Getty.c++.orig	Sun Jun 13 08:41:03 1999
 +++ faxd/Getty.c++
diff --git a/comms/hylafax/patches/patch-ak b/comms/hylafax/patches/patch-ak
index bd57abb13a4..c30f8f8bf49 100644
--- a/comms/hylafax/patches/patch-ak
+++ b/comms/hylafax/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ak,v 1.3 2000/08/30 09:50:46 abs Exp $
 
 --- faxd/UUCPLock.c++.orig	Sun Jun 13 08:41:05 1999
 +++ faxd/UUCPLock.c++
diff --git a/comms/hylafax/patches/patch-al b/comms/hylafax/patches/patch-al
index 8de81dd750f..9e715f83455 100644
--- a/comms/hylafax/patches/patch-al
+++ b/comms/hylafax/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-al,v 1.3 2000/08/30 09:50:46 abs Exp $
 
 --- faxd/faxGettyApp.c++.orig	Sun Jun 13 08:41:05 1999
 +++ faxd/faxGettyApp.c++
diff --git a/comms/hylafax/patches/patch-am b/comms/hylafax/patches/patch-am
index 537ac6812b7..80d29f313a2 100644
--- a/comms/hylafax/patches/patch-am
+++ b/comms/hylafax/patches/patch-am
@@ -1,75 +1,31 @@
-$NetBSD: patch-am,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-am,v 1.3 2000/08/30 09:50:46 abs Exp $
 
---- faxd/tif_fax3.h.orig	Mon Oct 12 21:47:49 1998
-+++ faxd/tif_fax3.h
-@@ -327,6 +327,10 @@
- 		goto doneWhite1d;					\
- 	    case S_MakeUpW:						\
- 	    case S_MakeUp:						\
-+		if (!TabEnt->Param) {					\
-+		    unexpected("WhiteTable Zero-length", a0);		\
-+		    goto done1d;					\
-+		}							\
- 		a0 += TabEnt->Param;					\
- 		RunLength += TabEnt->Param;				\
- 		break;							\
-@@ -349,6 +353,10 @@
- 		goto doneBlack1d;					\
- 	    case S_MakeUpB:						\
- 	    case S_MakeUp:						\
-+		if (!TabEnt->Param) {					\
-+		    unexpected("BlackTable Zero-length", a0);		\
-+		    goto done1d;					\
-+		}							\
- 		a0 += TabEnt->Param;					\
- 		RunLength += TabEnt->Param;				\
- 		break;							\
-@@ -404,6 +412,8 @@
- 			goto doneWhite2da;				\
- 		    case S_MakeUpB:					\
- 		    case S_MakeUp:					\
-+			if (!TabEnt->Param)				\
-+			    goto zeroBlack2d;				\
- 			a0 += TabEnt->Param;				\
- 			RunLength += TabEnt->Param;			\
- 			break;						\
-@@ -420,6 +430,8 @@
- 			goto doneBlack2da;				\
- 		    case S_MakeUpW:					\
- 		    case S_MakeUp:					\
-+			if (!TabEnt->Param)				\
-+			    goto zeroWhite2d;				\
- 			a0 += TabEnt->Param;				\
- 			RunLength += TabEnt->Param;			\
- 			break;						\
-@@ -437,6 +449,8 @@
- 			goto doneWhite2db;				\
- 		    case S_MakeUpW:					\
- 		    case S_MakeUp:					\
-+			if (!TabEnt->Param)				\
-+			    goto zeroWhite2d;				\
- 			a0 += TabEnt->Param;				\
- 			RunLength += TabEnt->Param;			\
- 			break;						\
-@@ -453,6 +467,8 @@
- 			goto doneBlack2db;				\
- 		    case S_MakeUpB:					\
- 		    case S_MakeUp:					\
-+			if (!TabEnt->Param)				\
-+			    goto zeroBlack2d;				\
- 			a0 += TabEnt->Param;				\
- 			RunLength += TabEnt->Param;			\
- 			break;						\
-@@ -493,6 +509,12 @@
- 	default:							\
- 	badMain2d:							\
- 	    unexpected("MainTable", a0);				\
-+	    goto eol2d;							\
-+	zeroBlack2d:							\
-+	    unexpected("BlackTable Zero length", a0);			\
-+	    goto eol2d;							\
-+	zeroWhite2d:							\
-+	    unexpected("WhiteTable Zero length", a0);			\
- 	    goto eol2d;							\
- 	badBlack2d:							\
- 	    unexpected("BlackTable", a0);				\
+--- hfaxd/User.c++.orig	Sun Jun 13 08:41:16 1999
++++ hfaxd/User.c++
+@@ -218,7 +218,7 @@
+     if (id == uid)				// user currently logged in
+ 	return (const char*) the_user;
+     if (id == FAXUID_ANON)			// anonymous user
+-	return "fax";
++	return FAX_USER;
+     if (idcache == NULL)			// load cache from file
+ 	fillIDCache();
+     const fxStr* hit = idcache->find(id);	// check cache
+@@ -237,7 +237,7 @@
+ {
+     if (name == the_user)
+ 	id = uid;
+-    else if (strcmp(name, "fax") == 0)
++    else if (strcmp(name, FAX_USER) == 0)
+ 	id = FAXUID_ANON;
+     else {
+ 	if (idcache == NULL)
+@@ -324,7 +324,7 @@
+     if (faxuid < FAXUID_MAX)
+ 	SetBit(FAXUID_RESV);			// reserved uid
+     else
+-	logError("Internal error, \"fax\" UID (%u) too large.", faxuid);
++	logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid);
+     SetBit(FAXUID_ANON);			// anonymous uid is reserved
+     while (nextRecord(db, line, sizeof (line))) {
+ 	if (line[0] == '!')
diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an
index d9c920bedb4..1cd038c225e 100644
--- a/comms/hylafax/patches/patch-an
+++ b/comms/hylafax/patches/patch-an
@@ -1,31 +1,35 @@
-$NetBSD: patch-an,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-an,v 1.3 2000/08/30 09:50:46 abs Exp $
 
---- hfaxd/User.c++.orig	Sun Jun 13 08:41:16 1999
-+++ hfaxd/User.c++
-@@ -218,7 +218,7 @@
-     if (id == uid)				// user currently logged in
- 	return (const char*) the_user;
-     if (id == FAXUID_ANON)			// anonymous user
--	return "fax";
-+	return FAX_USER;
-     if (idcache == NULL)			// load cache from file
- 	fillIDCache();
-     const fxStr* hit = idcache->find(id);	// check cache
-@@ -237,7 +237,7 @@
- {
-     if (name == the_user)
- 	id = uid;
--    else if (strcmp(name, "fax") == 0)
-+    else if (strcmp(name, FAX_USER) == 0)
- 	id = FAXUID_ANON;
-     else {
- 	if (idcache == NULL)
-@@ -324,7 +324,7 @@
-     if (faxuid < FAXUID_MAX)
- 	SetBit(FAXUID_RESV);			// reserved uid
-     else
--	logError("Internal error, \"fax\" UID (%u) too large.", faxuid);
-+	logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid);
-     SetBit(FAXUID_ANON);			// anonymous uid is reserved
-     while (nextRecord(db, line, sizeof (line))) {
- 	if (line[0] == '!')
+--- util/Makefile.in.orig	Thu Aug  5 10:46:06 1999
++++ util/Makefile.in
+@@ -154,7 +154,7 @@
+ PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
+ PUTSERVER	= ${INSTALL} -idb ${PRODUCT}.sw.server
+ PUTSERV		= ${PUTSERVER} -m 755
+-PUTSUPD		= ${PUTSERVER} -F ${SPOOL}/bin -idb "config(update)"
++PUTSUPD		= ${PUTSERVER} -F ${LIBEXEC}/hylafax -idb "config(update)"
+ PUTSBIN		= ${PUTSERVER} -F ${SBIN}
+ 
+ installClient: default
+@@ -171,6 +171,7 @@
+ 	${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
+ 	${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
+-	${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \
++	-${MKDIR} -m 755 ${PREFIX}/share/hylafax
++	-${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
++	${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -m 444 -idb "config(update)" \
+ 	    -src ${SRCDIR}/dpsprinter.ps -O dpsprinter.ps
+-	${PUTSERVER} -F ${SPOOL}/etc -idb "config(suggest)" \
++	${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -idb "config(suggest)" \
+ 	    -m 444 -src ${SRCDIR}/cover.templ -O cover.templ
+ 
+ @MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
diff --git a/comms/hylafax/patches/patch-ao b/comms/hylafax/patches/patch-ao
index e3584f0d0e6..d0e9b2ca51a 100644
--- a/comms/hylafax/patches/patch-ao
+++ b/comms/hylafax/patches/patch-ao
@@ -1,34 +1,84 @@
-$NetBSD: patch-ao,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ao,v 1.3 2000/08/30 09:50:46 abs Exp $
 
---- util/Makefile.in.orig	Thu Aug  5 10:46:06 1999
-+++ util/Makefile.in
-@@ -154,7 +154,7 @@
- PUTCLIENT	= ${INSTALL} -idb ${PRODUCT}.sw.client
- PUTSERVER	= ${INSTALL} -idb ${PRODUCT}.sw.server
- PUTSERV		= ${PUTSERVER} -m 755
--PUTSUPD		= ${PUTSERVER} -F ${SPOOL}/bin -idb "config(update)"
-+PUTSUPD		= ${PUTSERVER} -F ${LIBEXEC}/hylafax -idb "config(update)"
- PUTSBIN		= ${PUTSERVER} -F ${SBIN}
+--- util/TypeRules.c++.orig	Sun Jun 13 08:41:26 1999
++++ util/TypeRules.c++
+@@ -36,6 +36,14 @@
+ #include <netinet/in.h>
+ }
  
- installClient: default
-@@ -171,6 +171,7 @@
- 	${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
- 	${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,10 @@
- 	${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
--	${PUTSERVER} -F ${SPOOL}/etc -m 444 -idb "config(update)" \
-+	-${MKDIR} -m 755 ${PREFIX}/etc/hylafax
-+	${PUTSERVER} -F ${PREFIX}/etc/hylafax -m 444 -idb "config(update)" \
- 	    -src ${SRCDIR}/dpsprinter.ps -O dpsprinter.ps
--	${PUTSERVER} -F ${SPOOL}/etc -idb "config(suggest)" \
-+	${PUTSERVER} -F ${PREFIX}/etc/hylafax -idb "config(suggest)" \
- 	    -m 444 -src ${SRCDIR}/cover.templ -O cover.templ
++#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 @@
+ }
  
- @MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
+ 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
index c1db832b070..48d629f2510 100644
--- a/comms/hylafax/patches/patch-ap
+++ b/comms/hylafax/patches/patch-ap
@@ -1,84 +1,12 @@
-$NetBSD: patch-ap,v 1.3 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ap,v 1.4 2000/08/30 09:50:46 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;
+--- 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-aq b/comms/hylafax/patches/patch-aq
index 4053d8570c5..6e1c642a909 100644
--- a/comms/hylafax/patches/patch-aq
+++ b/comms/hylafax/patches/patch-aq
@@ -1,12 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-aq,v 1.3 2000/08/30 09:50:46 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
+--- util/faxcron.sh.in.orig	Tue Jun 29 12:55:07 1999
++++ util/faxcron.sh.in
+@@ -41,7 +41,7 @@
+ AGELOG=30			# keep log info for last 30 days
+ AGERCV=7			# purge received facsimile after 2 days
+ AGETMP=1			# purge orphaned temp files after 1 day
+-FAXUSER=fax			# owner of log files
++FAXUSER=@FAXUID@		# owner of log files
+ LOGMODE=0644			# mode for log files
+ XFERLOG=etc/xferfaxlog		# HylaFAX xferfaxlog file location
+ LAST=etc/lastrun		# file where time+date of last run recorded
diff --git a/comms/hylafax/patches/patch-ar b/comms/hylafax/patches/patch-ar
index 1b1108fe9d8..91c01b36565 100644
--- a/comms/hylafax/patches/patch-ar
+++ b/comms/hylafax/patches/patch-ar
@@ -1,13 +1,16 @@
-$NetBSD: patch-ar,v 1.2 2000/08/29 17:08:38 abs Exp $
+$NetBSD: patch-ar,v 1.3 2000/08/30 09:50:46 abs Exp $
 
---- util/faxcron.sh.in.orig	Tue Jun 29 12:55:07 1999
-+++ util/faxcron.sh.in
-@@ -41,7 +41,7 @@
- AGELOG=30			# keep log info for last 30 days
- AGERCV=7			# purge received facsimile after 2 days
- AGETMP=1			# purge orphaned temp files after 1 day
--FAXUSER=fax			# owner of log files
-+FAXUSER=@FAXUID@		# owner of log files
- LOGMODE=0644			# mode for log files
- XFERLOG=etc/xferfaxlog		# HylaFAX xferfaxlog file location
- LAST=etc/lastrun		# file where time+date of last run recorded
+--- util/typerules.orig	Mon Oct 12 21:47:48 1998
++++ util/typerules
+@@ -128,6 +128,11 @@
+ >15     string          ascii		ps	%F/textfmt -B -f Courier-Bold\
+ 						    -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\
diff --git a/comms/hylafax/patches/patch-as b/comms/hylafax/patches/patch-as
deleted file mode 100644
index eff40a048c0..00000000000
--- a/comms/hylafax/patches/patch-as
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-as,v 1.1 2000/08/29 17:08:38 abs Exp $
-
---- util/typerules.orig	Mon Oct 12 21:47:48 1998
-+++ util/typerules
-@@ -128,6 +128,11 @@
- >15     string          ascii		ps	%F/textfmt -B -f Courier-Bold\
- 						    -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\
diff --git a/comms/hylafax/pkg/PLIST b/comms/hylafax/pkg/PLIST
index 84f4fa3baba..1e50b25b127 100644
--- a/comms/hylafax/pkg/PLIST
+++ b/comms/hylafax/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/08/30 08:16:51 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/30 09:50:46 abs Exp $
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -8,30 +8,37 @@ bin/sendfax
 bin/sendpage
 libdata/hylafax/faxcover.ps
 libdata/hylafax/faxmail.ps
+libdata/hylafax/hfaxd.conf
 libdata/hylafax/pagesizes
 libdata/hylafax/typerules
-libdata/hylafax/hfaxd.conf
-share/doc/hylafax/COPYRIGHT
-libexec/lockname
-libexec/ondelay
-libexec/textfmt
 libexec/faxgetty
 libexec/faxsend
-libexec/pagesend
 libexec/hfaxd
-libexec/hylafax/ps2fax.gs
-libexec/hylafax/ps2fax.dps
-libexec/hylafax/ps2fax.imp
-libexec/hylafax/pcl2fax
-libexec/hylafax/tiff2fax
+libexec/hylafax/faxrcvd
+libexec/hylafax/mkcover
 libexec/hylafax/notify
 libexec/hylafax/notify.awk
-libexec/hylafax/faxrcvd
+libexec/hylafax/pcl2fax
 libexec/hylafax/pollrcvd
-libexec/hylafax/mkcover
+libexec/hylafax/ps2fax.dps
+libexec/hylafax/ps2fax.gs
+libexec/hylafax/ps2fax.imp
+libexec/hylafax/tiff2fax
 libexec/hylafax/wedged
-man/cat5/pagesizes.0.gz
-man/cat5/typerules.0.gz
+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.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/config.0.gz
 man/cat5/destctrls.0.gz
@@ -41,11 +48,13 @@ man/cat5/hylafax.0.gz
 man/cat5/info.0.gz
 man/cat5/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/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
@@ -81,96 +90,87 @@ man/cat8/tiffcheck.0.gz
 man/cat8/tsitest.0.gz
 man/cat8/wedged.0.gz
 man/cat8/xferfaxstats.0.gz
-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.0.gz
-man/cat1/sendfax.0.gz
-man/cat1/sendpage.0.gz
-man/cat1/sgi2fax.0.gz
-man/cat1/textfmt.0.gz
+sbin/choptest
+sbin/cqtest
+sbin/dialtest
+sbin/faxabort
 sbin/faxaddmodem
 sbin/faxadduser
+sbin/faxanswer
+sbin/faxconfig
+sbin/faxcron
 sbin/faxdeluser
+sbin/faxinfo
+sbin/faxmodem
+sbin/faxmsg
+sbin/faxq
+sbin/faxqclean
+sbin/faxquit
 sbin/faxsetup
 sbin/faxsetup.bsdi
 sbin/faxsetup.irix
 sbin/faxsetup.linux
-sbin/probemodem
-sbin/faxmsg
-sbin/faxconfig
-sbin/faxmodem
 sbin/faxstate
 sbin/faxwatch
-sbin/faxinfo
-sbin/tiffcheck
-sbin/faxabort
-sbin/faxanswer
-sbin/faxquit
 sbin/hylafax
-sbin/dialtest
-sbin/typetest
-sbin/xferfaxstats
+sbin/probemodem
 sbin/recvstats
-sbin/faxcron
-sbin/faxq
-sbin/faxqclean
-sbin/tsitest
 sbin/tagtest
-sbin/cqtest
-sbin/choptest
-etc/hylafax/modem/class1
-etc/hylafax/modem/class2
-etc/hylafax/modem/class2.0
-etc/hylafax/modem/skel
-etc/hylafax/modem/att-dataport-2
-etc/hylafax/modem/att-dataport-2.0
-etc/hylafax/modem/att-dataport
-etc/hylafax/modem/cirrus
-etc/hylafax/modem/dsi-scout+
-etc/hylafax/modem/e-tech
-etc/hylafax/modem/everex-2496d
-etc/hylafax/modem/exar
-etc/hylafax/modem/gvc-288
-etc/hylafax/modem/gvc-288-2
-etc/hylafax/modem/intel-400e
-etc/hylafax/modem/moto-288
-etc/hylafax/modem/mt-1432
-etc/hylafax/modem/nuvo-voyager
-etc/hylafax/modem/ppi-pm14400fxmt
-etc/hylafax/modem/ppi-pm14400fxsa
-etc/hylafax/modem/rc144ac
-etc/hylafax/modem/rc144ac-1
-etc/hylafax/modem/rc288dpi
-etc/hylafax/modem/rc288dpi-1
-etc/hylafax/modem/rc32acl
-etc/hylafax/modem/rc32acl-1
-etc/hylafax/modem/rockwell
-etc/hylafax/modem/telebit-t3000
-etc/hylafax/modem/telebit-qblazer
-etc/hylafax/modem/telebit-wb
-etc/hylafax/modem/tricom2842
-etc/hylafax/modem/uds-fastalk
-etc/hylafax/modem/usr-2.0
-etc/hylafax/modem/usr-rts
-etc/hylafax/modem/usr-xon
-etc/hylafax/modem/zyxel-1496e
-etc/hylafax/modem/zyxel-1496e-1
-etc/hylafax/modem/zyxel-1496e-2.0
-etc/hylafax/modem/zyxel-2864
-etc/hylafax/modem/sierra
-etc/hylafax/xferfaxlog
-etc/hylafax/hosts.hfaxd
-etc/hylafax/dialrules
-etc/hylafax/dialrules.sf-ba
-etc/hylafax/dialrules.europe
-etc/hylafax/lutRS18.pcf
-etc/hylafax/dpsprinter.ps
-etc/hylafax/cover.templ
-@dirrm etc/hylafax/modem
-@dirrm etc/hylafax
+sbin/tiffcheck
+sbin/tsitest
+sbin/typetest
+sbin/xferfaxstats
+share/doc/hylafax/COPYRIGHT
+share/hylafax/config_template/att-dataport
+share/hylafax/config_template/att-dataport-2
+share/hylafax/config_template/att-dataport-2.0
+share/hylafax/config_template/cirrus
+share/hylafax/config_template/class1
+share/hylafax/config_template/class2
+share/hylafax/config_template/class2.0
+share/hylafax/config_template/dsi-scout+
+share/hylafax/config_template/e-tech
+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/intel-400e
+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/rc144ac
+share/hylafax/config_template/rc144ac-1
+share/hylafax/config_template/rc288dpi
+share/hylafax/config_template/rc288dpi-1
+share/hylafax/config_template/rc32acl
+share/hylafax/config_template/rc32acl-1
+share/hylafax/config_template/rockwell
+share/hylafax/config_template/sierra
+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/tricom2842
+share/hylafax/config_template/uds-fastalk
+share/hylafax/config_template/usr-2.0
+share/hylafax/config_template/usr-rts
+share/hylafax/config_template/usr-xon
+share/hylafax/config_template/zyxel-1496e
+share/hylafax/config_template/zyxel-1496e-1
+share/hylafax/config_template/zyxel-1496e-2.0
+share/hylafax/config_template/zyxel-2864
+share/hylafax/etc_template/cover.templ
+share/hylafax/etc_template/dialrules
+share/hylafax/etc_template/dialrules.europe
+share/hylafax/etc_template/dialrules.sf-ba
+share/hylafax/etc_template/dpsprinter.ps
+share/hylafax/etc_template/hosts.hfaxd
+share/hylafax/etc_template/lutRS18.pcf
+share/hylafax/etc_template/xferfaxlog
+@dirrm share/hylafax/config_template
+@dirrm share/hylafax/etc_template
 @dirrm libexec/hylafax
 @dirrm libdata/hylafax
 @dirrm share/doc/hylafax