4 files changed, 270 insertions, 26 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index a49fcbd9de78..bc028a7edb40 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hylafax
-PORTVERSION=	4.1.8
+PORTVERSION=	4.2.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
@@ -35,6 +35,11 @@ CONFIGURE_ARGS=	--with-INSTALL="" \
 CONFIGURE_ARGS+=--with-PAGESIZE="${PAGESIZE}"
 .endif
 
+# Want PAM?
+.if defined(WITHOUT_PAM)
+CONFIGURE_ARGS+=--disable-PAM
+.endif
+
 # Want HTML documentation?
 .if defined(WITH_HTMLDOC)
 CONFIGURE_ARGS+=--with-HTML=yes
@@ -52,18 +57,18 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
 USE_REINPLACE=	yes
 
-MAN1=	hylafax-client.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 \
-	sendfax.1 sendpage.1 sgi2fax.1 textfmt.1 edit-faxcover.1
+MAN1=	edit-faxcover.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 \
+	hylafax-client.1 sendfax.1 sendpage.1 sgi2fax.1 textfmt.1
 
-MAN5=	pagesizes.5f typerules.5f hosts.hfaxd.5f xferfaxlog.5f cid.5f \
-	doneq.5f hylafax-config.5f destctrls.5f dialrules.5f \
-	hylafax-info.5f hylafax-log.5f pagermap.5f recvq.5f sendq.5f \
-	hylafax-server.5f hylafax-shutdown.5f status.5f tsi.5f
+MAN5=	cid.5f destctrls.5f dialrules.5f doneq.5f hosts.hfaxd.5f \
+	hylafax-config.5f hylafax-info.5f hylafax-log.5f hylafax-server.5f \
+	hylafax-shutdown.5f pagermap.5f pagesizes.5f recvq.5f sendq.5f \
+	status.5f tsi.5f typerules.5f xferfaxlog.5f
 
-MAN8=	cqtest.8c choptest.8c dialtest.8c faxabort.8c faxaddmodem.8c \
-	faxadduser.8c faxanswer.8c faxconfig.8c faxdeluser.8c faxmodem.8c \
-	faxstate.8c faxcron.8c faxgetty.8c faxinfo.8c faxlock.8c faxq.8c \
-	faxqclean.8c faxquit.8c faxrcvd.8c faxsend.8c faxsetup.8c \
+MAN8=	choptest.8c cqtest.8c dialtest.8c faxabort.8c faxaddmodem.8c \
+	faxadduser.8c faxanswer.8c faxconfig.8c faxcron.8c faxdeluser.8c \
+	faxgetty.8c faxinfo.8c faxinfo.8c faxlock.8c faxmodem.8c faxq.8c \
+	faxqclean.8c faxquit.8c faxrcvd.8c faxsend.8c faxsetup.8c faxstate.8c \
 	faxwatch.8c hfaxd.8c mkcover.8c notify.8c pagesend.8c pdf2fax.8c \
 	pollrcvd.8c ps2fax.8c recvstats.8c tagtest.8c tiff2fax.8c \
 	tiffcheck.8c tsitest.8c wedged.8c xferfaxstats.8c
@@ -73,10 +78,6 @@ SUID_EXES=	${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Configure fails on FreeBSD >= 5.x"
-.endif
-
 pre-extract:
 	@if [ -d /var/db/pkg/tiff-3.6.1 ]; then \
 		${ECHO_MSG} ""; \
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index fbd402368921..672e85217a58 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,2 +1,2 @@
-MD5 (hylafax/hylafax-4.1.8.tar.gz) = beaf55ad7935e3bcaa53a5ac093f61a8
-SIZE (hylafax/hylafax-4.1.8.tar.gz) = 1285536
+MD5 (hylafax/hylafax-4.2.0.tar.gz) = 463726ed21cfdac730c5d6915e0840cf
+SIZE (hylafax/hylafax-4.2.0.tar.gz) = 1351870
diff --git a/comms/hylafax/files/patch-configure b/comms/hylafax/files/patch-configure
index 59dc20e4d0e7..01c147b44d7d 100644
--- a/comms/hylafax/files/patch-configure
+++ b/comms/hylafax/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon May 24 15:24:35 2004
-+++ configure	Mon May 24 17:44:28 2004
+--- configure.orig	Fri Sep  3 14:08:03 2004
++++ configure	Fri Sep  3 14:14:34 2004
 @@ -43,8 +43,8 @@
  DIR_LIB=/usr/local/lib
  DIR_LIBEXEC=$DIR_SBIN
@@ -24,7 +24,236 @@
  DSO=auto
  GETTY=auto
  HTML=no
-@@ -2604,7 +2604,7 @@
+@@ -384,7 +384,7 @@
+     -srcdir=*|--srcdir=*)	SRCDIR="$ac_optarg";;
+     -target|--target)		ac_prev=TARGET;;
+     -target=*|--target=*)	TARGET="$ac_optarg" ;;
+-	-disable-pam|--disable-pam) DISABLE_PAM="yes" ;;
++    -disable-pam|--disable-pam) DISABLE_PAM="yes" ;;
+     -version|--version)
+ 	echo "This is HylaFAX configure $Revision: 1.102 $"
+ 	exit 0
+@@ -1519,10 +1519,16 @@
+ #
+ CheckForLibrary()
+ {
++    incls=$1; shift
++    vars=$1; shift
+     f=$1; shift
+     libs="$@";
+-    cat>t.c<<EOF
+-int t() { $f(); return 0; }
++    echo "">t.c
++    for i in $incls; do
++	echo "#include "$i>>t.c
++    done
++    cat>>t.c<<EOF
++int t() { $vars $f; return 0; }
+ int main(){ t(); return 0; }
+ EOF
+     capture cat t.c
+@@ -1542,39 +1548,41 @@
+ }
+ 
+ if [ "$SGI2FAX" = auto ]; then
+-    if CheckForLibrary iopen -limage && CheckForIncludeFile gl/image.h; then
++    if CheckForLibrary "<gl/image.h>" "char *a,*b;" "iopen(a,b)" -limage && CheckForIncludeFile gl/image.h; then
+ 	Note "Looks like there is support for SGI RGB images, configuring sgi2fax."
+ 	SGI2FAX=yes
+     else
+ 	SGI2FAX=no
+     fi
+ fi
+-if [ "$LIBMALLOC" = auto ]; then
+-    if CheckForLibrary mallopt -lmalloc; then
+-	Note "Looks like -lmalloc is here, using it for memory allocation."
+-	LIBMALLOC=yes
+-    else
++### FreeBSD have malloc in -lc, which is checked elsewhere.
++#if [ "$LIBMALLOC" = auto ]; then
++#    if CheckForLibrary mallopt -lmalloc; then
++#	Note "Looks like -lmalloc is here, using it for memory allocation."
++#	LIBMALLOC=yes
++#    else
+ 	LIBMALLOC=no
+-    fi
+-fi
+-if [ "$LIBSUN" = auto ]; then
+-    if CheckForLibrary getpwnam -lsun; then
+-	Note "Looks like -lsun is here, using it for NIS passwd & group stuff."
+-	LIBSUN=yes
+-    else
++#    fi
++#fi
++### FreeBSD have getpwnam in -lc, which is checked elsewhere.
++#if [ "$LIBSUN" = auto ]; then
++#    if CheckForLibrary getpwnam -lsun; then
++#	Note "Looks like -lsun is here, using it for NIS passwd & group stuff."
++#	LIBSUN=yes
++#    else
+ 	LIBSUN=no
+-    fi
+-fi
++#    fi
++#fi
+ HAVE_PAM="/*#define HAVE_PAM 1*/"
+ PAMLIBS=""
+ if [ "$DISABLE_PAM" != "yes" ]; then
+ 	Note "Checking for PAM (Pluggable Authentication Module) support"
+-	CheckForLibrary pam_authenticate -lpam &&
+-		CheckForLibrary misc_conv -lpam_misc -lpam &&
++	CheckForLibrary "<sys/types.h> <security/pam_appl.h>" "pam_handle_t *a; int b;" "pam_authenticate(a,b)" -lpam &&
++		CheckForLibrary "<security/pam_misc.h>" "int a; const struct pam_message **b; struct pam_response **c; void *d;" "misc_conv(a,b,c,d)" -lpam &&
+ 		CheckForIncludeFile security/pam_appl.h &&
+ 		CheckForIncludeFile security/pam_misc.h && {
+ 			HAVE_PAM="#define HAVE_PAM 1"
+-			PAMLIBS="-lpam -lpam_misc"
++			PAMLIBS="-lpam"
+ 		}
+ 	if [ "x$PAMLIBS" = "x" ]; then
+ 		Note "... not found. Disabling PAM support"
+@@ -1584,25 +1592,25 @@
+ else
+ 	Note "Disabling PAM support"
+ fi
+-CheckForLibrary crypt -lc || {
++CheckForLibrary "<unistd.h>" "const char *a,*b;" "crypt(a,b)" -lc || {
+     #
+     # FreeBSD-2.1 in particular needs -lcrypt.
+     # SCO sometime has -lcrypt_d (domestic) and
+     #    sometimes -lcrypt_i (import?)
+     #
+     for i in -lcrypt -lcrypt_d -lcrypt_i; do
+-	if CheckForLibrary crypt $i; then
++	if CheckForLibrary "" "" "crypt()" $i; then
+ 	    Note "Looks like $i is needed for crypt."
+ 	    MACHDEPLIBS="$MACHDEPLIBS $i"
+ 	    break;
+ 	fi
+     done
+ }
+-CheckForLibrary strftime -lc || {
++CheckForLibrary "<sys/types.h> <time.h>" "char *a; size_t b; const char *c; const struct tm *d;" "strftime(a,b,c,d)" -lc || {
+     #
+     # SCO has strftime in -lintl.
+     #
+-    if CheckForLibrary strftime -lintl; then
++    if CheckForLibrary "" "" "strftime()" -lintl; then
+ 	Note "Looks like -lintl is needed for strftime."
+ 	MACHDEPLIBS="$MACHDEPLIBS -lintl"
+     else
+@@ -1620,18 +1628,18 @@
+ 	boom
+     fi
+ }
+-CheckForLibrary socket -lc || {
++CheckForLibrary "<sys/types.h> <sys/socket.h>" "int a,b,c;" "socket(a,b,c)" -lc || {
+     #
+     # Socket support is not in normal C library, check
+     # for SVR4-style networking w/ -lsocket & -lnsl
+     #
+-    if CheckForLibrary socket -lsocket -lnsl; then
++    if CheckForLibrary "" "" "socket()" -lsocket -lnsl; then
+ 	Note "Looks like -lsocket & -lnsl are needed for socket support."
+ 	MACHDEPLIBS="$MACHDEPLIBS -lsocket -lnsl"
+-    elif CheckForLibrary socket -linet -lnsl_s; then
++    elif CheckForLibrary "" "" "socket()" -linet -lnsl_s; then
+ 	Note "Looks like -linet & -lnsl_s are needed for socket support."
+ 	MACHDEPLIBS="$MACHDEPLIBS -linet -lnsl_s"
+-    elif CheckForLibrary socket -lsocket; then
++    elif CheckForLibrary "" "" "socket()" -lsocket; then
+ 	Note "Looks like -lsocket is needed for socket support."
+ 	MACHDEPLIBS="$MACHDEPLIBS -lsocket"
+     else
+@@ -1650,39 +1658,43 @@
+ 	boom
+     fi
+ }
+-if CheckForLibrary logwtmp -lutil; then
++if CheckForLibrary "<sys/types.h> <libutil.h>" "const char *a,*b,*c;" "logwtmp(a,b,c)" -lutil; then
+     Note "Looks like -lutil is needed for wtmp file logging."
+     MACHDEPLIBS="$MACHDEPLIBS -lutil"
+     HAS_LOGWTMP=yes
+ else
+     HAS_LOGWTMP=no
+ fi
+-CheckForLibrary ftruncate -lc || {
+-    CheckForLibrary chsize -lx && {
++CheckForLibrary "<unistd.h>" "int a; off_t b;" "ftruncate(a,b)" -lc || {
++    CheckForLibrary "" "" "chsize()" -lx && {
+ 	Note "Looks like -lx is needed for chsize (used to emulate ftruncate)."
+ 	MACHDEPLIBS="$MACHDEPLIBS -lx"
+     }
+ }
+-CheckForLibrary flock -lc || {
+-    CheckForLibrary flock -lbsd && {
++CheckForLibrary "<sys/file.h>" "int a,b;" "flock(a,b)" -lc || {
++    CheckForLibrary "" "" "flock()" -lbsd && {
+ 	Note "Looks like -lbsd is needed for flock."
+ 	MACHDEPLIBS="$MACHDEPLIBS -lbsd"
+     }
+ }
+-for f in openlog pututxline; do
+-    CheckForLibrary $f -lc || {
+-	CheckForLibrary $f -lgen && {
+-	    Note "Looks like -lgen is needed for $f."
+-	    MACHDEPLIBS="$MACHDEPLIBS -lgen"
+-	    break;
+-	}
++CheckForLibrary "<syslog.h> <stdarg.h>" "const char *a; int b,c;" "openlog(a,b,c)" -lc || {
++    CheckForLibrary "" "" "openlog()" -lgen && {
++	Note "Looks like -lgen is needed for openlog."
++	MACHDEPLIBS="$MACHDEPLIBS -lgen"
+     }
+-done
++}
++### FreeBSD do not have pututxline.
++#CheckForLibrary pututxline -lc || {
++#    CheckForLibrary pututxline -lgen && {
++#	Note "Looks like -lgen is needed for pututxline."
++#	MACHDEPLIBS="$MACHDEPLIBS -lgen"
++#    }
++#}
+ if [ "$ISGXX" = yes ]; then
+     if [ -z "$CXXRUNTIME" ]; then
+-	for f in memmove strdup; do
+-	    CheckForLibrary $f -lc || {
+-		CheckForLibrary $f -lg++ && {
++	for f in "memmove(a,b,c)" "strdup(d)"; do
++	    CheckForLibrary "<string.h>" "void *a; const void *b; size_t c; const char *d;" $f -lc || {
++		CheckForLibrary "" "" "$f()" -lg++ && {
+ 		    Note "Looks like we need -lg++ for $f"
+ 		    MACHDEPLIBS="$MACHDEPLIBS -lg++"
+ 		    break;
+@@ -1690,9 +1702,9 @@
+ 	    }
+ 	done
+     fi
+-    for f in strtoul strerror memmove random; do
+-	CheckForLibrary $f -lc || {
+-	    CheckForLibrary $f -liberty && {
++    for f in "strtoul(a,b,c)" "strerror(c)" "memmove(d,e,f)" "random()"; do
++	CheckForLibrary "<stdlib.h> <limits.h> <string.h>" "const char *a; char **b; int c; void *d; const void *e; size_t f;" $f -lc || {
++	    CheckForLibrary "" "" "$f()" -liberty && {
+ 		Note "Looks like we need -liberty for $f"
+ 		MACHDEPLIBS="$MACHDEPLIBS -liberty"
+ 		break;
+@@ -1700,12 +1712,12 @@
+ 	}
+     done
+ fi
+-CheckForLibrary floor -lm && {
++CheckForLibrary "<math.h>" "double a;" "floor(a)" -lm && {
+     Note "Looks like -lm is the library for math functions."
+     MACHDEPLIBS="$MACHDEPLIBS -lm"
+ }
+ MACHDEPLIBS="$MACHDEPLIBS $CXXRUNTIME"
+-test "$LIBSUN" = yes && MACHDEPLIBS="$MACHDEPLIBS -lsun"
++test "$LIBSUN" = yes && MACHDEPLIBS="$MACHDEPLIBS -lc"
+ test "$LIBMALLOC" = yes && MACHDEPLIBS="$MACHDEPLIBS -lmalloc"
+ 
+ #
+@@ -2640,7 +2652,7 @@
      }
      CheckFuncDecl unlink 'extern int unlink(const char*);' unistd.h
      CheckFuncDecl read 'extern int read(int, const void*, unsigned int);' unistd.h
@@ -33,7 +262,16 @@
      CheckForFunc fchown && {
  	echo '#define HAS_FCHOWN 1'
  	Note "... configure use of fchown"
-@@ -4245,18 +4245,8 @@
+@@ -2852,7 +2864,7 @@
+ 	    AddFuncDecl logwtmp \
+ 		'int logwtmp(const char*, const char*, const char*);'
+ 	}
+-	CheckForLibrary logout -lutil && {
++	CheckForLibrary "<sys/types.h> <libutil.h>" "const char *a;" "logout(a)" -lutil && {
+ 	    echo '#define HAS_LOGOUT 1'
+         Note "... configure use of logout (BSD-style utmp support)"
+         CheckForFuncDecl logout utmp.h || {
+@@ -4307,18 +4319,8 @@
  
  HylaFAX configuration parameters (part 1 of 2) are:
  
@@ -52,7 +290,7 @@
  [13] Default page size:                 $PAGESIZE
  [14] Default vertical res (lpi):        $DEFVRES
  
-@@ -4272,16 +4262,9 @@
+@@ -4334,16 +4336,9 @@
  [15] Location of getty program:         $PATH_GETTY
  [16] Location of voice getty program:   $PATH_VGETTY
  [17] Location of sendmail program:      $PATH_SENDMAIL
@@ -72,7 +310,7 @@
  EOF
  }
    
-@@ -4382,7 +4365,7 @@
+@@ -4444,7 +4439,7 @@
      ok=skip
      while [ "$ok" != y ] && [ "$ok" != yes ]; do
  	if [ "$ok" != skip ]; then
@@ -81,7 +319,7 @@
  		promptForParameter $i;
  	    done
  	fi
-@@ -4411,7 +4394,7 @@
+@@ -4473,7 +4468,7 @@
      ok=skip
      while [ "$ok" != y ] && [ "$ok" != yes ]; do
  	if [ "$ok" != skip ]; then
diff --git a/comms/hylafax/pkg-plist b/comms/hylafax/pkg-plist
index 1b8fbd3cfd19..d8f2486967fe 100644
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@@ -128,9 +128,9 @@ sbin/xferfaxstats
 %%PORTDOCS%%share/doc/hylafax/overview.html
 %%PORTDOCS%%share/doc/hylafax/sam.gif
 %%PORTDOCS%%share/doc/hylafax/sam.html
-%%PORTDOCS%%share/doc/hylafax/setup.html
 %%PORTDOCS%%share/doc/hylafax/setup-advanced.html
 %%PORTDOCS%%share/doc/hylafax/setup-client.html
+%%PORTDOCS%%share/doc/hylafax/setup.html
 %%PORTDOCS%%share/doc/hylafax/source.html
 %%PORTDOCS%%share/doc/hylafax/toc.html
 %%PORTDOCS%%share/doc/hylafax/troubleshooting.html
@@ -184,7 +184,7 @@ hylafax/bin/archive
 hylafax/bin/faxrcvd
 hylafax/bin/mkcover
 hylafax/bin/notify
-hylafax/bin/notify.awk
+hylafax/bin/notify-4.1
 @unexec if [ -f %D/hylafax/bin/pdf2fax ]; then rm %D/hylafax/bin/pdf2fax; fi
 hylafax/bin/pdf2fax.gs
 hylafax/bin/pcl2fax
@@ -194,10 +194,13 @@ hylafax/bin/ps2fax.dps
 hylafax/bin/ps2fax.gs
 hylafax/bin/ps2fax.imp
 hylafax/bin/tiff2fax
+hylafax/bin/tiff2pdf
 hylafax/bin/wedged
 @exec mkdir %D/hylafax/client
 @exec chown uucp:dialer %D/hylafax/client
 @exec chmod 0755 %D/hylafax/client
+hylafax/config/agere-mp-2
+hylafax/config/agere-mp-21
 hylafax/config/att-dataport
 hylafax/config/att-dataport-2
 hylafax/config/att-dataport-2.0
@@ -225,6 +228,7 @@ hylafax/config/hayes
 hylafax/config/intel-400e
 hylafax/config/lucent
 hylafax/config/lucent-isa
+hylafax/config/lucent-mt-10
 hylafax/config/lucent-mt-2
 hylafax/config/lucent-mt-20
 hylafax/config/lucent-mt-21
@@ -244,6 +248,7 @@ hylafax/config/rockwell-k56
 hylafax/config/rockwell-rc
 hylafax/config/sierra
 hylafax/config/skel
+hylafax/config/t38modem
 hylafax/config/telebit-qblazer
 hylafax/config/telebit-t3000
 hylafax/config/telebit-wb