- update thunderbird to 24.0.1

- update enigmail to 1.6
- don't force gcc for i386 builds [1]

Submitted by:	mi [1]

5 files changed, 8 insertions, 82 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 505e12e4be55..dfb34c12c525 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	24.0
-PORTREVISION=	1
+DISTVERSION=	24.0.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
@@ -21,7 +20,7 @@ BUILD_DEPENDS=	nspr>=4.10:${PORTSDIR}/devel/nspr \
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
-EM_VERSION=	1.5.2
+EM_VERSION=	1.6
 L_VERSION=	2.6b3
 
 SSP_UNSAFE=	yes
@@ -74,11 +73,6 @@ MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 
-# libprldap60.so: Undefined symbol "PR_GetCurrentThread"
-.if ${ARCH} == i386
-USE_GCC?=	yes
-.endif
-
 .if ${PORT_OPTIONS:MENIGMAIL}
 MASTER_SITES+=	https://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
@@ -91,8 +85,6 @@ 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
-EXTRA_PATCHES+=	${FILESDIR}/extra-bug886095
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTNING}
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index d8baa121cfe5..f07d50e9d45c 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-24.0.source.tar.bz2) = 60a1abde987a61c8096e431f13df2ba2cf188a22fdbf1712aaec795b302a5ff5
-SIZE (thunderbird-24.0.source.tar.bz2) = 140334722
-SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26
-SIZE (enigmail-1.5.2.tar.gz) = 1211395
+SHA256 (thunderbird-24.0.1.source.tar.bz2) = 171086f079ea6a254780cf8348bea684c19c07f6b9f855b9e2fa18ad09e715cb
+SIZE (thunderbird-24.0.1.source.tar.bz2) = 140287258
+SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d
+SIZE (enigmail-1.6.tar.gz) = 1231111
diff --git a/mail/thunderbird/files/extra-bug886095 b/mail/thunderbird/files/extra-bug886095
deleted file mode 100644
index d72ace7c04e6..000000000000
--- a/mail/thunderbird/files/extra-bug886095
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git genxpi genxpi
-index a50e7ab..6083c55 100755
---- mailnews/extensions/enigmail/genxpi~
-+++ mailnews/extensions/enigmail/genxpi
-@@ -74,16 +74,17 @@ if [ ${platform} = OS2_x86-gcc3 ]; then
- else
-   enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
- fi
- 
- subprocessDll=${libPrefix}subprocess${dllSuffix}
- spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix}
- 
- # Prepare chrome.manifest
-+cp  ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save
- cat  ${srcDir}/package/chrome.manifest | \
- sed  's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \
- > ${targetDir}/chrome.manifest
- 
- # Prepare languages other than en-US
- 
- if [ -s ${srcDir}/lang/current-languages.txt ]; then
-   localeJar=chrome/${xpiModule}.jar
-@@ -147,8 +148,9 @@ zip ${xpiFile} \
-     ${localeJar} \
-     components/enigmime.xpt \
-     ${enigDllFile} \
-     ${spDllFile} \
-     chrome.manifest \
-     install.rdf
- 
- rm install.rdf chrome.manifest
-+mv chrome.manifest.save chrome.manifest
diff --git a/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile b/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile
deleted file mode 100644
index 55071518aaf1..000000000000
--- a/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- mailnews/extensions/enigmail/ipc/src/Makefile.enig~
-+++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
-@@ -19,13 +19,13 @@ 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
- 
-@@ -36,14 +36,14 @@ 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
diff --git a/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
index 4b6a5bcca21a..d22a1c412cac 100644
--- a/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
@@ -1,11 +1,12 @@
 --- 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,11 @@
+@@ -147,6 +147,12 @@
  CUSTOM_LIBS=1
  endif
  
 +ifeq ($(OS_ARCH), FreeBSD)
 +EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
++EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
 +CUSTOM_LIBS=1
 +endif
 +