Index: mail/dma/Makefile
===================================================================
RCS file: /local/shared/mirror/FreeBSD/r/pcvs/ports/mail/dma/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- mail/dma/Makefile	30 Aug 2010 11:22:50 -0000	1.7
+++ mail/dma/Makefile	12 Oct 2010 12:34:38 -0000
@@ -4,18 +4,24 @@
 #
 # $FreeBSD: ports/mail/dma/Makefile,v 1.7 2010/08/30 11:22:50 bapt Exp $
 #
+# 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} ; \
Index: mail/dma/distinfo
===================================================================
RCS file: /local/shared/mirror/FreeBSD/r/pcvs/ports/mail/dma/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- mail/dma/distinfo	11 Aug 2010 09:51:48 -0000	1.3
+++ mail/dma/distinfo	12 Oct 2010 12:16:21 -0000
@@ -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
Index: mail/dma/pkg-descr
===================================================================
RCS file: /local/shared/mirror/FreeBSD/r/pcvs/ports/mail/dma/pkg-descr,v
retrieving revision 1.3
diff -u -p -r1.3 pkg-descr
--- mail/dma/pkg-descr	26 Aug 2009 16:01:34 -0000	1.3
+++ mail/dma/pkg-descr	12 Oct 2010 12:26:56 -0000
@@ -13,4 +13,4 @@ Since dma is not intended as a replaceme
 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
Index: mail/dma/pkg-plist
===================================================================
RCS file: /local/shared/mirror/FreeBSD/r/pcvs/ports/mail/dma/pkg-plist,v
retrieving revision 1.2
diff -u -p -r1.2 pkg-plist
--- mail/dma/pkg-plist	11 Aug 2010 09:51:48 -0000	1.2
+++ mail/dma/pkg-plist	12 Oct 2010 11:52:32 -0000
@@ -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