3 files changed, 278 insertions, 25 deletions

diff --git a/www/xpi-firebug/Makefile b/www/xpi-firebug/Makefile
index 263db09435f9..29ee552b000c 100644
--- a/www/xpi-firebug/Makefile
+++ b/www/xpi-firebug/Makefile
@@ -6,8 +6,9 @@
 #
 
 PORTNAME=	firebug
-PORTVERSION=	1.05
-DISTVERSIONSUFFIX=	-fx+fl
+PORTVERSION=	1.2.0b6
+PORTEPOCH=	1
+DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
 MAINTAINER=	lapo@lapo.it
diff --git a/www/xpi-firebug/distinfo b/www/xpi-firebug/distinfo
index bf4d30779db8..88c135a578f0 100644
--- a/www/xpi-firebug/distinfo
+++ b/www/xpi-firebug/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/firebug-1.05-fx+fl.xpi) = d3bf78ab3ea64ae557abf05b3f196a4e
-SHA256 (xpi/firebug-1.05-fx+fl.xpi) = af1eb07312b75e92a3776c85fb044cae52ff87c38d3f1ca0fae30ecac4f5909a
-SIZE (xpi/firebug-1.05-fx+fl.xpi) = 263982
+MD5 (xpi/firebug-1.2.0b6-fx.xpi) = 13651d5bb03d81fae70cc413d21ac57f
+SHA256 (xpi/firebug-1.2.0b6-fx.xpi) = ce00daec2fcdce04ad9dace07baf3953c6ef576ce826c669589d65fe66ab93b2
+SIZE (xpi/firebug-1.2.0b6-fx.xpi) = 468251
diff --git a/www/xpi-firebug/pkg-plist b/www/xpi-firebug/pkg-plist
index 57bc7808592f..146368287181 100644
--- a/www/xpi-firebug/pkg-plist
+++ b/www/xpi-firebug/pkg-plist
@@ -1,31 +1,283 @@
-%%XPI_XPIDIR%%/chrome/firebug.jar
-%%XPI_XPIDIR%%/chrome/icons/default/firebug.ico
+%%XPI_XPIDIR%%/build.xml
 %%XPI_XPIDIR%%/chrome.manifest
 %%XPI_XPIDIR%%/components/firebug-service.js
-%%XPI_XPIDIR%%/components/nsIFireBug.xpt
+%%XPI_XPIDIR%%/content/firebug/bindings.xml
+%%XPI_XPIDIR%%/content/firebug/blank.gif
+%%XPI_XPIDIR%%/content/firebug/branch.properties
+%%XPI_XPIDIR%%/content/firebug/browserOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/changeeditor.xul
+%%XPI_XPIDIR%%/content/firebug/chrome.js
+%%XPI_XPIDIR%%/content/firebug/commandLine.js
+%%XPI_XPIDIR%%/content/firebug/commandLineInjected.js
+%%XPI_XPIDIR%%/content/firebug/console.js
+%%XPI_XPIDIR%%/content/firebug/consoleInjected.js
+%%XPI_XPIDIR%%/content/firebug/consoleInjector.js
+%%XPI_XPIDIR%%/content/firebug/css.js
+%%XPI_XPIDIR%%/content/firebug/customizeToolbarOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/debugger.js
+%%XPI_XPIDIR%%/content/firebug/dom.js
+%%XPI_XPIDIR%%/content/firebug/domplate.js
+%%XPI_XPIDIR%%/content/firebug/editor.js
+%%XPI_XPIDIR%%/content/firebug/editors.js
+%%XPI_XPIDIR%%/content/firebug/editors.xul
+%%XPI_XPIDIR%%/content/firebug/errors.js
+%%XPI_XPIDIR%%/content/firebug/firebug.css
+%%XPI_XPIDIR%%/content/firebug/firebug.js
+%%XPI_XPIDIR%%/content/firebug/firebug.png
+%%XPI_XPIDIR%%/content/firebug/firebug.xul
+%%XPI_XPIDIR%%/content/firebug/firebugOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/highlighter.css
+%%XPI_XPIDIR%%/content/firebug/html.js
+%%XPI_XPIDIR%%/content/firebug/infotip.js
+%%XPI_XPIDIR%%/content/firebug/insideOutBox.js
+%%XPI_XPIDIR%%/content/firebug/inspector.js
+%%XPI_XPIDIR%%/content/firebug/layout.js
+%%XPI_XPIDIR%%/content/firebug/lib.js
+%%XPI_XPIDIR%%/content/firebug/net.js
+%%XPI_XPIDIR%%/content/firebug/panel.html
+%%XPI_XPIDIR%%/content/firebug/permissionsOverlay.js
+%%XPI_XPIDIR%%/content/firebug/permissionsOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/plugin.js
+%%XPI_XPIDIR%%/content/firebug/profiler.js
+%%XPI_XPIDIR%%/content/firebug/reps.js
+%%XPI_XPIDIR%%/content/firebug/search.js
+%%XPI_XPIDIR%%/content/firebug/sourceCache.js
+%%XPI_XPIDIR%%/content/firebug/spy.js
+%%XPI_XPIDIR%%/content/firebug/tabContext.js
+%%XPI_XPIDIR%%/content/firebug/tabWatcher.js
+%%XPI_XPIDIR%%/content/firebug/tests/moved_to_fbug_tests.html
+%%XPI_XPIDIR%%/content/firebug/trace.js
+%%XPI_XPIDIR%%/content/firebug/tracePanel.js
+%%XPI_XPIDIR%%/content/firebug/xpcom.js
 %%XPI_XPIDIR%%/defaults/preferences/firebug.js
+%%XPI_XPIDIR%%/docs/Bugs.txt
+%%XPI_XPIDIR%%/docs/ReleaseNotes_1.1.txt
+%%XPI_XPIDIR%%/docs/ReleaseNotes_1.2.txt
+%%XPI_XPIDIR%%/docs/TODO.txt
+%%XPI_XPIDIR%%/docs/index.tpl.html
+%%XPI_XPIDIR%%/icons/default/firebug.ico
 %%XPI_XPIDIR%%/install.rdf
 %%XPI_XPIDIR%%/license.txt
-%%XPI_XPIDIR%%/platform/Darwin/chrome/firebug.jar
+%%XPI_XPIDIR%%/lite/errorIcon.png
+%%XPI_XPIDIR%%/lite/firebug.css
+%%XPI_XPIDIR%%/lite/firebug.html
+%%XPI_XPIDIR%%/lite/firebug.js
+%%XPI_XPIDIR%%/lite/firebugx.js
+%%XPI_XPIDIR%%/lite/infoIcon.png
+%%XPI_XPIDIR%%/lite/warningIcon.png
+%%XPI_XPIDIR%%/locale/Makefile.in
+%%XPI_XPIDIR%%/locale/bg/editors.dtd
+%%XPI_XPIDIR%%/locale/bg/firebug.dtd
+%%XPI_XPIDIR%%/locale/bg/firebug.properties
+%%XPI_XPIDIR%%/locale/ca-AD/editors.dtd
+%%XPI_XPIDIR%%/locale/ca-AD/firebug.dtd
+%%XPI_XPIDIR%%/locale/ca-AD/firebug.properties
+%%XPI_XPIDIR%%/locale/cs-CZ/editors.dtd
+%%XPI_XPIDIR%%/locale/cs-CZ/firebug.dtd
+%%XPI_XPIDIR%%/locale/cs-CZ/firebug.properties
+%%XPI_XPIDIR%%/locale/da-DK/editors.dtd
+%%XPI_XPIDIR%%/locale/da-DK/firebug.dtd
+%%XPI_XPIDIR%%/locale/da-DK/firebug.properties
+%%XPI_XPIDIR%%/locale/de-DE/editors.dtd
+%%XPI_XPIDIR%%/locale/de-DE/firebug.dtd
+%%XPI_XPIDIR%%/locale/de-DE/firebug.properties
+%%XPI_XPIDIR%%/locale/en-US/editors.dtd
+%%XPI_XPIDIR%%/locale/en-US/firebug.dtd
+%%XPI_XPIDIR%%/locale/en-US/firebug.properties
+%%XPI_XPIDIR%%/locale/es-ES/editors.dtd
+%%XPI_XPIDIR%%/locale/es-ES/firebug.dtd
+%%XPI_XPIDIR%%/locale/es-ES/firebug.properties
+%%XPI_XPIDIR%%/locale/fr-FR/editors.dtd
+%%XPI_XPIDIR%%/locale/fr-FR/firebug.dtd
+%%XPI_XPIDIR%%/locale/fr-FR/firebug.properties
+%%XPI_XPIDIR%%/locale/hu-HU/editors.dtd
+%%XPI_XPIDIR%%/locale/hu-HU/firebug.dtd
+%%XPI_XPIDIR%%/locale/hu-HU/firebug.properties
+%%XPI_XPIDIR%%/locale/it-IT/editors.dtd
+%%XPI_XPIDIR%%/locale/it-IT/firebug.dtd
+%%XPI_XPIDIR%%/locale/it-IT/firebug.properties
+%%XPI_XPIDIR%%/locale/ja/editors.dtd
+%%XPI_XPIDIR%%/locale/ja/firebug.dtd
+%%XPI_XPIDIR%%/locale/ja/firebug.properties
+%%XPI_XPIDIR%%/locale/jar.mn
+%%XPI_XPIDIR%%/locale/ko-KR/editors.dtd
+%%XPI_XPIDIR%%/locale/ko-KR/firebug.dtd
+%%XPI_XPIDIR%%/locale/ko-KR/firebug.properties
+%%XPI_XPIDIR%%/locale/nl-NL/editors.dtd
+%%XPI_XPIDIR%%/locale/nl-NL/firebug.dtd
+%%XPI_XPIDIR%%/locale/nl-NL/firebug.properties
+%%XPI_XPIDIR%%/locale/pl-PL/editors.dtd
+%%XPI_XPIDIR%%/locale/pl-PL/firebug.dtd
+%%XPI_XPIDIR%%/locale/pl-PL/firebug.properties
+%%XPI_XPIDIR%%/locale/pt-BR/editors.dtd
+%%XPI_XPIDIR%%/locale/pt-BR/firebug.dtd
+%%XPI_XPIDIR%%/locale/pt-BR/firebug.properties
+%%XPI_XPIDIR%%/locale/sk-SK/editors.dtd
+%%XPI_XPIDIR%%/locale/sk-SK/firebug.dtd
+%%XPI_XPIDIR%%/locale/sk-SK/firebug.properties
+%%XPI_XPIDIR%%/locale/tr-TR/editors.dtd
+%%XPI_XPIDIR%%/locale/tr-TR/firebug.dtd
+%%XPI_XPIDIR%%/locale/tr-TR/firebug.properties
+%%XPI_XPIDIR%%/locale/zh-CN/editors.dtd
+%%XPI_XPIDIR%%/locale/zh-CN/firebug.dtd
+%%XPI_XPIDIR%%/locale/zh-CN/firebug.properties
+%%XPI_XPIDIR%%/locale/zh-TW/editors.dtd
+%%XPI_XPIDIR%%/locale/zh-TW/firebug.dtd
+%%XPI_XPIDIR%%/locale/zh-TW/firebug.properties
 %%XPI_XPIDIR%%/platform/Darwin/chrome.manifest
-%%XPI_XPIDIR%%/platform/Linux/chrome/firebug.jar
-%%XPI_XPIDIR%%/platform/Linux/chrome.manifest
-%%XPI_XPIDIR%%/platform/WINNT/chrome/firebug.jar
-%%XPI_XPIDIR%%/platform/WINNT/chrome.manifest
-%%XPI_XPIDIR%%/platform/linux-gnu/chrome/firebug.jar
-%%XPI_XPIDIR%%/platform/linux-gnu/chrome.manifest
-@dirrm %%XPI_XPIDIR%%/chrome/icons/default
-@dirrm %%XPI_XPIDIR%%/chrome/icons
-@dirrm %%XPI_XPIDIR%%/chrome
+%%XPI_XPIDIR%%/skin/classic/arrowDown.png
+%%XPI_XPIDIR%%/skin/classic/arrowUp.png
+%%XPI_XPIDIR%%/skin/classic/bindings.xml
+%%XPI_XPIDIR%%/skin/classic/breakpoint.png
+%%XPI_XPIDIR%%/skin/classic/breakpointCondition.png
+%%XPI_XPIDIR%%/skin/classic/breakpointDisabled.png
+%%XPI_XPIDIR%%/skin/classic/breakpointDisabledExe.png
+%%XPI_XPIDIR%%/skin/classic/breakpointExe.png
+%%XPI_XPIDIR%%/skin/classic/condBorders.png
+%%XPI_XPIDIR%%/skin/classic/condBordersUps.png
+%%XPI_XPIDIR%%/skin/classic/condCorners.png
+%%XPI_XPIDIR%%/skin/classic/condCornersUps.png
+%%XPI_XPIDIR%%/skin/classic/console.css
+%%XPI_XPIDIR%%/skin/classic/continue.png
+%%XPI_XPIDIR%%/skin/classic/continueActive.png
+%%XPI_XPIDIR%%/skin/classic/continueDisabled.png
+%%XPI_XPIDIR%%/skin/classic/css.css
+%%XPI_XPIDIR%%/skin/classic/debugger.css
+%%XPI_XPIDIR%%/skin/classic/disable.png
+%%XPI_XPIDIR%%/skin/classic/disableHover.png
+%%XPI_XPIDIR%%/skin/classic/disabledIcon.png
+%%XPI_XPIDIR%%/skin/classic/dom.css
+%%XPI_XPIDIR%%/skin/classic/errorIcon-sm.png
+%%XPI_XPIDIR%%/skin/classic/errorIcon.png
+%%XPI_XPIDIR%%/skin/classic/exe.png
+%%XPI_XPIDIR%%/skin/classic/firebug-gray-16.png
+%%XPI_XPIDIR%%/skin/classic/firebug.css
+%%XPI_XPIDIR%%/skin/classic/firebug.png
+%%XPI_XPIDIR%%/skin/classic/firebug16.png
+%%XPI_XPIDIR%%/skin/classic/firebug24.png
+%%XPI_XPIDIR%%/skin/classic/firebug32.png
+%%XPI_XPIDIR%%/skin/classic/group.gif
+%%XPI_XPIDIR%%/skin/classic/html.css
+%%XPI_XPIDIR%%/skin/classic/infoIcon.png
+%%XPI_XPIDIR%%/skin/classic/inspect.png
+%%XPI_XPIDIR%%/skin/classic/inspectDisabled.png
+%%XPI_XPIDIR%%/skin/classic/inspectSmall.png
+%%XPI_XPIDIR%%/skin/classic/layout.css
+%%XPI_XPIDIR%%/skin/classic/loading_16.gif
+%%XPI_XPIDIR%%/skin/classic/mac/close.png
+%%XPI_XPIDIR%%/skin/classic/mac/closeActive.png
+%%XPI_XPIDIR%%/skin/classic/mac/closeHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/detach.png
+%%XPI_XPIDIR%%/skin/classic/mac/detachActive.png
+%%XPI_XPIDIR%%/skin/classic/mac/detachHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/firebug.css
+%%XPI_XPIDIR%%/skin/classic/mac/firebugMenu.png
+%%XPI_XPIDIR%%/skin/classic/mac/firebugMenuHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/firebugMenuOpen.png
+%%XPI_XPIDIR%%/skin/classic/mac/min.png
+%%XPI_XPIDIR%%/skin/classic/mac/minActive.png
+%%XPI_XPIDIR%%/skin/classic/mac/minHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/panel.css
+%%XPI_XPIDIR%%/skin/classic/mac/searchBox.png
+%%XPI_XPIDIR%%/skin/classic/mac/tabBar.gif
+%%XPI_XPIDIR%%/skin/classic/mac/tabLeft.png
+%%XPI_XPIDIR%%/skin/classic/mac/tabLeftHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/tabMid.png
+%%XPI_XPIDIR%%/skin/classic/mac/tabMidHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/tabRight.png
+%%XPI_XPIDIR%%/skin/classic/mac/tabRightHover.png
+%%XPI_XPIDIR%%/skin/classic/mac/toolbar.gif
+%%XPI_XPIDIR%%/skin/classic/mac/twistyClosed.png
+%%XPI_XPIDIR%%/skin/classic/mac/twistyOpen.png
+%%XPI_XPIDIR%%/skin/classic/mac/window.css
+%%XPI_XPIDIR%%/skin/classic/net.css
+%%XPI_XPIDIR%%/skin/classic/netBarCached.gif
+%%XPI_XPIDIR%%/skin/classic/netBarLoaded.gif
+%%XPI_XPIDIR%%/skin/classic/netBarLoading.gif
+%%XPI_XPIDIR%%/skin/classic/notloading_16.png
+%%XPI_XPIDIR%%/skin/classic/okIcon-sm.png
+%%XPI_XPIDIR%%/skin/classic/panel.css
+%%XPI_XPIDIR%%/skin/classic/panelbase.css
+%%XPI_XPIDIR%%/skin/classic/pause.png
+%%XPI_XPIDIR%%/skin/classic/pauseActive.png
+%%XPI_XPIDIR%%/skin/classic/pauseDisabled.png
+%%XPI_XPIDIR%%/skin/classic/rulerH.png
+%%XPI_XPIDIR%%/skin/classic/rulerV.png
+%%XPI_XPIDIR%%/skin/classic/stepInto.png
+%%XPI_XPIDIR%%/skin/classic/stepIntoActive.png
+%%XPI_XPIDIR%%/skin/classic/stepIntoDisabled.png
+%%XPI_XPIDIR%%/skin/classic/stepOut.png
+%%XPI_XPIDIR%%/skin/classic/stepOutActive.png
+%%XPI_XPIDIR%%/skin/classic/stepOutDisabled.png
+%%XPI_XPIDIR%%/skin/classic/stepOver.png
+%%XPI_XPIDIR%%/skin/classic/stepOverActive.png
+%%XPI_XPIDIR%%/skin/classic/stepOverDisabled.png
+%%XPI_XPIDIR%%/skin/classic/tabMenuTarget.png
+%%XPI_XPIDIR%%/skin/classic/tabMenuTargetHover.png
+%%XPI_XPIDIR%%/skin/classic/tableHeader.gif
+%%XPI_XPIDIR%%/skin/classic/tableHeaderActive.gif
+%%XPI_XPIDIR%%/skin/classic/tableHeaderSorted.gif
+%%XPI_XPIDIR%%/skin/classic/tableHeaderSortedActive.gif
+%%XPI_XPIDIR%%/skin/classic/textEditorBorders.png
+%%XPI_XPIDIR%%/skin/classic/textEditorCorners.png
+%%XPI_XPIDIR%%/skin/classic/tracePanel.css
+%%XPI_XPIDIR%%/skin/classic/warningIcon.png
+%%XPI_XPIDIR%%/skin/classic/win/close.png
+%%XPI_XPIDIR%%/skin/classic/win/closeActive.png
+%%XPI_XPIDIR%%/skin/classic/win/closeHover.png
+%%XPI_XPIDIR%%/skin/classic/win/detach.png
+%%XPI_XPIDIR%%/skin/classic/win/detachActive.png
+%%XPI_XPIDIR%%/skin/classic/win/detachHover.png
+%%XPI_XPIDIR%%/skin/classic/win/firebug.css
+%%XPI_XPIDIR%%/skin/classic/win/min.png
+%%XPI_XPIDIR%%/skin/classic/win/minActive.png
+%%XPI_XPIDIR%%/skin/classic/win/minHover.png
+%%XPI_XPIDIR%%/skin/classic/win/panel.css
+%%XPI_XPIDIR%%/skin/classic/win/search.png
+%%XPI_XPIDIR%%/skin/classic/win/tabBg.png
+%%XPI_XPIDIR%%/skin/classic/win/tabLeft.png
+%%XPI_XPIDIR%%/skin/classic/win/tabLeftHover.png
+%%XPI_XPIDIR%%/skin/classic/win/tabMid.png
+%%XPI_XPIDIR%%/skin/classic/win/tabMidHover.png
+%%XPI_XPIDIR%%/skin/classic/win/tabRight.png
+%%XPI_XPIDIR%%/skin/classic/win/tabRightHover.png
+%%XPI_XPIDIR%%/skin/classic/win/twistyClosed.png
+%%XPI_XPIDIR%%/skin/classic/win/twistyOpen.png
+%%XPI_XPIDIR%%/skin/classic/win/window.css
+%%XPI_XPIDIR%%/skin/classic/window.css
 @dirrm %%XPI_XPIDIR%%/components
+@dirrm %%XPI_XPIDIR%%/content/firebug/tests
+@dirrm %%XPI_XPIDIR%%/content/firebug
+@dirrm %%XPI_XPIDIR%%/content
 @dirrm %%XPI_XPIDIR%%/defaults/preferences
 @dirrm %%XPI_XPIDIR%%/defaults
-@dirrm %%XPI_XPIDIR%%/platform/Darwin/chrome
+@dirrm %%XPI_XPIDIR%%/docs
+@dirrm %%XPI_XPIDIR%%/icons/default
+@dirrm %%XPI_XPIDIR%%/icons
+@dirrm %%XPI_XPIDIR%%/lite
+@dirrm %%XPI_XPIDIR%%/locale/bg
+@dirrm %%XPI_XPIDIR%%/locale/ca-AD
+@dirrm %%XPI_XPIDIR%%/locale/cs-CZ
+@dirrm %%XPI_XPIDIR%%/locale/da-DK
+@dirrm %%XPI_XPIDIR%%/locale/de-DE
+@dirrm %%XPI_XPIDIR%%/locale/en-US
+@dirrm %%XPI_XPIDIR%%/locale/es-ES
+@dirrm %%XPI_XPIDIR%%/locale/fr-FR
+@dirrm %%XPI_XPIDIR%%/locale/hu-HU
+@dirrm %%XPI_XPIDIR%%/locale/it-IT
+@dirrm %%XPI_XPIDIR%%/locale/ja
+@dirrm %%XPI_XPIDIR%%/locale/ko-KR
+@dirrm %%XPI_XPIDIR%%/locale/nl-NL
+@dirrm %%XPI_XPIDIR%%/locale/pl-PL
+@dirrm %%XPI_XPIDIR%%/locale/pt-BR
+@dirrm %%XPI_XPIDIR%%/locale/sk-SK
+@dirrm %%XPI_XPIDIR%%/locale/tr-TR
+@dirrm %%XPI_XPIDIR%%/locale/zh-CN
+@dirrm %%XPI_XPIDIR%%/locale/zh-TW
+@dirrm %%XPI_XPIDIR%%/locale
 @dirrm %%XPI_XPIDIR%%/platform/Darwin
-@dirrm %%XPI_XPIDIR%%/platform/Linux/chrome
-@dirrm %%XPI_XPIDIR%%/platform/Linux
-@dirrm %%XPI_XPIDIR%%/platform/WINNT/chrome
-@dirrm %%XPI_XPIDIR%%/platform/WINNT
-@dirrm %%XPI_XPIDIR%%/platform/linux-gnu/chrome
-@dirrm %%XPI_XPIDIR%%/platform/linux-gnu
 @dirrm %%XPI_XPIDIR%%/platform
+@dirrm %%XPI_XPIDIR%%/skin/classic/mac
+@dirrm %%XPI_XPIDIR%%/skin/classic/win
+@dirrm %%XPI_XPIDIR%%/skin/classic
+@dirrm %%XPI_XPIDIR%%/skin