svn commit: r398009 - in head/mail/milter-regex: . files

[Dirk Meyer]

Author: dinoex
Date: Sat Sep 26 20:02:17 2015
New Revision: 398009
URL: https://svnweb.freebsd.org/changeset/ports/398009

Log:
  - handle vardir via plist
  PR:		203199
  Submitted by:	Dmitry Marakasov

Modified:
  head/mail/milter-regex/Makefile
  head/mail/milter-regex/files/milterregex.in
  head/mail/milter-regex/pkg-plist

Modified: head/mail/milter-regex/Makefile
==============================================================================
--- head/mail/milter-regex/Makefile	Sat Sep 26 20:00:59 2015	(r398008)
+++ head/mail/milter-regex/Makefile	Sat Sep 26 20:02:17 2015	(r398009)
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter-regex
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -40,5 +40,6 @@ post-patch:
 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>

Modified: head/mail/milter-regex/files/milterregex.in
==============================================================================
--- head/mail/milter-regex/files/milterregex.in	Sat Sep 26 20:00:59 2015	(r398008)
+++ head/mail/milter-regex/files/milterregex.in	Sat Sep 26 20:02:17 2015	(r398009)
@@ -29,17 +29,8 @@ 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}
 }

Modified: head/mail/milter-regex/pkg-plist
==============================================================================
--- head/mail/milter-regex/pkg-plist	Sat Sep 26 20:00:59 2015	(r398008)
+++ head/mail/milter-regex/pkg-plist	Sat Sep 26 20:02:17 2015	(r398009)
@@ -1,3 +1,3 @@
 libexec/milter-regex
 man/man8/milter-regex.8.gz
- at unexec rmdir %%SPOOLDIR%% 2>/dev/null || true
+ at dir(mailnull,mail,750) %%SPOOLDIR%%