- 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@

8 files changed, 32 insertions, 28 deletions

diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index 2561f153ab6d..b6ee330bb34d 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -4,18 +4,24 @@
 #
 # $FreeBSD$
 #
+# Based on git checkout from git://gitorious.org/dma/dma.git rather than
+# from Dragonfly.
+#
 
 PORTNAME=	dma
-PORTVERSION=	20091004
+# commit f54b5114efc65d0e31c7b612bd59cc1b7c8cd8dc
+PORTVERSION=	20101004
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://people.FreeBSD.org/~bapt/
+MASTER_SITES=   LOCAL/bz
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	DragonFly Mail Agent, a small MTA for local/outbound mail
 
+USE_BZIP2=	yes
+USE_OPENSSL=	yes
 LICENSE=	BSD
 
-USE_OPENSSL=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN8=		dma.8
 
@@ -36,17 +42,18 @@ post-patch:
 		${WRKSRC}/dma.h
 	@${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \
 		${WRKSRC}/dma.conf
+	@${MV} ${WRKSRC}/BSDmakefile ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL} -o root -g mail -m 2555 ${WRKSRC}/dma ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/dma.8 ${PREFIX}/man/man8/
 	${MKDIR} ${PREFIX}/etc/dma
-.for i in dma.conf virtusertable
+.for i in dma.conf
 	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${PREFIX}/etc/dma/${i}.sample
 .endfor
 	${INSTALL} -o root -g mail -m 0640 ${WRKSRC}/auth.conf \
 		${PREFIX}/etc/dma/auth.conf.sample
-.for i in dma.conf virtusertable auth.conf
+.for i in dma.conf auth.conf
 	if [ ! -f ${PREFIX}/etc/dma/${i} ]; then \
 		${CP} -p ${PREFIX}/etc/dma/${i}.sample \
 			${PREFIX}/etc/dma/${i} ; \
diff --git a/mail/dma/distinfo b/mail/dma/distinfo
index eb8d7c8d77b2..a5dcc8874eac 100644
--- a/mail/dma/distinfo
+++ b/mail/dma/distinfo
@@ -1,3 +1,3 @@
-MD5 (dma-20091004.tar.gz) = af42146a9a04722f1d4bc2cfd0be64c0
-SHA256 (dma-20091004.tar.gz) = f44e813c524a8ce84a36524a9aa3e484bfc90710128250d1ee83203bacf92d54
-SIZE (dma-20091004.tar.gz) = 26418
+MD5 (dma-20101004.tar.bz2) = 3cb2492af753c245ba2b75936abbf12e
+SHA256 (dma-20101004.tar.bz2) = 32218152690bcb935526194c5f9c9b6475eb4f480e3f95e8ab71a72e27df9c51
+SIZE (dma-20101004.tar.bz2) = 24895
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+");
diff --git a/mail/dma/pkg-descr b/mail/dma/pkg-descr
index 07bad93d905d..2619aece09d0 100644
--- a/mail/dma/pkg-descr
+++ b/mail/dma/pkg-descr
@@ -13,4 +13,4 @@ Since dma is not intended as a replacement for real, big MTAs
 like sendmail(8) or postfix(1), it does not listen on port 25
 for incoming connections.
 
-WWW: http://www.dragonflybsd.org/
+WWW: http://gitorious.org/dma
diff --git a/mail/dma/pkg-plist b/mail/dma/pkg-plist
index bd293dd35237..377e1f4b645a 100644
--- a/mail/dma/pkg-plist
+++ b/mail/dma/pkg-plist
@@ -5,9 +5,6 @@ etc/dma/dma.conf.sample
 @unexec if cmp -s %D/etc/dma/auth.conf.sample %D/etc/dma/auth.conf; then rm -f %D/etc/dma/auth.conf; fi
 etc/dma/auth.conf.sample
 @exec if [ ! -f %B/auth.conf ] ; then cp -p %B/%f %B/auth.conf; fi
-@unexec if cmp -s %D/etc/dma/virtusertable.sample %D/etc/dma/virtusertable; then rm -f %D/etc/dma/virtusertable; fi
-etc/dma/virtusertable.sample
-@exec if [ ! -f %B/virtusertable ] ; then cp -p %B/%f %B/virtusertable; fi
 @dirrmtry etc/dma
 @exec install -d -o root -g mail -m 770 /var/spool/dma
 @dirrmtry /var/spool/dma