- update firefox to 19.0

- update firefox-esr, thunderbird, linux-firefox, linux-thunderbird to 17.0.3
- update linux-seamonkey to 2.16
- update nspr to 4.9.5
- update nss to 3.14.3
- add DuckDuckGo search plugin to firefox [1]
- mark kompozer deprecated
- clang fixes for www/libxul19 [2]

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

6 files changed, 140 insertions, 34 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index f228adcd0be8..332d17ae06ba 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,29 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	17.0.2
+DISTVERSION=	17.0.3
 CATEGORIES=	mail ipv6
 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}
+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.9:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.9.2:${PORTSDIR}/devel/nspr \
 		nss>=3.13.6_1:${PORTSDIR}/security/nss \
-		sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \
+		sqlite3>=3.7.13:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		unzip:${PORTSDIR}/archivers/unzip
 
-EM_VERSION=	1.4.6
+EM_VERSION=	1.5.1
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 USE_GECKO=	gecko
-CONFLICTS=	thunderbird-10.*
+CONFLICTS=	thunderbird-2[0-9].* thunderbird-1[1-689].* thunderbird-10.*
 USE_MOZILLA=	# empty
 
 MAKE_JOBS_SAFE=	yes
@@ -57,7 +57,7 @@ OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-release
+WRKSRC=		${WRKDIR}/comm-esr17
 MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
@@ -85,6 +85,7 @@ 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
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTNING}
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 98f499ca9d26..e78a220a525d 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0.2.source.tar.bz2) = 081b53161750a31f9b43d4ba4ccb496c69fdfaa3430f0ce0798cd5fa3036764c
-SIZE (thunderbird-17.0.2.source.tar.bz2) = 113387318
-SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036
-SIZE (enigmail-1.4.6.tar.gz) = 1262280
+SHA256 (thunderbird-17.0.3esr.source.tar.bz2) = 96669acfaeaf3c591fbfe1ebe2ea41635e29f25074877148fb1fc7112df0c91c
+SIZE (thunderbird-17.0.3esr.source.tar.bz2) = 113057252
+SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
+SIZE (enigmail-1.5.1.tar.gz) = 1213954
diff --git a/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile b/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile
new file mode 100644
index 000000000000..d8b5128d02b4
--- /dev/null
+++ b/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile
@@ -0,0 +1,90 @@
+--- mailnews/extensions/enigmail/ipc/src/Makefile.enig~
++++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
+@@ -19,26 +19,26 @@ endif
+ 
+ ifeq ($(OS_ARCH),NetBSD)
+ ifeq ($(DLL_SUFFIX),.so.1.0)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ 
+ ifeq ($(OS_ARCH),HP-UX)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),OSF1)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+-LDFLAGS += -B symbolic
++LDFLAGS += -shared -B symbolic
+ 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
+ 
+ ifeq ($(OS_ARCH),NetBSD)
+ ifeq ($(DLL_SUFFIX),.so.1.0)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ 
+ ifeq ($(OS_ARCH),HP-UX)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),OSF1)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+-LDFLAGS += -B symbolic
++LDFLAGS += -shared -B symbolic
+ 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/mail/thunderbird/files/patch-bug781457 b/mail/thunderbird/files/patch-bug781457
deleted file mode 100644
index 1a883966b942..000000000000
--- a/mail/thunderbird/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/files/patch-bug828003 b/mail/thunderbird/files/patch-bug828003
new file mode 100644
index 000000000000..9313b9c77fb0
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug828003
@@ -0,0 +1,36 @@
+--- mozilla/gfx/qcms/qcmstypes.h
++++ mozilla/gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+ 
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* 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)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif defined(__OS2__)
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef PRUptrdiff uintptr_t;
+-#endif
+ #endif
+ 
+ #else // MOZ_QCMS
diff --git a/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h b/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h
deleted file mode 100644
index 7a23c9dd3820..000000000000
--- a/mail/thunderbird/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