- Update port to latest developer version

- Remove now useless patch-spool.c
- add patch-mail.c to fix compilation on 8.1 i386

Note that the dragonflybsd version and gitorious versions are different and the
virtuser file is gone in favour of env MAIL variable.

PR:		ports/151408
Submitted by:	bz@

4 files changed, 16 insertions, 16 deletions

diff --git a/mail/dma/files/patch-aliases_scan.l b/mail/dma/files/patch-aliases_scan.l
index 379c470232d4..d6913f30b0ac 100644
--- a/mail/dma/files/patch-aliases_scan.l
+++ b/mail/dma/files/patch-aliases_scan.l
@@ -1,5 +1,5 @@
---- ./aliases_scan.l.orig	2010-08-10 17:48:35.000000000 +0200
-+++ ./aliases_scan.l	2010-08-11 19:54:44.877687647 +0200
+--- ./aliases_scan.l.orig	2010-10-04 21:03:33.000000000 +0200
++++ ./aliases_scan.l	2010-10-18 13:25:47.330077534 +0200
 @@ -3,8 +3,6 @@
  #include <string.h>
  #include "aliases_parse.h"
diff --git a/mail/dma/files/patch-dma.c b/mail/dma/files/patch-dma.c
index 4bd1cf5461b2..0e31e14ebc50 100644
--- a/mail/dma/files/patch-dma.c
+++ b/mail/dma/files/patch-dma.c
@@ -1,6 +1,6 @@
---- ./dma.c.orig	2010-08-10 17:48:35.000000000 +0200
-+++ ./dma.c	2010-08-11 18:53:37.562144471 +0200
-@@ -295,7 +295,7 @@
+--- ./dma.c.orig	2010-10-04 21:03:33.000000000 +0200
++++ ./dma.c	2010-10-18 13:25:47.331077938 +0200
+@@ -293,7 +293,7 @@
  			exit(1);
  		}
  		if (gettimeofday(&now, NULL) == 0 &&
diff --git a/mail/dma/files/patch-mail.c b/mail/dma/files/patch-mail.c
new file mode 100644
index 000000000000..1c43e7f575fc
--- /dev/null
+++ b/mail/dma/files/patch-mail.c
@@ -0,0 +1,11 @@
+--- ./mail.c.orig	2010-10-04 21:03:33.000000000 +0200
++++ ./mail.c	2010-10-18 13:34:03.222470911 +0200
+@@ -415,7 +415,7 @@
+ 					snprintf(line, sizeof(line), "Message-Id: <%"PRIxMAX".%s.%"PRIxMAX"@%s>\n",
+ 						 (uintmax_t)time(NULL),
+ 						 queue->id,
+-						 random(),
++						 (uintmax_t)random(),
+ 						 hostname());
+ 				} else if (!had_from) {
+ 					had_from = 1;
diff --git a/mail/dma/files/patch-spool.c b/mail/dma/files/patch-spool.c
deleted file mode 100644
index e1342d12e03c..000000000000
--- a/mail/dma/files/patch-spool.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./spool.c.orig	2010-08-10 17:48:35.000000000 +0200
-+++ ./spool.c	2010-08-11 18:59:57.113889734 +0200
-@@ -92,7 +92,7 @@
- 	 */
- 	if (fstat(fd, &st) != 0)
- 		goto fail;
--	if (asprintf(&queue->id, "%"PRIxMAX, st.st_ino) < 0)
-+	if (asprintf(&queue->id, "%"PRIxMAX, (uintmax_t)st.st_ino) < 0)
- 		goto fail;
- 
- 	queue->mailf = fdopen(fd, "r+");