Index: head/mail/dma/Makefile
===================================================================
--- head/mail/dma/Makefile	(revision 228225)
+++ head/mail/dma/Makefile	(revision 228226)
@@ -1,55 +1,56 @@
 # New ports collection makefile for:	dma
 # Date created:				2009-01-17
 # Whom:					Daniel Roethlisberger <daniel@roe.ch>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dma
 PORTVERSION=	20090208
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://mirror.roe.ch/dist/dma/
 
 MAINTAINER=	daniel@roe.ch
 COMMENT=	DragonFly Mail Agent, a small MTA for local/outbound mail
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 
 MAN8=		dma.8
 
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 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
 	@${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \
 		${WRKSRC}/etc/dma/dma.conf
 	@${REINPLACE_CMD} -e '/^WARNS/d' ${WRKSRC}/libexec/dma/Makefile
 
 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/
 	${MKDIR} ${PREFIX}/etc/dma
 .for i in dma.conf virtusertable
 	${INSTALL_DATA} -m 0644 ${WRKSRC}/etc/dma/${i} ${PREFIX}/etc/dma/${i}.sample
 .endfor
 	${INSTALL} -o root -g mail -m 0640 ${WRKSRC}/etc/dma/auth.conf \
 		${PREFIX}/etc/dma/auth.conf.sample
 .for i in dma.conf virtusertable auth.conf
 	if [ ! -f ${PREFIX}/etc/dma/${i} ]; then \
 		${CP} -p ${PREFIX}/etc/dma/${i}.sample \
 			${PREFIX}/etc/dma/${i} ; \
 	fi
 .endfor
 	${INSTALL} -d -o root -g mail -m 770 /var/spool/dma
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/mail/dma/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/mail/dma/files/dma.rb
===================================================================
--- head/mail/dma/files/dma.rb	(revision 228225)
+++ head/mail/dma/files/dma.rb	(revision 228226)
@@ -1,58 +1,59 @@
 #!/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, cr, body = msg.split(/\n(\r?)\n/, 2)
+	head = head + "\n"
 	tmphead = head.gsub(/\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
 

Property changes on: head/mail/dma/files/dma.rb
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property