Date: Sun, 11 Sep 2005 04:29:25 +0300 From: Panagiotis Astithas <past@ebs.gr> To: Pawel Worach <pawel.worach@gmail.com> Cc: Mark Hobden <markhobden@gmail.com>, freebsd-java@freebsd.org Subject: Re: Patches to update jdk15 to patchset 2 Message-ID: <43238875.8010801@ebs.gr> In-Reply-To: <43235672.8000603@gmail.com> References: <20050909165832.GA16137@misty.eyesbeyond.com> <c57a763005091013427bac4533@mail.gmail.com> <20050910214746.GA6047@misty.eyesbeyond.com> <43235672.8000603@gmail.com>
index | next in thread | previous in thread | raw e-mail
Pawel Worach wrote:
> Greg Lewis wrote:
>
>> No, I think you've done everything correctly. I think that what is
>> happening is that back when I did the plugin support Firefox installed
>> the nspr files, but now it doesn't (as of late August). I will need
>> to do some additional changes to support nspr being separate. Yuk.
>>
>
> Yea, I noticed this too, had to add /usr/local/include/nspr to the
> include path.
I just used the following patch:
--- Makefile.orig Sun Sep 11 04:25:50 2005
+++ Makefile Sat Sep 10 15:08:38 2005
@@ -38,6 +38,7 @@
.endif
USE_ICONV= yes
MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include"
+MAKE_ENV+= NSPRHDRDIR="${LOCALBASE}/include/nspr"
.endif
PKGINSTALL= ${WRKDIR}/pkg-install
Plus the following in
files/patch-deploy::make::plugin::adapter::ns7-adapter::Makefile
--- ../../deploy/make/plugin/adapter/ns7-adapter/Makefile.bak Sat Sep
10 14:58:56 2005
+++ ../../deploy/make/plugin/adapter/ns7-adapter/Makefile Sat Sep
10 15:04:52 2005
@@ -79,7 +79,7 @@
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/$(BROWSER)) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/caps) \
$(subst \,/,
$(MOZILLA_HEADERS_PATH)/$(BROWSER)/liveconnect) \
- $(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/nspr) \
+ $(NSPRHDRDIR) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/oji) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/plugin) \
$(subst \,/, $(MOZILLA_HEADERS_PATH)/$(BROWSER)/xpcom)
This explains why you (Greg) couldn't see the breakage in the Eclipse
port. It only manifests itself with WITH_PLUGIN=firefox, since mozilla
has kept a local subdirectory of nspr include files and libraries,
although it depends on devel/nspr.
Cheers,
Panagiotis
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?43238875.8010801>