Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Sep 2014 06:16:36 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367712 - in head: Mk Mk/Uses devel/nspr devel/nspr/files mail/linux-thunderbird mail/linux-thunderbird/files mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files net-im net-im...
Message-ID:  <201409090616.s896GaQb062951@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Sep  9 06:16:35 2014
New Revision: 367712
URL: http://svnweb.freebsd.org/changeset/ports/367712
QAT: https://qat.redports.org/buildarchive/r367712/

Log:
  Mozilla upgrades:
  - Update nspr to 4.10.7
  - Update ca_root_nss to 3.17 (mark as NO_ARCH while here)
  - Update firefox to 32.0
  - Update thunderbird to 31.1.0
  - Add net-im/linux-instantbird
  - Update firefox-est to 31.1.0
  - Update libxul to 24.8.0
  - Update seamonkey to 2.29
  
  Submitted by:	Jan Beich for gecko@

Added:
  head/mail/thunderbird/files/patch-bug1046224   (contents, props changed)
  head/net-im/linux-instantbird/
  head/net-im/linux-instantbird/Makefile   (contents, props changed)
  head/net-im/linux-instantbird/distinfo   (contents, props changed)
  head/net-im/linux-instantbird/files/
  head/net-im/linux-instantbird/files/linux-instantbird.desktop.in   (contents, props changed)
  head/net-im/linux-instantbird/pkg-descr   (contents, props changed)
  head/net-im/linux-instantbird/pkg-plist   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1013882   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1026828   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1041381   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1046224   (contents, props changed)
  head/www/firefox-esr/files/patch-bug847568   (contents, props changed)
  head/www/firefox-esr/files/patch-bug981348   (contents, props changed)
  head/www/firefox-esr/files/patch-z-bug517422   (contents, props changed)
  head/www/firefox/files/patch-bug1041268   (contents, props changed)
  head/www/firefox/files/patch-bug1046224   (contents, props changed)
  head/www/firefox/files/patch-media-libstagefright-foundation-AString.cpp   (contents, props changed)
  head/www/libxul/files/patch-bug1046224   (contents, props changed)
  head/www/libxul/files/pkg-deinstall.in   (contents, props changed)
  head/www/libxul/files/pkg-install.in   (contents, props changed)
  head/www/seamonkey/files/patch-bug1046224   (contents, props changed)
  head/www/seamonkey/files/patch-bug981348   (contents, props changed)
  head/www/seamonkey/files/patch-mozilla-media-libstagefright-foundation-AString.cpp   (contents, props changed)
Deleted:
  head/mail/thunderbird/files/extra-patch-security_manager_Makefile.in
  head/www/firefox-esr/files/patch-bug783463
  head/www/firefox-esr/files/patch-bug803480
  head/www/firefox-esr/files/patch-bug807492
  head/www/firefox-esr/files/patch-bug810716
  head/www/firefox-esr/files/patch-bug851992
  head/www/firefox-esr/files/patch-bug876156
  head/www/firefox-esr/files/patch-bug878791
  head/www/firefox-esr/files/patch-bug886181
  head/www/firefox-esr/files/patch-bug889699
  head/www/firefox-esr/files/patch-bug893397
  head/www/firefox-esr/files/patch-bug910875
  head/www/firefox-esr/files/patch-bug916216
  head/www/firefox-esr/files/patch-bug916589
  head/www/firefox-esr/files/patch-bug918177
  head/www/firefox-esr/files/patch-bug938730
  head/www/firefox-esr/files/patch-bug945046
  head/www/firefox-esr/files/patch-bug946560
  head/www/firefox-esr/files/patch-bug948946
  head/www/firefox-esr/files/patch-bug961816
  head/www/firefox-esr/files/patch-bug962345
  head/www/firefox-esr/files/patch-bug975634
  head/www/firefox-esr/files/patch-bug977457
  head/www/firefox-esr/files/patch-bug985848
  head/www/firefox-esr/files/patch-toolkit_xre_Makefile.in
  head/www/firefox-esr/files/patch-z-bug1026828
  head/www/firefox-esr/files/patch-z-bug847568
  head/www/firefox-esr/files/patch-zz-bug517422
  head/www/firefox/files/patch-bug1013675
  head/www/firefox/files/patch-bug1015547
  head/www/firefox/files/patch-bug1026828
  head/www/firefox/files/patch-bug961264
  head/www/seamonkey/files/extra-patch-security_manager_Makefile.in
  head/www/seamonkey/files/patch-bug1013675
  head/www/seamonkey/files/patch-bug806917
  head/www/seamonkey/files/patch-bug893397
  head/www/seamonkey/files/patch-bug916589
  head/www/seamonkey/files/patch-bug961264
  head/www/seamonkey/files/patch-bug962345
  head/www/seamonkey/files/patch-bug973744
  head/www/seamonkey/files/patch-bug975397
  head/www/seamonkey/files/patch-bug975634
  head/www/seamonkey/files/patch-bug977457
  head/www/seamonkey/files/patch-bug985848
  head/www/seamonkey/files/patch-bug989112
  head/www/seamonkey/files/patch-bug993467
Modified:
  head/Mk/Uses/gecko.mk
  head/Mk/bsd.gecko.mk
  head/devel/nspr/Makefile
  head/devel/nspr/distinfo
  head/devel/nspr/files/patch-bug782113
  head/mail/linux-thunderbird/Makefile
  head/mail/linux-thunderbird/distinfo
  head/mail/linux-thunderbird/files/linux-thunderbird.desktop.in
  head/mail/thunderbird-i18n/Makefile
  head/mail/thunderbird-i18n/distinfo
  head/mail/thunderbird/Makefile
  head/mail/thunderbird/distinfo
  head/net-im/Makefile
  head/security/ca_root_nss/Makefile
  head/security/ca_root_nss/distinfo
  head/www/firefox-esr-i18n/Makefile
  head/www/firefox-esr-i18n/Makefile.lang
  head/www/firefox-esr-i18n/Makefile.option
  head/www/firefox-esr-i18n/distinfo
  head/www/firefox-esr/Makefile
  head/www/firefox-esr/distinfo
  head/www/firefox-esr/files/patch-bug1013675
  head/www/firefox-esr/files/patch-bug1015547
  head/www/firefox-esr/files/patch-bug1041795
  head/www/firefox-esr/files/patch-bug702179
  head/www/firefox-esr/files/patch-bug779713
  head/www/firefox-esr/files/patch-bug826985
  head/www/firefox-esr/files/patch-bug961264
  head/www/firefox-esr/files/patch-clang34-disable-stdcall
  head/www/firefox-esr/files/patch-config-baseconfig.mk
  head/www/firefox-esr/pkg-message
  head/www/firefox-i18n/Makefile
  head/www/firefox-i18n/distinfo
  head/www/firefox/Makefile
  head/www/firefox/distinfo
  head/www/firefox/files/patch-bug779713
  head/www/firefox/files/patch-bug826985
  head/www/firefox/files/patch-bug847568
  head/www/firefox/files/patch-z-bug517422
  head/www/libxul/Makefile
  head/www/libxul/distinfo
  head/www/linux-firefox/Makefile
  head/www/linux-firefox/distinfo
  head/www/linux-firefox/files/linux-firefox.desktop.in
  head/www/linux-seamonkey/Makefile
  head/www/linux-seamonkey/Makefile.common
  head/www/linux-seamonkey/distinfo
  head/www/linux-seamonkey/files/linux-seamonkey.desktop.in
  head/www/linux-seamonkey/pkg-plist
  head/www/seamonkey-i18n/Makefile
  head/www/seamonkey-i18n/distinfo
  head/www/seamonkey/Makefile
  head/www/seamonkey/distinfo
  head/www/seamonkey/files/patch-bug1015547
  head/www/seamonkey/files/patch-bug702179
  head/www/seamonkey/files/patch-bug826985
  head/www/seamonkey/files/patch-bug847568
  head/www/seamonkey/files/patch-clang34-disable-stdcall
  head/www/seamonkey/files/patch-z-bug517422

Modified: head/Mk/Uses/gecko.mk
==============================================================================
--- head/Mk/Uses/gecko.mk	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/Mk/Uses/gecko.mk	Tue Sep  9 06:16:35 2014	(r367712)
@@ -38,13 +38,13 @@ RUN_DEPENDS+=	libxul>=24:${PORTSDIR}/www
 
 .elif ${_GECKO_ARGS:Mfirefox}
 
-_GECKO_DEFAULT_VERSION=	24
-_GECKO_VERSIONS=		24 31
+_GECKO_DEFAULT_VERSION=	31
+_GECKO_VERSIONS=		31 33
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
-24_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-31_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+31_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
+33_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
@@ -53,8 +53,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLE
 
 .elif ${_GECKO_ARGS:Mseamonkey}
 
-_GECKO_DEFAULT_VERSION=	26
-_GECKO_VERSIONS=		26
+_GECKO_DEFAULT_VERSION=	29
+_GECKO_VERSIONS=		29
 _GECKO_TYPE=	seamonkey
 
 .if exists(${LOCALBASE}/bin/seamonkey)
@@ -63,7 +63,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLE
 .endif
 
 # Dependence lines for different Seamonkey versions
-26_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+29_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
 
 .elif ${_GECKO_ARGS:Mthunderbird}
 

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/Mk/bsd.gecko.mk	Tue Sep  9 06:16:35 2014	(r367712)
@@ -85,7 +85,8 @@ MOZILLA_VER?=	${PORTVERSION}
 MOZILLA_BIN?=	${PORTNAME}-bin
 MOZILLA_EXEC_NAME?=${MOZILLA}
 MOZ_RPATH?=	${MOZILLA}
-USES+=		cpe compiler:c++11-lib gmake iconv perl5 pkgconfig desktop-file-utils
+USES+=		cpe compiler:c++11-lib gmake iconv perl5 pkgconfig \
+			python:2,build desktop-file-utils
 CPE_VENDOR?=mozilla
 USE_PERL5=	build
 USE_XORG=	xext xrender xt
@@ -106,11 +107,6 @@ PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
 PKGINSTALL_INC?=	${.CURDIR}/../../www/firefox/files/pkg-install.in
 PKGDEINSTALL_INC?=	${.CURDIR}/../../www/firefox/files/pkg-deinstall.in
 
-EXTRACT_AFTER_ARGS?=	--exclude */CVS/*	\
-			--exclude */macbuild/*			\
-			--exclude */package/*			\
-			--exclude mozilla*/gc/boehm
-
 MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
 			${MOZILLA}-xpcom ${MOZILLA}-plugin
 
@@ -132,93 +128,74 @@ _ALL_DEPENDS=	cairo event ffi graphite h
 
 cairo_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
 cairo_MOZ_OPTIONS=	--enable-system-cairo
-cairo_EXTRACT_AFTER_ARGS=	--exclude mozilla*/gfx/cairo/cairo
 
 event_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 event_MOZ_OPTIONS=	--with-system-libevent
-event_EXTRACT_AFTER_ARGS=	--exclude mozilla*/ipc/chromium/src/third_party/libevent
 
 ffi_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 ffi_MOZ_OPTIONS=	--enable-system-ffi
-ffi_EXTRACT_AFTER_ARGS=	--exclude mozilla*/js/src/ctypes/libffi
 
 .if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568)
 graphite_LIB_DEPENDS=	libgraphite2.so:${PORTSDIR}/graphics/graphite2
 graphite_MOZ_OPTIONS=	--with-system-graphite2
-graphite_EXTRACT_AFTER_ARGS=	--exclude mozilla*/gfx/graphite2
 
 harfbuzz_LIB_DEPENDS=	libharfbuzz.so:${PORTSDIR}/print/harfbuzz
 harfbuzz_MOZ_OPTIONS=	--with-system-harfbuzz
-harfbuzz_EXTRACT_AFTER_ARGS=	--exclude mozilla*/gfx/harfbuzz
 .endif
 
 hunspell_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
 hunspell_MOZ_OPTIONS=	--enable-system-hunspell
 
 icu_LIB_DEPENDS=		libicui18n.so:${PORTSDIR}/devel/icu
-icu_MOZ_OPTIONS=		--with-system-icu --with-intl-api --enable-intl-api
+icu_MOZ_OPTIONS=		--with-system-icu --with-intl-api
 
 -jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm
 # XXX depends on ports/180159 or package flavor support
 #jpeg_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/libjpeg-turbo
 jpeg_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
-jpeg_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libjpeg
 
 nspr_LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
 nspr_MOZ_OPTIONS=	--with-system-nspr
 
 nss_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 nss_MOZ_OPTIONS=	--with-system-nss
-nss_EXTRACT_AFTER_ARGS=	--exclude mozilla*/dbm \
-						--exclude mozilla*/security/coreconf \
-						--exclude mozilla*/security/nss
 
 .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
 opus_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
 opus_MOZ_OPTIONS=	--with-system-opus
-opus_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libopus
 .endif
 
 pixman_LIB_DEPENDS=	libpixman-1.so:${PORTSDIR}/x11/pixman
 pixman_MOZ_OPTIONS=	--enable-system-pixman
-pixman_EXTRACT_AFTER_ARGS=	--exclude mozilla*/gfx/cairo/libpixman
 
 png_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
-#png_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libpng
 
 .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
 soundtouch_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 soundtouch_MOZ_OPTIONS=	--with-system-soundtouch
-soundtouch_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libsoundtouch
 
 # XXX disabled: bug 913854 not yet upstreamed
 speex_LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speex
 speex_MOZ_OPTIONS=	--with-system-speex
-speex_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libspeex_resampler
 .endif
 
 sqlite_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 sqlite_MOZ_OPTIONS=	--enable-system-sqlite
-sqlite_EXTRACT_AFTER_ARGS=	--exclude mozilla*/db/sqlite3
 
 .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
 # XXX disabled: update to 1.2.x or review backported fixes
 theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 theora_MOZ_OPTIONS=	--with-system-theora
-theora_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libtheora
 
 vorbis_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 vorbis_MOZ_OPTIONS=	--with-system-vorbis --with-system-ogg
-vorbis_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libvorbis \
-							--exclude mozilla*/media/libogg
 .endif
 
 -vpx_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 vpx_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 vpx_MOZ_OPTIONS=	--with-system-libvpx
-vpx_EXTRACT_AFTER_ARGS=	--exclude mozilla*/media/libvpx
 
 .for use in ${USE_MOZILLA}
 ${use:S/-/_WITHOUT_/}=	${TRUE}
@@ -230,7 +207,6 @@ BUILD_DEPENDS+=	${${dep}_BUILD_DEPENDS}
 LIB_DEPENDS+=	${${dep}_LIB_DEPENDS}
 RUN_DEPENDS+=	${${dep}_RUN_DEPENDS}
 MOZ_OPTIONS+=	${${dep}_MOZ_OPTIONS}
-EXTRACT_AFTER_ARGS+=	${${dep}_EXTRACT_AFTER_ARGS}
 .else
 BUILD_DEPENDS+=	${-${dep}_BUILD_DEPENDS}
 .endif
@@ -278,7 +254,7 @@ MOZ_TOOLKIT=	cairo-gtk3
 USE_MOZILLA+=	-cairo # ports/169343
 USE_DISPLAY=yes # install
 USE_GNOME+=	pango
-. if ${MOZILLA_VER:R:R} >= 30
+. if ${MOZILLA_VER:R:R} >= 30 || ${MOZILLA} == "seamonkey"
 USE_QT5+=	qmake_build buildtools_build gui network quick printsupport
 . else
 USE_QT4+=	qmake_build moc_build rcc_build gui network opengl
@@ -402,6 +378,8 @@ BROKEN=			dtrace -G crashes with C++ obj
 MOZ_OPTIONS+=	--enable-dtrace
 LIBS+=			-lelf
 STRIP=
+.else
+MOZ_OPTIONS+=	--disable-dtrace
 .endif
 
 .if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG}

Modified: head/devel/nspr/Makefile
==============================================================================
--- head/devel/nspr/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/devel/nspr/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nspr
-DISTVERSION=	4.10.6
+DISTVERSION=	4.10.7
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
 
@@ -23,11 +23,9 @@ MAKE_ENV=	DIST=${WRKSRC}/dist
 
 LIBRARIES=	libnspr4.so.1 libplc4.so.1 libplds4.so.1
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DEBUG
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.endif
+DEBUG_CONFIGURE_ENABLE=debug
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/nspr
@@ -46,17 +44,17 @@ do-install:
 .if defined(STRIP) && ${STRIP} != ""
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
 .endif
-	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/lib/${lib}
+	${CHMOD} ${LIBMODE} ${STAGEDIR}${PREFIX}/lib/${lib}
 	${LN} -sf ${lib} ${STAGEDIR}${PREFIX}/lib/${lib:R}
 .endfor
 
 prtests:
-	${MAKE_CMD} -C ${WRKSRC}/pr/tests
+	${DO_MAKE_BUILD} -C ${WRKSRC}/pr/tests
 	${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
 	cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
 
 libtests:
-	${MAKE_CMD} -C ${WRKSRC}/lib/tests
+	${DO_MAKE_BUILD} -C ${WRKSRC}/lib/tests
 	${WRKSRC}/lib/tests/string
 	${WRKSRC}/lib/tests/base64t
 	# The test below is commented out, because arena requires
@@ -79,4 +77,4 @@ post-build:
 	#
 #.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/nspr/distinfo
==============================================================================
--- head/devel/nspr/distinfo	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/devel/nspr/distinfo	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.6.tar.gz) = df69ac8b0126f11907792384468adf42712b1d6db9772f4aa20c6d471594644a
-SIZE (nspr-4.10.6.tar.gz) = 1131328
+SHA256 (nspr-4.10.7.tar.gz) = 389af5cfa863ea9bc6de7b30c15f8a4f9bddd8002f8c6fdc8b33caef43893938
+SIZE (nspr-4.10.7.tar.gz) = 1131171

Modified: head/devel/nspr/files/patch-bug782113
==============================================================================
--- head/devel/nspr/files/patch-bug782113	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/devel/nspr/files/patch-bug782113	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,5 +1,5 @@
---- ../pr/include/md/_freebsd.cfg.orig	2014-06-05 21:42:08.000000000 +0000
-+++ ../pr/include/md/_freebsd.cfg	2014-08-18 00:20:35.358964562 +0000
+--- ../pr/include/md/_freebsd.cfg
++++ ../pr/include/md/_freebsd.cfg
 @@ -251,6 +251,147 @@
  #define PR_ALIGN_OF_POINTER 8
  #define PR_ALIGN_OF_WORD    8
@@ -148,8 +148,8 @@
  #else
  
  #error "Unknown CPU architecture"
---- ../pr/include/md/_freebsd.h.orig	2014-08-18 00:19:52.236967851 +0000
-+++ ../pr/include/md/_freebsd.h	2014-08-18 00:19:52.507967938 +0000
+--- ../pr/include/md/_freebsd.h
++++ ../pr/include/md/_freebsd.h
 @@ -25,6 +25,12 @@
  #define _PR_SI_ARCHITECTURE "ia64"
  #elif defined(__amd64__)

Modified: head/mail/linux-thunderbird/Makefile
==============================================================================
--- head/mail/linux-thunderbird/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/linux-thunderbird/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	31.0
+DISTVERSION=	31.1.0
 CATEGORIES=	mail news net-im ipv6
-DISTNAME=	${PORTNAME}-${DISTVERSION}
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -14,7 +13,5 @@ USES=		tar:bzip2
 
 WANT_GTK218=	yes
 
-USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
-
 .include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common"
 .include <bsd.port.mk>

Modified: head/mail/linux-thunderbird/distinfo
==============================================================================
--- head/mail/linux-thunderbird/distinfo	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/linux-thunderbird/distinfo	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,5 +1,5 @@
-SHA256 (thunderbird-31.0.tar.bz2) = ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae
-SIZE (thunderbird-31.0.tar.bz2) = 33504321
+SHA256 (thunderbird-31.1.0.tar.bz2) = 234a6e0909880e7114e119e3fec34459652b43b51b307ae1f6e1a14d5f0dbdfc
+SIZE (thunderbird-31.1.0.tar.bz2) = 33438760
 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

Modified: head/mail/linux-thunderbird/files/linux-thunderbird.desktop.in
==============================================================================
--- head/mail/linux-thunderbird/files/linux-thunderbird.desktop.in	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/linux-thunderbird/files/linux-thunderbird.desktop.in	Tue Sep  9 06:16:35 2014	(r367712)
@@ -4,7 +4,7 @@ Name=Thunderbird (Linux)
 GenericName=Mail Client (Linux)
 Comment=Mail client and News Reader
 Exec=linux-thunderbird %u
-Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm
+Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default48.png
 StartupNotify=false
 Terminal=false
 Type=Application

Modified: head/mail/thunderbird-i18n/Makefile
==============================================================================
--- head/mail/thunderbird-i18n/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/thunderbird-i18n/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	31.0
+PORTVERSION=	31.1.0
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=

Modified: head/mail/thunderbird-i18n/distinfo
==============================================================================
--- head/mail/thunderbird-i18n/distinfo	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/thunderbird-i18n/distinfo	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-31.0/ar.xpi) = 81314f4c47393b18c90f4ca64e71747dfc8005e72feb7b4f6c43f87fb7319521
-SIZE (xpi/thunderbird-i18n-31.0/ar.xpi) = 472809
-SHA256 (xpi/thunderbird-i18n-31.0/ast.xpi) = 3a78c9011c7c9e380ae05553b6fb30c4c8235a9910e979f8b7925cda9e036037
-SIZE (xpi/thunderbird-i18n-31.0/ast.xpi) = 393046
-SHA256 (xpi/thunderbird-i18n-31.0/be.xpi) = 40e22baac6e6714a63830bfc83d5652b9b671090d3296736e2dcd917a1f0ceaf
-SIZE (xpi/thunderbird-i18n-31.0/be.xpi) = 427485
-SHA256 (xpi/thunderbird-i18n-31.0/bg.xpi) = c74870d38573d783c47a2ed25cbf9bffe32a0ab389790cde98ce621154d55086
-SIZE (xpi/thunderbird-i18n-31.0/bg.xpi) = 493731
-SHA256 (xpi/thunderbird-i18n-31.0/bn-BD.xpi) = d8e6ff465fab861b49fb1828983b85d9f5dedd93c38dc7f74a62fc8977fe17a1
-SIZE (xpi/thunderbird-i18n-31.0/bn-BD.xpi) = 555610
-SHA256 (xpi/thunderbird-i18n-31.0/br.xpi) = 20fa4c71abf89888ff19ad87dc97c39f93c395f34690b3714ac38014be221cdd
-SIZE (xpi/thunderbird-i18n-31.0/br.xpi) = 441442
-SHA256 (xpi/thunderbird-i18n-31.0/ca.xpi) = 340b8029f83554beca5256296b0715f569b4ac8f00dde62ba25013bbcd672b13
-SIZE (xpi/thunderbird-i18n-31.0/ca.xpi) = 441711
-SHA256 (xpi/thunderbird-i18n-31.0/cs.xpi) = 5abfb0e1dd0d1b2344373044147ab8211342ec14385280b6d6d66db4cbb5e0a9
-SIZE (xpi/thunderbird-i18n-31.0/cs.xpi) = 444698
-SHA256 (xpi/thunderbird-i18n-31.0/da.xpi) = 412cab5c29ee7cd39f3620fcfce05c6753e6c0c6ce7761d8512ecf19d54a04a5
-SIZE (xpi/thunderbird-i18n-31.0/da.xpi) = 422049
-SHA256 (xpi/thunderbird-i18n-31.0/de.xpi) = e76186c43cbb0965f049bdf4770319d5e7595527a76bf2a0683d5c9bd01ac559
-SIZE (xpi/thunderbird-i18n-31.0/de.xpi) = 424663
-SHA256 (xpi/thunderbird-i18n-31.0/el.xpi) = b6f36094ed24b347eaaa4584f4d1459896a17cf1332713c8a7ef9fe44d63f056
-SIZE (xpi/thunderbird-i18n-31.0/el.xpi) = 484852
-SHA256 (xpi/thunderbird-i18n-31.0/en-GB.xpi) = 30db7504cde1359f4e940cee846481e713d6a66442baab9aa6e30287c52f54bf
-SIZE (xpi/thunderbird-i18n-31.0/en-GB.xpi) = 412513
-SHA256 (xpi/thunderbird-i18n-31.0/en-US.xpi) = 89da465c642d4d1aa6ada8b45333cfa2b01d39be2a83904b77c468cfdc351a46
-SIZE (xpi/thunderbird-i18n-31.0/en-US.xpi) = 413657
-SHA256 (xpi/thunderbird-i18n-31.0/es-AR.xpi) = 6467b60b34d140671737d1af81b88d18b09e427374a73c73daf95f59280af6e9
-SIZE (xpi/thunderbird-i18n-31.0/es-AR.xpi) = 438528
-SHA256 (xpi/thunderbird-i18n-31.0/es-ES.xpi) = 58707f9abfdb36f72b09c78c4469047d7ce43ac538b529d77141fd27b31a8b68
-SIZE (xpi/thunderbird-i18n-31.0/es-ES.xpi) = 374978
-SHA256 (xpi/thunderbird-i18n-31.0/et.xpi) = d1ed0b990d44be0317f150037a115b2652397ac0ca428a92972cfd0f6c0b213a
-SIZE (xpi/thunderbird-i18n-31.0/et.xpi) = 434361
-SHA256 (xpi/thunderbird-i18n-31.0/eu.xpi) = 8a569452945478c8ea436f24ca2d0b0067476094e3d83275f7cafce3dc61e551
-SIZE (xpi/thunderbird-i18n-31.0/eu.xpi) = 431446
-SHA256 (xpi/thunderbird-i18n-31.0/fi.xpi) = 847ab3e6bf668fb27a5b56c248ac506602ddb27054692956ccbfc857aa341358
-SIZE (xpi/thunderbird-i18n-31.0/fi.xpi) = 435630
-SHA256 (xpi/thunderbird-i18n-31.0/fr.xpi) = b6a8df2e7ddd74e4b115c8a507a8b09b79aa721537d77c44cac83b7b053505d7
-SIZE (xpi/thunderbird-i18n-31.0/fr.xpi) = 444141
-SHA256 (xpi/thunderbird-i18n-31.0/fy-NL.xpi) = 67430b6113dc2fa2606009f92580fb727d2827116d759cfb75fe3ae0587a249d
-SIZE (xpi/thunderbird-i18n-31.0/fy-NL.xpi) = 438542
-SHA256 (xpi/thunderbird-i18n-31.0/ga-IE.xpi) = 711efc1e1da56ef0c9e096f8fa1ce47715dd49b9b76b2f13a686b32e55dbc4a1
-SIZE (xpi/thunderbird-i18n-31.0/ga-IE.xpi) = 449359
-SHA256 (xpi/thunderbird-i18n-31.0/gd.xpi) = c375218c658607c40d27593ec75b83f937b361a3d8634557e1772abe32723aee
-SIZE (xpi/thunderbird-i18n-31.0/gd.xpi) = 453169
-SHA256 (xpi/thunderbird-i18n-31.0/gl.xpi) = efadaea55ac283c60f2092e9510c02aece8c9447830f0a648fe1afb2aa008815
-SIZE (xpi/thunderbird-i18n-31.0/gl.xpi) = 446785
-SHA256 (xpi/thunderbird-i18n-31.0/he.xpi) = 55cb02490acbbd34eebdbe05b5db90972c6c870d7c8bd18b2528d4ed2140a9dc
-SIZE (xpi/thunderbird-i18n-31.0/he.xpi) = 476108
-SHA256 (xpi/thunderbird-i18n-31.0/hr.xpi) = adc70cf28f04e0412b98705c457efb2001c1929494c1248c2237b51fac5073ab
-SIZE (xpi/thunderbird-i18n-31.0/hr.xpi) = 436977
-SHA256 (xpi/thunderbird-i18n-31.0/hu.xpi) = b82ed4a17349aaddb6298ec2152538f8ebf89642c222eb5bd8ba52fa0aa6c295
-SIZE (xpi/thunderbird-i18n-31.0/hu.xpi) = 454540
-SHA256 (xpi/thunderbird-i18n-31.0/hy-AM.xpi) = 87b39a9b72a892ce0825ca039b7b34c901ee48a0b8206fa6e64d5caefe182888
-SIZE (xpi/thunderbird-i18n-31.0/hy-AM.xpi) = 492763
-SHA256 (xpi/thunderbird-i18n-31.0/id.xpi) = 1409390f3ab8b3340ed1497fe38033f936fb35fcb99502f626d0da34a4bf6261
-SIZE (xpi/thunderbird-i18n-31.0/id.xpi) = 475874
-SHA256 (xpi/thunderbird-i18n-31.0/is.xpi) = c5bc5957acf8129ffde9ba0fb262ed7c2feddf88c97c1cc8bf49619ecce5dfff
-SIZE (xpi/thunderbird-i18n-31.0/is.xpi) = 437957
-SHA256 (xpi/thunderbird-i18n-31.0/it.xpi) = da5517cd37c21ec73d423a3b4efffe2ee587eb6a1ae1e3f05d2f539d2debc2c7
-SIZE (xpi/thunderbird-i18n-31.0/it.xpi) = 367999
-SHA256 (xpi/thunderbird-i18n-31.0/ja.xpi) = 7f4e51b28a6fe1164da52d0efa16f30db29f92a27f4babc09434b0cb6ca57074
-SIZE (xpi/thunderbird-i18n-31.0/ja.xpi) = 489264
-SHA256 (xpi/thunderbird-i18n-31.0/ko.xpi) = bb770426c776fc076655049c60f24b6e0dc797b04412172739b540e907058496
-SIZE (xpi/thunderbird-i18n-31.0/ko.xpi) = 448916
-SHA256 (xpi/thunderbird-i18n-31.0/lt.xpi) = 34227eeb66f796aeb7b0c55b17fb9705fdfabca9329bf063143f8eb0b836d9c3
-SIZE (xpi/thunderbird-i18n-31.0/lt.xpi) = 457810
-SHA256 (xpi/thunderbird-i18n-31.0/nb-NO.xpi) = d07c357b09adee7477b27720b22ba2840dafce8b10f3909968863e08d5c70043
-SIZE (xpi/thunderbird-i18n-31.0/nb-NO.xpi) = 430939
-SHA256 (xpi/thunderbird-i18n-31.0/nl.xpi) = 2094c7577c4e885f0c030d972947d2ccc3abcac9fcd2f927fc8541b567c8a35d
-SIZE (xpi/thunderbird-i18n-31.0/nl.xpi) = 431885
-SHA256 (xpi/thunderbird-i18n-31.0/nn-NO.xpi) = a35351f6a85807f90fd7c7a93978cd9d78e3c5bdd007d4f06974e457768b7177
-SIZE (xpi/thunderbird-i18n-31.0/nn-NO.xpi) = 433195
-SHA256 (xpi/thunderbird-i18n-31.0/pa-IN.xpi) = ce41c104128925d1b03cd2897997686e1f18d79a53fa4f83a401f413526abcfa
-SIZE (xpi/thunderbird-i18n-31.0/pa-IN.xpi) = 525320
-SHA256 (xpi/thunderbird-i18n-31.0/pl.xpi) = 9d12eec1c898e7f20f40134f6bffac186de015f39a3bf9e8bb3e6d3daca11af7
-SIZE (xpi/thunderbird-i18n-31.0/pl.xpi) = 410870
-SHA256 (xpi/thunderbird-i18n-31.0/pt-BR.xpi) = a678b187ac24ca1cabae53d064e5d748aa00a25ffbcb4c0b489449678561f1a9
-SIZE (xpi/thunderbird-i18n-31.0/pt-BR.xpi) = 450473
-SHA256 (xpi/thunderbird-i18n-31.0/pt-PT.xpi) = 61a1bc548da0e54f11b8bc5eb4440a2f62ca5a6d81e52f488c66588b87247c39
-SIZE (xpi/thunderbird-i18n-31.0/pt-PT.xpi) = 439601
-SHA256 (xpi/thunderbird-i18n-31.0/rm.xpi) = 6522ed5a7524a265b9b8d94c3cd7883b1eb69ace23b4844c6fda2649c92beee2
-SIZE (xpi/thunderbird-i18n-31.0/rm.xpi) = 439183
-SHA256 (xpi/thunderbird-i18n-31.0/ro.xpi) = 98edaf17dc690403a8dc3666e0949a3c2737f5855a81f19fb241078a8ee044be
-SIZE (xpi/thunderbird-i18n-31.0/ro.xpi) = 479744
-SHA256 (xpi/thunderbird-i18n-31.0/ru.xpi) = 3e12ee986ee7e69d44253a3ad93cc3776d3b03700100bcda14c357037139bcd6
-SIZE (xpi/thunderbird-i18n-31.0/ru.xpi) = 436153
-SHA256 (xpi/thunderbird-i18n-31.0/si.xpi) = 39845364164e805b9c9d4c1afa887419216842ac04cf9e0d9447cb0af0db0637
-SIZE (xpi/thunderbird-i18n-31.0/si.xpi) = 528810
-SHA256 (xpi/thunderbird-i18n-31.0/sk.xpi) = 390e494377e4c315941ac2650581ed7aa10afb62f65ac7080b8a3a367d758643
-SIZE (xpi/thunderbird-i18n-31.0/sk.xpi) = 452993
-SHA256 (xpi/thunderbird-i18n-31.0/sl.xpi) = 6bf7e8172f6532e44799517db99c7d2db29c7653dee8990fee4ac8a4c9b4bf6e
-SIZE (xpi/thunderbird-i18n-31.0/sl.xpi) = 433872
-SHA256 (xpi/thunderbird-i18n-31.0/sq.xpi) = 6d838ccf9ad458445724d7daafbe5a119405e00fc3b83ef369b911471fad18d0
-SIZE (xpi/thunderbird-i18n-31.0/sq.xpi) = 454692
-SHA256 (xpi/thunderbird-i18n-31.0/sr.xpi) = 7f3a9254300fc2484014d7337d6a776063cc6eb18fbedd18b918b9c65ab6b0ab
-SIZE (xpi/thunderbird-i18n-31.0/sr.xpi) = 537332
-SHA256 (xpi/thunderbird-i18n-31.0/sv-SE.xpi) = 00ca227318e586b8f0a821957358bc3f4e82dd835d9ebc8d4b6cb7951997fff6
-SIZE (xpi/thunderbird-i18n-31.0/sv-SE.xpi) = 436103
-SHA256 (xpi/thunderbird-i18n-31.0/ta-LK.xpi) = 25ecd571f6d36a210e7618f7a4b9080deebd0a23e4f67afaaea011d7f0106dc1
-SIZE (xpi/thunderbird-i18n-31.0/ta-LK.xpi) = 553506
-SHA256 (xpi/thunderbird-i18n-31.0/tr.xpi) = 41cb40d4080284e96239ff4a994d70dacfa4666b80b2500303a6cb8eb704e952
-SIZE (xpi/thunderbird-i18n-31.0/tr.xpi) = 457357
-SHA256 (xpi/thunderbird-i18n-31.0/uk.xpi) = 474c20ee148f732663b53164990934013b3c2620a26d3e9d320c28f83f8f2de9
-SIZE (xpi/thunderbird-i18n-31.0/uk.xpi) = 499654
-SHA256 (xpi/thunderbird-i18n-31.0/vi.xpi) = 36996d67d9c5f8948f0fae1373c559bb60afbe571865c874a5eeba0a82383ac3
-SIZE (xpi/thunderbird-i18n-31.0/vi.xpi) = 513833
-SHA256 (xpi/thunderbird-i18n-31.0/zh-CN.xpi) = 01310efee05f441f74f3d721bfdb24e94880fe450adf26689dedc31ee6483837
-SIZE (xpi/thunderbird-i18n-31.0/zh-CN.xpi) = 462666
-SHA256 (xpi/thunderbird-i18n-31.0/zh-TW.xpi) = e4b4b6d6b97cd77c6f3395c863042c390b1fa36a2fe012e77dfd5f7e3ddedd15
-SIZE (xpi/thunderbird-i18n-31.0/zh-TW.xpi) = 463406
+SHA256 (xpi/thunderbird-i18n-31.1.0/ar.xpi) = 3bdd4b046604dd43b2d29cf51045e2d37f77dcbf6f8f80072c9dbc41582a4229
+SIZE (xpi/thunderbird-i18n-31.1.0/ar.xpi) = 472810
+SHA256 (xpi/thunderbird-i18n-31.1.0/ast.xpi) = 0c19b6dc4f06069b4d89edb03fc1cf6c43adf3de92b629a22683282a616ada0e
+SIZE (xpi/thunderbird-i18n-31.1.0/ast.xpi) = 393048
+SHA256 (xpi/thunderbird-i18n-31.1.0/be.xpi) = f640832e434fc13c3e4fc86395a5dad8b4281ef5bc008708bbfc239dce558e56
+SIZE (xpi/thunderbird-i18n-31.1.0/be.xpi) = 427487
+SHA256 (xpi/thunderbird-i18n-31.1.0/bg.xpi) = 6f77a52a6d86e109a8555e085c0f917f7dc9c7038e8d1099424d68916341e513
+SIZE (xpi/thunderbird-i18n-31.1.0/bg.xpi) = 493734
+SHA256 (xpi/thunderbird-i18n-31.1.0/bn-BD.xpi) = 3589d16d373d4b8fd4364317bf43ab1b0ce61b4d627bcb85b12e9b0ecd28b1c3
+SIZE (xpi/thunderbird-i18n-31.1.0/bn-BD.xpi) = 555612
+SHA256 (xpi/thunderbird-i18n-31.1.0/br.xpi) = 7c0160a2e9115f11a98f0571f8e85495ed9d9afcf2dc5d30b4b3f557d551a519
+SIZE (xpi/thunderbird-i18n-31.1.0/br.xpi) = 441444
+SHA256 (xpi/thunderbird-i18n-31.1.0/ca.xpi) = e5daa36ddf547a065816c67bae89b1637364fde044a03899a2f1f51bb1bb9161
+SIZE (xpi/thunderbird-i18n-31.1.0/ca.xpi) = 441712
+SHA256 (xpi/thunderbird-i18n-31.1.0/cs.xpi) = 926a631f22534cd475a2ca488a9b6ca9a749d50ae9bc4ec287bc57ca8fb58944
+SIZE (xpi/thunderbird-i18n-31.1.0/cs.xpi) = 444700
+SHA256 (xpi/thunderbird-i18n-31.1.0/da.xpi) = c5bda3505df4de80cef6d5f0269bc1622f8be4c51d74658f37f3ce987381ff62
+SIZE (xpi/thunderbird-i18n-31.1.0/da.xpi) = 422051
+SHA256 (xpi/thunderbird-i18n-31.1.0/de.xpi) = 16ee968e3c6d8d9f5a652a93ede4b5a399c871e2595b135617479cd7d3792315
+SIZE (xpi/thunderbird-i18n-31.1.0/de.xpi) = 424664
+SHA256 (xpi/thunderbird-i18n-31.1.0/el.xpi) = 80e078d8ed6be3481431d698925611391728e303d9a86afb8cecdc918e51b072
+SIZE (xpi/thunderbird-i18n-31.1.0/el.xpi) = 484855
+SHA256 (xpi/thunderbird-i18n-31.1.0/en-GB.xpi) = baa60e58a02c3d3b8ad65839cf1f65332561f3341f7739a9c4d5a77e5387dcfe
+SIZE (xpi/thunderbird-i18n-31.1.0/en-GB.xpi) = 412515
+SHA256 (xpi/thunderbird-i18n-31.1.0/en-US.xpi) = 29443d68c3bd260cf104ba64dfd302687ed272569f5840cc8cdee3cec88d3499
+SIZE (xpi/thunderbird-i18n-31.1.0/en-US.xpi) = 413659
+SHA256 (xpi/thunderbird-i18n-31.1.0/es-AR.xpi) = fa810d84e57445dc842413b4eee41ff2cda0a685c46799a92740436bb72a4d9b
+SIZE (xpi/thunderbird-i18n-31.1.0/es-AR.xpi) = 438530
+SHA256 (xpi/thunderbird-i18n-31.1.0/es-ES.xpi) = 380563fa13b9387fcc48067f9f5a9224e671c6b1a5d6417f93b460a75964a714
+SIZE (xpi/thunderbird-i18n-31.1.0/es-ES.xpi) = 374979
+SHA256 (xpi/thunderbird-i18n-31.1.0/et.xpi) = 3ef7f838cbee111a2031a4acad6dea5077c111860f49bb7f7866827b943de3d3
+SIZE (xpi/thunderbird-i18n-31.1.0/et.xpi) = 434363
+SHA256 (xpi/thunderbird-i18n-31.1.0/eu.xpi) = a0943d85b3255d6bb17fcf92f512d91ad21208ef6251de556012e07819ebba5d
+SIZE (xpi/thunderbird-i18n-31.1.0/eu.xpi) = 431448
+SHA256 (xpi/thunderbird-i18n-31.1.0/fi.xpi) = f03066aa7db8e1efeb40d0fd7b8a22e1ebeef86ea3e2ee349413fdf29381b4a0
+SIZE (xpi/thunderbird-i18n-31.1.0/fi.xpi) = 435631
+SHA256 (xpi/thunderbird-i18n-31.1.0/fr.xpi) = 8649d6923dbd8997be6b7f1736571cfc751b7f2b3f13fabbf7a9dc77c33bb47a
+SIZE (xpi/thunderbird-i18n-31.1.0/fr.xpi) = 444143
+SHA256 (xpi/thunderbird-i18n-31.1.0/fy-NL.xpi) = 0b11553a7795585462f983cf329322bc08665a168c1af8a14bbe563d80225bef
+SIZE (xpi/thunderbird-i18n-31.1.0/fy-NL.xpi) = 438544
+SHA256 (xpi/thunderbird-i18n-31.1.0/ga-IE.xpi) = 948440485b1c97d753d035c1095734db50a224236306d1d9f23e064197ff9f8d
+SIZE (xpi/thunderbird-i18n-31.1.0/ga-IE.xpi) = 449362
+SHA256 (xpi/thunderbird-i18n-31.1.0/gd.xpi) = 0aab77a9ccafa20dae350a173b7d4a9abffedc6d720a0d49855ac193b53db306
+SIZE (xpi/thunderbird-i18n-31.1.0/gd.xpi) = 453171
+SHA256 (xpi/thunderbird-i18n-31.1.0/gl.xpi) = 865a6474c146b29fb0469b3a99b3f5b6492ae594cdcf0b5dd9df081529634f53
+SIZE (xpi/thunderbird-i18n-31.1.0/gl.xpi) = 446787
+SHA256 (xpi/thunderbird-i18n-31.1.0/he.xpi) = 9cbdf3cb6e4a576fece60636bc6d47fc5c1f98521021edfc21fcbe4c50627a4d
+SIZE (xpi/thunderbird-i18n-31.1.0/he.xpi) = 476111
+SHA256 (xpi/thunderbird-i18n-31.1.0/hr.xpi) = a44318d8ecc80da9ac306cdc4bc804185cbf4556bc772c48ff73286f12bf5bca
+SIZE (xpi/thunderbird-i18n-31.1.0/hr.xpi) = 436983
+SHA256 (xpi/thunderbird-i18n-31.1.0/hu.xpi) = 1817ec0921a34b5facbcbdf9eb631aeb08c163cda86d0d570eddf9d36f66d836
+SIZE (xpi/thunderbird-i18n-31.1.0/hu.xpi) = 454541
+SHA256 (xpi/thunderbird-i18n-31.1.0/hy-AM.xpi) = ba15083ecdd2a5b56f45f7c2fee486f006e1d686c0554acae884479457808b56
+SIZE (xpi/thunderbird-i18n-31.1.0/hy-AM.xpi) = 492768
+SHA256 (xpi/thunderbird-i18n-31.1.0/id.xpi) = b7fdef3f352700a889ab7715fb34461567fb8e40b14c1c631aaff42a4693f831
+SIZE (xpi/thunderbird-i18n-31.1.0/id.xpi) = 475875
+SHA256 (xpi/thunderbird-i18n-31.1.0/is.xpi) = 20930236af265efe0826b1f1c2266e60a197812131c9ce659859a15f24149462
+SIZE (xpi/thunderbird-i18n-31.1.0/is.xpi) = 437959
+SHA256 (xpi/thunderbird-i18n-31.1.0/it.xpi) = 69766a4bdd55feab8d73df0ce36a8f5116a7c8c91b6d26e32ca18ca9adee1d42
+SIZE (xpi/thunderbird-i18n-31.1.0/it.xpi) = 368000
+SHA256 (xpi/thunderbird-i18n-31.1.0/ja.xpi) = e1b7633b1691ee36271312ecdbe5e2907ca8b9e2b46fdba26003d54c1daa8b40
+SIZE (xpi/thunderbird-i18n-31.1.0/ja.xpi) = 489266
+SHA256 (xpi/thunderbird-i18n-31.1.0/ko.xpi) = 2225b22692faf76945e9c6ec7e240f8cd7ba76704c1ac9e2f6cef45da6f86ef9
+SIZE (xpi/thunderbird-i18n-31.1.0/ko.xpi) = 448919
+SHA256 (xpi/thunderbird-i18n-31.1.0/lt.xpi) = da100c0594b57277b5ea8084eebeb9faa1dd4e4b23c9977d41422f6e129dcbcf
+SIZE (xpi/thunderbird-i18n-31.1.0/lt.xpi) = 457812
+SHA256 (xpi/thunderbird-i18n-31.1.0/nb-NO.xpi) = 65878db5a493cc3228f2048a9628aeee117282a53db2a30f00fff69ce722e187
+SIZE (xpi/thunderbird-i18n-31.1.0/nb-NO.xpi) = 430941
+SHA256 (xpi/thunderbird-i18n-31.1.0/nl.xpi) = f9ec7b3d25962ea316da43eed789044a6eba41c22595fda0ce71254efff41798
+SIZE (xpi/thunderbird-i18n-31.1.0/nl.xpi) = 431887
+SHA256 (xpi/thunderbird-i18n-31.1.0/nn-NO.xpi) = 55c1fcbeafeedbef2d974924ab19283b9049ae5f2f46b1fcb2903c631f54d028
+SIZE (xpi/thunderbird-i18n-31.1.0/nn-NO.xpi) = 433197
+SHA256 (xpi/thunderbird-i18n-31.1.0/pa-IN.xpi) = 2f01bce3c7a6c2e39d76d5e7ec8757cb805d7e42d9b32deb5d3fa29502686c54
+SIZE (xpi/thunderbird-i18n-31.1.0/pa-IN.xpi) = 525323
+SHA256 (xpi/thunderbird-i18n-31.1.0/pl.xpi) = f5d737033597bd560a503b68cb7e58343a23533a18ac182f1f08a9c56a57aa68
+SIZE (xpi/thunderbird-i18n-31.1.0/pl.xpi) = 410872
+SHA256 (xpi/thunderbird-i18n-31.1.0/pt-BR.xpi) = fdeddd53df5cb650253383e10558d493714dc059ac6a2ab114a552db8f733859
+SIZE (xpi/thunderbird-i18n-31.1.0/pt-BR.xpi) = 450476
+SHA256 (xpi/thunderbird-i18n-31.1.0/pt-PT.xpi) = e93691ec54708ff10fbccb43f766f0a6ef8996c0302046d75966abeabde7341c
+SIZE (xpi/thunderbird-i18n-31.1.0/pt-PT.xpi) = 439603
+SHA256 (xpi/thunderbird-i18n-31.1.0/rm.xpi) = 7672a6fb5d7e68e54463a9778262f3a988aa02d45bda8ce5e295d5b18d5436b6
+SIZE (xpi/thunderbird-i18n-31.1.0/rm.xpi) = 439185
+SHA256 (xpi/thunderbird-i18n-31.1.0/ro.xpi) = 79fd5f430a6946679fb58a3609b10dd8e9119acad1d3cc79370c1b5ef8d1ca1e
+SIZE (xpi/thunderbird-i18n-31.1.0/ro.xpi) = 479746
+SHA256 (xpi/thunderbird-i18n-31.1.0/ru.xpi) = 04f21ff5c10a75cd4f333269b71f3375c7e79894af0784c0940676a6586618f6
+SIZE (xpi/thunderbird-i18n-31.1.0/ru.xpi) = 436155
+SHA256 (xpi/thunderbird-i18n-31.1.0/si.xpi) = 813a638a3d8a9d123887a473aee5775f4389ae5d5bafca69f84ced3ec74391bb
+SIZE (xpi/thunderbird-i18n-31.1.0/si.xpi) = 528811
+SHA256 (xpi/thunderbird-i18n-31.1.0/sk.xpi) = 4eb1d225c047114803c2b2b43d78fecd75eaadcc47e8aebfd824f421cf2ecca5
+SIZE (xpi/thunderbird-i18n-31.1.0/sk.xpi) = 452995
+SHA256 (xpi/thunderbird-i18n-31.1.0/sl.xpi) = 905cb92682a6c3cd62545942699803d70d2fa0280b110565240d1b788757cc39
+SIZE (xpi/thunderbird-i18n-31.1.0/sl.xpi) = 433874
+SHA256 (xpi/thunderbird-i18n-31.1.0/sq.xpi) = 5ecc9feb46824c72a325fe4d6a7591b61b10ee41f2f2f872a74fd6d0ff5caa46
+SIZE (xpi/thunderbird-i18n-31.1.0/sq.xpi) = 454694
+SHA256 (xpi/thunderbird-i18n-31.1.0/sr.xpi) = e58f032465419beb1327e2ab1f4cdd06ad1dec72fca1aa2e521ddd3d8bf5be18
+SIZE (xpi/thunderbird-i18n-31.1.0/sr.xpi) = 537334
+SHA256 (xpi/thunderbird-i18n-31.1.0/sv-SE.xpi) = aa0fe96db9e5aedc2a4f13d8716d47a2f2f982d1c05ad0ed22185d98e3567fee
+SIZE (xpi/thunderbird-i18n-31.1.0/sv-SE.xpi) = 436104
+SHA256 (xpi/thunderbird-i18n-31.1.0/ta-LK.xpi) = b2206f4464d40a0fac5ca583deb0927381acf725a7673ceb0561b7b89f37592c
+SIZE (xpi/thunderbird-i18n-31.1.0/ta-LK.xpi) = 553508
+SHA256 (xpi/thunderbird-i18n-31.1.0/tr.xpi) = 8789a90e44469ecdddbd48b0d5f4e2539a1e1b67d02358b46c2c8f98d834603a
+SIZE (xpi/thunderbird-i18n-31.1.0/tr.xpi) = 457359
+SHA256 (xpi/thunderbird-i18n-31.1.0/uk.xpi) = b082f8232355a147e9350b0f3ec5f4637d2ead8a1a63a0770104a8e054481b97
+SIZE (xpi/thunderbird-i18n-31.1.0/uk.xpi) = 499656
+SHA256 (xpi/thunderbird-i18n-31.1.0/vi.xpi) = 6ea664760588a68d9e3157fe3eea238c107067ab287e122bf63f902a564b9340
+SIZE (xpi/thunderbird-i18n-31.1.0/vi.xpi) = 513835
+SHA256 (xpi/thunderbird-i18n-31.1.0/zh-CN.xpi) = 38e3636d46a8f80245f4ccd07e8e7c5812f8743552fdc5edb2cc5ba3205add3d
+SIZE (xpi/thunderbird-i18n-31.1.0/zh-CN.xpi) = 462667
+SHA256 (xpi/thunderbird-i18n-31.1.0/zh-TW.xpi) = 5b204c71f1453ae9a2a6e793967dc432266b7e498e6c8129ef89c1c99ed0f9d5
+SIZE (xpi/thunderbird-i18n-31.1.0/zh-TW.xpi) = 463407

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/thunderbird/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	31.0
+DISTVERSION=	31.1.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
@@ -29,12 +29,11 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/
 
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
-EM_VERSION=	1.7
-L_VERSION=	3.3
+EM_VERSION=	1.7.2
+L_VERSION=	3.3.1
 
 SSP_UNSAFE=	yes
 USE_AUTOTOOLS=	autoconf213:env
-USE_PYTHON_BUILD=2
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 USE_MOZILLA=	-cairo
@@ -166,7 +165,7 @@ post-configure:
 		${SETENV} ${MAKE_ENV} ./configure
 
 post-build:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \
+	${DO_MAKE_BUILD:S/${MAKEFILE}/Makefile/} all xpi \
 		-C ${WRKSRC}/mailnews/extensions/enigmail
 .endif
 

Modified: head/mail/thunderbird/distinfo
==============================================================================
--- head/mail/thunderbird/distinfo	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/mail/thunderbird/distinfo	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-31.0.source.tar.bz2) = 571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4
-SIZE (thunderbird-31.0.source.tar.bz2) = 170977129
-SHA256 (enigmail-1.7.tar.gz) = cddbf35783194a4e994f9584ad5bee74750e25f690e81727ba9eccc4f814f161
-SIZE (enigmail-1.7.tar.gz) = 1414100
+SHA256 (thunderbird-31.1.0.source.tar.bz2) = f6a8f2fce1958c692dce7351caf5a7d78433c7be30e2a89a414e0ef6727081ea
+SIZE (thunderbird-31.1.0.source.tar.bz2) = 170726889
+SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6
+SIZE (enigmail-1.7.2.tar.gz) = 1420346

Added: head/mail/thunderbird/files/patch-bug1046224
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/thunderbird/files/patch-bug1046224	Tue Sep  9 06:16:35 2014	(r367712)
@@ -0,0 +1,26 @@
+diff --git configure.in configure.in
+index 1853029..559bd45 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -2651,7 +2651,7 @@ if test "$ac_cv_sockaddr_sa_len" = true ; then
+   AC_DEFINE(HAVE_SA_LEN)
+ fi
+ 
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+               [  --enable-dtrace         build with dtrace support if available (default=no)],
+               [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
+diff --git js/src/configure.in js/src/configure.in
+index 134dfd3..682c1fb 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2153,7 +2153,7 @@ dnl Quota support
+ MOZ_CHECK_HEADERS(sys/quota.h)
+ MOZ_CHECK_HEADERS(linux/quota.h)
+ 
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+               [  --enable-dtrace         build with dtrace support if available (default=no)],
+               [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then

Modified: head/net-im/Makefile
==============================================================================
--- head/net-im/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/net-im/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -63,6 +63,7 @@
     SUBDIR += licq-msn
     SUBDIR += licq-osd
     SUBDIR += licq-qt-gui
+    SUBDIR += linux-instantbird
     SUBDIR += loudmouth
     SUBDIR += mbpurple
     SUBDIR += mcabber

Added: head/net-im/linux-instantbird/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/linux-instantbird/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	instantbird
+DISTVERSION=	1.5
+DISTVERSIONSUFFIX=.${LOCALE}.linux-i686
+CATEGORIES=	net-im irc ipv6
+MASTER_SITES=	http://ftp.instantbird.com/instantbird/releases/${DISTVERSION}/ \
+		GOOGLE_CODE
+
+MAINTAINER=	gecko@FreeBSD.org
+COMMENT=	Instant Messaging client based on XULRunner and libpurple
+
+USES=		tar:bzip2
+USE_LINUX_APPS=	libxml2 #avahiglib avahilibs
+
+ALL_LOCALES=	cs de en-US es-ES et fr nl pl pt-BR ru sk sv-SE uk
+LOCALE=		${${PORT_OPTIONS:MLANG_*}}
+PLIST_SUB=	LOCALE="${LOCALE}"
+EXTRACT_AFTER_ARGS=--exclude '*/searchplugins'
+
+OPTIONS_DEFAULT=LANG_US
+OPTIONS_SINGLE=	L10N
+
+L10N_DESC?= 	Localization
+
+.for l in ${ALL_LOCALES}
+OPTIONS_SINGLE_L10N+=LANG_${l:tu:C/.*-//}
+LANG_${l:tu:C/.*-//}= ${l}
+. if defined(PACKAGE_BUILDING)
+DISTFILES+=	${DISTNAME:S/${LOCALE}/${l}/}${EXTRACT_SUFX}
+. endif
+.endfor
+
+.include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common"
+.include <bsd.port.mk>

Added: head/net-im/linux-instantbird/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/linux-instantbird/distinfo	Tue Sep  9 06:16:35 2014	(r367712)
@@ -0,0 +1,26 @@
+SHA256 (instantbird-1.5.cs.linux-i686.tar.bz2) = f57914e1ebf4f35bf058f95391dc2290097fb212a5ddd92ecc37b7de7c4bea1c
+SIZE (instantbird-1.5.cs.linux-i686.tar.bz2) = 23914169
+SHA256 (instantbird-1.5.de.linux-i686.tar.bz2) = 3cfd4e3eefda9c38db9df79b8c4711bf0398cfce9d9700db9ae2f721ed57a684
+SIZE (instantbird-1.5.de.linux-i686.tar.bz2) = 23906578
+SHA256 (instantbird-1.5.en-US.linux-i686.tar.bz2) = 2a97ac4433616bcf930508a72d0dcf5e60cf5e0ebafa828c49176e1a6aeb1067
+SIZE (instantbird-1.5.en-US.linux-i686.tar.bz2) = 24209711
+SHA256 (instantbird-1.5.es-ES.linux-i686.tar.bz2) = 1ecc4b0e56d09394f372dad23f23f36f0533356e20ba68ef1c1a4c2003ff8e33
+SIZE (instantbird-1.5.es-ES.linux-i686.tar.bz2) = 23881047
+SHA256 (instantbird-1.5.et.linux-i686.tar.bz2) = 1fae7a62de2fd3706b943bf302ed5d3f94285859a3820493666a3796857f973f
+SIZE (instantbird-1.5.et.linux-i686.tar.bz2) = 24786664
+SHA256 (instantbird-1.5.fr.linux-i686.tar.bz2) = ad67f9c44e41858e5ac7a0ce2a0561d059f2382db6a1a7d70da79547fcd0735e
+SIZE (instantbird-1.5.fr.linux-i686.tar.bz2) = 24359684
+SHA256 (instantbird-1.5.nl.linux-i686.tar.bz2) = 67ab8e00c33f31b2fdb2e476bb85dd83ade8a3fa2ba30fcc9de2de36a28095b1
+SIZE (instantbird-1.5.nl.linux-i686.tar.bz2) = 24758053
+SHA256 (instantbird-1.5.pl.linux-i686.tar.bz2) = d528eb9aa085349853bcfd516d38894b36c34110a8b5dac53e61f21581ac5b2e
+SIZE (instantbird-1.5.pl.linux-i686.tar.bz2) = 25028515
+SHA256 (instantbird-1.5.pt-BR.linux-i686.tar.bz2) = 12b7630d7580af72b22e164702ff36bdbd436de5b44be03e8aa508f77f3aa876
+SIZE (instantbird-1.5.pt-BR.linux-i686.tar.bz2) = 24164134
+SHA256 (instantbird-1.5.ru.linux-i686.tar.bz2) = ce02f9d6e18183cae675a5d790c899b5c0696b234d2de5e0cb944a803c6b5fde
+SIZE (instantbird-1.5.ru.linux-i686.tar.bz2) = 24530383
+SHA256 (instantbird-1.5.sk.linux-i686.tar.bz2) = 3b66fd22b120581db09f734be2481287201d4afd2ca96fb4ce0a24ff72ee4b9d
+SIZE (instantbird-1.5.sk.linux-i686.tar.bz2) = 24830908
+SHA256 (instantbird-1.5.sv-SE.linux-i686.tar.bz2) = 331267db5bbd4086a48d848b491405ab688b6a4b66fa4b2726961e51de49ddb0
+SIZE (instantbird-1.5.sv-SE.linux-i686.tar.bz2) = 24342717
+SHA256 (instantbird-1.5.uk.linux-i686.tar.bz2) = 46f3f9ed19fb24cbafdab6c8fe8c923ec7ef8722407d93c49e8aa1026ed4aa47
+SIZE (instantbird-1.5.uk.linux-i686.tar.bz2) = 24371090

Added: head/net-im/linux-instantbird/files/linux-instantbird.desktop.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/linux-instantbird/files/linux-instantbird.desktop.in	Tue Sep  9 06:16:35 2014	(r367712)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Instantbird (Linux)
+GenericName=IM client (Linux)
+Comment=Instant Messaging and IRC client
+Exec=linux-instantbird %u
+Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default48.png
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Network;InstantMessaging;IRCClient;Chat;

Added: head/net-im/linux-instantbird/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/linux-instantbird/pkg-descr	Tue Sep  9 06:16:35 2014	(r367712)
@@ -0,0 +1,7 @@
+Instantbird is a cross-platform instant messaging client based on
+Mozilla's XULRunner and the open source library libpurple used in
+Pidgin. Instantbird is free software available under the GNU General
+Public License. Over 250 add-ons allow user customization of, and
+addition of, features. -- Wikipedia
+
+WWW: http://instantbird.com/

Added: head/net-im/linux-instantbird/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/linux-instantbird/pkg-plist	Tue Sep  9 06:16:35 2014	(r367712)
@@ -0,0 +1,74 @@
+bin/%%APP_NAME%%
+share/applications/%%APP_NAME%%.desktop
+lib/%%APP_NAME%%/Throbber-small.gif
+lib/%%APP_NAME%%/application.ini
+lib/%%APP_NAME%%/chrome.manifest
+lib/%%APP_NAME%%/chrome/icons/default/blistWindow.png
+lib/%%APP_NAME%%/chrome/icons/default/blistWindow16.png
+lib/%%APP_NAME%%/chrome/icons/default/blistWindow48.png
+lib/%%APP_NAME%%/chrome/icons/default/convWindow.png
+lib/%%APP_NAME%%/chrome/icons/default/convWindow16.png
+lib/%%APP_NAME%%/chrome/icons/default/convWindow48.png
+lib/%%APP_NAME%%/chrome/icons/default/default.png
+lib/%%APP_NAME%%/chrome/icons/default/default16.png
+lib/%%APP_NAME%%/chrome/icons/default/default48.png
+lib/%%APP_NAME%%/components/components.manifest
+lib/%%APP_NAME%%/components/libbonjour.so
+lib/%%APP_NAME%%/components/libmozgnome.so
+lib/%%APP_NAME%%/components/libpurplexpcom.so
+lib/%%APP_NAME%%/components/libtrayToolkit.so
+lib/%%APP_NAME%%/crashreporter
+lib/%%APP_NAME%%/crashreporter.ini
+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/%%LOCALE%%.aff
+lib/%%APP_NAME%%/dictionaries/%%LOCALE%%.dic
+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
+lib/%%APP_NAME%%/icons/default16.png
+lib/%%APP_NAME%%/icons/mozicon128.png
+lib/%%APP_NAME%%/icons/updater.png
+lib/%%APP_NAME%%/instantbird
+lib/%%APP_NAME%%/instantbird-bin
+lib/%%APP_NAME%%/libfreebl3.chk
+lib/%%APP_NAME%%/libfreebl3.so
+lib/%%APP_NAME%%/libmozalloc.so
+lib/%%APP_NAME%%/libmozsqlite3.so
+lib/%%APP_NAME%%/libnspr4.so
+lib/%%APP_NAME%%/libnss3.so
+lib/%%APP_NAME%%/libnssckbi.so
+lib/%%APP_NAME%%/libnssdbm3.chk
+lib/%%APP_NAME%%/libnssdbm3.so
+lib/%%APP_NAME%%/libnssutil3.so
+lib/%%APP_NAME%%/libplc4.so
+lib/%%APP_NAME%%/libplds4.so
+lib/%%APP_NAME%%/libsmime3.so
+lib/%%APP_NAME%%/libsoftokn3.chk
+lib/%%APP_NAME%%/libsoftokn3.so
+lib/%%APP_NAME%%/libssl3.so
+lib/%%APP_NAME%%/libxul.so
+lib/%%APP_NAME%%/mozilla-xremote-client
+lib/%%APP_NAME%%/omni.ja
+lib/%%APP_NAME%%/platform.ini
+lib/%%APP_NAME%%/plugin-container
+lib/%%APP_NAME%%/plugins
+lib/%%APP_NAME%%/precomplete
+lib/%%APP_NAME%%/removed-files
+lib/%%APP_NAME%%/run-mozilla.sh
+lib/%%APP_NAME%%/updater
+lib/%%APP_NAME%%/updater.ini
+@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
+@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
+@dirrm lib/%%APP_NAME%%/chrome/icons/default
+@dirrm lib/%%APP_NAME%%/chrome/icons
+@dirrm lib/%%APP_NAME%%/chrome
+@dirrm lib/%%APP_NAME%%/components
+@dirrm lib/%%APP_NAME%%/defaults/pref
+@dirrm lib/%%APP_NAME%%/defaults
+@dirrm lib/%%APP_NAME%%/dictionaries
+@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/%%APP_NAME%%/extensions
+@dirrm lib/%%APP_NAME%%/icons
+@dirrm lib/%%APP_NAME%%

Modified: head/security/ca_root_nss/Makefile
==============================================================================
--- head/security/ca_root_nss/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/security/ca_root_nss/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -14,6 +14,7 @@ ETCSYMLINK_DESC=	Add symlink to /etc/ssl
 
 USES=		perl5
 USE_PERL5=	build
+NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 CERTDIR?=	share/certs
@@ -24,7 +25,7 @@ PLIST_SUB+=	CERTDIR=${CERTDIR}
 # !!!  Please DO NOT submit patches for new version until it has !!!
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS=	3.16.3
+VERSION_NSS=	3.17
 #NSS_SUFFIX=	.with.ckbi.1.93
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl

Modified: head/security/ca_root_nss/distinfo
==============================================================================
--- head/security/ca_root_nss/distinfo	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/security/ca_root_nss/distinfo	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.16.3.tar.gz) = 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60
-SIZE (nss-3.16.3.tar.gz) = 6426732
+SHA256 (nss-3.17.tar.gz) = 3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81
+SIZE (nss-3.17.tar.gz) = 6429534

Modified: head/www/firefox-esr-i18n/Makefile
==============================================================================
--- head/www/firefox-esr-i18n/Makefile	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/www/firefox-esr-i18n/Makefile	Tue Sep  9 06:16:35 2014	(r367712)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-PORTVERSION=	24.7.0
+PORTVERSION=	31.1.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
 PKGNAMEPREFIX=

Modified: head/www/firefox-esr-i18n/Makefile.lang
==============================================================================
--- head/www/firefox-esr-i18n/Makefile.lang	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/www/firefox-esr-i18n/Makefile.lang	Tue Sep  9 06:16:35 2014	(r367712)
@@ -1,13 +1,13 @@
 # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
 
-FIREFOX_I18N_ALL_=	ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb  \
-			cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES     \
-			es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he     \
-			hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt \
-			lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR   \
-			pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th \
-			tr uk vi zh-CN zh-TW zu
+FIREFOX_I18N_ALL_=	ach af an ar as ast be bg bn-BD bn-IN br bs ca cs	\
+			csb cy da de el en-GB en-US en-ZA eo es-AR es-CL	\
+			es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl		\
+			gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km	\
+			kn ko ku lij lt lv mai mk ml mr ms nb-NO nl nn-NO	\
+			or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq	\
+			sr sv-SE ta te th tr uk vi xh zh-CN zh-TW zu
 
 .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
 FIREFOX_I18N=   ${FIREFOX_I18N_ALL_}
@@ -18,8 +18,8 @@ FIREFOX_I18N+=  ach
 .if ${PORT_OPTIONS:MLANG_AF}
 FIREFOX_I18N+=  af
 .endif
-.if ${PORT_OPTIONS:MLANG_AK}
-FIREFOX_I18N+=  ak
+.if ${PORT_OPTIONS:MLANG_AN}
+FIREFOX_I18N+=  an
 .endif
 .if ${PORT_OPTIONS:MLANG_AR}
 FIREFOX_I18N+=  ar
@@ -135,6 +135,9 @@ FIREFOX_I18N+=  hi-IN
 .if ${PORT_OPTIONS:MLANG_HR}
 FIREFOX_I18N+=  hr
 .endif
+.if ${PORT_OPTIONS:MLANG_HSB}
+FIREFOX_I18N+=  hsb
+.endif
 .if ${PORT_OPTIONS:MLANG_HU}
 FIREFOX_I18N+=  hu
 .endif
@@ -168,9 +171,6 @@ FIREFOX_I18N+=  ko
 .if ${PORT_OPTIONS:MLANG_KU}
 FIREFOX_I18N+=  ku
 .endif
-.if ${PORT_OPTIONS:MLANG_LG}
-FIREFOX_I18N+=  lg
-.endif
 .if ${PORT_OPTIONS:MLANG_LIJ}
 FIREFOX_I18N+=  lij
 .endif
@@ -192,6 +192,9 @@ FIREFOX_I18N+=  ml
 .if ${PORT_OPTIONS:MLANG_MR}
 FIREFOX_I18N+=  mr
 .endif
+.if ${PORT_OPTIONS:MLANG_MS}
+FIREFOX_I18N+=  ms
+.endif
 .if ${PORT_OPTIONS:MLANG_NB}
 FIREFOX_I18N+=  nb-NO
 .endif
@@ -201,9 +204,6 @@ FIREFOX_I18N+=  nl
 .if ${PORT_OPTIONS:MLANG_NN}
 FIREFOX_I18N+=  nn-NO
 .endif
-.if ${PORT_OPTIONS:MLANG_NSO}
-FIREFOX_I18N+=  nso
-.endif
 .if ${PORT_OPTIONS:MLANG_OR}
 FIREFOX_I18N+=  or
 .endif
@@ -249,12 +249,12 @@ FIREFOX_I18N+=  sr
 .if ${PORT_OPTIONS:MLANG_SV}
 FIREFOX_I18N+=  sv-SE
 .endif
+.if ${PORT_OPTIONS:MLANG_SW}
+FIREFOX_I18N+=  sw
+.endif
 .if ${PORT_OPTIONS:MLANG_TA}
 FIREFOX_I18N+=  ta
 .endif
-.if ${PORT_OPTIONS:MLANG_LK}
-FIREFOX_I18N+=  ta-LK
-.endif
 .if ${PORT_OPTIONS:MLANG_TE}
 FIREFOX_I18N+=  te
 .endif
@@ -270,6 +270,9 @@ FIREFOX_I18N+=  uk
 .if ${PORT_OPTIONS:MLANG_VI}
 FIREFOX_I18N+=  vi
 .endif
+.if ${PORT_OPTIONS:MLANG_XH}
+FIREFOX_I18N+=  xh
+.endif
 .if ${PORT_OPTIONS:MLANG_CN}
 FIREFOX_I18N+=  zh-CN
 .endif

Modified: head/www/firefox-esr-i18n/Makefile.option
==============================================================================
--- head/www/firefox-esr-i18n/Makefile.option	Tue Sep  9 00:54:51 2014	(r367711)
+++ head/www/firefox-esr-i18n/Makefile.option	Tue Sep  9 06:16:35 2014	(r367712)
@@ -3,7 +3,7 @@
 
 OPTIONS_DEFINE=	LANG_ACH \
 		LANG_AF \
-		LANG_AK \
+		LANG_AN \
 		LANG_SQ \
 		LANG_AR \
 		LANG_AS \
@@ -39,6 +39,7 @@ OPTIONS_DEFINE=	LANG_ACH \
 		LANG_HE \
 		LANG_HI \
 		LANG_HR \
+		LANG_HSB \
 		LANG_HU \
 		LANG_IS \
 		LANG_ID \
@@ -51,21 +52,20 @@ OPTIONS_DEFINE=	LANG_ACH \
 		LANG_KU \
 		LANG_LV \
 		LANG_LT \
-		LANG_LG \
 		LANG_LIJ \
 		LANG_MK \
 		LANG_MAI \
 		LANG_ML \
 		LANG_MR \
 		LANG_MN \
-		LANG_NSO \
+		LANG_MS \
 		LANG_NB \
 		LANG_NN \
 		LANG_OR \
 		LANG_FA \
 		LANG_PL \
 		LANG_PT \
-		LANG_PBR \
+		LANG_PBR\
 		LANG_PA \
 		LANG_RO \
 		LANG_RM \
@@ -82,13 +82,13 @@ OPTIONS_DEFINE=	LANG_ACH \
 		LANG_SV \
 		LANG_TW \
 		LANG_TA \
-		LANG_LK \
 		LANG_TE \
 		LANG_TH \
 		LANG_TR \
 		LANG_UK \
 		LANG_VI \
 		LANG_CY \
+		LANG_XH \
 		LANG_ZA \
 		LANG_ZU
 
@@ -97,8 +97,13 @@ OPTIONS_DEFAULT=LANG_AR LANG_BN LANG_BR 
 		LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE
 
 LANG_ACH_DESC?=	Acholi language support
+LANG_AN_DESC?=	Aragonese language support
 LANG_AS_DESC?=	Assamese language support
 LANG_CSB_DESC?=	Kashubian language support

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



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