Update to 0.9. For a complete list of what's new, plus an important

list of Known Issues, see:

http://www.mozilla.org/products/firefox/releases/0.9.html

This update also includes a new pkg-install script based on ports/65590
from Thierry Thomas <thierry@pompo.net>.  However...

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
After installing Firefox, you must su - to root, and run ``firefox'' before
running it as any other user.  If you do not su - to root, you may lose some
of your user settings.  If you try to run Firefox as a normal user without
first running it as root, the browser will not show up.  This is a known issue
with Firefox, and they hope to address it in a future release.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

4 files changed, 23 insertions, 53 deletions

diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index a0d469df586e..df281d3a3ca8 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -9,6 +9,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-mailnews
 ac_add_options --disable-composer
+ac_add_options --enable-default-toolkit=gtk2
 ######################################################################
 # FBSD specific
 export CPPFLAGS="@CPPFLAGS@"
@@ -31,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
-ac_add_options --enable-reorder
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -45,6 +45,11 @@ ac_add_options --disable-installer
 ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector
 ######################################################################
 # conditional from port Makefile
+if test -n "$WITH_REORDER"; then
+    ac_add_options --enable-reorder
+else
+    ac_add_options --disable-reorder
+fi # test -n "$WITH_REORDER"
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
     ac_add_options --disable-strip
@@ -52,6 +57,10 @@ else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
     ac_add_options --enable-strip
+    export BUILD_OFFICIAL=1
+    export MOZILLA_OFFICIAL=1
+    mk_add_options BUILD_OFFICIAL=1
+    mk_add_options MOZILLA_OFFICIAL=1
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
@@ -63,9 +72,4 @@ if test -z "$WITHOUT_XFT"; then
 else
     ac_add_options --disable-xft
 fi # test -z "$WITHOUT_XFT"
-if test -n "$WITH_GTK2"; then
-    ac_add_options --enable-default-toolkit=gtk2
-else
-    ac_add_options --enable-default-toolkit=gtk
-fi # test -n "$WITH_GTK2"
 ######################################################################
diff --git a/www/firefox/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h b/www/firefox/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
deleted file mode 100644
index e22c93be389e..000000000000
--- a/www/firefox/files/patch-directory-c-sdk-ldap-libraries-liblber-lber-int.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$FreeBSD$
-
---- directory/c-sdk/ldap/libraries/liblber/lber-int.h	Tue Mar 26 13:53:23 2002
-+++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	Sat Dec 13 13:02:49 2003
-@@ -236,15 +236,15 @@
- 	     (((_l)&0xff0000)>>8) + (((_l)&0xff000000)>>24))
- #define LBER_NTOHL(_l) LBER_HTONL(_l)
- 
--#elif !defined(__alpha) || defined(VMS)
-+#elif !defined(__amd64__) && (!defined(__alpha) || defined(VMS))
- 
- #define LBER_HTONL( l )	htonl( l )
- #define LBER_NTOHL( l )	ntohl( l )
- 
- #else /* __alpha */
- /*
-- * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the
-- * lower-order 32-bits of a (64-bit) long, so we define correct versions
-+ * htonl and ntohl on the 64 bit UNIX platforms only swap the lower-order
-+ * 32-bits of a (64-bit) long, so we define correct versions
-  * here.
-  */
- #define LBER_HTONL( l )	(((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \
-@@ -252,7 +252,7 @@
- 
- #define LBER_NTOHL( l )	(((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
-     			| ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
--#endif /* __alpha */
-+#endif /* __alpha || __amd64__ */
- 
- 
- /* function prototypes */
diff --git a/www/firefox/files/patch-nsprpub-pr-src-io-prprf.c b/www/firefox/files/patch-nsprpub-pr-src-io-prprf.c
index 29b941b60fac..38bd959aef25 100644
--- a/www/firefox/files/patch-nsprpub-pr-src-io-prprf.c
+++ b/www/firefox/files/patch-nsprpub-pr-src-io-prprf.c
@@ -1,14 +1,14 @@
-$FreeBSD$
-
---- nsprpub/pr/src/io/prprf.c	Wed Feb 26 15:53:42 2003
-+++ nsprpub/pr/src/io/prprf.c	Thu Oct 16 22:50:40 2003
-@@ -52,5 +52,8 @@
+--- nsprpub/pr/src/io/prprf.c.orig	Mon Mar  8 22:18:19 2004
++++ nsprpub/pr/src/io/prprf.c	Tue Jun 15 13:17:30 2004
+@@ -51,7 +51,10 @@
+ ** Note: on some platforms va_list is defined as an array,
  ** and requires array notation.
  */
--#if (defined(LINUX) && defined(__powerpc__)) || \
+-#if (defined(LINUX) && defined(__x86_64__))
 +#if defined(__amd64__)
 +#include <stdarg.h>
 +#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__powerpc__)) || \
++#elif (defined(LINUX) && defined(__x86_64__))
+ #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
+ #elif (defined(LINUX) && defined(__powerpc__)) || \
      (defined(LINUX) && defined(__s390__)) || \
-     (defined(LINUX) && defined(__s390x__)) || \
diff --git a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
index dea21b7325a0..9a41bbfc4602 100644
--- a/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ b/www/firefox/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
@@ -1,13 +1,11 @@
-$FreeBSD$
-
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Sun Feb  1 15:39:59 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Sun Feb  1 15:40:11 2004
+--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Tue Jun 15 12:52:36 2004
 @@ -8,7 +8,7 @@
  *  1 is AddRef
  *  2 is Release
  */
 -#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
 +#if !defined(__ia64)
- XPTC_EXPORT NS_IMETHOD Stub3();
- XPTC_EXPORT NS_IMETHOD Stub4();
- XPTC_EXPORT NS_IMETHOD Stub5();
+ NS_IMETHOD Stub3();
+ NS_IMETHOD Stub4();
+ NS_IMETHOD Stub5();