4 files changed, 43 insertions, 17 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index bf88a41032b5..92952a72749b 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -20,10 +20,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 BUILD_DEPENDS=	nss>=3.11.2:${PORTSDIR}/security/nss
 
 LATEST_LINK=	firefox2
-#MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
 MOZILLA_NAME=	Firefox
-#MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
-#MOZILLA_SUFX=	-devel
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/'
 
 WANT_GNOME=	yes
@@ -34,7 +31,6 @@ HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4+
-LIBS=		-Wl,-Bsymbolic -lc
 GECKO_PLIST_PRE_FILES=	lib/${MOZILLA}/chrome/icons/default/default.xpm
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons
 
@@ -54,6 +50,8 @@ OPTIONS=	NEWTAB "Open external links in a new tab" on \
 
 .include <bsd.port.pre.mk>
 
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
 .if ${OSVERSION} < 500000
 BROKEN=	does not build
 .endif
@@ -72,6 +70,8 @@ post-extract::
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${GECKO_PTHREAD_LIBS}|' \
+		${WRKSRC}/storage/build/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
diff --git a/www/firefox/files/patch-js_src_jsnum.c b/www/firefox/files/patch-js_src_jsnum.c
new file mode 100644
index 000000000000..74a9eca5d352
--- /dev/null
+++ b/www/firefox/files/patch-js_src_jsnum.c
@@ -0,0 +1,28 @@
+--- js/src/jsnum.c.orig	Sun Nov  5 18:37:07 2006
++++ js/src/jsnum.c	Sun Nov  5 18:42:31 2006
+@@ -45,6 +45,9 @@
+ #if defined(XP_WIN) || defined(XP_OS2)
+ #include <float.h>
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #include <locale.h>
+ #include <limits.h>
+ #include <math.h>
+@@ -532,7 +535,15 @@ static jsdouble NaN;
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version >= 503000
++#include <fenv.h>
++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
++
++#else
++
+ #define FIX_FPU() ((void)0)
++
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
+ 
+ #endif
+ 
diff --git a/www/firefox/files/patch-nothreads-sqlite b/www/firefox/files/patch-nothreads-sqlite
deleted file mode 100644
index 1b1bbbcbda15..000000000000
--- a/www/firefox/files/patch-nothreads-sqlite
+++ /dev/null
@@ -1,12 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig	Mon Sep 25 18:38:04 2006
-+++ db/sqlite3/src/Makefile.in	Mon Sep 25 18:38:14 2006
-@@ -99,7 +99,8 @@
- # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
- # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
- # don't have to vacuum to make sure the data is not visible in the file.
--DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
-+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
-+# -DTHREADSAFE=1
- 
- ifdef ENABLE_TESTS
- ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/www/firefox/files/patch-storage_build_Makefile.in b/www/firefox/files/patch-storage_build_Makefile.in
new file mode 100644
index 000000000000..18202a5a61d8
--- /dev/null
+++ b/www/firefox/files/patch-storage_build_Makefile.in
@@ -0,0 +1,10 @@
+--- storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
++++ storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
+@@ -77,6 +77,7 @@
+ 	$(EXTRA_DSO_LIBS) \
+ 	$(MOZ_COMPONENT_LIBS) \
+ 	$(MOZ_JS_LIBS) \
++	%%PTHREAD_LIBS%% \
+ 	$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk