From owner-svn-ports-all@FreeBSD.ORG Wed Apr 9 12:29:23 2014 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 16F421A8; Wed, 9 Apr 2014 12:29:23 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 04B8810E0; Wed, 9 Apr 2014 12:29:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39CTMVY020194; Wed, 9 Apr 2014 12:29:22 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39CTMUt020193; Wed, 9 Apr 2014 12:29:22 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201404091229.s39CTMUt020193@svn.freebsd.org> From: Dirk Meyer Date: Wed, 9 Apr 2014 12:29:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350686 - head/mail/milter-greylist 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.17 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, 09 Apr 2014 12:29:23 -0000 Author: dinoex Date: Wed Apr 9 12:29:22 2014 New Revision: 350686 URL: http://svnweb.freebsd.org/changeset/ports/350686 QAT: https://qat.redports.org/buildarchive/r350686/ Log: - use STAGEDIR - update LICENSE - undo silent install - robust INSTALL PR: 188069 Modified: head/mail/milter-greylist/Makefile Modified: head/mail/milter-greylist/Makefile ============================================================================== --- head/mail/milter-greylist/Makefile Wed Apr 9 12:29:08 2014 (r350685) +++ head/mail/milter-greylist/Makefile Wed Apr 9 12:29:22 2014 (r350686) @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= m.tsatsenko@gmail.com COMMENT= Easy-to-use greylist milter for sendmail and postfix -LICENSE= BSD +LICENSE= BSD3CLAUSE CONFLICTS= milter-greylist-devel-[1-9]*.* PKGMESSAGE= ${WRKDIR}/pkg-message @@ -19,7 +19,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_JOBS_UNSAFE= yes ## -NO_STAGE= yes # Use the following quirks to choose which sendmail to use (ports or system): # # WITH_SENDMAIL_BASE=yes @@ -40,8 +39,8 @@ POSTFIX_DESC= Use Postfix instead of Se .include .if ${PORT_OPTIONS:MMANPAGES} -MAN5= greylist.conf.5 -MAN8= milter-greylist.8 +PLIST_FILES+= man/man5/greylist.conf.5.gz \ + man/man8/milter-greylist.8.gz .endif .if ${PORT_OPTIONS:MSPF} BUILD_DEPENDS+= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2 @@ -86,41 +85,24 @@ SUB_FILES+= pkg-message USE_RC_SUBR= milter-greylist do-install: - @${MKDIR} ${PREFIX}/etc/mail + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail .if ${PORT_OPTIONS:MMANPAGES} - @${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5 - @${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${STAGEDIR}${PREFIX}/man/man5/ + ${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${STAGEDIR}${PREFIX}/man/man8/ .endif - @${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec - @${INSTALL_DATA} ${WRKSRC}/greylist.conf \ - ${PREFIX}/etc/mail/greylist.conf.sample + ${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${STAGEDIR}${PREFIX}/libexec/ + ${INSTALL_DATA} ${WRKSRC}/greylist.conf \ + ${STAGEDIR}${PREFIX}/etc/mail/greylist.conf.sample post-install: - @${MKDIR} /var/milter-greylist - @${CHOWN} -R mailnull:mailnull /var/milter-greylist .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/greylist.conf ${STAGEDIR}${EXAMPLESDIR}/ .endif - @${TEST} -f /var/db/milter-greylist/greylist.db && ( \ - ${ECHO} "************************************************************"; \ - ${ECHO} "************************************************************"; \ - ${ECHO} "** **"; \ - ${ECHO} "** WARNING **"; \ - ${ECHO} "** **"; \ - ${ECHO} "** The default dump file location has changed. **"; \ - ${ECHO} "** Please move greylist.db from /var/db/milter-greylist/ **"; \ - ${ECHO} "** to /var/milter-greylist/ and update your greylist.conf **"; \ - ${ECHO} "** accordingly. **"; \ - ${ECHO} "** **"; \ - ${ECHO} "************************************************************"; \ - ${ECHO} "************************************************************"; \ - ) || ${TRUE} - @${CAT} ${PKGMESSAGE} .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"