Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.51
diff -p -u -r1.51 Makefile
--- Makefile	27 Jul 2008 20:16:34 -0000	1.51
+++ Makefile	28 Jul 2008 13:11:41 -0000
@@ -14,6 +14,7 @@
 
 PORTNAME=	dkim-milter
 PORTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
cvs diff: Diffing files
Index: files/milter-dkim.sh.in
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/milter-dkim.sh.in,v
retrieving revision 1.13
diff -p -u -r1.13 milter-dkim.sh.in
--- files/milter-dkim.sh.in	27 Jul 2008 20:16:35 -0000	1.13
+++ files/milter-dkim.sh.in	28 Jul 2008 13:11:41 -0000
@@ -82,7 +82,7 @@ if [ -n "$2" ]; then
 	    milterdkim_cfgfile=""
 	fi
 	if [ "x${milterdkim_socket}" != "x" ];then
-	    milterdkim_socket="-p ${milterdkim_socket}"
+	    _socket_prefix="-p"
 	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
@@ -96,7 +96,7 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     else
 	echo "$0: extra argument ignored"
     fi
@@ -124,7 +124,7 @@ else
 	    milterdkim_cfgfile=""
 	fi
 	if [ "x${milterdkim_socket}" != "x" ];then
-	    milterdkim_socket="-p ${milterdkim_socket}"
+	    _socket_prefix="-p"
 	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
@@ -138,7 +138,7 @@ else
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     fi
 fi