svn commit: r363978 - in head: Mk Mk/Uses mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files...

Mon Aug 4 09:11:29 UTC 2014

Author: bapt
Date: Mon Aug  4 09:11:25 2014
New Revision: 363978
URL: http://svnweb.freebsd.org/changeset/ports/363978
QAT: https://qat.redports.org/buildarchive/r363978/

Log:
  Update mozilla ports:
  - firefox 31.0
  - firefox-esr 24.7.0
  - libxul 24.7.0
  - seamonkey 2.26.1
  - thunderbird 31.0
  
  Among changes:
  - add workaround for crash with openldap on thunderbird and seamonkey [1]
  - add crashfix for architectures with strict alignmentment
  - backport crashfix with system sqlite/nss on firefox-esr and thunderbird
  - restore hooking jemalloc in sqlite on freebsd 10+
  - fix thunderbird build with -jN [2]
  - respect MAKE_JOBS_NUMBER regardless of kern.smp.cpus [2]
  - define CPE_URI for nspr/nss and firefox/thunderbird/seamonkey
  - require recent gstreamer1-libav i386 crashfix
  - add DTRACE option for use with DTraceToolkit (js_flowtime.d, js_who.d, etc)
  
  PR:		165263 [1]
  PR:		184630 [2]
  Submitted by:	Jan Beich

Added:
  head/mail/thunderbird/files/patch-bug1026499   (contents, props changed)
  head/mail/thunderbird/files/patch-bug1026828   (contents, props changed)
  head/mail/thunderbird/files/patch-bug1041795   (contents, props changed)
  head/mail/thunderbird/files/patch-bug292127   (contents, props changed)
  head/mail/thunderbird/files/patch-bug702179   (contents, props changed)
  head/mail/thunderbird/files/patch-bug779713   (contents, props changed)
  head/mail/thunderbird/files/patch-bug847568   (contents, props changed)
  head/mail/thunderbird/files/patch-bug981348   (contents, props changed)
  head/mail/thunderbird/files/patch-z-bug517422   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1026499   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1041795   (contents, props changed)
  head/www/firefox-esr/files/patch-bug702179   (contents, props changed)
  head/www/firefox-esr/files/patch-bug779713   (contents, props changed)
  head/www/firefox-esr/files/patch-bug938730   (contents, props changed)
  head/www/firefox-esr/files/patch-z-bug1026828   (contents, props changed)
  head/www/firefox/files/patch-bug1026499   (contents, props changed)
  head/www/firefox/files/patch-bug1026828   (contents, props changed)
  head/www/firefox/files/patch-bug1041381   (contents, props changed)
  head/www/firefox/files/patch-bug1041795   (contents, props changed)
  head/www/firefox/files/patch-bug702179   (contents, props changed)
  head/www/firefox/files/patch-bug779713   (contents, props changed)
  head/www/libxul/files/patch-bug1026499   (contents, props changed)
  head/www/libxul/files/patch-bug1041795   (contents, props changed)
  head/www/libxul/files/patch-bug702179   (contents, props changed)
  head/www/libxul/files/patch-bug779713   (contents, props changed)
  head/www/libxul/files/patch-bug938730   (contents, props changed)
  head/www/libxul/files/patch-z-bug1026828   (contents, props changed)
  head/www/seamonkey/files/patch-bug1026499   (contents, props changed)
  head/www/seamonkey/files/patch-bug1026828   (contents, props changed)
  head/www/seamonkey/files/patch-bug1041381   (contents, props changed)
  head/www/seamonkey/files/patch-bug1041795   (contents, props changed)
  head/www/seamonkey/files/patch-bug292127   (contents, props changed)
  head/www/seamonkey/files/patch-bug702179   (contents, props changed)
  head/www/seamonkey/files/patch-bug779713   (contents, props changed)
Deleted:
  head/mail/thunderbird/files/patch-bug783463
  head/mail/thunderbird/files/patch-bug803480
  head/mail/thunderbird/files/patch-bug807492
  head/mail/thunderbird/files/patch-bug810716
  head/mail/thunderbird/files/patch-bug851992
  head/mail/thunderbird/files/patch-bug876156
  head/mail/thunderbird/files/patch-bug878791
  head/mail/thunderbird/files/patch-bug886181
  head/mail/thunderbird/files/patch-bug889699
  head/mail/thunderbird/files/patch-bug893397
  head/mail/thunderbird/files/patch-bug910875
  head/mail/thunderbird/files/patch-bug916216
  head/mail/thunderbird/files/patch-bug916589
  head/mail/thunderbird/files/patch-bug918177
  head/mail/thunderbird/files/patch-bug945046
  head/mail/thunderbird/files/patch-bug946560
  head/mail/thunderbird/files/patch-bug961816
  head/mail/thunderbird/files/patch-bug975634
  head/mail/thunderbird/files/patch-bug977457
  head/mail/thunderbird/files/patch-bug985848
  head/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in
  head/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
  head/mail/thunderbird/files/patch-z-bug847568
  head/mail/thunderbird/files/patch-zz-bug517422
  head/www/firefox-esr/files/patch-ipc-chromium-Makefile.in
  head/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
  head/www/firefox/files/patch-bug893397
  head/www/firefox/files/patch-bug916589
  head/www/firefox/files/patch-bug962345
  head/www/firefox/files/patch-bug975397
  head/www/firefox/files/patch-ipc-chromium-Makefile.in
  head/www/libxul/files/patch-ipc-chromium-Makefile.in
  head/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
  head/www/libxul/files/pkg-deinstall.in
  head/www/libxul/files/pkg-install.in
  head/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
  head/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
  head/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
Modified:
  head/Mk/Uses/gecko.mk
  head/Mk/bsd.gecko.mk
  head/mail/linux-thunderbird/Makefile
  head/mail/linux-thunderbird/distinfo
  head/mail/thunderbird-i18n/Makefile
  head/mail/thunderbird-i18n/distinfo
  head/mail/thunderbird/Makefile
  head/mail/thunderbird/distinfo
  head/mail/thunderbird/files/patch-bug1013675
  head/mail/thunderbird/files/patch-bug1015547
  head/mail/thunderbird/files/patch-bug826985
  head/mail/thunderbird/files/patch-bug961264
  head/mail/thunderbird/files/patch-bug962345
  head/mail/thunderbird/files/patch-clang34-disable-stdcall
  head/mail/thunderbird/files/patch-config-baseconfig.mk
  head/www/firefox-esr-i18n/Makefile
  head/www/firefox-esr-i18n/Makefile.option
  head/www/firefox-esr-i18n/distinfo
  head/www/firefox-esr/Makefile
  head/www/firefox-esr/distinfo
  head/www/firefox-i18n/Makefile
  head/www/firefox-i18n/Makefile.lang
  head/www/firefox-i18n/Makefile.option
  head/www/firefox-i18n/distinfo
  head/www/firefox/Makefile
  head/www/firefox/Makefile.options
  head/www/firefox/distinfo
  head/www/firefox/files/patch-bug1013882
  head/www/firefox/files/patch-bug826985
  head/www/firefox/files/patch-bug847568
  head/www/firefox/files/patch-z-bug517422
  head/www/libxul/Makefile
  head/www/libxul/distinfo
  head/www/linux-firefox/Makefile
  head/www/linux-firefox/distinfo
  head/www/linux-seamonkey/Makefile
  head/www/linux-seamonkey/Makefile.common
  head/www/linux-seamonkey/distinfo
  head/www/seamonkey/Makefile
  head/www/seamonkey/distinfo

Modified: head/Mk/Uses/gecko.mk
==============================================================================

--- head/Mk/Uses/gecko.mk	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/Mk/Uses/gecko.mk	Mon Aug  4 09:11:25 2014	(r363978)
@@ -39,12 +39,12 @@ RUN_DEPENDS+=	libxul>=24:${PORTSDIR}/www
 .elif ${_GECKO_ARGS:Mfirefox}
 
 _GECKO_DEFAULT_VERSION=	24
-_GECKO_VERSIONS=		24 30
+_GECKO_VERSIONS=		24 31
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
 24_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-30_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+31_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
@@ -67,8 +67,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLE
 
 .elif ${_GECKO_ARGS:Mthunderbird}
 
-_GECKO_DEFAULT_VERSION=	24
-_GECKO_VERSIONS=	24
+_GECKO_DEFAULT_VERSION=	31
+_GECKO_VERSIONS=	31
 _GECKO_TYPE=	thunderbird
 
 .if exists(${LOCALBASE}/bin/thunderbird)
@@ -77,7 +77,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLE
 .endif
 
 # Dependence lines for different Thunderbird versions
-24_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+31_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
 
 .else
 IGNORE=	Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/Mk/bsd.gecko.mk	Mon Aug  4 09:11:25 2014	(r363978)
@@ -85,7 +85,8 @@ MOZILLA_VER?=	${PORTVERSION}
 MOZILLA_BIN?=	${PORTNAME}-bin
 MOZILLA_EXEC_NAME?=${MOZILLA}
 MOZ_RPATH?=	${MOZILLA}
-USES+=		compiler:c++11-lib gmake iconv perl5 pkgconfig desktop-file-utils
+USES+=		cpe compiler:c++11-lib gmake iconv perl5 pkgconfig desktop-file-utils
+CPE_VENDOR?=mozilla
 USE_PERL5=	build
 USE_XORG=	xext xrender xt
 
@@ -185,7 +186,7 @@ pixman_EXTRACT_AFTER_ARGS=	--exclude moz
 
 png_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
-png_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libpng
+#png_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libpng
 
 .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
 soundtouch_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
@@ -394,6 +395,15 @@ STRIP=	# ports/184285
 MOZ_OPTIONS+=	--disable-debug --enable-release
 .endif
 
+.if ${PORT_OPTIONS:MDTRACE}
+. if ${OSVERSION} < 1000510
+BROKEN=			dtrace -G crashes with C++ object files
+. endif
+MOZ_OPTIONS+=	--enable-dtrace
+LIBS+=			-lelf
+STRIP=
+.endif
+
 .if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG}
 MOZ_OPTIONS+=	--enable-logging
 .else
@@ -420,6 +430,17 @@ MOZ_OPTIONS+=	--disable-strip --disable-
 MOZ_OPTIONS+=	--enable-strip --enable-install-strip
 .endif
 
+# _MAKE_JOBS is only available after bsd.port.post.mk, thus cannot be
+# used in .mozconfig. And client.mk automatically uses -jN where N
+# is what multiprocessing.cpu_count() returns.
+.if defined(MAKE_JOBS_NUMBER)
+MOZ_MAKE_FLAGS+=-j${MAKE_JOBS_NUMBER}
+.endif
+
+.if defined(MOZ_MAKE_FLAGS)
+MOZ_MK_OPTIONS+=MOZ_MAKE_FLAGS="${MOZ_MAKE_FLAGS}"
+.endif
+
 MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
 		-e 's|@CFLAGS@|${CFLAGS}|g'		\
 		-e 's|@LDFLAGS@|${LDFLAGS}|g'		\

Modified: head/mail/linux-thunderbird/Makefile
==============================================================================
--- head/mail/linux-thunderbird/Makefile	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/linux-thunderbird/Makefile	Mon Aug  4 09:11:25 2014	(r363978)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	24.6.0
+DISTVERSION=	31.0
 CATEGORIES=	mail news net-im ipv6
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US

Modified: head/mail/linux-thunderbird/distinfo
==============================================================================
--- head/mail/linux-thunderbird/distinfo	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/linux-thunderbird/distinfo	Mon Aug  4 09:11:25 2014	(r363978)
@@ -1,5 +1,5 @@
-SHA256 (thunderbird-24.6.0.tar.bz2) = ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987
-SIZE (thunderbird-24.6.0.tar.bz2) = 28991898
+SHA256 (thunderbird-31.0.tar.bz2) = ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae
+SIZE (thunderbird-31.0.tar.bz2) = 33504321
 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b

Modified: head/mail/thunderbird-i18n/Makefile
==============================================================================
--- head/mail/thunderbird-i18n/Makefile	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/thunderbird-i18n/Makefile	Mon Aug  4 09:11:25 2014	(r363978)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	24.6.0
+PORTVERSION=	31.0
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=

Modified: head/mail/thunderbird-i18n/distinfo
==============================================================================
--- head/mail/thunderbird-i18n/distinfo	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/thunderbird-i18n/distinfo	Mon Aug  4 09:11:25 2014	(r363978)
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 6aa3c326c9757751fe655242e446ae4d906a91ee86cc061a3dca1024fc57e88a
-SIZE (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 457862
-SHA256 (xpi/thunderbird-i18n-24.6.0/ast.xpi) = e583f909925f6ecb4f72949bd99340f5a8524c21f2628594dee474c9307e1617
-SIZE (xpi/thunderbird-i18n-24.6.0/ast.xpi) = 373831
-SHA256 (xpi/thunderbird-i18n-24.6.0/be.xpi) = 1fb28fd586a69e277ed01b6d6d636e95c7157bb5327e50662f1faadf524d18d3
-SIZE (xpi/thunderbird-i18n-24.6.0/be.xpi) = 416882
-SHA256 (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 9b3839d5d0b700d1b5258b47dd2cae555845e34c4dd3bc0a2c602dc0a4ff3503
-SIZE (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 485024
-SHA256 (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = 4fa1d881044ebc9b129e7f54b65278e5faa730ed5efc2f354f2ceaa6975398c1
-SIZE (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = 537258
-SHA256 (xpi/thunderbird-i18n-24.6.0/br.xpi) = 31723061e78c394a75f2977a80378c6ceec8fbec7d980becd50dfc93c14e573a
-SIZE (xpi/thunderbird-i18n-24.6.0/br.xpi) = 427680
-SHA256 (xpi/thunderbird-i18n-24.6.0/ca.xpi) = e7fa72f56d0a3ab90dd3df581aab4154552be12f71408e04701e4d3aec2b9e94
-SIZE (xpi/thunderbird-i18n-24.6.0/ca.xpi) = 429746
-SHA256 (xpi/thunderbird-i18n-24.6.0/cs.xpi) = 360e5cb9097c16ac9fd626917777b491c7c00a95b2e1879ae0fad1b7bed2d870
-SIZE (xpi/thunderbird-i18n-24.6.0/cs.xpi) = 431476
-SHA256 (xpi/thunderbird-i18n-24.6.0/da.xpi) = ded61b233f3598f69352d92dc05a7ee9d0bd8852073e2835e0c3b05001f920a8
-SIZE (xpi/thunderbird-i18n-24.6.0/da.xpi) = 409627
-SHA256 (xpi/thunderbird-i18n-24.6.0/de.xpi) = aca6d21ea4176af021b27c67fd21707b0280cf0f1bf6ac34b03b6abf40d50e7e
-SIZE (xpi/thunderbird-i18n-24.6.0/de.xpi) = 408674
-SHA256 (xpi/thunderbird-i18n-24.6.0/el.xpi) = 63080f452b54b7275bfc09b8aa73fd202739c0afd00a1413729b384e86649525
-SIZE (xpi/thunderbird-i18n-24.6.0/el.xpi) = 464553
-SHA256 (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = dfdb57b440d21ea9e140fc528f25e6ab2a1966b3865fc87390362995d7c48067
-SIZE (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = 400962
-SHA256 (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 977732840ff02afdaa0c19c98faf088e799f1f97bb8d70c5e8240fcad862bc5f
-SIZE (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 402144
-SHA256 (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = 3ec3c00f39e98f81c045f6cd41c68bc50ea908c91d295ebd9fa9b18722b83080
-SIZE (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = 425657
-SHA256 (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = 14086fa0e85857aa6430bdbfdd5f1f333a14b846126fba2ebfa65d954b68b609
-SIZE (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = 366308
-SHA256 (xpi/thunderbird-i18n-24.6.0/et.xpi) = 01505e5154f27bea956f17bf1f8ae3ecac21857b9cc631750aaccb2ae3ed3438
-SIZE (xpi/thunderbird-i18n-24.6.0/et.xpi) = 422893
-SHA256 (xpi/thunderbird-i18n-24.6.0/eu.xpi) = 0277449af802ad6fac63b28e7b0383baf2c978ef15bc15a1dd373200762c3d8a
-SIZE (xpi/thunderbird-i18n-24.6.0/eu.xpi) = 418497
-SHA256 (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 9999cf22d0baa8c5c35f560560e1a6ee86fdc37147c433c662f53ed062b251ea
-SIZE (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 424265
-SHA256 (xpi/thunderbird-i18n-24.6.0/fr.xpi) = d053f8f6da0b1d5417342e160824fc0472fd15556b29b2d4a01f043efebbfcac
-SIZE (xpi/thunderbird-i18n-24.6.0/fr.xpi) = 431289
-SHA256 (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 39492e2d8c4d0783b0d3cbc4bdc2067805850041a3e159e7d2f87842e932c155
-SIZE (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 426098
-SHA256 (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 78223fedce58b23f0974b0795d90527778bda0ac07cc523345c471d724cc9d1e
-SIZE (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 437114
-SHA256 (xpi/thunderbird-i18n-24.6.0/gd.xpi) = cfb9655e0423bea9a7b9afe67fc0f38824f859b0bafeb6cacfa346a9e1f9f7db
-SIZE (xpi/thunderbird-i18n-24.6.0/gd.xpi) = 440092
-SHA256 (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 41a888063bf5fc08f46280bb1d4e926b0162357bc2f76903d95272bf4d385683
-SIZE (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 427543
-SHA256 (xpi/thunderbird-i18n-24.6.0/he.xpi) = bdc5f8002eeb770daac280431dcfd837e7e2d6e4b250b37b70dba658dba72437
-SIZE (xpi/thunderbird-i18n-24.6.0/he.xpi) = 457066
-SHA256 (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 1e4cfebe1f3cb0e219e24e9ce2cfdf799a7df046dd4dec81b14f4b1c77104a85
-SIZE (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 422387
-SHA256 (xpi/thunderbird-i18n-24.6.0/hu.xpi) = f374db7d1f05bf2bedb8da02ae4ba37b2cdacffbcbced929be2113525d16a971
-SIZE (xpi/thunderbird-i18n-24.6.0/hu.xpi) = 441512
-SHA256 (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = c2c76a69dc3cb32a2009024d70ba25300bca706c72883f44e4894a679ecb5823
-SIZE (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = 477923
-SHA256 (xpi/thunderbird-i18n-24.6.0/id.xpi) = d25be8b5e37035220e02b07f774d821290ec21d1802973a637abb5af878af690
-SIZE (xpi/thunderbird-i18n-24.6.0/id.xpi) = 457499
-SHA256 (xpi/thunderbird-i18n-24.6.0/is.xpi) = b87e04aa6d35bbb41692c72f9f9cb19246e49a54d4edc3e29fddca5db651a3c0
-SIZE (xpi/thunderbird-i18n-24.6.0/is.xpi) = 425710
-SHA256 (xpi/thunderbird-i18n-24.6.0/it.xpi) = fea724ca6ec33c7462fd4781390a0b310fb3a023aaa99771db83399b65f581fe
-SIZE (xpi/thunderbird-i18n-24.6.0/it.xpi) = 357933
-SHA256 (xpi/thunderbird-i18n-24.6.0/ja.xpi) = 0c2113e085d920d748a0424f89641f92901d9e97ae9c06cfdb561e980a276c99
-SIZE (xpi/thunderbird-i18n-24.6.0/ja.xpi) = 475559
-SHA256 (xpi/thunderbird-i18n-24.6.0/ko.xpi) = cbaa57d1df226fb6f921d90c3b7d93ee47d73b2bb4f7bf3c748171a1c7af2aac
-SIZE (xpi/thunderbird-i18n-24.6.0/ko.xpi) = 428071
-SHA256 (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 6db3fa6fe593292d717b7077142381a038039365e8f14de74f74edbef64950e7
-SIZE (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 443260
-SHA256 (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = 1a773698c405c78a947d5bc2a276f770aa885fad724c9f2b8c04025215c0e994
-SIZE (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = 418922
-SHA256 (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 0761a699166bdcead5330af9691bb8437545dd24d3ce2cd1e642f1a48ecc7180
-SIZE (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 418764
-SHA256 (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 4e1951dbdfdcf06dee95a6884d1e9e7b4cf141d95e078fa1fc5fb79feefe873e
-SIZE (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 421134
-SHA256 (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 8bfa8109aac418ac6650c8419f946250e569d8101f587f9d6f001a6a59b30385
-SIZE (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 508272
-SHA256 (xpi/thunderbird-i18n-24.6.0/pl.xpi) = e3514ebf5207fd6ae6caeb01c624ad015ffdb6e06aae3ffe39feade0bdbcdcce
-SIZE (xpi/thunderbird-i18n-24.6.0/pl.xpi) = 401753
-SHA256 (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = 2bc7c139195fa661fbe0721df4cbb80e56cd193cd7807e8b16a7855d453b66e1
-SIZE (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = 430909
-SHA256 (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 19c86db424f83dda485d655d80830d242850da1008cf2644e0e214d4bf56c745
-SIZE (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 425026
-SHA256 (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 779d52491bfbc449ba87fc4ea11f5190021cb72a45d7167cdbcb8fc10cdbbdeb
-SIZE (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 432384
-SHA256 (xpi/thunderbird-i18n-24.6.0/ro.xpi) = 6b1e81e6df2f2ee752aab0fe1b9290e6c287da4ca498df330601de2bc9f8086e
-SIZE (xpi/thunderbird-i18n-24.6.0/ro.xpi) = 497491
-SHA256 (xpi/thunderbird-i18n-24.6.0/ru.xpi) = 2c4b38d8d1581614ae481efbe1fb1d74e75e374c4360df2dcc5eef335627cab2
-SIZE (xpi/thunderbird-i18n-24.6.0/ru.xpi) = 425098
-SHA256 (xpi/thunderbird-i18n-24.6.0/si.xpi) = 7a5bac3f61891229cb933f82b8b5a196313951db10d157ea70688c69c0a4cf06
-SIZE (xpi/thunderbird-i18n-24.6.0/si.xpi) = 511167
-SHA256 (xpi/thunderbird-i18n-24.6.0/sk.xpi) = 3899a09c9b4f6269830217e5d8ebd26a78619cc95c0a81898ab84a246def5cd8
-SIZE (xpi/thunderbird-i18n-24.6.0/sk.xpi) = 440106
-SHA256 (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 22d81c886d7a775e9b1464550c326c6d2adc32ed87c47fbc47e953ac5d4a388e
-SIZE (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 421706
-SHA256 (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 08a4bf603c50b67e28841e76d1cdb23ec250e52c9afbc04b35059c8ced37120a
-SIZE (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 435215
-SHA256 (xpi/thunderbird-i18n-24.6.0/sr.xpi) = 7e8eb7dd6dd9846bbb704d80dd757086f6da1b38070716cad12e2d6e87a99311
-SIZE (xpi/thunderbird-i18n-24.6.0/sr.xpi) = 518890
-SHA256 (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 4b920e494be9abf2784dc8b8b282b0c022601458e1bdac5ca21b92157f1a0fa6
-SIZE (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 423816
-SHA256 (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 23ca919444d43bc104e282fb3dbaf5c71ebbbfacd80a5c8a1c72ece41971394c
-SIZE (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 534923
-SHA256 (xpi/thunderbird-i18n-24.6.0/tr.xpi) = e6d8de6e52b3bc0bd706d46a25f25e1fe8c5d37608d7d5c251b43008c5397fa6
-SIZE (xpi/thunderbird-i18n-24.6.0/tr.xpi) = 438067
-SHA256 (xpi/thunderbird-i18n-24.6.0/uk.xpi) = 650bbcb5e1879d756953cbe990e78730afbf6b93b4b4fceef6119d3618c00522
-SIZE (xpi/thunderbird-i18n-24.6.0/uk.xpi) = 480949
-SHA256 (xpi/thunderbird-i18n-24.6.0/vi.xpi) = 7c927599de8066f45e07ff338167b9dba1c9b7f179bb8f6c93cdc9b0fa6b4624
-SIZE (xpi/thunderbird-i18n-24.6.0/vi.xpi) = 495559
-SHA256 (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = 63b2f4bfb24ad36d32529a79151a8b73195d4beb35eba9ef4a3e4cf8a2020139
-SIZE (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = 449182
-SHA256 (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 0f99b8c4680ab081629535e79898081c568d3f57c01d7149c69118d4be125e55
-SIZE (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 450001
+SHA256 (xpi/thunderbird-i18n-31.0/ar.xpi) = 81314f4c47393b18c90f4ca64e71747dfc8005e72feb7b4f6c43f87fb7319521
+SIZE (xpi/thunderbird-i18n-31.0/ar.xpi) = 472809
+SHA256 (xpi/thunderbird-i18n-31.0/ast.xpi) = 3a78c9011c7c9e380ae05553b6fb30c4c8235a9910e979f8b7925cda9e036037
+SIZE (xpi/thunderbird-i18n-31.0/ast.xpi) = 393046
+SHA256 (xpi/thunderbird-i18n-31.0/be.xpi) = 40e22baac6e6714a63830bfc83d5652b9b671090d3296736e2dcd917a1f0ceaf
+SIZE (xpi/thunderbird-i18n-31.0/be.xpi) = 427485
+SHA256 (xpi/thunderbird-i18n-31.0/bg.xpi) = c74870d38573d783c47a2ed25cbf9bffe32a0ab389790cde98ce621154d55086
+SIZE (xpi/thunderbird-i18n-31.0/bg.xpi) = 493731
+SHA256 (xpi/thunderbird-i18n-31.0/bn-BD.xpi) = d8e6ff465fab861b49fb1828983b85d9f5dedd93c38dc7f74a62fc8977fe17a1
+SIZE (xpi/thunderbird-i18n-31.0/bn-BD.xpi) = 555610
+SHA256 (xpi/thunderbird-i18n-31.0/br.xpi) = 20fa4c71abf89888ff19ad87dc97c39f93c395f34690b3714ac38014be221cdd
+SIZE (xpi/thunderbird-i18n-31.0/br.xpi) = 441442
+SHA256 (xpi/thunderbird-i18n-31.0/ca.xpi) = 340b8029f83554beca5256296b0715f569b4ac8f00dde62ba25013bbcd672b13
+SIZE (xpi/thunderbird-i18n-31.0/ca.xpi) = 441711
+SHA256 (xpi/thunderbird-i18n-31.0/cs.xpi) = 5abfb0e1dd0d1b2344373044147ab8211342ec14385280b6d6d66db4cbb5e0a9
+SIZE (xpi/thunderbird-i18n-31.0/cs.xpi) = 444698
+SHA256 (xpi/thunderbird-i18n-31.0/da.xpi) = 412cab5c29ee7cd39f3620fcfce05c6753e6c0c6ce7761d8512ecf19d54a04a5
+SIZE (xpi/thunderbird-i18n-31.0/da.xpi) = 422049
+SHA256 (xpi/thunderbird-i18n-31.0/de.xpi) = e76186c43cbb0965f049bdf4770319d5e7595527a76bf2a0683d5c9bd01ac559
+SIZE (xpi/thunderbird-i18n-31.0/de.xpi) = 424663
+SHA256 (xpi/thunderbird-i18n-31.0/el.xpi) = b6f36094ed24b347eaaa4584f4d1459896a17cf1332713c8a7ef9fe44d63f056
+SIZE (xpi/thunderbird-i18n-31.0/el.xpi) = 484852
+SHA256 (xpi/thunderbird-i18n-31.0/en-GB.xpi) = 30db7504cde1359f4e940cee846481e713d6a66442baab9aa6e30287c52f54bf
+SIZE (xpi/thunderbird-i18n-31.0/en-GB.xpi) = 412513
+SHA256 (xpi/thunderbird-i18n-31.0/en-US.xpi) = 89da465c642d4d1aa6ada8b45333cfa2b01d39be2a83904b77c468cfdc351a46
+SIZE (xpi/thunderbird-i18n-31.0/en-US.xpi) = 413657
+SHA256 (xpi/thunderbird-i18n-31.0/es-AR.xpi) = 6467b60b34d140671737d1af81b88d18b09e427374a73c73daf95f59280af6e9
+SIZE (xpi/thunderbird-i18n-31.0/es-AR.xpi) = 438528
+SHA256 (xpi/thunderbird-i18n-31.0/es-ES.xpi) = 58707f9abfdb36f72b09c78c4469047d7ce43ac538b529d77141fd27b31a8b68
+SIZE (xpi/thunderbird-i18n-31.0/es-ES.xpi) = 374978
+SHA256 (xpi/thunderbird-i18n-31.0/et.xpi) = d1ed0b990d44be0317f150037a115b2652397ac0ca428a92972cfd0f6c0b213a
+SIZE (xpi/thunderbird-i18n-31.0/et.xpi) = 434361
+SHA256 (xpi/thunderbird-i18n-31.0/eu.xpi) = 8a569452945478c8ea436f24ca2d0b0067476094e3d83275f7cafce3dc61e551
+SIZE (xpi/thunderbird-i18n-31.0/eu.xpi) = 431446
+SHA256 (xpi/thunderbird-i18n-31.0/fi.xpi) = 847ab3e6bf668fb27a5b56c248ac506602ddb27054692956ccbfc857aa341358
+SIZE (xpi/thunderbird-i18n-31.0/fi.xpi) = 435630
+SHA256 (xpi/thunderbird-i18n-31.0/fr.xpi) = b6a8df2e7ddd74e4b115c8a507a8b09b79aa721537d77c44cac83b7b053505d7
+SIZE (xpi/thunderbird-i18n-31.0/fr.xpi) = 444141
+SHA256 (xpi/thunderbird-i18n-31.0/fy-NL.xpi) = 67430b6113dc2fa2606009f92580fb727d2827116d759cfb75fe3ae0587a249d
+SIZE (xpi/thunderbird-i18n-31.0/fy-NL.xpi) = 438542
+SHA256 (xpi/thunderbird-i18n-31.0/ga-IE.xpi) = 711efc1e1da56ef0c9e096f8fa1ce47715dd49b9b76b2f13a686b32e55dbc4a1
+SIZE (xpi/thunderbird-i18n-31.0/ga-IE.xpi) = 449359
+SHA256 (xpi/thunderbird-i18n-31.0/gd.xpi) = c375218c658607c40d27593ec75b83f937b361a3d8634557e1772abe32723aee
+SIZE (xpi/thunderbird-i18n-31.0/gd.xpi) = 453169
+SHA256 (xpi/thunderbird-i18n-31.0/gl.xpi) = efadaea55ac283c60f2092e9510c02aece8c9447830f0a648fe1afb2aa008815
+SIZE (xpi/thunderbird-i18n-31.0/gl.xpi) = 446785
+SHA256 (xpi/thunderbird-i18n-31.0/he.xpi) = 55cb02490acbbd34eebdbe05b5db90972c6c870d7c8bd18b2528d4ed2140a9dc
+SIZE (xpi/thunderbird-i18n-31.0/he.xpi) = 476108
+SHA256 (xpi/thunderbird-i18n-31.0/hr.xpi) = adc70cf28f04e0412b98705c457efb2001c1929494c1248c2237b51fac5073ab
+SIZE (xpi/thunderbird-i18n-31.0/hr.xpi) = 436977
+SHA256 (xpi/thunderbird-i18n-31.0/hu.xpi) = b82ed4a17349aaddb6298ec2152538f8ebf89642c222eb5bd8ba52fa0aa6c295
+SIZE (xpi/thunderbird-i18n-31.0/hu.xpi) = 454540
+SHA256 (xpi/thunderbird-i18n-31.0/hy-AM.xpi) = 87b39a9b72a892ce0825ca039b7b34c901ee48a0b8206fa6e64d5caefe182888
+SIZE (xpi/thunderbird-i18n-31.0/hy-AM.xpi) = 492763
+SHA256 (xpi/thunderbird-i18n-31.0/id.xpi) = 1409390f3ab8b3340ed1497fe38033f936fb35fcb99502f626d0da34a4bf6261
+SIZE (xpi/thunderbird-i18n-31.0/id.xpi) = 475874
+SHA256 (xpi/thunderbird-i18n-31.0/is.xpi) = c5bc5957acf8129ffde9ba0fb262ed7c2feddf88c97c1cc8bf49619ecce5dfff
+SIZE (xpi/thunderbird-i18n-31.0/is.xpi) = 437957
+SHA256 (xpi/thunderbird-i18n-31.0/it.xpi) = da5517cd37c21ec73d423a3b4efffe2ee587eb6a1ae1e3f05d2f539d2debc2c7
+SIZE (xpi/thunderbird-i18n-31.0/it.xpi) = 367999
+SHA256 (xpi/thunderbird-i18n-31.0/ja.xpi) = 7f4e51b28a6fe1164da52d0efa16f30db29f92a27f4babc09434b0cb6ca57074
+SIZE (xpi/thunderbird-i18n-31.0/ja.xpi) = 489264
+SHA256 (xpi/thunderbird-i18n-31.0/ko.xpi) = bb770426c776fc076655049c60f24b6e0dc797b04412172739b540e907058496
+SIZE (xpi/thunderbird-i18n-31.0/ko.xpi) = 448916
+SHA256 (xpi/thunderbird-i18n-31.0/lt.xpi) = 34227eeb66f796aeb7b0c55b17fb9705fdfabca9329bf063143f8eb0b836d9c3
+SIZE (xpi/thunderbird-i18n-31.0/lt.xpi) = 457810
+SHA256 (xpi/thunderbird-i18n-31.0/nb-NO.xpi) = d07c357b09adee7477b27720b22ba2840dafce8b10f3909968863e08d5c70043
+SIZE (xpi/thunderbird-i18n-31.0/nb-NO.xpi) = 430939
+SHA256 (xpi/thunderbird-i18n-31.0/nl.xpi) = 2094c7577c4e885f0c030d972947d2ccc3abcac9fcd2f927fc8541b567c8a35d
+SIZE (xpi/thunderbird-i18n-31.0/nl.xpi) = 431885
+SHA256 (xpi/thunderbird-i18n-31.0/nn-NO.xpi) = a35351f6a85807f90fd7c7a93978cd9d78e3c5bdd007d4f06974e457768b7177
+SIZE (xpi/thunderbird-i18n-31.0/nn-NO.xpi) = 433195
+SHA256 (xpi/thunderbird-i18n-31.0/pa-IN.xpi) = ce41c104128925d1b03cd2897997686e1f18d79a53fa4f83a401f413526abcfa
+SIZE (xpi/thunderbird-i18n-31.0/pa-IN.xpi) = 525320
+SHA256 (xpi/thunderbird-i18n-31.0/pl.xpi) = 9d12eec1c898e7f20f40134f6bffac186de015f39a3bf9e8bb3e6d3daca11af7
+SIZE (xpi/thunderbird-i18n-31.0/pl.xpi) = 410870
+SHA256 (xpi/thunderbird-i18n-31.0/pt-BR.xpi) = a678b187ac24ca1cabae53d064e5d748aa00a25ffbcb4c0b489449678561f1a9
+SIZE (xpi/thunderbird-i18n-31.0/pt-BR.xpi) = 450473
+SHA256 (xpi/thunderbird-i18n-31.0/pt-PT.xpi) = 61a1bc548da0e54f11b8bc5eb4440a2f62ca5a6d81e52f488c66588b87247c39
+SIZE (xpi/thunderbird-i18n-31.0/pt-PT.xpi) = 439601
+SHA256 (xpi/thunderbird-i18n-31.0/rm.xpi) = 6522ed5a7524a265b9b8d94c3cd7883b1eb69ace23b4844c6fda2649c92beee2
+SIZE (xpi/thunderbird-i18n-31.0/rm.xpi) = 439183
+SHA256 (xpi/thunderbird-i18n-31.0/ro.xpi) = 98edaf17dc690403a8dc3666e0949a3c2737f5855a81f19fb241078a8ee044be
+SIZE (xpi/thunderbird-i18n-31.0/ro.xpi) = 479744
+SHA256 (xpi/thunderbird-i18n-31.0/ru.xpi) = 3e12ee986ee7e69d44253a3ad93cc3776d3b03700100bcda14c357037139bcd6
+SIZE (xpi/thunderbird-i18n-31.0/ru.xpi) = 436153
+SHA256 (xpi/thunderbird-i18n-31.0/si.xpi) = 39845364164e805b9c9d4c1afa887419216842ac04cf9e0d9447cb0af0db0637
+SIZE (xpi/thunderbird-i18n-31.0/si.xpi) = 528810
+SHA256 (xpi/thunderbird-i18n-31.0/sk.xpi) = 390e494377e4c315941ac2650581ed7aa10afb62f65ac7080b8a3a367d758643
+SIZE (xpi/thunderbird-i18n-31.0/sk.xpi) = 452993
+SHA256 (xpi/thunderbird-i18n-31.0/sl.xpi) = 6bf7e8172f6532e44799517db99c7d2db29c7653dee8990fee4ac8a4c9b4bf6e
+SIZE (xpi/thunderbird-i18n-31.0/sl.xpi) = 433872
+SHA256 (xpi/thunderbird-i18n-31.0/sq.xpi) = 6d838ccf9ad458445724d7daafbe5a119405e00fc3b83ef369b911471fad18d0
+SIZE (xpi/thunderbird-i18n-31.0/sq.xpi) = 454692
+SHA256 (xpi/thunderbird-i18n-31.0/sr.xpi) = 7f3a9254300fc2484014d7337d6a776063cc6eb18fbedd18b918b9c65ab6b0ab
+SIZE (xpi/thunderbird-i18n-31.0/sr.xpi) = 537332
+SHA256 (xpi/thunderbird-i18n-31.0/sv-SE.xpi) = 00ca227318e586b8f0a821957358bc3f4e82dd835d9ebc8d4b6cb7951997fff6
+SIZE (xpi/thunderbird-i18n-31.0/sv-SE.xpi) = 436103
+SHA256 (xpi/thunderbird-i18n-31.0/ta-LK.xpi) = 25ecd571f6d36a210e7618f7a4b9080deebd0a23e4f67afaaea011d7f0106dc1
+SIZE (xpi/thunderbird-i18n-31.0/ta-LK.xpi) = 553506
+SHA256 (xpi/thunderbird-i18n-31.0/tr.xpi) = 41cb40d4080284e96239ff4a994d70dacfa4666b80b2500303a6cb8eb704e952
+SIZE (xpi/thunderbird-i18n-31.0/tr.xpi) = 457357
+SHA256 (xpi/thunderbird-i18n-31.0/uk.xpi) = 474c20ee148f732663b53164990934013b3c2620a26d3e9d320c28f83f8f2de9
+SIZE (xpi/thunderbird-i18n-31.0/uk.xpi) = 499654
+SHA256 (xpi/thunderbird-i18n-31.0/vi.xpi) = 36996d67d9c5f8948f0fae1373c559bb60afbe571865c874a5eeba0a82383ac3
+SIZE (xpi/thunderbird-i18n-31.0/vi.xpi) = 513833
+SHA256 (xpi/thunderbird-i18n-31.0/zh-CN.xpi) = 01310efee05f441f74f3d721bfdb24e94880fe450adf26689dedc31ee6483837
+SIZE (xpi/thunderbird-i18n-31.0/zh-CN.xpi) = 462666
+SHA256 (xpi/thunderbird-i18n-31.0/zh-TW.xpi) = e4b4b6d6b97cd77c6f3395c863042c390b1fa36a2fe012e77dfd5f7e3ddedd15
+SIZE (xpi/thunderbird-i18n-31.0/zh-TW.xpi) = 463406

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/thunderbird/Makefile	Mon Aug  4 09:11:25 2014	(r363978)
@@ -2,55 +2,55 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	24.6.0
-PORTREVISION=	3
+DISTVERSION=	31.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
+		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-BUILD_DEPENDS=	nspr>=4.10.2:${PORTSDIR}/devel/nspr \
-		nss>=3.15.4:${PORTSDIR}/security/nss \
-		sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
-		soundtouch>=1.7.0:${PORTSDIR}/audio/soundtouch \
-		harfbuzz>=0.9.16:${PORTSDIR}/print/harfbuzz \
-		graphite2>=1.2.3:${PORTSDIR}/graphics/graphite2 \
+BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
+		nss>=3.16:${PORTSDIR}/security/nss \
+		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
+		harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
 		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
 		opus>=1.1:${PORTSDIR}/audio/opus \
+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
+		sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
+#		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
+
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
-EM_VERSION=	1.6
-L_VERSION=	2.6.5
+EM_VERSION=	1.7
+L_VERSION=	3.3
 
 SSP_UNSAFE=	yes
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=2
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-cairo
 
 WANT_GNOME=	yes
-USE_QT4=	# empty
+USE_QT5=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
 USE_GL=		gl
 USES=		dos2unix tar:bzip2
 DOS2UNIX_FILES=	mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
 
-MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
 MOZ_OPTIONS=	--program-transform-name='s/thunderbird/${MOZILLA}/' \
 	--enable-single-profile --disable-profilesharing \
 	--enable-application=mail --enable-official-branding
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
+MOZ_MK_OPTIONS=	MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_PKGCONFIG_FILES=
 
@@ -74,13 +74,34 @@ OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GST
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-esr24
+WRKSRC=		${WRKDIR}/comm-esr31
 MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 
+# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
+# http://svnweb.freebsd.org/changeset/base/255804
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
+. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+BROKEN=		Cannot build with OPTIMIZED_CFLAGS option due to \
+		a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \
+		use FAVORITE_COMPILER=gcc in Makefile.local/make.conf
+# apply workaround only for -O2 or greater
+. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+.  if ${MACHINE_CPU:Msse2}
+CXXFLAGS+=	-msse2
+.  else
+CXXFLAGS+=	-O1
+.  endif
+. endif
+.endif
+
 .if ${PORT_OPTIONS:MALSA}
-BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
+.endif
+
+.if ${PORT_OPTIONS:MGSTREAMER}
+RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
 
 .if ${PORT_OPTIONS:MENIGMAIL}
@@ -89,7 +110,7 @@ DISTFILES+=	${EM_DISTFILE}:enigmail
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 EM_DISTNAME=	enigmail-${EM_VERSION}
 EM_DISTFILE=	${EM_DISTNAME}.tar.gz
-EM_XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/}.xpi
+EM_XPI_FILE=	${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi
 EM_ORIG_ID=	{847b3a00-7ab1-11d4-8f02-006008948af5}
 EM_ID=		${PORTNAME}@mozilla-enigmail.org
 EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/install.rdf \
@@ -123,10 +144,12 @@ post-patch:
 		${WRKSRC}/mail/app/nsMailApp.cpp
 .if ${PORT_OPTIONS:MENIGMAIL}
 	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \
-		${WRKSRC}/mailnews/extensions/enigmail/makemake
+		${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \
+		${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl
 	@${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \
+		-e '/^all/s/ xpi//' \
 		-e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \
-		${WRKSRC}/mailnews/extensions/enigmail/Makefile.in
+		${WRKSRC}/mailnews/extensions/enigmail/Makefile
 	@${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \
 		-e '/em:maxVersion/s/pre//' \
 		${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf
@@ -138,11 +161,13 @@ pre-configure:
 	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 .if ${PORT_OPTIONS:MENIGMAIL}
+post-configure:
+	cd ${WRKSRC}/mailnews/extensions/enigmail/ && \
+		${SETENV} ${MAKE_ENV} ./configure
+
 post-build:
-	cd ${WRKSRC}/mailnews/extensions/enigmail && \
-		./makemake -r -o ${MOZ_OBJDIR}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \
-		-C ${MOZ_OBJDIR}/mailnews/extensions/enigmail
+		-C ${WRKSRC}/mailnews/extensions/enigmail
 .endif
 
 port-pre-install:

Modified: head/mail/thunderbird/distinfo
==============================================================================
--- head/mail/thunderbird/distinfo	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/thunderbird/distinfo	Mon Aug  4 09:11:25 2014	(r363978)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-24.6.0.source.tar.bz2) = ae9a7cbc8dc195bd9f4b7b4edcd33599fa08c5388a0690f77221e6c5566629ea
-SIZE (thunderbird-24.6.0.source.tar.bz2) = 140120461
-SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d
-SIZE (enigmail-1.6.tar.gz) = 1231111
+SHA256 (thunderbird-31.0.source.tar.bz2) = 571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4
+SIZE (thunderbird-31.0.source.tar.bz2) = 170977129
+SHA256 (enigmail-1.7.tar.gz) = cddbf35783194a4e994f9584ad5bee74750e25f690e81727ba9eccc4f814f161
+SIZE (enigmail-1.7.tar.gz) = 1414100

Modified: head/mail/thunderbird/files/patch-bug1013675
==============================================================================
--- head/mail/thunderbird/files/patch-bug1013675	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/thunderbird/files/patch-bug1013675	Mon Aug  4 09:11:25 2014	(r363978)
@@ -2,7 +2,7 @@ diff --git xpcom/base/nsDebugImpl.cpp xp
 index 13a286f..293bd73 100644
 --- mozilla/xpcom/base/nsDebugImpl.cpp
 +++ mozilla/xpcom/base/nsDebugImpl.cpp
-@@ -45,13 +45,44 @@
+@@ -45,12 +45,43 @@
  #endif
  #endif
  
@@ -10,7 +10,6 @@ index 13a286f..293bd73 100644
 +#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
 + || defined(__NetBSD__) || defined(__OpenBSD__)
  #include <stdbool.h>
- #include <sys/types.h>
  #include <unistd.h>
 +#include <sys/param.h>
  #include <sys/sysctl.h>

Modified: head/mail/thunderbird/files/patch-bug1015547
==============================================================================
--- head/mail/thunderbird/files/patch-bug1015547	Mon Aug  4 09:06:06 2014	(r363977)
+++ head/mail/thunderbird/files/patch-bug1015547	Mon Aug  4 09:11:25 2014	(r363978)
@@ -2,11 +2,12 @@ diff --git configure.in configure.in
 index 7bed45f..053de17 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
-@@ -3166,6 +3166,7 @@ AC_CHECK_FUNCS(random strerror lchown fc
- AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
- AC_CHECK_FUNCS(flockfile getpagesize)
- AC_CHECK_FUNCS(localtime_r strtok_r)
-+AC_CHECK_FUNCS(arc4random arc4random_buf)
+@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
+ dnl ========================================================
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
++AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
  
  dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
  AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),

Added: head/mail/thunderbird/files/patch-bug1026499
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1026499	Mon Aug  4 09:11:25 2014	(r363978)
@@ -0,0 +1,68 @@
+commit 8d0efe4
+Author: Martin Husemann <martin at NetBSD.org>
+Date:   Wed Jun 18 18:12:22 2014 +0200
+
+    Bug 1026499 - Use MOZ_ALIGNED_DECL to declare union members in ipdl value declarations. r=bsmedberg
+---
+ ipc/ipdl/ipdl/cxx/ast.py  | 7 ++++---
+ ipc/ipdl/ipdl/cxx/cgen.py | 5 ++++-
+ ipc/ipdl/ipdl/lower.py    | 2 +-
+ 4 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git ipc/ipdl/ipdl/cxx/ast.py ipc/ipdl/ipdl/cxx/ast.py
+index 3180a65..c2d945b 100644
+--- mozilla/ipc/ipdl/ipdl/cxx/ast.py
++++ mozilla/ipc/ipdl/ipdl/cxx/ast.py
+@@ -336,12 +336,13 @@ Type.VOID = Type('void')
+ Type.VOIDPTR = Type('void', ptr=1)
+ 
+ class TypeArray(Node):
+-    def __init__(self, basetype, nmemb):
+-        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr'''
++    def __init__(self, basetype, nmemb, alignType):
++        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr, |alignType| is a type'''
+         self.basetype = basetype
+         self.nmemb = nmemb
++        self.alignType = alignType
+     def __deepcopy__(self, memo):
+-        return TypeArray(deepcopy(self.basetype, memo), nmemb)
++        return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
+ 
+ class TypeEnum(Node):
+     def __init__(self, name=None):
+diff --git ipc/ipdl/ipdl/cxx/cgen.py ipc/ipdl/ipdl/cxx/cgen.py
+index 48b0988..bc914cf 100644
+--- mozilla/ipc/ipdl/ipdl/cxx/cgen.py
++++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py
+@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
+     def visitDecl(self, d):
+         # C-syntax arrays make code generation much more annoying
+         if isinstance(d.type, TypeArray):
++            self.write('MOZ_ALIGNED_DECL(')
+             d.type.basetype.accept(self)
+         else:
+             d.type.accept(self)
+@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
+         if isinstance(d.type, TypeArray):
+             self.write('[')
+             d.type.nmemb.accept(self)
+-            self.write(']')
++            self.write('], MOZ_ALIGNOF(')
++            d.type.alignType.accept(self)
++            self.write('))')
+ 
+     def visitParam(self, p):
+         self.visitDecl(p)
+diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py
+index e97a34c..9360f3c 100644
+--- mozilla/ipc/ipdl/ipdl/lower.py
++++ mozilla/ipc/ipdl/ipdl/lower.py
+@@ -768,7 +768,7 @@ IPDL union type."""
+         if self.recursive:
+             return self.ptrToType()
+         else:
+-            return TypeArray(Type('char'), ExprSizeof(self.internalType()))
++            return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType())
+ 
+     def unionValue(self):
+         # NB: knows that Union's storage C union is named |mValue|

Added: head/mail/thunderbird/files/patch-bug1026828
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1026828	Mon Aug  4 09:11:25 2014	(r363978)
@@ -0,0 +1,20 @@
+diff --git storage/src/moz.build storage/src/moz.build
+index 4cd2551..5c40536 100644
+--- mozilla/storage/src/moz.build
++++ mozilla/storage/src/moz.build
+@@ -50,11 +50,14 @@ FINAL_LIBRARY = 'storagecomps'
+ # (such as NSS) might trigger an initialization of sqlite and allocation
+ # of memory using the default allocator, prior to the storage service
+ # registering its allocator, causing memory management failures (bug 938730).
++# However, this is not an issue if both the jemalloc allocator and the default
++# allocator are the same thing.
+ #
+ # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
+ # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
+ # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
+-if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
++if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
++                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
+     if CONFIG['OS_TARGET'] != 'Android':
+         DEFINES['MOZ_STORAGE_MEMORY'] = True
+ 

Added: head/mail/thunderbird/files/patch-bug1041795
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1041795	Mon Aug  4 09:11:25 2014	(r363978)
@@ -0,0 +1,48 @@
+diff --git config/rules.mk config/rules.mk
+index 4d67eda..783942f 100644
+--- mozilla/config/rules.mk
++++ mozilla/config/rules.mk
+@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ
+ ifndef DTRACE_LIB_DEPENDENT
+ NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
+ $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
+-	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
++	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
+ endif
+ endif
+ endif
+@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER
+ endif
+ ifdef DTRACE_LIB_DEPENDENT
+ ifndef XP_MACOSX
+-	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
++	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
+ endif
+ 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
+ 	@$(RM) $(DTRACE_PROBE_OBJ)
+diff --git js/src/Makefile.in js/src/Makefile.in
+index 28ca5e8..96793d7 100644
+--- mozilla/js/src/Makefile.in
++++ mozilla/js/src/Makefile.in
+@@ -342,7 +342,7 @@ endif
+ 
+ ifdef HAVE_DTRACE
+ $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
+-	dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
++	dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
+ 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ 	    -e '/const/!s/char \*/const char */g' \
+ 	    javascript-trace.h.in > javascript-trace.h
+diff --git probes/Makefile.in probes/Makefile.in
+index 6d18f34..deec83f 100644
+--- mozilla/probes/Makefile.in
++++ mozilla/probes/Makefile.in
+@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h
+ 
+ # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE
+ $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
+-	dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
++	dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
+ 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ 	    mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
+ 	rm mozilla-trace.h.tmp

Added: head/mail/thunderbird/files/patch-bug292127
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug292127	Mon Aug  4 09:11:25 2014	(r363978)
@@ -0,0 +1,232 @@
+--- ldap/sdks/c-sdk/ldap/include/ldap.h~
++++ ldap/sdks/c-sdk/ldap/include/ldap.h
+@@ -40,6 +40,229 @@
+ #ifndef _LDAP_H
+ #define _LDAP_H
+ 
++/* rename symbols to not clash with openldap (bug 292127) */
++#define ldap_abandon moz_ldap_abandon
++#define ldap_abandon_ext moz_ldap_abandon_ext
++#define ldap_abandoned moz_ldap_abandoned
++#define ldap_add moz_ldap_add
++#define ldap_add_ext moz_ldap_add_ext
++#define ldap_add_ext_s moz_ldap_add_ext_s
++#define ldap_add_result_entry moz_ldap_add_result_entry
++#define ldap_add_s moz_ldap_add_s
++#define ldap_ber_free moz_ldap_ber_free
++#define ldap_bind moz_ldap_bind
++#define ldap_bind_s moz_ldap_bind_s
++#define ldap_build_filter moz_ldap_build_filter
++#define ldap_cache_flush moz_ldap_cache_flush
++#define ldap_charray_add moz_ldap_charray_add
++#define ldap_charray_dup moz_ldap_charray_dup
++#define ldap_charray_free moz_ldap_charray_free
++#define ldap_charray_inlist moz_ldap_charray_inlist
++#define ldap_charray_merge moz_ldap_charray_merge
++#define ldap_charray_position moz_ldap_charray_position
++#define ldap_compare moz_ldap_compare
++#define ldap_compare_ext moz_ldap_compare_ext
++#define ldap_compare_ext_s moz_ldap_compare_ext_s
++#define ldap_compare_s moz_ldap_compare_s
++#define ldap_control_free moz_ldap_control_free
++#define ldap_controls_free moz_ldap_controls_free
++#define ldap_count_entries moz_ldap_count_entries
++#define ldap_count_messages moz_ldap_count_messages
++#define ldap_count_references moz_ldap_count_references
++#define ldap_count_values moz_ldap_count_values
++#define ldap_count_values_len moz_ldap_count_values_len
++#define ldap_create_authzid_control moz_ldap_create_authzid_control
++#define ldap_create_filter moz_ldap_create_filter
++#define ldap_create_geteffectiveRights_control moz_ldap_create_geteffectiveRights_control
++#define ldap_create_passwordpolicy_control moz_ldap_create_passwordpolicy_control
++#define ldap_create_passwordpolicy_control_ext moz_ldap_create_passwordpolicy_control_ext
++#define ldap_create_persistentsearch_control moz_ldap_create_persistentsearch_control
++#define ldap_create_proxiedauth_control moz_ldap_create_proxiedauth_control
++#define ldap_create_proxyauth_control moz_ldap_create_proxyauth_control
++#define ldap_create_sort_control moz_ldap_create_sort_control
++#define ldap_create_sort_keylist moz_ldap_create_sort_keylist
++#define ldap_create_userstatus_control moz_ldap_create_userstatus_control
++#define ldap_create_virtuallist_control moz_ldap_create_virtuallist_control
++#define ldap_delete moz_ldap_delete
++#define ldap_delete_ext moz_ldap_delete_ext
++#define ldap_delete_ext_s moz_ldap_delete_ext_s
++#define ldap_delete_result_entry moz_ldap_delete_result_entry
++#define ldap_delete_s moz_ldap_delete_s
++#define ldap_dn2ufn moz_ldap_dn2ufn
++#define ldap_entry2html moz_ldap_entry2html
++#define ldap_entry2html_search moz_ldap_entry2html_search
++#define ldap_entry2text moz_ldap_entry2text
++#define ldap_entry2text_search moz_ldap_entry2text_search
++#define ldap_err2string moz_ldap_err2string
++#define ldap_errlist moz_ldap_errlist
++#define ldap_explode moz_ldap_explode
++#define ldap_explode_dn moz_ldap_explode_dn
++#define ldap_explode_dns moz_ldap_explode_dns
++#define ldap_explode_rdn moz_ldap_explode_rdn
++#define ldap_extended_operation moz_ldap_extended_operation
++#define ldap_extended_operation_s moz_ldap_extended_operation_s
++#define ldap_find_control moz_ldap_find_control
++#define ldap_first_attribute moz_ldap_first_attribute
++#define ldap_first_disptmpl moz_ldap_first_disptmpl
++#define ldap_first_entry moz_ldap_first_entry
++#define ldap_first_message moz_ldap_first_message
++#define ldap_first_reference moz_ldap_first_reference
++#define ldap_first_searchobj moz_ldap_first_searchobj
++#define ldap_first_tmplcol moz_ldap_first_tmplcol
++#define ldap_first_tmplrow moz_ldap_first_tmplrow
++#define ldap_free_friendlymap moz_ldap_free_friendlymap
++#define ldap_free_searchprefs moz_ldap_free_searchprefs
++#define ldap_free_sort_keylist moz_ldap_free_sort_keylist
++#define ldap_free_templates moz_ldap_free_templates
++#define ldap_free_urldesc moz_ldap_free_urldesc
++#define ldap_friendly_name moz_ldap_friendly_name
++#define ldap_get_dn moz_ldap_get_dn
++#define ldap_get_entry_controls moz_ldap_get_entry_controls
++#define ldap_get_lang_values moz_ldap_get_lang_values
++#define ldap_get_lang_values_len moz_ldap_get_lang_values_len
++#define ldap_get_lderrno moz_ldap_get_lderrno
++#define ldap_get_option moz_ldap_get_option
++#define ldap_get_values moz_ldap_get_values
++#define ldap_get_values_len moz_ldap_get_values_len
++#define ldap_getfilter_free moz_ldap_getfilter_free
++#define ldap_getfirstfilter moz_ldap_getfirstfilter
++#define ldap_getnextfilter moz_ldap_getnextfilter
++#define ldap_init moz_ldap_init
++#define ldap_init_getfilter moz_ldap_init_getfilter
++#define ldap_init_getfilter_buf moz_ldap_init_getfilter_buf
++#define ldap_init_searchprefs moz_ldap_init_searchprefs
++#define ldap_init_searchprefs_buf moz_ldap_init_searchprefs_buf
++#define ldap_init_templates moz_ldap_init_templates
++#define ldap_init_templates_buf moz_ldap_init_templates_buf
++#define ldap_is_dns_dn moz_ldap_is_dns_dn
++#define ldap_is_ldap_url moz_ldap_is_ldap_url
++#define ldap_keysort_entries moz_ldap_keysort_entries
++#define ldap_ld_free moz_ldap_ld_free
++#define ldap_memcache_abandon moz_ldap_memcache_abandon
++#define ldap_memcache_append moz_ldap_memcache_append
++#define ldap_memcache_createkey moz_ldap_memcache_createkey
++#define ldap_memcache_destroy moz_ldap_memcache_destroy
++#define ldap_memcache_flush moz_ldap_memcache_flush
++#define ldap_memcache_flush_results moz_ldap_memcache_flush_results
++#define ldap_memcache_get moz_ldap_memcache_get
++#define ldap_memcache_init moz_ldap_memcache_init
++#define ldap_memcache_new moz_ldap_memcache_new
++#define ldap_memcache_result moz_ldap_memcache_result
++#define ldap_memcache_set moz_ldap_memcache_set
++#define ldap_memcache_update moz_ldap_memcache_update
++#define ldap_memfree moz_ldap_memfree
++#define ldap_modify moz_ldap_modify
++#define ldap_modify_ext moz_ldap_modify_ext
++#define ldap_modify_ext_s moz_ldap_modify_ext_s
++#define ldap_modify_s moz_ldap_modify_s
++#define ldap_modrdn moz_ldap_modrdn
++#define ldap_modrdn2 moz_ldap_modrdn2
++#define ldap_modrdn2_s moz_ldap_modrdn2_s
++#define ldap_modrdn_s moz_ldap_modrdn_s
++#define ldap_mods_free moz_ldap_mods_free
++#define ldap_msgdelete moz_ldap_msgdelete
++#define ldap_msgfree moz_ldap_msgfree
++#define ldap_msgid moz_ldap_msgid
++#define ldap_msgtype moz_ldap_msgtype
++#define ldap_multisort_entries moz_ldap_multisort_entries
++#define ldap_name2template moz_ldap_name2template
++#define ldap_next_attribute moz_ldap_next_attribute
++#define ldap_next_disptmpl moz_ldap_next_disptmpl
++#define ldap_next_entry moz_ldap_next_entry
++#define ldap_next_message moz_ldap_next_message
++#define ldap_next_reference moz_ldap_next_reference
++#define ldap_next_searchobj moz_ldap_next_searchobj
++#define ldap_next_tmplcol moz_ldap_next_tmplcol
++#define ldap_next_tmplrow moz_ldap_next_tmplrow
++#define ldap_oc2template moz_ldap_oc2template
++#define ldap_open moz_ldap_open
++#define ldap_parse_authzid_control moz_ldap_parse_authzid_control
++#define ldap_parse_entrychange_control moz_ldap_parse_entrychange_control
++#define ldap_parse_extended_result moz_ldap_parse_extended_result
++#define ldap_parse_passwd moz_ldap_parse_passwd
++#define ldap_parse_passwordpolicy_control moz_ldap_parse_passwordpolicy_control
++#define ldap_parse_passwordpolicy_control_ext moz_ldap_parse_passwordpolicy_control_ext
++#define ldap_parse_reference moz_ldap_parse_reference
++#define ldap_parse_result moz_ldap_parse_result
++#define ldap_parse_sasl_bind_result moz_ldap_parse_sasl_bind_result
++#define ldap_parse_sort_control moz_ldap_parse_sort_control
++#define ldap_parse_userstatus_control moz_ldap_parse_userstatus_control
++#define ldap_parse_virtuallist_control moz_ldap_parse_virtuallist_control
++#define ldap_parse_whoami moz_ldap_parse_whoami
++#define ldap_passwd moz_ldap_passwd
++#define ldap_passwd_s moz_ldap_passwd_s
++#define ldap_passwordpolicy_err2txt moz_ldap_passwordpolicy_err2txt
++#define ldap_perror moz_ldap_perror
++#define ldap_rename moz_ldap_rename
++#define ldap_rename_s moz_ldap_rename_s
++#define ldap_result moz_ldap_result
++#define ldap_result2error moz_ldap_result2error
++#define ldap_sasl_bind moz_ldap_sasl_bind
++#define ldap_sasl_bind_s moz_ldap_sasl_bind_s
++#define ldap_sasl_interactive_bind_ext_s moz_ldap_sasl_interactive_bind_ext_s
++#define ldap_sasl_interactive_bind_s moz_ldap_sasl_interactive_bind_s
++#define ldap_search moz_ldap_search
++#define ldap_search_ext moz_ldap_search_ext
++#define ldap_search_ext_s moz_ldap_search_ext_s
++#define ldap_search_s moz_ldap_search_s
++#define ldap_search_st moz_ldap_search_st
++#define ldap_set_filter_additions moz_ldap_set_filter_additions
++#define ldap_set_lderrno moz_ldap_set_lderrno
++#define ldap_set_option moz_ldap_set_option
++#define ldap_set_rebind_proc moz_ldap_set_rebind_proc
++#define ldap_setfilteraffixes moz_ldap_setfilteraffixes
++#define ldap_simple_bind moz_ldap_simple_bind
++#define ldap_simple_bind_s moz_ldap_simple_bind_s
++#define ldap_sort_entries moz_ldap_sort_entries
++#define ldap_sort_strcasecmp moz_ldap_sort_strcasecmp
++#define ldap_sort_values moz_ldap_sort_values
++#define ldap_start_tls_s moz_ldap_start_tls_s
++#define ldap_str2charray moz_ldap_str2charray
++#define ldap_tmplattrs moz_ldap_tmplattrs
++#define ldap_tmplerr2string moz_ldap_tmplerr2string
++#define ldap_tmplerrlist moz_ldap_tmplerrlist
++#define ldap_ufn_search_c moz_ldap_ufn_search_c
++#define ldap_ufn_search_ct moz_ldap_ufn_search_ct
++#define ldap_ufn_search_ctx moz_ldap_ufn_search_ctx
++#define ldap_ufn_search_s moz_ldap_ufn_search_s
++#define ldap_ufn_setfilter moz_ldap_ufn_setfilter
++#define ldap_ufn_setprefix moz_ldap_ufn_setprefix
++#define ldap_ufn_timeout moz_ldap_ufn_timeout
++#define ldap_unbind moz_ldap_unbind
++#define ldap_unbind_ext moz_ldap_unbind_ext
++#define ldap_unbind_s moz_ldap_unbind_s
++#define ldap_url_parse moz_ldap_url_parse
++#define ldap_url_parse_no_defaults moz_ldap_url_parse_no_defaults
++#define ldap_url_search moz_ldap_url_search
++#define ldap_url_search_s moz_ldap_url_search_s
++#define ldap_url_search_st moz_ldap_url_search_st
++#define ldap_utf8characters moz_ldap_utf8characters
++#define ldap_utf8copy moz_ldap_utf8copy
++#define ldap_utf8getcc moz_ldap_utf8getcc
++#define ldap_utf8isalnum moz_ldap_utf8isalnum
++#define ldap_utf8isalpha moz_ldap_utf8isalpha
++#define ldap_utf8isdigit moz_ldap_utf8isdigit
++#define ldap_utf8isspace moz_ldap_utf8isspace
++#define ldap_utf8isxdigit moz_ldap_utf8isxdigit
++#define ldap_utf8len moz_ldap_utf8len
++#define ldap_utf8next moz_ldap_utf8next
++#define ldap_utf8prev moz_ldap_utf8prev
++#define ldap_utf8strtok_r moz_ldap_utf8strtok_r
++#define ldap_vals2html moz_ldap_vals2html
++#define ldap_vals2text moz_ldap_vals2text
++#define ldap_value_free moz_ldap_value_free
++#define ldap_value_free_len moz_ldap_value_free_len
++#define ldap_version moz_ldap_version
++#define ldap_whoami moz_ldap_whoami
++#define ldap_whoami_s moz_ldap_whoami_s
++#define ldap_x_calloc moz_ldap_x_calloc
++#define ldap_x_free moz_ldap_x_free
++#define ldap_x_hostlist_first moz_ldap_x_hostlist_first
++#define ldap_x_hostlist_next moz_ldap_x_hostlist_next
++#define ldap_x_hostlist_statusfree moz_ldap_x_hostlist_statusfree
++#define ldap_x_malloc moz_ldap_x_malloc
++#define ldap_x_realloc moz_ldap_x_realloc
++
+ /* Standard LDAP API functions and declarations */ 
+ #include "ldap-standard.h"
+ 

Added: head/mail/thunderbird/files/patch-bug702179
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug702179	Mon Aug  4 09:11:25 2014	(r363978)
@@ -0,0 +1,36 @@
+commit 6ddaacd
+Author: Ginn Chen <ginn.chen at oracle.com>
+Date:   Wed Nov 30 07:23:46 2011 +0800
+
+    Bug 702179 dtrace probes are not installed on Solaris with static js lib r=glandium
+---
+ configure.in       | 2 +-
+ js/src/Makefile.in | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git configure.in configure.in
+index 66549c1..75b848d 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
+ MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation
+ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
+ 
+-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)'
+ MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+ XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
+diff --git js/src/Makefile.in js/src/Makefile.in
+index e28160a..28ca5e8 100644
+--- mozilla/js/src/Makefile.in
++++ mozilla/js/src/Makefile.in
+@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
+ STATIC_LIBRARY_NAME = js_static
+ LIBS		= $(NSPR_LIBS)
+ 
+-DIST_INSTALL = 1
+-
+ ifdef JS_STANDALONE
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
+ ifndef MOZ_NATIVE_ZLIB

Added: head/mail/thunderbird/files/patch-bug779713
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug779713	Mon Aug  4 09:11:25 2014	(r363978)
@@ -0,0 +1,75 @@
+--- mozilla/mfbt/Alignment.h
++++ mozilla/mfbt/Alignment.h
+@@ -9,11 +9,20 @@
+ #ifndef mozilla_Alignment_h
+ #define mozilla_Alignment_h
+ 
++#include "mozilla/Attributes.h"
++
+ #include <stddef.h>
+ #include <stdint.h>
+ 
+ namespace mozilla {
+ 
++#if defined(MOZ_HAVE_CXX11_ALIGNAS)
++#define MOZ_ALIGNOF(T) alignof(T)
++#elif defined(__GNUC__)
++#define MOZ_ALIGNOF(T) __alignof__(T)
++#elif defined(_MSC_VER)
++#define MOZ_ALIGNOF(T) __alignof(T)
++#else
+ /*
+  * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
+  * bytes of alignment a given type needs.
+@@ -32,6 +41,7 @@ public:
+ };
+ 
+ #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
++#endif

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
