On Wed, Nov 22, 2006 at 02:10:18PM +0100, Matthias Drochner wrote:
> 
> ghen@NetBSD.org said:
> > Did you already commit the s/firefox2/firefox/ change?  
> 
> No I didn't. I was refering to the patches attached to my initial mail.
> 
> > Packages depending on firefox>=1.xxx:../../www/firefox will indeed default
> > to firefox-1.5.0.x but should work with firefox-2.0 as well.
> 
> The wrong bl3 file would be pulled in. This is probably harmless, but it
> isn't the right thing either.

I'd prefer the simplest way, i.e. just registering the www/firefox2 package as
firefox-2.0 and leaving the rest untouched:

Index: www/firefox2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox2/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- www/firefox2/Makefile	24 Oct 2006 22:20:11 -0000	1.1.1.1
+++ www/firefox2/Makefile	22 Nov 2006 13:27:20 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1.1.1 2006/10/24 22:20:11 ghen Exp $
 
-MOZILLA=		firefox2
+MOZILLA=		firefox
 EXTRACT_SUFX=		.tar.bz2
 COMMENT=		Lightweight gecko-based web browser
 
Index: www/firefox2-gtk1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox2-gtk1/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- www/firefox2-gtk1/Makefile	24 Oct 2006 22:20:34 -0000	1.1.1.1
+++ www/firefox2-gtk1/Makefile	22 Nov 2006 13:27:20 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1.1.1 2006/10/24 22:20:34 ghen Exp $
 
-MOZILLA=	firefox2-gtk1
+MOZILLA=	firefox-gtk1
 COMMENT=	Lightweight gecko-based web browser built with GTK+-1.x
 
 .include "../../www/firefox2/Makefile-firefox.common"

As for the bl3 files, you're right, but I think it would indeed be harmless in
this case.  Btw how do we handle this with other library packages of which we
provide multiple versions?  I think they usually have different basenames as
well (e.g. the *sql packages).

	Geert