ports/111786: comms/hylafax: update to 4.3.3

[Eric P. Scott]

>Number:         111786
>Category:       ports
>Synopsis:       comms/hylafax: update to 4.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 17 19:50:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Eric P. Scott
>Release:        FreeBSD 6.2-RELEASE-p2 i386
>Organization:
ana-systems, Inc.
>Environment:
System: FreeBSD sixofone 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Feb 27 22:41:06 UTC 2007 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
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

Why is there a DIST_SUBDIR?  Can it go away?

Important: I have not tested this to check if it behaves properly
at run time.  Please do so before committing this update.  Thanks!
>How-To-Repeat:
>Fix:
diff -u /usr/ports/comms/hylafax/Makefile comms/hylafax/Makefile
--- /usr/ports/comms/hylafax/Makefile	Wed Feb 21 21:48:47 2007
+++ comms/hylafax/Makefile
@@ -6,28 +6,27 @@
 #
 
 PORTNAME=	hylafax
-PORTVERSION=	4.3.2
+PORTVERSION=	4.3.3
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
+DIST_SUBDIR=	hylafax
 
 MAINTAINER=	W.J.Zwart at 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 +55,7 @@
 
 .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 +96,7 @@
 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 -u /usr/ports/comms/hylafax/distinfo comms/hylafax/distinfo
--- /usr/ports/comms/hylafax/distinfo	Wed Feb 21 21:48:47 2007
+++ comms/hylafax/distinfo	Fri Mar  2 13:10:04 2007
@@ -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/hylafax-4.3.3.tar.gz) = 0eda0ed1eae16bee177d2bcfb3a052da
+SHA256 (hylafax/hylafax-4.3.3.tar.gz) = d9e06e36604b937cceebca8ae9133502dfcf742574b9a32c8863723d336844f3
+SIZE (hylafax/hylafax-4.3.3.tar.gz) = 1520317
Common subdirectories: /usr/ports/comms/hylafax/files and comms/hylafax/files
diff -u /usr/ports/comms/hylafax/pkg-plist comms/hylafax/pkg-plist
--- /usr/ports/comms/hylafax/pkg-plist	Wed Feb 21 21:48:47 2007
+++ comms/hylafax/pkg-plist
@@ -308,7 +308,7 @@
 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-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-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-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-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-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-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-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-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 @@
 @dirrm hylafax/sendq
 @dirrm hylafax/status
 @dirrm hylafax/tmp
+ at dirrmtry hylafax/log
+ at dirrmtry hylafax/info
+ at dirrmtry hylafax/etc/templates/ro
+ at dirrmtry hylafax/etc/templates/pt_BR
+ at dirrmtry hylafax/etc/templates/pt
+ at dirrmtry hylafax/etc/templates/pl
+ at dirrmtry hylafax/etc/templates/it
+ at dirrmtry hylafax/etc/templates/html-sample1
+ at dirrmtry hylafax/etc/templates/fr
+ at dirrmtry hylafax/etc/templates/es
+ at dirrmtry hylafax/etc/templates/en
+ at dirrmtry hylafax/etc/templates/de
+ at dirrmtry hylafax/etc/templates
+ at dirrmtry hylafax/etc
+ at dirrmtry hylafax/doneq
+ at dirrmtry hylafax/dev
+ at 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 "-----------------"
>Release-Note:
>Audit-Trail:
>Unformatted: