Update firefox-bin to firefox 1.0.

Notes:
* NetBSD-native version not available, this can be used only with
  MOZILLA_USE_LINUX
* Linux sets MOZ_GTK2, gtk1-compiled version doesn't appear to be available
* Solaris not tested

4 files changed, 20 insertions, 18 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 846d9adaf20..4dbb79a198a 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/07/15 10:54:19 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/22 11:36:48 jdolecek Exp $
 
 MOZILLA=	firefox
-MOZ_VER=	0.9
+MOZ_VER=	1.0
 
 HOMEPAGE=	http://www.mozilla.org/projects/firefox/
 COMMENT=	Lightweight gecko-based web browser (binary pkg)
diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386
index 253b36d0c7b..95d35e034ba 100644
--- a/www/firefox-bin/Makefile.Linux.i386
+++ b/www/firefox-bin/Makefile.Linux.i386
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2004/06/29 14:47:10 grant Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.3 2005/01/22 11:36:48 jdolecek Exp $
 
-DISTNAME=	${MOZILLA}-${MOZ_VER}-i686-pc-linux-gnu
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=	${MOZILLA}-${MOZ_VER}-i686-pc-linux-jds2
 
 MOZ_PLATFORM=	linux
+
+# the binary firefox 1.0 appears to be built using GTK2
+MOZ_GTK2=	YES
+
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
index 2c32d73c2ea..902a0beafba 100644
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ b/www/firefox-bin/Makefile.NetBSD.i386
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.5 2004/07/15 10:54:19 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.6 2005/01/22 11:36:48 jdolecek Exp $
 
-MOZ_VER=		0.8
+BUILD_DEFS+=	MOZILLA_USE_LINUX
 
 .if defined(MOZILLA_USE_LINUX)
-DISTNAME=		${MOZILLA}-${MOZ_VER}-i686-pc-linux-gnu
-MOZ_PLATFORM=		linux
 ONLY_FOR_PLATFORM+=	NetBSD-*-i386
+.include "${.CURDIR}/Makefile.Linux.i386"
 .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_VER}-i386-unknown-netbsdelf1.6
 EXTRACT_SUFX=		.tar.bz2
 MOZ_PLATFORM=		netbsd
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 4bc45b6c362..5a7a722dbf2 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.5 2004/07/15 10:54:19 grant Exp $
+$NetBSD: distinfo,v 1.6 2005/01/22 11:36:48 jdolecek Exp $
 
 SHA1 (firefox-0.8-i386-unknown-netbsdelf1.6.tar.bz2) = e93acf161226044ca2abd6897c825695dfa562db
 Size (firefox-0.8-i386-unknown-netbsdelf1.6.tar.bz2) = 8722216 bytes
-SHA1 (firefox-0.8-i686-pc-linux-gnu.tar.gz) = 4dd239f88f212958dec089c7a4c02d7dcd157caf
-Size (firefox-0.8-i686-pc-linux-gnu.tar.gz) = 9189879 bytes
-SHA1 (firefox-0.9-i686-pc-linux-gnu.tar.bz2) = c002a6a341484704a7849bf9f8b582b388096dcb
-Size (firefox-0.9-i686-pc-linux-gnu.tar.bz2) = 7445337 bytes
-SHA1 (firefox-0.9-i386-pc-solaris2.8.tar.gz) = c555b597b24d795760b2a4a49542f583d0dcf160
-Size (firefox-0.9-i386-pc-solaris2.8.tar.gz) = 16757633 bytes
-SHA1 (firefox-0.9-sparc-sun-solaris2.8.tar.gz) = ec1968b2be45d86068d456493da78c03046425d9
-Size (firefox-0.9-sparc-sun-solaris2.8.tar.gz) = 12407471 bytes
+SHA1 (firefox-1.0-i686-pc-linux-jds2.tar.gz) = c5d7dde0fa4f5872cfdab9461e28974b7265928c
+Size (firefox-1.0-i686-pc-linux-jds2.tar.gz) = 10297912 bytes
+SHA1 (firefox-1.0-i386-pc-solaris2.8.tar.gz) = 16866aff8ae5b431bdfa6a7a90d350d4de9841b0
+Size (firefox-1.0-i386-pc-solaris2.8.tar.gz) = 16837263 bytes
+SHA1 (firefox-1.0-sparc-sun-solaris2.8.tar.gz) = 3c6707c302b13d80e32b4e7ec6c283e7cb276cbb
+Size (firefox-1.0-sparc-sun-solaris2.8.tar.gz) = 19345072 bytes