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

[Dirk Meyer]

Author: dinoex
Date: Wed Nov 13 06:31:00 2013
New Revision: 333653
URL: http://svnweb.freebsd.org/changeset/ports/333653

Log:
  - use STAGEDIR

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	Wed Nov 13 06:09:26 2013	(r333652)
+++ head/mail/milter-regex/Makefile	Wed Nov 13 06:31:00 2013	(r333653)
@@ -12,14 +12,13 @@ COMMENT=	Milter plugin to sendmail for r
 LICENSE=	BSD
 LICENSE_FILE=	${FILESDIR}/COPYRIGHT
 
-NO_STAGE=	yes
+USE_RC_SUBR=	milterregex
+SUB_LIST=	SPOOLDIR=${SPOOLDIR}
+PLIST_SUB=	SPOOLDIR=${SPOOLDIR}
+PLIST_FILES=	libexec/milter-regex man/man8/milter-regex.8.gz
 
 MAILUSER?=	mailnull
-MAN8=		milter-regex.8
-PLIST_FILES=	libexec/milter-regex
-USE_RC_SUBR=	milterregex
 SPOOLDIR?=	/var/run/milter-regex
-SUB_LIST=	SPOOLDIR=${SPOOLDIR}
 
 .include <bsd.port.pre.mk>
 
@@ -40,11 +39,7 @@ post-patch:
 	    s/-Werror//g"  ${WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${PREFIX}/libexec
-	@${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${PREFIX}/man/man8
-	@${INSTALL} -d -o ${MAILUSER} -g daemon -m 0700 ${SPOOLDIR}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${STAGEDIR}${PREFIX}/libexec/
+	${INSTALL_MAN} ${WRKSRC}/milter-regex.8 ${STAGEDIR}${MANPREFIX}/man/man8/
 
 .include <bsd.port.post.mk>

Modified: head/mail/milter-regex/files/milterregex.in
==============================================================================
--- head/mail/milter-regex/files/milterregex.in	Wed Nov 13 06:09:26 2013	(r333652)
+++ head/mail/milter-regex/files/milterregex.in	Wed Nov 13 06:31:00 2013	(r333653)
@@ -29,8 +29,17 @@ 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 700 -p "${spooldir}"
+		chown mailnull:daemon "${spooldir}"
+	fi
+}
+
 milterregex_poststop() {
 	/bin/rm -f ${pidfile}
 }

Modified: head/mail/milter-regex/pkg-plist
==============================================================================
--- head/mail/milter-regex/pkg-plist	Wed Nov 13 06:09:26 2013	(r333652)
+++ head/mail/milter-regex/pkg-plist	Wed Nov 13 06:31:00 2013	(r333653)
@@ -1,5 +1,3 @@
- at exec mkdir -m 700 -p /var/run/milter-regex
- at exec chown mailnull:daemon /var/run/milter-regex
 @cwd /
- at dirrmtry /var/run/milter-regex
+ at dirrmtry %%SPOOLDIR%%
 @cwd