Date: Mon, 24 Sep 2012 16:28:48 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: =?ISO-8859-1?Q?Beat_G=E4tzi?= <beat@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, Raphael Kubo da Costa <rakuco@FreeBSD.org>, TAKATSU Tomonari <tota@FreeBSD.org> Subject: Re: svn commit: r304774 - in head/devel/newfile: . files Message-ID: <5060D090.8050600@FreeBSD.org> In-Reply-To: <D7122959-18EF-4BFA-90B2-D40D83287F63@FreeBSD.org> References: <201209241143.q8OBhjYF011702@svn.freebsd.org> <506087E5.2010205@FreeBSD.org> <87zk4fnng6.fsf@FreeBSD.org> <D7122959-18EF-4BFA-90B2-D40D83287F63@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 9/24/2012 4:25 PM, Beat Gätzi wrote: > > On Sep 24, 2012, at 11:03 PM, Raphael Kubo da Costa wrote: >> Bryan Drewery <bdrewery@freebsd.org> 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 $ >>> >>> .. >>> >>> =======================<phase: patch >========================== >>> ===> 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. > > This is a problem caused by the SVN to CVS exporter. In CVS this file > should be commited with -ko to turn off keyword substitution but this > wasn't done by the exporter in this case. As portsnap still uses CVS the > expanded version is distributed. > I've asked svnadm for a fix to the CVS directly. Thanks! > > Beat > >> [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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5060D090.8050600>