3 files changed, 54 insertions, 6 deletions

diff --git a/www/xpi-foxmarks/Makefile b/www/xpi-foxmarks/Makefile
index 513ad6b0ffc6..faa0678ef658 100644
--- a/www/xpi-foxmarks/Makefile
+++ b/www/xpi-foxmarks/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	foxmarks
-PORTVERSION=	2.0.45
+PORTVERSION=	2.1.0.12
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
diff --git a/www/xpi-foxmarks/distinfo b/www/xpi-foxmarks/distinfo
index 447bde0580c6..6a38c8eb6494 100644
--- a/www/xpi-foxmarks/distinfo
+++ b/www/xpi-foxmarks/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/foxmarks_bookmark_synchronizer-2.0.45-fx.xpi) = f477ecdd9aee8df54d3f0c6e088629d0
-SHA256 (xpi/foxmarks_bookmark_synchronizer-2.0.45-fx.xpi) = a1913503a59b2400f99d238815bd28cb17a8e32dd12fde082bdcb5d843fc18ec
-SIZE (xpi/foxmarks_bookmark_synchronizer-2.0.45-fx.xpi) = 235525
+MD5 (xpi/foxmarks_bookmark_synchronizer-2.1.0.12-fx.xpi) = a3e2dac3ad98ea67b07d3377351ce649
+SHA256 (xpi/foxmarks_bookmark_synchronizer-2.1.0.12-fx.xpi) = 297ba34157d906a106370fdf12dcb0faaa46280b1902a3da716a912a8d93f102
+SIZE (xpi/foxmarks_bookmark_synchronizer-2.1.0.12-fx.xpi) = 300429
diff --git a/www/xpi-foxmarks/pkg-plist b/www/xpi-foxmarks/pkg-plist
index 5dbc388c70ef..7990260c5a16 100644
--- a/www/xpi-foxmarks/pkg-plist
+++ b/www/xpi-foxmarks/pkg-plist
@@ -1,4 +1,6 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-bookmarkconflict.xul
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-changeprofile.js
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-changeprofile.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-clobber.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-clobber.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-command.js
@@ -9,13 +11,17 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-folderconflict.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-json.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-log.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-manageroverlay.js
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-login.js
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-login.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-manageroverlay.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-network.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-nodes.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-overlay.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-overlay.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-parentconflict.xul
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-places.js
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-placesoverlay-mac.xul
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-placesoverlay.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-progress.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-progress.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-rdf.js
@@ -25,8 +31,13 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-setup.xul
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-statusbar.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-statusbar.xul
+%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-uitools.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-update.js
 %%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-utils.js
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/conflicts.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/foxmarks.properties
@@ -47,6 +58,14 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/foxmarks.properties
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/conflicts.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/foxmarks.properties
@@ -55,6 +74,14 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/foxmarks.properties
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/conflicts.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/foxmarks.properties
@@ -63,10 +90,18 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/foxmarks.properties
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/conflicts.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/foxmarks.properties
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/conflicts.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/foxmarks.properties
@@ -91,6 +126,10 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/foxmarks.properties
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/setup.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/conflicts.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/foxmarks.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/foxmarks.properties
@@ -108,13 +147,13 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW/foxmarks.properties
 %%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW/setup.dtd
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/foxmarks.css
+%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/Throbber-small.gif
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/dirty.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/error.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks-active.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks-default.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks-hover.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks.ico
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks_bug.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-advanced.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-bg-hover.png
@@ -124,6 +163,7 @@
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-icons.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-macosx-bg-sel.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-macosx-bg.png
+%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-profiles_TEMP.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/ready.png
 %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/working.gif
 %%XPI_XPIDIR%%/chrome.manifest
@@ -133,22 +173,30 @@
 %%XPI_XPIDIR%%/defaults/preferences/prefs.js
 %%XPI_XPIDIR%%/install.rdf
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/content
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/de-DE
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/el-GR
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/en-US
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/pl-PL
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-BR
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-PT
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ru-RU
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK
+@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/uk-UA
 @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-CN