3 files changed, 48 insertions, 32 deletions

diff --git a/www/xpi-tabmixplus/Makefile b/www/xpi-tabmixplus/Makefile
index d2b4f267671d..56aa75e75ea9 100644
--- a/www/xpi-tabmixplus/Makefile
+++ b/www/xpi-tabmixplus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tabmixplus
-DISTVERSION=	0.3.8.7
+DISTVERSION=	0.4.0.2
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
diff --git a/www/xpi-tabmixplus/distinfo b/www/xpi-tabmixplus/distinfo
index e088b2af8979..11272989395f 100644
--- a/www/xpi-tabmixplus/distinfo
+++ b/www/xpi-tabmixplus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/tab_mix_plus-0.3.8.7-fx.xpi) = f8898579c7815d36be376c689040e22e6652e2062c81f62d9f233ed2b1425f39
-SIZE (xpi/tab_mix_plus-0.3.8.7-fx.xpi) = 652537
+SHA256 (xpi/tab_mix_plus-0.4.0.2-fx.xpi) = 84494b2232fbe1c2c5df41d9f11a495cf9ebce8023abc444c9b203c0a28030d7
+SIZE (xpi/tab_mix_plus-0.4.0.2-fx.xpi) = 697058
diff --git a/www/xpi-tabmixplus/pkg-plist b/www/xpi-tabmixplus/pkg-plist
index 6e243843a0c4..5b91a3b0369c 100644
--- a/www/xpi-tabmixplus/pkg-plist
+++ b/www/xpi-tabmixplus/pkg-plist
@@ -14,14 +14,14 @@
 %%XPI_XPIDIR%%/chrome/content/links/userInterface.js
 %%XPI_XPIDIR%%/chrome/content/minit/autoReload.xul
 %%XPI_XPIDIR%%/chrome/content/minit/minit.js
-%%XPI_XPIDIR%%/chrome/content/minit/setFixedLabel.xul
+%%XPI_XPIDIR%%/chrome/content/minit/renameTab.xul
 %%XPI_XPIDIR%%/chrome/content/minit/tablib.js
-%%XPI_XPIDIR%%/chrome/content/overlay/browsroverlay3_36.css
 %%XPI_XPIDIR%%/chrome/content/overlay/browsroverlay40.css
 %%XPI_XPIDIR%%/chrome/content/overlay/browsroverlay_base.css
 %%XPI_XPIDIR%%/chrome/content/places/bookmarkProperties.xul
 %%XPI_XPIDIR%%/chrome/content/places/places.js
 %%XPI_XPIDIR%%/chrome/content/places/places.xul
+%%XPI_XPIDIR%%/chrome/content/pref/overlaySanitizeUI.js
 %%XPI_XPIDIR%%/chrome/content/pref/overlaySanitizeUI.xul
 %%XPI_XPIDIR%%/chrome/content/pref/pref-appearance.css
 %%XPI_XPIDIR%%/chrome/content/pref/pref-appearance.js
@@ -31,8 +31,6 @@
 %%XPI_XPIDIR%%/chrome/content/pref/pref-filetype.xul
 %%XPI_XPIDIR%%/chrome/content/pref/pref-tabmix.js
 %%XPI_XPIDIR%%/chrome/content/pref/pref-tabmix.xul
-%%XPI_XPIDIR%%/chrome/content/pref/pref-tabmixOverlay-40b5.xul
-%%XPI_XPIDIR%%/chrome/content/pref/pref-tabmixOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/pref/preferencesOverlay.js
 %%XPI_XPIDIR%%/chrome/content/pref/preferencesOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/pref/tab_panel.xul
@@ -40,6 +38,7 @@
 %%XPI_XPIDIR%%/chrome/content/session/promptservice.xul
 %%XPI_XPIDIR%%/chrome/content/session/session.js
 %%XPI_XPIDIR%%/chrome/content/session/sessionStore.js
+%%XPI_XPIDIR%%/chrome/content/tab/scrollbox.xml
 %%XPI_XPIDIR%%/chrome/content/tab/tab.js
 %%XPI_XPIDIR%%/chrome/content/tab/tabbrowser.xml
 %%XPI_XPIDIR%%/chrome/content/tab/tabbrowser_4.xml
@@ -112,6 +111,13 @@
 %%XPI_XPIDIR%%/chrome/locale/et-EE/session-manager.properties
 %%XPI_XPIDIR%%/chrome/locale/et-EE/tabmix.dtd
 %%XPI_XPIDIR%%/chrome/locale/et-EE/tabmix.properties
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/misc.dtd
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/pref-appearance.dtd
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/pref-filetype.dtd
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/pref-tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/session-manager.properties
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/fa-IR/tabmix.properties
 %%XPI_XPIDIR%%/chrome/locale/fr/misc.dtd
 %%XPI_XPIDIR%%/chrome/locale/fr/pref-appearance.dtd
 %%XPI_XPIDIR%%/chrome/locale/fr/pref-filetype.dtd
@@ -126,6 +132,13 @@
 %%XPI_XPIDIR%%/chrome/locale/he-IL/session-manager.properties
 %%XPI_XPIDIR%%/chrome/locale/he-IL/tabmix.dtd
 %%XPI_XPIDIR%%/chrome/locale/he-IL/tabmix.properties
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/misc.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/pref-appearance.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/pref-filetype.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/pref-tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/session-manager.properties
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/hr-HR/tabmix.properties
 %%XPI_XPIDIR%%/chrome/locale/hu-HU/misc.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu-HU/pref-appearance.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu-HU/pref-filetype.dtd
@@ -210,13 +223,27 @@
 %%XPI_XPIDIR%%/chrome/locale/sr/session-manager.properties
 %%XPI_XPIDIR%%/chrome/locale/sr/tabmix.dtd
 %%XPI_XPIDIR%%/chrome/locale/sr/tabmix.properties
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/misc.dtd
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/pref-appearance.dtd
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/pref-filetype.dtd
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/pref-tabmix.dtd
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/session-manager.properties
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/tabmix.dtd
-%%XPI_XPIDIR%%/chrome/locale/tr-TR/tabmix.properties
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/misc.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/pref-appearance.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/pref-filetype.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/pref-tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/session-manager.properties
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/tabmix.properties
+%%XPI_XPIDIR%%/chrome/locale/tr/misc.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr/pref-appearance.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr/pref-filetype.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr/pref-tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr/session-manager.properties
+%%XPI_XPIDIR%%/chrome/locale/tr/tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr/tabmix.properties
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/misc.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/pref-appearance.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/pref-filetype.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/pref-tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/session-manager.properties
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/tabmix.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/tabmix.properties
 %%XPI_XPIDIR%%/chrome/locale/vi/misc.dtd
 %%XPI_XPIDIR%%/chrome/locale/vi/pref-appearance.dtd
 %%XPI_XPIDIR%%/chrome/locale/vi/pref-filetype.dtd
@@ -238,14 +265,6 @@
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/session-manager.properties
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/tabmix.dtd
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/tabmix.properties
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.5/general.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.5/linux/browser.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.5/mac/browser.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.5/win/browser.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.6/general.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.6/linux/browser.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.6/mac/browser.css
-%%XPI_XPIDIR%%/chrome/skin/app_version/3.6/win/browser.css
 %%XPI_XPIDIR%%/chrome/skin/app_version/4.0/general.css
 %%XPI_XPIDIR%%/chrome/skin/app_version/4.0/linux/browser.css
 %%XPI_XPIDIR%%/chrome/skin/app_version/4.0/mac/browser.css
@@ -267,6 +286,7 @@
 %%XPI_XPIDIR%%/chrome/skin/preferences.css
 %%XPI_XPIDIR%%/chrome/skin/prefs.css
 %%XPI_XPIDIR%%/chrome/skin/protected.png
+%%XPI_XPIDIR%%/chrome/skin/renameTab.css
 %%XPI_XPIDIR%%/chrome/skin/sessionmanager.png
 %%XPI_XPIDIR%%/chrome/skin/tab.css
 %%XPI_XPIDIR%%/chrome/skin/tabslist.png
@@ -283,9 +303,9 @@
 %%XPI_XPIDIR%%/modules/AutoReload.jsm
 %%XPI_XPIDIR%%/modules/Decode.jsm
 %%XPI_XPIDIR%%/modules/MergeWindows.jsm
+%%XPI_XPIDIR%%/modules/RenameTab.jsm
 %%XPI_XPIDIR%%/modules/Services.jsm
 %%XPI_XPIDIR%%/modules/Slideshow.jsm
-%%XPI_XPIDIR%%/modules/XPCOMUtils.jsm
 %%XPI_XPIDIR%%/modules/extensions/CompatibilityCheck.jsm
 %%XPI_XPIDIR%%/modules/extensions/TabGroupsManager.jsm
 %%XPI_XPIDIR%%/modules/log.jsm
@@ -309,8 +329,10 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/en-US
 @dirrm %%XPI_XPIDIR%%/chrome/locale/es-ES
 @dirrm %%XPI_XPIDIR%%/chrome/locale/et-EE
+@dirrm %%XPI_XPIDIR%%/chrome/locale/fa-IR
 @dirrm %%XPI_XPIDIR%%/chrome/locale/fr
 @dirrm %%XPI_XPIDIR%%/chrome/locale/he-IL
+@dirrm %%XPI_XPIDIR%%/chrome/locale/hr-HR
 @dirrm %%XPI_XPIDIR%%/chrome/locale/hu-HU
 @dirrm %%XPI_XPIDIR%%/chrome/locale/it
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ja
@@ -323,19 +345,13 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ru-RU
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sk-SK
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sr
-@dirrm %%XPI_XPIDIR%%/chrome/locale/tr-TR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/sv-SE
+@dirrm %%XPI_XPIDIR%%/chrome/locale/tr
+@dirrm %%XPI_XPIDIR%%/chrome/locale/uk-UA
 @dirrm %%XPI_XPIDIR%%/chrome/locale/vi
 @dirrm %%XPI_XPIDIR%%/chrome/locale/zh-CN
 @dirrm %%XPI_XPIDIR%%/chrome/locale/zh-TW
 @dirrm %%XPI_XPIDIR%%/chrome/locale
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.5/linux
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.5/mac
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.5/win
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.5
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.6/linux
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.6/mac
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.6/win
-@dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/3.6
 @dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/4.0/linux
 @dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/4.0/mac
 @dirrm %%XPI_XPIDIR%%/chrome/skin/app_version/4.0/win