3 files changed, 32 insertions, 25 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 65b9eadd330d..2819382ab0dc 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -13,7 +13,7 @@
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -198,7 +198,7 @@ SITE_SUB+=	-e '/-DQUERY_CACHE/s/^dnl //g'
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 LIBDK_PORT=	mail/dk-milter
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
-LIBDK_PATH!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
+LIBDK_PATH_CMD=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
 SITE_SUB+=	-e '\|bld_VERIFY_DOMAINKEYS|s/^dnl //'
 PORTDOCS+=	rfc4870.txt
 .endif
@@ -274,8 +274,8 @@ post-patch:
 
 pre-configure:
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
-	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
-	${CP} ${LIBDK_PATH}/rfc4870.txt ${WRKSRC}/
+	${LN} -s $$(${LIBDK_PATH_CMD})/libdk ${WRKSRC}/
+	${CP} $$(${LIBDK_PATH_CMD})/rfc4870.txt ${WRKSRC}/
 .endif
 
 post-install:
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 9c54e9fa02cc..200546ad1f90 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-2.8.0.tar.gz) = 060ffddd0d8d114d4c482e04337af5a9
-SHA256 (dkim-milter-2.8.0.tar.gz) = 94c16d3b69d7300678d5c44e80803622ae7cee65ffe1084cc64824f3e4593be2
-SIZE (dkim-milter-2.8.0.tar.gz) = 725718
+MD5 (dkim-milter-2.8.1.tar.gz) = a822f7f5eb36f15d1377ca534d5d7edf
+SHA256 (dkim-milter-2.8.1.tar.gz) = adf233574cbc74d4dd8d0614ad3e0d88b8b581e53a281e7c395cacdd5cde2fb4
+SIZE (dkim-milter-2.8.1.tar.gz) = 726239
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index aa24feb301b1..9435e73e92c1 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -30,22 +30,6 @@
 # milterdkim_selector (str):  Selector to use when signing
 # milterdkim_alg (str):       Algorithm to use when signing
 # milterdkim_flags (str):     Flags passed to start command.
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-milterdkim_enable=${milterdkim_enable:-"NO"}
-milterdkim_uid=${milterdkim_uid:-"mailnull"}
-milterdkim_profiles=${milterdkim_profiles:-}
-milterdkim_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"}
-
-milterdkim_socket=${milterdkim_socket:-}
-milterdkim_domain=${milterdkim_domain:-}
-milterdkim_key=${milterdkim_key:-}
-milterdkim_selector=${milterdkim_selector:-}
-milterdkim_alg=${milterdkim_alg:-}
-# Options other than above can be set with $milterdkim_flags.
-# see dkim-milter documentation for detail.
-milterdkim_flags=${milterdkim_flags:-}
 
 . %%RC_SUBR%%
 
@@ -60,6 +44,23 @@ pidfile="${_piddir}/pid"
 
 load_rc_config $name
 
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+: ${milterdkim_enable="NO"}
+: ${milterdkim_uid="mailnull"}
+: ${milterdkim_profiles=""}
+: ${milterdkim_cfgfile="%%PREFIX%%/etc/mail/dkim-filter.conf"}
+
+: ${milterdkim_socket=""}
+: ${milterdkim_domain=""}
+: ${milterdkim_key=""}
+: ${milterdkim_selector=""}
+: ${milterdkim_alg=""}
+# Options other than above can be set with $milterdkim_flags.
+# see dkim-milter documentation for detail.
+:milterdkim_flags=${milterdkim_flags=""}
+
 if [ -n "$2" ]; then
     profile="$2"
     if [ "x${milterdkim_profiles}" != "x" ]; then
@@ -84,6 +85,9 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_socket}" != "x" ];then
 	    _socket_prefix="-p"
 	fi
+	if [ "x${milterdkim_uid}" != "x" ];then
+	    _uid_prefix="-u"
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -96,7 +100,7 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${_socket_prefix} ${milterdkim_socket} ${_uid_prefix} ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     else
 	echo "$0: extra argument ignored"
     fi
@@ -126,6 +130,9 @@ else
 	if [ "x${milterdkim_socket}" != "x" ];then
 	    _socket_prefix="-p"
 	fi
+	if [ "x${milterdkim_uid}" != "x" ];then
+	    _uid_prefix="-u"
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -138,7 +145,7 @@ else
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${_socket_prefix} ${milterdkim_socket} ${_uid_prefix} ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     fi
 fi