4 files changed, 31 insertions, 32 deletions

diff --git a/www/xpi-server_switcher/Makefile b/www/xpi-server_switcher/Makefile
index 0b24ade9e6d2..6ef332c7cfa4 100644
--- a/www/xpi-server_switcher/Makefile
+++ b/www/xpi-server_switcher/Makefile
@@ -6,33 +6,14 @@
 #
 
 PORTNAME=	server_switcher
-PORTVERSION=	0.1b
-DISTVERSIONSUFFIX=	-fx
+DISTVERSION=	0.2b
+DISTVERSIONSUFFIX=	-fx+fl
 CATEGORIES=	www
 
 MAINTAINER=	chinsan.tw@gmail.com
-COMMENT=	An extension to navigational help tool for web developers
+COMMENT=	A navigational help tool for web developers
 
 XPI_ID=		{F7D360DC-B8F8-11DA-86BD-3EC8728786A0}
-XPI_FILES=	chrome/switcher/content/about.xul \
-		chrome/switcher/content/common/preferences.js \
-		chrome/switcher/content/common/string.js \
-		chrome/switcher/content/dialogs/resize.js \
-		chrome/switcher/content/dialogs/resize.xul \
-		chrome/switcher/content/switcherOptions.js \
-		chrome/switcher/content/switcherOptions.xul \
-		chrome/switcher/content/switcherOverlay-old.js \
-		chrome/switcher/content/switcherOverlay.js \
-		chrome/switcher/content/switcherOverlay.xul \
-		chrome/switcher/skin/classic/devserver.png \
-		chrome/switcher/skin/classic/hceswitch.css \
-		chrome/switcher/skin/classic/icon.png \
-		chrome/switcher/skin/classic/liveserver.png \
-		chrome.manifest install.rdf license.txt
-XPI_DIRS=	chrome/switcher/content/common \
-		chrome/switcher/content/dialogs chrome/switcher/content \
-		chrome/switcher/skin/classic chrome/switcher/skin \
-		chrome/switcher chrome
 
-.include "../xpi-adblock/Makefile.xpi"
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-server_switcher/distinfo b/www/xpi-server_switcher/distinfo
index 58c7237547b4..7849f219cdf1 100644
--- a/www/xpi-server_switcher/distinfo
+++ b/www/xpi-server_switcher/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/server_switcher-0.1b-fx.xpi) = b7dfedd3c63febe579fc4d1fbe91d37a
-SHA256 (xpi/server_switcher-0.1b-fx.xpi) = c44685823bfacd1d935854f7ab589c36fecb642d026870e19cbac512f5fad824
-SIZE (xpi/server_switcher-0.1b-fx.xpi) = 22463
+MD5 (xpi/server_switcher-0.2b-fx+fl.xpi) = a1bc18ce75398f3c4ba0a3f004456884
+SHA256 (xpi/server_switcher-0.2b-fx+fl.xpi) = 2262343c3d65cb5634ffc6bb33b77f30a2049fe437e2462216c2c1c02c470c16
+SIZE (xpi/server_switcher-0.2b-fx+fl.xpi) = 21848
diff --git a/www/xpi-server_switcher/pkg-descr b/www/xpi-server_switcher/pkg-descr
index 9a220b011485..a9a93b892783 100644
--- a/www/xpi-server_switcher/pkg-descr
+++ b/www/xpi-server_switcher/pkg-descr
@@ -2,9 +2,4 @@ Server Switcher is a navigational help tool for web developers. It allows
 you to easily switch between sites on your development and live servers, so
 that you can immediately see the differences.
 
-Use case: When you are on http://localhost/page.html (your
-development-server) and click the ServerSwitcher-icon you will instantly be
-redirected to http://www.yoursite.com/page.html (your live-server).
-("localhost" and "www.yoursite.com" are of course configurable)
-
-WWW: https://addons.mozilla.org/firefox/2409/
+WWW: http://hermann.czedik.net/projekte/switcher/
diff --git a/www/xpi-server_switcher/pkg-plist b/www/xpi-server_switcher/pkg-plist
new file mode 100644
index 000000000000..714cd51befcb
--- /dev/null
+++ b/www/xpi-server_switcher/pkg-plist
@@ -0,0 +1,23 @@
+%%XPI_XPIDIR%%/chrome/switcher/content/about.xul
+%%XPI_XPIDIR%%/chrome/switcher/content/common/preferences.js
+%%XPI_XPIDIR%%/chrome/switcher/content/common/string.js
+%%XPI_XPIDIR%%/chrome/switcher/content/dialogs/serveradd.js
+%%XPI_XPIDIR%%/chrome/switcher/content/dialogs/serveradd.xul
+%%XPI_XPIDIR%%/chrome/switcher/content/switcherOptions.js
+%%XPI_XPIDIR%%/chrome/switcher/content/switcherOptions.xul
+%%XPI_XPIDIR%%/chrome/switcher/content/switcherOverlay.js
+%%XPI_XPIDIR%%/chrome/switcher/content/switcherOverlay.xul
+%%XPI_XPIDIR%%/chrome/switcher/skin/classic/devserver.png
+%%XPI_XPIDIR%%/chrome/switcher/skin/classic/hceswitch.css
+%%XPI_XPIDIR%%/chrome/switcher/skin/classic/icon.png
+%%XPI_XPIDIR%%/chrome/switcher/skin/classic/liveserver.png
+%%XPI_XPIDIR%%/chrome.manifest
+%%XPI_XPIDIR%%/install.rdf
+%%XPI_XPIDIR%%/license.txt
+@dirrm %%XPI_XPIDIR%%/chrome/switcher/content/common
+@dirrm %%XPI_XPIDIR%%/chrome/switcher/content/dialogs
+@dirrm %%XPI_XPIDIR%%/chrome/switcher/content
+@dirrm %%XPI_XPIDIR%%/chrome/switcher/skin/classic
+@dirrm %%XPI_XPIDIR%%/chrome/switcher/skin
+@dirrm %%XPI_XPIDIR%%/chrome/switcher
+@dirrm %%XPI_XPIDIR%%/chrome