Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Apr 2014 15:24:38 -0500
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        Emanuel Haupt <ehaupt@freebsd.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, owner-ports-committers@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r351390 - head/devel/cvsspam
Message-ID:  <933da2b4aadcb74649e7032cfd4859dd@shatow.net>
In-Reply-To: <201404161450.s3GEoIT3070458@svn.freebsd.org>
References:  <201404161450.s3GEoIT3070458@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?933da2b4aadcb74649e7032cfd4859dd>