Error building misc/openoffice2 with www/firefox2

["Joel CARNAT" <joel%carnat.net@localhost>]

Hi,

as I am already using www/firefox2, I modified misc/openoffice2 files as
follow:
*****************************************************************
--- options.mk.orig     2007-03-13 21:16:51.000000000 +0100
+++ options.mk  2007-03-13 21:22:36.000000000 +0100
@@ -4,5 +4,5 @@
 PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 # kde
 PKG_OPTIONS_REQUIRED_GROUPS=   browser lang
-PKG_OPTIONS_GROUP.browser=     firefox firefox-gtk1 seamonkey seamonkey-gtk1
+PKG_OPTIONS_GROUP.browser=     firefox firefox2 firefox-gtk1 seamonkey
seamonkey-gtk1
 OO_SUPPORTED_LANGUAGES=                en-US af as-IN be-BY bg br bs ca
cs cy da de \
                                el en-GB en-ZA eo es et fa fi fr ga gu-IN
he \
@@ -28,4 +28,9 @@
 .endif

+.if !empty(PKG_OPTIONS:Mfirefox2)
+.include "../../www/firefox2/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-system-mozilla --with-firefox
+.endif
+
 .if !empty(PKG_OPTIONS:Mfirefox-gtk1)
 .include "../../www/firefox-gtk1/buildlink3.mk"
*****************************************************************

When compilling OOo, I get the following error:
=> Required installed package firefox2>=2.0: NOT found
=> Verifying package for ../../www/firefox2
ERROR: [depends.mk] A package matching ``firefox2>=2.0'' should
ERROR:     be installed, but one cannot be found.  Perhaps there is a
ERROR:     stale work directory for ../../www/firefox2?
*** Error code 1

Stop.
make: stopped in /home/cvs/pkgsrc/misc/openoffice2
*** Error code 1

This seem to be because www/firefox2 is registered as firefox-2.x:
#  pkg_info | grep firefox
firefox-2.0.0.2     Lightweight gecko-based web browser

I'm not sure what has to be modified (and how).
>From what I understood buildlink3 refers to firefox2 but Makefile refers
to www/firefox. Is it www/firefox2/buildlink3.mk file or
www/firefox2/Makefile ?

TIA,
     Jo