update firefox-gtk2-bin to 1.0. changes since 1.0preview1 are same as

for www/firefox.

- deal with Linux binaries having a different directory structure than
  others on the MASTER_SITES.
- undo some brain damage when MOZILLA_USE_LINUX is defined.

4 files changed, 17 insertions, 17 deletions

diff --git a/www/firefox-gtk2-bin/Makefile b/www/firefox-gtk2-bin/Makefile
index e16b6855388..f6d8d4303e7 100644
--- a/www/firefox-gtk2-bin/Makefile
+++ b/www/firefox-gtk2-bin/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2004/10/04 11:28:45 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/02/27 03:50:11 grant Exp $
 
 MOZILLA=	firefox
-MOZ_VER=	0.10.1
-MOZ_DISTVER=	1.0PR
-# Added because 0.10 and 0.10.1 have the same distname.
-# Can be removed on update.
-DIST_SUBDIR=	${MOZILLA}-${MOZ_VER}
+MOZ_VER=	1.0
+MOZ_DISTVER=	${MOZ_VER}
 
 HOMEPAGE=	http://www.mozilla.org/projects/firefox/
 COMMENT=	Lightweight gecko-based web browser (gtk2 binary pkg)
 
 MOZ_GTK2=	YES
+DIST_SUBDIR=	${MOZILLA}-gtk2/${MOZ_DISTDIR}
 
 ONLY_FOR_PLATFORM+=	Linux-*-i386
 
diff --git a/www/firefox-gtk2-bin/Makefile.Linux.i386 b/www/firefox-gtk2-bin/Makefile.Linux.i386
index dfa4ee1af25..35712b3f442 100644
--- a/www/firefox-gtk2-bin/Makefile.Linux.i386
+++ b/www/firefox-gtk2-bin/Makefile.Linux.i386
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.Linux.i386,v 1.2 2004/09/20 15:48:58 erh Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.3 2005/02/27 03:50:11 grant Exp $
 
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-i686-linux-gtk2+xft
+DISTNAME=	${MOZILLA}-${MOZ_DISTVER}
+MOZ_DISTDIR=	releases/${MOZ_DIR}/linux-i686/en-US
+MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/${MOZ_DISTDIR}/
 
 MOZ_PLATFORM=	linux
diff --git a/www/firefox-gtk2-bin/Makefile.NetBSD.i386 b/www/firefox-gtk2-bin/Makefile.NetBSD.i386
index cc38e633486..aae6d3fc1b9 100644
--- a/www/firefox-gtk2-bin/Makefile.NetBSD.i386
+++ b/www/firefox-gtk2-bin/Makefile.NetBSD.i386
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2004/10/04 11:28:45 wiz Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.3 2005/02/27 03:50:11 grant Exp $
 
 BUILD_DEFS+=	MOZILLA_USE_LINUX
 
 .if defined(MOZILLA_USE_LINUX)
-DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-i686-linux-gtk2+xft
-MOZ_PLATFORM=		linux
 ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-MOZILLA_SCRIPT=		${.CURDIR}/files/mozilla.sh
+.  include "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_DISTVER}-i386-unknown-netbsdelf1.6
 EXTRACT_SUFX=		.tar.bz2
 MOZ_PLATFORM=		netbsd
-ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
+
+# no 1.0 build for NetBSD
+#ONLY_FOR_PLATFORM+=	NetBSD-1.6*-i386 NetBSD-2*-i386
 .endif
diff --git a/www/firefox-gtk2-bin/distinfo b/www/firefox-gtk2-bin/distinfo
index 84eca00a2d0..7fafb19f97c 100644
--- a/www/firefox-gtk2-bin/distinfo
+++ b/www/firefox-gtk2-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 14:08:30 wiz Exp $
+$NetBSD: distinfo,v 1.7 2005/02/27 03:50:11 grant Exp $
 
-SHA1 (firefox-0.10.1/firefox-1.0PR-i686-linux-gtk2+xft.tar.gz) = f87a7b0874f70ff665fefdc0b4f32025766a1c34
-RMD160 (firefox-0.10.1/firefox-1.0PR-i686-linux-gtk2+xft.tar.gz) = 252e39c68dbbc153273ad97fbfc7406c46fa9576
-Size (firefox-0.10.1/firefox-1.0PR-i686-linux-gtk2+xft.tar.gz) = 8145364 bytes
+SHA1 (firefox-gtk2/releases/1.0/linux-i686/en-US/firefox-1.0.tar.gz) = 50fc6b1e6b3a7958e9ad6a5a5862fadb4b877bec
+RMD160 (firefox-gtk2/releases/1.0/linux-i686/en-US/firefox-1.0.tar.gz) = 484cb9807ed2106fe78cf5896a46677e41fe2825
+Size (firefox-gtk2/releases/1.0/linux-i686/en-US/firefox-1.0.tar.gz) = 8223869 bytes