diff -ruN --exclude=CVS firefox-devel.orig/Makefile firefox-devel/Makefile
--- firefox-devel.orig/Makefile	Thu Jul 13 22:01:44 2006
+++ firefox-devel/Makefile	Wed Jul 12 19:05:45 2006
@@ -7,14 +7,12 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	2.0a3
-PORTREVISION=	1
+DISTVERSION=	2.0b1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/bonecho/alpha3/source
-#DISTNAME=	${PORTNAME}-${DISTVERSION}-source
-DISTNAME=	bonecho-alpha3-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
diff -ruN --exclude=CVS firefox-devel.orig/distinfo firefox-devel/distinfo
--- firefox-devel.orig/distinfo	Thu Jul 13 22:01:44 2006
+++ firefox-devel/distinfo	Wed Jul 12 19:30:36 2006
@@ -1,3 +1,3 @@
-MD5 (bonecho-alpha3-source.tar.bz2) = 50fc7a086d7911d5d1341df7bffe8d56
-SHA256 (bonecho-alpha3-source.tar.bz2) = 3328e8a072404d31dd77dc95caeb830bf3a7b6f65a1aa2a03bcedde234c9613e
-SIZE (bonecho-alpha3-source.tar.bz2) = 36073138
+MD5 (firefox-2.0b1-source.tar.bz2) = 98c4ab4fe86c12230def007779ce6784
+SHA256 (firefox-2.0b1-source.tar.bz2) = 2d5b71fb9177010ded3eb78b3ff44374599bc59debc1c1a8109f81c0457cd465
+SIZE (firefox-2.0b1-source.tar.bz2) = 36380602
diff -ruN --exclude=CVS firefox-devel.orig/files/patch-libm firefox-devel/files/patch-libm
--- firefox-devel.orig/files/patch-libm	Thu Jul 13 22:01:44 2006
+++ firefox-devel/files/patch-libm	Wed Jul 12 19:37:41 2006
@@ -1,19 +1,3 @@
---- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
-+++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
- 
--FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK	= jsmathtemp.o
- JS_SAFE_ARENA	= 1
-@@ -320,7 +319,4 @@
- endif
- 	@$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
- 
 --- js/Makefile.in	Sun Mar 23 14:36:00 2003
 +++ js/Makefile.in	Thu Aug  4 23:08:06 2005
 @@ -46,5 +46,5 @@
diff -ruN --exclude=CVS firefox-devel.orig/files/patch-sysnss firefox-devel/files/patch-sysnss
--- firefox-devel.orig/files/patch-sysnss	Thu Jul 13 22:01:44 2006
+++ firefox-devel/files/patch-sysnss	Wed Jul 12 19:55:29 2006
@@ -1,12 +1,3 @@
---- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
 --- security/manager/Makefile.in.orig	Tue Mar 28 14:36:54 2006
 +++ security/manager/Makefile.in	Tue Mar 28 14:40:29 2006
 @@ -54,22 +54,13 @@
@@ -148,25 +139,43 @@
  endif
  
  echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in.orig	Tue Jan 31 07:24:14 2006
-+++ security/manager/ssl/src/Makefile.in	Tue Mar 28 15:30:44 2006
-@@ -119,17 +119,16 @@
+--- Makefile.in.orig	Fri Jun 23 22:48:01 2006
++++ Makefile.in	Wed Jul 12 19:51:01 2006
+@@ -91,14 +91,8 @@
+ #
+ # tier 1 -  3rd party individual libraries
+ #
+-tier_1_dirs	+= dbm
+-
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs	+= jpeg
+-endif
+-
+-ifndef MOZ_NATIVE_ZLIB
+-tier_1_dirs	+= modules/zlib
+ endif
+ 
+ # Installer needs standalone libjar, hence standalone zlib
+--- security/manager/ssl/src/Makefile.in.orig	Mon Jun 26 22:14:34 2006
++++ security/manager/ssl/src/Makefile.in	Wed Jul 12 19:54:41 2006
+@@ -122,19 +122,17 @@
  		  pipboot \
  		  $(NULL)
  
 -EXTRA_DEPS = $(NSS_DEP_LIBS)
 -
+ DEFINES += -DNSS_ENABLE_ECC
+ 
  # Use local includes because they are inserted before INCLUDES
  # so that Mozilla's nss.h is used, not glibc's
 -LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
  
  EXTRA_DSO_LDOPTS += \
  		$(MOZ_UNICHARUTIL_LIBS) \
  		$(MOZ_COMPONENT_LIBS) \
  		$(MOZ_JS_LIBS) \
  		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
++		-I%%LOCALBASE%%/include/nss/nss
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk