From owner-freebsd-java@FreeBSD.ORG  Thu Oct  9 09:08:24 2003
Return-Path: <owner-freebsd-java@FreeBSD.ORG>
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 F203916A4B3
	for <freebsd-java@freebsd.org>; Thu,  9 Oct 2003 09:08:24 -0700 (PDT)
Received: from mail.speakeasy.net (mail10.speakeasy.net [216.254.0.210])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 796FB43FEC
	for <freebsd-java@freebsd.org>; Thu,  9 Oct 2003 09:08:23 -0700 (PDT)
	(envelope-from aah@acm.org)
Received: (qmail 13154 invoked from network); 9 Oct 2003 16:08:22 -0000
Received: from unknown (HELO acm.org) (aah@[216.27.178.67])
          (envelope-sender <aah@acm.org>)
          by mail10.speakeasy.net (qmail-ldap-1.03) with SMTP
          for <sheldonh@starjuice.net>; 9 Oct 2003 16:08:22 -0000
Message-ID: <3F858831.6080100@acm.org>
Date: Thu, 09 Oct 2003 09:09:21 -0700
From: Andrew Houghton <aah@acm.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4) Gecko/20030919
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Sheldon Hearn <sheldonh@starjuice.net>
References: <20031009005113.GA50130@misty.eyesbeyond.com>
	<3F84D58B.1010205@acm.org> <20031009132716.GF42736@starjuice.net>
In-Reply-To: <20031009132716.GF42736@starjuice.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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 <freebsd-java.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-java>
List-Post: <mailto:freebsd-java@freebsd.org>
List-Help: <mailto:freebsd-java-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2003 16:08:25 -0000

Sheldon's right, I had a local version of patch-FileChannelImpl.c.  
Sorry for the noise.

- a.

Sheldon Hearn wrote:

>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.
>
>  
>