From owner-svn-ports-all@FreeBSD.ORG Wed Nov 13 06:31:01 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4CCA915; Wed, 13 Nov 2013 06:31:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8AD7E278A; Wed, 13 Nov 2013 06:31:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAD6V1bR098224; Wed, 13 Nov 2013 06:31:01 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAD6V1Om098218; Wed, 13 Nov 2013 06:31:01 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201311130631.rAD6V1Om098218@svn.freebsd.org> From: Dirk Meyer Date: Wed, 13 Nov 2013 06:31:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333653 - in head/mail/milter-regex: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2013 06:31:01 -0000 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 @@ -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 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 @@ -@exec mkdir -m 700 -p /var/run/milter-regex -@exec chown mailnull:daemon /var/run/milter-regex @cwd / -@dirrmtry /var/run/milter-regex +@dirrmtry %%SPOOLDIR%% @cwd