[pkgsrc/trunk]: pkgsrc/www Register firefox2-bin and firefox2-gtk1 as firefox...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a3830221286
branches:  trunk
changeset: 522002:5a3830221286
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Thu Nov 30 11:40:14 2006 +0000

description:
Register firefox2-bin and firefox2-gtk1 as firefox-* (instead of firefox2-*),
as is done with firefox2 as well now.  This obsoletes additional packages like
firefox2-bin-flash etc.  Downside is that the corresponding 1.5 and 2.0
packages can no longer be installed in parallel.

diffstat:

 www/firefox2-bin/Makefile  |  5 +----
 www/firefox2-gtk1/DESCR    |  2 +-
 www/firefox2-gtk1/Makefile |  4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 74b7c2634b74 -r 5a3830221286 www/firefox2-bin/Makefile
--- a/www/firefox2-bin/Makefile Thu Nov 30 11:34:23 2006 +0000
+++ b/www/firefox2-bin/Makefile Thu Nov 30 11:40:14 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/11/25 21:38:51 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2006/11/30 11:40:14 ghen Exp $
 
 MOZILLA=               firefox
-MOZ_EXTRA=             2
 MOZ_VER=               2.0
 MOZ_DISTVER=           ${MOZ_VER}
 
@@ -14,6 +13,4 @@
 
 ONLY_FOR_PLATFORM+=    Linux-*-i386
 
-WRKSRC=                        ${WRKDIR}/firefox
-
 .include "../../www/seamonkey-bin/Makefile.common"
diff -r 74b7c2634b74 -r 5a3830221286 www/firefox2-gtk1/DESCR
--- a/www/firefox2-gtk1/DESCR   Thu Nov 30 11:34:23 2006 +0000
+++ b/www/firefox2-gtk1/DESCR   Thu Nov 30 11:40:14 2006 +0000
@@ -10,4 +10,4 @@
 Firefox 2 is the next generation release of the award-winning Firefox web
 browser from Mozilla.
 
-firefox2-gtk1 uses GTK+-1.x widgets.
+firefox-gtk1 uses GTK+-1.x widgets.
diff -r 74b7c2634b74 -r 5a3830221286 www/firefox2-gtk1/Makefile
--- a/www/firefox2-gtk1/Makefile        Thu Nov 30 11:34:23 2006 +0000
+++ b/www/firefox2-gtk1/Makefile        Thu Nov 30 11:40:14 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/24 22:20:34 ghen Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/30 11:40:14 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"