- update firefox, thunderbird, linux-firefox and linux-thunderbird to 17.0.2

- update firefox-esr, thunderbird-esr and libxul to 10.0.12
- update linux-seamonkey to 2.15

Security:	http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html

12 files changed, 84 insertions, 53 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2c04f1dd17be..0eae44c8b1f5 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	17.0.1
+DISTVERSION=	17.0.2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}.source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
+DISTNAME=	${PORTNAME}-${DISTVERSION}esr.source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -53,7 +53,7 @@ OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
 
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/mozilla-release
+WRKSRC:=	${WRKDIR}/mozilla-esr17
 
 .if ${ARCH} == amd64
 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index cfe88fa602b4..1170b6ce6919 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -17,3 +17,4 @@ LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
 LOGGING_DESC?=		Additional log messages
 QT4_DESC?=		Qt GUI (EXPERIMENTAL, bug 521582)
+WEBRTC_DESC?=		Web Real-Time Communication
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index d01bd869b05c..a7e07589b3a6 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0.1.source.tar.bz2) = bec6b29e5d29fa0550e95e48ec1c6842dc56981e342580ea04876d0f8d2a6e56
-SIZE (firefox-17.0.1.source.tar.bz2) = 90785127
+SHA256 (firefox-17.0.2esr.source.tar.bz2) = 92bf717b3e3933b84fd37b0e5c5026868e139be828637cfcf4acdc83f7ccd886
+SIZE (firefox-17.0.2esr.source.tar.bz2) = 90828234
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index c63671f6439d..f8b263dccbbc 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxul
-DISTVERSION=	10.0.11
+DISTVERSION=	10.0.12
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firefox/releases/${DISTVERSION}esr/source
diff --git a/www/libxul/distinfo b/www/libxul/distinfo
index 1d6b420050c4..9d22d8b0dac6 100644
--- a/www/libxul/distinfo
+++ b/www/libxul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-10.0.11esr.source.tar.bz2) = 94b4d5a339d97dc56fd349f93407c3af4f408a4a8409a64e3680d564d37594f8
-SIZE (firefox-10.0.11esr.source.tar.bz2) = 75444542
+SHA256 (firefox-10.0.12esr.source.tar.bz2) = 9f12cb7fd18fc51e995cd67b70a090f32fcd8dcf636be1b840281f2612d9db40
+SIZE (firefox-10.0.12esr.source.tar.bz2) = 75510903
diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index f59e3909b65b..1b0c2e5b9bbe 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-PORTVERSION=	10.0.11
+PORTVERSION=	17.0.2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR?=	firefox/releases/${PORTVERSION}esr/linux-i686/en-US
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 246b6b3f1019..2cd6d8de3467 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-10.0.11esr.tar.bz2) = a917230123b9c97c64e772ed3e563d7f958443bea4dba1384e6360bb88d8657b
-SIZE (firefox-10.0.11esr.tar.bz2) = 17305222
+SHA256 (firefox-17.0.2esr.tar.bz2) = aaf51e4027337bfe30ba26362bfbd25ee115b989cc20fda1aa40fb201496249a
+SIZE (firefox-17.0.2esr.tar.bz2) = 21274620
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 1a033786c8e7..87cd0057fae5 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -22,7 +22,6 @@ lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.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%%/firefox
 lib/%%APP_NAME%%/firefox-bin
 lib/%%APP_NAME%%/icons/mozicon128.png
@@ -59,26 +58,37 @@ lib/%%APP_NAME%%/searchplugins/google.xml
 lib/%%APP_NAME%%/searchplugins/twitter.xml
 lib/%%APP_NAME%%/searchplugins/wikipedia.xml
 lib/%%APP_NAME%%/searchplugins/yahoo.xml
-lib/%%APP_NAME%%/update.locale
+lib/%%APP_NAME%%/update-settings.ini
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
+lib/%%APP_NAME%%/webapprt-stub
+lib/%%APP_NAME%%/webapprt/omni.ja
+lib/%%APP_NAME%%/webapprt/webapprt.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
 @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%%/plugins/  -depth 1 -type l -delete 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%%/searchplugins
-@dirrm lib/%%APP_NAME%%/jsloader/resource
-@dirrm lib/%%APP_NAME%%/jsloader
-@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/hyphenation
-@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/%%APP_NAME%%/extensions
-@dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults
-@dirrm lib/%%APP_NAME%%/components
 @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%%/modules/services-aitc
+@dirrm lib/%%APP_NAME%%/modules/services-common
+@dirrm lib/%%APP_NAME%%/modules/services-crypto
+@dirrm lib/%%APP_NAME%%/modules/services-notifications
+@dirrm lib/%%APP_NAME%%/modules/services-sync/engines
+@dirrm lib/%%APP_NAME%%/modules/services-sync
+@dirrm lib/%%APP_NAME%%/modules/sessionstore
+@dirrm lib/%%APP_NAME%%/modules
+@dirrm lib/%%APP_NAME%%/plugins
+@dirrm lib/%%APP_NAME%%/searchplugins
+@dirrm lib/%%APP_NAME%%/webapprt/components
+@dirrm lib/%%APP_NAME%%/webapprt
 @dirrm lib/%%APP_NAME%%
 @dirrmtry share/applications
diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 5b4ad12beee3..e7d508891f88 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-PORTVERSION=	2.14.1
+PORTVERSION=	2.15
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
 
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index c7d764b7daa4..de1341e89916 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -37,6 +37,7 @@ _Q=	2>/dev/null || true
 .if !target(post-extract)
 post-extract:
 	@${RM} -rf ${WRKSRC}/updates
+	@${MKDIR} ${WRKSRC}/plugins ${WRKSRC}/extensions
 .endif
 
 .if ${CATEGORIES:Mwww}
@@ -62,6 +63,26 @@ do-install:
 		${FDIR}/extensions/ ${_Q}
 .endif
 
+# Keep empty directories with pkg_* tools
+.if !target(post-extract-script)
+post-extract-script:
+	@if [ "${PKG_BIN:T}" != "pkg" ]; then \
+	    for d in $$(${FIND} ${WRKSRC} -type d -empty); do \
+		${TOUCH} $$d/.keep_me; \
+		${ECHO_CMD} lib/${APP_NAME}/$${d#${WRKSRC}/}/.keep_me \
+			>> ${WRKDIR}/.PLIST.opkg; \
+	    done; \
+	fi
+.endif
+
+.if !target(post-install-script)
+post-install-script:
+	@if [ -f ${WRKDIR}/.PLIST.opkg ]; then \
+		${CAT} ${TMPPLIST} >> ${WRKDIR}/.PLIST.opkg; \
+		${MV} ${WRKDIR}/.PLIST.opkg ${TMPPLIST}; \
+	fi
+.endif
+
 # Maintainer section
 create-plist: build
 	${ECHO_CMD} bin/%%APP_NAME%% > ${PLIST}
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index 76adb471c582..5d7901beab07 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.14.1.tar.bz2) = a52326a4e197ef83a48288420db7366c9a94a1c5f8e46a6e44b61c20aa166fac
-SIZE (seamonkey-2.14.1.tar.bz2) = 24030719
+SHA256 (seamonkey-2.15.tar.bz2) = 3dc92d91230399f16e966c7b4c8b36d0870979394339f357ef2c9989575fd204
+SIZE (seamonkey-2.15.tar.bz2) = 25993787
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 015c759106e1..8c3bc83f6d72 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -17,8 +17,8 @@ lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow.png
 lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow16.png
 lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow48.png
 lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties.png
-lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.png
 lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties16.png
+lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.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
@@ -117,39 +117,38 @@ lib/%%APP_NAME%%/searchplugins/creativecommons.xml
 lib/%%APP_NAME%%/searchplugins/google.xml
 lib/%%APP_NAME%%/searchplugins/wikipedia.xml
 lib/%%APP_NAME%%/searchplugins/yahoo.xml
+lib/%%APP_NAME%%/update-settings.ini
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
-lib/%%APP_NAME%%/update-settings.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
 @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%%/plugins/  -depth 1 -type l -delete 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%%/searchplugins
+@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/messenger
+@dirrm lib/%%APP_NAME%%/defaults/pref
+@dirrm lib/%%APP_NAME%%/defaults/profile
+@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
+@dirrm lib/%%APP_NAME%%/icons
+@dirrm lib/%%APP_NAME%%/isp
+@dirrm lib/%%APP_NAME%%/modules/services-aitc
+@dirrm lib/%%APP_NAME%%/modules/services-common
+@dirrm lib/%%APP_NAME%%/modules/services-crypto
 @dirrm lib/%%APP_NAME%%/modules/services-notifications
 @dirrm lib/%%APP_NAME%%/modules/services-sync/engines
 @dirrm lib/%%APP_NAME%%/modules/services-sync
-@dirrm lib/%%APP_NAME%%/modules/services-crypto
-@dirrm lib/%%APP_NAME%%/modules/services-common
-@dirrm lib/%%APP_NAME%%/modules/services-aitc
+@dirrm lib/%%APP_NAME%%/modules/identity
+@dirrm lib/%%APP_NAME%%/modules/commonjs/promise
+@dirrm lib/%%APP_NAME%%/modules/commonjs
 @dirrm lib/%%APP_NAME%%/modules
-@dirrm lib/%%APP_NAME%%/jssubloader/185/resource
-@dirrm lib/%%APP_NAME%%/jssubloader/185
-@dirrm lib/%%APP_NAME%%/jssubloader
-@dirrm lib/%%APP_NAME%%/jsloader/resource
-@dirrm lib/%%APP_NAME%%/jsloader
-@dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/extensions
-@dirrm lib/%%APP_NAME%%/distribution/extensions
-@dirrm lib/%%APP_NAME%%/distribution
-@dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/profile
-@dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults/messenger
-@dirrm lib/%%APP_NAME%%/defaults
-@dirrm lib/%%APP_NAME%%/components
-@dirrm lib/%%APP_NAME%%/chrome/icons/default
-@dirrm lib/%%APP_NAME%%/chrome/icons
-@dirrm lib/%%APP_NAME%%/chrome
+@dirrm lib/%%APP_NAME%%/plugins
+@dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%
 @dirrmtry share/applications