- Update to 20091004

- Add license
- Remove the now useless dma.rb

Approved by:	rene@ (mentor vacation)

7 files changed, 27 insertions, 92 deletions

diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index cb350ccd127e..fa42124eea66 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	dma
-PORTVERSION=	20090825
+PORTVERSION=	20091004
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://mirror.roe.ch/dist/dma/
+MASTER_SITES=	http://people.FreeBSD.org/~bapt/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	DragonFly Mail Agent, a small MTA for local/outbound mail
 
-USE_BZIP2=	yes
+LICENSE=	BSD
+
 USE_OPENSSL=	yes
 
 MAN8=		dma.8
@@ -25,21 +26,19 @@ SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/dma,${PREFIX}/etc/dma,g' \
-		${WRKSRC}/libexec/dma/dma.8 \
-		${WRKSRC}/libexec/dma/dma.h
+		${WRKSRC}/dma.8 \
+		${WRKSRC}/dma.h
 	@${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \
-		${WRKSRC}/etc/dma/dma.conf
-	@${REINPLACE_CMD} -e '/^WARNS/d' ${WRKSRC}/libexec/dma/Makefile
+		${WRKSRC}/dma.conf
 
 do-install:
-	${INSTALL} -o root -g mail -m 2555 ${WRKSRC}/libexec/dma/dma ${PREFIX}/libexec
-	${INSTALL_SCRIPT} ${FILESDIR}/dma.rb ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/libexec/dma/dma.8 ${PREFIX}/man/man8/
+	${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
-	${INSTALL_DATA} -m 0644 ${WRKSRC}/etc/dma/${i} ${PREFIX}/etc/dma/${i}.sample
+	${INSTALL_DATA} -m 0644 ${WRKSRC}/${i} ${PREFIX}/etc/dma/${i}.sample
 .endfor
-	${INSTALL} -o root -g mail -m 0640 ${WRKSRC}/etc/dma/auth.conf \
+	${INSTALL} -o root -g mail -m 0640 ${WRKSRC}/auth.conf \
 		${PREFIX}/etc/dma/auth.conf.sample
 .for i in dma.conf virtusertable auth.conf
 	if [ ! -f ${PREFIX}/etc/dma/${i} ]; then \
diff --git a/mail/dma/distinfo b/mail/dma/distinfo
index 4495e817410c..eb8d7c8d77b2 100644
--- a/mail/dma/distinfo
+++ b/mail/dma/distinfo
@@ -1,3 +1,3 @@
-MD5 (dma-20090825.tar.bz2) = d76ef92def1992c836888c8451afce23
-SHA256 (dma-20090825.tar.bz2) = 9fcff7cffd4b5a9ef9413b733f2e3dffebdee00f8a449e7908db480d4302a531
-SIZE (dma-20090825.tar.bz2) = 19992
+MD5 (dma-20091004.tar.gz) = af42146a9a04722f1d4bc2cfd0be64c0
+SHA256 (dma-20091004.tar.gz) = f44e813c524a8ce84a36524a9aa3e484bfc90710128250d1ee83203bacf92d54
+SIZE (dma-20091004.tar.gz) = 26418
diff --git a/mail/dma/files/dma.rb b/mail/dma/files/dma.rb
deleted file mode 100644
index 348626b3b8f5..000000000000
--- a/mail/dma/files/dma.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright (c) 2009 Daniel Roethlisberger <daniel@roe.ch>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice unmodified, this list of conditions, and the following
-#    disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# 
-# $FreeBSD$
-
-# Wrapper around dma(8) which implements the missing -t sendmail option.
-# WARNING: The address parsing is very incomplete and might break.
-
-require 'open3'
-
-dma = $0.gsub(/.rb$/, '')
-
-if ARGV.delete "-t"
-	msg = STDIN.read
-	head, cr, body = msg.split(/\n(\r?)\n/, 2)
-	head = head + "\n"
-	tmphead = head.gsub(/\r?\n\s+/m, ' ')
-	rcpts = []
-	tmphead.gsub(/^(?:to|cc|bcc):\s.*$/i) do |match|
-		match.sub(/^[^:]+:\s*/, '').split(/\s*[,;]\s*/).each do |addr|
-			rcpts << addr.sub(/.*<([^<>]+)>.*/, '\\1')
-		end
-	end
-	head.gsub!(/^bcc:.*\n/i, '')
-	Open3.popen3(dma, *ARGV.concat(rcpts)) do |i,o,e|
-		i.write head
-		i.write "#{cr}\n"
-		i.write body
-		i.close_write
-		print o.read
-		print e.read
-	end
-else
-	exec(dma, *ARGV)
-end
-
diff --git a/mail/dma/files/patch-Makefile b/mail/dma/files/patch-Makefile
deleted file mode 100644
index f0fdffdf85df..000000000000
--- a/mail/dma/files/patch-Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
---- /dev/null	2009-01-17 17:24:56.000000000 +0100
-+++ Makefile	2009-01-17 17:25:04.000000000 +0100
-@@ -0,0 +1,3 @@
-+DISTRIBUTION=portsmaildma
-+SUBDIR=libexec/dma
-+.include <bsd.subdir.mk>
diff --git a/mail/dma/files/patch-dma.c b/mail/dma/files/patch-dma.c
new file mode 100644
index 000000000000..8fdd730cd224
--- /dev/null
+++ b/mail/dma/files/patch-dma.c
@@ -0,0 +1,11 @@
+--- ./dma.c.orig	2010-08-10 17:48:35.000000000 +0200
++++ ./dma.c	2010-08-11 08:02:15.966237154 +0200
+@@ -295,7 +295,7 @@
+ 			exit(1);
+ 		}
+ 		if (gettimeofday(&now, NULL) == 0 &&
+-		    (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
++		    (now.tv_sec - st.st_mtime > MAX_TIMEOUT)) {
+ 			asprintf(__DECONST(void *, &errmsg),
+ 				 "Could not deliver for the last %d seconds. Giving up.",
+ 				 MAX_TIMEOUT);
diff --git a/mail/dma/files/pkg-message.in b/mail/dma/files/pkg-message.in
index 37d7cc6be3b6..84f9ec179a51 100644
--- a/mail/dma/files/pkg-message.in
+++ b/mail/dma/files/pkg-message.in
@@ -5,15 +5,6 @@ referring to another MTA with the following:
 sendmail	%%PREFIX%%/libexec/dma
 send-mail	%%PREFIX%%/libexec/dma
 
-If you need sendmail -t compatibility, e.g. for send-pr(1), you may use the
-ruby wrapper script instead (make sure to install lang/ruby as well):
-
-sendmail	%%PREFIX%%/libexec/dma.rb
-send-mail	%%PREFIX%%/libexec/dma.rb
-
-Note that the ruby wrapper only supports a subset of what is considered valid
-email address syntax by the relevant RFCs.
-
 If you not need sendmail anymore, please add in your rc.conf:
 
 sendmail_enable="NO"
diff --git a/mail/dma/pkg-plist b/mail/dma/pkg-plist
index b20339017cbe..bd293dd35237 100644
--- a/mail/dma/pkg-plist
+++ b/mail/dma/pkg-plist
@@ -1,5 +1,4 @@
 libexec/dma
-libexec/dma.rb
 @unexec if cmp -s %D/etc/dma/dma.conf.sample %D/etc/dma/dma.conf; then rm -f %D/etc/dma/dma.conf; fi
 etc/dma/dma.conf.sample
 @exec if [ ! -f %B/dma.conf ] ; then cp -p %B/%f %B/dma.conf; fi
@@ -11,4 +10,4 @@ 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
-@unexec rmdir /var/spool/dma 2>/dev/null || true
+@dirrmtry /var/spool/dma