ports/79775: Update mail/dbmail to 2.0.4

[Andrew Thompson]

>Number:         79775
>Category:       ports
>Synopsis:       Update mail/dbmail to 2.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 11 03:00:48 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Thompson
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD nhs1.fire.org.nz 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Fri Mar 11 14:05:12 NZDT 2005 thompsa at nhs1.fire.org.nz:/usr/obj/usr/src/sys/NHS1 i386



>Description:

Update dbmail to 2.0.4, no plist changes. Also fix two portlint nits


>How-To-Repeat:
>Fix:


diff -urN mail/dbmail.orig/Makefile mail/dbmail/Makefile
--- mail/dbmail.orig/Makefile	Mon Apr 11 13:34:01 2005
+++ mail/dbmail/Makefile	Mon Apr 11 14:55:20 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTVERSION=	2.0.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/
 PKGNAMESUFFIX=	-${DATABASE}
@@ -63,7 +62,7 @@
 	@${ECHO} ""
 
 post-patch:
-	@${FIND} ${WRKSRC} -name CVS -type d | xargs ${RM} -fr
+	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
 
 post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
@@ -98,6 +97,5 @@
 	@${ECHO} "	   dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in"
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
-
 
 .include <bsd.port.mk>
diff -urN mail/dbmail.orig/distinfo mail/dbmail/distinfo
--- mail/dbmail.orig/distinfo	Mon Apr 11 13:34:01 2005
+++ mail/dbmail/distinfo	Mon Apr 11 13:34:37 2005
@@ -1,2 +1,2 @@
-MD5 (dbmail-2.0.0.tgz) = 936307da839d2e26e9860af6ba67b983
-SIZE (dbmail-2.0.0.tgz) = 530847
+MD5 (dbmail-2.0.4.tgz) = fc80ac11a24286aa78ee71dd78c965a1
+SIZE (dbmail-2.0.4.tgz) = 589603
diff -urN mail/dbmail.orig/files/patch-sort.c mail/dbmail/files/patch-sort.c
--- mail/dbmail.orig/files/patch-sort.c	Thu Jan  1 12:00:00 1970
+++ mail/dbmail/files/patch-sort.c	Mon Apr 11 13:47:50 2005
@@ -0,0 +1,11 @@
+--- sort/sort.c.orig	Tue Mar 15 00:54:00 2005
++++ sort/sort.c	Mon Apr 11 13:46:46 2005
+@@ -58,7 +58,7 @@
+  *
+  * Then do it!
+  * */
+-dsn_class_t sort_and_deliver(u64_t msgidnr,
++sort_result_t sort_and_deliver(u64_t msgidnr,
+ 		const char *header UNUSED, 
+ 		u64_t headersize UNUSED, 
+ 		u64_t totalmsgsize, 
>Release-Note:
>Audit-Trail:
>Unformatted: