From owner-svn-ports-head@FreeBSD.ORG Mon Sep 24 21:26:18 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9CE431065675 for ; Mon, 24 Sep 2012 21:26:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0C1F48FC1C for ; Mon, 24 Sep 2012 21:26:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8OLQHAf059519 for ; Mon, 24 Sep 2012 21:26:17 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8OLQHQN059515 for svn-ports-head@freebsd.org; Mon, 24 Sep 2012 21:26:17 GMT (envelope-from bdrewery) Received: (qmail 79804 invoked from network); 24 Sep 2012 16:26:15 -0500 Received: from unknown (HELO ?192.168.0.74?) (freebsd@shatow.net@74.94.87.209) by sweb.xzibition.com with ESMTPA; 24 Sep 2012 16:26:15 -0500 Message-ID: <5060CFFA.1030004@FreeBSD.org> Date: Mon, 24 Sep 2012 16:26:18 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120824 Thunderbird/15.0 MIME-Version: 1.0 To: Raphael Kubo da Costa , TAKATSU Tomonari References: <201209241143.q8OBhjYF011702@svn.freebsd.org> <506087E5.2010205@FreeBSD.org> <87zk4fnng6.fsf@FreeBSD.org> In-Reply-To: <87zk4fnng6.fsf@FreeBSD.org> X-Enigmail-Version: 1.4.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r304774 - in head/devel/newfile: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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, 24 Sep 2012 21:26:18 -0000 On 9/24/2012 4:03 PM, Raphael Kubo da Costa wrote: > Bryan Drewery writes: > >> This is causing a build failure: >> >> building for: 7.4-RELEASE i386 >> maintained by: ports@FreeBSD.org >> Makefile ident: $FreeBSD: ports/devel/newfile/Makefile,v 1.20 >> 2012/09/24 11:43:45 tota Exp $ >> >> .. >> >> ================================================= >> ===> Patching for newfile-1.0.14_3 >> ===> newfile-1.0.14_3 depends on file: /usr/local/bin/ruby19 - found >> ===> Applying FreeBSD patches for newfile-1.0.14_3 >> 1 out of 2 hunks failed--saving rejects to data/projects/port@Makefile.rej >> => Patch patch-data_projects_port_Makefile failed to apply cleanly. >> *** Error code 1 >> >> Stop in /usr/ports/devel/newfile. >> ===> Cleaning for newfile-1.0.14_3 >> build of /usr/ports/devel/newfile ended at Mon Sep 24 10:19:43 CDT 2012 > > This is interesting. > > The SVN commit is OK, and that patch file does have the fbsd:nokeywords > property set to 'yes'. > > However, [1] does seem to have expanded the $FreeBSD$ tag in the file, > and the file I got from portsnap has that tag expanded as well. [2] > shows the file as expected, though. > Yes I am seeing the same as well. My build environment is using portsnap. Running 'portsnap extract devel/newfile', I see that the tag is expanded in files/patch-data_projects_port_Makefile. > [1] > http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/newfile/files/patch-data_projects_port_Makefile?rev=1.2 > [2] > http://svnweb.freebsd.org/ports/head/devel/newfile/files/patch-data_projects_port_Makefile?revision=304774&view=markup > -- Regards, Bryan Drewery bdrewery@freenode/EFNet