From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 18 17:47:43 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 42C6D402;
 Fri, 18 Apr 2014 17:47:43 +0000 (UTC)
Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client CN "mouf.net", Issuer "mouf.net" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id CF6C01AD6;
 Fri, 18 Apr 2014 17:47:42 +0000 (UTC)
Received: from mouf.net (swills@mouf [199.48.129.64])
 by mouf.net (8.14.5/8.14.5) with ESMTP id s3IHlRVa019615
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Fri, 18 Apr 2014 17:47:32 GMT (envelope-from swills@mouf.net)
Received: (from swills@localhost)
 by mouf.net (8.14.5/8.14.5/Submit) id s3IHlRvx019614;
 Fri, 18 Apr 2014 17:47:27 GMT (envelope-from swills)
Date: Fri, 18 Apr 2014 17:47:27 +0000
From: Steve Wills <swills@freebsd.org>
To: Pawel Pekala <pawel@freebsd.org>
Subject: Re: svn commit: r351554 - head/Mk
Message-ID: <20140418174725.GD3573@mouf.net>
References: <201404181731.s3IHVDK0062215@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201404181731.s3IHVDK0062215@svn.freebsd.org>
User-Agent: Mutt/1.5.22 (2013-10-16)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (mouf.net [199.48.129.64]); Fri, 18 Apr 2014 17:47:33 +0000 (UTC)
X-Spam-Status: No, score=0.0 required=4.5 tests=none autolearn=unavailable
 version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mouf.net
X-Virus-Scanned: clamav-milter 0.98.1 at mouf.net
X-Virus-Status: Clean
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Apr 2014 17:47:43 -0000

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-|'`; \