From owner-java@FreeBSD.ORG  Mon Dec 15 22:30:51 1997
Return-Path: <owner-java@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id WAA29110
          for java-outgoing; Mon, 15 Dec 1997 22:30:51 -0800 (PST)
          (envelope-from owner-java@FreeBSD.ORG)
Received: from ns.mt.sri.com (sri-gw.MT.net [206.127.105.141])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id WAA29106;
          Mon, 15 Dec 1997 22:30:43 -0800 (PST)
          (envelope-from nate@mt.sri.com)
Received: from mt.sri.com (rocky.mt.sri.com [206.127.76.100])
	by ns.mt.sri.com (8.8.8/8.8.8) with SMTP id XAA26747;
	Mon, 15 Dec 1997 23:30:42 -0700 (MST)
	(envelope-from nate@rocky.mt.sri.com)
Received: by mt.sri.com (SMI-8.6/SMI-SVR4)
	id XAA07638; Mon, 15 Dec 1997 23:30:39 -0700
Date: Mon, 15 Dec 1997 23:30:39 -0700
Message-Id: <199712160630.XAA07638@mt.sri.com>
From: Nate Williams <nate@mt.sri.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: "Alex.Boisvert" <boia01@gel.usherb.ca>
Cc: Nate Williams <nate@mt.sri.com>, nate@FreeBSD.ORG,
        freebsd-java@FreeBSD.ORG
Subject: Re: Diffs for 1.1.2 (fwd)
In-Reply-To: <Pine.SOL.3.91.971215225034.16356A-100000@castor>
References: <199712160038.RAA06870@mt.sri.com>
	<Pine.SOL.3.91.971215225034.16356A-100000@castor>
X-Mailer: VM 6.29 under 19.15 XEmacs Lucid
Sender: owner-java@FreeBSD.ORG
Precedence: bulk

> > Great, how about any special build trees, or mods to the original source
> > tree?
> > 
> > I note the top of the diff contains lines like this, and there is no
> > javasrc/build/freebsd tree anywhere. :)
> > 
> > *** orig/build/freebsd/GNUmakefile      Wed May 28 02:52:10 1997
> > --- javasrc/build/freebsd/GNUmakefile   Thu Nov 13 20:08:43 1997
> > 
> 
> 
> I didn't cover this because it's (partly) explained in the README at the
> top of the hierarchy of the JDK source. 
> 
> I'm not home anymore, so I don't have my notes handy, but I think you'll 
> have to do the following:
> 
> mv javasrc/build/solaris javasrc/build/freebsd
> mv javasrc/src/solaris javasrc/src/freebsd
> rm -rf javasrc/build/win32
> rm -rf javasrc/src/win32
> rm -rf javasrc/src/ODBC

OK, I now have the following 4 files that didn't patch cleanly.  (Note,
I'm using a JDK1.1.2 source tree.  I'll worry about later versions once
I get the original version working...)

javasrc/src/freebsd/java/green_threads/src/iomgr.c.rej
javasrc/src/freebsd/java/green_threads/src/signals.c.rej
javasrc/src/freebsd/net/multicast.c.rej
javasrc/src/freebsd/net/socket.c.rej

However, upon closer inspection, they appear to be due to 'white-space'
differences and aren't functionally a problem.

Building now....


Nate