5 files changed, 25 insertions, 21 deletions
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index dff8002f72be..f1b7f07be914 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.11
+PORTVERSION=	2.12
 CATEGORIES=	mail
 MASTER_SITES=	http://www.roaringpenguin.com/mimedefang/
 
@@ -33,7 +33,7 @@ IGNORE=	"requires libmilter installed in the base system, upgrade your FreeBSD"
 .endif
 
 post-install:
-	${INSTALL} -m 755 ${FILESDIR}/mimedefang.sh ${PREFIX}/etc/rc.d/mimedefang.sh
+	${INSTALL_SCRIPT} ${FILESDIR}/mimedefang.sh ${PREFIX}/etc/rc.d/mimedefang.sh
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 	${MKDIR} ${DOCSDIR}
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index af6bd1b44c9f..a609bd919abb 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1 +1 @@
-MD5 (mimedefang-2.11.tar.gz) = 1b4b37bcf536336ef6cbebd2f631f327
+MD5 (mimedefang-2.12.tar.gz) = 91c717239324d18583fd2f23bd2b3be6
diff --git a/mail/mimedefang/files/mimedefang.sh b/mail/mimedefang/files/mimedefang.sh
index 103883e992bf..28da4fa709b6 100644
--- a/mail/mimedefang/files/mimedefang.sh
+++ b/mail/mimedefang/files/mimedefang.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	initialization/shutdown script for DrWeb daemon and DrWeb mail filter
+#	initialization/shutdown script for MIMEDefang mail filter
 
 if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
     echo "$0: Cannot determine the PREFIX" >&2
@@ -30,14 +30,13 @@ MIMEDEFANG=${PREFIX}/bin/mimedefang
 MULTIPLEX=${PREFIX}/bin/mimedefang-multiplexor
 
 # MIMEDefang socket
-SOCK=${SPOOLDIR}/mimedefang.sock
-
+SOCK=/var/run/mimedefang.sock
 # MIMEDefang-multiplexor socket
-MXSOCK=${SPOOLDIR}/mdefang-mx.sock
-
+MXSOCK=/var/run/mdefang-mx.sock
 # PID file location
-PIDFILE=${SPOOLDIR}/mimedefang.pid
-
+PIDFILE=/var/run/mimedefang.pid
+# Multiplexor PID file location
+MXPIDFILE=/var/run/mdefang-mx.pid
 # MIMEDefang owner
 USER=mailnull
 
@@ -47,16 +46,15 @@ USER=mailnull
 # See how we were called.
 case "$1" in
   start)
-	# Clean spool directory
-	su -m ${USER} -c "rm -f ${PIDFILE} ${SOCK} ${MXSOCK}"
-	# Start daemons.
+	# Remove socket if it exists
+	rm -f ${SOCK}
 	# Start multiplexor
-	su -m ${USER} -c "$MULTIPLEX -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT -i $IDLE_TIMEOUT $DO_LOGGING $STATS_LOG $FLUSH_STATS -s ${MXSOCK}"
+	$MULTIPLEX -U ${USER} -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT -i $IDLE_TIMEOUT $DO_LOGGING $STATS_LOG $FLUSH_STATS -s ${MXSOCK} -p ${MXPIDFILE}
 	RETVAL=$?
 	[ $RETVAL -ne 0 ] && exit 1
 	echo -n " mimedefang-multiplexor"
 
-	su -m ${USER} -c "$MIMEDEFANG -m ${MXSOCK} -p ${SOCK} -P ${PIDFILE}"
+	$MIMEDEFANG -U ${USER} -m ${MXSOCK} -p ${SOCK} -P ${PIDFILE}
 	RETVAL=$?
 	[ $RETVAL -ne 0 ] && exit 1
 	echo -n " mimedefang"
@@ -65,8 +63,7 @@ case "$1" in
 	# Stop daemons.
 	kill `cat ${PIDFILE}`
 	echo -n " mimedefang"
-	kill `ps ax | grep mimedefang-multiplexor | grep -v grep | grep -v sh | awk '{print $1}'`
-	su -m ${USER} -c "rm -f ${PIDFILE} ${SOCK} ${MXSOCK}"
+	kill `cat ${MXPIDFILE}`
 	echo -n " mimedefang-multiplexor"
 	;;
 	restart)
diff --git a/mail/mimedefang/pkg-message b/mail/mimedefang/pkg-message
index 993054a25884..323e13f70bc4 100644
--- a/mail/mimedefang/pkg-message
+++ b/mail/mimedefang/pkg-message
@@ -1,5 +1,11 @@
-To finish installation please reconfigure sendmail to use
- MIMEDefang filter, for example add this lines to your sendmail.mc
+To finish installation please follow these steps:
 
- MAIL_FILTER(`mimedefang', `S=local:/var/spool/MIMEDefang/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl
- define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl
+1. Edit /etc/mail/mimedefang-filter
+
+2. Reconfigure sendmail to use MIMEDefang, for example add this lines to
+   your sendmail.mc:
+
+   MAIL_FILTER(`mimedefang', `S=local:/var/run/mimedefang.sock, F=T, T=C:15m;S:4m;R:4m;E:10m')dnl
+   define(`confINPUT_MAIL_FILTERS', `mimedefang')dnl
+
+   rebuild sendmail.cf and install it.
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index 19a1d0b10e5c..248e7e5f931a 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -5,6 +5,7 @@ etc/rc.d/mimedefang.sh
 %%PORTDOCS%%share/doc/mimedefang/README
 %%PORTDOCS%%share/doc/mimedefang/README.ANOMY
 %%PORTDOCS%%share/doc/mimedefang/README.SPAMASSASSIN
+%%PORTDOCS%%share/doc/mimedefang/README.NONROOT
 %%PORTDOCS%%share/examples/mimedefang/suggested-minimum-filter-for-windows-clients
 %%PORTDOCS%%share/examples/mimedefang/README
 %%PORTDOCS%%share/examples/mimedefang/redhat-logrotate-file