Date: Wed, 14 Dec 2005 23:33:41 -0900 From: Beecher Rintoul <akbeech@gmail.com> To: freebsd-java@freebsd.org Cc: Melvyn Sopacua <freebsd.java@melvyn.homeunix.org> Subject: Re: [fixed] jdk-1.5 update to _3 does not work under freebsd 6 stable Message-ID: <200512142333.43632.akbeech@gmail.com> In-Reply-To: <200512142309.48247.akbeech@gmail.com> References: <200512142200.22535.freebsd.java@melvyn.homeunix.org> <200512150120.01650.freebsd.java@melvyn.homeunix.org> <200512142309.48247.akbeech@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wednesday 14 December 2005 11:09 pm, Beecher Rintoul wrote:
> On Wednesday 14 December 2005 03:20 pm, Melvyn Sopacua wrote:
> > Hi,
> >
> > attached are all patches that resulted in a succesful build for me and
> > firefox showing in about:plugins:
> > Java(TM) Plug-in 1.5.0-p2-root_14_dec_2005_21_49
> >
> > File name: libjavaplugin_oji.so
> > Java(TM) Plug-in 1.5.0
> >
> >
> > They might include bits of patches already in the port as some files
> > already had a .orig.
> >
> > In short - I took the shortest route to getting the plugin implementation
> > to accept PRThread * in place of JDUint32/nsPluginThread, fixed an
> > include patch for moved headers and disabled the obsoleted
> > NS_COMPONENT_MANAGER_CID with an #ifdef.
>
> Thanks for your speedy work fixing this port. I added your patches to the
> port and got this error message on trying a make:
>
> ===> Applying FreeBSD patches for jdk-1.5.0p2_3
> 2 out of 2 hunks failed--saving rejects to Makefile.rej
> => Patch patch-deploy::make::plugin::adapter::ns7-adapter::Makefile.txt
> failed to apply cleanly.
> => Patch(es) patch-control::common::Defs-bsd.gmk
> patch-deploy::common::Defs-bsd.gmk
> patch-deploy::common::DeployRules-solaris.gmk applied cleanly.
> *** Error code 1
>
> Stop in /usr/ports/java/jdk15.
>
> Is there anything I can do to get this working?
>
> uname: FreeBSD stargate.akparadise.com 7.0-CURRENT FreeBSD 7.0-CURRENT #30:
> Wed Dec 14 12:14:39 AKST 2005
> root@stargate.akparadise.com:/usr/obj/usr/src/sys/STARGATE i386
>
>
> Beech
Sorry, I forgot the makefile.rej:
***************
*** 82,91 ****
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/nspr) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/oji) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
- $(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom)
endif
X11HDRDIR = /usr/X11R6/include
ICONVHDRDIR = /usr/local/include
else
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7/nspr)
--- 82,93 ----
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/nspr) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/oji) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
+ $(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom) \
+ $(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/js)
endif
X11HDRDIR = /usr/X11R6/include
ICONVHDRDIR = /usr/local/include
+ NSPRHDRDIR = $(NSPR_HEADERS_PATH)
else
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7/nspr)
***************
*** 110,115 ****
$(COREDIR) \
$(INTERFACESDIR) \
$(MOZHDRDIR) \
$(X11HDRDIR) \
$(ICONVHDRDIR)
--- 112,118 ----
$(COREDIR) \
$(INTERFACESDIR) \
$(MOZHDRDIR) \
+ $(NSPRHDRDIR) \
$(X11HDRDIR) \
$(ICONVHDRDIR)
--
---------------------------------------------------------------------------------------
Beech Rintoul - System Administrator - akbeech@gmail.com
/"\ ASCII Ribbon Campaign | NorthWind Communications
\ / - NO HTML/RTF in e-mail | 201 East 9th Avenue Ste.310
X - NO Word docs in e-mail | Anchorage, AK 99501
/ \ - Please visit Alaska Paradise - http://akparadise.byethost33.com
---------------------------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512142333.43632.akbeech>