author: Florian Smeets <flo@FreeBSD.org> 2013-04-03 20:27:48 +0000
committer: Florian Smeets <flo@FreeBSD.org> 2013-04-03 20:27:48 +0000
commit: 513d21d8384e61cc02b820137587b3680ffbb51c (patch)
tree: fc7673f01258f369254c78eaa2111a667c2fd1f7 /mail
parent: 7f2a857b2964490ac2c8b80ef6a315366e9bf55a (diff)
download: ports-513d21d8384e61cc02b820137587b3680ffbb51c.tar.gz
ports-513d21d8384e61cc02b820137587b3680ffbb51c.zip
64 files changed, 189 insertions, 3586 deletions
diff --git a/mail/Makefile b/mail/Makefile
index 25256071995d..ac849cd08d3e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -715,8 +715,6 @@
     SUBDIR += textmail
     SUBDIR += thunderbird
     SUBDIR += thunderbird-dictionaries
-    SUBDIR += thunderbird-esr
-    SUBDIR += thunderbird-esr-i18n
     SUBDIR += thunderbird-i18n
     SUBDIR += tkrat2
     SUBDIR += tlb
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index a24990fbc72d..06ca8dedeb47 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-PORTVERSION=	17.0.4
+PORTVERSION=	17.0.5
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR?=	${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 DISTNAME=	${PORTNAME}-${DISTVERSION}esr
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index 65351a5d5f17..05c6f830aef7 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-17.0.4esr.tar.bz2) = 200a9f609455b852a48634932e9bb92e53610c8aac95a7d67107945d083bd83f
-SIZE (thunderbird-17.0.4esr.tar.bz2) = 21483231
+SHA256 (thunderbird-17.0.5esr.tar.bz2) = e1a0282baff12d00c5fe58e7e7f4058eecacd99911d79c5d473b2814042d8f3e
+SIZE (thunderbird-17.0.5esr.tar.bz2) = 21480241
diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile
deleted file mode 100644
index 55cba34ed11e..000000000000
--- a/mail/thunderbird-esr-i18n/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	thunderbird-i18n
-PORTVERSION=	10.0.12
-CATEGORIES=	mail
-MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi
-PKGNAMEPREFIX=
-DISTFILES=	${THUNDERBIRD_I18N_:S/$/.xpi/}
-DIST_SUBDIR=	xpi/${DISTNAME}
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for Thunderbird
-
-EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-
-PLIST?=		${WRKDIR}/plist
-PLISTD?=	${WRKDIR}/plist_dirs
-PLISTF?=	${WRKDIR}/plist_files
-
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
-LATEST_LINK=	thunderbird-esr-i18n
-NO_BUILD=	yes
-USE_THUNDERBIRD=	10
-USE_XPI=	thunderbird linux-thunderbird
-
-THUNDERBIRD_I18N_ALL=	ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
-			fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \
-			pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk zh-TW
-
-.ifdef PACKAGE_BUILDING
-THUNDERBIRD_I18N?=	all
-.else
-THUNDERBIRD_I18N?=	es-ES pt-BR ru ja de fr ko it
-.endif
-
-.if ${THUNDERBIRD_I18N} == all
-THUNDERBIRD_I18N_=	${THUNDERBIRD_I18N_ALL}
-.endif
-THUNDERBIRD_I18N_?=	${THUNDERBIRD_I18N}
-
-WDIR=	langpack-*@thunderbird.mozilla.org
-
-XPI_DISTNAMES=	${THUNDERBIRD_I18N_}
-.for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack-${dist}@thunderbird.mozilla.org
-.endfor
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR} ${WRKSRC}
-	@for lang in ${THUNDERBIRD_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
-		then \
-			exit 1; \
-		fi; \
-		cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/; \
-		${FIND} -H -s * ! -type d | \
-		${SED} -e "s|^|lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTF} && \
-		${FIND} -d * -type d | \
-		${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTD}; \
-	done
-	${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
-	${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
-
-do-install:
-	@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
-	@${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/
-	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/
-	@for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; }
-	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
-	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
-		${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
-	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A}
-	@${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
-
-post-patch:
-	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d'
-
-list-langs:
-	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/${MASTER_SITE_SUBDIR}"|\
-		perl -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1 "}'
-
-.include "${.CURDIR}/../../www/xpi-adblock/Makefile.xpi"
-.include <bsd.port.mk>
diff --git a/mail/thunderbird-esr-i18n/distinfo b/mail/thunderbird-esr-i18n/distinfo
deleted file mode 100644
index 61813a2d542d..000000000000
--- a/mail/thunderbird-esr-i18n/distinfo
+++ /dev/null
@@ -1,84 +0,0 @@
-SHA256 (xpi/thunderbird-i18n-10.0.12/ar.xpi) = 8640606545b0f908e76889ee279e9fae03f7d6cb6874fc7ac2e4ee9f18633426
-SIZE (xpi/thunderbird-i18n-10.0.12/ar.xpi) = 441467
-SHA256 (xpi/thunderbird-i18n-10.0.12/br.xpi) = fdaa276753268349115d5c69171e20c5a5a65163a93dae3af1d56c734be37f8c
-SIZE (xpi/thunderbird-i18n-10.0.12/br.xpi) = 415527
-SHA256 (xpi/thunderbird-i18n-10.0.12/ca.xpi) = 048a97a326e3c96315bd0fe0794565c1c9a218ef7a2b29909d82f5aaaec08164
-SIZE (xpi/thunderbird-i18n-10.0.12/ca.xpi) = 416070
-SHA256 (xpi/thunderbird-i18n-10.0.12/cs.xpi) = f98e04fff0c361cf641f65ce003f2302203dcc44c7e23277fd625415d5c3aae5
-SIZE (xpi/thunderbird-i18n-10.0.12/cs.xpi) = 419419
-SHA256 (xpi/thunderbird-i18n-10.0.12/da.xpi) = 84c41306ec93f2effa1584e715802d4394967f290c1eead20bbf0ab21ac37f71
-SIZE (xpi/thunderbird-i18n-10.0.12/da.xpi) = 363377
-SHA256 (xpi/thunderbird-i18n-10.0.12/de.xpi) = c4699b580db139597596b12c77e8fe8dd1dfdcf877edcdb10d9220b62cc2de2a
-SIZE (xpi/thunderbird-i18n-10.0.12/de.xpi) = 418267
-SHA256 (xpi/thunderbird-i18n-10.0.12/en-GB.xpi) = 4a36fa81eb83964ae211074d1befa5b6582a4eb9ba80927fd86b5303eb82c8af
-SIZE (xpi/thunderbird-i18n-10.0.12/en-GB.xpi) = 391743
-SHA256 (xpi/thunderbird-i18n-10.0.12/en-US.xpi) = 7ee165bed1e9f2294398d02b9e9b4412e214998593efc94f4787483fdf6d462b
-SIZE (xpi/thunderbird-i18n-10.0.12/en-US.xpi) = 391242
-SHA256 (xpi/thunderbird-i18n-10.0.12/es-AR.xpi) = f6b6020981533c95b1f3cb390081d448439ec1fc0333c47d41294907e8c11d93
-SIZE (xpi/thunderbird-i18n-10.0.12/es-AR.xpi) = 410727
-SHA256 (xpi/thunderbird-i18n-10.0.12/es-ES.xpi) = 5a39d54385c37d9229a954275cbfb20cd3de7c59e16b0a2a718fa95f58f8d5b5
-SIZE (xpi/thunderbird-i18n-10.0.12/es-ES.xpi) = 355143
-SHA256 (xpi/thunderbird-i18n-10.0.12/et.xpi) = ecb178ff7a985ac2860629d974ace70855cb9c81ca7ee984bd1409b57b0bf3de
-SIZE (xpi/thunderbird-i18n-10.0.12/et.xpi) = 410725
-SHA256 (xpi/thunderbird-i18n-10.0.12/eu.xpi) = 6bab4baac74e8f1c0ea2d4aafdd229d04a4db681a457e74719ef7086894ec3f5
-SIZE (xpi/thunderbird-i18n-10.0.12/eu.xpi) = 406387
-SHA256 (xpi/thunderbird-i18n-10.0.12/fi.xpi) = 2af4203f980d915f68167c09144ed6b4630583203f4f4e7e455a519644f1ecc1
-SIZE (xpi/thunderbird-i18n-10.0.12/fi.xpi) = 411928
-SHA256 (xpi/thunderbird-i18n-10.0.12/fr.xpi) = 138b0853522a5cea6c9b361f0b4915b99d5874cdf2d8f8d6390cf91765757ef2
-SIZE (xpi/thunderbird-i18n-10.0.12/fr.xpi) = 414750
-SHA256 (xpi/thunderbird-i18n-10.0.12/fy-NL.xpi) = d052d6520e9dc41134e3d0afee4beb0abed9d809a391293b034a2db57606f95b
-SIZE (xpi/thunderbird-i18n-10.0.12/fy-NL.xpi) = 413985
-SHA256 (xpi/thunderbird-i18n-10.0.12/ga-IE.xpi) = 4208354ce071bb1a049646916e0a0921cc8393da5399df1c458d556cf8e8fc64
-SIZE (xpi/thunderbird-i18n-10.0.12/ga-IE.xpi) = 423261
-SHA256 (xpi/thunderbird-i18n-10.0.12/gd.xpi) = bd1de14cd558a179978d9e4138c5866a5cd35c8affb683b653e747c546b36c1d
-SIZE (xpi/thunderbird-i18n-10.0.12/gd.xpi) = 425877
-SHA256 (xpi/thunderbird-i18n-10.0.12/gl.xpi) = 0d01229d75fbf49bf0217df70a986679e92f69a6c206e43591bfdefe117cbcb6
-SIZE (xpi/thunderbird-i18n-10.0.12/gl.xpi) = 409229
-SHA256 (xpi/thunderbird-i18n-10.0.12/he.xpi) = de5ba8c32c2b909c770eced2e237fe54213fc01271bdbef6d720e01d8b21812d
-SIZE (xpi/thunderbird-i18n-10.0.12/he.xpi) = 439207
-SHA256 (xpi/thunderbird-i18n-10.0.12/hu.xpi) = 54bd3e348c0d4177dabd6789e77dfbee08547591b258acfe18030fdc7e66eac6
-SIZE (xpi/thunderbird-i18n-10.0.12/hu.xpi) = 426357
-SHA256 (xpi/thunderbird-i18n-10.0.12/is.xpi) = f4abd2e33b51762bc90700097d45f5a5629934d40666a58d8f577a9043941b3b
-SIZE (xpi/thunderbird-i18n-10.0.12/is.xpi) = 412635
-SHA256 (xpi/thunderbird-i18n-10.0.12/it.xpi) = b0313761e838f887a906ec514f70267124d5e103e96a0eaee57d18f73ca41411
-SIZE (xpi/thunderbird-i18n-10.0.12/it.xpi) = 347634
-SHA256 (xpi/thunderbird-i18n-10.0.12/ja.xpi) = ac34c2227b3327a86f699dd0968041b350d216cd6ecfb1e948032e8e4294ea6c
-SIZE (xpi/thunderbird-i18n-10.0.12/ja.xpi) = 459031
-SHA256 (xpi/thunderbird-i18n-10.0.12/ko.xpi) = 8acecd1f7649c4d18ef8f36d5666215598818934315dd05c1672bc37439b1630
-SIZE (xpi/thunderbird-i18n-10.0.12/ko.xpi) = 372016
-SHA256 (xpi/thunderbird-i18n-10.0.12/lt.xpi) = af71d869af00d7b4507d1da907cec67583951a138caed60dbc55bbfe4403b1d4
-SIZE (xpi/thunderbird-i18n-10.0.12/lt.xpi) = 531023
-SHA256 (xpi/thunderbird-i18n-10.0.12/nb-NO.xpi) = 4d580bb55cb5c060dbf1c50294e072be7fec2dd680ed65a6a178bf3d6f7d4727
-SIZE (xpi/thunderbird-i18n-10.0.12/nb-NO.xpi) = 407730
-SHA256 (xpi/thunderbird-i18n-10.0.12/nl.xpi) = 79e093884f05848ce3176dcd03a67734f44a43ce721936c5966c1ba2032a2bdc
-SIZE (xpi/thunderbird-i18n-10.0.12/nl.xpi) = 407985
-SHA256 (xpi/thunderbird-i18n-10.0.12/nn-NO.xpi) = 28c90815dcb7ed4b2226f0e93800a433633f44cc88fe79cb86233cf76352b568
-SIZE (xpi/thunderbird-i18n-10.0.12/nn-NO.xpi) = 409459
-SHA256 (xpi/thunderbird-i18n-10.0.12/pl.xpi) = 594209d10ba7155e288fa5c5767374ba074e5419b62a0ca373b4c9eee9d75762
-SIZE (xpi/thunderbird-i18n-10.0.12/pl.xpi) = 393579
-SHA256 (xpi/thunderbird-i18n-10.0.12/pt-BR.xpi) = 33eeef67280c75853335d06fac8c6d3b15e3b0e3e18e5e6f92914e069784d06e
-SIZE (xpi/thunderbird-i18n-10.0.12/pt-BR.xpi) = 417230
-SHA256 (xpi/thunderbird-i18n-10.0.12/pt-PT.xpi) = 3cdd5bb8072f83295979347cd67ad8cdee896f7c4fc5ce910815afe87525441f
-SIZE (xpi/thunderbird-i18n-10.0.12/pt-PT.xpi) = 414266
-SHA256 (xpi/thunderbird-i18n-10.0.12/rm.xpi) = 6188a9730c0310d0f5fbcef056855c9244c451534f9790a47df498849a867229
-SIZE (xpi/thunderbird-i18n-10.0.12/rm.xpi) = 414710
-SHA256 (xpi/thunderbird-i18n-10.0.12/ru.xpi) = 74401e13a9c7e2748e798a5dbe9f46ba75ac8215189f034dfe965821be32f612
-SIZE (xpi/thunderbird-i18n-10.0.12/ru.xpi) = 411635
-SHA256 (xpi/thunderbird-i18n-10.0.12/si.xpi) = 0ee022882f55d521f324c8109e0c39cbe91e96b7544faebde1dba8c233366018
-SIZE (xpi/thunderbird-i18n-10.0.12/si.xpi) = 456608
-SHA256 (xpi/thunderbird-i18n-10.0.12/sk.xpi) = ccdafe5cfc51715ce2dcc0f496554656a16a26ab3ded3aa9888a1cea87343cd4
-SIZE (xpi/thunderbird-i18n-10.0.12/sk.xpi) = 425030
-SHA256 (xpi/thunderbird-i18n-10.0.12/sl.xpi) = 1437078e9486244904e0368fe99f3cde58d67a6261d3bebaa3d41f4fa40f27b4
-SIZE (xpi/thunderbird-i18n-10.0.12/sl.xpi) = 410432
-SHA256 (xpi/thunderbird-i18n-10.0.12/sq.xpi) = 2a4747afc1667b437de4628ca305fc71ca4b4a33c7566fa8d31dc139c10fb37c
-SIZE (xpi/thunderbird-i18n-10.0.12/sq.xpi) = 360481
-SHA256 (xpi/thunderbird-i18n-10.0.12/sv-SE.xpi) = 5699c1117ebb00fb247f13a9ce1b75b24e7126f826d7e26cce2114b97560db66
-SIZE (xpi/thunderbird-i18n-10.0.12/sv-SE.xpi) = 478282
-SHA256 (xpi/thunderbird-i18n-10.0.12/ta-LK.xpi) = 533ed4e1ae373ce6cf07ee0773717117ea4bccb2e7eb7242d352f227de9e57fa
-SIZE (xpi/thunderbird-i18n-10.0.12/ta-LK.xpi) = 475719
-SHA256 (xpi/thunderbird-i18n-10.0.12/tr.xpi) = 1825b73858ffeec3e48b1c46429c9ee3a1f205d878942cbd8664b0e861beecef
-SIZE (xpi/thunderbird-i18n-10.0.12/tr.xpi) = 418210
-SHA256 (xpi/thunderbird-i18n-10.0.12/uk.xpi) = 49deb8c09c042e6021dce36135627dc8e461c752a26bb7fd43301a936b1c9fc9
-SIZE (xpi/thunderbird-i18n-10.0.12/uk.xpi) = 463925
-SHA256 (xpi/thunderbird-i18n-10.0.12/zh-TW.xpi) = 3baa27565d941d5ab34e3b0cb4275778aca577a3d2ac58f39852505ad414d203
-SIZE (xpi/thunderbird-i18n-10.0.12/zh-TW.xpi) = 431828
diff --git a/mail/thunderbird-esr-i18n/pkg-descr b/mail/thunderbird-esr-i18n/pkg-descr
deleted file mode 100644
index e5842d14f281..000000000000
--- a/mail/thunderbird-esr-i18n/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Language packs for Thunderbird
-
-WWW: http://www.mozilla.org/projects/l10n/
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
deleted file mode 100644
index bb3d028a322f..000000000000
--- a/mail/thunderbird-esr/Makefile
+++ /dev/null
@@ -1,190 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	thunderbird
-DISTVERSION=	10.0.12
-CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
-DISTFILES=	${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
-
-BUILD_DEPENDS=	nspr>=4.8.8:${PORTSDIR}/devel/nspr \
-		nss>=3.13.6_1:${PORTSDIR}/security/nss \
-		sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \
-		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
-		unzip:${PORTSDIR}/archivers/unzip
-
-EM_VERSION=	1.4.3
-
-USE_AUTOTOOLS=	autoconf213:env
-LATEST_LINK=	thunderbird-esr
-USE_GECKO=	gecko
-CONFLICTS=	thunderbird-1[1-9].*
-USE_MOZILLA=	# empty
-
-MAKE_JOBS_SAFE=	yes
-WANT_GNOME=	yes
-USE_QT4=	# empty
-QT_NONSTANDARD=	yes
-ALL_TARGET=	default
-GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GL=		gl
-
-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_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-MOZ_PKGCONFIG_FILES=
-
-PORTNAME_ICON=	${MOZILLA}.png
-PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
-
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS_DEFINE=	ENIGMAIL LIGHTNING
-OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
-
-.include "${.CURDIR}/../../www/firefox/Makefile.options"
-.include <bsd.port.pre.mk>
-
-WRKSRC=		${WRKDIR}/comm-esr10
-MOZSRC:=	${WRKSRC}/mozilla
-
-XPI_LIBDIR=	${PREFIX}/lib/xpi
-
-.if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
-.elif ${ARCH} == powerpc64
-.if ${OSVERSION} < 900033
-BROKEN=		Needs binutils 2.17.50 to build
-.else
-MOZ_EXPORT+=	UNAME_m="powerpc64"
-CFLAGS+=	-mminimal-toc
-.endif
-.endif
-
-.if !empty(CXX:M*clang++*) || (${CXX:Mc++} && ${OSVERSION} > 1000023)
-CFLAGS+=	-Wno-return-type-c-linkage
-.endif
-
-.if ${PORT_OPTIONS:MENIGMAIL}
-MASTER_SITES+=	http://www.enigmail.net/download/source/:enigmail
-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}-freebsd-${ARCH:S/amd64/x86_64/}.xpi
-EM_ORIG_ID=	{847b3a00-7ab1-11d4-8f02-006008948af5}
-EM_ID=		${PORTNAME}@mozilla-enigmail.org
-EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/install.rdf \
-		${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
-		${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
-.endif
-
-.if ${PORT_OPTIONS:MLIGHTNING}
-MOZ_OPTIONS+=	--enable-calendar
-MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
-LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi
-XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
-XPI_ID=		lightning@thunderbird.mozilla.org
-.else
-MOZ_OPTIONS+=	--disable-calendar
-.endif
-
-post-extract:
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \
-		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
-.if ${PORT_OPTIONS:MENIGMAIL}
-	@${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \
-		-C ${WRKSRC}/mailnews/extensions
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/mail/app/nsMailApp.cpp
-.if ${PORT_OPTIONS:MENIGMAIL}
-	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \
-		${WRKSRC}/mailnews/extensions/enigmail/makemake
-	@${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \
-		-e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \
-		${WRKSRC}/mailnews/extensions/enigmail/Makefile.in
-	@${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \
-		-e '/em:minVersion/s/1[0-9].0/10.0/' \
-		-e '/em:maxVersion/s/pre//' \
-		${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf
-.endif
-
-pre-configure:
-	(cd ${WRKSRC} && ${AUTOCONF})
-	(cd ${MOZSRC} && ${AUTOCONF})
-	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
-
-.if ${PORT_OPTIONS:MENIGMAIL}
-post-build:
-	cd ${WRKSRC}/mailnews/extensions/enigmail && \
-		./makemake -r -o ${MOZ_OBJDIR}
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \
-		-C ${MOZ_OBJDIR}/mailnews/extensions/enigmail
-.endif
-
-port-pre-install:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-
-pre-install:
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
-	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
-	${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
-.if ${PORT_OPTIONS:MLIGHTNING}
-	@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
-	@(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
-	@${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
-	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
-	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true
-	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
-	@(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
-		${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
-	@${ECHO_CMD} 'lib/xpi/symlinks/thunderbird/${XPI_ID}' >> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
-	@(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
-		${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MENIGMAIL}
-	@${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME}
-	@(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE})
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID}
-	@${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES}
-	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID}
-	@${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true
-	@${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true
-	@(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \
-		${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
-	@${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST}
-	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST}
-	@(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \
-		${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL}
-	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
deleted file mode 100644
index d3d15a8de407..000000000000
--- a/mail/thunderbird-esr/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (thunderbird-10.0.12esr.source.tar.bz2) = 9868f2523685b581626ce1d3280b47803b23e3578e1caec4493b31d0b1b02075
-SIZE (thunderbird-10.0.12esr.source.tar.bz2) = 97703324
-SHA256 (enigmail-1.4.3.tar.gz) = 440035f19a22e8e234c530a0e78fb9ee74bb934fcf721777868de79324636d27
-SIZE (enigmail-1.4.3.tar.gz) = 1337811
diff --git a/mail/thunderbird-esr/files/moz_pis_S50cleanhome b/mail/thunderbird-esr/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392043..000000000000
--- a/mail/thunderbird-esr/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# We run in our own subshell
-
-# First, verify protocol
-[ "$1" != "start" ] && exit 1
-[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
-[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
-[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
-[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
-
-# Try to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
-if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
-    sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
-	"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
-	| while read dir
-    do
-	[ ! -d "${dir}" ] && continue
-	# at last, debian do this, we do for new builds
-	# rm -f "${dir}/XUL.mfasl"
-	# make reclaculate compreg.dat, xpti.dat for new builds
-	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-	    rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
-    done
-fi
diff --git a/mail/thunderbird-esr/files/patch-alsapulse b/mail/thunderbird-esr/files/patch-alsapulse
deleted file mode 100644
index 47580cd562b3..000000000000
--- a/mail/thunderbird-esr/files/patch-alsapulse
+++ /dev/null
@@ -1,119 +0,0 @@
---- mozilla/config/autoconf.mk.in~
-+++ mozilla/config/autoconf.mk.in
-@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS	= @MOZ_LIBNOTIFY_CF
- MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS@
- MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
- 
-+MOZ_ALSA                = @MOZ_ALSA@
- MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
-+MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
-+
-+MOZ_PULSEAUDIO          = @MOZ_PULSEAUDIO@
-+MOZ_PULSEAUDIO_LIBS     = @MOZ_PULSEAUDIO_LIBS@
-+MOZ_PULSEAUDIO_CFLAGS   = @MOZ_PULSEAUDIO_CFLAGS@
- 
- GLIB_CFLAGS	= @GLIB_CFLAGS@
- GLIB_LIBS	= @GLIB_LIBS@
---- mozilla/configure.in~
-+++ mozilla/configure.in
-@@ -5758,17 +5775,48 @@ dnl ====================================
- dnl = Check alsa availability on Linux if using sydneyaudio
- dnl ========================================================
- 
-+MOZ_ARG_ENABLE_BOOL(alsa,
-+[  --enable-alsa          Enable Alsa support],
-+MOZ_ALSA=1,
-+MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
-+
- dnl If using sydneyaudio with Linux, ensure that the alsa library is available
--if test -n "$MOZ_SYDNEYAUDIO"; then
-+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then
-    case "$target_os" in
- linux*)
-+      MOZ_ALSA=1
-+      ;;
-+   esac
-+fi
-+
-+if test -n "$MOZ_ALSA"; then
-       PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
-          [echo "$MOZ_ALSA_PKG_ERRORS"
-           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
--      ;;
--   esac
- fi
- 
-+AC_SUBST(MOZ_ALSA_CFLAGS)
-+AC_SUBST(MOZ_ALSA)
-+
-+dnl ========================================================
-+dnl = Enable PulseAudio
-+dnl ========================================================
-+
-+MOZ_ARG_ENABLE_BOOL(pulseaudio,
-+[  --enable-pulseaudio          Enable PulseAudio support],
-+MOZ_PULSEAUDIO=1,
-+MOZ_PULSEAUDIO=)
-+
-+if test -n "$MOZ_PULSEAUDIO"; then
-+    PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
-+         [echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
-+          AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])])
-+fi
-+
-+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS)
-+AC_SUBST(MOZ_PULSEAUDIO_LIBS)
-+AC_SUBST(MOZ_PULSEAUDIO)
-+
- dnl ========================================================
- dnl Permissions System
- dnl ========================================================
---- mozilla/media/libsydneyaudio/src/Makefile.in~
-+++ mozilla/media/libsydneyaudio/src/Makefile.in
-@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android)
- CSRCS		= \
- 		sydney_audio_android.c \
- 		$(NULL)
--else ifeq ($(OS_ARCH),Linux)
--CSRCS		= \
--		sydney_audio_alsa.c \
--		$(NULL)
- endif
- 
- ifeq ($(OS_ARCH),WINNT)
-@@ -68,6 +64,18 @@ CSRCS		= \
- 		$(NULL)
- endif
- 
-+ifdef MOZ_ALSA
-+CSRCS		= \
-+		sydney_audio_alsa.c \
-+		$(NULL)
-+endif
-+
-+ifdef MOZ_PULSEAUDIO
-+CSRCS		= \
-+		sydney_audio_pulseaudio.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += winmm.lib
- endif
---- mozilla/toolkit/library/libxul-config.mk~
-+++ mozilla/toolkit/library/libxul-config.mk
-@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX
- EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS)
- endif
- 
--ifdef MOZ_SYDNEYAUDIO
--ifeq ($(OS_ARCH),Linux)
-+ifdef MOZ_ALSA
- EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
- endif
-+
-+ifdef MOZ_PULSEAUDIO
-+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
- endif
- 
- ifdef HAVE_CLOCK_MONOTONIC
diff --git a/mail/thunderbird-esr/files/patch-bug653551 b/mail/thunderbird-esr/files/patch-bug653551
deleted file mode 100644
index 08b62b48897a..000000000000
--- a/mail/thunderbird-esr/files/patch-bug653551
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 47ea30f
-Author: Landry Breuil <landry@openbsd.org>
-Date:   Thu Feb 2 15:31:56 2012 +0900
-
-    Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
----
- js/src/configure.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in
-index 84390cf..d663c46 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -2806,13 +2806,15 @@ arm*-*)
-     AC_DEFINE(JS_NUNBOX32)
-     ;;
- sparc*-*)
-+    if test ! "$HAVE_64BIT_OS" ; then
-     NANOJIT_ARCH=Sparc
-     ENABLE_METHODJIT=1
-     ENABLE_MONOIC=1
-     ENABLE_POLYIC=1
-     ENABLE_METHODJIT_TYPED_ARRAY=1
-     AC_DEFINE(JS_CPU_SPARC)
-     AC_DEFINE(JS_NUNBOX32)
-+    fi
-     ;;
- mips*-*)
-     ENABLE_METHODJIT=1
diff --git a/mail/thunderbird-esr/files/patch-bug685258 b/mail/thunderbird-esr/files/patch-bug685258
deleted file mode 100644
index cac425d6adba..000000000000
--- a/mail/thunderbird-esr/files/patch-bug685258
+++ /dev/null
@@ -1,17 +0,0 @@
-# HG changeset patch
-# User Oleg Romashin <romaxa@gmail.com>
-# Parent a2291c212856ad27622416e83c8311b6a33b52f1
-Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
-
-diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
---- mozilla/content/media/nsAudioStream.cpp
-+++ mozilla/content/media/nsAudioStream.cpp
-@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
-   mFormat = aFormat;
- 
-   if (sa_stream_create_pcm(reinterpret_cast<sa_stream_t**>(&mAudioHandle),
--                           NULL,
-+                           "Mozilla",
-                            SA_MODE_WRONLY,
-                            SA_PCM_FORMAT_S16_NE,
-                            aRate,
diff --git a/mail/thunderbird-esr/files/patch-bug691898 b/mail/thunderbird-esr/files/patch-bug691898
deleted file mode 100644
index adf059a59554..000000000000
--- a/mail/thunderbird-esr/files/patch-bug691898
+++ /dev/null
@@ -1,285 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 24 Dec 2011 09:56:58 +0100
-Subject: Bug 691898 - Use YARR interpreter instead of PCRE on platforms where
- YARR JIT is not supported
-
----
- js/src/Makefile.in           |   21 +++++++++++++--------
- js/src/vm/RegExpObject-inl.h |   28 ++++++----------------------
- js/src/vm/RegExpObject.cpp   |   36 ------------------------------------
- js/src/vm/RegExpObject.h     |   27 ++++++---------------------
- js/src/yarr/wtfbridge.h      |    2 --
- 5 files changed, 25 insertions(+), 89 deletions(-)
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
-index fc48cbd..49f0bdc 100644
---- mozilla/js/src/Makefile.in
-+++ mozilla/js/src/Makefile.in
-@@ -416,15 +416,20 @@ CPPSRCS += 	checks.cc \
- 
- ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
- 
--VPATH +=        $(srcdir)/yarr/pcre \
-+VPATH +=        $(srcdir)/assembler \
-+                $(srcdir)/assembler/wtf \
-+                $(srcdir)/yarr \
- 		$(NULL)
- 
- CPPSRCS += \
--                pcre_compile.cpp \
--                pcre_exec.cpp \
--                pcre_tables.cpp \
--                pcre_xclass.cpp \
--                pcre_ucp_searchfuncs.cpp \
-+                Assertions.cpp \
-+                OSAllocatorOS2.cpp \
-+                OSAllocatorPosix.cpp \
-+                OSAllocatorWin.cpp \
-+                PageBlock.cpp \
-+                YarrInterpreter.cpp \
-+                YarrPattern.cpp \
-+                YarrSyntaxChecker.cpp \
- 		$(NULL)
- else
- 
-@@ -1015,10 +1020,10 @@ endif
- # Needed to "configure" it correctly.  Unfortunately these
- # flags wind up being applied to all code in js/src, not just
- # the code in js/src/assembler.
--CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
-+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1
- 
- ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
--CXXFLAGS +=  -DENABLE_JIT=1
-+CXXFLAGS +=  -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1
- endif
- 
- INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
-diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h
-index 5f7817d..91108a7 100644
---- mozilla/js/src/vm/RegExpObject-inl.h
-+++ mozilla/js/src/vm/RegExpObject-inl.h
-@@ -327,6 +327,7 @@ RegExpPrivate::create(JSContext *cx, JSString *source, RegExpFlag flags, TokenSt
-     return RetType(self);
- }
- 
-+#if ENABLE_YARR_JIT
- /* This function should be deleted once bad Android platforms phase out. See bug 604774. */
- inline bool
- RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
-@@ -337,12 +338,12 @@ RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
-     return true;
- #endif
- }
-+#endif
- 
- inline bool
- RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
-                            uintN *parenCount, RegExpFlag flags)
- {
--#if ENABLE_YARR_JIT
-     /* Parse the pattern. */
-     ErrorCode yarrError;
-     YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
-@@ -359,7 +360,7 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *
-      * case we have to bytecode compile it.
-      */
- 
--#ifdef JS_METHODJIT
-+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
-     if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
-         if (!cx->compartment->ensureJaegerCompartmentExists(cx))
-             return false;
-@@ -371,21 +372,11 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *
-     }
- #endif
- 
-+#if ENABLE_YARR_JIT
-     codeBlock.setFallBack(true);
-+#endif
-     byteCode = byteCompile(yarrPattern, cx->compartment->regExpAllocator).get();
-     return true;
--#else /* !defined(ENABLE_YARR_JIT) */
--    int error = 0;
--    compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
--                  ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
--                  multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
--                  parenCount, &error);
--    if (error) {
--        reportPCREError(cx, error);
--        return false;
--    }
--    return true;
--#endif
- }
- 
- inline bool
-@@ -431,19 +422,12 @@ RegExpPrivateCode::execute(JSContext *cx, const jschar *chars, size_t start, siz
-     else
-         result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
- #else
--    result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
-+    result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
- #endif
- 
-     if (result == -1)
-         return Success_NotFound;
- 
--#if !ENABLE_YARR_JIT
--    if (result < 0) {
--        reportPCREError(cx, result);
--        return Error;
--    }
--#endif
--
-     JS_ASSERT(result >= 0);
-     return Success;
- }
-diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
-index f75c6a5..7631dd5 100644
---- mozilla/js/src/vm/RegExpObject.cpp
-+++ mozilla/js/src/vm/RegExpObject.cpp
-@@ -251,7 +251,6 @@ Class js::RegExpClass = {
-     NULL                     /* trace */
- };
- 
--#if ENABLE_YARR_JIT
- void
- RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
- {
-@@ -283,41 +282,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode err
-     }
- }
- 
--#else /* !ENABLE_YARR_JIT */
--
--void
--RegExpPrivateCode::reportPCREError(JSContext *cx, int error)
--{
--#define REPORT(msg_) \
--    JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
--    return
--    switch (error) {
--      case -2: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      case 0: JS_NOT_REACHED("Precondition violation: an error must have occurred."); 
--      case 1: REPORT(JSMSG_TRAILING_SLASH);
--      case 2: REPORT(JSMSG_TRAILING_SLASH); 
--      case 3: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      case 4: REPORT(JSMSG_BAD_QUANTIFIER);
--      case 5: REPORT(JSMSG_BAD_QUANTIFIER);
--      case 6: REPORT(JSMSG_BAD_CLASS_RANGE);
--      case 7: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      case 8: REPORT(JSMSG_BAD_CLASS_RANGE);
--      case 9: REPORT(JSMSG_BAD_QUANTIFIER);
--      case 10: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN);
--      case 11: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      case 12: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN);
--      case 13: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      case 14: REPORT(JSMSG_MISSING_PAREN);
--      case 15: REPORT(JSMSG_BAD_BACKREF);
--      case 16: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      case 17: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
--      default:
--        JS_NOT_REACHED("Precondition violation: unknown PCRE error code.");
--    }
--#undef REPORT
--}
--#endif /* ENABLE_YARR_JIT */
--
- bool
- js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut)
- {
-diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h
-index 1449d56..279f3c0 100644
---- mozilla/js/src/vm/RegExpObject.h
-+++ mozilla/js/src/vm/RegExpObject.h
-@@ -49,8 +49,6 @@
- #include "yarr/Yarr.h"
- #if ENABLE_YARR_JIT
- #include "yarr/YarrJIT.h"
--#else
--#include "yarr/pcre/pcre.h"
- #endif
- 
- namespace js {
-@@ -153,48 +151,39 @@ ResetRegExpObject(JSContext *cx, AlreadyIncRefed<RegExpPrivate> rep);
- /* Abstracts away the gross |RegExpPrivate| backend details. */
- class RegExpPrivateCode
- {
--#if ENABLE_YARR_JIT
-     typedef JSC::Yarr::BytecodePattern BytecodePattern;
-     typedef JSC::Yarr::ErrorCode ErrorCode;
-+    typedef JSC::Yarr::YarrPattern YarrPattern;
-+#if ENABLE_YARR_JIT
-     typedef JSC::Yarr::JSGlobalData JSGlobalData;
-     typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock;
--    typedef JSC::Yarr::YarrPattern YarrPattern;
- 
-     /* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */
-     YarrCodeBlock   codeBlock;
--    BytecodePattern *byteCode;
--#else
--    JSRegExp        *compiled;
- #endif
-+    BytecodePattern *byteCode;
- 
-   public:
-     RegExpPrivateCode()
-       :
- #if ENABLE_YARR_JIT
-         codeBlock(),
--        byteCode(NULL)
--#else
--        compiled(NULL)
- #endif
-+        byteCode(NULL)
-     { }
- 
-     ~RegExpPrivateCode() {
- #if ENABLE_YARR_JIT
-         codeBlock.release();
-+#endif
-         if (byteCode)
-             Foreground::delete_<BytecodePattern>(byteCode);
--#else
--        if (compiled)
--            jsRegExpFree(compiled);
--#endif
-     }
- 
- #if ENABLE_YARR_JIT
-     static inline bool isJITRuntimeEnabled(JSContext *cx);
--    void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
--#else
--    void reportPCREError(JSContext *cx, int error);
- #endif
-+    void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
- 
-     inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,
-                         RegExpFlag flags);
-@@ -205,11 +194,7 @@ class RegExpPrivateCode
-                                  int *output, size_t outputCount);
- 
-     static size_t getOutputSize(size_t pairCount) {
--#if ENABLE_YARR_JIT
-         return pairCount * 2;
--#else
--        return pairCount * 3; /* Should be x2, but PCRE has... needs. */
--#endif
-     }
- };
- 
-diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h
-index ac41d08..fb8eb86 100644
---- mozilla/js/src/yarr/wtfbridge.h
-+++ mozilla/js/src/yarr/wtfbridge.h
-@@ -49,9 +49,7 @@
- #include "jsprvtd.h"
- #include "vm/String.h"
- #include "assembler/wtf/Platform.h"
--#if ENABLE_YARR_JIT
- #include "assembler/jit/ExecutableAllocator.h"
--#endif
- 
- namespace JSC { namespace Yarr {
- 
diff --git a/mail/thunderbird-esr/files/patch-bug714312 b/mail/thunderbird-esr/files/patch-bug714312
deleted file mode 100644
index 02d0871c9a76..000000000000
--- a/mail/thunderbird-esr/files/patch-bug714312
+++ /dev/null
@@ -1,73 +0,0 @@
-commit c104d9b
-Author: Landry Breuil <landry@openbsd.org>
-Date:   Mon Jan 9 17:32:00 2012 -0600
-
-    Bug 714312 - Use <machine/endian.h> to get endianess on BSD systems, fixing the BSD build.  r=ted
-    
-    --HG--
-    extra : rebase_source : 8b418bdb2d713093d138ffed20bf1630c05f396b
----
- js/src/configure.in   |  5 +++++
- js/src/js-config.h.in |  4 ++++
- js/src/jscpucfg.h     | 17 +++++++++++++++++
- 3 files changed, 26 insertions(+)
-
-diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in
-index 164c896..361b29e 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -2934,6 +2934,11 @@ if test "$ac_cv_header_endian_h" = yes; 
-     AC_DEFINE(JS_HAVE_ENDIAN_H)
- fi
- 
-+AC_CHECK_HEADERS(machine/endian.h)
-+if test "$ac_cv_header_machine_endian_h" = yes; then
-+    AC_DEFINE(JS_HAVE_MACHINE_ENDIAN_H)
-+fi
-+
- AC_CHECK_HEADERS(sys/isa_defs.h)
- if test "$ac_cv_header_sys_isa_defs_h" = yes; then
-     AC_DEFINE(JS_HAVE_SYS_ISA_DEFS_H)
-diff --git mozilla/js/src/js-config.h.in mozilla/js/src/js-config.h.in
-index fb009fa..402262e 100644
---- mozilla/js/src/js-config.h.in
-+++ mozilla/js/src/js-config.h.in
-@@ -59,6 +59,10 @@
-    useable.  See jscpucfg.h.  */
- #undef JS_HAVE_ENDIAN_H
- 
-+/* Define to 1 if the <machine/endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+#undef JS_HAVE_MACHINE_ENDIAN_H
-+
- /* Define to 1 if the <sys/isa_defs.h> header is present and
-    useable.  See jscpucfg.h.  */
- #undef JS_HAVE_SYS_ISA_DEFS_H
-diff --git mozilla/js/src/jscpucfg.h mozilla/js/src/jscpucfg.h
-index dd32bce..5fd8415 100644
---- mozilla/js/src/jscpucfg.h
-+++ mozilla/js/src/jscpucfg.h
-@@ -92,6 +92,23 @@
- #  error "endian.h does not define __BYTE_ORDER. Cannot determine endianness."
- # endif
- 
-+/* BSDs */
-+#elif defined(JS_HAVE_MACHINE_ENDIAN_H)
-+# include <sys/types.h>
-+# include <machine/endian.h>
-+
-+# if defined(_BYTE_ORDER)
-+#  if _BYTE_ORDER == _LITTLE_ENDIAN
-+#   define IS_LITTLE_ENDIAN 1
-+#   undef  IS_BIG_ENDIAN
-+#  elif _BYTE_ORDER == _BIG_ENDIAN
-+#   undef  IS_LITTLE_ENDIAN
-+#   define IS_BIG_ENDIAN 1
-+#  endif
-+# else /* !defined(_BYTE_ORDER) */
-+#  error "machine/endian.h does not define _BYTE_ORDER. Cannot determine endianness."
-+# endif
-+
- #elif defined(JS_HAVE_SYS_ISA_DEFS_H)
- # include <sys/isa_defs.h>
- 
diff --git a/mail/thunderbird-esr/files/patch-bug725655 b/mail/thunderbird-esr/files/patch-bug725655
deleted file mode 100644
index 56b9e36a8e41..000000000000
--- a/mail/thunderbird-esr/files/patch-bug725655
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 18b9c9d
-Author: Martin Stránský <stransky@redhat.com>
-Date:   Fri Feb 10 16:07:41 2012 +0100
-
-    Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin
----
- ipc/chromium/src/base/file_util_linux.cc       | 3 +++
- ipc/chromium/src/base/message_pump_libevent.cc | 3 +++
- ipc/chromium/src/base/time_posix.cc            | 3 +++
- 3 files changed, 9 insertions(+)
-
-diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc
-index cca706f..171e44f 100644
---- mozilla/ipc/chromium/src/base/file_util_linux.cc
-+++ mozilla/ipc/chromium/src/base/file_util_linux.cc
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff --git mozilla/ipc/chromium/src/base/message_pump_libevent.cc mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-index 6194f79..9f31dbb 100644
---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff --git mozilla/ipc/chromium/src/base/time_posix.cc mozilla/ipc/chromium/src/base/time_posix.cc
-index 8d1a1d5..abf2a56 100644
---- mozilla/ipc/chromium/src/base/time_posix.cc
-+++ mozilla/ipc/chromium/src/base/time_posix.cc
-@@ -13,6 +13,9 @@
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <limits>
- 
diff --git a/mail/thunderbird-esr/files/patch-bug728968 b/mail/thunderbird-esr/files/patch-bug728968
deleted file mode 100644
index 72da7af43d41..000000000000
--- a/mail/thunderbird-esr/files/patch-bug728968
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 4075972
-Author: Mike Hommey <mh+mozilla@glandium.org>
-Date:   Thu Feb 23 11:00:46 2012 +0100
-
-    Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
----
- configure.in | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
-
-diff --git mozilla/configure.in mozilla/configure.in
-index 3ba7e2f..3d0614c 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
- AC_CHECK_FUNCS(flockfile getpagesize)
- AC_CHECK_FUNCS(localtime_r strtok_r)
- 
--dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
--_SAVE_LDFLAGS=$LDFLAGS
--LDFLAGS="$LDFLAGS -lrt"
--AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
--               ac_cv_have_clock_monotonic,
--               [AC_TRY_LINK([#include <time.h>],
--                            [ struct timespec ts;
--                              clock_gettime(CLOCK_MONOTONIC, &ts); ],
--                            ac_cv_have_clock_monotonic=yes,
--                            ac_cv_have_clock_monotonic=no)])
--LDFLAGS=$_SAVE_LDFLAGS
--if test "$ac_cv_have_clock_monotonic" = "yes"; then
-+dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
-+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
-+               ac_cv_clock_monotonic,
-+               [for libs in "" -lrt; do
-+                    _SAVE_LDFLAGS="$LDFLAGS"
-+                    LDFLAGS="$LDFLAGS $libs"
-+                    AC_TRY_LINK([#include <time.h>],
-+                                 [ struct timespec ts;
-+                                   clock_gettime(CLOCK_MONOTONIC, &ts); ],
-+                                 ac_cv_clock_monotonic=$libs
-+                                 break,
-+                                 ac_cv_clock_monotonic=no)
-+                    LDFLAGS="$_SAVE_LDFLAGS"
-+                done])
-+if test "$ac_cv_clock_monotonic" != "no"; then
-     HAVE_CLOCK_MONOTONIC=1
--    REALTIME_LIBS=-lrt
-+    REALTIME_LIBS=$ac_cv_clock_monotonic
-     AC_DEFINE(HAVE_CLOCK_MONOTONIC)
-     AC_SUBST(HAVE_CLOCK_MONOTONIC)
-     AC_SUBST(REALTIME_LIBS)
diff --git a/mail/thunderbird-esr/files/patch-bug729155 b/mail/thunderbird-esr/files/patch-bug729155
deleted file mode 100644
index b4791bb1141a..000000000000
--- a/mail/thunderbird-esr/files/patch-bug729155
+++ /dev/null
@@ -1,18 +0,0 @@
---- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
-+++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp
-@@ -114,6 +114,7 @@ MediateRace(const RPCChannel::Message& parent,
-   }
- }
- 
-+#if defined(OS_LINUX)
- static string
- ReplaceAll(const string& haystack, const string& needle, const string& with)
- {
-@@ -127,6 +128,7 @@ ReplaceAll(const string& haystack, const string& needle, const string& with)
- 
-   return munged;
- }
-+#endif
- 
- string
- MungePluginDsoPath(const string& path)
diff --git a/mail/thunderbird-esr/files/patch-bug741737 b/mail/thunderbird-esr/files/patch-bug741737
deleted file mode 100644
index d4ceffbe8cef..000000000000
--- a/mail/thunderbird-esr/files/patch-bug741737
+++ /dev/null
@@ -1,90 +0,0 @@
-changeset:   91900:eee73897136b
-user:        Martin Stransky <stransky@redhat.com>
-date:        Tue Apr 17 19:57:40 2012 -0400
-summary:     Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
-
-diff --git a/configure.in b/configure.in
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
- 
- dnl system libvpx Support
- dnl ========================================================
--MOZ_ARG_WITH_STRING(system-libvpx,
--[  --with-system-libvpx=[PFX]
--                          Use system libvpx [installed at prefix PFX]],
--    LIBVPX_DIR=$withval)
-+MOZ_ARG_WITH_BOOL(system-libvpx,
-+[  --with-system-libvpx    Use system libvpx (located with pkgconfig)],
-+    MOZ_NATIVE_LIBVPX=1)
- 
--MOZ_NATIVE_LIBVPX=
- MOZ_LIBVPX_INCLUDES=
- MOZ_LIBVPX_LIBS=
- 
-@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then
-         AC_DEFINE(MOZ_VP8_ENCODER)
-     fi
- 
--    if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
--        _SAVE_CFLAGS=$CFLAGS
--        _SAVE_LDFLAGS=$LDFLAGS
--        _SAVE_LIBS=$LIBS
--        if test "${LIBVPX_DIR}" = "yes"; then
--            LIBVPX_DIR=/usr
--        fi
--        CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
--        LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
--        MOZ_NATIVE_LIBVPX_DEC_TEST=
--        MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
--            [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
--             AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
--            fi],
--            AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
--        AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
--                     [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
--                     ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
--        if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
--            AC_MSG_CHECKING([for libvpx version >= v0.9.7])
--            dnl We need at least v0.9.7 to fix several crash bugs (for which we
--            dnl had local patches prior to v0.9.7).
--            dnl
--            dnl This is a terrible test for the library version, but we don't
--            dnl have a good one. There is no version number in a public header,
--            dnl and testing the headers still doesn't guarantee we link against
--            dnl the right version. While we could call vpx_codec_version() at
--            dnl run-time, that would break cross-compiling. There are no
--            dnl additional exported symbols between the v0.9.7 release and the
--            dnl v0.9.6 one to check for.
--            AC_TRY_COMPILE([
--                #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
--                    #error "test failed."
--                #endif
--                ],
--                [return 0;],
--                [AC_MSG_RESULT([yes])
--                 MOZ_NATIVE_LIBVPX=1
--                 MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
--                 MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
--                [AC_MSG_RESULT([no])
--                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
--        fi
--        CFLAGS=$_SAVE_CFLAGS
--        LDFLAGS=$_SAVE_LDFLAGS
--        LIBS=$_SAVE_LIBS
-+    if test -n "$MOZ_NATIVE_LIBVPX"; then
-+        dnl ============================
-+        dnl === libvpx Version check ===
-+        dnl ============================
-+        dnl Check to see if we have a system libvpx package.
-+        PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7)
-+
-+        MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], 
-+         [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
-+
-+        AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], 
-+         [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
-     fi
- fi
- 
diff --git a/mail/thunderbird-esr/files/patch-bug753046 b/mail/thunderbird-esr/files/patch-bug753046
deleted file mode 100644
index 63700c2f41d8..000000000000
--- a/mail/thunderbird-esr/files/patch-bug753046
+++ /dev/null
@@ -1,1202 +0,0 @@
-# Bug 753046 - Add support for DragonFly/NetBSD
-
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2011-12-20 23:28:14.000000000 +0000
-+++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -5,6 +5,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- #ifdef MOZ_WIDGET_QT
-+#include <unistd.h> // for _exit()
- #include <QtCore/QTimer>
- #include "nsQAppInstance.h"
- #include "NestedLoopTimer.h"
-@@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin
- 
-     // TODO: use PluginPRLibrary here
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     mShutdownFunc =
-         (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
- 
-@@ -1790,7 +1790,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
-     PLUGIN_LOG_DEBUG_METHOD;
-     AssertPluginThread();
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     return true;
- #elif defined(OS_WIN) || defined(OS_MACOSX)
-     *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1823,7 +1823,7 @@ PluginModuleChild::AnswerNP_Initialize(N
-     SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     *_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions);
-     return true;
- #elif defined(OS_WIN) || defined(OS_MACOSX)
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig	2011-12-20 23:28:14.000000000 +0000
-+++ mozilla/dom/plugins/ipc/PluginModuleChild.h
-@@ -340,7 +340,7 @@ private:
- 
-     // we get this from the plugin
-     NP_PLUGINSHUTDOWN mShutdownFunc;
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     NP_PLUGINUNIXINIT mInitializeFunc;
- #elif defined(OS_WIN) || defined(OS_MACOSX)
-     NP_PLUGININIT mInitializeFunc;
-$NetBSD: patch-ipc_chromium_Makefile.in,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/Makefile.in.orig	2012-02-16 06:40:33.000000000 +0000
-+++ mozilla/ipc/chromium/Makefile.in
-@@ -278,6 +278,34 @@ endif
- 
- endif # } OS_LINUX
- 
-+ifdef OS_BSD # {
-+
-+CPPSRCS += \
-+  atomicops_internals_x86_gcc.cc \
-+  file_util_linux.cc \
-+  process_util_bsd.cc \
-+  time_posix.cc \
-+  $(NULL)
-+
-+ifdef MOZ_ENABLE_GTK2
-+CPPSRCS += \
-+  message_pump_glib.cc \
-+  $(NULL)
-+endif
-+
-+ifdef MOZ_ENABLE_QT
-+MOCSRCS = \
-+  moc_message_pump_qt.cc \
-+  $(NULL)
-+
-+CPPSRCS += \
-+  $(MOCSRCS) \
-+  message_pump_qt.cc \
-+  $(NULL)
-+endif
-+
-+endif # } OS_BSD
-+
- # libevent
- 
- ifndef MOZ_NATIVE_LIBEVENT # {
-$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.2 2012/03/15 08:30:06 ryoon Exp $
-
---- mozilla/ipc/chromium/chromium-config.mk.orig	2012-02-16 07:40:33.000000000 +0100
-+++ mozilla/ipc/chromium/chromium-config.mk	2012-03-11 11:05:40.397182000 +0100
-@@ -56,17 +56,6 @@
-   -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
-   $(NULL)
- 
--ifeq ($(OS_ARCH),Darwin) # {
--
--OS_MACOSX = 1
--OS_POSIX = 1
--
--DEFINES += \
--  -DOS_MACOSX=1 \
--  -DOS_POSIX=1 \
--  $(NULL)
--
--else # } {
- ifeq ($(OS_ARCH),WINNT) # {
- OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
- 
-@@ -93,13 +82,65 @@
- endif
- 
- else # } {
--
--OS_LINUX = 1
- OS_POSIX = 1
-+DEFINES += -DOS_POSIX=1
-+
-+ifeq ($(OS_ARCH),Darwin) # {
-+
-+OS_MACOSX = 1
-+DEFINES += \
-+  -DOS_MACOSX=1 \
-+  $(NULL)
-+
-+else # } {
-+ifeq ($(OS_ARCH),DragonFly) # {
-+
-+OS_DRAGONFLY = 1
-+OS_BSD = 1
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+DEFINES += \
-+  -DOS_DRAGONFLY=1 \
-+  -DOS_BSD=1 \
-+  $(NULL)
-+
-+else # } {
-+ifeq ($(OS_ARCH),FreeBSD) # {
-+
-+OS_FREEBSD = 1
-+OS_BSD = 1
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+DEFINES += \
-+  -DOS_FREEBSD=1 \
-+  -DOS_BSD=1 \
-+  $(NULL)
- 
-+else # } {
-+ifeq ($(OS_ARCH),NetBSD) # {
-+
-+OS_NETBSD = 1
-+OS_BSD = 1
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+DEFINES += \
-+  -DOS_NETBSD=1 \
-+  -DOS_BSD=1 \
-+  $(NULL)
-+
-+else # } {
-+ifeq ($(OS_ARCH),OpenBSD) # {
-+
-+OS_OPENBSD = 1
-+OS_BSD = 1
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+DEFINES += \
-+  -DOS_OPENBSD=1 \
-+  -DOS_BSD=1 \
-+  $(NULL)
-+
-+else # } {
-+
-+OS_LINUX = 1
- DEFINES += \
-   -DOS_LINUX=1 \
--  -DOS_POSIX=1 \
-   $(NULL)
- 
- # NB: to stop gcc warnings about exporting template instantiation
-@@ -107,4 +147,8 @@
- 
- endif # }
- endif # }
-+endif # }
-+endif # }
-+endif # }
-+endif # }
- 
-$NetBSD: patch-ipc_chromium_src_base_base__paths.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/base_paths.h.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/base_paths.h
-@@ -13,7 +13,7 @@
- #include "base/base_paths_win.h"
- #elif defined(OS_MACOSX)
- #include "base/base_paths_mac.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "base/base_paths_linux.h"
- #endif
- #include "base/path_service.h"
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:18:45 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/debug_util_posix.cc
-@@ -5,7 +5,7 @@
- #include "build/build_config.h"
- #include "base/debug_util.h"
- 
--#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__))
-+#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID))
- 
- #include <errno.h>
- #include <fcntl.h>
-@@ -17,9 +17,16 @@
- #include <unistd.h>
- #if MOZ_HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-+
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- #include <sys/sysctl.h>
- #endif
- 
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
-+#include <sys/user.h>
-+#endif
-+
- #include "base/basictypes.h"
- #include "base/eintr_wrapper.h"
- #include "base/logging.h"
-@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
-   return false;
- }
- 
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- 
- // Based on Apple's recommended method as described in
- // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() {
- 
-   // This process is being debugged if the P_TRACED flag is set.
-   is_set = true;
-+#if defined(OS_DRAGONFLY)
-+  being_debugged = (info.kp_flags & P_TRACED) != 0;
-+#elif defined(OS_FREEBSD)
-+  being_debugged = (info.ki_flag & P_TRACED) != 0;
-+#elif defined(OS_OPENBSD)
-+  being_debugged = (info.p_flag & P_TRACED) != 0;
-+#else
-   being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
-+#endif
-   return being_debugged;
- }
- 
-diff --git ipc/chromium/src/base/dir_reader_bsd.h ipc/chromium/src/base/dir_reader_bsd.h
-new file mode 100644
-index 0000000..3fc1a87
---- /dev/null
-+++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
-@@ -0,0 +1,112 @@
-+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+// derived from dir_reader_linux.h
-+
-+#ifndef BASE_DIR_READER_BSD_H_
-+#define BASE_DIR_READER_BSD_H_
-+#pragma once
-+
-+#include <dirent.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdint.h>
-+#include <unistd.h>
-+
-+#include "base/logging.h"
-+#include "base/eintr_wrapper.h"
-+
-+// See the comments in dir_reader_posix.h about this.
-+
-+namespace base {
-+
-+class DirReaderBSD {
-+ public:
-+  explicit DirReaderBSD(const char* directory_path)
-+#ifdef O_DIRECTORY
-+      : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
-+#else
-+      : fd_(open(directory_path, O_RDONLY)),
-+#endif
-+        offset_(0),
-+        size_(0) {
-+    memset(buf_, 0, sizeof(buf_));
-+  }
-+
-+  ~DirReaderBSD() {
-+    if (fd_ >= 0) {
-+      if (HANDLE_EINTR(close(fd_)))
-+        DLOG(ERROR) << "Failed to close directory handle";
-+    }
-+  }
-+
-+  bool IsValid() const {
-+    return fd_ >= 0;
-+  }
-+
-+  // Move to the next entry returning false if the iteration is complete.
-+  bool Next() {
-+    if (size_) {
-+      struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
-+#ifdef OS_DRAGONFLY
-+      offset_ += _DIRENT_DIRSIZ(dirent);
-+#else
-+      offset_ += dirent->d_reclen;
-+#endif
-+    }
-+
-+    if (offset_ != size_)
-+      return true;
-+
-+#ifdef OS_OPENBSD
-+    const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_);
-+#else
-+    const int r = getdents(fd_, buf_, sizeof(buf_));
-+#endif
-+    if (r == 0)
-+      return false;
-+    if (r == -1) {
-+#ifdef OS_OPENBSD
-+      DLOG(ERROR) << "getdirentries returned an error: " << errno;
-+#else
-+      DLOG(ERROR) << "getdents returned an error: " << errno;
-+#endif
-+      return false;
-+    }
-+    size_ = r;
-+    offset_ = 0;
-+    return true;
-+  }
-+
-+  const char* name() const {
-+    if (!size_)
-+      return NULL;
-+
-+    const struct dirent* dirent =
-+        reinterpret_cast<const struct dirent*>(&buf_[offset_]);
-+    return dirent->d_name;
-+  }
-+
-+  int fd() const {
-+    return fd_;
-+  }
-+
-+  static bool IsFallback() {
-+    return false;
-+  }
-+
-+ private:
-+  const int fd_;
-+  char buf_[512];
-+#ifdef OS_OPENBSD
-+  off_t *basep_;
-+#endif
-+  size_t offset_, size_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(DirReaderBSD);
-+};
-+
-+}  // namespace base
-+
-+#endif // BASE_DIR_READER_BSD_H_
-diff --git ipc/chromium/src/base/dir_reader_posix.h ipc/chromium/src/base/dir_reader_posix.h
-index 9a34492..62b280c 100644
---- mozilla/ipc/chromium/src/base/dir_reader_posix.h
-+++ mozilla/ipc/chromium/src/base/dir_reader_posix.h
-@@ -18,6 +18,8 @@
- 
- #if defined(OS_LINUX)
- #include "base/dir_reader_linux.h"
-+#elif defined(OS_BSD)
-+#include "base/dir_reader_bsd.h"
- #else
- #include "base/dir_reader_fallback.h"
- #endif
-@@ -26,6 +28,8 @@
- 
- #if defined(OS_LINUX)
- typedef DirReaderLinux DirReaderPosix;
-+#elif defined(OS_BSD)
-+typedef DirReaderBSD DirReaderPosix;
- #else
- typedef DirReaderFallback DirReaderPosix;
- #endif
-diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc
-index 171e44f..0c6dfcc 100644
---- mozilla/ipc/chromium/src/base/file_util_linux.cc
-+++ mozilla/ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
- }
- 
- bool GetShmemTempDir(FilePath* path) {
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_BSD)
-   return GetTempDir(path);
- #else
-   *path = FilePath("/dev/shm");
-$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/file_util_posix.cc
-@@ -31,7 +31,7 @@
- #include "base/time.h"
- 
- // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine
--#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+#ifndef HAVE_STAT64
- #define stat64 stat
- #endif
- 
-$NetBSD: patch-ipc_chromium_src_base_message__loop.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/message_loop.cc.orig	2012-02-16 07:40:33.000000000 +0100
-+++ mozilla/ipc/chromium/src/base/message_loop.cc	2012-02-21 21:24:41.000000000 +0100
-@@ -19,7 +19,7 @@
- #if defined(OS_POSIX)
- #include "base/message_pump_libevent.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #ifdef MOZ_WIDGET_GTK2
- #include "base/message_pump_glib.h"
- #endif
-@@ -119,7 +119,7 @@
-   if (type_ == TYPE_UI) {
- #if defined(OS_MACOSX)
-     pump_ = base::MessagePumpMac::Create();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-     pump_ = new base::MessagePumpForUI();
- #endif  // OS_LINUX
-   } else if (type_ == TYPE_IO) {
-$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/platform_thread.h.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/platform_thread.h
-@@ -22,9 +22,12 @@ typedef void* PlatformThreadHandle;  // HANDLE
- #elif defined(OS_POSIX)
- #include <pthread.h>
- typedef pthread_t PlatformThreadHandle;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_OPENBSD)
- #include <unistd.h>
- typedef pid_t PlatformThreadId;
-+#elif defined(OS_BSD)
-+#include <sys/types.h>
-+typedef lwpid_t PlatformThreadId;
- #elif defined(OS_MACOSX)
- #include <mach/mach.h>
- typedef mach_port_t PlatformThreadId;
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 15:18:45 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,23 @@
- 
- #if defined(OS_MACOSX)
- #include <mach/mach.h>
-+#elif defined(OS_NETBSD)
-+#include <lwp.h>
- #elif defined(OS_LINUX)
- #include <sys/syscall.h>
- #include <unistd.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <unistd.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/param.h>
-+#if __FreeBSD_version > 802500
-+#include <sys/thr.h>
-+#else
-+_Pragma("GCC visibility push(default)")
-+extern "C" int thr_self(long *);
-+_Pragma("GCC visibility pop")
-+#endif
-+#include <pthread_np.h>
- #endif
- 
- #if defined(OS_MACOSX)
-@@ -38,9 +45,20 @@
-   // into the kernel.
- #if defined(OS_MACOSX)
-   return mach_thread_self();
--#elif defined (__OpenBSD__)
-+#elif defined(OS_NETBSD)
-+  return _lwp_self();
-+#elif defined(OS_DRAGONFLY)
-+  return lwp_gettid();
-+#elif defined(OS_FREEBSD)
-+#  if __FreeBSD_version > 900030
-+    return pthread_getthreadid_np();
-+#  else
-+    long lwpid;
-+    thr_self(&lwpid);
-+    return lwpid;
-+#  endif
-+#elif defined(OS_OPENBSD)
--  // TODO(BSD): find a better thread ID
--  return (intptr_t)(pthread_self());
-+  return (intptr_t) (pthread_self());
- #elif defined(OS_LINUX)
-   return syscall(__NR_gettid);
- #endif
-$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/process_util.h.orig	2011-12-21 00:28:19.000000000 +0100
-+++ mozilla/ipc/chromium/src/base/process_util.h	2012-01-31 13:14:54.000000000 +0100
-@@ -280,6 +280,7 @@ class NamedProcessIterator {
-   const ProcessEntry* NextProcessEntry();
- 
-  private:
-+#if !defined(OS_BSD)
-   // Determines whether there's another process (regardless of executable)
-   // left in the list of all processes.  Returns true and sets entry_ to
-   // that process's info if there is one, false otherwise.
-@@ -292,18 +292,24 @@
-   void InitProcessEntry(ProcessEntry* entry);
- 
-   std::wstring executable_name_;
-+#endif
- 
- #if defined(OS_WIN)
-   HANDLE snapshot_;
-   bool started_iteration_;
- #elif defined(OS_LINUX)
-   DIR *procfs_dir_;
-+#elif defined(OS_BSD)
-+  std::vector<ProcessEntry> content;
-+  size_t nextEntry;
- #elif defined(OS_MACOSX)
-   std::vector<kinfo_proc> kinfo_procs_;
-   size_t index_of_kinfo_proc_;
- #endif
-+#if !defined(OS_BSD)
-   ProcessEntry entry_;
-   const ProcessFilter* filter_;
-+#endif
- 
-   DISALLOW_EVIL_CONSTRUCTORS(NamedProcessIterator);
- };
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:18:45 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-04-01 00:04:28.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,318 @@
-+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+// derived from process_util_linux.cc and process_util_mac.cc
-+
-+#include "base/process_util.h"
-+
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/wait.h>
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
-+#include <sys/user.h>
-+#endif
-+
-+#include <ctype.h>
-+#include <fcntl.h>
-+#include <kvm.h>
-+#include <unistd.h>
-+
-+#include <string>
-+
-+#include "base/debug_util.h"
-+#include "base/eintr_wrapper.h"
-+#include "base/file_util.h"
-+#include "base/logging.h"
-+#include "base/string_tokenizer.h"
-+#include "base/string_util.h"
-+
-+#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \
-+  || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500)
-+#define HAVE_POSIX_SPAWN	1
-+#endif
-+
-+#ifndef __dso_public
-+# ifdef __exported
-+#  define __dso_public	__exported
-+# else
-+#  define __dso_public	__attribute__((__visibility__("default")))
-+# endif
-+#endif
-+
-+#ifdef HAVE_POSIX_SPAWN
-+#include <spawn.h>
-+extern "C" char **environ __dso_public;
-+#endif
-+
-+namespace {
-+
-+enum ParsingState {
-+  KEY_NAME,
-+  KEY_VALUE
-+};
-+
-+static mozilla::EnvironmentLog gProcessLog("MOZ_PROCESS_LOG");
-+
-+}  // namespace
-+
-+namespace base {
-+
-+#ifdef HAVE_POSIX_SPAWN
-+
-+void FreeEnvVarsArray(char* array[], int length)
-+{
-+  for (int i = 0; i < length; i++) {
-+    free(array[i]);
-+  }
-+  delete[] array;
-+}
-+
-+bool LaunchApp(const std::vector<std::string>& argv,
-+               const file_handle_mapping_vector& fds_to_remap,
-+               bool wait, ProcessHandle* process_handle) {
-+  return LaunchApp(argv, fds_to_remap, environment_map(),
-+                   wait, process_handle);
-+}
-+
-+bool LaunchApp(const std::vector<std::string>& argv,
-+               const file_handle_mapping_vector& fds_to_remap,
-+               const environment_map& env_vars_to_set,
-+               bool wait, ProcessHandle* process_handle,
-+               ProcessArchitecture arch) {
-+  bool retval = true;
-+
-+  char* argv_copy[argv.size() + 1];
-+  for (size_t i = 0; i < argv.size(); i++) {
-+    argv_copy[i] = const_cast<char*>(argv[i].c_str());
-+  }
-+  argv_copy[argv.size()] = NULL;
-+
-+  // Make sure we don't leak any FDs to the child process by marking all FDs
-+  // as close-on-exec.
-+  SetAllFDsToCloseOnExec();
-+
-+  // Copy environment to a new char array and add the variables
-+  // in env_vars_to_set.
-+  // Existing variables are overwritten by env_vars_to_set.
-+  int pos = 0;
-+  environment_map combined_env_vars = env_vars_to_set;
-+  while(environ[pos] != NULL) {
-+    std::string varString = environ[pos];
-+    std::string varName = varString.substr(0, varString.find_first_of('='));
-+    std::string varValue = varString.substr(varString.find_first_of('=') + 1);
-+    if (combined_env_vars.find(varName) == combined_env_vars.end()) {
-+      combined_env_vars[varName] = varValue;
-+    }
-+    pos++;
-+  }
-+  int varsLen = combined_env_vars.size() + 1;
-+
-+  char** vars = new char*[varsLen];
-+  int i = 0;
-+  for (environment_map::const_iterator it = combined_env_vars.begin();
-+       it != combined_env_vars.end(); ++it) {
-+    std::string entry(it->first);
-+    entry += "=";
-+    entry += it->second;
-+    vars[i] = strdup(entry.c_str());
-+    i++;
-+  }
-+  vars[i] = NULL;
-+
-+  posix_spawn_file_actions_t file_actions;
-+  if (posix_spawn_file_actions_init(&file_actions) != 0) {
-+    FreeEnvVarsArray(vars, varsLen);
-+    return false;
-+  }
-+
-+  // Turn fds_to_remap array into a set of dup2 calls.
-+  for (file_handle_mapping_vector::const_iterator it = fds_to_remap.begin();
-+       it != fds_to_remap.end();
-+       ++it) {
-+    int src_fd = it->first;
-+    int dest_fd = it->second;
-+
-+    if (src_fd == dest_fd) {
-+      int flags = fcntl(src_fd, F_GETFD);
-+      if (flags != -1) {
-+        fcntl(src_fd, F_SETFD, flags & ~FD_CLOEXEC);
-+      }
-+    } else {
-+      if (posix_spawn_file_actions_adddup2(&file_actions, src_fd, dest_fd) != 0) {
-+        posix_spawn_file_actions_destroy(&file_actions);
-+        FreeEnvVarsArray(vars, varsLen);
-+        return false;
-+      }
-+    }
-+  }
-+
-+  pid_t pid = 0;
-+  int spawn_succeeded = (posix_spawnp(&pid,
-+                                      argv_copy[0],
-+                                      &file_actions,
-+                                      NULL,
-+                                      argv_copy,
-+                                      vars) == 0);
-+
-+  FreeEnvVarsArray(vars, varsLen);
-+
-+  posix_spawn_file_actions_destroy(&file_actions);
-+
-+  bool process_handle_valid = pid > 0;
-+  if (!spawn_succeeded || !process_handle_valid) {
-+    retval = false;
-+  } else {
-+    if (wait)
-+      HANDLE_EINTR(waitpid(pid, 0, 0));
-+
-+    if (process_handle)
-+      *process_handle = pid;
-+  }
-+
-+  return retval;
-+}
-+
-+bool LaunchApp(const CommandLine& cl,
-+               bool wait, bool start_hidden, ProcessHandle* process_handle) {
-+  // TODO(playmobil): Do we need to respect the start_hidden flag?
-+  file_handle_mapping_vector no_files;
-+  return LaunchApp(cl.argv(), no_files, wait, process_handle);
-+}
-+
-+#else // no posix_spawn, use fork/exec
-+
-+bool LaunchApp(const std::vector<std::string>& argv,
-+               const file_handle_mapping_vector& fds_to_remap,
-+               bool wait, ProcessHandle* process_handle) {
-+  return LaunchApp(argv, fds_to_remap, environment_map(),
-+                   wait, process_handle);
-+}
-+
-+bool LaunchApp(const std::vector<std::string>& argv,
-+               const file_handle_mapping_vector& fds_to_remap,
-+               const environment_map& env_vars_to_set,
-+               bool wait, ProcessHandle* process_handle,
-+               ProcessArchitecture arch) {
-+  scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
-+  // Illegal to allocate memory after fork and before execvp
-+  InjectiveMultimap fd_shuffle1, fd_shuffle2;
-+  fd_shuffle1.reserve(fds_to_remap.size());
-+  fd_shuffle2.reserve(fds_to_remap.size());
-+
-+  pid_t pid = fork();
-+  if (pid < 0)
-+    return false;
-+
-+  if (pid == 0) {
-+    for (file_handle_mapping_vector::const_iterator
-+        it = fds_to_remap.begin(); it != fds_to_remap.end(); ++it) {
-+      fd_shuffle1.push_back(InjectionArc(it->first, it->second, false));
-+      fd_shuffle2.push_back(InjectionArc(it->first, it->second, false));
-+    }
-+
-+    if (!ShuffleFileDescriptors(&fd_shuffle1))
-+      _exit(127);
-+
-+    CloseSuperfluousFds(fd_shuffle2);
-+
-+    for (environment_map::const_iterator it = env_vars_to_set.begin();
-+         it != env_vars_to_set.end(); ++it) {
-+      if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
-+        _exit(127);
-+    }
-+
-+    for (size_t i = 0; i < argv.size(); i++)
-+      argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-+    argv_cstr[argv.size()] = NULL;
-+    execvp(argv_cstr[0], argv_cstr.get());
-+    // if we get here, we're in serious trouble and should complain loudly
-+    DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-+    exit(127);
-+  } else {
-+    gProcessLog.print("==> process %d launched child process %d\n",
-+                      GetCurrentProcId(), pid);
-+    if (wait)
-+      HANDLE_EINTR(waitpid(pid, 0, 0));
-+
-+    if (process_handle)
-+      *process_handle = pid;
-+  }
-+
-+  return true;
-+}
-+
-+bool LaunchApp(const CommandLine& cl,
-+               bool wait, bool start_hidden,
-+               ProcessHandle* process_handle) {
-+  file_handle_mapping_vector no_files;
-+  return LaunchApp(cl.argv(), no_files, wait, process_handle);
-+}
-+
-+#endif
-+
-+NamedProcessIterator::NamedProcessIterator(const std::wstring& executable_name,
-+                                           const ProcessFilter* filter)
-+{
-+  int numEntries;
-+  kvm_t *kvm;
-+  std::string exe(WideToASCII(executable_name));
-+
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
-+  kvm  = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
-+  struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), &numEntries);
-+  if (procs != NULL && numEntries > 0) {
-+    for (int i = 0; i < numEntries; i++) {
-+#  if defined(OS_DRAGONFLY)
-+    if (exe != procs[i].kp_comm) continue;
-+      if (filter && !filter->Includes(procs[i].kp_pid, procs[i].kp_ppid)) continue;
-+      ProcessEntry e;
-+      e.pid = procs[i].kp_pid;
-+      e.ppid = procs[i].kp_ppid;
-+      strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile);
-+      content.push_back(e);
-+#  elif defined(OS_FREEBSD)
-+    if (exe != procs[i].ki_comm) continue;
-+      if (filter && !filter->Includes(procs[i].ki_pid, procs[i].ki_ppid)) continue;
-+      ProcessEntry e;
-+      e.pid = procs[i].ki_pid;
-+      e.ppid = procs[i].ki_ppid;
-+      strlcpy(e.szExeFile, procs[i].ki_comm, sizeof e.szExeFile);
-+      content.push_back(e);
-+#  endif
-+#else
-+  kvm  = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+#if defined(OS_OPENBSD)
-+  struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries);
-+#else
-+  struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries);
-+#endif
-+  if (procs != NULL && numEntries > 0) {
-+    for (int i = 0; i < numEntries; i++) {
-+    if (exe != procs[i].p_comm) continue;
-+      if (filter && !filter->Includes(procs[i].p_pid, procs[i].p_ppid)) continue;
-+      ProcessEntry e;
-+      e.pid = procs[i].p_pid;
-+      e.ppid = procs[i].p_ppid;
-+      strlcpy(e.szExeFile, procs[i].p_comm, sizeof e.szExeFile);
-+      content.push_back(e);
-+#endif
-+    }
-+  }
-+  nextEntry = 0;
-+  kvm_close(kvm);
-+}
-+
-+NamedProcessIterator::~NamedProcessIterator() {
-+}
-+
-+const ProcessEntry* NamedProcessIterator::NextProcessEntry() {
-+  if (nextEntry >= content.size()) return NULL;
-+  return &content[nextEntry++];
-+}
-+
-+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+  return false;
-+}
-+
-+}  // namespace base
-$NetBSD: patch-ipc_chromium_src_base_process__util__posix.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/process_util_posix.cc
-@@ -116,6 +116,11 @@ void CloseSuperfluousFds(const base::Inj
- #elif defined(OS_MACOSX)
-   static const rlim_t kSystemDefaultMaxFds = 256;
-   static const char kFDDir[] = "/dev/fd";
-+#elif defined(OS_BSD)
-+  // the getrlimit below should never fail, so whatever ..
-+  static const rlim_t kSystemDefaultMaxFds = 1024;
-+  // at least /dev/fd will exist
-+  static const char kFDDir[] = "/dev/fd";
- #endif
- 
-   // Get the maximum number of FDs possible.
-@@ -199,7 +204,7 @@ void CloseSuperfluousFds(const base::Inj
- void SetAllFDsToCloseOnExec() {
- #if defined(OS_LINUX)
-   const char fd_dir[] = "/proc/self/fd";
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
-   const char fd_dir[] = "/dev/fd";
- #endif
-   ScopedDIR dir_closer(opendir(fd_dir));
-$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.2 2011/11/27 13:09:00 tnn Exp $
-
---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig	2011-11-04 21:34:00.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/sys_info_posix.cc
-@@ -18,6 +18,11 @@
- #include <mach/mach_init.h>
- #endif
- 
-+#if defined(OS_NETBSD)
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- #include "base/logging.h"
- #include "base/string_util.h"
- 
-@@ -26,7 +31,11 @@ namespace base {
- int SysInfo::NumberOfProcessors() {
-   // It seems that sysconf returns the number of "logical" processors on both
-   // mac and linux.  So we get the number of "online logical" processors.
-+#ifdef _SC_NPROCESSORS_ONLN
-   static long res = sysconf(_SC_NPROCESSORS_ONLN);
-+#else
-+  static long res = 1;
-+#endif
-   if (res == -1) {
-     NOTREACHED();
-     return 1;
-@@ -52,6 +61,20 @@ int64 SysInfo::AmountOfPhysicalMemory() 
-   }
- 
-   return static_cast<int64>(hostinfo.max_mem);
-+#elif defined(OS_NETBSD)
-+  int mib[2];
-+  int rc;
-+  int64_t memSize;
-+  size_t len = sizeof(memSize);
-+
-+  mib[0] = CTL_HW;
-+  mib[1] = HW_PHYSMEM64;
-+  rc = sysctl( mib, 2, &memSize, &len, NULL, 0 );
-+  if (-1 != rc)  {
-+    return memSize;
-+  }
-+  return 0;
-+
- #else
-   long pages = sysconf(_SC_PHYS_PAGES);
-   long page_size = sysconf(_SC_PAGE_SIZE);
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
-@@ -34,7 +34,7 @@
- #include "base/third_party/nspr/prcpucfg_win.h"
- #elif defined(__APPLE__)
- #include "base/third_party/nspr/prcpucfg_mac.h"
--#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include "base/third_party/nspr/prcpucfg_linux.h"
- #elif defined(__OpenBSD__)
- #include "base/third_party/nspr/prcpucfg_openbsd.h"
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc
-@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
-     LL_ADD(retVal, retVal, temp);
- 
-     return retVal;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY)
-     struct tm exp_tm = {0};
-     exp_tm.tm_sec  = exploded->tm_sec;
-     exp_tm.tm_min  = exploded->tm_min;
-@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
-     result *= kSecondsToMicroseconds;
-     result += exploded->tm_usec;
-     return result;
-+#elif defined(OS_FREEBSD) || defined(OS_NETBSD)
-+    struct tm exp_tm = {0};
-+    exp_tm.tm_sec  = exploded->tm_sec;
-+    exp_tm.tm_min  = exploded->tm_min;
-+    exp_tm.tm_hour = exploded->tm_hour;
-+    exp_tm.tm_mday = exploded->tm_mday;
-+    exp_tm.tm_mon  = exploded->tm_month;
-+    exp_tm.tm_year = exploded->tm_year - 1900;
-+
-+    // time_t is 64bit
-+    time_t absolute_time = timegm(&exp_tm);
-+
-+    PRTime result = static_cast<PRTime>(absolute_time);
-+    result -= exploded->tm_params.tp_gmt_offset +
-+              exploded->tm_params.tp_dst_offset;
-+    result *= kSecondsToMicroseconds;
-+    result += exploded->tm_usec;
-+    return result;
- #else
- #error No PR_ImplodeTime implemented on your platform.
- #endif
-diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc
-index abf2a56..48791f6 100644
---- mozilla/ipc/chromium/src/base/time_posix.cc
-+++ mozilla/ipc/chromium/src/base/time_posix.cc
-@@ -167,7 +167,7 @@ TimeTicks TimeTicks::Now() {
-   // With numer and denom = 1 (the expected case), the 64-bit absolute time
-   // reported in nanoseconds is enough to last nearly 585 years.
- 
--#elif defined(__OpenBSD__) || defined(OS_POSIX) && \
-+#elif defined(OS_OPENBSD) || defined(OS_POSIX) && \
-       defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
- 
-   struct timespec ts;
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/01 15:18:45 ryoon Exp $
-
---- mozilla/ipc/chromium/src/build/build_config.h.orig	2012-03-13 01:36:53.000000000 +0000
-+++ mozilla/ipc/chromium/src/build/build_config.h
-@@ -19,6 +19,12 @@
- #define OS_MACOSX 1
- #elif defined(__linux__) || defined(ANDROID)
- #define OS_LINUX 1
-+#elif defined(__DragonFly__)
-+#define OS_DRAGONFLY 1
-+#elif defined(__FreeBSD__)
-+#define OS_FREEBSD 1
-+#elif defined(__NetBSD__)
-+#define OS_NETBSD 1
- #elif defined(__OpenBSD__)
- #define OS_OPENBSD 1
- #elif defined(_WIN32)
-@@ -27,9 +33,16 @@
- #error Please add support for your platform in build/build_config.h
- #endif
- 
-+// For access to standard BSD features, use OS_BSD instead of a
-+// more specific macro.
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)	\
-+  || defined(OS_NETBSD) || defined(OS_OPENBSD)
-+#define OS_BSD 1
-+#endif
-+
- // For access to standard POSIX features, use OS_POSIX instead of a more
- // specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- #define OS_POSIX 1
- #endif
- 
-diff --git ipc/chromium/src/chrome/common/ipc_channel_posix.cc ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-index bd866ee..2ea5b19 100644
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -7,6 +7,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <stddef.h>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.1 2011/07/11 12:46:14 tnn Exp $
-
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig	2011-06-15 21:57:27.000000000 +0000
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h
-@@ -92,7 +92,7 @@ class Channel::ChannelImpl : public Mess
-   };
- 
-   // This is a control message buffer large enough to hold kMaxReadFDs
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_NETBSD)
-   // TODO(agl): OSX appears to have non-constant CMSG macros!
-   char input_cmsg_buf_[1024];
- #else
-$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
-@@ -195,7 +195,7 @@
- };
- #endif
- 
--#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
-+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
- // There size_t is a synonym for |unsigned long| ...
- template <>
- struct ParamTraits<size_t> {
-@@ -248,7 +248,7 @@
- };
- #endif  // defined(OS_MACOSX)
- 
--#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))
-+#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS))
- // int64 is |long int| on 64-bit systems, uint64 is |unsigned long|
- template <>
- struct ParamTraits<int64> {
-$NetBSD: patch-ipc_chromium_src_chrome_common_transport__dib.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/chrome/common/transport_dib.h
-@@ -7,7 +7,7 @@
- 
- #include "base/basictypes.h"
- 
--#if defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
- #include "base/shared_memory.h"
- #endif
- 
-@@ -66,7 +66,7 @@ class TransportDIB {
-     uint32 sequence_num;
-   };
-   typedef HandleAndSequenceNum Id;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
-   typedef base::SharedMemoryHandle Handle;
-   // On Mac, the inode number of the backing file is used as an id.
-   typedef base::SharedMemoryId Id;
-@@ -108,7 +108,7 @@ class TransportDIB {
- 
-  private:
-   TransportDIB();
--#if defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
-   explicit TransportDIB(base::SharedMemoryHandle dib);
-   base::SharedMemory shared_memory_;
-   uint32 sequence_num_;
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoon Exp $
-
---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/glue/GeckoChildProcessHost.cpp
-@@ -430,7 +430,7 @@
-   // and passing wstrings from one config to the other is unsafe.  So
-   // we split the logic here.
- 
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-   base::environment_map newEnvVars;
-   // XPCOM may not be initialized in some subprocesses.  We don't want
-   // to initialize XPCOM just for the directory service, especially
-@@ -445,8 +445,8 @@
-       if (NS_SUCCEEDED(rv)) {
-         nsCString path;
-         greDir->GetNativePath(path);
--# ifdef OS_LINUX
--#  ifdef ANDROID
-+# if defined(OS_LINUX) || defined(OS_BSD)
-+#  if defined(ANDROID) || defined(OS_BSD)
-         path += "/lib";
- #  endif  // ANDROID
-         const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -557,7 +557,7 @@
-   childArgv.push_back(pidstring);
- 
- #if defined(MOZ_CRASHREPORTER)
--#  if defined(OS_LINUX)
-+#  if defined(OS_LINUX) || defined(OS_BSD)
-   int childCrashFd, childCrashRemapFd;
-   if (!CrashReporter::CreateNotificationPipeForChild(
-         &childCrashFd, &childCrashRemapFd))
-@@ -594,7 +594,7 @@
- #endif
- 
-   base::LaunchApp(childArgv, mFileMap,
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-                   newEnvVars,
- #endif
-                   false, &process, arch);
-diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h
-index f37998d..b05dc7b 100644
---- mozilla/ipc/glue/SharedMemorySysV.h
-+++ mozilla/ipc/glue/SharedMemorySysV.h
-@@ -8,7 +8,7 @@
- #ifndef mozilla_ipc_SharedMemorySysV_h
- #define mozilla_ipc_SharedMemorySysV_h
- 
--#if defined(OS_LINUX) && !defined(ANDROID)
-+#if (defined(OS_LINUX) && !defined(ANDROID)) || defined(OS_BSD)
- 
- // SysV shared memory isn't available on Windows, but we define the
- // following macro so that #ifdefs are clearer (compared to #ifdef
-$NetBSD: patch-mm,v 1.13 2012/06/05 18:09:21 ryoon Exp $
-
---- mozilla/toolkit/library/Makefile.in.orig	2012-05-23 18:57:09.000000000 +0000
-+++ mozilla/toolkit/library/Makefile.in
-@@ -534,6 +538,12 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
- endif
- endif
- 
-+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+# keep `environ' unresolved, see bug 14426 for binutils
-+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
-+endif
-+
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet)
- ifdef ACCESSIBILITY
diff --git a/mail/thunderbird-esr/files/patch-bug761077 b/mail/thunderbird-esr/files/patch-bug761077
deleted file mode 100644
index 3c8040ed6754..000000000000
--- a/mail/thunderbird-esr/files/patch-bug761077
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-index b8a87a5..918c4cf 100644
---- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-+++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-@@ -44,7 +44,7 @@ print OUTFILE "*  0 is QueryInterface\n";
- print OUTFILE "*  1 is AddRef\n";
- print OUTFILE "*  2 is Release\n";
- print OUTFILE "*/\n";
--print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
-+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
- for($i = 0; $i < $entry_count; $i++) {
-     print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
- }
-diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-index eb66761..807db26 100644
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-@@ -8,7 +8,7 @@
- *  1 is AddRef
- *  2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
-diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-index ae6ed66..2783957 100644
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -70,7 +70,7 @@ endif
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -269,7 +269,7 @@ endif
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS		:= $(CC) -c -x assembler-with-cpp
-@@ -278,7 +278,7 @@ endif
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS             := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@ endif
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
-diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-index d903ced..e4ec832 100644
---- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-+++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-@@ -14,7 +14,7 @@
- 
- class xptiInterfaceEntry;
- 
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -31,7 +31,7 @@ public:
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
- 
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
diff --git a/mail/thunderbird-esr/files/patch-bug778056 b/mail/thunderbird-esr/files/patch-bug778056
deleted file mode 100644
index 2a792aba9aa0..000000000000
--- a/mail/thunderbird-esr/files/patch-bug778056
+++ /dev/null
@@ -1,21 +0,0 @@
---- mozilla/memory/mozalloc/mozalloc.cpp~
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
- #if defined(XP_UNIX)
- #  include <unistd.h>           // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
-+#  include <malloc_np.h>        // for malloc_usable_size
-+#endif
- 
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY)
-+#elif defined(MOZ_MEMORY) || defined(__FreeBSD__)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
diff --git a/mail/thunderbird-esr/files/patch-bug778078 b/mail/thunderbird-esr/files/patch-bug778078
deleted file mode 100644
index 6043f4a30c90..000000000000
--- a/mail/thunderbird-esr/files/patch-bug778078
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n
-     gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
- #if defined(MOZ_WIDGET_GTK2)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
-     // Disable the slice allocator, since jemalloc already uses similar layout
-     // algorithms, and using a sub-allocator tends to increase fragmentation.
-     // This must be done before g_thread_init() is called.
diff --git a/mail/thunderbird-esr/files/patch-bug779847 b/mail/thunderbird-esr/files/patch-bug779847
deleted file mode 100644
index ed30d515af31..000000000000
--- a/mail/thunderbird-esr/files/patch-bug779847
+++ /dev/null
@@ -1,28 +0,0 @@
---- mozilla/gfx/ycbcr/Makefile.in
-+++ mozilla/gfx/ycbcr/Makefile.in
-@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
-            $(NULL)
- endif
- else
--ifeq ($(OS_ARCH),Linux)
--CPPSRCS += yuv_row_posix.cpp \
--           $(NULL)
--else
--ifeq ($(OS_ARCH),SunOS)
--CPPSRCS += yuv_row_posix.cpp \
--           $(NULL)
--else
--ifeq ($(OS_ARCH),Darwin)
-+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
- CPPSRCS += yuv_row_posix.cpp \
-            $(NULL)
- else
- CPPSRCS += yuv_row_other.cpp \
-            $(NULL)
--endif # Darwin
--endif # SunOS
--endif # linux
-+endif # posix
- endif # windows
- 
- ifeq (arm,$(findstring arm,$(OS_TEST)))
diff --git a/mail/thunderbird-esr/files/patch-bug781457 b/mail/thunderbird-esr/files/patch-bug781457
deleted file mode 100644
index 1a883966b942..000000000000
--- a/mail/thunderbird-esr/files/patch-bug781457
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/nsStackWalk.cpp.orig	2010-09-12 19:34:04.012503905 +0300
-+++ mozilla/xpcom/base/nsStackWalk.cpp	2010-09-12 19:34:41.294462134 +0300
-@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
- 
- #elif defined(HAVE__UNWIND_BACKTRACE)
- 
-+#define _GNU_SOURCE
- // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
- #include <unwind.h>
- 
diff --git a/mail/thunderbird-esr/files/patch-bug783463 b/mail/thunderbird-esr/files/patch-bug783463
deleted file mode 100644
index 64c28f6ceede..000000000000
--- a/mail/thunderbird-esr/files/patch-bug783463
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla/widget/src/qt/nsNativeThemeQt.cpp~
-+++ mozilla/widget/src/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,6 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
--#include <malloc.h>
- 
- 
- #include "gfxASurface.h"
---- mozilla/widget/src/qt/nsSound.cpp~
-+++ mozilla/widget/src/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
- 
- #include <string.h>
-+#include <unistd.h>
- 
- #include "nscore.h"
- #include "plstr.h"
diff --git a/mail/thunderbird-esr/files/patch-bug784776 b/mail/thunderbird-esr/files/patch-bug784776
deleted file mode 100644
index d8f0e6326249..000000000000
--- a/mail/thunderbird-esr/files/patch-bug784776
+++ /dev/null
@@ -1,22 +0,0 @@
---- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
-+++ mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp
-@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
-   struct tm *tmc;
-   int i;
- 
--  tt = time((time_t)NULL);
-+  tt = time(NULL);
-   tmc = localtime(&tt);
- 
-   tmc->tm_hour=22;    // put the test sample hour to 22:00 which is 10PM
---- mozilla/xpcom/glue/nsBaseHashtable.h~
-+++ mozilla/xpcom/glue/nsBaseHashtable.h
-@@ -147,7 +147,7 @@ public:
-   {
-     EntryType* ent = this->GetEntry(aKey);
-     if (!ent)
--      return NULL;
-+      return 0;
- 
-     return ent->mData;
-   }
diff --git a/mail/thunderbird-esr/files/patch-bug788039 b/mail/thunderbird-esr/files/patch-bug788039
deleted file mode 100644
index c42105d133c4..000000000000
--- a/mail/thunderbird-esr/files/patch-bug788039
+++ /dev/null
@@ -1,59 +0,0 @@
-# Bug 788039 - With no prefix search libevent via pkg-config.
-
---- mozilla/config/autoconf.mk.in~
-+++ mozilla/config/autoconf.mk.in
-@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
- 
- MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
- MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
--MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
-+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
- 
- MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
- MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
---- mozilla/configure.in~
-+++ mozilla/configure.in
-@@ -3854,7 +3854,7 @@ fi
- dnl system libevent Support
- dnl ========================================================
- MOZ_ARG_WITH_STRING(system-libevent,
--[  --with-system-libevent=[PFX]
-+[  --with-system-libevent[=PFX]
-                           Use system libevent [installed at prefix PFX]],
-     LIBEVENT_DIR=$withval)
- 
-@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
- _SAVE_LIBS=$LIBS
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
-     MOZ_NATIVE_LIBEVENT=
-+elif test "$LIBEVENT_DIR" = yes; then
-+    PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+        MOZ_NATIVE_LIBEVENT=1,
-+        AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
- else
--    if test "${LIBEVENT_DIR}" = "yes"; then
--        LIBEVENT_DIR=/usr
--    fi
-     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
-     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
-     MOZ_CHECK_HEADER(event.h,
-@@ -3876,16 +3877,16 @@ else
-         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
-     AC_CHECK_LIB(event, event_init,
-                  [MOZ_NATIVE_LIBEVENT=1
--                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+                  MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
-                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
--                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
-+                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
- fi
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
- 
- AC_SUBST(MOZ_NATIVE_LIBEVENT)
--AC_SUBST(MOZ_LIBEVENT_INCLUDES)
-+AC_SUBST(MOZ_LIBEVENT_CFLAGS)
- AC_SUBST(MOZ_LIBEVENT_LIBS)
- 
- dnl ========================================================
diff --git a/mail/thunderbird-esr/files/patch-bug788108 b/mail/thunderbird-esr/files/patch-bug788108
deleted file mode 100644
index db2399499397..000000000000
--- a/mail/thunderbird-esr/files/patch-bug788108
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla/content/base/public/nsContentUtils.h~
-+++ mozilla/content/base/public/nsContentUtils.h
-@@ -18,17 +18,6 @@
- #include <ieeefp.h>
- #endif
- 
--//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
--#include <ieeefp.h>
--#ifdef __alpha__
--static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
--#endif
--static fp_except_t oldmask = fpsetmask(~allmask);
--#endif
--
- #include "nsAString.h"
- #include "nsIStatefulFrame.h"
- #include "nsNodeInfoManager.h"
diff --git a/mail/thunderbird-esr/files/patch-bug789436 b/mail/thunderbird-esr/files/patch-bug789436
deleted file mode 100644
index 2479d8e69c78..000000000000
--- a/mail/thunderbird-esr/files/patch-bug789436
+++ /dev/null
@@ -1,27 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue)
- 
- #endif
- 
--#if defined(FREEBSD)
--// pick up fpsetmask prototype.
--#include <ieeefp.h>
--#endif
--
- static inline void
- DumpVersion()
- {
-@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname)
- 
-   // Unbuffer stdout, needed for tinderbox tests.
-   setbuf(stdout, 0);
--
--#if defined(FREEBSD)
--  // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp
--  // trap behavior that trips up on floating-point tests performed by
--  // the JS engine.  See bugzilla bug 9967 details.
--  fpsetmask(0);
--#endif
- }
- 
diff --git a/mail/thunderbird-esr/files/patch-bug789693 b/mail/thunderbird-esr/files/patch-bug789693
deleted file mode 100644
index 82b76c8d0a7c..000000000000
--- a/mail/thunderbird-esr/files/patch-bug789693
+++ /dev/null
@@ -1,108 +0,0 @@
---- mozilla/toolkit/components/startup/nsAppStartup.cpp
-+++ mozilla/toolkit/components/startup/nsAppStartup.cpp
-@@ -50,17 +50,40 @@
- #include <sys/syscall.h>
- #endif
- 
--#ifdef XP_MACOSX
-+#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
-+  || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
- 
--#ifdef __OpenBSD__
--#include <sys/param.h>
--#include <sys/sysctl.h>
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <sys/user.h>
- #endif
- 
- #include "mozilla/Telemetry.h"
- 
-+#if defined(__NetBSD__)
-+#undef KERN_PROC
-+#define KERN_PROC KERN_PROC2
-+#define KINFO_PROC struct kinfo_proc2
-+#else
-+#define KINFO_PROC struct kinfo_proc
-+#endif
-+
-+#if defined(XP_MACOSX)
-+#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec
-+#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec
-+#elif defined(__DragonFly__)
-+#define KP_START_SEC kp_start.tv_sec
-+#define KP_START_USEC kp_start.tv_usec
-+#elif defined(__FreeBSD__)
-+#define KP_START_SEC ki_start.tv_sec
-+#define KP_START_USEC ki_start.tv_usec
-+#else
-+#define KP_START_SEC p_ustart_sec
-+#define KP_START_USEC p_ustart_usec
-+#endif
-+
- static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
- 
- using namespace mozilla;
-@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp()
- #endif
-   return timestamp;
- }
--#elif defined(XP_MACOSX)
-+#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
-+  || defined(__NetBSD__) || defined(__OpenBSD__)
- static PRTime
- CalculateProcessCreationTimestamp()
- {
--  int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
--  size_t buffer_size;
--  if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0))
--    return 0;
-+  int mib[] = {
-+    CTL_KERN,
-+    KERN_PROC,
-+    KERN_PROC_PID,
-+    getpid(),
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+    sizeof(KINFO_PROC),
-+    1,
-+#endif
-+  };
-+  u_int miblen = sizeof(mib) / sizeof(mib[0]);
- 
--  struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size);  
--  if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) {
--    free(proc);
--    return 0;
--  }
--  PRTime starttime = static_cast<PRTime>(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC;
--  starttime += proc->kp_proc.p_un.__p_starttime.tv_usec;
--  free(proc);
--  return starttime;
--}
--#elif defined(__OpenBSD__)
--static PRTime
--CalculateProcessCreationTimestamp()
--{
--  int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 };
--  size_t buffer_size;
--  if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0))
-+  KINFO_PROC proc;
-+  size_t buffer_size = sizeof(proc);
-+  if (sysctl(mib, miblen, &proc, &buffer_size, NULL, 0))
-     return 0;
- 
--  struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size);
--  if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) {
--    free(proc);
--    return 0;
--  }
--  PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC;
--  starttime += proc->p_ustart_usec;
--  free(proc);
-+  PRTime starttime = static_cast<PRTime>(proc.KP_START_SEC) * PR_USEC_PER_SEC;
-+  starttime += proc.KP_START_USEC;
-   return starttime;
- }
- #else
diff --git a/mail/thunderbird-esr/files/patch-bug791305 b/mail/thunderbird-esr/files/patch-bug791305
deleted file mode 100644
index e4c44a405f57..000000000000
--- a/mail/thunderbird-esr/files/patch-bug791305
+++ /dev/null
@@ -1,107 +0,0 @@
-commit c269a16
-Author: Jeff Muizelaar <jmuizelaar@mozilla.com>
-Date:   Fri Sep 14 15:54:55 2012 -0400
-
-    Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey
-    
-    libjpeg-turbo supports converting directly to a format compatible with cairo's
-    FORMAT_RGB24. Use that instead of our own handcoded function. This also gives
-    us SSE2 and NEON version of this function.
-    
-    --HG--
-    extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9
----
- configure.in                     |   6 +-
- image/decoders/nsJPEGDecoder.cpp | 311 ++-------------------------------------
- 2 files changed, 20 insertions(+), 297 deletions(-)
-
-diff --git mozilla/image/decoders/nsJPEGDecoder.cpp mozilla/image/decoders/nsJPEGDecoder.cpp
-index c1fb515..1d2a259 100644
---- mozilla/image/decoders/nsJPEGDecoder.cpp
-+++ mozilla/image/decoders/nsJPEGDecoder.cpp
-@@ -22,6 +22,13 @@
- extern "C" {
- #include "iccjpeg.h"
- 
-+#ifdef JCS_EXTENSIONS
-+#if defined(IS_BIG_ENDIAN)
-+#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB
-+#else
-+#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX
-+#endif
-+#else
- /* Colorspace conversion (copied from jpegint.h) */
- struct jpeg_color_deconverter {
-   JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-@@ -34,6 +41,7 @@ METHODDEF(void)
- ycc_rgb_convert_argb (j_decompress_ptr cinfo,
-                  JSAMPIMAGE input_buf, JDIMENSION input_row,
-                  JSAMPARRAY output_buf, int num_rows);
-+#endif
- }
- 
- static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
-@@ -329,7 +340,18 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
-       case JCS_GRAYSCALE:
-       case JCS_RGB:
-       case JCS_YCbCr:
-+#ifdef JCS_EXTENSIONS
-+        // if we're not color managing we can decode directly to
-+        // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
-+        if (mCMSMode != eCMSMode_All) {
-+            mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-+            mInfo.out_color_components = 4;
-+        } else {
-+            mInfo.out_color_space = JCS_RGB;
-+        }
-+#else
-         mInfo.out_color_space = JCS_RGB;
-+#endif
-         break;
-       case JCS_CMYK:
-       case JCS_YCCK:
-@@ -397,6 +419,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
-       return; /* I/O suspension */
-     }
- 
-+#ifndef JCS_EXTENSIONS
-     /* Force to use our YCbCr to Packed RGB converter when possible */
-     if (!mTransform && (mCMSMode != eCMSMode_All) &&
-         mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) {
-@@ -404,6 +427,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
-       mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/
-       mInfo.cconvert->color_convert = ycc_rgb_convert_argb;
-     }
-+#endif
- 
-     /* If this is a progressive JPEG ... */
-     mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -542,7 +566,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend)
-       PRUint32 *imageRow = ((PRUint32*)mImageData) +
-                            (mInfo.output_scanline * mInfo.output_width);
- 
-+#ifdef JCS_EXTENSIONS
-+      if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
-+#else
-       if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
-+#endif
-         /* Special case: scanline will be directly converted into packed ARGB */
-         if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
-           *suspend = true; /* suspend */
-@@ -858,6 +887,7 @@ term_source (j_decompress_ptr jd)
- } // namespace mozilla
- 
- 
-+#ifndef JCS_EXTENSIONS
- /**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/
- 
- /*
-@@ -1130,7 +1160,8 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo,
-     }
-   }
- }
-+#endif
- 
- 
- /**************** Inverted CMYK -> RGB conversion **************/
- /*
diff --git a/mail/thunderbird-esr/files/patch-bug791366 b/mail/thunderbird-esr/files/patch-bug791366
deleted file mode 100644
index f7eb443b9a26..000000000000
--- a/mail/thunderbird-esr/files/patch-bug791366
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git mozilla/xpcom/base/nsMemoryReporterManager.cpp mozilla/xpcom/base/nsMemoryReporterManager.cpp
-index a9aff58..674e757 100644
---- mozilla/xpcom/base/nsMemoryReporterManager.cpp
-+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
-@@ -64,7 +64,7 @@ extern void jemalloc_stats(jemalloc_stat
- #  endif  // XP_LINUX
- #endif  // MOZ_MEMORY
- 
--#if defined(XP_LINUX) || defined(XP_MACOSX)
-+#ifdef XP_UNIX
- 
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -122,6 +122,78 @@ static PRInt64 GetResident()
-     return GetProcSelfStatmField(1);
- }
- 
-+#elif defined(__DragonFly__) || defined(__FreeBSD__) \
-+    || defined(__NetBSD__) || defined(__OpenBSD__)
-+
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <sys/user.h>
-+#endif
-+
-+#include <unistd.h>
-+
-+#if defined(__NetBSD__)
-+#undef KERN_PROC
-+#define KERN_PROC KERN_PROC2
-+#define KINFO_PROC struct kinfo_proc2
-+#else
-+#define KINFO_PROC struct kinfo_proc
-+#endif
-+
-+#if defined(__DragonFly__)
-+#define KP_SIZE(kp) (kp.kp_vm_map_size)
-+#define KP_RSS(kp) (kp.kp_vm_rssize * getpagesize())
-+#elif defined(__FreeBSD__)
-+#define KP_SIZE(kp) (kp.ki_size)
-+#define KP_RSS(kp) (kp.ki_rssize * getpagesize())
-+#elif defined(__NetBSD__)
-+#define KP_SIZE(kp) (kp.p_vm_msize * getpagesize())
-+#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize())
-+#elif defined(__OpenBSD__)
-+#define KP_SIZE(kp) ((kp.p_vm_dsize + kp.p_vm_ssize                     \
-+                      + kp.p_vm_tsize) * getpagesize())
-+#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize())
-+#endif
-+
-+static nsresult GetKinfoProcSelf(KINFO_PROC *proc)
-+{
-+    int mib[] = {
-+        CTL_KERN,
-+        KERN_PROC,
-+        KERN_PROC_PID,
-+        getpid(),
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+        sizeof(KINFO_PROC),
-+        1,
-+#endif
-+    };
-+    u_int miblen = sizeof(mib) / sizeof(mib[0]);
-+    size_t size = sizeof(KINFO_PROC);
-+    if (sysctl(mib, miblen, proc, &size, NULL, 0))
-+        return NS_ERROR_FAILURE;
-+
-+    return NS_OK;
-+}
-+
-+static PRInt64 GetVsize()
-+{
-+    KINFO_PROC proc;
-+    if (NS_SUCCEEDED(GetKinfoProcSelf(&proc)))
-+        return KP_SIZE(proc);
-+
-+    return -1;
-+}
-+
-+static PRInt64 GetResident()
-+{
-+    KINFO_PROC proc;
-+    if (NS_SUCCEEDED(GetKinfoProcSelf(&proc)))
-+        return KP_RSS(proc);
-+
-+    return -1;
-+}
-+
- #elif defined(XP_MACOSX)
- 
- #include <mach/mach_init.h>
-@@ -224,7 +297,7 @@ static PRInt64 GetResident()
- 
- #endif
- 
--#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN)
-+#if defined(XP_UNIX) || defined(XP_WIN)
- NS_MEMORY_REPORTER_IMPLEMENT(Vsize,
-     "vsize",
-     KIND_OTHER,
-@@ -239,7 +312,7 @@ NS_MEMORY_REPORTER_IMPLEMENT(Vsize,
-     "measure of the memory resources used by the process.")
- #endif
- 
--#if defined(XP_LINUX) || defined(XP_MACOSX)
-+#if defined(XP_UNIX)
- NS_MEMORY_REPORTER_IMPLEMENT(PageFaultsSoft,
-     "page-faults-soft",
-     KIND_OTHER,
-@@ -457,11 +530,11 @@ nsMemoryReporterManager::Init()
-     REGISTER(HeapUnallocated);
-     REGISTER(Resident);
- 
--#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN)
-+#if defined(XP_UNIX) || defined(XP_WIN)
-     REGISTER(Vsize);
- #endif
- 
--#if defined(XP_LINUX) || defined(XP_MACOSX)
-+#if defined(XP_UNIX)
-     REGISTER(PageFaultsSoft);
-     REGISTER(PageFaultsHard);
- #endif
diff --git a/mail/thunderbird-esr/files/patch-bug799441 b/mail/thunderbird-esr/files/patch-bug799441
deleted file mode 100644
index 6e27d090483c..000000000000
--- a/mail/thunderbird-esr/files/patch-bug799441
+++ /dev/null
@@ -1,116 +0,0 @@
-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
---- mozilla/configure.in
-+++ mozilla/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
---- mozilla/extensions/gio/Makefile.in
-+++ mozilla/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) \
--		   $(NSPR_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
---- mozilla/toolkit/library/libxul-config.mk
-+++ mozilla/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
---- mozilla/toolkit/library/nsStaticXULComponents.cpp
-+++ mozilla/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
---- mozilla/toolkit/toolkit-tiers.mk
-+++ mozilla/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.
diff --git a/mail/thunderbird-esr/files/patch-clang32-visibility-hack b/mail/thunderbird-esr/files/patch-clang32-visibility-hack
deleted file mode 100644
index 010130bc7a44..000000000000
--- a/mail/thunderbird-esr/files/patch-clang32-visibility-hack
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.in~
-+++ configure.in
-@@ -3230,6 +3230,7 @@ EOF
-                        ac_cv_have_visibility_class_bug,
-                        [cat > conftest.c <<EOF
- #pragma GCC visibility push(hidden)
-+struct TestStruct;
- struct __attribute__ ((visibility ("default"))) TestStruct {
-   static void Init();
- };
---- mozilla/configure.in~
-+++ mozilla/configure.in
-@@ -3230,6 +3230,7 @@ EOF
-                        ac_cv_have_visibility_class_bug,
-                        [cat > conftest.c <<EOF
- #pragma GCC visibility push(hidden)
-+struct TestStruct;
- struct __attribute__ ((visibility ("default"))) TestStruct {
-   static void Init();
- };
---- mozilla/js/src/configure.in~
-+++ mozilla/js/src/configure.in
-@@ -3230,6 +3230,7 @@ EOF
-                        ac_cv_have_visibility_class_bug,
-                        [cat > conftest.c <<EOF
- #pragma GCC visibility push(hidden)
-+struct TestStruct;
- struct __attribute__ ((visibility ("default"))) TestStruct {
-   static void Init();
- };
diff --git a/mail/thunderbird-esr/files/patch-config-autoconf.mk.in b/mail/thunderbird-esr/files/patch-config-autoconf.mk.in
deleted file mode 100644
index 877c48294fc6..000000000000
--- a/mail/thunderbird-esr/files/patch-config-autoconf.mk.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig	2009-04-24 03:46:37.000000000 +0200
-+++ config/autoconf.mk.in	2009-05-11 15:03:26.000000000 +0200
-@@ -57,14 +57,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/%%MOZILLA%%
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/%%MOZILLA%%
-+sdkdir		= $(libdir)/%%MOZILLA%%
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
diff --git a/mail/thunderbird-esr/files/patch-dom-ipc-ContentChild.cpp b/mail/thunderbird-esr/files/patch-dom-ipc-ContentChild.cpp
deleted file mode 100644
index 3fc0e4cf5047..000000000000
--- a/mail/thunderbird-esr/files/patch-dom-ipc-ContentChild.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/dom/ipc/ContentChild.cpp~
-+++ mozilla/dom/ipc/ContentChild.cpp
-@@ -42,6 +42,7 @@
- #endif
- 
- #ifdef MOZ_WIDGET_QT
-+#include <unistd.h>
- #include "nsQAppInstance.h"
- #endif
- 
diff --git a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index 63f7b76052c3..000000000000
--- a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
-+++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
-@@ -254,6 +254,10 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- ifeq ($(OS_ARCH), NetBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
diff --git a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
deleted file mode 100644
index df2e10326632..000000000000
--- a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-09 08:53:46.000000000 +0100
-@@ -147,6 +147,11 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
diff --git a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
deleted file mode 100644
index 4ec8205074ee..000000000000
--- a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~
-+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in
-@@ -188,6 +188,9 @@ endif
- 
- OBJDEST = $(OBJDIR_NAME)
- 
-+# accept -pthread with MOZ_NATIVE_NSS
-+LINK_DLL	= $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS)
-+
- ###########################################################################
- 
- ifeq ($(USE_DLL_EXPORTS_FILE), 1)
diff --git a/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp b/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp
deleted file mode 100644
index 0d17050c939c..000000000000
--- a/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mail/app/nsMailApp.cpp~
-+++ mail/app/nsMailApp.cpp
-@@ -154,6 +154,7 @@ int main(int argc, char* argv[])
-   TriggerQuirks();
- #endif
- 
-+  setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/thunderbird", 0);
-   nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
-   if (NS_FAILED(rv)) {
-     Output("Couldn't calculate the application directory.\n");
diff --git a/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp b/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
deleted file mode 100644
index 9bae143f2e26..000000000000
--- a/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- mailnews/addrbook/src/nsDirPrefs.cpp~
-+++ mailnews/addrbook/src/nsDirPrefs.cpp
-@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
-    DIR_Server *s=nsnull;
-    
-    switch (position) {
--   case DIR_POS_APPEND:
-+   case (PRInt32)DIR_POS_APPEND:
-    /* Do nothing if the request is to append a server that is already
-      * in the list.
-      */
-@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
-      wholeList->AppendElement(server);
-      break;
-      
--   case DIR_POS_DELETE:
-+   case (PRInt32)DIR_POS_DELETE:
-        /* Remove the prefs corresponding to the given server.  If the prefName
-        * value is nsnull, the server has never been saved and there are no
-        * prefs to remove.
diff --git a/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp b/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
deleted file mode 100644
index b3a6df4d2c90..000000000000
--- a/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- mailnews/compose/src/nsSmtpProtocol.cpp~
-+++ mailnews/compose/src/nsSmtpProtocol.cpp
-@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
- 
-   switch (code)
-   {
--      case NS_ERROR_SMTP_SERVER_ERROR:
--      case NS_ERROR_TCP_READ_ERROR:
--      case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
--      case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
--      case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
--      case NS_ERROR_SENDING_FROM_COMMAND:
--      case NS_ERROR_SENDING_RCPT_COMMAND:
--      case NS_ERROR_SENDING_DATA_COMMAND:
--      case NS_ERROR_SENDING_MESSAGE:
--      case NS_ERROR_SMTP_GREETING:
-+      case (int)NS_ERROR_SMTP_SERVER_ERROR:
-+      case (int)NS_ERROR_TCP_READ_ERROR:
-+      case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-+      case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-+      case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-+      case (int)NS_ERROR_SENDING_FROM_COMMAND:
-+      case (int)NS_ERROR_SENDING_RCPT_COMMAND:
-+      case (int)NS_ERROR_SENDING_DATA_COMMAND:
-+      case (int)NS_ERROR_SENDING_MESSAGE:
-+      case (int)NS_ERROR_SMTP_GREETING:
-          bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
-          msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
-          break;
diff --git a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
deleted file mode 100644
index 7d3316500fa7..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- mozilla/config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
-+++ mozilla/config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/%%MOZILLA%%
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/%%MOZILLA%%
-+sdkdir		= $(libdir)/%%MOZILLA%%
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-
diff --git a/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp
deleted file mode 100644
index 165e7f647be3..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~
-+++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp
-@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList()
-     }
-   }
- 
-+  // load system hunspell dictionaries
-+  nsIFile* hunDir;
-+  NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"),
-+			true, (nsILocalFile**)&hunDir);
-+  LoadDictionariesFromDir(hunDir);
-+
-   // find dictionaries from extensions requiring restart
-   nsCOMPtr<nsISimpleEnumerator> dictDirs;
-   rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
diff --git a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
deleted file mode 100644
index 7a23c9dd3820..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/gfx/qcms/qcmstypes.h.orig	2010-11-22 12:01:36.000000000 +0100
-+++ mozilla/gfx/qcms/qcmstypes.h	2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #ifdef __OS2__
- /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
- #include <stdlib.h>
--#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) 
- typedef PRUptrdiff uintptr_t;
- #endif
- #endif
diff --git a/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
deleted file mode 100644
index 294e8270334a..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- mozilla/ipc/chromium/Makefile.in~
-+++ mozilla/ipc/chromium/Makefile.in
-@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk
- 
- OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
- 
-+# workaround IPC hang with libevent2
-+ifndef MOZ_DEBUG
-+ifneq (,$(filter 4.2.%, $(CXX_VERSION)))
-+MOZ_OPTIMIZE_FLAGS = -O1
-+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS)
-+endif
-+endif
-+
- LIBRARY_NAME = chromium_s
- FORCE_STATIC_LIB = 1
- LIBXUL_LIBRARY = 1
-@@ -55,9 +60,7 @@ vpath %.c \
-   $(srcdir)/src/third_party/libevent \
-   $(NULL)
- else # } else {
--# message_pump_libevent.cc includes third_party/libevent/event.h,
--# which we put in $(DIST), see export rule below
--LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
- endif # }
- 
- vpath %.cc \
diff --git a/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc b/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
deleted file mode 100644
index 3fe4995aa0f8..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
-+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -15,7 +15,7 @@
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
--#include "third_party/libevent/event.h"
-+#include "event.h"
- 
- // Lifecycle of struct event
- // Libevent uses two main data structures:
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
deleted file mode 100644
index 3b174c18585c..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/js/src/configure.in.orig	2012-01-29 15:44:24.000000000 +0100
-+++ mozilla/js/src/configure.in	2012-01-30 23:37:46.541060008 +0100
-@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
-  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
-  * is defined before <stdint.h> is included. */
- #define __STDC_LIMIT_MACROS
-+#define __STDC_CONSTANT_MACROS
- 
- #endif /* _JS_CONFDEFS_H_ */
- 
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp
deleted file mode 100644
index 009b469dcd7f..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla/js/src/methodjit/MethodJIT.cpp~
-+++ mozilla/js/src/methodjit/MethodJIT.cpp
-@@ -171,7 +171,7 @@
- 
- JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
- 
--#if defined(__linux__) && defined(JS_CPU_X64)
-+#if defined(__ELF__) && defined(JS_CPU_X64)
- # define SYMBOL_STRING_RELOC(name) #name "@plt"
- #else
- # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name)
-@@ -149,7 +149,7 @@
- 
- #if defined(XP_MACOSX)
- # define HIDE_SYMBOL(name) ".private_extern _" #name
--#elif defined(__linux__)
-+#elif defined(__ELF__)
- # define HIDE_SYMBOL(name) ".hidden" #name
- #else
- # define HIDE_SYMBOL(name)
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c b/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c
deleted file mode 100644
index ddb42a92a1e3..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c~
-+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c
-@@ -446,6 +446,10 @@ static void audio_callback(void* data)
-           printf("!");  /* not enough audio data */
- #endif
-           bytes = bytes-bytes_to_copy;
-+          struct timespec ts = {0, 1000000};
-+          pthread_mutex_unlock(&s->mutex);
-+          nanosleep(&ts, NULL);
-+          pthread_mutex_lock(&s->mutex);
-           break;
-         }
-         free(s->bl_head);
diff --git a/mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
deleted file mode 100644
index 272a02bdb9e0..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
-+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
-@@ -110,6 +110,7 @@
- #include "nss.h"
- #include "pk11func.h"
- #include "ssl.h"
-+#define NSS_ENABLE_ECC 1
- #include "sslproto.h"
- #include "secmod.h"
- #include "sechash.h"
diff --git a/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in
deleted file mode 100644
index 224a65d1efe0..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- mozilla/toolkit/xre/Makefile.in.orig	2007-09-10 10:31:53.000000000 -0400
-+++ mozilla/toolkit/xre/Makefile.in	2007-09-10 10:35:00.000000000 -0400
-@@ -263,5 +263,3 @@
- libs:: platform.ini
- 	$(INSTALL) $^ $(DIST)/bin
- 
--install::
--	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
diff --git a/mail/thunderbird-esr/files/patch-mozilla_toolkit_mozapps_installer_packager_mk b/mail/thunderbird-esr/files/patch-mozilla_toolkit_mozapps_installer_packager_mk
deleted file mode 100644
index 9a2a4ea99070..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla_toolkit_mozapps_installer_packager_mk
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $
-install headers/idl/sdk libs only if xulrunner
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	Fri Jun  1 14:04:20 2012
-+++ mozilla/toolkit/mozapps/installer/packager.mk	Tue Jun  5 07:55:51 2012
-@@ -886,7 +886,7 @@ endif
- 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
- 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
- 	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--ifdef INSTALL_SDK # Here comes the hard part
-+ifeq ($(MOZ_APP_NAME),xulrunner)
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
- 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
diff --git a/mail/thunderbird-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp b/mail/thunderbird-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp
deleted file mode 100644
index 341a9f7562e7..000000000000
--- a/mail/thunderbird-esr/files/patch-toolkit-xre-nsEmbedFunctions.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/toolkit/xre/nsEmbedFunctions.cpp~
-+++ mozilla/toolkit/xre/nsEmbedFunctions.cpp
-@@ -36,6 +36,7 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #if defined(MOZ_WIDGET_QT)
-+#include <unistd.h>
- #include "nsQAppInstance.h"
- #endif
- 
diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in
deleted file mode 100644
index 790a064ec01d..000000000000
--- a/mail/thunderbird-esr/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=@MOZILLA@ %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird-esr/pkg-descr b/mail/thunderbird-esr/pkg-descr
deleted file mode 100644
index 9ef9a8246af4..000000000000
--- a/mail/thunderbird-esr/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language.  See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.com/thunderbird/
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index 07df4e6cea96..d4005bd1e42f 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	17.0.4
+PORTVERSION=	17.0.5
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -45,7 +45,7 @@ do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR} ${WRKSRC}
 	@for lang in ${THUNDERBIRD_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
 		then \
 			exit 1; \
 		fi; \
diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo
index b5250c2a323a..7185ca0cce13 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,84 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-17.0.4/ar.xpi) = e039fefa92fc6345a74c113e110901e83f5de4331f1073de836a86b947a7f190
-SIZE (xpi/thunderbird-i18n-17.0.4/ar.xpi) = 445977
-SHA256 (xpi/thunderbird-i18n-17.0.4/br.xpi) = 02511cc2ebf07ce5e4a820456d4a2f224586a81e43b30304efc1f6ec8bad5d6e
-SIZE (xpi/thunderbird-i18n-17.0.4/br.xpi) = 417071
-SHA256 (xpi/thunderbird-i18n-17.0.4/ca.xpi) = 832559f44041f4ee2827868634bc79ca9cb2476fafc87fef666faf4990bacf12
-SIZE (xpi/thunderbird-i18n-17.0.4/ca.xpi) = 418407
-SHA256 (xpi/thunderbird-i18n-17.0.4/cs.xpi) = 2492f52859a1a1ec7716a2e64269790dd7251444345607fc7e427722dd18325c
-SIZE (xpi/thunderbird-i18n-17.0.4/cs.xpi) = 420627
-SHA256 (xpi/thunderbird-i18n-17.0.4/da.xpi) = 7b71744f4b9d72ac2686a6caff0f839d55580ef2164a38b879a9d63b08ec0a22
-SIZE (xpi/thunderbird-i18n-17.0.4/da.xpi) = 398980
-SHA256 (xpi/thunderbird-i18n-17.0.4/de.xpi) = 28047c853e9088d63b8e833767f0a1b5602f82702d434c218a76a721d4b24720
-SIZE (xpi/thunderbird-i18n-17.0.4/de.xpi) = 393632
-SHA256 (xpi/thunderbird-i18n-17.0.4/en-GB.xpi) = e3cc830d6abccd7da1edeb130036422903166942d6399e5773c492dc33b428b1
-SIZE (xpi/thunderbird-i18n-17.0.4/en-GB.xpi) = 390694
-SHA256 (xpi/thunderbird-i18n-17.0.4/en-US.xpi) = 32565328e79e74aaf7ab00a5f18258595f2e86610b7b11a08cec96e25ad60ba0
-SIZE (xpi/thunderbird-i18n-17.0.4/en-US.xpi) = 390780
-SHA256 (xpi/thunderbird-i18n-17.0.4/es-AR.xpi) = 9396500ed0a5d2cd4444718acb61ff2f8a624f07c6c0add8f8c36821b2576eba
-SIZE (xpi/thunderbird-i18n-17.0.4/es-AR.xpi) = 415499
-SHA256 (xpi/thunderbird-i18n-17.0.4/es-ES.xpi) = 5d881355da3d2e8e42953edc657922a77e4540529d7365a07d629118c2f93475
-SIZE (xpi/thunderbird-i18n-17.0.4/es-ES.xpi) = 356861
-SHA256 (xpi/thunderbird-i18n-17.0.4/et.xpi) = fc481bf9a252f606fc876e4d34c2445c64a90bf3b5e0fc87449e773d5ca2c8b3
-SIZE (xpi/thunderbird-i18n-17.0.4/et.xpi) = 411892
-SHA256 (xpi/thunderbird-i18n-17.0.4/eu.xpi) = f3ce6271ca7dbc824abe20d9247fcd310f9f46bdc0632b0384263ad9ff5a6bc8
-SIZE (xpi/thunderbird-i18n-17.0.4/eu.xpi) = 407190
-SHA256 (xpi/thunderbird-i18n-17.0.4/fi.xpi) = 9ed2bcc8db0fb36ddf2f4e1719e97a259621c0807759dcd6d75fd920d4d2d21b
-SIZE (xpi/thunderbird-i18n-17.0.4/fi.xpi) = 413620
-SHA256 (xpi/thunderbird-i18n-17.0.4/fr.xpi) = 00308a39144987a1bc0cba6a7ea9348e41acc2fe9faed234c6804eb5c22610b7
-SIZE (xpi/thunderbird-i18n-17.0.4/fr.xpi) = 420826
-SHA256 (xpi/thunderbird-i18n-17.0.4/fy-NL.xpi) = 189a4072c0c050b86d99a1a7aea653bb6085865b47d490704fa9fb51e4eb2a61
-SIZE (xpi/thunderbird-i18n-17.0.4/fy-NL.xpi) = 415712
-SHA256 (xpi/thunderbird-i18n-17.0.4/ga-IE.xpi) = 522cf62f206d2c2f7c67404523e9f77164fc2a7d508e1c4dec6361250de46c0f
-SIZE (xpi/thunderbird-i18n-17.0.4/ga-IE.xpi) = 425395
-SHA256 (xpi/thunderbird-i18n-17.0.4/gd.xpi) = 1d0b416a691b4a458c3d74ef69caba4348ac206b4d42db24e60929eefec402d5
-SIZE (xpi/thunderbird-i18n-17.0.4/gd.xpi) = 428939
-SHA256 (xpi/thunderbird-i18n-17.0.4/gl.xpi) = 0fc31d402fb8460eff43018b6b2f4add021804edd23ce279911ea8ad7e2f8cdf
-SIZE (xpi/thunderbird-i18n-17.0.4/gl.xpi) = 410370
-SHA256 (xpi/thunderbird-i18n-17.0.4/he.xpi) = 1487236524c2bcfbb3bb5fa6d2f2154d64d748eedd12ab96dd580e0cba946309
-SIZE (xpi/thunderbird-i18n-17.0.4/he.xpi) = 439504
-SHA256 (xpi/thunderbird-i18n-17.0.4/hu.xpi) = 51395b5e8120f9a1cb7040959975a4a3c0f4a3acc5ab57671b64a017fb284c2f
-SIZE (xpi/thunderbird-i18n-17.0.4/hu.xpi) = 433187
-SHA256 (xpi/thunderbird-i18n-17.0.4/is.xpi) = 9f668b8bb1a6d44fb7519e8c4d98533c2f80fd1c84fa5fe0e3224044d3112763
-SIZE (xpi/thunderbird-i18n-17.0.4/is.xpi) = 414069
-SHA256 (xpi/thunderbird-i18n-17.0.4/it.xpi) = 02d0b8f3d468f269362c04259fc8707e58267def0c4df1abce1a1d49831fafc2
-SIZE (xpi/thunderbird-i18n-17.0.4/it.xpi) = 348621
-SHA256 (xpi/thunderbird-i18n-17.0.4/ja.xpi) = 502e1e996be4cc6314b9646a83ec0a6b62ac762002088c0b48cb6456cbdd4fd3
-SIZE (xpi/thunderbird-i18n-17.0.4/ja.xpi) = 463488
-SHA256 (xpi/thunderbird-i18n-17.0.4/ko.xpi) = d10e12e7d744bbc91a73aa6e42c387cb05d157a95485f62baa7f9c3c2215a278
-SIZE (xpi/thunderbird-i18n-17.0.4/ko.xpi) = 412964
-SHA256 (xpi/thunderbird-i18n-17.0.4/lt.xpi) = 4d66657535056f4f19effc5bb1ede9230951ff511ed18ad4b51f1f1129ccde19
-SIZE (xpi/thunderbird-i18n-17.0.4/lt.xpi) = 519802
-SHA256 (xpi/thunderbird-i18n-17.0.4/nb-NO.xpi) = a44a8979e497fb8e23a70b0c41a5ad4585607ef45eaa79875ab3d3ebb29fc524
-SIZE (xpi/thunderbird-i18n-17.0.4/nb-NO.xpi) = 408519
-SHA256 (xpi/thunderbird-i18n-17.0.4/nl.xpi) = a9c6b701edb496289119d1c9905d80ca362757b2cb07410cb53ff22bf9df7c61
-SIZE (xpi/thunderbird-i18n-17.0.4/nl.xpi) = 408527
-SHA256 (xpi/thunderbird-i18n-17.0.4/nn-NO.xpi) = 0d8ea2d1e934a9d9b5ac27cc8aa98dd057fcdc1fe1cd0e9e6fa92f9754603ee7
-SIZE (xpi/thunderbird-i18n-17.0.4/nn-NO.xpi) = 431472
-SHA256 (xpi/thunderbird-i18n-17.0.4/pl.xpi) = bf9c3c895c81ae7f3f4c48f7d4566d9cd83dce528586fc2fcca077d1c064b9f4
-SIZE (xpi/thunderbird-i18n-17.0.4/pl.xpi) = 402114
-SHA256 (xpi/thunderbird-i18n-17.0.4/pt-BR.xpi) = 076427dc1f445d88bda77f9ff1426041e9d1894b7105e815474a7403aa095edc
-SIZE (xpi/thunderbird-i18n-17.0.4/pt-BR.xpi) = 415778
-SHA256 (xpi/thunderbird-i18n-17.0.4/pt-PT.xpi) = 0483e2a1e5e5c1d2f380b1a3b383b2821968581a4b283f89db5c78e6f2508eed
-SIZE (xpi/thunderbird-i18n-17.0.4/pt-PT.xpi) = 445754
-SHA256 (xpi/thunderbird-i18n-17.0.4/rm.xpi) = 073b733654f80e609832ce81f4a2b0e3acd8ca071dc1a4352fc804842dd3ca79
-SIZE (xpi/thunderbird-i18n-17.0.4/rm.xpi) = 415531
-SHA256 (xpi/thunderbird-i18n-17.0.4/ru.xpi) = 0a8af78c82f2a74a81244af42da67993c1a14a6b919d480a344f41d8668e5598
-SIZE (xpi/thunderbird-i18n-17.0.4/ru.xpi) = 415708
-SHA256 (xpi/thunderbird-i18n-17.0.4/si.xpi) = ff598f3db2e9344960674a47d9efa3876b7750a56679f5bc4177c192772a2d19
-SIZE (xpi/thunderbird-i18n-17.0.4/si.xpi) = 494162
-SHA256 (xpi/thunderbird-i18n-17.0.4/sk.xpi) = 364dc60eafec703fade801fc14b7bf94590db4206f27d82b71c7977444cd1e7e
-SIZE (xpi/thunderbird-i18n-17.0.4/sk.xpi) = 429756
-SHA256 (xpi/thunderbird-i18n-17.0.4/sl.xpi) = 821c936dce601dec1cc5180f1e7893a235bf0ddccddf3bad4b26bbe65e966b45
-SIZE (xpi/thunderbird-i18n-17.0.4/sl.xpi) = 442096
-SHA256 (xpi/thunderbird-i18n-17.0.4/sq.xpi) = 9fee45bf383fe6c6829d38728428baa5b4e1dbeeb4cdb27341b40ebc05a705e4
-SIZE (xpi/thunderbird-i18n-17.0.4/sq.xpi) = 418780
-SHA256 (xpi/thunderbird-i18n-17.0.4/sv-SE.xpi) = 070c04fe56c29031bbc20f849d2aedb31265003ecd0bbb5d0da57116260b2b31
-SIZE (xpi/thunderbird-i18n-17.0.4/sv-SE.xpi) = 413218
-SHA256 (xpi/thunderbird-i18n-17.0.4/ta-LK.xpi) = cdb347b78d49ec86176cc35da1d337a57ab1abf1bf8588cbe91c44a0404e90a6
-SIZE (xpi/thunderbird-i18n-17.0.4/ta-LK.xpi) = 517913
-SHA256 (xpi/thunderbird-i18n-17.0.4/tr.xpi) = 8693131fd1c14ebb0c7b6631410b8780da4fb8f565505f1c5d4701cdad361ef5
-SIZE (xpi/thunderbird-i18n-17.0.4/tr.xpi) = 444944
-SHA256 (xpi/thunderbird-i18n-17.0.4/uk.xpi) = aa8c240255d6a319e3b72ea8ea5c55ae6c3649ebbeb153986512f9dd9239cc1d
-SIZE (xpi/thunderbird-i18n-17.0.4/uk.xpi) = 471143
-SHA256 (xpi/thunderbird-i18n-17.0.4/zh-TW.xpi) = f7538eb7e9ab4c9766dbedfb68612f603a4441bc67832674da31b22519882f0b
-SIZE (xpi/thunderbird-i18n-17.0.4/zh-TW.xpi) = 437591
+SHA256 (xpi/thunderbird-i18n-17.0.5/ar.xpi) = a895c50567eb0060854019921ab1b7f9d68ca56d76f7f73d7d2fe4fa201fbb50
+SIZE (xpi/thunderbird-i18n-17.0.5/ar.xpi) = 445976
+SHA256 (xpi/thunderbird-i18n-17.0.5/br.xpi) = e43198ba660f8b2b5c9ef2dd428549c98c27cf3398eccb6e4d2e77e4bd79eaad
+SIZE (xpi/thunderbird-i18n-17.0.5/br.xpi) = 417071
+SHA256 (xpi/thunderbird-i18n-17.0.5/ca.xpi) = 644a001ee2100ab455b66cfcaba491af6ba75120f69d4cc8ac5b927339c529f0
+SIZE (xpi/thunderbird-i18n-17.0.5/ca.xpi) = 418407
+SHA256 (xpi/thunderbird-i18n-17.0.5/cs.xpi) = 357bee0902b90a1210aa9843c8e7857eae1b94370020c8487282d59a488bcc78
+SIZE (xpi/thunderbird-i18n-17.0.5/cs.xpi) = 420627
+SHA256 (xpi/thunderbird-i18n-17.0.5/da.xpi) = c8ec9031d017d4bbb90eafa98fae5c784d08c0dd4358b4f4574d6c317548caeb
+SIZE (xpi/thunderbird-i18n-17.0.5/da.xpi) = 398980
+SHA256 (xpi/thunderbird-i18n-17.0.5/de.xpi) = 20246a979c14a4544fac5ea35d319258d51d593eff2a602d04c80d62f7d61574
+SIZE (xpi/thunderbird-i18n-17.0.5/de.xpi) = 393632
+SHA256 (xpi/thunderbird-i18n-17.0.5/en-GB.xpi) = d622039e5f4c0871508fdb654ed96ff2cda85721535e08e16962aa9a700c83d8
+SIZE (xpi/thunderbird-i18n-17.0.5/en-GB.xpi) = 390694
+SHA256 (xpi/thunderbird-i18n-17.0.5/en-US.xpi) = 968e42159c16bcc1b7523f228010afb203f544db09317b9f78b2cf7596e77f0b
+SIZE (xpi/thunderbird-i18n-17.0.5/en-US.xpi) = 390780
+SHA256 (xpi/thunderbird-i18n-17.0.5/es-AR.xpi) = 9f56e7295c4de06c4cabcc0fc64db26423f9415ba419202b016dcd61cf397ed2
+SIZE (xpi/thunderbird-i18n-17.0.5/es-AR.xpi) = 415499
+SHA256 (xpi/thunderbird-i18n-17.0.5/es-ES.xpi) = 1e9f7b437ab08e91e5fb039dd617891229357acf3b4a2ef487c4449521c86656
+SIZE (xpi/thunderbird-i18n-17.0.5/es-ES.xpi) = 356861
+SHA256 (xpi/thunderbird-i18n-17.0.5/et.xpi) = 7c515dd0615c14ef1bf26dbbaeb8324d5597b547c03ff7b8201e1007661be845
+SIZE (xpi/thunderbird-i18n-17.0.5/et.xpi) = 411892
+SHA256 (xpi/thunderbird-i18n-17.0.5/eu.xpi) = 6b241859c6eb30dd4ec3ea3f436da426475e677257586e1a3126ac8a6668afc7
+SIZE (xpi/thunderbird-i18n-17.0.5/eu.xpi) = 407189
+SHA256 (xpi/thunderbird-i18n-17.0.5/fi.xpi) = f039a084cc38d9e1f33ccb6cb579b8abe4f7ae95a9fc04d84734859990191475
+SIZE (xpi/thunderbird-i18n-17.0.5/fi.xpi) = 413620
+SHA256 (xpi/thunderbird-i18n-17.0.5/fr.xpi) = 2ad4ae0da6e482cb667deaa9fd439806c72d1f14b8530aff3c8e3750b1d47ec0
+SIZE (xpi/thunderbird-i18n-17.0.5/fr.xpi) = 420826
+SHA256 (xpi/thunderbird-i18n-17.0.5/fy-NL.xpi) = ef09775e3974be8b6994770793dd9edd008e27b0841194d91f5ec020b5676c49
+SIZE (xpi/thunderbird-i18n-17.0.5/fy-NL.xpi) = 415712
+SHA256 (xpi/thunderbird-i18n-17.0.5/ga-IE.xpi) = 823d78e621fecca08589773ded8dd6099faecedf5ef4097da66ffe16c78e29ed
+SIZE (xpi/thunderbird-i18n-17.0.5/ga-IE.xpi) = 425395
+SHA256 (xpi/thunderbird-i18n-17.0.5/gd.xpi) = 587dbff956aca0f295322b847f927c74c8d032ed4ae0f566a11a5de0c6811f85
+SIZE (xpi/thunderbird-i18n-17.0.5/gd.xpi) = 428939
+SHA256 (xpi/thunderbird-i18n-17.0.5/gl.xpi) = 125a14bccb420d71792e8fc52655032baffde887d2c322527f3e11e5c2d47069
+SIZE (xpi/thunderbird-i18n-17.0.5/gl.xpi) = 410370
+SHA256 (xpi/thunderbird-i18n-17.0.5/he.xpi) = f15933476b38aaeead09a9517c2bc89f236b5dbf595f65e8be05e0f85ac96fb1
+SIZE (xpi/thunderbird-i18n-17.0.5/he.xpi) = 439504
+SHA256 (xpi/thunderbird-i18n-17.0.5/hu.xpi) = 77292c922fd097fbbce065b7ce95e95890159bdf496e0fdc36f7cfeeecd12da3
+SIZE (xpi/thunderbird-i18n-17.0.5/hu.xpi) = 433186
+SHA256 (xpi/thunderbird-i18n-17.0.5/is.xpi) = a1a1664d4ef35af52aa701231d6cee733e70411d24f3c6bb27a2d003022f5dcf
+SIZE (xpi/thunderbird-i18n-17.0.5/is.xpi) = 414068
+SHA256 (xpi/thunderbird-i18n-17.0.5/it.xpi) = e94ff8019ba450384155b9191a10a6df15860360a01d79b0b72d19ab9f60c004
+SIZE (xpi/thunderbird-i18n-17.0.5/it.xpi) = 348621
+SHA256 (xpi/thunderbird-i18n-17.0.5/ja.xpi) = e0c40d7192c30a8ec3b2a04eab251aac8e16b99ecd53e5de880dbbfa3cf549a1
+SIZE (xpi/thunderbird-i18n-17.0.5/ja.xpi) = 463488
+SHA256 (xpi/thunderbird-i18n-17.0.5/ko.xpi) = b5e4beca15983d134bd92d09a8f2846bd0e1a7469d896d6f83f6c1eccab244a8
+SIZE (xpi/thunderbird-i18n-17.0.5/ko.xpi) = 412964
+SHA256 (xpi/thunderbird-i18n-17.0.5/lt.xpi) = 8412dd792bda43c960f4f86070b5645e6b30b7ace9cf478f27b83a2ae2001107
+SIZE (xpi/thunderbird-i18n-17.0.5/lt.xpi) = 519802
+SHA256 (xpi/thunderbird-i18n-17.0.5/nb-NO.xpi) = 0ff536aad4b03355d221a084110ac37162096c5e7e0eaec267bcf15766bcb582
+SIZE (xpi/thunderbird-i18n-17.0.5/nb-NO.xpi) = 408519
+SHA256 (xpi/thunderbird-i18n-17.0.5/nl.xpi) = 65c3926f247080a11dd7e6dd24e4ecaef251ee0ff1188db3b338e193ab849e7a
+SIZE (xpi/thunderbird-i18n-17.0.5/nl.xpi) = 408527
+SHA256 (xpi/thunderbird-i18n-17.0.5/nn-NO.xpi) = 3efbf9f409b38cf742c974a6c418e2d44bd80c040a0d2cd0c88548dc3265e428
+SIZE (xpi/thunderbird-i18n-17.0.5/nn-NO.xpi) = 431472
+SHA256 (xpi/thunderbird-i18n-17.0.5/pl.xpi) = 26079889be42bbfe0a561f3c72a2bef89470a4312544c600dde7fb9106725280
+SIZE (xpi/thunderbird-i18n-17.0.5/pl.xpi) = 402114
+SHA256 (xpi/thunderbird-i18n-17.0.5/pt-BR.xpi) = aea1e660b1da7b6af02b44b211e5945acdc4186573dd0fb0e6c486d5155eb41f
+SIZE (xpi/thunderbird-i18n-17.0.5/pt-BR.xpi) = 415778
+SHA256 (xpi/thunderbird-i18n-17.0.5/pt-PT.xpi) = 85747c873660d5a4f3e94e2eedcfdbe63a73292ffb77b9d3a182bd5b682c116e
+SIZE (xpi/thunderbird-i18n-17.0.5/pt-PT.xpi) = 445754
+SHA256 (xpi/thunderbird-i18n-17.0.5/rm.xpi) = f76e4465a280f8b71f9937dc902d1c4dcf1adf835b1daed1916f619b87831f39
+SIZE (xpi/thunderbird-i18n-17.0.5/rm.xpi) = 415531
+SHA256 (xpi/thunderbird-i18n-17.0.5/ru.xpi) = 85b306fcc0032ab81b86ef03549ccf019a32a9d811c38e796d796523f30e36f8
+SIZE (xpi/thunderbird-i18n-17.0.5/ru.xpi) = 415708
+SHA256 (xpi/thunderbird-i18n-17.0.5/si.xpi) = 6c9222d802c3aad59c68b8d165dc0ed433cdc07ca12196f1e0c58ee7aec3fc7d
+SIZE (xpi/thunderbird-i18n-17.0.5/si.xpi) = 494162
+SHA256 (xpi/thunderbird-i18n-17.0.5/sk.xpi) = df616a212daf49a45a0aff11bc9264e99ee2854691cc569cd6f4aa7b57a4ca98
+SIZE (xpi/thunderbird-i18n-17.0.5/sk.xpi) = 429756
+SHA256 (xpi/thunderbird-i18n-17.0.5/sl.xpi) = bcc2badb1cc8e7d94621e558fa2ad7f1608011d243f7c23f952a8b6a19afd907
+SIZE (xpi/thunderbird-i18n-17.0.5/sl.xpi) = 442096
+SHA256 (xpi/thunderbird-i18n-17.0.5/sq.xpi) = 47f5d71fd8e0b0e4250d544564ad8d91149c5311c4f04fa1c215979d52f72b9f
+SIZE (xpi/thunderbird-i18n-17.0.5/sq.xpi) = 418781
+SHA256 (xpi/thunderbird-i18n-17.0.5/sv-SE.xpi) = ab121125b9714b5b8acd6fc52415d47d53df4ef561188b65dd4b9b687b6c1c7a
+SIZE (xpi/thunderbird-i18n-17.0.5/sv-SE.xpi) = 413218
+SHA256 (xpi/thunderbird-i18n-17.0.5/ta-LK.xpi) = 789946d7a9f3a04ea37fd43b6c4e6b9907611e2ecf9428e471c1162bfbbd47a2
+SIZE (xpi/thunderbird-i18n-17.0.5/ta-LK.xpi) = 517912
+SHA256 (xpi/thunderbird-i18n-17.0.5/tr.xpi) = 420969d11d6f2e8945ab3a50bc0779cbdc135f32cdd7423ac3f6d8042abdc4f7
+SIZE (xpi/thunderbird-i18n-17.0.5/tr.xpi) = 444945
+SHA256 (xpi/thunderbird-i18n-17.0.5/uk.xpi) = 30270bfb9b6a99cae60a37fa08614af1ed0deb2044f6de52c79c56da5ab4ffeb
+SIZE (xpi/thunderbird-i18n-17.0.5/uk.xpi) = 471142
+SHA256 (xpi/thunderbird-i18n-17.0.5/zh-TW.xpi) = 194b9a773cdf8a078b11928e56807b58a111d849af272116c8323d5c147ceb69
+SIZE (xpi/thunderbird-i18n-17.0.5/zh-TW.xpi) = 437591
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index b0c77276d14b..9a6bbc431811 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	17.0.4
+DISTVERSION=	17.0.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
@@ -24,7 +24,7 @@ EM_VERSION=	1.5.1
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-2[0-9].* thunderbird-1[1-689].* thunderbird-10.*
+CONFLICTS=	thunderbird-24.* thunderbird-1[1-6].* thunderbird-10.*
 USE_MOZILLA=	# empty
 
 MAKE_JOBS_SAFE=	yes
@@ -62,17 +62,6 @@ MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 
-.if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
-.elif ${ARCH} == powerpc64
-.if ${OSVERSION} < 900033
-BROKEN=		Needs binutils 2.17.50 to build
-.else
-MOZ_EXPORT+=	UNAME_m="powerpc64"
-CFLAGS+=	-mminimal-toc
-.endif
-.endif
-
 .if ${PORT_OPTIONS:MENIGMAIL}
 MASTER_SITES+=	http://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 01bd2a50190d..6d683516fd17 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0.4esr.source.tar.bz2) = e453a0509e28af0001de917801aad274c9a532de80f124a68b2df32b9d152137
-SIZE (thunderbird-17.0.4esr.source.tar.bz2) = 113367797
+SHA256 (thunderbird-17.0.5esr.source.tar.bz2) = d8a6ff5c35fb030514d24eb7b6e224cb0dc69dce85051a2d03952d5308bc67f6
+SIZE (thunderbird-17.0.5esr.source.tar.bz2) = 113259410
 SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
 SIZE (enigmail-1.5.1.tar.gz) = 1213954
diff --git a/mail/thunderbird/files/patch-bug753046 b/mail/thunderbird/files/patch-bug753046
index 8dbb09a9b55e..0a11537b30d7 100644
--- a/mail/thunderbird/files/patch-bug753046
+++ b/mail/thunderbird/files/patch-bug753046
@@ -460,7 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01
 
 --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,16 +9,30 @@
+@@ -9,16 +9,24 @@
  
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
@@ -474,13 +474,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01
 -#include <pthread_np.h>
 +#elif defined(OS_FREEBSD)
 +#include <sys/param.h>
-+#if __FreeBSD_version > 802500
 +#include <sys/thr.h>
-+#else
-+_Pragma("GCC visibility push(default)")
-+extern "C" int thr_self(long *);
-+_Pragma("GCC visibility pop")
-+#endif
  #endif
 +
 +#if !defined(OS_MACOSX)
diff --git a/mail/thunderbird/files/patch-bug810716 b/mail/thunderbird/files/patch-bug810716
new file mode 100644
index 000000000000..93e59a2d7929
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug810716
@@ -0,0 +1,95 @@
+diff --git configure.in configure.in
+index 2084be9..eb6eeb2 100644
+--- configure.in
++++ configure.in
+@@ -3369,14 +3369,19 @@ fi
+ AC_CACHE_CHECK(
+     [for res_ninit()],
+     ac_cv_func_res_ninit,
+-    [AC_TRY_LINK([
++    [AC_TRY_RUN([
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++        #include <sys/types.h>
++        #include <netinet/in.h>
++        #include <arpa/nameser.h>
+         #include <resolv.h>
+-        ],
+-        [int foo = res_ninit(&_res);],
++        int main(int argc, char **argv){
++            int foo = res_ninit(&_res);
++        }],
+         [ac_cv_func_res_ninit=yes],
++        [ac_cv_func_res_ninit=no],
+         [ac_cv_func_res_ninit=no])
+     ])
+ 
+diff --git configure.in configure.in
+index 2084be9..eb6eeb2 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3369,14 +3369,19 @@ fi
+ AC_CACHE_CHECK(
+     [for res_ninit()],
+     ac_cv_func_res_ninit,
+-    [AC_TRY_LINK([
++    [AC_TRY_RUN([
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++        #include <sys/types.h>
++        #include <netinet/in.h>
++        #include <arpa/nameser.h>
+         #include <resolv.h>
+-        ],
+-        [int foo = res_ninit(&_res);],
++        int main(int argc, char **argv){
++            int foo = res_ninit(&_res);
++        }],
+         [ac_cv_func_res_ninit=yes],
++        [ac_cv_func_res_ninit=no],
+         [ac_cv_func_res_ninit=no])
+     ])
+ 
+diff --git extensions/auth/nsAuthGSSAPI.cpp extensions/auth/nsAuthGSSAPI.cpp
+index e828beb..6444246 100644
+--- mozilla/extensions/auth/nsAuthGSSAPI.cpp
++++ mozilla/extensions/auth/nsAuthGSSAPI.cpp
+@@ -39,6 +39,9 @@ typedef KLStatus (*KLCacheHasValidTickets_type)(
+ #endif
+ 
+ #if defined(HAVE_RES_NINIT)
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
+ #include <resolv.h>
+ #endif
+ 
+diff --git js/src/configure.in js/src/configure.in
+index e25f569..b9722f9 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2797,14 +2797,19 @@ fi
+ AC_CACHE_CHECK(
+     [for res_ninit()],
+     ac_cv_func_res_ninit,
+-    [AC_TRY_LINK([
++    [AC_TRY_RUN([
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++        #include <sys/types.h>
++        #include <netinet/in.h>
++        #include <arpa/nameser.h>
+         #include <resolv.h>
+-        ],
+-        [int foo = res_ninit(&_res);],
++        int main(int argc, char **argv){
++            int foo = res_ninit(&_res);
++        }],
+         [ac_cv_func_res_ninit=yes],
++        [ac_cv_func_res_ninit=no],
+         [ac_cv_func_res_ninit=no])
+     ])
+ 
diff --git a/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp b/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp
deleted file mode 100644
index f31ba356b0ab..000000000000
--- a/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/content/media/nsAudioStream.cpp~
-+++ mozilla/content/media/nsAudioStream.cpp
-@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
-       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull));
-     }
-   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
-+#if defined(__FreeBSD__) && __FreeBSD_version < 800097
-+    bool value = Preferences::GetBool(aPref, false);
-+#else
-     bool value = Preferences::GetBool(aPref, true);
-+#endif
-     mozilla::MutexAutoLock lock(*gAudioPrefsLock);
-     gUseCubeb = value;
-   } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) {
diff --git a/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in b/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in
deleted file mode 100644
index 6d7fa6c39ca6..000000000000
--- a/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/js/src/js-confdefs.h.in~
-+++ mozilla/js/src/js-confdefs.h.in
-@@ -12,6 +12,7 @@
-  * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
-  * is defined before <stdint.h> is included. */
- #define __STDC_LIMIT_MACROS
-+#define __STDC_CONSTANT_MACROS
- 
- #endif /* _JS_CONFDEFS_H_ */
-
author	Florian Smeets <flo@FreeBSD.org>	2013-04-03 20:27:48 +0000
committer	Florian Smeets <flo@FreeBSD.org>	2013-04-03 20:27:48 +0000
commit	513d21d8384e61cc02b820137587b3680ffbb51c (patch)
tree	fc7673f01258f369254c78eaa2111a667c2fd1f7 /mail
parent	7f2a857b2964490ac2c8b80ef6a315366e9bf55a (diff)
download	ports-513d21d8384e61cc02b820137587b3680ffbb51c.tar.gz ports-513d21d8384e61cc02b820137587b3680ffbb51c.zip