3 files changed, 102 insertions, 10 deletions

diff --git a/www/xpi-firebug/Makefile b/www/xpi-firebug/Makefile
index 6ee486428575..83eee2c6d192 100644
--- a/www/xpi-firebug/Makefile
+++ b/www/xpi-firebug/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firebug
-PORTVERSION=	1.4.5
+PORTVERSION=	1.5.0
 DISTVERSIONSUFFIX=	-fx
 PORTEPOCH=	3
 CATEGORIES=	www
diff --git a/www/xpi-firebug/distinfo b/www/xpi-firebug/distinfo
index f3c16256b403..a18e98d21b24 100644
--- a/www/xpi-firebug/distinfo
+++ b/www/xpi-firebug/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/firebug-1.4.5-fx.xpi) = 1623533f1f6fbdd65e12caf49d70686e
-SHA256 (xpi/firebug-1.4.5-fx.xpi) = bb3e7f79295d83c7f2d7c9e3095e818b9ed57805142e6af8624a2ae1f4dc26b1
-SIZE (xpi/firebug-1.4.5-fx.xpi) = 695194
+MD5 (xpi/firebug-1.5.0-fx.xpi) = 7e147e65151d2d24f4bc6ce2a455c007
+SHA256 (xpi/firebug-1.5.0-fx.xpi) = 9c72d2c2838fab16707bb37042f6005ecfd781c10861e96c35db01dd8ca2138b
+SIZE (xpi/firebug-1.5.0-fx.xpi) = 1052176
diff --git a/www/xpi-firebug/pkg-plist b/www/xpi-firebug/pkg-plist
index aae236a98f98..47416e330eb3 100644
--- a/www/xpi-firebug/pkg-plist
+++ b/www/xpi-firebug/pkg-plist
@@ -6,10 +6,13 @@
 %%XPI_XPIDIR%%/components/firebug-service.js
 %%XPI_XPIDIR%%/components/firebug-trace-service.js
 %%XPI_XPIDIR%%/content/firebug/a11y.js
+%%XPI_XPIDIR%%/content/firebug/aboutOverlay.js
+%%XPI_XPIDIR%%/content/firebug/aboutOverlay.xul
 %%XPI_XPIDIR%%/content/firebug/activation.js
 %%XPI_XPIDIR%%/content/firebug/bindings.xml
 %%XPI_XPIDIR%%/content/firebug/blank.gif
 %%XPI_XPIDIR%%/content/firebug/branch.properties
+%%XPI_XPIDIR%%/content/firebug/breakpoint.js
 %%XPI_XPIDIR%%/content/firebug/browserOverlay.xul
 %%XPI_XPIDIR%%/content/firebug/changeeditor.xul
 %%XPI_XPIDIR%%/content/firebug/chrome.js
@@ -43,6 +46,7 @@
 %%XPI_XPIDIR%%/content/firebug/inspector.js
 %%XPI_XPIDIR%%/content/firebug/jsonViewer.js
 %%XPI_XPIDIR%%/content/firebug/layout.js
+%%XPI_XPIDIR%%/content/firebug/lib/htmlLib.js
 %%XPI_XPIDIR%%/content/firebug/lib.js
 %%XPI_XPIDIR%%/content/firebug/net.js
 %%XPI_XPIDIR%%/content/firebug/panel.html
@@ -51,7 +55,9 @@
 %%XPI_XPIDIR%%/content/firebug/reps.js
 %%XPI_XPIDIR%%/content/firebug/search.js
 %%XPI_XPIDIR%%/content/firebug/shortcuts.js
+%%XPI_XPIDIR%%/content/firebug/sourceBox.js
 %%XPI_XPIDIR%%/content/firebug/sourceCache.js
+%%XPI_XPIDIR%%/content/firebug/sourceFile.js
 %%XPI_XPIDIR%%/content/firebug/spy.js
 %%XPI_XPIDIR%%/content/firebug/tabCache.js
 %%XPI_XPIDIR%%/content/firebug/tabContext.js
@@ -62,8 +68,10 @@
 %%XPI_XPIDIR%%/content/firebug/traceConsole.html
 %%XPI_XPIDIR%%/content/firebug/traceConsole.js
 %%XPI_XPIDIR%%/content/firebug/traceConsole.xul
+%%XPI_XPIDIR%%/content/firebug/traceLogFrame.html
 %%XPI_XPIDIR%%/content/firebug/traceModule.js
 %%XPI_XPIDIR%%/content/firebug/traceOverlay.xul
+%%XPI_XPIDIR%%/content/firebug/xmlViewer.js
 %%XPI_XPIDIR%%/content/firebug/xpcom.js
 %%XPI_XPIDIR%%/defaults/preferences/firebug.js
 %%XPI_XPIDIR%%/docs/Bugs.txt
@@ -71,6 +79,7 @@
 %%XPI_XPIDIR%%/docs/ReleaseNotes_1.2.txt
 %%XPI_XPIDIR%%/docs/ReleaseNotes_1.3.txt
 %%XPI_XPIDIR%%/docs/ReleaseNotes_1.4.txt
+%%XPI_XPIDIR%%/docs/ReleaseNotes_1.5.txt
 %%XPI_XPIDIR%%/docs/TODO.txt
 %%XPI_XPIDIR%%/docs/index.tpl.html
 %%XPI_XPIDIR%%/icons/default/TraceConsole.png
@@ -90,6 +99,8 @@
 %%XPI_XPIDIR%%/locale/bg-BG/firebug.dtd
 %%XPI_XPIDIR%%/locale/bg-BG/firebug.properties
 %%XPI_XPIDIR%%/locale/ca-AD/editors.dtd
+%%XPI_XPIDIR%%/locale/ca-AD/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/ca-AD/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/ca-AD/firebug.dtd
 %%XPI_XPIDIR%%/locale/ca-AD/firebug.properties
 %%XPI_XPIDIR%%/locale/cs-CZ/editors.dtd
@@ -99,27 +110,58 @@
 %%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-amo.properties
+%%XPI_XPIDIR%%/locale/de-DE/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/de-DE/firebug.dtd
 %%XPI_XPIDIR%%/locale/de-DE/firebug.properties
+%%XPI_XPIDIR%%/locale/el-GR/editors.dtd
+%%XPI_XPIDIR%%/locale/el-GR/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/el-GR/firebug-tracing.properties
+%%XPI_XPIDIR%%/locale/el-GR/firebug.dtd
+%%XPI_XPIDIR%%/locale/el-GR/firebug.properties
 %%XPI_XPIDIR%%/locale/en-US/editors.dtd
+%%XPI_XPIDIR%%/locale/en-US/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/en-US/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/en-US/firebug.dtd
 %%XPI_XPIDIR%%/locale/en-US/firebug.properties
 %%XPI_XPIDIR%%/locale/es-AR/editors.dtd
+%%XPI_XPIDIR%%/locale/es-AR/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/es-AR/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/es-AR/firebug.dtd
 %%XPI_XPIDIR%%/locale/es-AR/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/fa-IR/editors.dtd
+%%XPI_XPIDIR%%/locale/fa-IR/firebug.dtd
+%%XPI_XPIDIR%%/locale/fa-IR/firebug.properties
 %%XPI_XPIDIR%%/locale/fr-FR/editors.dtd
+%%XPI_XPIDIR%%/locale/fr-FR/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/fr-FR/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/fr-FR/firebug.dtd
 %%XPI_XPIDIR%%/locale/fr-FR/firebug.properties
+%%XPI_XPIDIR%%/locale/hr-HR/editors.dtd
+%%XPI_XPIDIR%%/locale/hr-HR/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/hr-HR/firebug-tracing.properties
+%%XPI_XPIDIR%%/locale/hr-HR/firebug.dtd
+%%XPI_XPIDIR%%/locale/hr-HR/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/hy-AM/editors.dtd
+%%XPI_XPIDIR%%/locale/hy-AM/firebug.dtd
+%%XPI_XPIDIR%%/locale/hy-AM/firebug.properties
+%%XPI_XPIDIR%%/locale/is-IS/editors.dtd
+%%XPI_XPIDIR%%/locale/is-IS/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/is-IS/firebug-tracing.properties
+%%XPI_XPIDIR%%/locale/is-IS/firebug.dtd
+%%XPI_XPIDIR%%/locale/is-IS/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-JP/editors.dtd
+%%XPI_XPIDIR%%/locale/ja-JP/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/ja-JP/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/ja-JP/firebug.dtd
 %%XPI_XPIDIR%%/locale/ja-JP/firebug.properties
 %%XPI_XPIDIR%%/locale/jar.mn
@@ -127,24 +169,44 @@
 %%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-amo.properties
+%%XPI_XPIDIR%%/locale/nl-NL/firebug-tracing.properties
 %%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-amo.properties
+%%XPI_XPIDIR%%/locale/pl-PL/firebug-tracing.properties
 %%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/pt-PT/editors.dtd
+%%XPI_XPIDIR%%/locale/pt-PT/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/pt-PT/firebug-tracing.properties
+%%XPI_XPIDIR%%/locale/pt-PT/firebug.dtd
+%%XPI_XPIDIR%%/locale/pt-PT/firebug.properties
 %%XPI_XPIDIR%%/locale/ro-RO/editors.dtd
+%%XPI_XPIDIR%%/locale/ro-RO/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/ro-RO/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/ro-RO/firebug.dtd
 %%XPI_XPIDIR%%/locale/ro-RO/firebug.properties
 %%XPI_XPIDIR%%/locale/ru-RU/editors.dtd
+%%XPI_XPIDIR%%/locale/ru-RU/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/ru-RU/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/ru-RU/firebug.dtd
 %%XPI_XPIDIR%%/locale/ru-RU/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/sl-SI/editors.dtd
+%%XPI_XPIDIR%%/locale/sl-SI/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/sl-SI/firebug-tracing.properties
+%%XPI_XPIDIR%%/locale/sl-SI/firebug.dtd
+%%XPI_XPIDIR%%/locale/sl-SI/firebug.properties
 %%XPI_XPIDIR%%/locale/sv-SE/editors.dtd
+%%XPI_XPIDIR%%/locale/sv-SE/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/sv-SE/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/sv-SE/firebug.dtd
 %%XPI_XPIDIR%%/locale/sv-SE/firebug.properties
 %%XPI_XPIDIR%%/locale/tr-TR/editors.dtd
@@ -153,7 +215,14 @@
 %%XPI_XPIDIR%%/locale/uk-UA/editors.dtd
 %%XPI_XPIDIR%%/locale/uk-UA/firebug.dtd
 %%XPI_XPIDIR%%/locale/uk-UA/firebug.properties
+%%XPI_XPIDIR%%/locale/vi-VN/editors.dtd
+%%XPI_XPIDIR%%/locale/vi-VN/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/vi-VN/firebug-tracing.properties
+%%XPI_XPIDIR%%/locale/vi-VN/firebug.dtd
+%%XPI_XPIDIR%%/locale/vi-VN/firebug.properties
 %%XPI_XPIDIR%%/locale/zh-CN/editors.dtd
+%%XPI_XPIDIR%%/locale/zh-CN/firebug-amo.properties
+%%XPI_XPIDIR%%/locale/zh-CN/firebug-tracing.properties
 %%XPI_XPIDIR%%/locale/zh-CN/firebug.dtd
 %%XPI_XPIDIR%%/locale/zh-CN/firebug.properties
 %%XPI_XPIDIR%%/locale/zh-TW/editors.dtd
@@ -161,7 +230,10 @@
 %%XPI_XPIDIR%%/locale/zh-TW/firebug.properties
 %%XPI_XPIDIR%%/platform/Darwin/chrome.manifest
 %%XPI_XPIDIR%%/skin/classic/Templarian_inspector.png
-%%XPI_XPIDIR%%/skin/classic/activation-menu.png
+%%XPI_XPIDIR%%/skin/classic/about.css
+%%XPI_XPIDIR%%/skin/classic/activation-menu-console.png
+%%XPI_XPIDIR%%/skin/classic/activation-menu-net.png
+%%XPI_XPIDIR%%/skin/classic/activation-menu-script.png
 %%XPI_XPIDIR%%/skin/classic/arrowDown.png
 %%XPI_XPIDIR%%/skin/classic/arrowUp.png
 %%XPI_XPIDIR%%/skin/classic/bindings.xml
@@ -184,6 +256,7 @@
 %%XPI_XPIDIR%%/skin/classic/continueActive.png
 %%XPI_XPIDIR%%/skin/classic/continueDisabled.png
 %%XPI_XPIDIR%%/skin/classic/css.css
+%%XPI_XPIDIR%%/skin/classic/customizeShortcuts.css
 %%XPI_XPIDIR%%/skin/classic/debugger.css
 %%XPI_XPIDIR%%/skin/classic/disable.png
 %%XPI_XPIDIR%%/skin/classic/disableHover.png
@@ -219,11 +292,13 @@
 %%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/hud-style-button-middle-background.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/search-panel-down.png
+%%XPI_XPIDIR%%/skin/classic/mac/search-panel.png
 %%XPI_XPIDIR%%/skin/classic/mac/tabBar.gif
 %%XPI_XPIDIR%%/skin/classic/mac/tabLeft.png
 %%XPI_XPIDIR%%/skin/classic/mac/tabLeftHover.png
@@ -240,9 +315,15 @@
 %%XPI_XPIDIR%%/skin/classic/netBarConnecting.gif
 %%XPI_XPIDIR%%/skin/classic/netBarLoaded.gif
 %%XPI_XPIDIR%%/skin/classic/netBarLoading.gif
+%%XPI_XPIDIR%%/skin/classic/netBarReceiving.gif
 %%XPI_XPIDIR%%/skin/classic/netBarResolving.gif
 %%XPI_XPIDIR%%/skin/classic/netBarResponded.gif
+%%XPI_XPIDIR%%/skin/classic/netBarSending.gif
 %%XPI_XPIDIR%%/skin/classic/netBarWaiting.gif
+%%XPI_XPIDIR%%/skin/classic/noteBorders.png
+%%XPI_XPIDIR%%/skin/classic/noteBordersUps.png
+%%XPI_XPIDIR%%/skin/classic/noteCorners.png
+%%XPI_XPIDIR%%/skin/classic/noteCornersUps.png
 %%XPI_XPIDIR%%/skin/classic/notloading_16.png
 %%XPI_XPIDIR%%/skin/classic/okIcon-sm.png
 %%XPI_XPIDIR%%/skin/classic/panel.css
@@ -252,6 +333,7 @@
 %%XPI_XPIDIR%%/skin/classic/pauseDisabled.png
 %%XPI_XPIDIR%%/skin/classic/rulerH.png
 %%XPI_XPIDIR%%/skin/classic/rulerV.png
+%%XPI_XPIDIR%%/skin/classic/search.png
 %%XPI_XPIDIR%%/skin/classic/stepInto.png
 %%XPI_XPIDIR%%/skin/classic/stepIntoActive.png
 %%XPI_XPIDIR%%/skin/classic/stepIntoDisabled.png
@@ -285,21 +367,22 @@
 %%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/off.png
-%%XPI_XPIDIR%%/skin/classic/win/offActive.png
-%%XPI_XPIDIR%%/skin/classic/win/offHover.png
 %%XPI_XPIDIR%%/skin/classic/win/panel.css
 %%XPI_XPIDIR%%/skin/classic/win/pause.png
 %%XPI_XPIDIR%%/skin/classic/win/pauseActive.png
 %%XPI_XPIDIR%%/skin/classic/win/pauseDisabled.png
-%%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/tabLeftUnselected.png
+%%XPI_XPIDIR%%/skin/classic/win/tabMenuTarget.png
+%%XPI_XPIDIR%%/skin/classic/win/tabMenuTargetHover.png
 %%XPI_XPIDIR%%/skin/classic/win/tabMid.png
 %%XPI_XPIDIR%%/skin/classic/win/tabMidHover.png
+%%XPI_XPIDIR%%/skin/classic/win/tabMidUnselected.png
 %%XPI_XPIDIR%%/skin/classic/win/tabRight.png
 %%XPI_XPIDIR%%/skin/classic/win/tabRightHover.png
+%%XPI_XPIDIR%%/skin/classic/win/tabRightUnselected.png
 %%XPI_XPIDIR%%/skin/classic/win/twistyClosed.png
 %%XPI_XPIDIR%%/skin/classic/win/twistyOpen.png
 %%XPI_XPIDIR%%/skin/classic/win/up.png
@@ -309,6 +392,7 @@
 %%XPI_XPIDIR%%/skin/classic/window.css
 %%XPI_XPIDIR%%/update.rdf.tpl.xml
 @dirrm %%XPI_XPIDIR%%/components
+@dirrm %%XPI_XPIDIR%%/content/firebug/lib
 @dirrm %%XPI_XPIDIR%%/content/firebug/tests
 @dirrm %%XPI_XPIDIR%%/content/firebug
 @dirrm %%XPI_XPIDIR%%/content
@@ -323,23 +407,31 @@
 @dirrm %%XPI_XPIDIR%%/locale/cs-CZ
 @dirrm %%XPI_XPIDIR%%/locale/da-DK
 @dirrm %%XPI_XPIDIR%%/locale/de-DE
+@dirrm %%XPI_XPIDIR%%/locale/el-GR
 @dirrm %%XPI_XPIDIR%%/locale/en-US
 @dirrm %%XPI_XPIDIR%%/locale/es-AR
 @dirrm %%XPI_XPIDIR%%/locale/es-ES
+@dirrm %%XPI_XPIDIR%%/locale/fa-IR
 @dirrm %%XPI_XPIDIR%%/locale/fr-FR
+@dirrm %%XPI_XPIDIR%%/locale/hr-HR
 @dirrm %%XPI_XPIDIR%%/locale/hu-HU
+@dirrm %%XPI_XPIDIR%%/locale/hy-AM
+@dirrm %%XPI_XPIDIR%%/locale/is-IS
 @dirrm %%XPI_XPIDIR%%/locale/it-IT
 @dirrm %%XPI_XPIDIR%%/locale/ja-JP
 @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/pt-PT
 @dirrm %%XPI_XPIDIR%%/locale/ro-RO
 @dirrm %%XPI_XPIDIR%%/locale/ru-RU
 @dirrm %%XPI_XPIDIR%%/locale/sk-SK
+@dirrm %%XPI_XPIDIR%%/locale/sl-SI
 @dirrm %%XPI_XPIDIR%%/locale/sv-SE
 @dirrm %%XPI_XPIDIR%%/locale/tr-TR
 @dirrm %%XPI_XPIDIR%%/locale/uk-UA
+@dirrm %%XPI_XPIDIR%%/locale/vi-VN
 @dirrm %%XPI_XPIDIR%%/locale/zh-CN
 @dirrm %%XPI_XPIDIR%%/locale/zh-TW
 @dirrm %%XPI_XPIDIR%%/locale