summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2006-11-30 11:40:14 +0000
committerghen <ghen@pkgsrc.org>2006-11-30 11:40:14 +0000
commit08e6213557f637099ccc29a908e1e64a9ae17608 (patch)
tree0185f34e625c78d16016a863dcb811a191003e91 /www
parent1d880895fc3fe5b9ba36d8fb6bc5904fae4639c7 (diff)
downloadpkgsrc-08e6213557f637099ccc29a908e1e64a9ae17608.tar.gz
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 (limited to 'www')
-rw-r--r--www/firefox2-bin/Makefile5
-rw-r--r--www/firefox2-gtk1/DESCR2
-rw-r--r--www/firefox2-gtk1/Makefile4
3 files changed, 4 insertions, 7 deletions
diff --git a/www/firefox2-bin/Makefile b/www/firefox2-bin/Makefile
index adee03d4131..4eff2822953 100644
--- a/www/firefox2-bin/Makefile
+++ b/www/firefox2-bin/Makefile
@@ -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 @@ MOZ_GTK2= YES
ONLY_FOR_PLATFORM+= Linux-*-i386
-WRKSRC= ${WRKDIR}/firefox
-
.include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/firefox2-gtk1/DESCR b/www/firefox2-gtk1/DESCR
index 42833edc122..6d549d30604 100644
--- a/www/firefox2-gtk1/DESCR
+++ b/www/firefox2-gtk1/DESCR
@@ -10,4 +10,4 @@ JavaScript, C++, etc. Many extensions are available.
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 --git a/www/firefox2-gtk1/Makefile b/www/firefox2-gtk1/Makefile
index ac327925c2c..f23e295df69 100644
--- a/www/firefox2-gtk1/Makefile
+++ b/www/firefox2-gtk1/Makefile
@@ -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"