From owner-freebsd-ports@FreeBSD.ORG  Sat Aug 27 14:36:41 2005
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: freebsd-ports@freebsd.org
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ADC3516A41F
	for <freebsd-ports@freebsd.org>; Sat, 27 Aug 2005 14:36:41 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: from wproxy.gmail.com (wproxy.gmail.com [64.233.184.206])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E6AA43D45
	for <freebsd-ports@freebsd.org>; Sat, 27 Aug 2005 14:36:40 +0000 (GMT)
	(envelope-from swhetzel@gmail.com)
Received: by wproxy.gmail.com with SMTP id i16so121600wra
	for <freebsd-ports@freebsd.org>; Sat, 27 Aug 2005 07:36:39 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=J8BPSxzmvF1YLh6HCkOXzSWE5/6X9M5yeUsKFUa9c2hJAAP3acT/kL5UQR86qV/Z1hOIZWuqjs29v/0R48msBxDBwS+fwoN674YNx36rJg5ERx64mxPF9CLb5aah3GV2OG2/QrnO7J/+xqyRBUUjmGsg0XOHGLiOk/vj25o2n4s=
Received: by 10.54.6.59 with SMTP id 59mr4526393wrf;
	Sat, 27 Aug 2005 07:36:39 -0700 (PDT)
Received: by 10.54.29.26 with HTTP; Sat, 27 Aug 2005 07:36:39 -0700 (PDT)
Message-ID: <790a9fff0508270736256a26db@mail.gmail.com>
Date: Sat, 27 Aug 2005 09:36:39 -0500
From: Scot Hetzel <swhetzel@gmail.com>
To: Ed Schouten <ed@fxq.nl>
In-Reply-To: <20050827140041.GJ749@hoeg.nl>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <200508122130.j7CLUNRQ018058@www.freebsd.org>
	<200508122140.j7CLe7nw054439@freefall.freebsd.org>
	<20050827140041.GJ749@hoeg.nl>
Cc: freebsd-ports@freebsd.org
Subject: Re: Patching files with DOS returns
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Aug 2005 14:36:41 -0000

On 8/27/05, Ed Schouten <ed@fxq.nl> wrote:
> Hello,
>=20
> Some days ago I submitted a port for the Quake 3: Arena source, released
> by id Software (see PR 84853).
>=20
> The patches included with the port (patch-freebsd and patch-make) patch
> some files that have DOS returns (\r\n), so the patches have ^M's at the
> end of each line.
>=20
> My question is: will those patches be malformed if they got checked into
> CVS? Is there some kind of clean way to 'dosunix' the entire WRKSRC
> before it gets patched?
>=20
Yes, there is a way to use PERL to convert the files from DOS line
formats to UNIX line format. I have a couple of perl scripts that do
this for me on another system.  That's not accessible to me at the
moment.

If the source is distributed in a zip file you can use unzip to
convert the line formats for you, see the man page for unzip.

Scot
--=20
DISCLAIMER:
No electrons were mamed while sending this message. Only slightly bruised.