From owner-svn-ports-all@FreeBSD.ORG Thu Jul 10 19:12:04 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 59018434; Thu, 10 Jul 2014 19:12:04 +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 45D1F2A95; Thu, 10 Jul 2014 19:12:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AJC457061053; Thu, 10 Jul 2014 19:12:04 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AJC3fN061051; Thu, 10 Jul 2014 19:12:03 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407101912.s6AJC3fN061051@svn.freebsd.org> From: Raphael Kubo da Costa Date: Thu, 10 Jul 2014 19:12:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361484 - head/mail/postfix-logwatch 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.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: Thu, 10 Jul 2014 19:12:04 -0000 Author: rakuco Date: Thu Jul 10 19:12:03 2014 New Revision: 361484 URL: http://svnweb.freebsd.org/changeset/ports/361484 QAT: https://qat.redports.org/buildarchive/r361484/ Log: - Support staging. - Use the @sample keyword in the plist. PR: 191728 Submitted by: takefu@airport.fm Modified: head/mail/postfix-logwatch/Makefile head/mail/postfix-logwatch/pkg-plist Modified: head/mail/postfix-logwatch/Makefile ============================================================================== --- head/mail/postfix-logwatch/Makefile Thu Jul 10 19:11:19 2014 (r361483) +++ head/mail/postfix-logwatch/Makefile Thu Jul 10 19:12:03 2014 (r361484) @@ -3,11 +3,12 @@ PORTNAME= postfix-logwatch PORTVERSION= 1.40.00 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/logreporters/${PORTNAME}/release/${PORTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Postfix MTA log parser LICENSE= MIT @@ -16,36 +17,35 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PORTDOCS= Bugs Changes README PORTEXAMPLES= ${PORTNAME}.conf ${PORTNAME}.conf-topn -MAN1= ${PORTNAME}.1 - -USES= perl5 +USES= perl5 shebangfix USE_PERL5= run NO_BUILD= yes +SHEBANG_FILES= ${PORTNAME} + +.include -NO_STAGE= yes post-patch: @cd ${WRKSRC} && ${REINPLACE_CMD} -e '\ s!/usr/local/etc!${ETCDIR}! \ ' ${PORTNAME} ${PORTNAME}.1 README do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1 - @${CP} ${WRKSRC}/${PORTNAME}.conf ${WRKSRC}/${PORTNAME}.conf.sample - @${MKDIR} ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.sample ${ETCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample post-install: @if [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \ - ${CP} -p ${ETCDIR}/${PORTNAME}.conf.sample ${ETCDIR}/${PORTNAME}.conf; \ + ${CP} -p ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf; \ fi -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .endif .include Modified: head/mail/postfix-logwatch/pkg-plist ============================================================================== --- head/mail/postfix-logwatch/pkg-plist Thu Jul 10 19:11:19 2014 (r361483) +++ head/mail/postfix-logwatch/pkg-plist Thu Jul 10 19:12:03 2014 (r361484) @@ -1,5 +1,4 @@ -@unexec if cmp -s %D/%%ETCDIR%%/postfix-logwatch.conf.sample %D/%%ETCDIR%%/postfix-logwatch.conf; then rm -f %D/%%ETCDIR%%/postfix-logwatch.conf; fi -%%ETCDIR%%/postfix-logwatch.conf.sample -@exec if [ ! -f %B/postfix-logwatch.conf ] ; then cp -p %B/%f %B/postfix-logwatch.conf; fi +@sample %%ETCDIR%%/postfix-logwatch.conf.sample @dirrmtry %%ETCDIR%% bin/postfix-logwatch +man/man1/postfix-logwatch.1.gz