4 files changed, 19 insertions, 25 deletions

diff --git a/www/xpi-foxyproxy/Makefile b/www/xpi-foxyproxy/Makefile
index 3a5a87462a66..d17738b2cd2a 100644
--- a/www/xpi-foxyproxy/Makefile
+++ b/www/xpi-foxyproxy/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	foxyproxy
-PORTVERSION=	2.8.14
-DISTVERSIONSUFFIX=	-fx
+PORTVERSION=	2.9
+DISTVERSIONSUFFIX=	-fx+sm+tb
 CATEGORIES=	www
 
 MAINTAINER=	wahjava@gmail.com
@@ -18,10 +18,10 @@ XPI_NUM=	2464
 XPI_ID=		foxyproxy@eric.h.jung
 
 post-extract:
-	${FIND} ${WRKSRC} -type f -name *.js |${XARGS} ${SED} -i '' -e 's/[[:space:]]*$$//g'
+	${FIND} ${WRKSRC} -type f -name '*.js' |${XARGS} ${SED} -i '' -e 's/[[:space:]]*$$//g'
 
 pre-install:
-	${FIND} ${WRKSRC} -type f -name *.orig |${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -type f -name '*.orig' |${XARGS} ${RM} -f
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-foxyproxy/distinfo b/www/xpi-foxyproxy/distinfo
index 80e3b80aa5b3..a1a813d46461 100644
--- a/www/xpi-foxyproxy/distinfo
+++ b/www/xpi-foxyproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/foxyproxy-2.8.14-fx.xpi) = 716fa378e6a8c2174df4f898ade6ea8f
-SHA256 (xpi/foxyproxy-2.8.14-fx.xpi) = 8a6dff5e36c20a4171739f693b9129bedc116f5d1b87d8b09a69b398b4b7b1c9
-SIZE (xpi/foxyproxy-2.8.14-fx.xpi) = 546658
+MD5 (xpi/foxyproxy-2.9-fx+sm+tb.xpi) = ea71be9f4ab3ee3e81c21160c5fb146f
+SHA256 (xpi/foxyproxy-2.9-fx+sm+tb.xpi) = 1921ae4aafffc000d067930156a3a243a4e0f143b44fc60f121185bf5b113bea
+SIZE (xpi/foxyproxy-2.9-fx+sm+tb.xpi) = 567733
diff --git a/www/xpi-foxyproxy/files/patch-components_foxyproxy.js b/www/xpi-foxyproxy/files/patch-components_foxyproxy.js
index 2e930701e050..b1f3c8f43319 100644
--- a/www/xpi-foxyproxy/files/patch-components_foxyproxy.js
+++ b/www/xpi-foxyproxy/files/patch-components_foxyproxy.js
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- components/foxyproxy.js.orig
 +++ components/foxyproxy.js
-@@ -430,15 +430,12 @@
+@@ -424,15 +424,13 @@
    },
  
    getDefaultPath : function() {
@@ -13,21 +13,14 @@ $FreeBSD$
 -    f.append("foxyproxy.xml");
 +    var file = CC["@mozilla.org/file/local;1"].createInstance(CI.nsILocalFile);
 +    var dir = CC["@mozilla.org/file/directory_service;1"].getService(CI.nsIProperties).get("ProfD", CI.nsILocalFile);
-     //dump("settings file: " + f.path + "\n");
--    return f;
--    //file.initWithPath(dir.path);
--    //file.appendRelativePath("foxyproxy.xml");
--    //return file;
+     // dump("settings file: " + f.path + "\n");
+     return f;
+-    // file.initWithPath(dir.path);
+-    // file.appendRelativePath("foxyproxy.xml");
+-    // return file;
 +    file.initWithPath(dir.path);
 +    file.appendRelativePath("foxyproxy.xml");
 +    return file;
    },
  
    // Convert |o| from:
-@@ -1471,4 +1468,4 @@
-   _xpComObjects: {},
-   _catObserverName: null,
-   _catContractId: null
--};
-\ No newline at end of file
-+};
diff --git a/www/xpi-foxyproxy/pkg-plist b/www/xpi-foxyproxy/pkg-plist
index 572a7879ffe9..10499069e4d4 100644
--- a/www/xpi-foxyproxy/pkg-plist
+++ b/www/xpi-foxyproxy/pkg-plist
@@ -6,6 +6,8 @@
 %%XPI_XPIDIR%%/chrome/content/alertOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/blockedpagepattern.js
 %%XPI_XPIDIR%%/chrome/content/blockedpagepattern.xul
+%%XPI_XPIDIR%%/chrome/content/chooseproxy.js
+%%XPI_XPIDIR%%/chrome/content/chooseproxy.xul
 %%XPI_XPIDIR%%/chrome/content/firefoxOptionsOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/firefoxOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/foxyproxy.css
@@ -30,10 +32,14 @@
 %%XPI_XPIDIR%%/chrome/content/overlay.js
 %%XPI_XPIDIR%%/chrome/content/pattern.js
 %%XPI_XPIDIR%%/chrome/content/pattern.xul
+%%XPI_XPIDIR%%/chrome/content/selection.js
 %%XPI_XPIDIR%%/chrome/content/strings.xml
 %%XPI_XPIDIR%%/chrome/content/superadd.js
 %%XPI_XPIDIR%%/chrome/content/superadd.xul
+%%XPI_XPIDIR%%/chrome/content/tbirdOverlay.xul
 %%XPI_XPIDIR%%/chrome/content/torwizhelp.xhtml
+%%XPI_XPIDIR%%/chrome/content/triquestion.js
+%%XPI_XPIDIR%%/chrome/content/triquestion.xul
 %%XPI_XPIDIR%%/chrome/icons/default/foxyproxyaboutdlg2.ico
 %%XPI_XPIDIR%%/chrome/icons/default/foxyproxyaddproxydlg2.ico
 %%XPI_XPIDIR%%/chrome/icons/default/foxyproxyoptions2.ico
@@ -135,10 +141,6 @@
 %%XPI_XPIDIR%%/chrome/locale/sr-RS/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/sr-RS/foxyproxy.properties
 %%XPI_XPIDIR%%/chrome/locale/sr-RS/torwizhelp.dtd
-%%XPI_XPIDIR%%/chrome/locale/sr-YU/amo.properties
-%%XPI_XPIDIR%%/chrome/locale/sr-YU/foxyproxy.dtd
-%%XPI_XPIDIR%%/chrome/locale/sr-YU/foxyproxy.properties
-%%XPI_XPIDIR%%/chrome/locale/sr-YU/torwizhelp.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/amo.properties
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/foxyproxy.dtd
 %%XPI_XPIDIR%%/chrome/locale/sv-SE/foxyproxy.properties
@@ -202,7 +204,6 @@
 @dirrm %%XPI_XPIDIR%%/chrome/locale/ru-RU
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sk
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sr-RS
-@dirrm %%XPI_XPIDIR%%/chrome/locale/sr-YU
 @dirrm %%XPI_XPIDIR%%/chrome/locale/sv-SE
 @dirrm %%XPI_XPIDIR%%/chrome/locale/th-TH
 @dirrm %%XPI_XPIDIR%%/chrome/locale/tr-TR