Date: Mon, 24 Sep 2012 23:25:26 +0200 From: =?iso-8859-1?Q?Beat_G=E4tzi?= <beat@FreeBSD.org> To: Raphael Kubo da Costa <rakuco@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, TAKATSU Tomonari <tota@FreeBSD.org>, ports-committers@FreeBSD.org, Bryan Drewery <bdrewery@FreeBSD.org> Subject: Re: svn commit: r304774 - in head/devel/newfile: . files Message-ID: <D7122959-18EF-4BFA-90B2-D40D83287F63@FreeBSD.org> In-Reply-To: <87zk4fnng6.fsf@FreeBSD.org> References: <201209241143.q8OBhjYF011702@svn.freebsd.org> <506087E5.2010205@FreeBSD.org> <87zk4fnng6.fsf@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sep 24, 2012, at 11:03 PM, Raphael Kubo da Costa wrote: > Bryan Drewery <bdrewery@freebsd.org> writes: >=20 >> This is causing a build failure: >>=20 >> 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 $ >>=20 >> .. >>=20 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<p= hase: patch >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D >> =3D=3D=3D> Patching for newfile-1.0.14_3 >> =3D=3D=3D> newfile-1.0.14_3 depends on file: /usr/local/bin/ruby19 = - found >> =3D=3D=3D> Applying FreeBSD patches for newfile-1.0.14_3 >> 1 out of 2 hunks failed--saving rejects to = data/projects/port@Makefile.rej >> =3D> Patch patch-data_projects_port_Makefile failed to apply cleanly. >> *** Error code 1 >>=20 >> Stop in /usr/ports/devel/newfile. >> =3D=3D=3D> Cleaning for newfile-1.0.14_3 >> build of /usr/ports/devel/newfile ended at Mon Sep 24 10:19:43 CDT = 2012 >=20 > This is interesting. >=20 > The SVN commit is OK, and that patch file does have the = fbsd:nokeywords > property set to 'yes'. >=20 > 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. Beat > [1] > = http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/newfile/files/patch-data= _projects_port_Makefile?rev=3D1.2 > [2] > = http://svnweb.freebsd.org/ports/head/devel/newfile/files/patch-data_projec= ts_port_Makefile?revision=3D304774&view=3Dmarkup
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D7122959-18EF-4BFA-90B2-D40D83287F63>