From owner-svn-ports-all@FreeBSD.ORG Wed Aug 6 15:20:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6EF28DCA for ; Wed, 6 Aug 2014 15:20:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31E982935 for ; Wed, 6 Aug 2014 15:20:08 +0000 (UTC) Received: from marino (uid 1323) (envelope-from marino@FreeBSD.org) id 56b9 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 15:20:07 +0000 From: John Marino Date: Wed, 6 Aug 2014 15:20:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364191 - head/mail/postgrey X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e247a8.56b9.5694723b@svn.freebsd.org> X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 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, 06 Aug 2014 15:20:08 -0000 Author: marino Date: Wed Aug 6 15:20:07 2014 New Revision: 364191 URL: http://svnweb.freebsd.org/changeset/ports/364191 QAT: https://qat.redports.org/buildarchive/r364191/ Log: Stage mail/postgrey PR: 190082 Submitted by: freebsd (nagilum.org) Add'l work by: marino Approved by: maintainer timeout (2.5 months) Modified: head/mail/postgrey/Makefile head/mail/postgrey/pkg-plist Modified: head/mail/postgrey/Makefile ============================================================================== --- head/mail/postgrey/Makefile Wed Aug 6 15:05:45 2014 (r364190) +++ head/mail/postgrey/Makefile Wed Aug 6 15:20:07 2014 (r364191) @@ -34,45 +34,42 @@ PGY_DIR?= /var/db/postgrey USERS= ${PGY_USERNAME} GROUPS= ${PGY_GROUPNAME} -MAN1= ${PORTNAME}.1 policy-test.1 postgreyreport.1 +MPAGES= postgrey.1 policy-test.1 postgreyreport.1 USES= shebangfix perl5 -SHEBANG_FILES= ${WRKSRC}/postgrey - -NO_STAGE= yes +SHEBANG_FILES= postgrey policy-test contrib/postgreyreport OPTIONS_DEFINE= DOCS .include post-patch: - @${REINPLACE_CMD} -e 's#nogroup#${PGY_GROUPNAME}#' ${WRKSRC}/postgrey - @${REINPLACE_CMD} -e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey - @${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' ${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_* - @${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${PGY_DIR}#' ${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport - -pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${REINPLACE_CMD} -e 's#nogroup#${PGY_GROUPNAME}#' \ + -e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey + @${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' \ + ${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_* + @${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${PGY_DIR}#' \ + ${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport do-install: - @${POD2MAN} ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1 - @${POD2MAN} ${WRKSRC}/policy-test ${WRKSRC}/policy-test.1 - @${POD2MAN} ${WRKSRC}/contrib/postgreyreport ${WRKSRC}/postgreyreport.1 - @${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport ${PREFIX}/sbin - @${INSTALL} -d ${PREFIX}/etc/postfix + ${POD2MAN} ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1 + ${POD2MAN} ${WRKSRC}/policy-test ${WRKSRC}/policy-test.1 + ${POD2MAN} ${WRKSRC}/contrib/postgreyreport ${WRKSRC}/postgreyreport.1 + ${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport \ + ${STAGEDIR}${PREFIX}/sbin + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}/${PGY_DIR} .for i in ${ETCFILES} - ${INSTALL_DATA} ${WRKSRC}/postgrey_${i} ${PREFIX}/etc/postfix/dist-postgrey_${i} + ${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \ + ${STAGEDIR}${PREFIX}/etc/postfix/dist-postgrey_${i} .endfor .if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif - @cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1 - -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @cd ${WRKSRC} && \ + ${INSTALL_MAN} ${MPAGES} ${STAGEDIR}${MANPREFIX}/man/man1 .include Modified: head/mail/postgrey/pkg-plist ============================================================================== --- head/mail/postgrey/pkg-plist Wed Aug 6 15:05:45 2014 (r364190) +++ head/mail/postgrey/pkg-plist Wed Aug 6 15:20:07 2014 (r364191) @@ -1,9 +1,12 @@ @unexec if cmp -s %D/etc/postfix/dist-postgrey_whitelist_recipients %D/etc/postfix/postgrey_whitelist_recipients; then rm -f %D/etc/postfix/postgrey_whitelist_recipients; fi @unexec if cmp -s %D/etc/postfix/dist-postgrey_whitelist_clients %D/etc/postfix/postgrey_whitelist_clients; then rm -f %D/etc/postfix/postgrey_whitelist_clients; fi +etc/postfix/dist-postgrey_whitelist_recipients +etc/postfix/dist-postgrey_whitelist_clients +man/man1/policy-test.1.gz +man/man1/postgrey.1.gz +man/man1/postgreyreport.1.gz sbin/postgrey sbin/policy-test sbin/postgreyreport -etc/postfix/dist-postgrey_whitelist_recipients -etc/postfix/dist-postgrey_whitelist_clients @dirrmtry etc/postfix @unexec rmdir /var/db/postgrey 2>/dev/null || true