Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Jun 2007 00:27:49 -0700
From:      Greg Lewis <glewis@eyesbeyond.com>
To:        Robert Huff <roberthuff@rcn.com>
Cc:        java@freebsd.org, Jung-uk Kim <jkim@freebsd.org>
Subject:   Re: fresh install on -CURRENT?
Message-ID:  <20070626072749.GC65217@misty.eyesbeyond.com>
In-Reply-To: <18047.56934.373358.154744@jerusalem.litteratus.org>
References:  <18032.2946.355998.504571@jerusalem.litteratus.org> <20070613182542.GA93302@misty.eyesbeyond.com> <18043.48929.989279.749679@jerusalem.litteratus.org> <20070624203430.GA67183@misty.eyesbeyond.com> <18047.56934.373358.154744@jerusalem.litteratus.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jun 25, 2007 at 11:25:26AM -0400, Robert Huff wrote:
> Greg Lewis writes:
>=20
> >  I wasn't aware compat6x had been committed (it hadn't when I last
> >  checked).  Please cvsup (or whatever you do) and try again.  I
> >  just committed a change that makes the port depend on compat6x on
> >  7.x.
>=20
> 	Done.  daiblo-jdk15 is now installed.
> 	However: after applying the patch and attempting to build
> jdk15-p12, I get the appended.
> 	What have I done wrong?

Looks like jdk15 isn't completely up to date.  In particular it looks
suspiciously like you have some patches which no longer exist still
there.

> =0C
> 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
> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> |RCS file: /var/jcvs/javasrc_1_5_jrl/j2se/src/solaris/native/sun/nio/ch/N=
et.c,v
> |retrieving revision 1.1.1.2
> |retrieving revision 1.5
> |diff -u -r1.1.1.2 -r1.5
> |--- j2se/src/solaris/native/sun/nio/ch/Net.c	6 Mar 2007 16:53:30 -0000	1=
.1.1.2
> |+++ j2se/src/solaris/native/sun/nio/ch/Net.c	15 May 2007 22:23:52 -0000	=
1.5
> --------------------------
> Patching file j2se/src/solaris/native/sun/nio/ch/Net.c using Plan A...
> Hunk #1 succeeded at 120.
> Hunk #2 succeeded at 154.
> Hunk #3 succeeded at 330.
> 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/ServerSocketChannelImpl.c
> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> |RCS file: /var/jcvs/javasrc_1_5_jrl/j2se/src/solaris/native/sun/nio/ch/S=
erverSocketChannelImpl.c,v
> |retrieving revision 1.1.1.1
> |retrieving revision 1.4
> |diff -u -r1.1.1.1 -r1.4
> |--- j2se/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c	8 Nov 2=
004 22:27:40 -0000	1.1.1.1
> |+++ j2se/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c	30 Mar =
2007 16:45:50 -0000	1.4
> --------------------------
> Patching file j2se/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.=
c using Plan A...
> Hunk #1 succeeded at 63.
> Hunk #2 succeeded at 97.
> 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/SocketChannelImpl.c
> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> |RCS file: /var/jcvs/javasrc_1_5_jrl/j2se/src/solaris/native/sun/nio/ch/S=
ocketChannelImpl.c,v
> |retrieving revision 1.1.1.1
> |retrieving revision 1.2
> |diff -u -r1.1.1.1 -r1.2
> |--- j2se/src/solaris/native/sun/nio/ch/SocketChannelImpl.c	8 Nov 2004 22=
:27:40 -0000	1.1.1.1
> |+++ j2se/src/solaris/native/sun/nio/ch/SocketChannelImpl.c	16 Jan 2007 2=
1:34:56 -0000	1.2
> --------------------------
> Patching file j2se/src/solaris/native/sun/nio/ch/SocketChannelImpl.c usin=
g Plan A...
> Hunk #1 succeeded at 37.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: j2se/src/solaris/native/sun/xawt/XWindow.c
> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> |RCS file: /var/jcvs/javasrc_1_5_jrl/j2se/src/solaris/native/sun/xawt/XWi=
ndow.c,v
> |retrieving revision 1.1.1.2
> |retrieving revision 1.3
> |diff -u -r1.1.1.2 -r1.3
> |--- j2se/src/solaris/native/sun/xawt/XWindow.c	6 Mar 2007 16:53:30 -0000=
	1.1.1.2
> |+++ j2se/src/solaris/native/sun/xawt/XWindow.c	6 Mar 2007 17:45:05 -0000=
	1.3
> --------------------------
> Patching file j2se/src/solaris/native/sun/xawt/XWindow.c using Plan A...
> Hunk #1 succeeded at 210.
> Hunk #2 succeeded at 840.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: j2se/src/solaris/transport/socket/socket_md.c
> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> |RCS file: /var/jcvs/javasrc_1_5_jrl/j2se/src/solaris/transport/socket/so=
cket_md.c,v
> |retrieving revision 1.1.1.1
> |retrieving revision 1.3
> |diff -u -r1.1.1.1 -r1.3
> |--- j2se/src/solaris/transport/socket/socket_md.c	8 Nov 2004 22:27:40 -0=
000	1.1.1.1
> |+++ j2se/src/solaris/transport/socket/socket_md.c	3 Jan 2005 18:32:01 -0=
000	1.3
> --------------------------
> Patching file j2se/src/solaris/transport/socket/socket_md.c using Plan A.=
..
> Hunk #1 succeeded at 17.
> Hunk #2 succeeded at 264.
> done
> =3D=3D=3D>  Applying FreeBSD patches for jdk-1.5.0.12p5,1
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to ../../hotspot/src/os_cpu/bsd_=
amd64/vm/os_bsd_amd64.hpp.rej
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to ../../hotspot/src/os_cpu/bsd_=
i486/vm/os_bsd_i486.hpp.rej
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to ../../hotspot/src/os_cpu/bsd_=
amd64/vm/os_bsd_amd64.hpp.rej
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to ../../hotspot/src/os_cpu/bsd_=
i486/vm/os_bsd_i486.hpp.rej
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to ../../hotspot/src/os_cpu/bsd_=
amd64/vm/os_bsd_amd64.hpp.rej
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to ../../hotspot/src/os_cpu/bsd_=
i486/vm/os_bsd_i486.hpp.rej
> =3D> Patch patch-setup_fpu failed to apply cleanly.
> =3D> Patch(es) patch-control::common::Defs-bsd.gmk patch-deploy::common::=
Defs-bsd.gmk patch-deploy::common::config.gmk patch-deploy::controlpanel::s=
un_java.desktop patch-deploy::jvmnative::Makefile patch-deploy::make::commo=
n::Defs-bsd.gmk patch-deploy::ns7-adapter::Makefile patch-deploy::nscore::M=
akefile patch-hotspot::bsd_i486::vm::os_bsd_i486.cpp patch-hotspot::i486::v=
m::i486.ad patch-hotspot::i486::vm::register_i486.hpp patch-j2se::awt::font=
path.c patch-j2se::awt::mawt.gmk patch-j2se::awt::mlib_sys.c patch-j2se::bi=
n::java_md.c patch-j2se::common::Defs-bsd.gmk patch-j2se::font::Makefile pa=
tch-j2se::gtk::GTKLookAndFeel.java patch-j2se::gtk::Metacity.java patch-j2s=
e::hpi::memory_md.c patch-j2se::instrument::Makefile patch-j2se::nio::genCh=
arsetProvider.sh patch-j2se::sound::HAE_API_BSDOS.c patch-j2se::xawt::Makef=
ile patch-java_Makefile applied cleanly.
> *** Error code 1
>=20
> Stop in /usr/ports/java/jdk15.
> *** Error code 1
>=20
> Stop in /usr/ports/java/jdk15.
> huff@jerusalem>> ^D=08=08exit
>=20
> Script done on Mon Jun 25 09:04:56 2007
> =09

--=20
Greg Lewis                          Email   : glewis@eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis@FreeBSD.org



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070626072749.GC65217>