From owner-freebsd-java@FreeBSD.ORG Thu Oct 9 06:27:29 2003 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07B8216A4B3; Thu, 9 Oct 2003 06:27:29 -0700 (PDT) Received: from axl.seasidesoftware.co.za (axl.seasidesoftware.co.za [196.31.7.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CBD443FEC; Thu, 9 Oct 2003 06:27:27 -0700 (PDT) (envelope-from sheldonh@starjuice.net) Received: from sheldonh by axl.seasidesoftware.co.za with local (Exim 4.24; FreeBSD 5.1) id 1A7ap2-000Jp4-3A; Thu, 09 Oct 2003 15:27:16 +0200 Date: Thu, 9 Oct 2003 15:27:16 +0200 From: Sheldon Hearn To: Andrew Houghton Message-ID: <20031009132716.GF42736@starjuice.net> Mail-Followup-To: Andrew Houghton , Greg Lewis , phantom@freebsd.org, freebsd-java@freebsd.org References: <20031009005113.GA50130@misty.eyesbeyond.com> <3F84D58B.1010205@acm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3F84D58B.1010205@acm.org> User-Agent: Mutt/1.5.4i Sender: Sheldon Hearn cc: phantom@freebsd.org cc: freebsd-java@freebsd.org Subject: Re: jdk14 patches X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2003 13:27:29 -0000 On (2003/10/08 20:27), Andrew Houghton wrote: > The diff you provided applies cleanly, but breaks the application of > files/patch-FileChannelImpl.c I think you've got a local files/patch-FileChannelImpl.c, like I do. It's not in CVS, and Greg's patch is targetted at the port as it stands in CVS. Just remove files/patch-FileChannelImpl.c, which is rolled into Greg's patch. Ciao, Sheldon.