- update to 2.16

- add DuckDuckGo search plugin [1]

Security:	http://www.vuxml.org/freebsd/e3f0374a-7ad6-11e2-84cd-d43d7e0c7c02.html
Submitted by:	DuckDuckGo [1]
In collaboration with:	Jan Beich <jbeich@tormail.org>

29 files changed, 216 insertions, 783 deletions

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index b37b3163ce01..e2d261f681ad 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -190,9 +190,9 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #                         version is given by the maintainer via the port
 #                         or by the user via defined variable try to find
 #                         the highest stable installed version.
-#                         Available values: yes 15+ 15
+#                         Available values: yes 16+ 16
 #                         NOTE:
-#                         default value 15 is used in case of USE_SEAMONKEY=yes
+#                         default value 16 is used in case of USE_SEAMONKEY=yes
 #
 # USE_SEAMONKEY_BUILD     Add buildtime dependency on SeaMonkey.
 #                         Available values: see USE_SEAMONKEY
@@ -294,12 +294,12 @@ USE_SEAMONKEY:=				${USE_SEAMONKEY_BUILD}
 _SEAMONKEY_BUILD_DEPENDS=	yes
 .endif
 
-_SEAMONKEY_DEFAULT_VERSION=	15
-_SEAMONKEY_VERSIONS=		15
-_SEAMONKEY_RANGE_VERSIONS=	15+
+_SEAMONKEY_DEFAULT_VERSION=	16
+_SEAMONKEY_VERSIONS=		16
+_SEAMONKEY_RANGE_VERSIONS=	16+
 
-# For specifying [15, ..]+
-_SEAMONKEY_15P=	15
+# For specifying [16, ..]+
+_SEAMONKEY_16P=	16
 
 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
 .if ${USE_SEAMONKEY} == "yes"
@@ -341,7 +341,7 @@ IGNORE=			cannot install: unknown SeaMonkey version: seamonkey-2.${USE_SEAMONKEY
 .endif
 
 # Dependence lines for different SeaMonkey versions
-15_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+16_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
 
 # Add dependencies
 .if defined(USE_SEAMONKEY)
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index d840800b9e89..7c5f65ed8abb 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey-i18n
-PORTVERSION=	2.15
+PORTVERSION=	2.16
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	seamonkey/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
@@ -18,7 +18,7 @@ PLIST?=		${WRKDIR}/plist
 PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
-USE_SEAMONKEY=	15
+USE_SEAMONKEY=	16
 USE_XPI=	seamonkey linux-seamonkey
 
 USE_SUBMAKE=	yes
diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo
index 838a4d0302a8..9f1180f5e419 100644
--- a/www/seamonkey-i18n/distinfo
+++ b/www/seamonkey-i18n/distinfo
@@ -1,46 +1,46 @@
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ca.langpack.xpi) = 6d50618890ce0e027a267a660acd5077bd92204ff51a633935dd2e14755bf548
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ca.langpack.xpi) = 774381
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.cs.langpack.xpi) = 8fccf87607c994fa17fbfe702b540bbb12b07634b2c04b37e0a557d2abe3f48f
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.cs.langpack.xpi) = 780635
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.de.langpack.xpi) = a505f3a527772e0fbabeeec22f9b897f884baf6f37387008cbb2f8f5a59fd122
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.de.langpack.xpi) = 803512
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-GB.langpack.xpi) = c212ae7470dde686171a22ebc2f453e24dbc983f56f232fe9bf5df32986f09fb
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-GB.langpack.xpi) = 749207
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-US.langpack.xpi) = 5a769a47423138f6906d33f286dc537127bd67d19a234b9c025c7427feeac52f
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.en-US.langpack.xpi) = 750320
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-AR.langpack.xpi) = 3886c630c357018a753e7811bfff7a2a0b8feb384cb1154cb054125429e7d6a5
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-AR.langpack.xpi) = 822641
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-ES.langpack.xpi) = 36f2f9b492bb090ef558e3cf2e50c0d4e67f8d438745fcf23828af611d880d24
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.es-ES.langpack.xpi) = 771022
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fi.langpack.xpi) = 3f167297e49ea07e30c0a9344a78ecc36d41bf52645f826b87d721d21a8b70b9
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fi.langpack.xpi) = 769725
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fr.langpack.xpi) = 2ef7cef1d5c10c19c007991873d4862d0f7be58852e40210393c8ecb84d4efde
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.fr.langpack.xpi) = 779197
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.hu.langpack.xpi) = 3c5692c45a0b5c5f57c05611d639b02974756fc00f344c66a507cd6b700ce46b
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.hu.langpack.xpi) = 814029
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.it.langpack.xpi) = 4b6ad130c007c39f77d4f0e4993e9d6972b80561f8d8535a8eed35c685a3fc80
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.it.langpack.xpi) = 720238
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja-JP-mac.langpack.xpi) = bbda684ee88b8d6b10fc92fd78802b614b6ea476c36f8513a2316114ba6fbaf1
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja-JP-mac.langpack.xpi) = 852408
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja.langpack.xpi) = 49527887f98b0f7a0b062888474502067ffa65a1f82b54ead13ffd5eafd2f8d3
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ja.langpack.xpi) = 827550
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.lt.langpack.xpi) = 13870b04fdec8cff3b482ee1662ce9a4a18f8830902726e6ed4ed294862bf683
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.lt.langpack.xpi) = 793490
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nb-NO.langpack.xpi) = b7e1d4cb09c7b178ceef9e46f21df0f01ecf605a253f419827d9ff1628edb4ac
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nb-NO.langpack.xpi) = 768618
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nl.langpack.xpi) = 7024a0e51f718e2b6d7780e16c173600abf9b7b15cd5a26ec32e20111a44fa76
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.nl.langpack.xpi) = 765521
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pl.langpack.xpi) = c4e02b93829255fdf11b8d41ce406bf152f18187e4c4a5cd274add7c99413b2e
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pl.langpack.xpi) = 815325
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pt-PT.langpack.xpi) = e682683f36279888792b2a0bea5efb19c81f1c4577f3ee0860263ac4be29945a
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.pt-PT.langpack.xpi) = 801658
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ru.langpack.xpi) = 1d7f61ffb9fc39941ab6f4c33a72ce11799c6124b57a93cca37949b2e87bf018
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.ru.langpack.xpi) = 873512
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sk.langpack.xpi) = 8ee2cbbe409af42d49d5867f1f099bd38db6c9fdb8b71b6d43433707c30ab913
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sk.langpack.xpi) = 807146
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sv-SE.langpack.xpi) = 10ca3e4aa7d6c6d9386ec336e1164d013459d4792989fb74d5ebdfe6034ba4ab
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.sv-SE.langpack.xpi) = 792884
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.tr.langpack.xpi) = b2f4e90228c06c85686b5f8d0fbf37105aceba9ce581930937892bb359a882b3
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.tr.langpack.xpi) = 831669
-SHA256 (xpi/seamonkey-i18n-2.15/seamonkey-2.15.uk.langpack.xpi) = a047bed31c246951a43edf4889dc69c882612bf389f505b612d62457d0246cdd
-SIZE (xpi/seamonkey-i18n-2.15/seamonkey-2.15.uk.langpack.xpi) = 831595
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ca.langpack.xpi) = e02e367cfa1cf2e3962410765f9978ba87d432638fa0676f4d419f762a78c669
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ca.langpack.xpi) = 777209
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.cs.langpack.xpi) = 96649b94ecaaf22fac7c9674b8db37a4b8c82784fc0b7ce9ad77a9958c68c45b
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.cs.langpack.xpi) = 782322
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.de.langpack.xpi) = c9a2b8be76b7f70b91c5dca606ccb9c9c3d465da1a3aa1ce67a613b508d925b8
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.de.langpack.xpi) = 805627
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-GB.langpack.xpi) = 5da43319f2d63a7c8256ea1cb7d26ea0c680afde5ccb4e3995f94702d552d73e
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-GB.langpack.xpi) = 751439
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-US.langpack.xpi) = 916e77dca508bd02dab76991cf2b4a6a1cbf8ce9357e93c6d93ccb377c651230
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.en-US.langpack.xpi) = 752024
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-AR.langpack.xpi) = 4b7dfa49f05760cb6722a9544a09c3202073f40cfafd3282a1ffdf423058d72a
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-AR.langpack.xpi) = 824333
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-ES.langpack.xpi) = 0023c3c49089cb15794c6723cece84b5f4032f35d961852821c23d1177ad170f
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.es-ES.langpack.xpi) = 772662
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fi.langpack.xpi) = 41612f0ef771daba34d38896239f1446679b1c411dc9053f9153bf7910ae4437
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fi.langpack.xpi) = 772027
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fr.langpack.xpi) = 0461b666df8cc0f28024df329d87f8a3403c6581535ffa4996a34d9d2b0a1e38
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.fr.langpack.xpi) = 781405
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.hu.langpack.xpi) = 7b65c00bda86527c167cb763bbc9b2f2ba4b20109f8c8735f377fac5b081db15
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.hu.langpack.xpi) = 816446
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.it.langpack.xpi) = 7719d2255f43ab085747153ed770e26cdc173e764bbd8ba1afb22bd5223ed24b
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.it.langpack.xpi) = 721930
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja-JP-mac.langpack.xpi) = 284c7b0b8c6170bf7f1de4ebd7b9e6c56707815b8fa2ff1c17bc6201442c4bbd
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja-JP-mac.langpack.xpi) = 854852
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja.langpack.xpi) = 12fbad03a2b868491fc83c5ddc00fe0f6ea9c9a0c3c2a670ef714889750df23a
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ja.langpack.xpi) = 829870
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.lt.langpack.xpi) = 851a3d6d1e82482d6998c2f7f22f8c5ffc5e95f1a05a23b49a661a5c3df695d8
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.lt.langpack.xpi) = 795358
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nb-NO.langpack.xpi) = 264bac89d8cb25b9c0c6e20b816ecfe3811746026be242f47b90b4ea8f09152f
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nb-NO.langpack.xpi) = 772249
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nl.langpack.xpi) = b0db8fc017f807bf3b011b79cb8040b3e53bc77522cc8803ec0af4b927876060
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.nl.langpack.xpi) = 767742
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pl.langpack.xpi) = 3ef35349ceb6603c91882707b36453511de3eb9ce5910f25f712ae497dd700ed
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pl.langpack.xpi) = 813178
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pt-PT.langpack.xpi) = f3fa3d272772898a4daa74a7b135198f99f8b060574ffb02849ccd78d043a880
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.pt-PT.langpack.xpi) = 805319
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ru.langpack.xpi) = 49d580909b61526ac271472826b2b659b85aaf419cb21977cdd185eba531e3f5
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.ru.langpack.xpi) = 875919
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sk.langpack.xpi) = 3c420a328427db54528dbf168ae6389da581cda45c17d75c7eaa098714552bda
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sk.langpack.xpi) = 808953
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sv-SE.langpack.xpi) = 4fb1abdf5018e8d4037403ac22a35ac22850904609d8d7b27c5601b835c08284
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.sv-SE.langpack.xpi) = 795061
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.tr.langpack.xpi) = fc600b1adde387315e060c31a7a6c5394f6804aa7cb050655cfb25111dda96a1
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.tr.langpack.xpi) = 834967
+SHA256 (xpi/seamonkey-i18n-2.16/seamonkey-2.16.uk.langpack.xpi) = 8c7d5af2ea2c2b751ca12e175cc78bec7ac84eeb378c3c9c54c62d9659a7d440
+SIZE (xpi/seamonkey-i18n-2.16/seamonkey-2.16.uk.langpack.xpi) = 835210
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index e605f1ff457e..70947163b91e 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,23 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.15
+DISTVERSION=	2.16
 CATEGORIES?=	www ipv6
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
-DISTFILES=	seamonkey-${DISTVERSION}.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	seamonkey-${DISTVERSION}.source${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
+DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	nspr>=4.9.3:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
 		nss>=3.14.1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		unzip:${PORTSDIR}/archivers/unzip
 
-EM_VERSION=	1.5.0
+EM_VERSION=	1.5.1
+L_VERSION=	2.1b1
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
@@ -33,6 +34,7 @@ WANT_PERL=	yes
 GNU_CONFIGURE=	yes
 ALL_TARGET=	default
 USE_GL=		gl
+USE_DOS2UNIX=	mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
 MAKE_JOBS_SAFE=	yes
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 
@@ -116,7 +118,7 @@ MOZ_OPTIONS+=	--disable-composer
 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_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning@seamonkey.mozilla.org
 .else
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 5a52443b8e70..1f6b7b7f878e 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.15.source.tar.bz2) = 29ef839f30bb5998cc60adfe16b2e5e64abc14e48cbf10dff98b5b3a5260f5c7
-SIZE (seamonkey-2.15.source.tar.bz2) = 120128259
-SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71
-SIZE (enigmail-1.5.0.tar.gz) = 1216071
+SHA256 (seamonkey-2.16.source.tar.bz2) = eb694309d3186737c30b745db650de89de4b4aebb49bf609ed9eb89e3fb9b8a3
+SIZE (seamonkey-2.16.source.tar.bz2) = 121957357
+SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
+SIZE (enigmail-1.5.1.tar.gz) = 1213954
diff --git a/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile b/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
index d8b5128d02b4..e76c595117f4 100644
--- a/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
+++ b/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
@@ -31,18 +31,6 @@
  CFLAGS += -fPIC
  endif
  endif
-@@ -62,7 +62,11 @@ libs: source
- 	$(CC) $(LDFLAGS) -o $(libname) $(objfiles)
- 
- source: $(source)
-+ifneq (,$(filter 4.2.%, $(CC_VERSION)))
-+	$(CC) $(CFLAGS) -c -o $(objfiles) $^
-+else
- 	$(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^
-+endif
- 
- 
- clean:
 --- mailnews/extensions/enigmail/ipc/src/Makefile.in~
 +++ mailnews/extensions/enigmail/ipc/src/Makefile.in
 @@ -19,26 +19,26 @@ endif
@@ -76,15 +64,3 @@
  CFLAGS += -fPIC
  endif
  endif
-@@ -62,7 +62,11 @@ libs: source
- 	$(CC) $(LDFLAGS) -o $(libname) $(objfiles)
- 
- source: $(source)
-+ifneq (,$(filter 4.2.%, $(CC_VERSION)))
-+	$(CC) $(CFLAGS) -c -o $(objfiles) $^
-+else
- 	$(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^
-+endif
- 
- 
- clean:
diff --git a/www/seamonkey/files/patch-bug685258 b/www/seamonkey/files/patch-bug685258
index cac425d6adba..655ecdf96e85 100644
--- a/www/seamonkey/files/patch-bug685258
+++ b/www/seamonkey/files/patch-bug685258
@@ -3,9 +3,9 @@
 # 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
+diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
+--- mozilla/content/media/AudioStream.cpp
++++ mozilla/content/media/AudioStream.cpp
 @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
    mFormat = aFormat;
  
diff --git a/www/seamonkey/files/patch-bug732340 b/www/seamonkey/files/patch-bug732340
deleted file mode 100644
index f09561f4e8e1..000000000000
--- a/www/seamonkey/files/patch-bug732340
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig	2012-06-24 22:14:46.463741874 -0400
-+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc	2012-06-24 22:15:06.784770042 -0400
-@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t 
-   GPOS::position_finish (buffer);
- }
- 
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
-+#endif
- 
- 
diff --git a/www/seamonkey/files/patch-bug778078 b/www/seamonkey/files/patch-bug778078
deleted file mode 100644
index 27be88312b95..000000000000
--- a/www/seamonkey/files/patch-bug778078
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/toolkit/xre/nsAppRunner.cpp~
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
-   ScopedLogging log;
- 
- #if defined(MOZ_WIDGET_GTK)
--#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/www/seamonkey/files/patch-bug781457 b/www/seamonkey/files/patch-bug781457
deleted file mode 100644
index f7331270ab8a..000000000000
--- a/www/seamonkey/files/patch-bug781457
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/nsStackWalk.cpp~
-+++ mozilla/xpcom/base/nsStackWalk.cpp
-@@ -1638,6 +1638,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/www/seamonkey/files/patch-bug783505 b/www/seamonkey/files/patch-bug783505
deleted file mode 100644
index d32be963c7b8..000000000000
--- a/www/seamonkey/files/patch-bug783505
+++ /dev/null
@@ -1,52 +0,0 @@
-commit b5f97ee
-Author: Rafael Ávila de Espíndola <respindola@mozilla.com>
-Date:   Mon Aug 20 10:28:08 2012 -0400
-
-    Bug 783505 - OS X gcc builds failing. r=jorendorff.
-    This patch adds a workaround for
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608
----
- js/src/jstypedarray.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git mozilla/js/src/jstypedarray.cpp mozilla/js/src/jstypedarray.cpp
-index 1eaeea0..1957086 100644
---- mozilla/js/src/jstypedarray.cpp
-+++ mozilla/js/src/jstypedarray.cpp
-@@ -1423,8 +1423,14 @@ class TypedArrayTemplate
-     Getter(JSContext *cx, unsigned argc, Value *vp)
-     {
-         CallArgs args = CallArgsFromVp(argc, vp);
-+        // FIXME: Hack to keep us building with gcc 4.2. Remove this once we
-+        // drop support for gcc 4.2. See bug 783505 for the details.
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+        return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args);
-+#else
-         return CallNonGenericMethod<ThisTypeArray::IsThisClass,
-                                     ThisTypeArray::GetterImpl<ValueGetter> >(cx, args);
-+#endif
-     }
- 
-     // Define an accessor for a read-only property that invokes a native getter
---- mozilla/build/autoconf/gcc-pr39608.m4~
-+++ mozilla/build/autoconf/gcc-pr39608.m4
-@@ -31,7 +31,6 @@ AC_LANG_RESTORE
- 
- AC_MSG_RESULT($ac_have_gcc_pr39608)
- if test "$ac_have_gcc_pr39608" = "yes"; then
--   echo This compiler would fail to build firefox, plase upgrade.
--   exit 1
-+   echo This compiler may fail to build firefox, plase upgrade.
- fi
- ])
---- mozilla/js/src/build/autoconf/gcc-pr39608.m4~
-+++ mozilla/js/src/build/autoconf/gcc-pr39608.m4
-@@ -31,7 +31,6 @@ AC_LANG_RESTORE
- 
- AC_MSG_RESULT($ac_have_gcc_pr39608)
- if test "$ac_have_gcc_pr39608" = "yes"; then
--   echo This compiler would fail to build firefox, plase upgrade.
--   exit 1
-+   echo This compiler may fail to build firefox, plase upgrade.
- fi
- ])
diff --git a/www/seamonkey/files/patch-bug788955 b/www/seamonkey/files/patch-bug788955
deleted file mode 100644
index 3974181f4aad..000000000000
--- a/www/seamonkey/files/patch-bug788955
+++ /dev/null
@@ -1,299 +0,0 @@
-diff --git Makefile.in Makefile.in
-index e341462..f75bd55 100644
---- mozilla/Makefile.in
-+++ mozilla/Makefile.in
-@@ -48,8 +48,10 @@ endif
- ifdef MOZ_MEMORY
- tier_base_dirs += memory/mozjemalloc
- ifdef MOZ_JEMALLOC
-+ifndef MOZ_NATIVE_JEMALLOC
- tier_base_dirs += memory/jemalloc
- endif
-+endif
- tier_base_dirs += memory/build
- endif
- ifndef MOZ_NATIVE_ZLIB
-diff --git allmakefiles.sh allmakefiles.sh
-index 6a9be4b..d2e49e3 100755
---- mozilla/allmakefiles.sh
-+++ mozilla/allmakefiles.sh
-@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then
-     mozglue/Makefile
-     mozglue/build/Makefile
-   "
--  if [ "$MOZ_JEMALLOC" ]; then
-+  if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then
-     add_makefiles "
-       memory/jemalloc/Makefile
-     "
-diff --git configure.in configure.in
-index bb05782..2f32516 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3711,21 +3711,22 @@ fi
- 
- dnl Check for the existence of various allocation headers/functions
- 
-+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
--MOZ_CHECK_HEADER(malloc.h,        [MALLOC_H=malloc.h])
--if test "$MALLOC_H" = ""; then
--  MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
--  if test "$MALLOC_H" = ""; then
--    MOZ_CHECK_HEADER(sys/malloc.h,    [MALLOC_H=sys/malloc.h])
-+
-+for file in $MALLOC_HEADERS; do
-+  MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
-+  if test "$MALLOC_H" != ""; then
-+    AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
-+    break
-   fi
--fi
--if test "$MALLOC_H" != ""; then
--   AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
--fi
-+done
- 
- MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
- AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
- 
-+AC_CHECK_FUNCS(malloc_usable_size)
-+
- dnl See if compiler supports some gcc-style attributes
- 
- AC_CACHE_CHECK(for __attribute__((always_inline)),
-@@ -6939,6 +6940,18 @@ else
- fi
- 
- if test -z "$MOZ_MEMORY"; then
-+  if test -n "$MOZ_JEMALLOC"; then
-+    MOZ_NATIVE_JEMALLOC=1
-+    AC_CHECK_FUNCS(mallctl nallocm,,
-+      [MOZ_NATIVE_JEMALLOC=
-+       break])
-+    if test -n "$MOZ_NATIVE_JEMALLOC"; then
-+      MOZ_MEMORY=1
-+      AC_DEFINE(MOZ_MEMORY)
-+      AC_DEFINE(MOZ_JEMALLOC)
-+      AC_DEFINE(MOZ_NATIVE_JEMALLOC)
-+    fi
-+  fi
-   case "${target}" in
-     *-mingw*)
-       if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
-@@ -7033,6 +7046,7 @@ else
- fi # MOZ_MEMORY
- AC_SUBST(MOZ_MEMORY)
- AC_SUBST(MOZ_JEMALLOC)
-+AC_SUBST(MOZ_NATIVE_JEMALLOC)
- AC_SUBST(MOZ_GLUE_LDFLAGS)
- AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS)
- AC_SUBST(WIN32_CRT_LIBS)
-@@ -8820,10 +8834,22 @@ fi
- 
- # Run jemalloc configure script
- 
--if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
-+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
-   ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
--  if test "$OS_ARCH" = "Linux"; then
--    MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
-+  case "$OS_ARCH" in
-+    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-+      MANGLE="malloc calloc valloc free realloc posix_memalign"
-+      case "$OS_ARCH" in
-+        Linux)
-+          MANGLE="$MANGLE memalign malloc_usable_size"
-+          ;;
-+        FreeBSD)
-+          MANGLE="$MANGLE malloc_usable_size"
-+          ;;
-+      esac
-+      ;;
-+  esac
-+  if test -n "$MANGLE"; then
-     MANGLED=
-     JEMALLOC_WRAPPER=
-     if test -n "$_WRAP_MALLOC"; then
-diff --git memory/build/Makefile.in memory/build/Makefile.in
-index dca0f48..af93ee0 100644
---- mozilla/memory/build/Makefile.in
-+++ mozilla/memory/build/Makefile.in
-@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
- 
- ifdef MOZ_JEMALLOC
- CSRCS += mozjemalloc_compat.c
-+ifndef MOZ_NATIVE_JEMALLOC
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
-+endif
- else
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
- endif
-diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c
-index 9d87629..03c8320 100644
---- mozilla/memory/build/extraMallocFuncs.c
-+++ mozilla/memory/build/extraMallocFuncs.c
-@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src)
- #endif
- 
- #ifdef MOZ_JEMALLOC
-+
-+#undef wrap
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- /* Override some jemalloc defaults */
--const char *je_malloc_conf = "narenas:1,lg_chunk:20";
-+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20";
- 
- #ifdef ANDROID
- #include <android/log.h>
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 10a845a..94ad96e 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -5,14 +5,21 @@
- #include "mozilla/Types.h"
- #include "jemalloc_types.h"
- 
--extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
- 
--MOZ_EXPORT_API (void)
-+extern MOZ_IMPORT_API(int)
-+wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+
-+MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
-   size_t size = sizeof(stats->mapped);
--  je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0);
--  je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0);
-+  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
-+  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
-   stats->committed = -1;
-   stats->dirty = -1;
- }
-diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c
-index 37a843e..55e18c2 100644
---- mozilla/memory/jemalloc/src/src/mutex.c
-+++ mozilla/memory/jemalloc/src/src/mutex.c
-@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread,
- /******************************************************************************/
- 
- #ifdef JEMALLOC_MUTEX_INIT_CB
--int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-+JEMALLOC_EXPORT int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-     void *(calloc_cb)(size_t, size_t));
- #endif
- 
-diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
-index 5b61050b..5b3399a 100644
---- mozilla/memory/mozalloc/mozalloc.cpp
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -12,16 +12,13 @@
- #include <sys/types.h>
- 
- #if defined(MALLOC_H)
--#  include MALLOC_H             // for memalign, valloc where available
-+#  include MALLOC_H             // for memalign, valloc, malloc_size, malloc_usable_size
- #endif // if defined(MALLOC_H)
- #include <stddef.h>             // for size_t
- #include <stdlib.h>             // for malloc, free
- #if defined(XP_UNIX)
- #  include <unistd.h>           // for valloc on *BSD
- #endif //if defined(XP_UNIX)
--#if defined(__FreeBSD__)
--#  include <malloc_np.h>        // for malloc_usable_size
--#endif // if defined(__FreeBSD__)
- 
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- #  define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
--    // Android bionic libc doesn't have malloc_usable_size.
-+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
-diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
-index f0e0878..2486e83 100644
---- mozilla/memory/mozjemalloc/jemalloc.h
-+++ mozilla/memory/mozjemalloc/jemalloc.h
-@@ -37,22 +37,29 @@
- #endif
- #include "jemalloc_types.h"
- 
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_NATIVE_JEMALLOC) \
-+  || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- void	jemalloc_stats(jemalloc_stats_t *stats);
- 
- /* Computes the usable size in advance. */
- #if !defined(MOZ_MEMORY_DARWIN)
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- #if defined(MOZ_JEMALLOC)
--int je_nallocm(size_t *rsize, size_t size, int flags);
-+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags);
- #else
- size_t je_malloc_good_size(size_t size);
- #endif
-@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) {
- #if defined(MOZ_MEMORY_DARWIN)
-   return malloc_good_size(size);
- #elif defined(MOZ_JEMALLOC)
--  if (je_nallocm) {
-+  if (wrap(nallocm)) {
-     size_t ret;
-     if (size == 0)
-       size = 1;
--    if (!je_nallocm(&ret, size, 0))
-+    if (!wrap(nallocm)(&ret, size, 0))
-       return ret;
-   }
-   return size;
-@@ -113,4 +120,6 @@ void    jemalloc_purge_freed_pages();
- } /* extern "C" */
- #endif
- 
-+#undef wrap
-+
- #endif /* _JEMALLOC_H_ */
-diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in
-index c333647..15ba505 100644
---- mozilla/mozglue/build/Makefile.in
-+++ mozilla/mozglue/build/Makefile.in
-@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1
- endif
- 
- # Keep jemalloc separated when mozglue is statically linked
--ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB))
-+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))
- SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build)
- else
- # Temporary, until bug 662814 lands
diff --git a/www/seamonkey/files/patch-bug791305 b/www/seamonkey/files/patch-bug791305
index 633415128199..b4197b85b9d7 100644
--- a/www/seamonkey/files/patch-bug791305
+++ b/www/seamonkey/files/patch-bug791305
@@ -17,6 +17,23 @@ Date:   Fri Sep 14 15:54:55 2012 -0400
 
 diff --git configure.in configure.in
 index f0aeb5d..1c01010 100644
+--- configure.in
++++ configure.in
+@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+                      #include <jpeglib.h> ],
+                    [ #if JPEG_LIB_VERSION < $MOZJPEG
+                      #error "Insufficient JPEG library version ($MOZJPEG required)."
+-                     #endif
+-                     #ifndef JCS_EXTENSIONS
+-                     #error "libjpeg-turbo JCS_EXTENSIONS required"
+-                     #endif
+-                     ],
++                     #endif ],
+                    MOZ_NATIVE_JPEG=1,
+                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
+ fi
+diff --git configure.in configure.in
+index f0aeb5d..1c01010 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
 @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
diff --git a/www/seamonkey/files/patch-bug798354 b/www/seamonkey/files/patch-bug798354
deleted file mode 100644
index 26ce712479ff..000000000000
--- a/www/seamonkey/files/patch-bug798354
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
-+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
- }
- 
- //------------------------------------------------------------------------------
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+sockaddr_un sizecheck;
-+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
-+#else
- const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
-+#endif
- 
- // Creates a Fifo with the specified name ready to listen on.
- bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {
diff --git a/www/seamonkey/files/patch-bug800401 b/www/seamonkey/files/patch-bug800401
deleted file mode 100644
index b0364c3eb231..000000000000
--- a/www/seamonkey/files/patch-bug800401
+++ /dev/null
@@ -1,91 +0,0 @@
-commit a564d64
-Author: Ehsan Akhgari <ehsan@mozilla.com>
-Date:   Thu Oct 11 13:42:12 2012 -0400
-
-    Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
-    
-    In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
----
- media/mtransport/third_party/nICEr/nicer.gyp       | 2 --
- media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
- media/webrtc/signaling/signaling.gyp               | 6 ------
- 3 files changed, 10 deletions(-)
-
-diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 26ec0c5..0e1f8b4 100644
---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp
-@@ -132,7 +132,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -183,7 +182,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index f9a5c19..3cc8e1c 100644
---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -150,7 +150,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -200,7 +199,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index 1ec0ee2..175996f 100644
---- mozilla/media/webrtc/signaling/signaling.gyp
-+++ mozilla/media/webrtc/signaling/signaling.gyp
-@@ -184,7 +184,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -212,8 +211,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
-@@ -633,7 +630,6 @@
-           ],
- 
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -752,8 +748,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
diff --git a/www/seamonkey/files/patch-bug806139 b/www/seamonkey/files/patch-bug806139
deleted file mode 100644
index 0bdf975ce228..000000000000
--- a/www/seamonkey/files/patch-bug806139
+++ /dev/null
@@ -1,29 +0,0 @@
---- mozilla/content/html/content/public/nsHTMLMediaElement.h~
-+++ mozilla/content/html/content/public/nsHTMLMediaElement.h
-@@ -311,7 +311,7 @@ public:
-   static bool IsH264Enabled();
-   static bool IsH264Type(const nsACString& aType);
-   static const char gH264Types[3][16];
--  static char const *const gH264Codecs[7];
-+  static char const *const gH264Codecs[9];
- #endif
- 
- #ifdef MOZ_MEDIA_PLUGINS
---- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~
-+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA
- #endif
- 
- #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
--char const *const nsHTMLMediaElement::gH264Codecs[7] = {
-+char const *const nsHTMLMediaElement::gH264Codecs[9] = {
-   "avc1.42E01E",
-   "avc1.42001E",
-   "avc1.58A01E",
-   "avc1.4D401E",
-   "avc1.64001E",
-+  "avc1.64001F",
-+  "mp4v.20.3",
-   "mp4a.40.2",
-   nullptr
- };
diff --git a/www/seamonkey/files/patch-bug807492 b/www/seamonkey/files/patch-bug807492
index 94be8ad66854..d6b26d7cc46e 100644
--- a/www/seamonkey/files/patch-bug807492
+++ b/www/seamonkey/files/patch-bug807492
@@ -81,11 +81,11 @@ index c167461..8346c11 100644
  if test -n "$MOZ_WEBRTC"; then
     AC_MSG_RESULT("generating WebRTC Makefiles...")
  
+ dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
+ dnl so that regeneration via dependencies works correctly
     WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
  
     GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
- 
-    $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
 diff --git js/src/config/system-headers js/src/config/system-headers
 index 9bd1efa..1095a01 100644
 --- mozilla/js/src/config/system-headers
@@ -289,7 +289,7 @@ index cc260b7..66af2d7 100644
 +
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
-+# if __FreeBSD_version > 900044
++# if __FreeBSD_version > 900505
 +#  define HAVE_XLOCALE
 +# endif
 +#endif
@@ -447,14 +447,14 @@ index bcb1ec0..bb73591 100644
 --- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
 +++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
 @@ -33,5 +33,5 @@
- #define	_SYS_QUEUE_H_
- 
+ #define        _SYS_QUEUE_H_
+
 -#ifndef DARWIN
 +#if !defined(BSD) && !defined(DARWIN)
  #include <stddef.h>
  #define __offsetof offsetof
  #endif
- 
+
 diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
 index 3aced8b..be020bb 100644
 --- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
@@ -581,10 +581,10 @@ diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/we
 index a7c47e1..4f191de 100644
 --- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
 +++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
  {
      static const char fname[] = "cprGetMessage";
- 	
+ 
      void *buffer = 0;
      cpr_msg_queue_t *msgq;
      cpr_msgq_node_t *node;
@@ -599,12 +599,12 @@ index a7c47e1..4f191de 100644
  		int     tz_dsttime;     /* type of dst correction to apply */
  	} tz;
 +#endif
- 	
+ 
      /* Initialize ppUserData */
      if (ppUserData) {
          *ppUserData = NULL;
      }
- 	
+ 
      msgq = (cpr_msg_queue_t *) msgQueue;
      if (msgq == NULL) {
 diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
@@ -1268,7 +1268,6 @@ index 12df1b3..424ea0a 100644
 +#include <linux/videodev2.h>
 +#endif
 +
- #include <iostream>
  #include <new>
  
  #include "ref_count.h"
@@ -1276,6 +1275,7 @@ index 12df1b3..424ea0a 100644
  #include "thread_wrapper.h"
  #include "critical_section_wrapper.h"
  #include "video_capture_linux.h"
+ 
 diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
 index e3f7bb5..882cede 100644
 --- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
diff --git a/www/seamonkey/files/patch-bug815025 b/www/seamonkey/files/patch-bug815025
deleted file mode 100644
index cc542e077de6..000000000000
--- a/www/seamonkey/files/patch-bug815025
+++ /dev/null
@@ -1,27 +0,0 @@
---- mozilla/mfbt/SHA1.h~
-+++ mozilla/mfbt/SHA1.h
-@@ -27,6 +27,11 @@
- #include "mozilla/StandardInteger.h"
- #include "mozilla/Types.h"
- 
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+/* c++/36107: mark SHA1Sum constructor as weak manually */
-+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
-+#endif
-+
- namespace mozilla {
- class SHA1Sum {
-   union {
-@@ -39,7 +43,12 @@ class SHA1Sum {
- 
- public:
-   static const unsigned int HashSize = 20;
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
-+  MOZ_IMPORT_API() SHA1Sum();
-+#else
-   MFBT_API() SHA1Sum();
-+#endif
-   MFBT_API(void) update(const void* dataIn, uint32_t len);
-   MFBT_API(void) finish(uint8_t hashout[20]);
- };
diff --git a/www/seamonkey/files/patch-bug817267 b/www/seamonkey/files/patch-bug817267
new file mode 100644
index 000000000000..549e5022b7eb
--- /dev/null
+++ b/www/seamonkey/files/patch-bug817267
@@ -0,0 +1,36 @@
+commit faafeb1
+Author: Jan Beich <jbeich@tormail.org>
+Date:   Sat Dec 1 21:25:24 2012 -0500
+
+    Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric
+---
+ dom/system/OSFileConstants.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 75a41dc..63fc6b1 100644
+--- mozilla/dom/system/OSFileConstants.cpp
++++ mozilla/dom/system/OSFileConstants.cpp
+@@ -41,6 +41,11 @@
+ #include "OSFileConstants.h"
+ #include "nsIOSFileConstantsService.h"
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) \
++  || defined(__NetBSD__) || defined(__OpenBSD__)
++#define __dd_fd dd_fd
++#endif
++
+ /**
+  * This module defines the basic libc constants (error numbers, open modes,
+  * etc.) used by OS.File and possibly other OS-bound JavaScript libraries.
+@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] =
+   { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) },
+ #endif // defined(DT_UNKNOWN)
+ 
+-  // Under MacOS X, |dirfd| is a macro rather than a function, so we
+-  // need a little help to get it to work
++  // Under MacOS X and BSDs, |dirfd| is a macro rather than a
++  // function, so we need a little help to get it to work
+ #if defined(dirfd)
+   { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) },
+ 
diff --git a/www/seamonkey/files/patch-bug828003 b/www/seamonkey/files/patch-bug828003
index 4a58815a5ab1..dd961056377f 100644
--- a/www/seamonkey/files/patch-bug828003
+++ b/www/seamonkey/files/patch-bug828003
@@ -4,13 +4,13 @@
  #include "mozilla/StandardInteger.h"
  
  /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-+/* stdint.h defines int*_t and uintptr_t */
++/* StandardInteger.h defines int*_t and uintptr_t */
  
 -#if defined (__SVR4) && defined (__sun)
 -/* int_types.h gets included somehow, so avoid redefining the types differently */
 -#include <sys/int_types.h>
 -#elif defined (_AIX)
-+#if defined (_AIX)
++#if defined(_AIX)
  #include <sys/types.h>
 -#elif defined(__OpenBSD__)
 -#include <inttypes.h>
@@ -26,7 +26,7 @@
 -
 -#ifdef __OS2__
 -/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
-+#elif __OS2__
++#elif defined(__OS2__)
  #include <stdlib.h>
 -#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
 -typedef unsigned long uintptr_t;
diff --git a/www/seamonkey/files/patch-duckduckgo b/www/seamonkey/files/patch-duckduckgo
new file mode 100644
index 000000000000..0ff9d6c471d5
--- /dev/null
+++ b/www/seamonkey/files/patch-duckduckgo
@@ -0,0 +1,41 @@
+--- /dev/null	2013-02-09 00:33:00.000000000 +0100
++++ suite/locales/en-US/searchplugins/duckduckgo.xml	2013-02-09 00:40:19.000000000 +0100
+@@ -0,0 +1,11 @@
++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
++<ShortName>DuckDuckGo</ShortName>
++<Description>We believe in better search and not tracking.</Description>
++<InputEncoding>UTF-8</InputEncoding>
++<Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image>
++<Url type="text/html" method="GET" template="https://duckduckgo.com/">
++<Param name="q" value="{searchTerms}"/>
++<Param name="t" value="freebsd"/>
++</Url>
++<SearchForm>https://duckduckgo.com/</SearchForm>
++</SearchPlugin>
+--- suite/browser/browser-prefs.js.orig	2013-02-09 21:26:33.000000000 +0100
++++ suite/browser/browser-prefs.js	2013-02-09 21:25:32.000000000 +0100
+@@ -102,6 +102,7 @@
+ // Ordering of Search Engines in the Engine list.
+ pref("browser.search.order.1", "chrome://communicator-region/locale/region.properties");
+ pref("browser.search.order.2", "chrome://communicator-region/locale/region.properties");
++pref("browser.search.order.3", "chrome://communicator-region/locale/region.properties");
+ 
+ // Search (side)bar results always open in a new tab.
+ pref("browser.search.openintab", false);
+--- suite/locales/en-US/chrome/common/region.properties.orig	2013-02-09 21:31:31.000000000 +0100
++++ suite/locales/en-US/chrome/common/region.properties	2013-02-09 21:32:04.000000000 +0100
+@@ -8,6 +8,7 @@
+ # Search engine order (order displayed in the search bar dropdown)
+ browser.search.order.1=Google
+ browser.search.order.2=Yahoo
++browser.search.order.3=DuckDuckGo
+ 
+ # More information about this update link available in the update wizard.
+ # Only change this if you are providing localized release notes.
+--- suite/locales/en-US/searchplugins/list.txt.orig	2013-02-09 21:35:07.000000000 +0100
++++ suite/locales/en-US/searchplugins/list.txt	2013-02-09 21:35:14.000000000 +0100
+@@ -2,3 +2,4 @@
+ google
+ wikipedia
+ yahoo
++duckduckgo
diff --git a/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h b/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h
deleted file mode 100644
index b799ff5fb83f..000000000000
--- a/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/content/base/src/nsTextFragmentImpl.h.orig	2013-01-05 00:44:29.000000000 +0100
-+++ mozilla/content/base/src/nsTextFragmentImpl.h	2013-01-10 13:02:12.291088273 +0100
-@@ -16,7 +16,11 @@
- };
- 
- template<> struct Non8BitParameters<8> {
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+  static inline size_t mask() { return 0xff00ff00ff00ff00ULL; }
-+#else
-   static inline size_t mask() { return 0xff00ff00ff00ff00; }
-+#endif
-   static inline uint32_t alignMask() { return 0x7; }
-   static inline uint32_t numUnicharsPerWord() { return 4; }
- };
diff --git a/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp b/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp
index 346ff93c37fa..3df70bd290f8 100644
--- a/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp
+++ b/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp
@@ -1,5 +1,5 @@
---- mozilla/content/media/nsAudioStream.cpp~
-+++ mozilla/content/media/nsAudioStream.cpp
+--- mozilla/content/media/AudioStream.cpp~
++++ mozilla/content/media/AudioStream.cpp
 @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
        gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
      }
diff --git a/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h b/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h
new file mode 100644
index 000000000000..13720f6af320
--- /dev/null
+++ b/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h
@@ -0,0 +1,18 @@
+diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h
+index f42822e..1a5a699 100644
+--- mozilla/gfx/ots/include/opentype-sanitiser.h
++++ mozilla/gfx/ots/include/opentype-sanitiser.h
+@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t;
+ #include <stdint.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 800067
++#  include <sys/types.h> // for off_t
++# endif
++#endif
++
+ #include <algorithm>  // for std::min
+ #include <cassert>
+ #include <cstddef>
diff --git a/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in b/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
index 294e8270334a..727a86a4c3bc 100644
--- a/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
+++ b/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
@@ -1,20 +1,5 @@
 --- 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)
diff --git a/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc b/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
index 3fe4995aa0f8..ba9c0d6d3416 100644
--- a/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
+++ b/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
@@ -1,9 +1,9 @@
 --- 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"
+@@ -16,7 +16,7 @@
  #include "base/scoped_ptr.h"
  #include "base/time.h"
+ #include "nsDependentSubstring.h"
 -#include "third_party/libevent/event.h"
 +#include "event.h"
  
diff --git a/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp b/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
index 3492d13e36ff..d00ab205957b 100644
--- a/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
+++ b/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp
@@ -1,16 +1,16 @@
 --- mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp~
 +++ mozilla/media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
 @@ -21,6 +21,13 @@ Scott McMurray
- #include "constants.hpp"

- #include <cstring>

- 

-+#ifdef __FreeBSD__

-+# include <osreldate.h>

-+# if __FreeBSD_version < 900506

-+#  define getchar boost_getchar

-+# endif

-+#endif

-+

- namespace boost {

-   namespace detail {

-   	//This only works on unsigned data types

+ #include "constants.hpp"
+ #include <cstring>
+ 
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++#  define getchar boost_getchar
++# endif
++#endif
++
+ namespace boost {
+   namespace detail {
+   	//This only works on unsigned data types
diff --git a/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp b/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp
deleted file mode 100644
index e97731dbc67d..000000000000
--- a/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/AvailableMemoryTracker.cpp~
-+++ mozilla/xpcom/base/AvailableMemoryTracker.cpp
-@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
-   MOZ_ASSERT(NS_IsMainThread());
- 
- #if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
-+//  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
- #elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();
diff --git a/www/seamonkey/files/patch-z-bug762445 b/www/seamonkey/files/patch-z-bug762445
deleted file mode 100644
index 648492dfa700..000000000000
--- a/www/seamonkey/files/patch-z-bug762445
+++ /dev/null
@@ -1,70 +0,0 @@
-commit b44dc8e
-Author: Jan Beich <jbeich@tormail.org>
-Date:   Fri Oct 12 18:49:59 2012 +0000
-
-    Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory.
----
- memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 94ad96e..7adfef5 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -11,15 +11,50 @@
- #define wrap(a) je_ ## a
- #endif
- 
--extern MOZ_IMPORT_API(int)
-+/*
-+ *  CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:
-+ *  - drop `t' argument to avoid redundancy in calculating type size
-+ *  - require `i' argument for arena number explicitly
-+ */
-+
-+#define	CTL_GET(n, v) do {						\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctl)(n, &v, &sz, NULL, 0);				\
-+} while (0)
-+
-+#define	CTL_I_GET(n, v, i) do {						\
-+	size_t mib[6];							\
-+	size_t miblen = sizeof(mib) / sizeof(mib[0]);			\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctlnametomib)(n, mib, &miblen);			\
-+	mib[2] = i;							\
-+	wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0);		\
-+} while (0)
-+
-+MOZ_IMPORT_API(int)
- wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
- 
- MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
--  size_t size = sizeof(stats->mapped);
--  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
--  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
--  stats->committed = -1;
--  stats->dirty = -1;
-+  unsigned narenas;
-+  size_t active, allocated, mapped, page, pdirty;
-+
-+  CTL_GET("arenas.narenas", narenas);
-+  CTL_GET("arenas.page", page);
-+  CTL_GET("stats.active", active);
-+  CTL_GET("stats.allocated", allocated);
-+  CTL_GET("stats.mapped", mapped);
-+
-+  /* get the summation for all arenas, i == narenas */
-+  CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
-+
-+  stats->allocated = allocated;
-+  stats->mapped = mapped;
-+  stats->dirty = pdirty * page;
-+  stats->committed = active + stats->dirty;
- }