Index: head/mail/milter-regex/Makefile
===================================================================
--- head/mail/milter-regex/Makefile	(revision 398008)
+++ head/mail/milter-regex/Makefile	(revision 398009)
@@ -1,44 +1,45 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	milter-regex
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Milter plugin to sendmail for regular expression filtering
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${FILESDIR}/COPYRIGHT
 
 USE_RC_SUBR=	milterregex
 SUB_LIST=	SPOOLDIR=${SPOOLDIR}
 PLIST_SUB=	SPOOLDIR=${SPOOLDIR}
 
 MAILUSER?=	mailnull
 SPOOLDIR?=	/var/run/milter-regex
 
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 post-patch:
 	${REINPLACE_CMD} -e \
 	    "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \
 	    s:/var/spool/milter-regex:${SPOOLDIR}:g; \
 	    s:_milter-regex:${MAILUSER}:g;" ${WRKSRC}/milter-regex.c
 	${REINPLACE_CMD} -e \
 	    "s:/etc/milter-regex.conf:${PREFIX}/etc/milter-regex.conf:g; \
 	    s:/var/spool/milter-regex:${SPOOLDIR}:g; \
 	    s:mailstats 1:mailstats 8:;" ${WRKSRC}/milter-regex.8
 	${REINPLACE_CMD} -e "s:-I/usr/src/gnu/usr.sbin/sendmail/include::g; \
 	    s:-L/usr/local/lib:-L${LOCALBASE}/lib:g; \
 	    s/-Werror//g"  ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${STAGEDIR}${PREFIX}/man/man8/
+	${MKDIR} ${STAGEDIR}${SPOOLDIR}
 
 .include <bsd.port.post.mk>
Index: head/mail/milter-regex/files/milterregex.in
===================================================================
--- head/mail/milter-regex/files/milterregex.in	(revision 398008)
+++ head/mail/milter-regex/files/milterregex.in	(revision 398009)
@@ -1,48 +1,39 @@
 #!/bin/sh
 
 # $FreeBSD$
 
 # Start or stop milterregex
 
 # PROVIDE: milterregex
 # REQUIRE: DAEMON
 # BEFORE: mail
 # KEYWORD: shutdown
 
 spooldir=%%SPOOLDIR%%
 
 # Define these milterregex_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local
 #	/etc/rc.conf.d/milterregex
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 # milterregex_flags Flags to milter-regex program
 
 [ -z "$milterregex_enable" ] && milterregex_enable="NO"	# Enable milter-regex
 
 . /etc/rc.subr
 
 name="milterregex"
 rcvar="milterregex_enable"
 command="%%PREFIX%%/libexec/milter-regex"
 pidfile="${spooldir}/milter-regex.pid"
 required_files="%%PREFIX%%/etc/milter-regex.conf"
-start_precmd="milterregex_prestart"
 stop_postcmd="milterregex_poststop"
-
-milterregex_prestart() {
-	if test ! -d "${spooldir}"
-	then
-		mkdir -m 750 -p "${spooldir}"
-		chown mailnull:mail "${spooldir}"
-	fi
-}
 
 milterregex_poststop() {
 	/bin/rm -f ${pidfile}
 }
 
 load_rc_config $name
 run_rc_command "$1"
Index: head/mail/milter-regex/pkg-plist
===================================================================
--- head/mail/milter-regex/pkg-plist	(revision 398008)
+++ head/mail/milter-regex/pkg-plist	(revision 398009)
@@ -1,3 +1,3 @@
 libexec/milter-regex
 man/man8/milter-regex.8.gz
-@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true
+@dir(mailnull,mail,750) %%SPOOLDIR%%