From owner-freebsd-java@FreeBSD.ORG Fri Jun 25 23:32:56 2004 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 444AA16A4CE for ; Fri, 25 Jun 2004 23:32:56 +0000 (GMT) Received: from goliath.nxlkhost.com (goliath.nxlkhost.com [207.155.252.91]) by mx1.FreeBSD.org (Postfix) with ESMTP id 242F243D39 for ; Fri, 25 Jun 2004 23:32:56 +0000 (GMT) (envelope-from dhockin@staffware-spokane.com) Received: from [127.0.0.1] (403254C2.ptr.dia.nextlink.net [64.50.84.194]) by goliath.nxlkhost.com id TAA05604; Fri, 25 Jun 2004 19:32:46 -0400 (EDT) [ConcentricHost SMTP Relay 1.17] Errors-To: Message-ID: <40DCB620.5050204@staffware-spokane.com> Date: Fri, 25 Jun 2004 16:32:48 -0700 From: Doug Hockin User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.8a1) Gecko/20040520 X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-java@freebsd.org Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Subject: jdk1.4 on FreeBSD 5.2.1 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: Fri, 25 Jun 2004 23:32:56 -0000 I got a patch error when attempting to port jdk1.4 to 5.2.1. I used these files: j2sdk-1_4_2-src-scsl.zip j2sdk-1_4_2-bin-scsl.zip bsd-jdk14-patches-6.tar.gz I had to change the Makefile in the port area to reference version 6 of the patches rather than version 5. It gave an error when attempting to checksum the patch file (checksum missing?), so I ran the command: make NO_CHECKSUM=yes install The end make output looks like this: > |Index: j2se/src/solaris/native/sun/nio/ch/NativeThread.c > |=================================================================== > |RCS file: /var/jcvs/javasrc_1_4_scsl/j2se/src/solaris/native/sun/nio/ch/NativeThread.c,v > |retrieving revision 1.1.1.2 > |retrieving revision 1.4 > |diff -u -r1.1.1.2 -r1.4 > |--- j2se/src/solaris/native/sun/nio/ch/NativeThread.c 22 Oct 2003 23:03:50 -0000 1.1.1.2 > |+++ j2se/src/solaris/native/sun/nio/ch/NativeThread.c 27 Oct 2003 12:16:42 -0000 1.4 > -------------------------- > Patching file j2se/src/solaris/native/sun/nio/ch/NativeThread.c using Plan A... > Hunk #1 succeeded at 5. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: j2se/src/solaris/native/sun/nio/ch/Net.c > |=================================================================== > |RCS file: /var/jcvs/javasrc_1_4_scsl/j2se/src/solaris/native/sun/nio/ch/Net.c,v > |retrieving revision 1.1.1.3 > |retrieving revision 1.6 > |diff -u -r1.1.1.3 -r1.6 > |--- j2se/src/solaris/native/sun/nio/ch/Net.c 22 Oct 2003 23:03:50 -0000 1.1.1.3 > |+++ j2se/src/solaris/native/sun/nio/ch/Net.c 27 Oct 2003 12:16:42 -0000 1.6 > -------------------------- > Patching file j2se/src/solaris/native/sun/nio/ch/Net.c using Plan A... > Hunk #1 succeeded at 283. > done > ===> Applying FreeBSD patches for jdk-1.4.2p6 > 1 out of 1 hunks failed--saving rejects to ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.rej >>> Patch patch-PlainDatagramSocketImpl.c failed to apply cleanly. > *** Error code 1 > > Stop in /usr/ports/java/jdk14. > > Compilation exited abnormally with code 1 at Fri Jun 25 15:23:43 And the .rej file looks like this: > *************** > *** 2034,2042 **** > /* > * Join the multicast group. > */ > - // XXXBSD: fix for BSD (re-implement with KAME ?) > - // if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), > - if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0), > (char *) &mname, mname_len) < 0) { > > /* > --- 2034,2040 ---- > /* > * Join the multicast group. > */ > + if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP), > (char *) &mname, mname_len) < 0) { > > /* -- Doug