Patch faxd/tif_fax3.h to avoid potential infinite loop in EXPAND1D and EXPAND2D

This package still has bizarre issues with trying to symlink everything across
from /var/spool/fax into /usr/pkg/..., which breaks probably due to judicious
use of chroot(). That _really_ needs to be fixed

19 files changed, 648 insertions, 573 deletions

diff --git a/comms/hylafax/patches/patch-aa b/comms/hylafax/patches/patch-aa
index cdb8d7ae9fb..fbb9278a53c 100644
--- a/comms/hylafax/patches/patch-aa
+++ b/comms/hylafax/patches/patch-aa
@@ -1,188 +1,29 @@
-$NetBSD: patch-aa,v 1.4 2000/04/20 16:30:25 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/29 17:08:38 abs Exp $
 
---- configure.orig	Mon Jul 26 16:57:29 1999
-+++ configure	Sat Oct  9 15:22:19 1999
-@@ -37,21 +37,19 @@
- #
- # Setup general configuration parameters.
- #
--DIR_BIN=/usr/local/bin
--DIR_SBIN=/usr/local/sbin
--DIR_LIBDATA=/usr/local/lib/fax
--DIR_LIBEXEC=$DIR_SBIN
-+DIR_BIN=${PREFIX}/bin
-+DIR_SBIN=${PREFIX}/sbin
-+DIR_LIBDATA=${PREFIX}/libdata/hylafax
-+DIR_LIBEXEC=${PREFIX}/libexec
- DIR_SPOOL=/var/spool/fax
--DIR_HTML=/var/httpd/htdocs/hylafax
--DIR_CGI=/var/httpd/cgi-bin
-+DIR_HTML=${PREFIX}/http/htdocs/hylafax
-+DIR_CGI=${PREFIX}/http/cgi-bin
- PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
--PATH_IMPRIP=/usr/lib/print/psrip
-+PATH_IMPRIP=${PREFIX}/lib/print/psrip
- HTMLPATH=/hylafax
- CGIPATH=/cgi-bin
- DEFVRES=98
- PAGESIZE="North American Letter"
--FAXUID=uucp
--FAXGID=
- SYSUID=bin
- SYSGID=
- DSO=auto
-@@ -67,18 +65,18 @@
- GS=no
- IMP=no
- UTMP=auto
--LIBTIFF="-L/usr/local/lib -ltiff"
--TIFFINC=/usr/local/include
-+LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
-+TIFFINC=${PREFIX}/include
- TIFFBIN=
--ZLIB=yes
--LIBZ='-L${DEPTH}/zlib -lz'
--ZLIBINC='${DEPTH}/${TOPSRCDIR}/zlib'
-+ZLIB=no
-+LIBZ='-lz'
-+ZLIBINC='/usr/include'
- REGEX=yes
- LIBREGEX='-L${DEPTH}/regex -lregex'
- REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
- DBLIB=no
--LIBDB="-L/usr/local/lib -ldb"
--DBLIBINC=/usr/local/include
-+LIBDB="-L${PREFIX}/lib -ldb"
-+DBLIBINC=${PREFIX}/include
- CONFIG_OSFCNH=auto
+--- Makefile.in.orig	Fri Mar 19 04:11:05 1999
++++ Makefile.in
+@@ -243,22 +243,13 @@
+ makeServerDirs::
+ 	-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
+ 	    -idb hylafax.sw.server -dir ${SBIN};
+-	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
+-	    -idb hylafax.sw.server -dir ${SPOOL}
+-	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
+-	    -idb hylafax.sw.server -dir \
+-	    -F ${SPOOL} bin client config dev etc info log recvq status
+-	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 700 \
+-	    -idb hylafax.sw.server -dir \
+-	    -F ${SPOOL} sendq doneq docq tmp pollq archive
+ makeDirs: makeClientDirs makeServerDirs
  
- # SVR4 packaging stuff
-@@ -195,6 +193,7 @@
- PKG_VENDOR
- PORT
- PORTFUNCS
-+PREFIX
- PSPACKAGE	PS
- REGEX
- RM		RMCMD
-@@ -247,7 +246,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
--test -d /usr/local/bin && PATH=/usr/local/bin:$PATH	# for GNU stuff
-+test -d ${PREFIX}/bin && PATH=${PREFIX}/bin:$PATH	# for packages stuff
- PATH=$PATH:$OPATH
+ makeDevices::
+-	${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 600 -fifo \
+-	    -idb hylafax.sw.server -F ${SPOOL} FIFO
  
- POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
-@@ -617,6 +616,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" ;;
-@@ -2838,7 +2838,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
-@@ -2865,10 +2865,6 @@
- 	printf("old include files: version %u\n", TIFFLIB_VERSION);
-         exit(-1);
-     }
--    if (strncmp(TIFFGetVersion(), "LIBTIFF, Version 3.4", 20) != 0) {
--	printf("old library: version %s\n", TIFFGetVersion());
--	exit(-1);
--    } else
- 	exit(0);
- }
- EOF
-@@ -3414,7 +3410,7 @@
- if [ -z "$PATH_VGETTY" ]; then
-     PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
-     if [ -z "$PATH_VGETTY" ]; then
--	PATH_VGETTY=/bin/vgetty
-+	PATH_VGETTY=${PREFIX}/bin/vgetty
- 	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."
-@@ -3427,7 +3423,7 @@
- if [ -z "$PATH_EGETTY" ]; then
-     PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
-     if [ -z "$PATH_EGETTY" ]; then
--	PATH_EGETTY=/bin/egetty
-+	PATH_EGETTY=${PREFIX}/bin/egetty
- 	Note "WARNING, no egetty program found, using $PATH_EGETTY."
-     else
- 	Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
-@@ -3497,6 +3493,7 @@
- {
-     if [ -z "$PATH_GSRIP" ]; then
- 	GSLOCS="
-+	    ${PREFIX}/bin/gs
- 	    /usr/local/bin/gs
- 	    /usr/contrib/bin/gs
- 	    /usr/gnu/bin/gs
-@@ -3544,7 +3541,7 @@
- on building Ghostscript with the necessary TIFF driver.
- 
- EOF
--	PATH_PSRIP=/usr/local/bin/gs
-+	PATH_PSRIP=${PREFIX}/bin/gs
- 	PATH_GSRIP=$PATH_PSRIP
-     fi
- }
-@@ -3607,9 +3604,9 @@
-     else
-         DIR_AFMS="
- 	    /usr/lib/afm
--	    /usr/local/lib/afm
--	    /usr/local/share/ghostscript/fonts
--	    /usr/local/lib/ghostscript/fonts
-+	    ${PREFIX}/lib/afm
-+	    ${PREFIX}/share/ghostscript/fonts
-+	    ${PREFIX}/lib/ghostscript/fonts
- 	    /usr/share/ghostscript/fonts
- 	    /usr/gnu/lib/ghostscript/fonts
- 	    /opt/gnu/lib/ghostscript/fonts
-@@ -3629,7 +3626,7 @@
- fi
- if [ -z "$PATH_AFM" ]; then
-     # put it where ghostscript normally puts things
--    PATH_AFM=/usr/local/lib/ghostscript/fonts
-+    PATH_AFM=${PREFIX}/share/ghostscript/fonts
-     Note "WARNING, could not locate a directory with font metric information,"
-     Note "guessing that font metric information goes in $PATH_AFM."
- else
-@@ -3648,6 +3645,7 @@
- #
- if [ -z "$DIR_MAN" ]; then
-     MANPATH="
-+	${PREFIX}/man
- 	$MANPATH
- 	/usr/local/man
- 	/usr/contrib/man
-@@ -3657,7 +3655,7 @@
-     for i in $MANPATH; do
- 	test -d $i && { DIR_MAN=$i; break; }
-     done
--    test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
-+    test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man
- fi
- Note "Looks like manual pages go in $DIR_MAN."
- if [ -z "$MANSCHEME" ]; then
-@@ -4044,7 +4042,8 @@
- 	printConfig
- 	checkForExecutable $PATH_SENDMAIL
- 	checkForExecutable $PATH_GETTY
--	prompt "Are these ok [yes]?"; read ok
-+#	prompt "Are these ok [yes]?"; read ok
-+	ok=yes
- 	test -z "$ok" && ok=yes
- 	case "$ok" in
- 	[1-9]|1[0-6])	promptForParameter $ok;;
+ install: makeDirs makeDevices
+-	${INSTALL} -m 444 -F ${SPOOL} -idb hylafax.sw.server \
++	-${MKDIR} -p -m 755 ${PREFIX}/share/doc/hylafax
++	${INSTALL} -m 444 -F ${PREFIX}/share/doc/hylafax -idb hylafax.sw.server \
+ 	    -src ${SRCDIR}/COPYRIGHT -O COPYRIGHT
+ 	@if [ "@ZLIB@" = yes ]; then \
+ 	    ${ECHO} "= "zlib; cd zlib; ${MAKE} install; \
diff --git a/comms/hylafax/patches/patch-ab b/comms/hylafax/patches/patch-ab
index 4e3aa66c1f2..a466c4b3012 100644
--- a/comms/hylafax/patches/patch-ab
+++ b/comms/hylafax/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- faxd/Getty.c++.orig	Sun Jun 13 09:41:03 1999
-+++ faxd/Getty.c++	Mon Aug  9 21:54:26 1999
-@@ -218,7 +218,7 @@
-     // NB: this is executed in the parent
-     fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
-     Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
--    Sys::chmod(device, 0600);			// reset protection
-+    Sys::chmod(device, 0660);			// reset protection
- }
- 
- extern void vlogError(const char* fmt, va_list ap);
+--- config.h.in.orig	Thu Aug  5 12:11:41 1999
++++ config.h.in
+@@ -53,6 +53,7 @@
+  * NB: The Unix-domain support is unfinished.
+  */
+ #define	FAX_USER	"@FAXUID@"	/* account name of the ``fax user'' */
++#define	FAX_GROUP	"@FAXGID@"	/* group name of the ``fax user'' */
+ #define	FAX_SERVICE	"hylafax"	/* client-server service name */
+ #define	FAX_PROTONAME	"tcp"		/* protocol used by client+server */
+ #define	FAX_DEFPORT	4559		/* port to use if service is unknown */
diff --git a/comms/hylafax/patches/patch-ac b/comms/hylafax/patches/patch-ac
index 12b0fe0a55f..8305c936c15 100644
--- a/comms/hylafax/patches/patch-ac
+++ b/comms/hylafax/patches/patch-ac
@@ -1,27 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
+$NetBSD: patch-ac,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- faxd/UUCPLock.c++.orig	Sat Feb 14 11:49:38 1998
-+++ faxd/UUCPLock.c++	Mon Apr 12 17:53:07 1999
-@@ -37,6 +37,7 @@
- }
- #endif
- #include <pwd.h>
-+#include <grp.h>
+--- config/Makefile.in.orig	Mon Oct 12 21:47:47 1998
++++ config/Makefile.in
+@@ -95,6 +95,7 @@
+ PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
  
- /*
-  * UUCP Device Locking Support.
-@@ -146,8 +147,13 @@
- 	if (!pwd)
- 	    faxApp::fatal("Can not deduce identity of UUCP");
- 	UUCPuid = pwd->pw_uid;
--	UUCPgid = pwd->pw_gid;
- 	endpwent();			// paranoia
-+
-+	const group *grp = getgrnam(FAX_GROUP);
-+	if (!grp)
-+	    faxApp::fatal("Can not deduce group identity of '" FAX_GROUP "'");
-+	UUCPgid = grp->gr_gid;
-+	endgrent();			// paranoia
-     }
- }
- uid_t UUCPLock::getUUCPUid() { setupIDs(); return UUCPuid; }
+ install: default ${CONFIGFILES}
++	-${MKDIR} -p -m 0755 ${PREFIX}/etc/hylafax/modem
+ 	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; \
+ 	done
diff --git a/comms/hylafax/patches/patch-ad b/comms/hylafax/patches/patch-ad
index bc994433325..2ac863e280e 100644
--- a/comms/hylafax/patches/patch-ad
+++ b/comms/hylafax/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- config/skel.orig	Sat Feb 14 11:46:50 1998
-+++ config/skel	Tue Dec 29 12:32:49 1998
+--- config/skel.orig	Sun Jan 10 09:09:38 1999
++++ config/skel
 @@ -41,8 +41,8 @@
  SessionTracing:		11		# log server-related operations
  RecvFileMode:		0600		# recvd facsimile are not public
diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae
index 1dd87d76de0..238dc661e68 100644
--- a/comms/hylafax/patches/patch-ae
+++ b/comms/hylafax/patches/patch-ae
@@ -1,84 +1,188 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-ae,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- util/TypeRules.c++.orig	Sun Jun 13 09:41:26 1999
-+++ util/TypeRules.c++	Tue Aug 10 15:36:51 1999
-@@ -36,6 +36,14 @@
- #include <netinet/in.h>
- }
+--- configure.orig	Mon Jul 26 15:57:29 1999
++++ configure
+@@ -37,21 +37,19 @@
+ #
+ # Setup general configuration parameters.
+ #
+-DIR_BIN=/usr/local/bin
+-DIR_SBIN=/usr/local/sbin
+-DIR_LIBDATA=/usr/local/lib/fax
+-DIR_LIBEXEC=$DIR_SBIN
++DIR_BIN=${PREFIX}/bin
++DIR_SBIN=${PREFIX}/sbin
++DIR_LIBDATA=${PREFIX}/libdata/hylafax
++DIR_LIBEXEC=${PREFIX}/libexec
+ DIR_SPOOL=/var/spool/fax
+-DIR_HTML=/var/httpd/htdocs/hylafax
+-DIR_CGI=/var/httpd/cgi-bin
++DIR_HTML=${PREFIX}/http/htdocs/hylafax
++DIR_CGI=${PREFIX}/http/cgi-bin
+ PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
+-PATH_IMPRIP=/usr/lib/print/psrip
++PATH_IMPRIP=${PREFIX}/lib/print/psrip
+ HTMLPATH=/hylafax
+ CGIPATH=/cgi-bin
+ DEFVRES=98
+ PAGESIZE="North American Letter"
+-FAXUID=uucp
+-FAXGID=
+ SYSUID=bin
+ SYSGID=
+ DSO=auto
+@@ -67,18 +65,18 @@
+ GS=no
+ IMP=no
+ UTMP=auto
+-LIBTIFF="-L/usr/local/lib -ltiff"
+-TIFFINC=/usr/local/include
++LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
++TIFFINC=${PREFIX}/include
+ TIFFBIN=
+-ZLIB=yes
+-LIBZ='-L${DEPTH}/zlib -lz'
+-ZLIBINC='${DEPTH}/${TOPSRCDIR}/zlib'
++ZLIB=no
++LIBZ='-lz'
++ZLIBINC='/usr/include'
+ REGEX=yes
+ LIBREGEX='-L${DEPTH}/regex -lregex'
+ REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
+ DBLIB=no
+-LIBDB="-L/usr/local/lib -ldb"
+-DBLIBINC=/usr/local/include
++LIBDB="-L${PREFIX}/lib -ldb"
++DBLIBINC=${PREFIX}/include
+ CONFIG_OSFCNH=auto
+ 
+ # SVR4 packaging stuff
+@@ -195,6 +193,7 @@
+ PKG_VENDOR
+ PORT
+ PORTFUNCS
++PREFIX
+ PSPACKAGE	PS
+ REGEX
+ RM		RMCMD
+@@ -247,7 +246,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
+-test -d /usr/local/bin && PATH=/usr/local/bin:$PATH	# for GNU stuff
++test -d ${PREFIX}/bin && PATH=${PREFIX}/bin:$PATH	# for packages stuff
+ PATH=$PATH:$OPATH
  
-+#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 @@
+ POSIXLY_CORRECT=1; export POSIXLY_CORRECT		# disable GNU extensions
+@@ -617,6 +616,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" ;;
+@@ -2838,7 +2838,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
+@@ -2865,10 +2865,6 @@
+ 	printf("old include files: version %u\n", TIFFLIB_VERSION);
+         exit(-1);
+     }
+-    if (strncmp(TIFFGetVersion(), "LIBTIFF, Version 3.4", 20) != 0) {
+-	printf("old library: version %s\n", TIFFGetVersion());
+-	exit(-1);
+-    } else
+ 	exit(0);
  }
+ EOF
+@@ -3414,7 +3410,7 @@
+ if [ -z "$PATH_VGETTY" ]; then
+     PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
+     if [ -z "$PATH_VGETTY" ]; then
+-	PATH_VGETTY=/bin/vgetty
++	PATH_VGETTY=${PREFIX}/bin/vgetty
+ 	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."
+@@ -3427,7 +3423,7 @@
+ if [ -z "$PATH_EGETTY" ]; then
+     PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
+     if [ -z "$PATH_EGETTY" ]; then
+-	PATH_EGETTY=/bin/egetty
++	PATH_EGETTY=${PREFIX}/bin/egetty
+ 	Note "WARNING, no egetty program found, using $PATH_EGETTY."
+     else
+ 	Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
+@@ -3497,6 +3493,7 @@
+ {
+     if [ -z "$PATH_GSRIP" ]; then
+ 	GSLOCS="
++	    ${PREFIX}/bin/gs
+ 	    /usr/local/bin/gs
+ 	    /usr/contrib/bin/gs
+ 	    /usr/gnu/bin/gs
+@@ -3544,7 +3541,7 @@
+ on building Ghostscript with the necessary TIFF driver.
  
- 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;
+ EOF
+-	PATH_PSRIP=/usr/local/bin/gs
++	PATH_PSRIP=${PREFIX}/bin/gs
+ 	PATH_GSRIP=$PATH_PSRIP
+     fi
+ }
+@@ -3607,9 +3604,9 @@
+     else
+         DIR_AFMS="
+ 	    /usr/lib/afm
+-	    /usr/local/lib/afm
+-	    /usr/local/share/ghostscript/fonts
+-	    /usr/local/lib/ghostscript/fonts
++	    ${PREFIX}/lib/afm
++	    ${PREFIX}/share/ghostscript/fonts
++	    ${PREFIX}/lib/ghostscript/fonts
+ 	    /usr/share/ghostscript/fonts
+ 	    /usr/gnu/lib/ghostscript/fonts
+ 	    /opt/gnu/lib/ghostscript/fonts
+@@ -3629,7 +3626,7 @@
+ fi
+ if [ -z "$PATH_AFM" ]; then
+     # put it where ghostscript normally puts things
+-    PATH_AFM=/usr/local/lib/ghostscript/fonts
++    PATH_AFM=${PREFIX}/share/ghostscript/fonts
+     Note "WARNING, could not locate a directory with font metric information,"
+     Note "guessing that font metric information goes in $PATH_AFM."
+ else
+@@ -3648,6 +3645,7 @@
+ #
+ if [ -z "$DIR_MAN" ]; then
+     MANPATH="
++	${PREFIX}/man
+ 	$MANPATH
+ 	/usr/local/man
+ 	/usr/contrib/man
+@@ -3657,7 +3655,7 @@
+     for i in $MANPATH; do
+ 	test -d $i && { DIR_MAN=$i; break; }
+     done
+-    test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
++    test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man
+ fi
+ Note "Looks like manual pages go in $DIR_MAN."
+ if [ -z "$MANSCHEME" ]; then
+@@ -4044,7 +4042,8 @@
+ 	printConfig
+ 	checkForExecutable $PATH_SENDMAIL
+ 	checkForExecutable $PATH_GETTY
+-	prompt "Are these ok [yes]?"; read ok
++#	prompt "Are these ok [yes]?"; read ok
++	ok=yes
+ 	test -z "$ok" && ok=yes
+ 	case "$ok" in
+ 	[1-9]|1[0-6])	promptForParameter $ok;;
diff --git a/comms/hylafax/patches/patch-af b/comms/hylafax/patches/patch-af
index 755c8419535..e18785bac8c 100644
--- a/comms/hylafax/patches/patch-af
+++ b/comms/hylafax/patches/patch-af
@@ -1,12 +1,21 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-af,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- util/TypeRules.h.orig	Sun Jun 13 09:41:26 1999
-+++ util/TypeRules.h	Mon Aug  9 21:59:31 1999
-@@ -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
+--- defs.in.orig	Mon Jan  4 09:17:09 1999
++++ defs.in
+@@ -44,6 +44,7 @@
+ # to insufficient; you are better off rerunning the
+ # configure script so that all uses are set correctly.
+ #
++PREFIX		= @PREFIX@
+ SPOOL		= @SPOOL@
+ SBIN		= @SBIN@
+ BIN		= @BIN@
+@@ -255,7 +256,7 @@
+ LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
+ LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
+ 
+-GLDOPTS		= -L/usr/local/lib
++GLDOPTS		= -L${PREFIX}/lib
+ GLDLIBS		= ${SHDLIBC}
+ 
+ #
diff --git a/comms/hylafax/patches/patch-ag b/comms/hylafax/patches/patch-ag
index afc7140de23..f345f80c0fb 100644
--- a/comms/hylafax/patches/patch-ag
+++ b/comms/hylafax/patches/patch-ag
@@ -1,16 +1,24 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-ag,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- util/typerules.orig	Sat Feb 14 11:48:08 1998
-+++ util/typerules	Tue Dec 29 12:32:50 1998
-@@ -128,6 +128,11 @@
- >15     string          ascii		ps	%F/textfmt -B -f Courier-Bold\
- 						    -p 11 -s %s >%o <%i
+--- etc/Makefile.in.orig	Thu Aug  5 12:11:42 1999
++++ etc/Makefile.in
+@@ -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.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
+ 	for i in ${DIALRULES}; do \
+-	    ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
++	    ${PUTSERVER} -F ${PREFIX}/etc/hylafax -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 \
+ 	    -src ${SRCDIR}/lutRS18.pcf -O lutRS18.pcf
+ 
  #
-+# 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-ah b/comms/hylafax/patches/patch-ah
index 5ee51693347..72817a2776e 100644
--- a/comms/hylafax/patches/patch-ah
+++ b/comms/hylafax/patches/patch-ah
@@ -1,12 +1,26 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-ah,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- config.h.in.orig	Sat Feb 14 11:46:29 1998
-+++ config.h.in	Mon Apr 12 17:49:10 1999
-@@ -53,6 +53,7 @@
-  * NB: The Unix-domain support is unfinished.
-  */
- #define	FAX_USER	"@FAXUID@"	/* account name of the ``fax user'' */
-+#define	FAX_GROUP	"@FAXGID@"	/* group name of the ``fax user'' */
- #define	FAX_SERVICE	"hylafax"	/* client-server service name */
- #define	FAX_PROTONAME	"tcp"		/* protocol used by client+server */
- #define	FAX_DEFPORT	4559		/* port to use if service is unknown */
+--- etc/faxaddmodem.sh.in.orig	Thu Jul 15 11:48:43 1999
++++ etc/faxaddmodem.sh.in
+@@ -46,6 +46,7 @@
+ SPOOL=@SPOOL@
+ 
+ SPEED=
++TTY=
+ while [ x"$1" != x"" ] ; do
+     case $1 in
+     -s)	    SPEED=$2; shift;;
+@@ -91,10 +92,11 @@
+ SVR4UULCKN=$LIBEXEC/lockname	# SVR4 UUCP lock name construction program
+ ONDELAY=$LIBEXEC/ondelay	# prgm to open devices blocking on carrier
+ CAT="$CAT -u"			# something to do unbuffered reads and writes
+-FAX=fax				# identity of the fax user
++FAX=@FAXUID@			# identity of the fax user
++FAXGID=@FAXGID@
+ GROUP=/etc/group		# where to go for group entries
+ PROTOGID=$FAXGID		# group who's gid we use for FAX user
+-defPROTOGID=10			# use this gid if PROTOGID doesn't exist
++defPROTOGID=117			# use this gid if PROTOGID doesn't exist
+ MODEMCONFIG=$SPOOL/config	# location of prototype modem config files
+ RMCMD="$RM -f"			# forced removal
+ 
diff --git a/comms/hylafax/patches/patch-ai b/comms/hylafax/patches/patch-ai
index a0bda623e13..c09488d1ce9 100644
--- a/comms/hylafax/patches/patch-ai
+++ b/comms/hylafax/patches/patch-ai
@@ -1,26 +1,80 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-ai,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- etc/faxaddmodem.sh.in.orig	Sat Feb 14 11:47:03 1998
-+++ etc/faxaddmodem.sh.in	Fri Apr 16 00:13:52 1999
-@@ -46,6 +46,7 @@
- SPOOL=@SPOOL@
+--- etc/faxsetup.sh.in.orig	Thu Aug  5 12:11:42 1999
++++ etc/faxsetup.sh.in
+@@ -41,7 +41,9 @@
+ # This script interactively prepares and verifies 
+ # a HylaFAX client and/or server machine for use.
+ #
+-PATH=/bin:/usr/bin:/etc
++PREFIX=@PREFIX@
++#
++PATH=/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
+ test -d /usr/ucb  && PATH=$PATH:/usr/ucb		# Sun and others
+ test -d /usr/bsd  && PATH=$PATH:/usr/bsd		# Silicon Graphics
+ test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc	# Sun and others
+@@ -58,13 +60,14 @@
+ GREP=@GREP@			# grep command for use below
+ LN=@LN@				# ln command for use below
+ LN_S=@LN_S@			# ln option for creating a symbolic link
++MKDIR=@MKDIR@			# directory creation program for use below
+ MKFIFO=@MKFIFO@			# FIFO creation program for use below
+ MV=@MV@				# move file for use below
+ RMCMD=@RM@			# remove file for use below
+ SCRIPT_SH=@SCRIPT_SH@		# shell for use below
+ SED=@SED@			# sed for use below
  
- SPEED=
-+TTY=
- while [ x"$1" != x"" ] ; do
-     case $1 in
-     -s)	    SPEED=$2; shift;;
-@@ -91,10 +92,11 @@
- SVR4UULCKN=$LIBEXEC/lockname	# SVR4 UUCP lock name construction program
- ONDELAY=$LIBEXEC/ondelay	# prgm to open devices blocking on carrier
- CAT="$CAT -u"			# something to do unbuffered reads and writes
 -FAX=fax				# identity of the fax user
 +FAX=@FAXUID@			# identity of the fax user
-+FAXGID=@FAXGID@
- GROUP=/etc/group		# where to go for group entries
- PROTOGID=$FAXGID		# group who's gid we use for FAX user
--defPROTOGID=10			# use this gid if PROTOGID doesn't exist
-+defPROTOGID=117			# use this gid if PROTOGID doesn't exist
- MODEMCONFIG=$SPOOL/config	# location of prototype modem config files
- RMCMD="$RM -f"			# forced removal
+ SERVICES=/etc/services		# location of services database
+ INETDCONF=/usr/etc/inetd.conf	# default location of inetd configuration file
+ ALIASES=/usr/lib/aliases	# default location of mail aliases database file
+@@ -138,6 +141,7 @@
+ LIBEXEC		DIR_LIBEXEC
+ LN
+ MANDIR		DIR_MAN
++MKDIR
+ MKFIFO
+ MV
+ PATH
+@@ -741,6 +745,40 @@
+     bitch "Sorry, but you must run this script as the super-user!"
+     boom
+ fi
++
++createspool()
++{
++    if [ -d "${DIR_SPOOL}" ]; then
++	cat <<EOF
++=================================================================
++
++  @SPOOL@ already exists, probably from a previous run of
++  faxsetup.sh --  I'm not touching it!
++
++  If you encounter problems, deinstall the HylaFax package,
++  remove @SPOOL@ and reinstall the package.
++
++=================================================================
++EOF
++    else
++	${MKDIR} -p -m 0755 ${DIR_SPOOL}
++	${MKFIFO} -m 0600 ${DIR_SPOOL}/FIFO
++	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
++	    ${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
++	${CHOWN} -R ${PROTOUID}:${PROTOGID} ${DIR_SPOOL}
++    fi
++}
++
++Note "Creating spool directory structure"
++
++createspool
  
+ onClient && Note "Checking system for proper client configuration."
+ onServer && Note "Checking system for proper server configuration."
diff --git a/comms/hylafax/patches/patch-aj b/comms/hylafax/patches/patch-aj
index d6d68759dfe..bf294f68400 100644
--- a/comms/hylafax/patches/patch-aj
+++ b/comms/hylafax/patches/patch-aj
@@ -1,80 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-aj,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- etc/faxsetup.sh.in.orig	Sun Jan 10 12:37:07 1999
-+++ etc/faxsetup.sh.in	Mon Aug  9 22:04:50 1999
-@@ -41,7 +41,9 @@
- # This script interactively prepares and verifies 
- # a HylaFAX client and/or server machine for use.
- #
--PATH=/bin:/usr/bin:/etc
-+PREFIX=@PREFIX@
-+#
-+PATH=/bin:/usr/bin:${PREFIX}/bin:${PREFIX}/sbin
- test -d /usr/ucb  && PATH=$PATH:/usr/ucb		# Sun and others
- test -d /usr/bsd  && PATH=$PATH:/usr/bsd		# Silicon Graphics
- test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc	# Sun and others
-@@ -58,13 +60,14 @@
- GREP=@GREP@			# grep command for use below
- LN=@LN@				# ln command for use below
- LN_S=@LN_S@			# ln option for creating a symbolic link
-+MKDIR=@MKDIR@			# directory creation program for use below
- MKFIFO=@MKFIFO@			# FIFO creation program for use below
- MV=@MV@				# move file for use below
- RMCMD=@RM@			# remove file for use below
- SCRIPT_SH=@SCRIPT_SH@		# shell for use below
- SED=@SED@			# sed for use below
+--- faxd/Getty.c++.orig	Sun Jun 13 08:41:03 1999
++++ faxd/Getty.c++
+@@ -218,7 +218,7 @@
+     // NB: this is executed in the parent
+     fxStr device = fxStr::format("%s/" | line, _PATH_DEV);
+     Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
+-    Sys::chmod(device, 0600);			// reset protection
++    Sys::chmod(device, 0660);			// reset protection
+ }
  
--FAX=fax				# identity of the fax user
-+FAX=@FAXUID@			# identity of the fax user
- SERVICES=/etc/services		# location of services database
- INETDCONF=/usr/etc/inetd.conf	# default location of inetd configuration file
- ALIASES=/usr/lib/aliases	# default location of mail aliases database file
-@@ -138,6 +141,7 @@
- LIBEXEC		DIR_LIBEXEC
- LN
- MANDIR		DIR_MAN
-+MKDIR
- MKFIFO
- MV
- PATH
-@@ -741,6 +745,40 @@
-     bitch "Sorry, but you must run this script as the super-user!"
-     boom
- fi
-+
-+createspool()
-+{
-+    if [ -d "${DIR_SPOOL}" ]; then
-+	cat <<EOF
-+=================================================================
-+
-+  @SPOOL@ already exists, probably from a previous run of
-+  faxsetup.sh --  I'm not touching it!
-+
-+  If you encounter problems, deinstall the HylaFax package,
-+  remove @SPOOL@ and reinstall the package.
-+
-+=================================================================
-+EOF
-+    else
-+	${MKDIR} -p -m 0755 ${DIR_SPOOL}
-+	${MKFIFO} -m 0600 ${DIR_SPOOL}/FIFO
-+	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
-+	    ${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
-+	${CHOWN} -R ${PROTOUID}:${PROTOGID} ${DIR_SPOOL}
-+    fi
-+}
-+
-+Note "Creating spool directory structure"
-+
-+createspool
- 
- onClient && Note "Checking system for proper client configuration."
- onServer && Note "Checking system for proper server configuration."
+ extern void vlogError(const char* fmt, va_list ap);
diff --git a/comms/hylafax/patches/patch-ak b/comms/hylafax/patches/patch-ak
index 6e0740bd3fe..bd57abb13a4 100644
--- a/comms/hylafax/patches/patch-ak
+++ b/comms/hylafax/patches/patch-ak
@@ -1,13 +1,27 @@
-$NetBSD: patch-ak,v 1.1.1.1 1999/08/11 06:04:29 rh Exp $
+$NetBSD: patch-ak,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- util/faxcron.sh.in.orig	Tue Jun 29 13:55:07 1999
-+++ util/faxcron.sh.in	Mon Aug  9 22:06:17 1999
-@@ -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
+--- faxd/UUCPLock.c++.orig	Sun Jun 13 08:41:05 1999
++++ faxd/UUCPLock.c++
+@@ -37,6 +37,7 @@
+ }
+ #endif
+ #include <pwd.h>
++#include <grp.h>
+ 
+ /*
+  * UUCP Device Locking Support.
+@@ -146,8 +147,13 @@
+ 	if (!pwd)
+ 	    faxApp::fatal("Can not deduce identity of UUCP");
+ 	UUCPuid = pwd->pw_uid;
+-	UUCPgid = pwd->pw_gid;
+ 	endpwent();			// paranoia
++
++	const group *grp = getgrnam(FAX_GROUP);
++	if (!grp)
++	    faxApp::fatal("Can not deduce group identity of '" FAX_GROUP "'");
++	UUCPgid = grp->gr_gid;
++	endgrent();			// paranoia
+     }
+ }
+ uid_t UUCPLock::getUUCPUid() { setupIDs(); return UUCPuid; }
diff --git a/comms/hylafax/patches/patch-al b/comms/hylafax/patches/patch-al
index 12c7abf6fc9..8de81dd750f 100644
--- a/comms/hylafax/patches/patch-al
+++ b/comms/hylafax/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-al,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- faxd/faxGettyApp.c++.orig	Sat Feb 14 11:49:40 1998
-+++ faxd/faxGettyApp.c++	Mon Apr 12 18:06:51 1999
+--- faxd/faxGettyApp.c++.orig	Sun Jun 13 08:41:05 1999
++++ faxd/faxGettyApp.c++
 @@ -671,7 +671,7 @@
      FaxServer::notifyDocumentRecvd(ri);
  
diff --git a/comms/hylafax/patches/patch-am b/comms/hylafax/patches/patch-am
index acda432a837..537ac6812b7 100644
--- a/comms/hylafax/patches/patch-am
+++ b/comms/hylafax/patches/patch-am
@@ -1,31 +1,75 @@
-$NetBSD: patch-am,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-am,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- hfaxd/User.c++.orig	Sat Feb 14 11:50:15 1998
-+++ hfaxd/User.c++	Mon Apr 12 18:14:53 1999
-@@ -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] == '!')
+--- 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);				\
diff --git a/comms/hylafax/patches/patch-an b/comms/hylafax/patches/patch-an
index 9287a7bf6f0..d9c920bedb4 100644
--- a/comms/hylafax/patches/patch-an
+++ b/comms/hylafax/patches/patch-an
@@ -1,21 +1,31 @@
-$NetBSD: patch-an,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-an,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- defs.in.orig	Mon Jan  4 10:17:09 1999
-+++ defs.in	Tue Aug 10 18:10:07 1999
-@@ -44,6 +44,7 @@
- # to insufficient; you are better off rerunning the
- # configure script so that all uses are set correctly.
- #
-+PREFIX		= @PREFIX@
- SPOOL		= @SPOOL@
- SBIN		= @SBIN@
- BIN		= @BIN@
-@@ -255,7 +256,7 @@
- LDOPTS		= ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
- LDLIBS		= ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
- 
--GLDOPTS		= -L/usr/local/lib
-+GLDOPTS		= -L${PREFIX}/lib
- GLDLIBS		= ${SHDLIBC}
- 
- #
+--- 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-ao b/comms/hylafax/patches/patch-ao
index face546bd4c..e3584f0d0e6 100644
--- a/comms/hylafax/patches/patch-ao
+++ b/comms/hylafax/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-ao,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- util/Makefile.in.orig	Sun Jan 10 10:50:29 1999
-+++ util/Makefile.in	Mon Aug  9 23:09:07 1999
-@@ -150,7 +150,7 @@
+--- 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
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
  PUTSBIN		= ${PUTSERVER} -F ${SBIN}
  
  installClient: default
-@@ -167,6 +167,7 @@
+@@ -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
@@ -19,7 +19,7 @@ $NetBSD: patch-ao,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
  	${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
-@@ -178,9 +179,10 @@
+@@ -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
diff --git a/comms/hylafax/patches/patch-ap b/comms/hylafax/patches/patch-ap
index fe16c605e38..c1db832b070 100644
--- a/comms/hylafax/patches/patch-ap
+++ b/comms/hylafax/patches/patch-ap
@@ -1,24 +1,84 @@
-$NetBSD: patch-ap,v 1.2 1999/08/30 08:16:51 rh Exp $
+$NetBSD: patch-ap,v 1.3 2000/08/29 17:08:38 abs Exp $
 
---- 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.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
- 	for i in ${DIALRULES}; do \
--	    ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
-+	    ${PUTSERVER} -F ${PREFIX}/etc/hylafax -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 \
- 	    -src ${SRCDIR}/lutRS18.pcf -O lutRS18.pcf
+--- 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-aq b/comms/hylafax/patches/patch-aq
index b0af9c35c68..4053d8570c5 100644
--- a/comms/hylafax/patches/patch-aq
+++ b/comms/hylafax/patches/patch-aq
@@ -1,13 +1,12 @@
-$NetBSD: patch-aq,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-aq,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- config/Makefile.in.orig	Sat Feb 14 11:46:36 1998
-+++ config/Makefile.in	Thu Apr 15 21:57:19 1999
-@@ -95,6 +95,7 @@
- PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
- 
- install: default ${CONFIGFILES}
-+	-${MKDIR} -p -m 0755 ${PREFIX}/etc/hylafax/modem
- 	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; \
- 	done
+--- 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
index 02ca8ad788a..1b1108fe9d8 100644
--- a/comms/hylafax/patches/patch-ar
+++ b/comms/hylafax/patches/patch-ar
@@ -1,29 +1,13 @@
-$NetBSD: patch-ar,v 1.1.1.1 1999/08/11 06:04:30 rh Exp $
+$NetBSD: patch-ar,v 1.2 2000/08/29 17:08:38 abs Exp $
 
---- Makefile.in.orig	Sat Feb 14 11:46:32 1998
-+++ Makefile.in	Fri Apr 16 00:03:33 1999
-@@ -247,22 +247,13 @@
- makeServerDirs::
- 	-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
- 	    -idb hylafax.sw.server -dir ${SBIN};
--	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
--	    -idb hylafax.sw.server -dir ${SPOOL}
--	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
--	    -idb hylafax.sw.server -dir \
--	    -F ${SPOOL} bin client config dev etc info log recvq status
--	-${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 700 \
--	    -idb hylafax.sw.server -dir \
--	    -F ${SPOOL} sendq doneq docq tmp pollq archive
- makeDirs: makeClientDirs makeServerDirs
- 
- makeDevices::
--	${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 600 -fifo \
--	    -idb hylafax.sw.server -F ${SPOOL} FIFO
- 
- install: makeDirs makeDevices
--	${INSTALL} -m 444 -F ${SPOOL} -idb hylafax.sw.server \
-+	-${MKDIR} -p -m 755 ${PREFIX}/share/doc/hylafax
-+	${INSTALL} -m 444 -F ${PREFIX}/share/doc/hylafax -idb hylafax.sw.server \
- 	    -src ${SRCDIR}/COPYRIGHT -O COPYRIGHT
- 	@if [ "@ZLIB@" = yes ]; then \
- 	    ${ECHO} "= "zlib; cd zlib; ${MAKE} install; \
+--- 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-as b/comms/hylafax/patches/patch-as
new file mode 100644
index 00000000000..eff40a048c0
--- /dev/null
+++ b/comms/hylafax/patches/patch-as
@@ -0,0 +1,16 @@
+$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\