Index: head/security/amavisd-milter/Makefile
===================================================================
--- head/security/amavisd-milter/Makefile	(revision 404577)
+++ head/security/amavisd-milter/Makefile	(revision 404578)
@@ -1,69 +1,68 @@
 # Created by: Petr Rehor <rx@rx.cz>
 # $FreeBSD$
 
 PORTNAME=	amavisd-milter
 PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rx@rx.cz
 COMMENT=	Milter for amavisd-new
 
 RUN_DEPENDS=	amavisd:${PORTSDIR}/security/amavisd-new
 
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
 #   WITH_SENDMAIL_BASE=yes
 # or
 #   WITH_SENDMAIL_PORT=yes
 #
 # If unspecified, check for an up-to-date system version but give an
 # installed port preference over it.
 ##
 
 # Shared defaults with security/amavisd-new
 AMAVISUSER?=	vscan
 AMAVISGROUP?=	vscan
 AMAVISDIR?=	/var/amavis
 
 RUNDIR=		/var/run/amavis
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-working-dir=tmp
+CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-working-dir=${AMAVISDIR}/tmp
 USE_RC_SUBR=	${PORTNAME}
 
 SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
 		AMAVISGROUP=${AMAVISGROUP} \
 		AMAVISDIR=${AMAVISDIR} \
 		RUNDIR=${RUNDIR}
 PLIST_SUB=	${SUB_LIST}
 
 PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO
 
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 .if defined(WITH_SENDMAIL_BASE) && !exists(/usr/lib/libmilter.a)
 BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
 .endif
 
 .if defined(WITH_SENDMAIL_PORT)
 CONFIGURE_ARGS+=--with-sendmail=${MILTERBASE}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL} -d -o ${AMAVISUSER} -g ${AMAVISGROUP} -m 755 ${STAGEDIR}${RUNDIR}
-	${INSTALL} -d -o ${AMAVISUSER} -g ${AMAVISGROUP} -m 750 ${STAGEDIR}${RUNDIR}/tmp
 
 .include <bsd.port.post.mk>
Index: head/security/amavisd-milter/files/amavisd-milter.in
===================================================================
--- head/security/amavisd-milter/files/amavisd-milter.in	(revision 404577)
+++ head/security/amavisd-milter/files/amavisd-milter.in	(revision 404578)
@@ -1,43 +1,45 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: amavisd-milter
 # REQUIRE: amavisd
 # BEFORE: mail
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable amavisd-milter:
 #
 # amavisd_milter_enable="YES"
 # amavisd_milter_flags="<set as needed>"
 #
 
 . /etc/rc.subr
 
 name="amavisd_milter"
 rcvar=amavisd_milter_enable
 
 load_rc_config $name
 
 # Set defaults
 : ${amavisd_milter_enable:="NO"}
 : ${amavisd_milter_user="%%AMAVISUSER%%"}
 : ${amavisd_milter_socket:="%%RUNDIR%%/amavisd-milter.sock"}
 : ${amavisd_milter_socket_perm:="0666"}
 : ${amavisd_am_pdp_socket:="%%AMAVISDIR%%/amavisd.sock"}
 
 pidfile="${amavisd_milter_pidfile:-%%RUNDIR%%/amavisd-milter.pid}"
 command="%%PREFIX%%/sbin/amavisd-milter"
 command_args="-p ${pidfile} -s ${amavisd_milter_socket} -S ${amavisd_am_pdp_socket}"
 required_files="%%PREFIX%%/etc/amavisd.conf"
 start_postcmd="amavisd_milter_postcmd"
 
 amavisd_milter_postcmd()
 {
-	chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket}
+	if [ -e ${amavisd_milter_socket} ]; then
+		chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket}
+	fi
 }
 
 run_rc_command "$1"
Index: head/security/amavisd-milter/pkg-plist
===================================================================
--- head/security/amavisd-milter/pkg-plist	(revision 404577)
+++ head/security/amavisd-milter/pkg-plist	(revision 404578)
@@ -1,4 +1,3 @@
 sbin/amavisd-milter
 man/man8/amavisd-milter.8.gz
-@dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,750) %%RUNDIR%%/tmp
 @dir(%%AMAVISUSER%%,%%AMAVISGROUP%%,755) %%RUNDIR%%