- Update www/firefox{,-i18n} to 16.0.2

- Update seamonkey to 2.13.2
- Update ESR ports and libxul to 10.0.10
- Update nspr to 4.9.3
- Update nss to 3.14
- with GNOMEVFS2 option build its extension, too [1]
- make heap-committed and heap-dirty reporters work in about:memory
- properly mark QT4 as experimental (needs love upstream)
- *miscellaneous cleanups and fixups*

mail/thunderbird will be updated once the tarballs are available.

PR:		ports/173052 [1]
Security:	6b3b1b97-207c-11e2-a03f-c8600054b392
Feature safe:	yes
In collaboration with:	Jan Beich <jbeich@tormail.org>

4 files changed, 119 insertions, 20 deletions

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index c5c5c181581a..a8956424ce18 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	10.0.9
+DISTVERSION=	10.0.10
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -80,10 +80,6 @@ MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
 		@MOZ_OBJDIR@/_profile/pgo/profileserver.py"
 .endif
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
-BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
-.endif
-
 .if !empty(CXX:M*clang++*)
 CXXFLAGS+=	-Wno-return-type-c-linkage
 .endif
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index eff211db49e5..f5735dc6faa1 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-10.0.9esr.source.tar.bz2) = 7719499f1b2610b497ed0ebbccd3fc84d2b331fed2ccd447aeb5e6b5b183155c
-SIZE (firefox-10.0.9esr.source.tar.bz2) = 75634700
+SHA256 (firefox-10.0.10esr.source.tar.bz2) = ea14528ae9292332721eef1da5aeebf07c188e5878cd65eb16c2ae03247460c0
+SIZE (firefox-10.0.10esr.source.tar.bz2) = 75629310
diff --git a/www/firefox-esr/files/patch-bug713802 b/www/firefox-esr/files/patch-bug713802
index 956ed1cc8e97..7d3cc4dad110 100644
--- a/www/firefox-esr/files/patch-bug713802
+++ b/www/firefox-esr/files/patch-bug713802
@@ -25,19 +25,6 @@ index 40ab494..eae5645 100755
  # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
  # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
  # because branding dependencies are broken.
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so
- 
- ; [Extensions]
- ;
-+#ifdef MOZ_ENABLE_GIO
-+bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@
-+#endif
-+
- #ifdef MOZ_ENABLE_GNOMEVFS
- bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
- #endif
 diff --git configure.in configure.in
 index 87a9391..2118651 100644
 --- configure.in
diff --git a/www/firefox-esr/files/patch-bug799441 b/www/firefox-esr/files/patch-bug799441
new file mode 100644
index 000000000000..3f9f1b45db2f
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug799441
@@ -0,0 +1,116 @@
+commit b9accdd
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date:   Thu Oct 18 14:47:10 2012 +0200
+
+    Bug 799441 - Build GIO module in libxul. r=ted
+---
+ configure.in                              |  6 ++++++
+ extensions/gio/Makefile.in                | 14 +++-----------
+ toolkit/library/Makefile.in               |  5 +++++
+ toolkit/library/nsStaticXULComponents.cpp |  7 +++++++
+ toolkit/toolkit-tiers.mk                  |  4 ++++
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git configure.in configure.in
+index a9fb5f1..37e6db8 100644
+--- configure.in
++++ configure.in
+@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th
+     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
+ fi
+ 
++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
++    MOZ_GIO_COMPONENT=1
++    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
++fi
++AC_SUBST(MOZ_GIO_COMPONENT)
++
+ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+     AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in
+index ccf2846..79112a8 100644
+--- extensions/gio/Makefile.in
++++ extensions/gio/Makefile.in
+@@ -14,6 +14,9 @@ MODULE		= nkgio
+ LIBRARY_NAME	= nkgio
+ SHORT_LIBNAME	= nkgio
+ IS_COMPONENT	= 1
++EXPORT_LIBRARY	= 1
++MODULE_NAME	= nsGIOModule
++LIBXUL_LIBRARY	= 1
+ 
+ CPPSRCS		= \
+ 		nsGIOProtocolHandler.cpp \
+@@ -21,15 +24,4 @@ CPPSRCS		= \
+ 
+ LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)
+ 
+-EXTRA_DSO_LDOPTS = \
+-		   $(XPCOM_GLUE_LDOPTS) \
+-		   $(MOZ_COMPONENT_LIBS) \
+-		   $(MOZ_GIO_LIBS) \
+-		   $(NULL)
+-
+-# make sure this component is never statically linked into the main
+-# application.  this is necessary since we don't want to force users
+-# to install gio in order to use the rest of mozilla ;-)
+-FORCE_SHARED_LIB= 1
+-
+ include $(topsrcdir)/config/rules.mk
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7f9046e..6499758 100644
+--- toolkit/library/libxul-config.mk
++++ toolkit/library/libxul-config.mk
+@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug
+ endif
+ endif
+ 
++ifdef MOZ_GIO_COMPONENT
++DEFINES += -DMOZ_GIO_COMPONENT
++COMPONENT_LIBS += nkgio
++endif
++
+ ifdef MOZ_APP_COMPONENT_LIBS
+ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
+ endif
+diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp
+index e1d90f2..85b21a2 100644
+--- toolkit/library/nsStaticXULComponents.cpp
++++ toolkit/library/nsStaticXULComponents.cpp
+@@ -164,6 +164,12 @@
+ #define PROFILER_MODULE
+ #endif
+ 
++#if defined(MOZ_GIO_COMPONENT)
++#define GIO_MODULE MODULE(nsGIOModule)
++#else
++#define GIO_MODULE
++#endif
++
+ #define XUL_MODULES                          \
+     MODULE(nsUConvModule)                    \
+     MODULE(nsI18nModule)                     \
+@@ -220,6 +226,7 @@
+     MODULE(nsTelemetryModule)                \
+     MODULE(jsinspector)                      \
+     MODULE(jsdebugger)                       \
++    GIO_MODULE                               \
+     /* end of list */
+ 
+ #define MODULE(_name) \
+diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk
+index e87d7af..4b16d23 100644
+--- toolkit/toolkit-tiers.mk
++++ toolkit/toolkit-tiers.mk
+@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger
+ 
+ tier_platform_dirs += other-licenses/snappy
+ 
++ifdef MOZ_GIO_COMPONENT
++tier_platform_dirs += extensions/gio
++endif
++
+ ifdef APP_LIBXUL_STATICDIRS
+ # Applications can cheat and ask for code to be
+ # built before libxul so libxul can be linked against it.