3 files changed, 52 insertions, 32 deletions

diff --git a/www/xpi-foxyproxy/Makefile b/www/xpi-foxyproxy/Makefile
index 2404c9b9e7d4..e24e4d96fd42 100644
--- a/www/xpi-foxyproxy/Makefile
+++ b/www/xpi-foxyproxy/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	foxyproxy
-PORTVERSION=	2.22.1
-DISTVERSIONSUFFIX=	-fx+sm+tb
+PORTVERSION=	3.3
+DISTVERSIONSUFFIX=	-fx+tb+sm
 CATEGORIES=	www
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/www/xpi-foxyproxy/distinfo b/www/xpi-foxyproxy/distinfo
index 550867019001..049d385c97d5 100644
--- a/www/xpi-foxyproxy/distinfo
+++ b/www/xpi-foxyproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/foxyproxy_standard-2.22.1-fx+sm+tb.xpi) = 22d3fd93930bc61c050cf37ad248b237d4afd7d1e10cfcb00b04c7eae2e9bb5b
-SIZE (xpi/foxyproxy_standard-2.22.1-fx+sm+tb.xpi) = 650200
+SHA256 (xpi/foxyproxy_standard-3.3-fx+tb+sm.xpi) = ea5f26c59821ceb23ba533e9199d8956fb77b701d7a40541cd848c6623fad5f9
+SIZE (xpi/foxyproxy_standard-3.3-fx+tb+sm.xpi) = 795273
diff --git a/www/xpi-foxyproxy/pkg-plist b/www/xpi-foxyproxy/pkg-plist
index 6c7b668b60e3..0dc3d6d35706 100644
--- a/www/xpi-foxyproxy/pkg-plist
+++ b/www/xpi-foxyproxy/pkg-plist
@@ -1,9 +1,9 @@
 %%XPI_XPIDIR%%/LICENSE
-%%XPI_XPIDIR%%/chrome.manifest
 %%XPI_XPIDIR%%/chrome/content/about.js
 %%XPI_XPIDIR%%/chrome/content/about.xul
 %%XPI_XPIDIR%%/chrome/content/addeditproxy.js
 %%XPI_XPIDIR%%/chrome/content/addeditproxy.xul
+%%XPI_XPIDIR%%/chrome/content/bindings.xml
 %%XPI_XPIDIR%%/chrome/content/blockedpagepattern.js
 %%XPI_XPIDIR%%/chrome/content/blockedpagepattern.xul
 %%XPI_XPIDIR%%/chrome/content/chooseproxy.js
@@ -14,8 +14,9 @@
 %%XPI_XPIDIR%%/chrome/content/firefoxOptionsOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/firefoxOverlay-svg.xul
 %%XPI_XPIDIR%%/chrome/content/firefoxOverlay.xul
-%%XPI_XPIDIR%%/chrome/content/foxyproxy.css
 %%XPI_XPIDIR%%/chrome/content/foxyproxy-win.css
+%%XPI_XPIDIR%%/chrome/content/foxyproxy-mac.css
+%%XPI_XPIDIR%%/chrome/content/foxyproxy.css
 %%XPI_XPIDIR%%/chrome/content/foxyproxySongbird.css
 %%XPI_XPIDIR%%/chrome/content/images/16x16.gif
 %%XPI_XPIDIR%%/chrome/content/images/arrow_refresh.png
@@ -28,8 +29,8 @@
 %%XPI_XPIDIR%%/chrome/content/images/edit-clear-disabled.png
 %%XPI_XPIDIR%%/chrome/content/images/edit-clear.png
 %%XPI_XPIDIR%%/chrome/content/images/emblem-favorite.png
-%%XPI_XPIDIR%%/chrome/content/images/fpplus.png
 %%XPI_XPIDIR%%/chrome/content/images/foxyproxy-nocopy.gif
+%%XPI_XPIDIR%%/chrome/content/images/fpplus.png
 %%XPI_XPIDIR%%/chrome/content/images/go-down-disabled.png
 %%XPI_XPIDIR%%/chrome/content/images/go-down.png
 %%XPI_XPIDIR%%/chrome/content/images/go-up-disabled.png
@@ -62,13 +63,22 @@
 %%XPI_XPIDIR%%/chrome/content/images/tick.png
 %%XPI_XPIDIR%%/chrome/content/images/wand.png
 %%XPI_XPIDIR%%/chrome/content/images/world.png
+%%XPI_XPIDIR%%/chrome/content/images/abp.png
+%%XPI_XPIDIR%%/chrome/content/images/json-icon.png
 %%XPI_XPIDIR%%/chrome/content/includes.xul
 %%XPI_XPIDIR%%/chrome/content/options.js
 %%XPI_XPIDIR%%/chrome/content/options.xul
 %%XPI_XPIDIR%%/chrome/content/optionsOverlay.js
+%%XPI_XPIDIR%%/chrome/content/optionsOverlay-svg.xul
 %%XPI_XPIDIR%%/chrome/content/overlay.js
 %%XPI_XPIDIR%%/chrome/content/pattern.js
 %%XPI_XPIDIR%%/chrome/content/pattern.xul
+%%XPI_XPIDIR%%/chrome/content/pattern-subscriptions/addeditsubscription.js
+%%XPI_XPIDIR%%/chrome/content/pattern-subscriptions/addeditsubscription.xul
+%%XPI_XPIDIR%%/chrome/content/pattern-subscriptions/patternsView.xul
+%%XPI_XPIDIR%%/chrome/content/pattern-subscriptions/laststatus.js
+%%XPI_XPIDIR%%/chrome/content/pattern-subscriptions/laststatus.xul
+%%XPI_XPIDIR%%/chrome/content/pattern-subscriptions/patternsView.js
 %%XPI_XPIDIR%%/chrome/content/selection.js
 %%XPI_XPIDIR%%/chrome/content/strings.xml
 %%XPI_XPIDIR%%/chrome/content/superadd.js
@@ -82,6 +92,7 @@
 %%XPI_XPIDIR%%/chrome/icons/default/foxyproxyoptions2.ico
 %%XPI_XPIDIR%%/chrome/icons/default/foxyproxypatterndlg2.ico
 %%XPI_XPIDIR%%/chrome/icons/default/foxyproxyquickadddlg2.ico
+%%XPI_XPIDIR%%/chrome/icons/default/foxyproxySubscriptions.ico
 %%XPI_XPIDIR%%/chrome/locale/ar/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/ar/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/ar/foxyproxy.properties
@@ -90,18 +101,18 @@
 %%XPI_XPIDIR%%/chrome/locale/cs/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/cs/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/cs/torwizhelp.dtd
-%%XPI_XPIDIR%%/chrome/locale/da-DK/amo.properties
-%%XPI_XPIDIR%%/chrome/locale/da-DK/foxyproxy.dtd
-%%XPI_XPIDIR%%/chrome/locale/da-DK/foxyproxy.properties
-%%XPI_XPIDIR%%/chrome/locale/da-DK/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/da/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/da/amo.properties
+%%XPI_XPIDIR%%/chrome/locale/da/foxyproxy.properties
+%%XPI_XPIDIR%%/chrome/locale/da/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/de/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/de/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/de/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/de/torwizhelp.dtd
-%%XPI_XPIDIR%%/chrome/locale/el-GR/amo.properties
-%%XPI_XPIDIR%%/chrome/locale/el-GR/foxyproxy.dtd
-%%XPI_XPIDIR%%/chrome/locale/el-GR/foxyproxy.properties
-%%XPI_XPIDIR%%/chrome/locale/el-GR/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/el/foxyproxy.properties
+%%XPI_XPIDIR%%/chrome/locale/el/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/el/amo.properties
+%%XPI_XPIDIR%%/chrome/locale/el/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-US/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/en-US/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/en-US/foxyproxy.properties
@@ -138,10 +149,10 @@
 %%XPI_XPIDIR%%/chrome/locale/hu-HU/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/hu-HU/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/hu-HU/torwizhelp.dtd
-%%XPI_XPIDIR%%/chrome/locale/it-IT/amo.properties
-%%XPI_XPIDIR%%/chrome/locale/it-IT/foxyproxy.dtd
-%%XPI_XPIDIR%%/chrome/locale/it-IT/foxyproxy.properties
-%%XPI_XPIDIR%%/chrome/locale/it-IT/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/it/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/it/amo.properties
+%%XPI_XPIDIR%%/chrome/locale/it/foxyproxy.dtd
+%%XPI_XPIDIR%%/chrome/locale/it/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/ja-JP/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/ja-JP/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/ja-JP/foxyproxy.properties
@@ -154,10 +165,10 @@
 %%XPI_XPIDIR%%/chrome/locale/nl/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/nl/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/nl/torwizhelp.dtd
-%%XPI_XPIDIR%%/chrome/locale/pl-PL/amo.properties
-%%XPI_XPIDIR%%/chrome/locale/pl-PL/foxyproxy.dtd
-%%XPI_XPIDIR%%/chrome/locale/pl-PL/foxyproxy.properties
-%%XPI_XPIDIR%%/chrome/locale/pl-PL/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl/amo.properties
+%%XPI_XPIDIR%%/chrome/locale/pl/foxyproxy.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl/foxyproxy.properties
+%%XPI_XPIDIR%%/chrome/locale/pl/torwizhelp.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-BR/foxyproxy.properties
@@ -166,6 +177,10 @@
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/pt-PT/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/ro/amo.properties
+%%XPI_XPIDIR%%/chrome/locale/ro/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/ro/foxyproxy.properties
+%%XPI_XPIDIR%%/chrome/locale/ro/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/ru-RU/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/ru-RU/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/ru-RU/foxyproxy.properties
@@ -182,10 +197,10 @@
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/torwizhelp.dtd
-%%XPI_XPIDIR%%/chrome/locale/th-TH/amo.properties
-%%XPI_XPIDIR%%/chrome/locale/th-TH/foxyproxy.dtd
-%%XPI_XPIDIR%%/chrome/locale/th-TH/foxyproxy.properties
-%%XPI_XPIDIR%%/chrome/locale/th-TH/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/th/torwizhelp.dtd
+%%XPI_XPIDIR%%/chrome/locale/th/amo.properties
+%%XPI_XPIDIR%%/chrome/locale/th/foxyproxy.properties
+%%XPI_XPIDIR%%/chrome/locale/th/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/tr-TR/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/tr-TR/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/tr-TR/foxyproxy.properties
@@ -207,6 +222,7 @@
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/zh-TW/torwizhelp.dtd
 %%XPI_XPIDIR%%/chrome/skin/overlay.css
+%%XPI_XPIDIR%%/chrome.manifest
 %%XPI_XPIDIR%%/components/autoconf.js
 %%XPI_XPIDIR%%/components/commandlinehandler.js
 %%XPI_XPIDIR%%/components/common.js
@@ -218,6 +234,8 @@
 %%XPI_XPIDIR%%/defaults/preferences/prefs.js
 %%XPI_XPIDIR%%/install.rdf
 %%XPI_XPIDIR%%/modules/superadd.js
+%%XPI_XPIDIR%%/modules/autoproxy.jsm
+%%XPI_XPIDIR%%/modules/patternSubscriptions.jsm
 @dirrm %%XPI_XPIDIR%%/modules
 @dirrm %%XPI_XPIDIR%%/defaults/preferences
 @dirrm %%XPI_XPIDIR%%/defaults
@@ -228,18 +246,19 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/vi
 @dirrm %%XPI_XPIDIR%%/chrome/locale/uk-UA
 @dirrm %%XPI_XPIDIR%%/chrome/locale/tr-TR
-@dirrm %%XPI_XPIDIR%%/chrome/locale/th-TH
+@dirrm %%XPI_XPIDIR%%/chrome/locale/th
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sv-SE
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sr
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sk
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ru-RU
+@dirrm %%XPI_XPIDIR%%/chrome/locale/ro
 @dirrm %%XPI_XPIDIR%%/chrome/locale/pt-PT
 @dirrm %%XPI_XPIDIR%%/chrome/locale/pt-BR
-@dirrm %%XPI_XPIDIR%%/chrome/locale/pl-PL
+@dirrm %%XPI_XPIDIR%%/chrome/locale/pl
 @dirrm %%XPI_XPIDIR%%/chrome/locale/nl
 @dirrm %%XPI_XPIDIR%%/chrome/locale/lv-LV
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ja-JP
-@dirrm %%XPI_XPIDIR%%/chrome/locale/it-IT
+@dirrm %%XPI_XPIDIR%%/chrome/locale/it
 @dirrm %%XPI_XPIDIR%%/chrome/locale/hu-HU
 @dirrm %%XPI_XPIDIR%%/chrome/locale/hr-HR
 @dirrm %%XPI_XPIDIR%%/chrome/locale/gl-ES
@@ -249,14 +268,15 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/es-ES
 @dirrm %%XPI_XPIDIR%%/chrome/locale/es-AR
 @dirrm %%XPI_XPIDIR%%/chrome/locale/en-US
-@dirrm %%XPI_XPIDIR%%/chrome/locale/el-GR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/el
 @dirrm %%XPI_XPIDIR%%/chrome/locale/de
-@dirrm %%XPI_XPIDIR%%/chrome/locale/da-DK
+@dirrm %%XPI_XPIDIR%%/chrome/locale/da
 @dirrm %%XPI_XPIDIR%%/chrome/locale/cs
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ar
 @dirrm %%XPI_XPIDIR%%/chrome/locale
 @dirrm %%XPI_XPIDIR%%/chrome/icons/default
 @dirrm %%XPI_XPIDIR%%/chrome/icons
 @dirrm %%XPI_XPIDIR%%/chrome/content/images
+@dirrm %%XPI_XPIDIR%%/chrome/content/pattern-subscriptions
 @dirrm %%XPI_XPIDIR%%/chrome/content
 @dirrm %%XPI_XPIDIR%%/chrome