7 files changed, 28 insertions, 24 deletions
diff --git a/mail/thunderbird-bin-nightly/Makefile b/mail/thunderbird-bin-nightly/Makefile
index 6af35fa1870..89474b526a5 100644
--- a/mail/thunderbird-bin-nightly/Makefile
+++ b/mail/thunderbird-bin-nightly/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/09/24 16:44:36 salo Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:33 jlam Exp $
 
 MOZILLA=	thunderbird
 
 HOMEPAGE=	http://www.mozilla.org/projects/thunderbird/
 COMMENT=	Redesign of the Mozilla mail client (nightly binary pkg)
 
-MOZ_GTK2=	YES
 MOZ_EXTRA=	# empty
 
-ONLY_FOR_PLATFORM+=	Linux-*-i386
-ONLY_FOR_PLATFORM+=	NetBSD-2.*-i386
-ONLY_FOR_PLATFORM+=	SunOS-5.[789]*-sparc
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
 
 .include "../../www/seamonkey-bin-nightly/Makefile.common"
diff --git a/mail/thunderbird-bin-nightly/Makefile.Linux.i386 b/mail/thunderbird-bin-nightly/Makefile.Linux.i386
deleted file mode 100644
index 2687638eb4d..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.Linux.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.Linux.i386,v 1.8 2004/04/28 23:40:12 grant Exp $
-
-DISTNAME=	thunderbird-i686-linux-gtk2+xft
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/latest-trunk/
-
-MOZ_PLATFORM=	linux
diff --git a/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386 b/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386
deleted file mode 100644
index 8e4c0af4112..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2004/05/25 13:42:35 grant Exp $
-
-DISTNAME=	thunderbird-i386-unknown-netbsdelf2.0-gtk2
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/contrib/latest-trunk/
-EXTRACT_SUFX=	.tar.bz2
-
-MOZ_PLATFORM=	netbsd
diff --git a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc b/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
deleted file mode 100644
index b9603e8dcf9..00000000000
--- a/mail/thunderbird-bin-nightly/Makefile.SunOS.sparc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2004/03/05 00:45:32 grant Exp $
-
-DISTNAME=	thunderbird-sparc-sun-solaris2.7
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/contrib/latest-trunk/
-
-MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin-nightly/Makefile.linux-i386 b/mail/thunderbird-bin-nightly/Makefile.linux-i386
new file mode 100644
index 00000000000..830d46963d3
--- /dev/null
+++ b/mail/thunderbird-bin-nightly/Makefile.linux-i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:34 jlam Exp $
+
+DISTNAME=	thunderbird-3.0a1pre.en-US.linux-i686
+EXTRACT_SUFX=	.tar.bz2 
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	linux
diff --git a/mail/thunderbird-bin-nightly/Makefile.solaris-i386 b/mail/thunderbird-bin-nightly/Makefile.solaris-i386
new file mode 100644
index 00000000000..c3e9baa61c8
--- /dev/null
+++ b/mail/thunderbird-bin-nightly/Makefile.solaris-i386
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-i386,v 1.1 2007/07/29 05:19:34 jlam Exp $
+
+SOLARIS_VERSION_REQD?=	10
+
+DISTNAME=	thunderbird-3.0a1.en-US.solaris10-nosvg-i386
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris
diff --git a/mail/thunderbird-bin-nightly/Makefile.solaris-sparc b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc
new file mode 100644
index 00000000000..bd0c4860b87
--- /dev/null
+++ b/mail/thunderbird-bin-nightly/Makefile.solaris-sparc
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.solaris-sparc,v 1.1 2007/07/29 05:19:35 jlam Exp $
+
+SOLARIS_VERSION_REQD?=	10
+
+DISTNAME=	thunderbird-3.0a1.en-US.solaris10-nosvg-sparc
+EXTRACT_SUFX=	.tar.bz2
+
+MOZ_GTK2=	yes
+MOZ_PLATFORM=	solaris