comms/hylafax: update to 4.3.3

	1. Update to hylafax 4.3.3
	2. Enable JBIG send (receive has to wait for an updated graphics/tiff)
	3. Add GHOSTSCRIPT dependency
	4. Make portlint a little happier
	5. Change "cuaa1" to "cuad1" in pkg-message.in (sigh)
	6. Add some @dirrmtry lines to pkg-plist

upgrade of the comms/hylafax from 4.3.3 to 4.3.4

	This is an patch to upgrade Hylafax 4.3.3 to 4.3.4

PR:		ports/111786, ports/112667
Submitted by:	"Eric P. Scott" <eps+pbug0704@ana.com>, Willem Jaap Zwart<W.J.Zwart@NescioLudens.nl>
Approved by:	maintainer timeout, maintainer

4 files changed, 39 insertions, 23 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index c5b4d70d2444..1b7af1aeaacb 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hylafax
-PORTVERSION=	4.3.2
+PORTVERSION=	4.3.4
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
@@ -14,20 +14,18 @@ MAINTAINER=	W.J.Zwart@NescioLudens.nl
 COMMENT=	Fax software
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
-
-# no dependency on ghostscript because we don't know which
-# version the user prefers
 LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
-		jpeg:${PORTSDIR}/graphics/jpeg
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		jbig.1:${PORTSDIR}/graphics/jbigkit
 
-DIST_SUBDIR=	hylafax
+USE_GHOSTSCRIPT=yes
 
 CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg" \
-		--with-ZLIB=no --with-LIBZ=-lz --with-ZLIBINC=none \
+		--with-ZLIB=no --with-LIBZ=-lz \
 		--with-TIFFINC="${LOCALBASE}/include" \
 		--with-GCOPTS=" " --with-GCXXOPTS=" " \
-		--with-REGEX=no --with-LIBREGEX='' --with-REGEXINC=none \
+		--with-REGEX=no --with-LIBREGEX='' --with-REGEXINC=/usr/include \
 		--with-DIR_HTML="${DOCSDIR}"
 
 SUB_FILES=	pkg-message hylafax.sh.sample
@@ -56,7 +54,7 @@ CONFIGURE_ARGS+=--nointeractive
 
 .if defined(WITH_GAWK)
 BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 CONFIGURE_ARGS+=--with-AWK="${LOCALBASE}/bin/gawk"
 .endif
 
@@ -97,6 +95,7 @@ pre-extract:
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,/usr/local,${LOCALBASE},g' \
+		-e 's,-ljbig,-L${LOCALBASE}/lib &,' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's,-O hfaxd.conf,-O hfaxd.conf-dist,' \
 		${WRKSRC}/hfaxd/Makefile.in
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index 1ce0bac6bbd5..b4b6c0241f50 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,3 +1,3 @@
-MD5 (hylafax/hylafax-4.3.2.tar.gz) = 5fd10cf19b2ade2ca823276e732ca377
-SHA256 (hylafax/hylafax-4.3.2.tar.gz) = 7c31f972022e69048e2273836c265b8b55399b907de0db495b01fcb923de0c8e
-SIZE (hylafax/hylafax-4.3.2.tar.gz) = 1521085
+MD5 (hylafax-4.3.4.tar.gz) = 06c9ddd804d5dc278e183fdd2a80ee39
+SHA256 (hylafax-4.3.4.tar.gz) = a41fda7904633ef730a32bca65d5b88e9830443d8d47c74bd5a590625c670a18
+SIZE (hylafax-4.3.4.tar.gz) = 1467634
diff --git a/comms/hylafax/files/pkg-message.in b/comms/hylafax/files/pkg-message.in
index e092d9db4528..6e280b329be2 100644
--- a/comms/hylafax/files/pkg-message.in
+++ b/comms/hylafax/files/pkg-message.in
@@ -5,7 +5,7 @@ Setting up: (for impatients)
 	Invoke %%PREFIX%%/sbin/faxsetup, and answer the questions.
 	Mostly, accepting the defaults should work well.
 
-	When you are asked to specify the name of tty device, use "cuaa1"
+	When you are asked to specify the name of tty device, use "cuad1"
 	instead of "ttyd1".  Otherwise it does not work well.
 
 	Consult %%PREFIX%%/etc/rc.d/hylafax.sh.sample for startups.
@@ -13,7 +13,7 @@ Setting up: (for impatients)
 	For accepting incoming FAX/data calls, modify /etc/ttys as below
 	and send SIGHUP to init process:
 
->cuaa1	"%%PREFIX%%/sbin/faxgetty"	dialup	on secure
+>cuad1	"%%PREFIX%%/sbin/faxgetty"	dialup	on secure
 
 Be sure to rerun %%PREFIX%%/sbin/faxsetup after updating your hylafax version
  
diff --git a/comms/hylafax/pkg-plist b/comms/hylafax/pkg-plist
index 2cff994edad5..accfb968f3c4 100644
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@@ -308,7 +308,7 @@ hylafax/etc/templates/en/notify-no_formatter.txt
 hylafax/etc/templates/en/notify-poll_failed.txt
 hylafax/etc/templates/en/notify-poll_no_document.txt
 hylafax/etc/templates/en/notify-poll_rejected.txt
-hylafax/etc/templates/en/notify-reject.txt
+hylafax/etc/templates/en/notify-rejected.txt
 hylafax/etc/templates/en/notify-removed.txt
 hylafax/etc/templates/en/notify-requeued.txt
 hylafax/etc/templates/en/notify-timedout.txt
@@ -328,7 +328,7 @@ hylafax/etc/templates/fr/notify-no_formatter.txt
 hylafax/etc/templates/fr/notify-poll_failed.txt
 hylafax/etc/templates/fr/notify-poll_no_document.txt
 hylafax/etc/templates/fr/notify-poll_rejected.txt
-hylafax/etc/templates/fr/notify-reject.txt
+hylafax/etc/templates/fr/notify-rejected.txt
 hylafax/etc/templates/fr/notify-removed.txt
 hylafax/etc/templates/fr/notify-requeued.txt
 hylafax/etc/templates/fr/notify-timedout.txt
@@ -348,7 +348,7 @@ hylafax/etc/templates/de/notify-no_formatter.txt
 hylafax/etc/templates/de/notify-poll_failed.txt
 hylafax/etc/templates/de/notify-poll_no_document.txt
 hylafax/etc/templates/de/notify-poll_rejected.txt
-hylafax/etc/templates/de/notify-reject.txt
+hylafax/etc/templates/de/notify-rejected.txt
 hylafax/etc/templates/de/notify-removed.txt
 hylafax/etc/templates/de/notify-requeued.txt
 hylafax/etc/templates/de/notify-timedout.txt
@@ -368,7 +368,7 @@ hylafax/etc/templates/ro/notify-no_formatter.txt
 hylafax/etc/templates/ro/notify-poll_failed.txt
 hylafax/etc/templates/ro/notify-poll_no_document.txt
 hylafax/etc/templates/ro/notify-poll_rejected.txt
-hylafax/etc/templates/ro/notify-reject.txt
+hylafax/etc/templates/ro/notify-rejected.txt
 hylafax/etc/templates/ro/notify-removed.txt
 hylafax/etc/templates/ro/notify-requeued.txt
 hylafax/etc/templates/ro/notify-timedout.txt
@@ -388,7 +388,7 @@ hylafax/etc/templates/pt_BR/notify-no_formatter.txt
 hylafax/etc/templates/pt_BR/notify-poll_failed.txt
 hylafax/etc/templates/pt_BR/notify-poll_no_document.txt
 hylafax/etc/templates/pt_BR/notify-poll_rejected.txt
-hylafax/etc/templates/pt_BR/notify-reject.txt
+hylafax/etc/templates/pt_BR/notify-rejected.txt
 hylafax/etc/templates/pt_BR/notify-removed.txt
 hylafax/etc/templates/pt_BR/notify-requeued.txt
 hylafax/etc/templates/pt_BR/notify-timedout.txt
@@ -408,7 +408,7 @@ hylafax/etc/templates/pt/notify-no_formatter.txt
 hylafax/etc/templates/pt/notify-poll_failed.txt
 hylafax/etc/templates/pt/notify-poll_no_document.txt
 hylafax/etc/templates/pt/notify-poll_rejected.txt
-hylafax/etc/templates/pt/notify-reject.txt
+hylafax/etc/templates/pt/notify-rejected.txt
 hylafax/etc/templates/pt/notify-removed.txt
 hylafax/etc/templates/pt/notify-requeued.txt
 hylafax/etc/templates/pt/notify-timedout.txt
@@ -428,7 +428,7 @@ hylafax/etc/templates/es/notify-no_formatter.txt
 hylafax/etc/templates/es/notify-poll_failed.txt
 hylafax/etc/templates/es/notify-poll_no_document.txt
 hylafax/etc/templates/es/notify-poll_rejected.txt
-hylafax/etc/templates/es/notify-reject.txt
+hylafax/etc/templates/es/notify-rejected.txt
 hylafax/etc/templates/es/notify-removed.txt
 hylafax/etc/templates/es/notify-requeued.txt
 hylafax/etc/templates/es/notify-timedout.txt
@@ -448,7 +448,7 @@ hylafax/etc/templates/it/notify-no_formatter.txt
 hylafax/etc/templates/it/notify-poll_failed.txt
 hylafax/etc/templates/it/notify-poll_no_document.txt
 hylafax/etc/templates/it/notify-poll_rejected.txt
-hylafax/etc/templates/it/notify-reject.txt
+hylafax/etc/templates/it/notify-rejected.txt
 hylafax/etc/templates/it/notify-removed.txt
 hylafax/etc/templates/it/notify-requeued.txt
 hylafax/etc/templates/it/notify-timedout.txt
@@ -468,7 +468,7 @@ hylafax/etc/templates/pl/notify-no_formatter.txt
 hylafax/etc/templates/pl/notify-poll_failed.txt
 hylafax/etc/templates/pl/notify-poll_no_document.txt
 hylafax/etc/templates/pl/notify-poll_rejected.txt
-hylafax/etc/templates/pl/notify-reject.txt
+hylafax/etc/templates/pl/notify-rejected.txt
 hylafax/etc/templates/pl/notify-removed.txt
 hylafax/etc/templates/pl/notify-requeued.txt
 hylafax/etc/templates/pl/notify-timedout.txt
@@ -527,5 +527,22 @@ hylafax/etc/templates/html-sample1/notify-timedout.txt
 @dirrm hylafax/sendq
 @dirrm hylafax/status
 @dirrm hylafax/tmp
+@dirrmtry hylafax/log
+@dirrmtry hylafax/info
+@dirrmtry hylafax/etc/templates/ro
+@dirrmtry hylafax/etc/templates/pt_BR
+@dirrmtry hylafax/etc/templates/pt
+@dirrmtry hylafax/etc/templates/pl
+@dirrmtry hylafax/etc/templates/it
+@dirrmtry hylafax/etc/templates/html-sample1
+@dirrmtry hylafax/etc/templates/fr
+@dirrmtry hylafax/etc/templates/es
+@dirrmtry hylafax/etc/templates/en
+@dirrmtry hylafax/etc/templates/de
+@dirrmtry hylafax/etc/templates
+@dirrmtry hylafax/etc
+@dirrmtry hylafax/doneq
+@dirrmtry hylafax/dev
+@dirrmtry hylafax/archive
 @unexec rmdir %D/hylafax 2>/dev/null || echo "If you are permanently removing this port, you should do a ''rm -rf /var/spool/hylafax'' to remove any binary, configuration and log files left." | fmt
 @unexec echo "-----------------"