Move firefox-gtk2-bin package contents to firefox-bin, and rename

package to match.
There are no firefox gtk1 binary packages for linux any longer, so
no need to keep two different -bin packages around.
This way it also matches the non-bin firefox packages.

7 files changed, 25 insertions, 33 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 4dbb79a198a..fef6f4c167e 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,13 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2005/01/22 11:36:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/18 14:24:15 wiz Exp $
 
 MOZILLA=	firefox
-MOZ_VER=	1.0
+MOZ_VER=	1.0.3
+MOZ_DISTVER=	${MOZ_VER}
 
 HOMEPAGE=	http://www.mozilla.org/projects/firefox/
-COMMENT=	Lightweight gecko-based web browser (binary pkg)
+COMMENT=	Lightweight gecko-based web browser (binary package)
+
+DIST_SUBDIR=	${MOZILLA}/${MOZ_DISTDIR}
+# binary package is built against GTK2
+MOZ_GTK2=	YES
 
-# see Makefile.NetBSD.i386 for NetBSD ONLY_FOR_PLATFORM patterns.
 ONLY_FOR_PLATFORM+=	Linux-*-i386
-ONLY_FOR_PLATFORM+=	SunOS-5.[89]*-*
 
 .include "../../www/mozilla-bin/Makefile.common"
diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386
index 95d35e034ba..489b4e1c792 100644
--- a/www/firefox-bin/Makefile.Linux.i386
+++ b/www/firefox-bin/Makefile.Linux.i386
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile.Linux.i386,v 1.3 2005/01/22 11:36:48 jdolecek Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.4 2005/04/18 14:24:15 wiz Exp $
 
-DISTNAME=	${MOZILLA}-${MOZ_VER}-i686-pc-linux-jds2
+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
-
-# 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 902a0beafba..857a46d8b2e 100644
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ b/www/firefox-bin/Makefile.NetBSD.i386
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.6 2005/01/22 11:36:48 jdolecek Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.7 2005/04/18 14:24:15 wiz Exp $
 
 BUILD_DEFS+=	MOZILLA_USE_LINUX
 
 .if defined(MOZILLA_USE_LINUX)
 ONLY_FOR_PLATFORM+=	NetBSD-*-i386
-.include "${.CURDIR}/Makefile.Linux.i386"
+.  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_VER}-i386-unknown-netbsdelf1.6
+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-bin/Makefile.SunOS.i386 b/www/firefox-bin/Makefile.SunOS.i386
deleted file mode 100644
index 8ee43503167..00000000000
--- a/www/firefox-bin/Makefile.SunOS.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.SunOS.i386,v 1.2 2004/06/29 14:47:10 grant Exp $
-
-DISTNAME=	${MOZILLA}-${MOZ_VER}-i386-pc-solaris2.8
-
-MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/Makefile.SunOS.sparc b/www/firefox-bin/Makefile.SunOS.sparc
index c4bf215ce2a..3e16ac61fbb 100644
--- a/www/firefox-bin/Makefile.SunOS.sparc
+++ b/www/firefox-bin/Makefile.SunOS.sparc
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.2 2004/06/29 14:47:10 grant Exp $
+# $NetBSD: Makefile.SunOS.sparc,v 1.3 2005/04/18 14:24:15 wiz Exp $
 
-DISTNAME=	${MOZILLA}-${MOZ_VER}-sparc-sun-solaris2.8
+DISTNAME=	${MOZILLA}-${MOZ_DISTVER}-sparc-sun-solaris2.8-gtk2
 
 MOZ_PLATFORM=	solaris
diff --git a/www/firefox-bin/PLIST b/www/firefox-bin/PLIST
index a82cb0b4cdb..57cf73ae48e 100644
--- a/www/firefox-bin/PLIST
+++ b/www/firefox-bin/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/09 10:29:42 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/04/18 14:24:15 wiz Exp $
 @comment this PLIST intentionally left blank
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index a424db89e81..570c8698e14 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:08:30 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/04/18 14:24:15 wiz Exp $
 
-SHA1 (firefox-1.0-i686-pc-linux-jds2.tar.gz) = c5d7dde0fa4f5872cfdab9461e28974b7265928c
-RMD160 (firefox-1.0-i686-pc-linux-jds2.tar.gz) = b4c919d4d76f1dedd8d9bf2cb81a88169c76fc9e
-Size (firefox-1.0-i686-pc-linux-jds2.tar.gz) = 10297912 bytes
-SHA1 (firefox-1.0-i386-pc-solaris2.8.tar.gz) = 16866aff8ae5b431bdfa6a7a90d350d4de9841b0
-RMD160 (firefox-1.0-i386-pc-solaris2.8.tar.gz) = 35ad1726e381d1499dfc0db1c298ddbf90ff8b00
-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
-RMD160 (firefox-1.0-sparc-sun-solaris2.8.tar.gz) = 1cd8391d82e1fe814a227c8d77c8e60e63ff8a33
+SHA1 (firefox/releases/1.0.3/linux-i686/en-US/firefox-1.0.3.tar.gz) = b7e21bbff750706b6154ce5630960813f4379c8b
+RMD160 (firefox/releases/1.0.3/linux-i686/en-US/firefox-1.0.3.tar.gz) = 0f2e02bf3064c922fc85ab7935d6f8a2fa5976c7
+Size (firefox/releases/1.0.3/linux-i686/en-US/firefox-1.0.3.tar.gz) = 8251239 bytes