Update to version 2.0.4.

PR:		ports/79775
Approved by:	maintainer timeout (seanc), linimon

15 files changed, 75 insertions, 30 deletions

diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
index fb5c362f4bb5..a67e4be6ec2a 100644
--- a/mail/dbmail-devel/Makefile
+++ b/mail/dbmail-devel/Makefile
@@ -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 @@ pre-everything::
 	@${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' \
@@ -99,5 +98,4 @@ post-install:
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
 
-
 .include <bsd.port.mk>
diff --git a/mail/dbmail-devel/distinfo b/mail/dbmail-devel/distinfo
index 57adc30d0b26..776ad1c05d7a 100644
--- a/mail/dbmail-devel/distinfo
+++ b/mail/dbmail-devel/distinfo
@@ -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 --git a/mail/dbmail-devel/files/patch-sort.c b/mail/dbmail-devel/files/patch-sort.c
new file mode 100644
index 000000000000..a267163eca11
--- /dev/null
+++ b/mail/dbmail-devel/files/patch-sort.c
@@ -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, 
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index fb5c362f4bb5..a67e4be6ec2a 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -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 @@ pre-everything::
 	@${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' \
@@ -99,5 +98,4 @@ post-install:
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
 
-
 .include <bsd.port.mk>
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 57adc30d0b26..776ad1c05d7a 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -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 --git a/mail/dbmail/files/patch-sort.c b/mail/dbmail/files/patch-sort.c
new file mode 100644
index 000000000000..a267163eca11
--- /dev/null
+++ b/mail/dbmail/files/patch-sort.c
@@ -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, 
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
index fb5c362f4bb5..a67e4be6ec2a 100644
--- a/mail/dbmail20/Makefile
+++ b/mail/dbmail20/Makefile
@@ -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 @@ pre-everything::
 	@${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' \
@@ -99,5 +98,4 @@ post-install:
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
 
-
 .include <bsd.port.mk>
diff --git a/mail/dbmail20/distinfo b/mail/dbmail20/distinfo
index 57adc30d0b26..776ad1c05d7a 100644
--- a/mail/dbmail20/distinfo
+++ b/mail/dbmail20/distinfo
@@ -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 --git a/mail/dbmail20/files/patch-sort.c b/mail/dbmail20/files/patch-sort.c
new file mode 100644
index 000000000000..a267163eca11
--- /dev/null
+++ b/mail/dbmail20/files/patch-sort.c
@@ -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, 
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index fb5c362f4bb5..a67e4be6ec2a 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -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 @@ pre-everything::
 	@${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' \
@@ -99,5 +98,4 @@ post-install:
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
 
-
 .include <bsd.port.mk>
diff --git a/mail/dbmail21/distinfo b/mail/dbmail21/distinfo
index 57adc30d0b26..776ad1c05d7a 100644
--- a/mail/dbmail21/distinfo
+++ b/mail/dbmail21/distinfo
@@ -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 --git a/mail/dbmail21/files/patch-sort.c b/mail/dbmail21/files/patch-sort.c
new file mode 100644
index 000000000000..a267163eca11
--- /dev/null
+++ b/mail/dbmail21/files/patch-sort.c
@@ -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, 
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index fb5c362f4bb5..a67e4be6ec2a 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -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 @@ pre-everything::
 	@${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' \
@@ -99,5 +98,4 @@ post-install:
 	@${ECHO} "	   /etc/rc.conf."
 	@${ECHO} ""
 
-
 .include <bsd.port.mk>
diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo
index 57adc30d0b26..776ad1c05d7a 100644
--- a/mail/dbmail22/distinfo
+++ b/mail/dbmail22/distinfo
@@ -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 --git a/mail/dbmail22/files/patch-sort.c b/mail/dbmail22/files/patch-sort.c
new file mode 100644
index 000000000000..a267163eca11
--- /dev/null
+++ b/mail/dbmail22/files/patch-sort.c
@@ -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,