Update hylafax to 4.1b2. Changes are mostly minor bugfixes. Also, the

hosts configuration file and manual pages were renamed to hosts.hfaxd to
avoid confusion with /etc/hosts.

5 files changed, 19 insertions, 15 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index f03bc8ce9f1..5ac5673ac5b 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/11 06:04:26 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/30 08:16:49 rh Exp $
 #
 
-DISTNAME=	hylafax-4.1beta1
-PKGNAME=	hylafax-4.1b1
+DISTNAME=	hylafax-4.1beta2
+PKGNAME=	hylafax-4.1b2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/hylafax/source/BETA/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/BETA/ \
diff --git a/comms/hylafax/files/md5 b/comms/hylafax/files/md5
index 27e0d887e1e..10453a7851c 100644
--- a/comms/hylafax/files/md5
+++ b/comms/hylafax/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
+$NetBSD: md5,v 1.2 1999/08/30 08:16:50 rh Exp $
 
-MD5 (hylafax-4.1beta1.tar.gz) = 8b5aaf4bb412e47bb16b984e93d08514
+MD5 (hylafax-4.1beta2.tar.gz) = d8560726e4f75093b9d6c7d1403694ce
diff --git a/comms/hylafax/files/patch-sum b/comms/hylafax/files/patch-sum
index 4bd5de41a31..8410782da5b 100644
--- a/comms/hylafax/files/patch-sum
+++ b/comms/hylafax/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/08/11 06:12:06 rh Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/30 08:16:50 rh Exp $
 
 MD5 (patch-aa) = f5a737a58433188581e2519ed963f678
 MD5 (patch-ab) = 365714e1edc1b975c7d1945e401abefa
@@ -15,6 +15,6 @@ MD5 (patch-al) = c6a1fd4622c328459706a93d0e127552
 MD5 (patch-am) = 6c3b3e6b6a514b9f2bcbcc986edf5292
 MD5 (patch-an) = ade8d2d498f324d22cf18cd8c1d50190
 MD5 (patch-ao) = 0d5f671c9b55f40d86161910dc170bcb
-MD5 (patch-ap) = 250fc12954279c50ee2d5e4b7b00dc29
+MD5 (patch-ap) = 829c8a63f9e2ba0dc8f143d61784522f
 MD5 (patch-aq) = f8e9bcbbc8db3e2da4a28f06d8ee794a
 MD5 (patch-ar) = 1253fc9904390be4d820f1caa5ac6f82
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
index cb47e49314b..fe16c605e38 100644
--- a/comms/hylafax/patches/patch-ap
+++ b/comms/hylafax/patches/patch-ap
@@ -1,16 +1,16 @@
-$NetBSD: patch-ap,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-ap,v 1.2 1999/08/30 08:16:51 rh Exp $
 
---- etc/Makefile.in.orig	Fri Jan 22 08:02:49 1999
-+++ etc/Makefile.in	Mon Aug  9 23:11:44 1999
+--- etc/Makefile.in.orig	Thu Aug  5 13:11:42 1999
++++ etc/Makefile.in	Mon Aug 30 08:53:10 1999
 @@ -78,14 +78,15 @@
  		-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
+-	${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
++	${PUTSAMPLE} -F ${PREFIX}/etc/hylafax -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 \
diff --git a/comms/hylafax/pkg/PLIST b/comms/hylafax/pkg/PLIST
index 1c05dfc6c73..84f4fa3baba 100644
--- a/comms/hylafax/pkg/PLIST
+++ b/comms/hylafax/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/11 06:04:27 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/30 08:16:51 rh Exp $
 bin/faxalter
 bin/faxcover
 bin/faxmail
@@ -36,7 +36,7 @@ man/cat5/cid.0.gz
 man/cat5/config.0.gz
 man/cat5/destctrls.0.gz
 man/cat5/dialrules.0.gz
-man/cat5/hosts.0.gz
+man/cat5/hosts.hfaxd.0.gz
 man/cat5/hylafax.0.gz
 man/cat5/info.0.gz
 man/cat5/log.0.gz
@@ -52,9 +52,11 @@ 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
@@ -90,6 +92,8 @@ man/cat1/sendpage.0.gz
 man/cat1/sgi2fax.0.gz
 man/cat1/textfmt.0.gz
 sbin/faxaddmodem
+sbin/faxadduser
+sbin/faxdeluser
 sbin/faxsetup
 sbin/faxsetup.bsdi
 sbin/faxsetup.irix
@@ -158,7 +162,7 @@ etc/hylafax/modem/zyxel-1496e-2.0
 etc/hylafax/modem/zyxel-2864
 etc/hylafax/modem/sierra
 etc/hylafax/xferfaxlog
-etc/hylafax/hosts
+etc/hylafax/hosts.hfaxd
 etc/hylafax/dialrules
 etc/hylafax/dialrules.sf-ba
 etc/hylafax/dialrules.europe