Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Apr 2014 17:47:27 +0000
From:      Steve Wills <swills@freebsd.org>
To:        Pawel Pekala <pawel@freebsd.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r351554 - head/Mk
Message-ID:  <20140418174725.GD3573@mouf.net>
In-Reply-To: <201404181731.s3IHVDK0062215@svn.freebsd.org>
References:  <201404181731.s3IHVDK0062215@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Thanks! I have run into that too. I wonder about the case of doing makepatch on
an existing port and not knowing that you needed to delete a patch. Would it be
a good idea to emit a warning or something when you would have generated an
empty patch?

Steve

On Fri, Apr 18, 2014 at 05:31:13PM +0000, Pawel Pekala wrote:
> Author: pawel
> Date: Fri Apr 18 17:31:12 2014
> New Revision: 351554
> URL: http://svnweb.freebsd.org/changeset/ports/351554
> QAT: https://qat.redports.org/buildarchive/r351554/
> 
> Log:
>   makepatch: don't create empty patches
>   
>   PR:		ports/188764
>   Submitted by:	myself
>   Approved by:	portmgr (bdrewery)
> 
> Modified:
>   head/Mk/bsd.port.mk
> 
> Modified: head/Mk/bsd.port.mk
> ==============================================================================
> --- head/Mk/bsd.port.mk	Fri Apr 18 17:28:40 2014	(r351553)
> +++ head/Mk/bsd.port.mk	Fri Apr 18 17:31:12 2014	(r351554)
> @@ -1194,6 +1194,7 @@ makepatch:
>  		for i in `find . -type f -name '*.orig'`; do \
>  			ORG=$$i; \
>  			NEW=$${i%.orig}; \
> +			cmp -s $${ORG} $${NEW} && continue; \
>  			OUT=${FILESDIR}`${ECHO} $${NEW} | \
>  				${SED} -e 's|/|__|g' \
>  					-e 's|^\.__|/patch-|'`; \



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