From owner-svn-ports-head@FreeBSD.ORG Mon Apr 21 20:24:41 2014 Return-Path: Delivered-To: svn-ports-head@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 16D45F92 for ; Mon, 21 Apr 2014 20:24:41 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 D6E851317 for ; Mon, 21 Apr 2014 20:24:40 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKOeDo069391 for ; Mon, 21 Apr 2014 20:24:40 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3LKOeZ3069389 for svn-ports-head@freebsd.org; Mon, 21 Apr 2014 20:24:40 GMT (envelope-from bdrewery) Received: (qmail 55423 invoked from network); 21 Apr 2014 15:24:38 -0500 Received: from unknown (HELO roundcube.xk42.net) (10.10.5.5) by sweb.xzibition.com with SMTP; 21 Apr 2014 15:24:38 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 21 Apr 2014 15:24:38 -0500 From: Bryan Drewery To: Emanuel Haupt Subject: Re: svn commit: r351390 - head/devel/cvsspam Organization: FreeBSD In-Reply-To: <201404161450.s3GEoIT3070458@svn.freebsd.org> References: <201404161450.s3GEoIT3070458@svn.freebsd.org> Message-ID: <933da2b4aadcb74649e7032cfd4859dd@shatow.net> X-Sender: bdrewery@FreeBSD.org User-Agent: Roundcube Webmail/0.9.5 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, owner-ports-committers@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:24:41 -0000 On 2014-04-16 09:50, Emanuel Haupt wrote: > Author: ehaupt > Date: Wed Apr 16 14:50:18 2014 > New Revision: 351390 > URL: http://svnweb.freebsd.org/changeset/ports/351390 > QAT: https://qat.redports.org/buildarchive/r351390/ > > Log: > Use @sample pkg-plist macro. > > Modified: > head/devel/cvsspam/Makefile > head/devel/cvsspam/pkg-plist > > Modified: head/devel/cvsspam/Makefile > ============================================================================== > --- head/devel/cvsspam/Makefile Wed Apr 16 14:48:09 2014 (r351389) > +++ head/devel/cvsspam/Makefile Wed Apr 16 14:50:18 2014 (r351390) > @@ -3,6 +3,7 @@ > > PORTNAME= cvsspam > PORTVERSION= 0.2.12 > +PORTREVISION= 1 > CATEGORIES= devel > > MASTER_SITES= http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/ > \ > CRITICAL > @@ -34,7 +35,7 @@ do-install: > ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} > .endfor > ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf \ > - ${STAGEDIR}${PREFIX}/etc/cvsspam.conf.default > + ${STAGEDIR}${PREFIX}/etc/cvsspam.conf.sample .. > .if !exists(${STAGEDIR}${PREFIX}/etc/cvsspam.conf) > ${INSTALL_DATA} ${WRKSRC}/cvsspam.conf \ > ${STAGEDIR}${PREFIX}/etc/cvsspam.conf You should now remove the .if... lines. It's already handled by plist. > > Modified: head/devel/cvsspam/pkg-plist > ============================================================================== > --- head/devel/cvsspam/pkg-plist Wed Apr 16 14:48:09 2014 (r351389) > +++ head/devel/cvsspam/pkg-plist Wed Apr 16 14:50:18 2014 (r351390) > @@ -1,6 +1,4 @@ > -@unexec if cmp -s %D/etc/cvsspam.conf %D/etc/cvsspam.conf.default; > then rm -f %D/etc/cvsspam.conf; fi > -etc/cvsspam.conf.default > -@exec [ -f %B/cvsspam.conf ] || cp %B/%f %B/cvsspam.conf > +@sample etc/cvsspam.conf.sample > libexec/cvsspam/collect_diffs.rb > libexec/cvsspam/cvsspam.rb > libexec/cvsspam/record_lastdir.rb -- Regards, Bryan Drewery