14 files changed, 242 insertions, 142 deletions

diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 7234144f4bde..2a1be77acf1d 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.31
+DISTVERSION=	2.32
 CATEGORIES=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index 05fd1271cb47..313005a159be 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,5 +1,5 @@
-SHA256 (seamonkey-2.31.tar.bz2) = d6f3fe75bf9605c06bcb47be2d1ef004525e27e8326b05ab88d5fe4a6eaaf4c4
-SIZE (seamonkey-2.31.tar.bz2) = 40638305
+SHA256 (seamonkey-2.32.tar.bz2) = 571829702f8dc5f869181ec31911797471e63ebac5b0b2bfb9f5ae1986478f47
+SIZE (seamonkey-2.32.tar.bz2) = 40849036
 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index 7c38ae0a3d8d..93b10f52b08c 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey-i18n
-PORTVERSION=	2.31
+PORTVERSION=	2.32
 CATEGORIES=	www mail news editors irc
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo
index c0bedf654742..aa91b3c6a5bd 100644
--- a/www/seamonkey-i18n/distinfo
+++ b/www/seamonkey-i18n/distinfo
@@ -1,54 +1,52 @@
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.be.langpack.xpi) = c685778c26e42914713f248af13531746a893775b690c851276c5dbac6c42673
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.be.langpack.xpi) = 842987
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ca.langpack.xpi) = 64e11f5088be84b21c5fe22605b754c246ff86142a22b680599e8c138784f1c2
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ca.langpack.xpi) = 836129
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.cs.langpack.xpi) = 00a70a450997b8598970089c8d67f1d77da9cd94a31db297eefcd7fe42e76b71
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.cs.langpack.xpi) = 837401
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.de.langpack.xpi) = 1b9cb19e1618eb146ae52875f700def9c130b293f03e57ffd61abe7d262c8791
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.de.langpack.xpi) = 841321
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-GB.langpack.xpi) = fb5c13e0a92bcf94589dd68ac27d6d91d5eb3dd445b78eb77258956849650de0
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-GB.langpack.xpi) = 806393
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-US.langpack.xpi) = cd9916784e258990bee4a4b92353da0f7c015a99e29ce1b19d518e843bcb2f7a
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.en-US.langpack.xpi) = 806393
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-AR.langpack.xpi) = 789cb938c4473fe4f7c9661d8e0a3974b5f627460e0a3d66f43a2d4c02b3ba76
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-AR.langpack.xpi) = 855419
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-ES.langpack.xpi) = 93ca568a07923605613d2df703a712b95c5364c3e67487d64e05b1dd6c2124fe
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.es-ES.langpack.xpi) = 832275
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fi.langpack.xpi) = d904b42fef7cb6e7537e8ce0b97c1fae7902cecab24c44eaa0a24bbeecc34275
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fi.langpack.xpi) = 803753
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fr.langpack.xpi) = e58ad8812caa8ee5762cb80869d517c70a0ea6c22e780a5b9561ab06e4b30c35
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.fr.langpack.xpi) = 813901
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.gl.langpack.xpi) = 7015eed1fc8f47ec11bfb22435682ed1053b4d3e0939a8442c27f1b23113b0ee
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.gl.langpack.xpi) = 815951
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.hu.langpack.xpi) = 88a8aded02ebfc926caff925cffbf3659d03c7923c25917a4d945047ec13a948
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.hu.langpack.xpi) = 847393
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.it.langpack.xpi) = 7b61f752a6981983d53155f09b14043bc1ae30335d58bc2cd2469b7b2205f85f
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.it.langpack.xpi) = 744925
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja-JP-mac.langpack.xpi) = e94c36f9e5c342b33f778be5880106b5d45f4f2b0aef36c604c3a6ffeeba24d7
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja-JP-mac.langpack.xpi) = 903849
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja.langpack.xpi) = 833a41fea45be480338a86a51163959886f1e4b443ee61cbf09ba68e61255874
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ja.langpack.xpi) = 888311
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.lt.langpack.xpi) = 9e44994780eb3efe7dc46a4742cf24bcd6cf41d045d8fadbf9eccc28fe03bb50
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.lt.langpack.xpi) = 854172
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nb-NO.langpack.xpi) = eea41ed25941cc479c6f92b2ebdc668182bb5f42f4bbeacf96008c4469cbd834
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nb-NO.langpack.xpi) = 825996
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nl.langpack.xpi) = c399ab8412e7e44100c08df9a8362cf7e74c79a8277e8dba6a1856fc79df2b4d
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.nl.langpack.xpi) = 799921
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pl.langpack.xpi) = f37cd7f58a28991b156efad2bf439df3d584c0724dae3050121893ef4624c1d8
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pl.langpack.xpi) = 871193
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pt-PT.langpack.xpi) = 59d671a4ebed43eaeedd84aa6dad3d92c5bde0fa60d2419df0d16f9b08312650
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.pt-PT.langpack.xpi) = 840381
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ru.langpack.xpi) = 2aed82158ef7feed0beea74e337c91a72f5c6b56e04d33027214f2dcc1bee3e8
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.ru.langpack.xpi) = 903117
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sk.langpack.xpi) = 59e3d10e170484dc36e7db9361ced649fea50ca2ca203ece2dad32cf2923d146
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sk.langpack.xpi) = 864480
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sv-SE.langpack.xpi) = 44b550171164b290bb5af66f34930a9da187d54fb8ea37e7f91026966dc8b149
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.sv-SE.langpack.xpi) = 828261
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.tr.langpack.xpi) = 856ea876142e409caf81423da627f002664054f546df7839663f3c8a56a727ef
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.tr.langpack.xpi) = 813160
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.uk.langpack.xpi) = 6a70dc6b9832960216725889ca341d8d4ae2f3a80723d8b5a48c470c58a9d6fe
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.uk.langpack.xpi) = 875357
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-CN.langpack.xpi) = 2a378781a7a13ef0b8ec3758633ecf3d55f99d5439f8ee2d3a0a6ae4106f2aa3
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-CN.langpack.xpi) = 838609
-SHA256 (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-TW.langpack.xpi) = 4032cd3e4aff64f7c84258da2387857046bcb015ce3d13aed8ae61b2eeee1bbb
-SIZE (xpi/seamonkey-i18n-2.31/seamonkey-2.31.zh-TW.langpack.xpi) = 863793
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.be.langpack.xpi) = fec9ed55542d53940cc8c73c37519acbcbe5451106e495b661e85eda27b040c8
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.be.langpack.xpi) = 841560
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ca.langpack.xpi) = d2f1e695ce860c976fc8239f2315aee37e2a8c3fa482dbd2ec9b3f16dd6daff4
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ca.langpack.xpi) = 832917
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.cs.langpack.xpi) = 19616f12c39cc398b8e27197a81be822b08ee2bad104ec705d2877fa175831f8
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.cs.langpack.xpi) = 830451
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.de.langpack.xpi) = 6588e65232922c57a7cdd53cab38a3d8cd8f26fa6105ae564a3ae231be2d67b8
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.de.langpack.xpi) = 838041
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-GB.langpack.xpi) = f74ef701cb701527d4852591450864bd97ccd6f3b4b6392fedb474c260ab6a84
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-GB.langpack.xpi) = 804019
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-US.langpack.xpi) = 73cdd17bc37fc4346b594ee35f5adcc0e3fcc870a66662e9a67faafa372a40f6
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-US.langpack.xpi) = 803478
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-AR.langpack.xpi) = 2d40bc0f2f6e9a31618c149b7a1c9a69cbb92f5e79e1e90d063a94e9390d1326
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-AR.langpack.xpi) = 852545
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-ES.langpack.xpi) = 2d1e94907a26ffef9b0df13c6d79ef238f5f3da271add0e1503174a1bccc70f1
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-ES.langpack.xpi) = 829553
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fi.langpack.xpi) = 84c3d99167bb99f9dca4eb2c7f9f6c96c5610b0e4cf69a43a5bfa720f4ac4f7f
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fi.langpack.xpi) = 799881
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fr.langpack.xpi) = faa3938631be0862bfc2f851caf7f065a255bb931d4d6bddea0af656c1ac472c
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fr.langpack.xpi) = 810711
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.gl.langpack.xpi) = 2ddb7809dfbde64044c1b46b20ef9e86e82f13a9c1da18d8cd8b5c9cdc32038d
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.gl.langpack.xpi) = 814445
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 7c87922eac25dd9cc8bfcc1f61e458c27197816be50d28948f759e5d5fdfae7e
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 844069
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 1925e77234e5a4423d66b0e988a5ef9aeb067d8193e34a31273741570cb77540
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 742070
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = e44009f8ec92c476f0c04ea6862629db8884f8f143f707ae47418ac9ecbad6dd
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = 884921
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = f2b7a50cb4a8e02e2cdd4badcf5566ca520f95450a0d84d267297e6ca57b7a22
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = 852677
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nb-NO.langpack.xpi) = 0666795e29873639bf1cd127b22491a4c87d3d38894de5d5734a68e5a83356ea
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nb-NO.langpack.xpi) = 822959
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nl.langpack.xpi) = f7a93a63084268f9a593859d72fd207d33e01c87f2f0983ab4c536b529183b74
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nl.langpack.xpi) = 796641
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pl.langpack.xpi) = f6b5ac5a752ba2e3d2b5145f5f05d2d486ccc3fc1c56898ef143b0009a60d3c6
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pl.langpack.xpi) = 868114
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pt-PT.langpack.xpi) = 5bcdb4fa75d548301d7d16ecff4d97c7348f53c98cea6920a9154b3fa5c85611
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pt-PT.langpack.xpi) = 833784
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ru.langpack.xpi) = 039e3c3ba62b2157c7a3da45a6fa1ebbb5276524dbb059f6352cb5d7f0d74368
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ru.langpack.xpi) = 899661
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sk.langpack.xpi) = cb5111034a7561dc7a5928032920cdffe0e7a828c2e3188f37baebfd9619d496
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sk.langpack.xpi) = 857464
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sv-SE.langpack.xpi) = b8d3c4b1d11d21b11a2fde81fa265a1cfc228678f2021f306329f90c8bfd1af1
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sv-SE.langpack.xpi) = 825104
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.tr.langpack.xpi) = 88075220e2f653ca2b318e54d80a2d4f56b3cea041d861892822e63b63c493b8
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.tr.langpack.xpi) = 811614
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.uk.langpack.xpi) = 85772ee30485bd069ff97827d487ba974906369598ef80793ca41c0d59183c46
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.uk.langpack.xpi) = 873317
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-CN.langpack.xpi) = 6948c68c87c41587786f92f728cb0ac9568066f2e4e5e8cd858a09f8aa5c5d31
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-CN.langpack.xpi) = 834251
+SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-TW.langpack.xpi) = 58e96499f4a412741b04ecd3026ebbd2cb50be14ec69d17b6e5373f6b2915b71
+SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-TW.langpack.xpi) = 860363
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 6c835940b990..f852a3dfc7a6 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.31
-PORTREVISION=	1
+DISTVERSION=	2.32
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -33,7 +32,7 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.7.2
-L_VERSION=	3.6
+L_VERSION=	3.7
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
@@ -54,7 +53,7 @@ MOZ_PKGCONFIG_FILES=
 NOT_FOR_ARCHS=	ia64
 
 OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
 
 CHATZILLA_DESC?=Chatzilla IRC module
 COMPOSER_DESC?=	HTML Composer module
@@ -90,8 +89,6 @@ MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
 .if ! ${PORT_OPTIONS:MLDAP}
 MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
 .else
-BROKEN=		XPCOMGlueLoad error for file ${LOCALBASE}/lib/${MOZILLA}/libxul.so: \
-		Cannot open "../../ldap/sdks/c-sdk/ldap/libraries/libldap/libldap60.so"
 MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 .endif
 .if ${PORT_OPTIONS:MENIGMAIL}
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index a0e72c1e1771..5a81f70fec81 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.31.source.tar.bz2) = 9c4dd82f776780b99b70be0b6b944ada218e4356ec8dd059a63d4c260a04ee28
-SIZE (seamonkey-2.31.source.tar.bz2) = 187731254
+SHA256 (seamonkey-2.32.source.tar.bz2) = e174dc5093e49078c33f91b4e8658327957d59bd53ac59e304441d8d5f17ba9b
+SIZE (seamonkey-2.32.source.tar.bz2) = 199700383
 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6
 SIZE (enigmail-1.7.2.tar.gz) = 1420346
diff --git a/www/seamonkey/files/patch-bug1073709 b/www/seamonkey/files/patch-bug1073709
deleted file mode 100644
index 054ed2725747..000000000000
--- a/www/seamonkey/files/patch-bug1073709
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git mfbt/Atomics.h mfbt/Atomics.h
-index 495a9d3..c7f7601 100644
---- mozilla/mfbt/Atomics.h
-+++ mozilla/mfbt/Atomics.h
-@@ -34,10 +34,12 @@
-     * loose typing of the atomic builtins. GCC 4.5 and 4.6 lacks inline
-     * definitions for unspecialized std::atomic and causes linking errors.
-     * Therefore, we require at least 4.7.0 for using libstdc++.
-+    *
-+    * libc++ <atomic> is only functional with clang.
-     */
- #  if MOZ_USING_LIBSTDCXX && MOZ_LIBSTDCXX_VERSION_AT_LEAST(4, 7, 0)
- #    define MOZ_HAVE_CXX11_ATOMICS
--#  elif MOZ_USING_LIBCXX
-+#  elif MOZ_USING_LIBCXX && defined(__clang__)
- #    define MOZ_HAVE_CXX11_ATOMICS
- #  endif
- /*
diff --git a/www/seamonkey/files/patch-bug1112904 b/www/seamonkey/files/patch-bug1112904
new file mode 100644
index 000000000000..96fa3a4a1c74
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1112904
@@ -0,0 +1,161 @@
+diff --git a/c-sdk/config/FreeBSD.mk b/c-sdk/config/FreeBSD.mk
+--- ldap/sdks/c-sdk/config/FreeBSD.mk
++++ ldap/sdks/c-sdk/config/FreeBSD.mk
+@@ -79,8 +79,8 @@ DLL_SUFFIX		= so.1.0
+ endif
+ 
+ DSO_CFLAGS		= -fPIC
+-DSO_LDOPTS		= -Bshareable
++DSO_LDOPTS		= -shared -Wl,-soname,$(notdir $@)
+ 
+-MKSHLIB			= $(LD) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) $(DSO_LDOPTS)
+ 
+ G++INCLUDES		= -I/usr/include/g++
+diff --git a/c-sdk/configure b/c-sdk/configure
+--- ldap/sdks/c-sdk/configure
++++ ldap/sdks/c-sdk/configure
+@@ -4241,8 +4241,10 @@ EOF
+ #define DRAGONFLY 1
+ EOF
+ 
++    LD='$(CC)'
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-shared'
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ 	;;
+ 
+ *-freebsd*)
+@@ -4261,6 +4263,7 @@ EOF
+ #define HAVE_BSD_FLOCK 1
+ EOF
+ 
++    LD='$(CC)'
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -4268,8 +4271,9 @@ EOF
+     else
+         DLL_SUFFIX=so.1.0
+     fi
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS=-Bshareable
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+     ;;
+ 
+ *-hpux*)
+@@ -6512,8 +6516,15 @@ echo "configure:6510: checking whether $
+    if test $? -eq 0; then
+ 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 	    ac_cv_have_dash_pthread=yes
+-	    CFLAGS="$CFLAGS -pthread"
+-	    CXXFLAGS="$CXXFLAGS -pthread"
++		case "$target_os" in
++	    dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++            ;;
++	    *)
++            CFLAGS="$CFLAGS -pthread"
++            CXXFLAGS="$CXXFLAGS -pthread"
++            ;;
++        esac
+ 	fi
+     fi
+     rm -f conftest*
+@@ -6542,7 +6553,22 @@ echo "configure:6526: checking whether $
+             _PTHREAD_LDFLAGS=
+         fi
+ 	    ;;
+-    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++    *-dragonfly*|*-freebsd*)
++	    cat >> confdefs.h <<\EOF
++#define _REENTRANT 1
++EOF
++
++	    cat >> confdefs.h <<\EOF
++#define _THREAD_SAFE 1
++EOF
++
++	    	    if test "$ac_cv_have_dash_pthread" = "yes"; then
++	        _PTHREAD_LDFLAGS="-pthread"
++	    else
++	        _PTHREAD_LDFLAGS="-lc_r"
++	    fi
++	    ;;
++    *-openbsd*|*-bsdi*|*-netbsd*)
+ 	    cat >> confdefs.h <<\EOF
+ #define _THREAD_SAFE 1
+ EOF
+diff --git a/c-sdk/configure.in b/c-sdk/configure.in
+--- ldap/sdks/c-sdk/configure.in
++++ ldap/sdks/c-sdk/configure.in
+@@ -1225,8 +1225,10 @@ tools are selected during the Xcode/Deve
+     fi
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(DRAGONFLY)
++    LD='$(CC)'
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-shared'
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+ 	;;
+ 
+ *-freebsd*)
+@@ -1236,6 +1238,7 @@ tools are selected during the Xcode/Deve
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(FREEBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    LD='$(CC)'
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+@@ -1243,8 +1246,9 @@ tools are selected during the Xcode/Deve
+     else
+         DLL_SUFFIX=so.1.0
+     fi
++    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS=-Bshareable
++    DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
+     ;;
+ 
+ *-hpux*)
+@@ -2329,8 +2333,15 @@ if test -n "$USE_PTHREADS"; then
+    if test $? -eq 0; then
+ 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 	    ac_cv_have_dash_pthread=yes
+-	    CFLAGS="$CFLAGS -pthread"
+-	    CXXFLAGS="$CXXFLAGS -pthread"
++		case "$target_os" in
++	    dragonfly*|freebsd*)
++# Freebsd doesn't use -pthread for compiles, it uses them for linking
++            ;;
++	    *)
++            CFLAGS="$CFLAGS -pthread"
++            CXXFLAGS="$CXXFLAGS -pthread"
++            ;;
++        esac
+ 	fi
+     fi
+     rm -f conftest*
+@@ -2361,7 +2372,17 @@ if test -n "$USE_PTHREADS"; then
+             _PTHREAD_LDFLAGS=
+         fi
+ 	    ;;
+-    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++    *-dragonfly*|*-freebsd*)
++	    AC_DEFINE(_REENTRANT)
++	    AC_DEFINE(_THREAD_SAFE)
++	    dnl -pthread links in -lc_r, so don't specify it explicitly.
++	    if test "$ac_cv_have_dash_pthread" = "yes"; then
++	        _PTHREAD_LDFLAGS="-pthread"
++	    else
++	        _PTHREAD_LDFLAGS="-lc_r"
++	    fi
++	    ;;
++    *-openbsd*|*-bsdi*|*-netbsd*)
+ 	    AC_DEFINE(_THREAD_SAFE)
+ 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
+ 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index 63f7b76052c3..000000000000
--- a/www/seamonkey/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/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
deleted file mode 100644
index 5495298ae3d1..000000000000
--- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ /dev/null
@@ -1,15 +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-01 10:18:43.000000000 +0100
-@@ -147,6 +147,12 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
deleted file mode 100644
index 98aa2319501a..000000000000
--- a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig	2009-09-10 17:36:39.000000000 +0200
-+++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in	2009-09-10 17:37:28.000000000 +0200
-@@ -180,6 +180,10 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+CUSTOM_LIBS=1
-+endif
-+
- ifndef CUSTOM_LIBS
- EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME)
- EXTRA_LIBS += $(NSSLINK) 
diff --git a/www/seamonkey/files/patch-config-baseconfig.mk b/www/seamonkey/files/patch-mozilla-config-baseconfig.mk
index fedf7c5d8a8e..21c5eb9a1a20 100644
--- a/www/seamonkey/files/patch-config-baseconfig.mk
+++ b/www/seamonkey/files/patch-mozilla-config-baseconfig.mk
@@ -1,5 +1,5 @@
---- config/baseconfig.mk~
-+++ config/baseconfig.mk
+--- mozilla/config/baseconfig.mk~
++++ mozilla/config/baseconfig.mk
 @@ -1,7 +1,7 @@
 -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -9,6 +9,6 @@
 +idldir = $(datadir)/idl/%%MOZILLA%%
 +installdir = $(libdir)/%%MOZILLA%%
 +sdkdir = $(libdir)/%%MOZILLA%%
- MOZILLA_SRCDIR = $(topsrcdir)/mozilla
- MOZDEPTH = $(DEPTH)/mozilla
- DIST = $(MOZDEPTH)/dist
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
diff --git a/www/seamonkey/files/patch-system-openh264 b/www/seamonkey/files/patch-system-openh264
index fd8f8332c51a..c75b8bd83125 100644
--- a/www/seamonkey/files/patch-system-openh264
+++ b/www/seamonkey/files/patch-system-openh264
@@ -1,15 +1,15 @@
 # Revert bug 1045209 to allow using absolute path
 
 diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp
-index 4165a75..81914d5 100644
+index 1dde3ac..12c88cf 100644
 --- mozilla/content/media/gmp/GMPChild.cpp
 +++ mozilla/content/media/gmp/GMPChild.cpp
-@@ -66,19 +66,11 @@
+@@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa
    }
  #endif
  
 -  nsCOMPtr<nsIFile> parent;
--  rv = aLibFile->GetParent(getter_AddRefs(parent));
+-  rv = aFileBase->GetParent(getter_AddRefs(parent));
 -  if (NS_FAILED(rv)) {
 -    return false;
 -  }
@@ -18,15 +18,18 @@ index 4165a75..81914d5 100644
 -  rv = parent->GetLeafName(parentLeafName);
 -  if (NS_FAILED(rv)) {
 +  nsAutoString leafName;
-+  if (NS_FAILED(aLibFile->GetLeafName(leafName))) {
++  if (NS_FAILED(aFileBase->GetLeafName(leafName))) {
      return false;
    }
--
--  nsAutoString baseName(Substring(parentLeafName, 4, parentLeafName.Length() - 1));
-+  nsAutoString baseName(Substring(leafName, 4, leafName.Length() - 1));
  
- #if defined(XP_MACOSX)
-   nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".dylib");
+-  aBaseName = Substring(parentLeafName,
++  aBaseName = Substring(leafName,
+                         4,
+-                        parentLeafName.Length() - 1);
++                        leafName.Length() - 1);
+   return true;
+ }
+ 
 diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp
 index aa60acf..90878ca 100644
 --- mozilla/content/media/gmp/GMPParent.cpp
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
index 33c317273bd0..b11c6790c393 100644
--- a/www/seamonkey/files/patch-z-bug517422
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -494,10 +494,10 @@ index d42137a..695e75a8 100644
  if CONFIG['MOZ_NATIVE_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
-diff --git xpcom/build/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp
+diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp
 index 2cf281e..6d7af0e 100644
---- mozilla/xpcom/build/nsXPComInit.cpp
-+++ mozilla/xpcom/build/nsXPComInit.cpp
+--- mozilla/xpcom/build/XPCOMInit.cpp
++++ mozilla/xpcom/build/XPCOMInit.cpp
 @@ -138,7 +138,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**);
  #include "mozilla/VisualEventTracer.h"
  #endif