From owner-cvs-all@FreeBSD.ORG  Thu Jun 23 16:05:18 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.ORG
Delivered-To: cvs-all@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D24B16A41C;
	Thu, 23 Jun 2005 16:05:18 +0000 (GMT)
	(envelope-from sobomax@portaone.com)
Received: from www.portaone.com (support.portaone.com [195.70.151.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC25243D1D;
	Thu, 23 Jun 2005 16:05:16 +0000 (GMT)
	(envelope-from sobomax@portaone.com)
Received: from [192.168.0.49] (lesnik.portaone.com [195.140.246.50])
	(authenticated bits=0)
	by www.portaone.com (8.12.11/8.12.11) with ESMTP id j5NG5DIl097513
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 23 Jun 2005 18:05:15 +0200 (CEST)
	(envelope-from sobomax@portaone.com)
Message-ID: <42BADDB6.8020708@portaone.com>
Date: Thu, 23 Jun 2005 19:05:10 +0300
From: Maxim Sobolev <sobomax@portaone.com>
Organization: Porta Software Ltd
User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Oliver Lehmann <oliver@FreeBSD.ORG>
References: <200506230314.j5N3EQP9095807@repoman.freebsd.org>
In-Reply-To: <200506230314.j5N3EQP9095807@repoman.freebsd.org>
Content-Type: text/plain; charset=KOI8-U; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: ClamAV 0.83/954/Wed Jun 22 21:15:13 2005 on www.portaone.com
X-Virus-Status: Clean
Cc: cvs-ports@FreeBSD.ORG, cvs-all@FreeBSD.ORG, ports-committers@FreeBSD.ORG
Subject: Re: cvs commit: ports/games/alephone/files
	patch-Source_Files-Misc-thread_priority_sdl_posix.cpp
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Maxim.Sobolev@portaone.com
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 16:05:18 -0000

In such cases it's better to apply tr(1) to the file in question to 
convert \r\n into \n in the pre-patch target (or to all source files). 
This ensures that in the future you won't bump into the same problem again.

-Maxim

Oliver Lehmann wrote:
> oliver      2005-06-23 03:14:26 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     games/alephone/files 
>                          patch-Source_Files-Misc-thread_priority_sdl_posix.cpp 
>   Log:
>   The file to patch is in DOS format (NL+CR) but the patch didn't addressed that.
>   Fixing the patch makes it apply...
>   
>   Pointed out by: Colin Worthy <cworthy@myrealbox.com>
>   
>   Revision  Changes    Path
>   1.2       +10 -10    ports/games/alephone/files/patch-Source_Files-Misc-thread_priority_sdl_posix.cpp
> 
> 
>