Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Sep 2013 22:40:58 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327587 - in head: Mk mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files security/vuxml www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-i1...
Message-ID:  <201309182240.r8IMewpL007735@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Sep 18 22:40:57 2013
New Revision: 327587
URL: http://svnweb.freebsd.org/changeset/ports/327587

Log:
  - update firefox, thunderbird and libxul to 24.0
  - update seamonkey to 2.21
  - update firefox-esr to 17.0.9
  - enable GSTREAMER by default for html5 with h264/aac/mp3
  - WEBRTC is now always built
  - add PROFILE and TESTS options
  
  Security:		7dfed67b-20aa-11e3-b8d8-0025905a4771
  In collaboration with:	Jan Beich <jbeich@tormail.org>

Added:
  head/mail/thunderbird/files/extra-bug886095   (contents, props changed)
  head/mail/thunderbird/files/extra-patch-security_manager_Makefile.in   (contents, props changed)
  head/mail/thunderbird/files/patch-bug803480   (contents, props changed)
  head/mail/thunderbird/files/patch-bug807492   (contents, props changed)
  head/mail/thunderbird/files/patch-bug826985   (contents, props changed)
  head/mail/thunderbird/files/patch-bug851992   (contents, props changed)
  head/mail/thunderbird/files/patch-bug876156   (contents, props changed)
  head/mail/thunderbird/files/patch-bug878791   (contents, props changed)
  head/mail/thunderbird/files/patch-bug886181   (contents, props changed)
  head/mail/thunderbird/files/patch-bug889699   (contents, props changed)
  head/mail/thunderbird/files/patch-bug893397   (contents, props changed)
  head/mail/thunderbird/files/patch-bug910875   (contents, props changed)
  head/mail/thunderbird/files/patch-bug916216   (contents, props changed)
  head/mail/thunderbird/files/patch-bug916589   (contents, props changed)
  head/mail/thunderbird/files/patch-ldap-xpcom-src-Makefile.in   (contents, props changed)
  head/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp   (contents, props changed)
  head/mail/thunderbird/files/patch-no-videoio.h   (contents, props changed)
  head/www/firefox/files/patch-bug876156   (contents, props changed)
  head/www/firefox/files/patch-bug886181   (contents, props changed)
  head/www/firefox/files/patch-bug889699   (contents, props changed)
  head/www/firefox/files/patch-bug910875   (contents, props changed)
  head/www/firefox/files/patch-bug916216   (contents, props changed)
  head/www/firefox/files/patch-bug916589   (contents, props changed)
  head/www/firefox/files/patch-no-videoio.h   (contents, props changed)
  head/www/libxul/files/patch-bug803480   (contents, props changed)
  head/www/libxul/files/patch-bug807492   (contents, props changed)
  head/www/libxul/files/patch-bug826985   (contents, props changed)
  head/www/libxul/files/patch-bug851992   (contents, props changed)
  head/www/libxul/files/patch-bug876156   (contents, props changed)
  head/www/libxul/files/patch-bug878791   (contents, props changed)
  head/www/libxul/files/patch-bug886181   (contents, props changed)
  head/www/libxul/files/patch-bug889699   (contents, props changed)
  head/www/libxul/files/patch-bug893397   (contents, props changed)
  head/www/libxul/files/patch-bug910875   (contents, props changed)
  head/www/libxul/files/patch-bug916216   (contents, props changed)
  head/www/libxul/files/patch-bug916589   (contents, props changed)
  head/www/libxul/files/patch-duckduckgo   (contents, props changed)
  head/www/libxul/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp   (contents, props changed)
  head/www/libxul/files/patch-no-videoio.h   (contents, props changed)
  head/www/libxul/files/pkg-deinstall.in   (contents, props changed)
  head/www/libxul/files/pkg-install.in   (contents, props changed)
Deleted:
  head/mail/thunderbird/files/patch-alsapulse
  head/mail/thunderbird/files/patch-bug685258
  head/mail/thunderbird/files/patch-bug722975
  head/mail/thunderbird/files/patch-bug732340
  head/mail/thunderbird/files/patch-bug753046
  head/mail/thunderbird/files/patch-bug778078
  head/mail/thunderbird/files/patch-bug784631
  head/mail/thunderbird/files/patch-bug786995
  head/mail/thunderbird/files/patch-bug787904
  head/mail/thunderbird/files/patch-bug788039
  head/mail/thunderbird/files/patch-bug788108
  head/mail/thunderbird/files/patch-bug788955
  head/mail/thunderbird/files/patch-bug789436
  head/mail/thunderbird/files/patch-bug789656
  head/mail/thunderbird/files/patch-bug789693
  head/mail/thunderbird/files/patch-bug791366
  head/mail/thunderbird/files/patch-bug799441
  head/mail/thunderbird/files/patch-bug806139
  head/mail/thunderbird/files/patch-bug828003
  head/mail/thunderbird/files/patch-clang33
  head/mail/thunderbird/files/patch-configure.in
  head/mail/thunderbird/files/patch-mozilla-config-baseconfig.mk
  head/mail/thunderbird/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp
  head/mail/thunderbird/files/patch-mozilla-media-libsydneyaudio-src-sydney_audio_oss.c
  head/mail/thunderbird/files/patch-mozilla-toolkit-xre-Makefile.in
  head/mail/thunderbird/files/patch-z-bug762445
  head/www/firefox/files/patch-bug722975
  head/www/firefox/files/patch-bug844818
  head/www/firefox/files/patch-bug862759
  head/www/firefox/files/patch-js-src-methodjit-MethodJIT.cpp
  head/www/firefox/files/patch-media-webrtc-trunk-testing-gtest-include-gtest-internal-gtest-port.h
  head/www/libxul/files/patch-alsapulse
  head/www/libxul/files/patch-bug685258
  head/www/libxul/files/patch-bug713802
  head/www/libxul/files/patch-bug722975
  head/www/libxul/files/patch-bug732340
  head/www/libxul/files/patch-bug753046
  head/www/libxul/files/patch-bug778078
  head/www/libxul/files/patch-bug784631
  head/www/libxul/files/patch-bug786995
  head/www/libxul/files/patch-bug787904
  head/www/libxul/files/patch-bug788039
  head/www/libxul/files/patch-bug788108
  head/www/libxul/files/patch-bug788955
  head/www/libxul/files/patch-bug789436
  head/www/libxul/files/patch-bug789656
  head/www/libxul/files/patch-bug789693
  head/www/libxul/files/patch-bug791366
  head/www/libxul/files/patch-bug799441
  head/www/libxul/files/patch-bug806139
  head/www/libxul/files/patch-bug828003
  head/www/libxul/files/patch-clang33
  head/www/libxul/files/patch-js-src-methodjit-MethodJIT.cpp
  head/www/libxul/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c
  head/www/libxul/files/patch-z-bug762445
Modified:
  head/Mk/bsd.gecko.mk
  head/mail/linux-thunderbird/Makefile
  head/mail/linux-thunderbird/distinfo
  head/mail/linux-thunderbird/pkg-plist
  head/mail/thunderbird-i18n/Makefile
  head/mail/thunderbird-i18n/distinfo
  head/mail/thunderbird/Makefile
  head/mail/thunderbird/distinfo
  head/mail/thunderbird/files/extra-bug780531
  head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile
  head/mail/thunderbird/files/moz_pis_S50cleanhome   (contents, props changed)
  head/mail/thunderbird/files/patch-bug783463
  head/mail/thunderbird/files/patch-bug791305
  head/mail/thunderbird/files/patch-bug810716
  head/mail/thunderbird/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
  head/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in   (contents, props changed)
  head/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in   (contents, props changed)
  head/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in   (contents, props changed)
  head/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc   (contents, props changed)
  head/security/vuxml/vuln.xml
  head/www/firefox-esr-i18n/Makefile
  head/www/firefox-esr-i18n/distinfo
  head/www/firefox-esr/Makefile
  head/www/firefox-esr/distinfo
  head/www/firefox-i18n/Makefile
  head/www/firefox-i18n/distinfo
  head/www/firefox/Makefile
  head/www/firefox/Makefile.options
  head/www/firefox/distinfo
  head/www/firefox/files/patch-bug783463
  head/www/firefox/files/patch-bug803480
  head/www/firefox/files/patch-bug807492
  head/www/firefox/files/patch-bug893397
  head/www/firefox/files/patch-build-pgo-profileserver.py
  head/www/firefox/files/patch-duckduckgo
  head/www/libxul/Makefile
  head/www/libxul/distinfo
  head/www/libxul/files/extra-bug780531
  head/www/libxul/files/patch-bug783463
  head/www/libxul/files/patch-bug791305
  head/www/libxul/files/patch-build-pgo-profileserver.py   (contents, props changed)
  head/www/libxul/files/patch-ipc-chromium-Makefile.in   (contents, props changed)
  head/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc   (contents, props changed)
  head/www/linux-firefox/Makefile
  head/www/linux-firefox/distinfo
  head/www/linux-seamonkey/Makefile
  head/www/linux-seamonkey/Makefile.common
  head/www/linux-seamonkey/distinfo

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/Mk/bsd.gecko.mk	Wed Sep 18 22:40:57 2013	(r327587)
@@ -77,7 +77,7 @@ Gecko_Pre_Include=			bsd.gecko.mk
 
 _GECKO_ALL=	libxul
 
-libxul_PLIST=		libxul>=17
+libxul_PLIST=		libxul>=24
 
 .for gecko in ${_GECKO_ALL}
 ${gecko}_PORTSDIR?=	www
@@ -176,7 +176,7 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #                         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 17+ 23+ 17 23+
+#                         Available values: yes 17+ 24+ 17 24+
 #                         NOTE:
 #                         default value 17 is used in case of USE_FIREFOX=yes
 #
@@ -187,9 +187,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 20+ 20
+#                         Available values: yes 21+ 21
 #                         NOTE:
-#                         default value 20 is used in case of USE_SEAMONKEY=yes
+#                         default value 21 is used in case of USE_SEAMONKEY=yes
 #
 # USE_SEAMONKEY_BUILD     Add buildtime dependency on SeaMonkey.
 #                         Available values: see USE_SEAMONKEY
@@ -198,9 +198,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 17+ 17
+#                         Available values: yes 24+ 24
 #                         NOTE:
-#                         default value 17 is used in case of USE_THUNDERBIRD=yes
+#                         default value 24 is used in case of USE_THUNDERBIRD=yes
 #
 # USE_THUNDERBIRD_BUILD   Add buildtime dependency on Thunderbird.
 #                         Available values: see USE_THUNDERBIRD
@@ -218,11 +218,11 @@ _FIREFOX_BUILD_DEPENDS=		yes
 .endif
 
 _FIREFOX_DEFAULT_VERSION=	17
-_FIREFOX_VERSIONS=			17 23
-_FIREFOX_RANGE_VERSIONS=	17+ 23+
+_FIREFOX_VERSIONS=			17 24
+_FIREFOX_RANGE_VERSIONS=	17+ 24+
 
 # For specifying [17, ..]+
-_FIREFOX_23P=	23 ${_FIREFOX_17P}
+_FIREFOX_24P=	24 ${_FIREFOX_17P}
 _FIREFOX_17P=	17
 
 # Set the default Firefox version and check if USE_FIREFOX=yes was given
@@ -269,7 +269,7 @@ IGNORE=			cannot install: unknown Firefo
 
 # Dependence lines for different Firefox versions
 17_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-23_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+24_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 
 # Add dependencies
 .if defined(USE_FIREFOX)
@@ -291,12 +291,12 @@ USE_SEAMONKEY:=				${USE_SEAMONKEY_BUILD
 _SEAMONKEY_BUILD_DEPENDS=	yes
 .endif
 
-_SEAMONKEY_DEFAULT_VERSION=	20
-_SEAMONKEY_VERSIONS=		20
-_SEAMONKEY_RANGE_VERSIONS=	20+
+_SEAMONKEY_DEFAULT_VERSION=	21
+_SEAMONKEY_VERSIONS=		21
+_SEAMONKEY_RANGE_VERSIONS=	21+
 
-# For specifying [20, ..]+
-_SEAMONKEY_20P=	20
+# For specifying [21, ..]+
+_SEAMONKEY_21P=	21
 
 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
 .if ${USE_SEAMONKEY} == "yes"
@@ -338,7 +338,7 @@ IGNORE=			cannot install: unknown SeaMon
 .endif
 
 # Dependence lines for different SeaMonkey versions
-20_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+21_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
 
 # Add dependencies
 .if defined(USE_SEAMONKEY)
@@ -360,12 +360,12 @@ USE_THUNDERBIRD:=			${USE_THUNDERBIRD_BU
 _THUNDERBIRD_BUILD_DEPENDS=		yes
 .endif
 
-_THUNDERBIRD_DEFAULT_VERSION=	17
-_THUNDERBIRD_VERSIONS=			17
-_THUNDERBIRD_RANGE_VERSIONS=	17+
+_THUNDERBIRD_DEFAULT_VERSION=	24
+_THUNDERBIRD_VERSIONS=			24
+_THUNDERBIRD_RANGE_VERSIONS=	24+
 
-# For specifying [17, ..]+
-_THUNDERBIRD_17P=	17
+# For specifying [24, ..]+
+_THUNDERBIRD_24P=	24
 
 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
 .if ${USE_THUNDERBIRD} == "yes"
@@ -409,7 +409,7 @@ IGNORE=			cannot install: unknown Thunde
 .endif
 
 # Dependence lines for different Thunderbird versions
-17_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+24_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
 
 # Add dependencies
 .if defined(USE_THUNDERBIRD)
@@ -502,7 +502,7 @@ MOZILLA_BIN?=	${PORTNAME}-bin
 MOZILLA_EXEC_NAME?=${MOZILLA}
 MOZ_RPATH?=	${MOZILLA}
 USE_GNOME+=	libidl desktopfileutils
-USES+=	iconv perl5
+USES+=		gmake iconv perl5 pkgconfig
 USE_PERL5=	build
 USE_XORG=	printproto sm xt xi xext x11 xinerama \
 		ice xproto
@@ -598,7 +598,7 @@ _ALL_DEPENDS+=	icu
 .endif
 
 icu_LIB_DEPENDS=		icui18n:${PORTSDIR}/devel/icu
-icu_MOZ_OPTIONS=		--enable-intl-api --with-system-icu
+icu_MOZ_OPTIONS=		--with-system-icu --with-intl-api --enable-intl-api
 
 # XXX: depends on pkgng package flavor support
 #jpeg_LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/libjpeg-turbo
@@ -649,7 +649,7 @@ EXTRACT_AFTER_ARGS+=	${${dep}_EXTRACT_AF
 # Standard options
 MOZ_CHROME?=	omni
 MOZ_TOOLKIT?=	cairo-gtk2
-MOZ_OPTIONS+=	--disable-tests 	\
+MOZ_OPTIONS+=	\
 		--enable-chrome-format=${MOZ_CHROME} \
 		--enable-default-toolkit=${MOZ_TOOLKIT} \
 		--with-pthreads
@@ -677,6 +677,9 @@ MOZ_OPTIONS+=	--with-system-zlib		\
 
 .if ${MOZILLA_VER:R:R} < 25 && !exists(${FILESDIR}/patch-bug803480)
 MOZ_OPTIONS+=	--disable-necko-wifi
+.else
+# XXX stolen from www/chromium
+MOZ_EXPORT+=	MOZ_GOOGLE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
@@ -763,18 +766,10 @@ USE_DISPLAY=yes
 .undef GNU_CONFIGURE
 MAKEFILE=	${WRKSRC}/client.mk
 ALL_TARGET=	profiledbuild
+. if ${MOZILLA_VER:R:R} < 22 && ! ${MOZILLA:Mseamonkey*}
 MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
 		@MOZ_OBJDIR@/_profile/pgo/profileserver.py"
-.endif
-
-.if ${PORT_OPTIONS:MWEBRTC}
-BUILD_DEPENDS+=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS+=	v4l2:${PORTSDIR}/multimedia/libv4l
-. if ${PORT_OPTIONS:MOSS}
-IGNORE=		WEBRTC works only with ALSA and PULSEAUDIO audio backends
 . endif
-.else
-MOZ_OPTIONS+=	--disable-webrtc
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
@@ -791,16 +786,10 @@ LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/
 MOZ_OPTIONS+=	--enable-pulseaudio
 .endif
 
-.if !defined(STRIP) || ${STRIP} == ""
-MOZ_OPTIONS+=	--disable-strip --disable-install-strip
-.else
-MOZ_OPTIONS+=	--enable-strip --enable-install-strip
-.endif
-
 .if ${PORT_OPTIONS:MDEBUG}
-MOZ_OPTIONS+=	--enable-debug
+MOZ_OPTIONS+=	--enable-debug --disable-release
 .else
-MOZ_OPTIONS+=	--disable-debug
+MOZ_OPTIONS+=	--disable-debug --enable-release
 .endif
 
 .if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG}
@@ -809,6 +798,25 @@ MOZ_OPTIONS+=	--enable-logging
 MOZ_OPTIONS+=	--disable-logging
 .endif
 
+.if ${PORT_OPTIONS:MPROFILE}
+MOZ_OPTIONS+=	--enable-profiling
+STRIP=
+.else
+MOZ_OPTIONS+=	--disable-profiling
+.endif
+
+.if ${PORT_OPTIONS:MTEST}
+MOZ_OPTIONS+=	--enable-tests
+.else
+MOZ_OPTIONS+=	--disable-tests
+.endif
+
+.if !defined(STRIP) || ${STRIP} == ""
+MOZ_OPTIONS+=	--disable-strip --disable-install-strip
+.else
+MOZ_OPTIONS+=	--enable-strip --enable-install-strip
+.endif
+
 MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
 		-e 's|@CFLAGS@|${CFLAGS}|g'		\
 		-e 's|@LDFLAGS@|${LDFLAGS}|g'		\

Modified: head/mail/linux-thunderbird/Makefile
==============================================================================
--- head/mail/linux-thunderbird/Makefile	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/linux-thunderbird/Makefile	Wed Sep 18 22:40:57 2013	(r327587)
@@ -2,15 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-PORTVERSION=	17.0.8
+DISTVERSION=	24.0
 CATEGORIES=	mail
-DISTNAME=	${PORTNAME}-${DISTVERSION}esr
-MASTER_SITES=   MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
+DISTNAME=	${PORTNAME}-${DISTVERSION}
+MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 USE_BZIP2=	yes
+REPLACE_GRE=	yes
 
 USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
 

Modified: head/mail/linux-thunderbird/distinfo
==============================================================================
--- head/mail/linux-thunderbird/distinfo	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/linux-thunderbird/distinfo	Wed Sep 18 22:40:57 2013	(r327587)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-17.0.8esr.tar.bz2) = 50a79b52784c8f7611c5ca491a5668f712485483494a7b3e18030a0cc89eb9bb
-SIZE (thunderbird-17.0.8esr.tar.bz2) = 21488005
+SHA256 (thunderbird-24.0.tar.bz2) = f642a6978cf0c5d1c54b97f86c11e79c8ae2d0a3ee38cff296320a9a5c8911a0
+SIZE (thunderbird-24.0.tar.bz2) = 28964786

Modified: head/mail/linux-thunderbird/pkg-plist
==============================================================================
--- head/mail/linux-thunderbird/pkg-plist	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/linux-thunderbird/pkg-plist	Wed Sep 18 22:40:57 2013	(r327587)
@@ -10,18 +10,17 @@ lib/%%APP_NAME%%/chrome/icons/default/de
 lib/%%APP_NAME%%/chrome/icons/default/default256.png
 lib/%%APP_NAME%%/chrome/icons/default/default32.png
 lib/%%APP_NAME%%/chrome/icons/default/default48.png
-lib/%%APP_NAME%%/components/binary.manifest
+lib/%%APP_NAME%%/components/components.manifest
 lib/%%APP_NAME%%/components/libdbusservice.so
 lib/%%APP_NAME%%/components/libmozgnome.so
 lib/%%APP_NAME%%/crashreporter
 lib/%%APP_NAME%%/crashreporter.ini
 lib/%%APP_NAME%%/defaults/messenger/mailViews.dat
+lib/%%APP_NAME%%/defaults/pref/browser-prefs.js
 lib/%%APP_NAME%%/defaults/pref/channel-prefs.js
 lib/%%APP_NAME%%/dependentlibs.list
 lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.dic
-lib/%%APP_NAME%%/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
-lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
@@ -52,7 +51,6 @@ lib/%%APP_NAME%%/libsmime3.so
 lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so
 lib/%%APP_NAME%%/libssl3.so
-lib/%%APP_NAME%%/libxpcom.so
 lib/%%APP_NAME%%/libxul.so
 lib/%%APP_NAME%%/mozilla-xremote-client
 lib/%%APP_NAME%%/omni.ja
@@ -85,8 +83,6 @@ lib/%%APP_NAME%%/updater.ini
 @dirrm lib/%%APP_NAME%%/defaults/pref
 @dirrm lib/%%APP_NAME%%/defaults
 @dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/distribution/extensions
-@dirrm lib/%%APP_NAME%%/distribution
 @dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/icons

Modified: head/mail/thunderbird-i18n/Makefile
==============================================================================
--- head/mail/thunderbird-i18n/Makefile	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird-i18n/Makefile	Wed Sep 18 22:40:57 2013	(r327587)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	17.0.8
+PORTVERSION=	24.0
 CATEGORIES=	mail
-MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
+MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${THUNDERBIRD_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}

Modified: head/mail/thunderbird-i18n/distinfo
==============================================================================
--- head/mail/thunderbird-i18n/distinfo	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird-i18n/distinfo	Wed Sep 18 22:40:57 2013	(r327587)
@@ -1,84 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-17.0.8/ar.xpi) = 06aa4989dafac30777a9f1733372038bf27ea6ebe2689bbfb1f32ee84bbce570
-SIZE (xpi/thunderbird-i18n-17.0.8/ar.xpi) = 445976
-SHA256 (xpi/thunderbird-i18n-17.0.8/br.xpi) = 7cec403004e5dfa547452aa3885d6a30711eebfdbeb708897e3be58eb95f038a
-SIZE (xpi/thunderbird-i18n-17.0.8/br.xpi) = 417071
-SHA256 (xpi/thunderbird-i18n-17.0.8/ca.xpi) = 9608970325c28c29e63c6db0c841c84588ec6af39ddbbbc305e18188b2591628
-SIZE (xpi/thunderbird-i18n-17.0.8/ca.xpi) = 418406
-SHA256 (xpi/thunderbird-i18n-17.0.8/cs.xpi) = 4e530ad1281db4f52484ff15d117c49b4204ad6e9c743452d72acb6ee716ae03
-SIZE (xpi/thunderbird-i18n-17.0.8/cs.xpi) = 420626
-SHA256 (xpi/thunderbird-i18n-17.0.8/da.xpi) = cbf06bd93d1244f07974176e13802bd1bf6a81783de6ef598be3011104e60d6a
-SIZE (xpi/thunderbird-i18n-17.0.8/da.xpi) = 398980
-SHA256 (xpi/thunderbird-i18n-17.0.8/de.xpi) = 49e0a19e794d4c3a12d8cee63fd6818583ea3b1c61cd604c62445d6217a8e3a2
-SIZE (xpi/thunderbird-i18n-17.0.8/de.xpi) = 393631
-SHA256 (xpi/thunderbird-i18n-17.0.8/en-GB.xpi) = ff7de06053de1ba904d3020d0706a0f8951127c307ab3c620b580ae72273243f
-SIZE (xpi/thunderbird-i18n-17.0.8/en-GB.xpi) = 390693
-SHA256 (xpi/thunderbird-i18n-17.0.8/en-US.xpi) = f28070ed90bb00befe74dda876194773ff334b16a1eb738847e3a41f5ba58617
-SIZE (xpi/thunderbird-i18n-17.0.8/en-US.xpi) = 390779
-SHA256 (xpi/thunderbird-i18n-17.0.8/es-AR.xpi) = 4976d3892ba2051a5182ab605c6ef9b2d2394cb6474af689fb7c96083070b643
-SIZE (xpi/thunderbird-i18n-17.0.8/es-AR.xpi) = 415498
-SHA256 (xpi/thunderbird-i18n-17.0.8/es-ES.xpi) = 7d0c65387f0d429eaf0f1a9e9cf96a1614378cf4f2c34c4db2fda3981fe777ac
-SIZE (xpi/thunderbird-i18n-17.0.8/es-ES.xpi) = 356860
-SHA256 (xpi/thunderbird-i18n-17.0.8/et.xpi) = fe6475d3fd4e025e4fd907389d522fce86fd9674f32b5f63d9b636503499ce18
-SIZE (xpi/thunderbird-i18n-17.0.8/et.xpi) = 411891
-SHA256 (xpi/thunderbird-i18n-17.0.8/eu.xpi) = f3f2be6e12a2fcad30233c45a700c72ae202802b430b7ba8b2b51c8b7f644f19
-SIZE (xpi/thunderbird-i18n-17.0.8/eu.xpi) = 407189
-SHA256 (xpi/thunderbird-i18n-17.0.8/fi.xpi) = 7a83de772a2b98927835d38a01bb7304149cf5958aff858d1120380f0c1f04b1
-SIZE (xpi/thunderbird-i18n-17.0.8/fi.xpi) = 413619
-SHA256 (xpi/thunderbird-i18n-17.0.8/fr.xpi) = f5b43059ea2e3b3f08087b040abfa0f04f3c51b865fc99b6095f953a14690cb6
-SIZE (xpi/thunderbird-i18n-17.0.8/fr.xpi) = 420825
-SHA256 (xpi/thunderbird-i18n-17.0.8/fy-NL.xpi) = ebc9b148fb7cd63b0225ce3bd6c1da1ff1ba88627fd9c0cb96d86c2618596217
-SIZE (xpi/thunderbird-i18n-17.0.8/fy-NL.xpi) = 415712
-SHA256 (xpi/thunderbird-i18n-17.0.8/ga-IE.xpi) = 095fe84c70d846aeb77ad9dcaf9a2c25096166e2594f85d52af3050ddcbef2ed
-SIZE (xpi/thunderbird-i18n-17.0.8/ga-IE.xpi) = 425394
-SHA256 (xpi/thunderbird-i18n-17.0.8/gd.xpi) = c88bb185f2e863a1114d23d31172ea1aab3a9b4856a6f2c0b4d7fe834af07f50
-SIZE (xpi/thunderbird-i18n-17.0.8/gd.xpi) = 428939
-SHA256 (xpi/thunderbird-i18n-17.0.8/gl.xpi) = e1f1e1745f635eb3a58a32fa466ca96ac913ff8ffc81c31b904ebfd843be21cb
-SIZE (xpi/thunderbird-i18n-17.0.8/gl.xpi) = 410369
-SHA256 (xpi/thunderbird-i18n-17.0.8/he.xpi) = 2e095d156027034db8c7d9ed44a23dade5f872651aed611df3428c05c7a9261d
-SIZE (xpi/thunderbird-i18n-17.0.8/he.xpi) = 439503
-SHA256 (xpi/thunderbird-i18n-17.0.8/hu.xpi) = 959666ffb50493b56db8832a4a4910e8f2839a248b0fe9da30b802fd197f0884
-SIZE (xpi/thunderbird-i18n-17.0.8/hu.xpi) = 433186
-SHA256 (xpi/thunderbird-i18n-17.0.8/is.xpi) = 09bd200fc261a525c42d66451fcd14fd1db4d1e4549d300683e88fb3d9dc6f97
-SIZE (xpi/thunderbird-i18n-17.0.8/is.xpi) = 414067
-SHA256 (xpi/thunderbird-i18n-17.0.8/it.xpi) = 591612ff988180ed4c654b800106d66c318543322d6f64170189abf9244ed6d6
-SIZE (xpi/thunderbird-i18n-17.0.8/it.xpi) = 348620
-SHA256 (xpi/thunderbird-i18n-17.0.8/ja.xpi) = 70bfb44ed2eedf8adb52eec63597fd4c75e0c71ac5616b2a1596132016ca9484
-SIZE (xpi/thunderbird-i18n-17.0.8/ja.xpi) = 463487
-SHA256 (xpi/thunderbird-i18n-17.0.8/ko.xpi) = 39972768c671f80dcb679947b4e4e205effad1006a887a871571efac8d74bff5
-SIZE (xpi/thunderbird-i18n-17.0.8/ko.xpi) = 412963
-SHA256 (xpi/thunderbird-i18n-17.0.8/lt.xpi) = 72aa8c347afc860e47242382e790f991e522d3185d1dcc7b0996118db9885dfd
-SIZE (xpi/thunderbird-i18n-17.0.8/lt.xpi) = 519802
-SHA256 (xpi/thunderbird-i18n-17.0.8/nb-NO.xpi) = 56a06fca489f0d3f001884d2c5d700869f78ab90ca99f4953249db68e7337bae
-SIZE (xpi/thunderbird-i18n-17.0.8/nb-NO.xpi) = 408518
-SHA256 (xpi/thunderbird-i18n-17.0.8/nl.xpi) = 0fb6c31b37d4a80044dede14d66c2e6c1d324cfd636da8cb48e6404d57bf8c09
-SIZE (xpi/thunderbird-i18n-17.0.8/nl.xpi) = 408526
-SHA256 (xpi/thunderbird-i18n-17.0.8/nn-NO.xpi) = fd94eea4d179135ba0603f1b1e73234b1de0ffec9d1c20e4226536fbb8a3efaa
-SIZE (xpi/thunderbird-i18n-17.0.8/nn-NO.xpi) = 431471
-SHA256 (xpi/thunderbird-i18n-17.0.8/pl.xpi) = e556ddf3ff2c4bc426f527bbc8f4ad0a9a2aedc4a9ed97e6de63aa0b0f9e8c8d
-SIZE (xpi/thunderbird-i18n-17.0.8/pl.xpi) = 402114
-SHA256 (xpi/thunderbird-i18n-17.0.8/pt-BR.xpi) = 204e3aacb4afae9dddd554fc7f3d422ca5ee14ba3611d49ca0143114da91f640
-SIZE (xpi/thunderbird-i18n-17.0.8/pt-BR.xpi) = 415777
-SHA256 (xpi/thunderbird-i18n-17.0.8/pt-PT.xpi) = e7f49b3552060eaa264ae80bd8f80342b875810e3c968e1b5e78713035696c27
-SIZE (xpi/thunderbird-i18n-17.0.8/pt-PT.xpi) = 445753
-SHA256 (xpi/thunderbird-i18n-17.0.8/rm.xpi) = 2effe0850bdf4fe6c3155a812e47ef2016b0eaf50f437e899861878cd1187b4f
-SIZE (xpi/thunderbird-i18n-17.0.8/rm.xpi) = 415530
-SHA256 (xpi/thunderbird-i18n-17.0.8/ru.xpi) = 9a9d855d12c59c975a293ca0c3fb9345c51b2108ab24c3b4863fe8d310d14405
-SIZE (xpi/thunderbird-i18n-17.0.8/ru.xpi) = 415707
-SHA256 (xpi/thunderbird-i18n-17.0.8/si.xpi) = 7c4554283aafae7ecbdd7736f46e4ae6d8f3fdd53590b5c94a9dcfa749e00460
-SIZE (xpi/thunderbird-i18n-17.0.8/si.xpi) = 494162
-SHA256 (xpi/thunderbird-i18n-17.0.8/sk.xpi) = 541f4b02312b5e8eec972067e0eca91b76f8d1be75767220813efb2a8e351cd9
-SIZE (xpi/thunderbird-i18n-17.0.8/sk.xpi) = 429755
-SHA256 (xpi/thunderbird-i18n-17.0.8/sl.xpi) = c86f305935aaa443cb3eca302595d401655a3e90dcb3b6b1270de5d9be7ba74a
-SIZE (xpi/thunderbird-i18n-17.0.8/sl.xpi) = 442095
-SHA256 (xpi/thunderbird-i18n-17.0.8/sq.xpi) = a3b6a6dcc81f4a780faa55f9cc7f43030bef80cb2f754d24077cb45ef80f9d51
-SIZE (xpi/thunderbird-i18n-17.0.8/sq.xpi) = 418779
-SHA256 (xpi/thunderbird-i18n-17.0.8/sv-SE.xpi) = 3758e651c99db3325703508d73010d7ca97e1904117ddc29a1132fa168a44e50
-SIZE (xpi/thunderbird-i18n-17.0.8/sv-SE.xpi) = 413217
-SHA256 (xpi/thunderbird-i18n-17.0.8/ta-LK.xpi) = e7e06c7ab1538571b0f71083230cd3d72d6cc2cd16e88268667e5239481a7941
-SIZE (xpi/thunderbird-i18n-17.0.8/ta-LK.xpi) = 517912
-SHA256 (xpi/thunderbird-i18n-17.0.8/tr.xpi) = 5f17ce575f00a08c5abd6536856469d388e9797195e7dadf20e1b3d980e10b91
-SIZE (xpi/thunderbird-i18n-17.0.8/tr.xpi) = 444944
-SHA256 (xpi/thunderbird-i18n-17.0.8/uk.xpi) = 77ea7dcee6ea87dafcf0ea49800c6a4318188ddc9906fca7f57b2e942e238389
-SIZE (xpi/thunderbird-i18n-17.0.8/uk.xpi) = 471142
-SHA256 (xpi/thunderbird-i18n-17.0.8/zh-TW.xpi) = bdda98eaebcd1c8104100002ef1c25db939039e533646f74ffd72b8faf381b10
-SIZE (xpi/thunderbird-i18n-17.0.8/zh-TW.xpi) = 437590
+SHA256 (xpi/thunderbird-i18n-24.0/ar.xpi) = 6e74a6ccb7554a3044df3ea099761f892028748e8441bbdd6f001a4bca5b54d2
+SIZE (xpi/thunderbird-i18n-24.0/ar.xpi) = 457861
+SHA256 (xpi/thunderbird-i18n-24.0/br.xpi) = d93eb0d12d1096ab6cf5876cd49bb2c1803fe868ace230e6cb1f780138202321
+SIZE (xpi/thunderbird-i18n-24.0/br.xpi) = 427679
+SHA256 (xpi/thunderbird-i18n-24.0/ca.xpi) = 51204a0b11204898d9fd5988b93b03834ac641e866d6a61562808ebb5129b5b1
+SIZE (xpi/thunderbird-i18n-24.0/ca.xpi) = 429745
+SHA256 (xpi/thunderbird-i18n-24.0/cs.xpi) = bcb13058eb336687fc88acc448403148575acb42e5b3fa95f8560b030e7f50b9
+SIZE (xpi/thunderbird-i18n-24.0/cs.xpi) = 431475
+SHA256 (xpi/thunderbird-i18n-24.0/da.xpi) = 9e00b6b4a355fac44fccbef39383fa7b87e21403a442e5f7f7f26b22bb4ea531
+SIZE (xpi/thunderbird-i18n-24.0/da.xpi) = 409625
+SHA256 (xpi/thunderbird-i18n-24.0/de.xpi) = ced0f7f53902ed68308f07fbdc006435f07390ca106e9380df90ec692d4931f3
+SIZE (xpi/thunderbird-i18n-24.0/de.xpi) = 408673
+SHA256 (xpi/thunderbird-i18n-24.0/en-GB.xpi) = d7a4e0064220a2c2b20b923038c04e5d0bb9601cea20f95062800cac4007e450
+SIZE (xpi/thunderbird-i18n-24.0/en-GB.xpi) = 400962
+SHA256 (xpi/thunderbird-i18n-24.0/en-US.xpi) = 30e6b0050d0e6a10ebc9cb094143df30325e10b8fea01a90b3a2d4adc697be09
+SIZE (xpi/thunderbird-i18n-24.0/en-US.xpi) = 402143
+SHA256 (xpi/thunderbird-i18n-24.0/es-AR.xpi) = 26ef7475af9e1e5f24486a863d1e5ce2b33be101554681405caeee7b5502918b
+SIZE (xpi/thunderbird-i18n-24.0/es-AR.xpi) = 425656
+SHA256 (xpi/thunderbird-i18n-24.0/es-ES.xpi) = 54162b01cf30faf33fa5e7201e8450e86c516bc73225bfc715db074a05cb977e
+SIZE (xpi/thunderbird-i18n-24.0/es-ES.xpi) = 366307
+SHA256 (xpi/thunderbird-i18n-24.0/et.xpi) = 8f25031f7f968b07029c81149272cf0f5ce1e72bb7945a078911d76d5b4595ff
+SIZE (xpi/thunderbird-i18n-24.0/et.xpi) = 422892
+SHA256 (xpi/thunderbird-i18n-24.0/eu.xpi) = fde5a4fd691b0d2b5d88158c867f5afc559190cb9b4398e80c2160ba882eaa72
+SIZE (xpi/thunderbird-i18n-24.0/eu.xpi) = 418495
+SHA256 (xpi/thunderbird-i18n-24.0/fi.xpi) = ac943ecb5dbdee837c4d488771b265ad5b95caca5fb78b52d2e4b2927da6f7db
+SIZE (xpi/thunderbird-i18n-24.0/fi.xpi) = 424264
+SHA256 (xpi/thunderbird-i18n-24.0/fr.xpi) = 29ab3aa7245390df7daa06adefbd21901d0cd0feedbada0ef6bfddbe7c2a1b3d
+SIZE (xpi/thunderbird-i18n-24.0/fr.xpi) = 431288
+SHA256 (xpi/thunderbird-i18n-24.0/fy-NL.xpi) = b06e11f3258446b2bb0ebd2107cc4e9d898331abd83b2ef98c9515703280ad19
+SIZE (xpi/thunderbird-i18n-24.0/fy-NL.xpi) = 426097
+SHA256 (xpi/thunderbird-i18n-24.0/ga-IE.xpi) = ee5814995fd15ce793c40cd9b5a1373e53c062ab1d48bd5462dd00a40502de9c
+SIZE (xpi/thunderbird-i18n-24.0/ga-IE.xpi) = 437113
+SHA256 (xpi/thunderbird-i18n-24.0/gd.xpi) = 0216577662f777e651fc4d811c02f1a230ab580d6a205e4035b227f772d39e41
+SIZE (xpi/thunderbird-i18n-24.0/gd.xpi) = 440091
+SHA256 (xpi/thunderbird-i18n-24.0/gl.xpi) = f2534c5c4dab6e95789b4eec759429dd450fbeaa7ac68126319e4eb65f1e13d8
+SIZE (xpi/thunderbird-i18n-24.0/gl.xpi) = 427541
+SHA256 (xpi/thunderbird-i18n-24.0/he.xpi) = 080ffd99b20800b2c798cfb8891d56e64908745af439b0fe4653cc28120c90d9
+SIZE (xpi/thunderbird-i18n-24.0/he.xpi) = 457064
+SHA256 (xpi/thunderbird-i18n-24.0/hu.xpi) = 9d14de0cefcf099f12a767a5703e2687c805713e1e5489931c2c29295bf2f514
+SIZE (xpi/thunderbird-i18n-24.0/hu.xpi) = 441511
+SHA256 (xpi/thunderbird-i18n-24.0/is.xpi) = ed00dade105c0656f5dd51d027f18ac902d24a5073988c339401a6f443e5d062
+SIZE (xpi/thunderbird-i18n-24.0/is.xpi) = 425710
+SHA256 (xpi/thunderbird-i18n-24.0/it.xpi) = 51767e8fb90a46432862e24de5bfd34ec8cda786859f6b3d9e1a08d2fa0256e2
+SIZE (xpi/thunderbird-i18n-24.0/it.xpi) = 357932
+SHA256 (xpi/thunderbird-i18n-24.0/ja.xpi) = cf3332bd773a119fabc993cef4a56f1e0235d4f881deb7437025404e2a7fba3b
+SIZE (xpi/thunderbird-i18n-24.0/ja.xpi) = 475558
+SHA256 (xpi/thunderbird-i18n-24.0/ko.xpi) = 420b7ae6ce2b01b8e5458f3c4c89c9b425aabb8307487f7a37111ddb2c10b547
+SIZE (xpi/thunderbird-i18n-24.0/ko.xpi) = 428069
+SHA256 (xpi/thunderbird-i18n-24.0/lt.xpi) = 39102843525cae3a387fadb7f705d6c67b3a64bd0ca0aed9ade34ae261c536bc
+SIZE (xpi/thunderbird-i18n-24.0/lt.xpi) = 443259
+SHA256 (xpi/thunderbird-i18n-24.0/nb-NO.xpi) = 05f337bfecef422add4442566c549af97c803b779ce09eeebe60868e58a5e7da
+SIZE (xpi/thunderbird-i18n-24.0/nb-NO.xpi) = 418921
+SHA256 (xpi/thunderbird-i18n-24.0/nl.xpi) = e9025ece687f11db08b7d8b1ebc45a1a4ee4d4b99277a3fd047af7f54e21a20d
+SIZE (xpi/thunderbird-i18n-24.0/nl.xpi) = 418763
+SHA256 (xpi/thunderbird-i18n-24.0/nn-NO.xpi) = 0e8e2d44b6c0fa3023ac6ab1eeddc77dbd2d0577e915eaa7520ed154f89b1ce2
+SIZE (xpi/thunderbird-i18n-24.0/nn-NO.xpi) = 421133
+SHA256 (xpi/thunderbird-i18n-24.0/pl.xpi) = f23f0dd3a8c5a066ac413a64700a15155e674b64e8d10be031a0a632410f1b25
+SIZE (xpi/thunderbird-i18n-24.0/pl.xpi) = 401751
+SHA256 (xpi/thunderbird-i18n-24.0/pt-BR.xpi) = 8230c94b5d999b9dfc2492b5e322615893763d31881e67f87c931f5d2bf1251c
+SIZE (xpi/thunderbird-i18n-24.0/pt-BR.xpi) = 430907
+SHA256 (xpi/thunderbird-i18n-24.0/pt-PT.xpi) = f95d600c78e5b80f9bceaf70b47af007be292c6c699c2d6b7391c01a8d4ea56c
+SIZE (xpi/thunderbird-i18n-24.0/pt-PT.xpi) = 425024
+SHA256 (xpi/thunderbird-i18n-24.0/rm.xpi) = 07de2de69ffe373dc4328968cc5732526952b4611816372093b4ef384c6d689f
+SIZE (xpi/thunderbird-i18n-24.0/rm.xpi) = 432383
+SHA256 (xpi/thunderbird-i18n-24.0/ru.xpi) = 4e552902034381abb9823648a4f43f6923b4c2d1f0c17a306094238ce1a74e2b
+SIZE (xpi/thunderbird-i18n-24.0/ru.xpi) = 425097
+SHA256 (xpi/thunderbird-i18n-24.0/si.xpi) = 92a93c4ac2e6c1407a86f478d0092e7c5ede6d6b51ae1a9d5fad116f57ec57b4
+SIZE (xpi/thunderbird-i18n-24.0/si.xpi) = 511166
+SHA256 (xpi/thunderbird-i18n-24.0/sk.xpi) = 73619d1dc30e824ef3416975871e3ad0624f7523da5be4eb40beb3d1121bc018
+SIZE (xpi/thunderbird-i18n-24.0/sk.xpi) = 440105
+SHA256 (xpi/thunderbird-i18n-24.0/sl.xpi) = 4c662abae741f474f08cda52ba82a465d24f730845a67d7cbac0ab278801b92f
+SIZE (xpi/thunderbird-i18n-24.0/sl.xpi) = 421705
+SHA256 (xpi/thunderbird-i18n-24.0/sq.xpi) = d3356e40709d5ac8299f163737d537f7fbb7ea1942a64faa2b34d4dcaae7a2b2
+SIZE (xpi/thunderbird-i18n-24.0/sq.xpi) = 435214
+SHA256 (xpi/thunderbird-i18n-24.0/sv-SE.xpi) = e91988e86316d0b6a4fc660f17ab9efb3141d293453adbf63dd81978bf488eaa
+SIZE (xpi/thunderbird-i18n-24.0/sv-SE.xpi) = 423814
+SHA256 (xpi/thunderbird-i18n-24.0/ta-LK.xpi) = d1d7ba9affb29e8afd8fca1261313c3f14c414086e30754e4c3da2bef4962ab6
+SIZE (xpi/thunderbird-i18n-24.0/ta-LK.xpi) = 534922
+SHA256 (xpi/thunderbird-i18n-24.0/tr.xpi) = d1ff4e9bbd39d37d9b2c80f05a8df011ac64a3c24c090526822ca2965e3aceab
+SIZE (xpi/thunderbird-i18n-24.0/tr.xpi) = 438066
+SHA256 (xpi/thunderbird-i18n-24.0/uk.xpi) = 8d4c56288be58f392436b8f123aa8696bf81d8f6712fbebe95659659cf1a307f
+SIZE (xpi/thunderbird-i18n-24.0/uk.xpi) = 480948
+SHA256 (xpi/thunderbird-i18n-24.0/zh-TW.xpi) = a0c8877af5dfd9b7b3add1626e3fa01ddaac7b7648fbc1dbd23eb1f0660da537
+SIZE (xpi/thunderbird-i18n-24.0/zh-TW.xpi) = 450000

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/Makefile	Wed Sep 18 22:40:57 2013	(r327587)
@@ -2,26 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	17.0.8
+DISTVERSION=	24.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
-DISTFILES=	${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
+MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
+DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-BUILD_DEPENDS=	nspr>=4.9.2:${PORTSDIR}/devel/nspr \
-		nss>=3.13.6_1:${PORTSDIR}/security/nss \
-		sqlite3>=3.7.13:${PORTSDIR}/databases/sqlite3 \
+BUILD_DEPENDS=	nspr>=4.10:${PORTSDIR}/devel/nspr \
+		nss>=3.15:${PORTSDIR}/security/nss \
+		sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
-EM_VERSION=	1.5.1
+EM_VERSION=	1.5.2
+L_VERSION=	2.6b3
 
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
+OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 USE_MOZILLA=	# empty
 
@@ -29,10 +33,9 @@ WANT_GNOME=	yes
 USE_QT4=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gmake pkgconfig
 USE_GL=		gl
+USE_DOS2UNIX=	mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
 
 MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
 MOZ_OPTIONS=	--program-transform-name='s/thunderbird/${MOZILLA}/' \
@@ -51,19 +54,30 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 OPTIONS_DEFINE=	ENIGMAIL LIGHTNING
 OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
 
+# non-client.mk objdir build broken after bug 846540
+.undef GNU_CONFIGURE
+ALL_TARGET=	build
+MAKEFILE=	${WRKSRC}/client.mk
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
-OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/ALSA/OSS/}
+# OSS is gone after bug 852401
+OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-esr17
+WRKSRC=		${WRKDIR}/comm-esr24
 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+=	http://www.enigmail.net/download/source/:enigmail
+MASTER_SITES+=	https://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 EM_DISTNAME=	enigmail-${EM_VERSION}
@@ -75,13 +89,14 @@ EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/ins
 		${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}
 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.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning@thunderbird.mozilla.org
 .else
@@ -97,6 +112,8 @@ post-extract:
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
+		${MOZSRC}/configure.in ${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/mail/app/nsMailApp.cpp
 .if ${PORT_OPTIONS:MENIGMAIL}

Modified: head/mail/thunderbird/distinfo
==============================================================================
--- head/mail/thunderbird/distinfo	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/distinfo	Wed Sep 18 22:40:57 2013	(r327587)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0.8esr.source.tar.bz2) = 6e9f5899f97a6efd11b231909d534b2dec40502a20e1ab06eb12a4953e3deb54
-SIZE (thunderbird-17.0.8esr.source.tar.bz2) = 113699743
-SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
-SIZE (enigmail-1.5.1.tar.gz) = 1213954
+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

Modified: head/mail/thunderbird/files/extra-bug780531
==============================================================================
--- head/mail/thunderbird/files/extra-bug780531	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/files/extra-bug780531	Wed Sep 18 22:40:57 2013	(r327587)
@@ -1,13 +1,24 @@
 --- mozilla/configure.in~
 +++ mozilla/configure.in
-@@ -5151,8 +5148,8 @@ fi
+@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP)
  
- AC_SUBST(MOZ_WEBRTC)
- 
--case "$target_cpu" in
--arm*)
+ dnl Use integers over floats for audio on B2G and Android, because audio
+ dnl backends for those platforms don't support floats.
+-if test "$OS_TARGET" = "Android"; then
 +case "$target" in
-+arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
-     MOZ_SAMPLE_TYPE_S16LE=1
-     AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
-     AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
++*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+     MOZ_SAMPLE_TYPE_S16=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16)
+-else
++;;
++*)
+     MOZ_SAMPLE_TYPE_FLOAT32=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
+     AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
+-fi
++;;
++esac
+ 
+ dnl ========================================================
+ dnl = Disable Speech API code

Added: head/mail/thunderbird/files/extra-bug886095
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/extra-bug886095	Wed Sep 18 22:40:57 2013	(r327587)
@@ -0,0 +1,32 @@
+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

Added: head/mail/thunderbird/files/extra-patch-security_manager_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/extra-patch-security_manager_Makefile.in	Wed Sep 18 22:40:57 2013	(r327587)
@@ -0,0 +1,11 @@
+--- security/manager/Makefile.in.orig.patched	Thu May 25 10:19:22 2006
++++ security/manager/Makefile.in	Thu May 25 10:19:22 2006
+@@ -159,8 +159,6 @@
+ 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+ ifeq ($(OS_ARCH),WINNT)
+ 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+ endif
+ #	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+ ifndef SKIP_CHK

Modified: head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile
==============================================================================
--- head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile	Wed Sep 18 22:40:57 2013	(r327587)
@@ -1,6 +1,6 @@
 --- mailnews/extensions/enigmail/ipc/src/Makefile.enig~
 +++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
-@@ -19,26 +19,26 @@ endif
+@@ -19,13 +19,13 @@ endif
  
  ifeq ($(OS_ARCH),NetBSD)
  ifeq ($(DLL_SUFFIX),.so.1.0)
@@ -16,50 +16,7 @@
  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
+@@ -36,14 +36,14 @@ endif
  
  ifeq ($(OS_ARCH),HP-UX)
  ifeq ($(GNU_CC)$(GNU_CXX),)
@@ -76,15 +33,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:

Modified: head/mail/thunderbird/files/moz_pis_S50cleanhome
==============================================================================
--- head/mail/thunderbird/files/moz_pis_S50cleanhome	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/files/moz_pis_S50cleanhome	Wed Sep 18 22:40:57 2013	(r327587)
@@ -2,7 +2,8 @@
 #
 
 # S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
+# a script to clean up users' Mozilla home directories to make upgrading
+# less painful.
 
 # We run in our own subshell
 
@@ -13,22 +14,18 @@
 [ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
 [ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
 
-# Try to polite ${HOME}/${MOZ_PIS_USER_DIR}
+# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR}
 
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
 if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
     sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
-	"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
+    	"${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
 	| while read dir
     do
 	[ ! -d "${dir}" ] && continue
-	# at last, debian do this, we do for new builds
+	# Debian does this for new builds
 	# rm -f "${dir}/XUL.mfasl"
-	# make reclaculate compreg.dat, xpti.dat for new builds
+	# force a rebuild of compreg.dat and xpti.dat for new installations
 	[ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
-	    rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
+		rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
     done
 fi

Modified: head/mail/thunderbird/files/patch-bug783463
==============================================================================
--- head/mail/thunderbird/files/patch-bug783463	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/files/patch-bug783463	Wed Sep 18 22:40:57 2013	(r327587)
@@ -1,14 +1,14 @@
---- mozilla/gfx/skia/Makefile.in~
-+++ mozilla/gfx/skia/Makefile.in
-@@ -339,10 +339,9 @@ CPPSRCS += \
- 	SkMMapStream.cpp \
- 	SkOSFile.cpp \
- 	$(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
- CPPSRCS += \
- 	SkFontHost_linux.cpp \
--	SkFontHost_tables.cpp \
- 	SkTime_Unix.cpp \
- 	$(NULL)
- endif
+--- mozilla/gfx/skia/moz.build~
++++ mozilla/gfx/skia/moz.build
+@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+         'SkMMapStream.cpp',
+         'SkOSFile.cpp',
+     ]
+-    if CONFIG['OS_TARGET'] == 'Linux':
++    if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
+         CPP_SOURCES += [
+             'SkFontHost_linux.cpp',
+-            'SkFontHost_tables.cpp',
+             'SkThread_pthread.cpp',
+             'SkTime_Unix.cpp',
+         ]

Modified: head/mail/thunderbird/files/patch-bug791305
==============================================================================
--- head/mail/thunderbird/files/patch-bug791305	Wed Sep 18 22:13:34 2013	(r327586)
+++ head/mail/thunderbird/files/patch-bug791305	Wed Sep 18 22:40:57 2013	(r327587)
@@ -15,93 +15,383 @@ Date:   Fri Sep 14 15:54:55 2012 -0400
  image/decoders/nsJPEGDecoder.cpp | 311 ++-------------------------------------
  2 files changed, 20 insertions(+), 297 deletions(-)
 
+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
+                      #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 mozilla/image/decoders/nsJPEGDecoder.cpp mozilla/image/decoders/nsJPEGDecoder.cpp
-index c1fb515..1d2a259 100644
+index 8fa8200..1d2a259 100644
 --- mozilla/image/decoders/nsJPEGDecoder.cpp
 +++ mozilla/image/decoders/nsJPEGDecoder.cpp
-@@ -22,6 +22,13 @@
+@@ -21,13 +21,28 @@
+ 
  extern "C" {
  #include "iccjpeg.h"
+-}
  
 +#ifdef JCS_EXTENSIONS
-+#if defined(IS_BIG_ENDIAN)
-+#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB
-+#else
-+#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX
-+#endif
+ #if defined(IS_BIG_ENDIAN)
+ #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB
+ #else
+ #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX
+ #endif
 +#else
- /* Colorspace conversion (copied from jpegint.h) */
- struct jpeg_color_deconverter {
-   JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-@@ -34,6 +41,7 @@ METHODDEF(void)
- ycc_rgb_convert_argb (j_decompress_ptr cinfo,
-                  JSAMPIMAGE input_buf, JDIMENSION input_row,
-                  JSAMPARRAY output_buf, int num_rows);
++/* Colorspace conversion (copied from jpegint.h) */
++struct jpeg_color_deconverter {
++  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
++  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
++				JSAMPIMAGE input_buf, JDIMENSION input_row,
++				JSAMPARRAY output_buf, int num_rows));
++};
++
++METHODDEF(void)
++ycc_rgb_convert_argb (j_decompress_ptr cinfo,
++                 JSAMPIMAGE input_buf, JDIMENSION input_row,
++                 JSAMPARRAY output_buf, int num_rows);
 +#endif
- }
++}
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
-@@ -329,7 +340,18 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
+ 
+@@ -324,6 +340,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
        case JCS_GRAYSCALE:
        case JCS_RGB:
        case JCS_YCbCr:
 +#ifdef JCS_EXTENSIONS
-+        // if we're not color managing we can decode directly to
-+        // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
-+        if (mCMSMode != eCMSMode_All) {
-+            mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB;
-+            mInfo.out_color_components = 4;
-+        } else {
-+            mInfo.out_color_space = JCS_RGB;
-+        }
+         // if we're not color managing we can decode directly to
+         // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
+         if (mCMSMode != eCMSMode_All) {
+@@ -332,6 +349,9 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
+         } else {
+             mInfo.out_color_space = JCS_RGB;
+         }
 +#else
-         mInfo.out_color_space = JCS_RGB;
++        mInfo.out_color_space = JCS_RGB;
 +#endif
          break;
        case JCS_CMYK:
        case JCS_YCCK:
-@@ -397,6 +419,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
+@@ -399,6 +419,15 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
        return; /* I/O suspension */
      }
  
 +#ifndef JCS_EXTENSIONS
-     /* Force to use our YCbCr to Packed RGB converter when possible */
-     if (!mTransform && (mCMSMode != eCMSMode_All) &&
-         mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) {
-@@ -404,6 +427,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount)
-       mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/
-       mInfo.cconvert->color_convert = ycc_rgb_convert_argb;
-     }
++    /* Force to use our YCbCr to Packed RGB converter when possible */
++    if (!mTransform && (mCMSMode != eCMSMode_All) &&
++        mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) {
++      /* Special case for the most common case: transform from YCbCr direct into packed ARGB */
++      mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/
++      mInfo.cconvert->color_convert = ycc_rgb_convert_argb;
++    }
 +#endif
  
      /* If this is a progressive JPEG ... */
      mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -542,7 +566,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend)
-       PRUint32 *imageRow = ((PRUint32*)mImageData) +
+@@ -544,7 +573,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend)
+       uint32_t *imageRow = ((uint32_t*)mImageData) +
                             (mInfo.output_scanline * mInfo.output_width);
  
 +#ifdef JCS_EXTENSIONS
-+      if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
+       if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) {
 +#else
-       if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
++      if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
 +#endif
          /* Special case: scanline will be directly converted into packed ARGB */
          if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
            *suspend = true; /* suspend */
-@@ -858,6 +887,7 @@ term_source (j_decompress_ptr jd)
+@@ -854,6 +887,282 @@ term_source (j_decompress_ptr jd)
  } // namespace mozilla
  
  
 +#ifndef JCS_EXTENSIONS
- /**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/
- 
- /*
-@@ -1130,7 +1160,8 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo,
-     }
-   }
- }
++/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/
++
++/*
++ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
++ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
++ * The conversion equations to be implemented are therefore
++ *      R = Y                + 1.40200 * Cr
++ *      G = Y - 0.34414 * Cb - 0.71414 * Cr
++ *      B = Y + 1.77200 * Cb
++ * where Cb and Cr represent the incoming values less CENTERJSAMPLE.
++ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
++ *

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309182240.r8IMewpL007735>