From owner-svn-ports-head@FreeBSD.ORG Mon Sep 24 21:25:30 2012 Return-Path: Delivered-To: svn-ports-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75622106566C; Mon, 24 Sep 2012 21:25:30 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id D788D8FC08; Mon, 24 Sep 2012 21:25:29 +0000 (UTC) Received: from [192.168.1.102] (dynamic-94-247-222-022.catv.glattnet.ch [94.247.222.22]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8OLPRD9017787 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES128-SHA bits=128 verify=NO); Mon, 24 Sep 2012 21:25:28 GMT (envelope-from beat@FreeBSD.org) Mime-Version: 1.0 (Apple Message framework v1283) Content-Type: text/plain; charset=us-ascii From: =?iso-8859-1?Q?Beat_G=E4tzi?= In-Reply-To: <87zk4fnng6.fsf@FreeBSD.org> Date: Mon, 24 Sep 2012 23:25:26 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201209241143.q8OBhjYF011702@svn.freebsd.org> <506087E5.2010205@FreeBSD.org> <87zk4fnng6.fsf@FreeBSD.org> To: Raphael Kubo da Costa X-Mailer: Apple Mail (2.1283) Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, TAKATSU Tomonari , ports-committers@FreeBSD.org, Bryan Drewery 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:25:30 -0000 On Sep 24, 2012, at 11:03 PM, Raphael Kubo da Costa wrote: > Bryan Drewery 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=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