Update to Firefox 2.0.0.3 (nb1), from www/firefox2* (see there for history

and change notes).  Firefox 1.5.0.x will be maintained in www/firefox15*,
as discussed on tech-pkg.

6 files changed, 19 insertions, 32 deletions

diff --git a/www/firefox-bin/DESCR b/www/firefox-bin/DESCR
index 2a5e60bf3a5..2f9713be943 100644
--- a/www/firefox-bin/DESCR
+++ b/www/firefox-bin/DESCR
@@ -7,7 +7,3 @@ windows.
 Firefox also offers excellent bookmark and history management, and it
 can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
-
-Note: Firefox 1.5.0.x will be maintained with security and stability
-updates until mid-May, 2007. All users are strongly encouraged to
-upgrade to Firefox 2 (pkgsrc/www/firefox2-bin).
diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 4b171d2ede6..8acdf5fe9e5 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.27 2007/03/21 13:33:05 ghen Exp $
+# $NetBSD: Makefile,v 1.28 2007/05/12 13:53:12 ghen Exp $
 
-MOZILLA=	firefox
-MOZ_VER=	1.5.0.11
-MOZ_DISTVER=	${MOZ_VER}
+MOZILLA=		firefox
+MOZ_VER=		2.0.0.3
+MOZ_DISTVER=		${MOZ_VER}
 
-HOMEPAGE=	http://www.mozilla.com/firefox/
-COMMENT=	Lightweight gecko-based web browser (binary package)
+HOMEPAGE=		http://www.mozilla.com/en-US/firefox/
+COMMENT=		Lightweight gecko-based web browser (binary package)
 
-DIST_SUBDIR=	${MOZILLA}/releases/${MOZ_DIR}
+DIST_SUBDIR=		${MOZILLA}/releases/${MOZ_DIR}
 # binary package is built against GTK2
-MOZ_GTK2=	YES
+MOZ_GTK2=		YES
 
 ONLY_FOR_PLATFORM+=	Linux-*-i386
 
diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386
index 6264e763b8f..d79def91e49 100644
--- a/www/firefox-bin/Makefile.Linux.i386
+++ b/www/firefox-bin/Makefile.Linux.i386
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.Linux.i386,v 1.8 2006/11/25 21:38:51 jdolecek Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.9 2007/05/12 13:53:12 ghen Exp $
 
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}
-MOZ_DIR=	${MOZ_VER}/linux-i686/en-US
-MOZ_PLATFORM=	linux
+DISTNAME=		firefox-${MOZ_DISTVER}
+MOZ_DIR=		${MOZ_DISTVER}/linux-i686/en-US
+MOZ_PLATFORM=		linux
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
index 119d0eef50c..f04d7f6fb2b 100644
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ b/www/firefox-bin/Makefile.NetBSD.i386
@@ -1,20 +1,11 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.10 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.11 2007/05/12 13:53:12 ghen Exp $
 
-BUILD_DEFS+=	MOZILLA_USE_LINUX
+BUILD_DEFS+=		MOZILLA_USE_LINUX
 
 .if defined(MOZILLA_USE_LINUX)
 ONLY_FOR_PLATFORM+=	NetBSD-*-i386
 .  include "Makefile.Linux.i386"
-.  if defined(SUSE_PREFER) && !empty(SUSE_PREFER:M10.0)
-DEPENDS+=	suse_compat>=10.0:../../emulators/suse100_compat
-.  endif
 .else
 PKG_SKIP_REASON+=	"No native pre-built NetBSD binary available."
 PKG_SKIP_REASON+=	"Set MOZILLA_USE_LINUX if you want to use the Linux binary."
-DISTNAME=		${MOZILLA}-${MOZ_DISTVER}-i386-unknown-netbsdelf1.6
-EXTRACT_SUFX=		.tar.bz2
-MOZ_PLATFORM=		netbsd
-
-# no 1.0 build for NetBSD
-#ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
 .endif
diff --git a/www/firefox-bin/PLIST b/www/firefox-bin/PLIST
index 57cf73ae48e..7078f7b62d6 100644
--- a/www/firefox-bin/PLIST
+++ b/www/firefox-bin/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/18 14:24:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/05/12 13:53:12 ghen Exp $
 @comment this PLIST intentionally left blank
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index c7f3bd782a7..80095bdf403 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.24 2007/03/21 13:33:05 ghen Exp $
+$NetBSD: distinfo,v 1.25 2007/05/12 13:53:12 ghen Exp $
 
-SHA1 (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = 180eb33fe66a9bdd4fb2b6f4ee6a07ed7e2b1046
-RMD160 (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = b50b1ffd4edf6d22f18fd882c4f8e6035d5d1919
-Size (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = 8531625 bytes
+SHA1 (firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz) = 4b56f4e77c276a963e48de387741ab74dd2ffbd9
+RMD160 (firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz) = 13f262bc77f5eb21d36e2cc4a2e7c89098ae746c
+Size (firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz) = 9651693 bytes