Update to firefox-4.0.

Firefox 4 is based on the Gecko 2.0 Web platform. This release features
JavaScript execution speeds up to six times faster than the previous
version, new capabilities for Web Developers and Add-on Developers such as
hardware accelerated graphics and HTML5 technologies, and a completely
revised user interface.

2 files changed, 366 insertions, 23 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index d2d1c28739c..b51bc307cc6 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2011/04/22 13:44:58 obache Exp $
+# $NetBSD: Makefile,v 1.85 2011/04/26 14:18:01 tnn Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	firefox-${FIREFOX_VER}
-PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	tnn@NetBSD.org
@@ -15,6 +14,8 @@ MOZILLA_DIR=	# empty
 CONFIGURE_ARGS+=	--enable-application=browser
 CONFIGURE_ARGS+=	--with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk
 CONFIGURE_ARGS+=	--with-system-libxul
+# XXX tnn with omnijar enabled it just doesn't start
+CONFIGURE_ARGS+=	--enable-chrome-format=flat
 
 ALL_ENV+=		MOZILLA_PKG_NAME=firefox
 
@@ -23,15 +24,17 @@ ALL_ENV+=		MOZILLA_PKG_NAME=firefox
 
 MOZILLA=firefox
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
-MOZILLA_NAME=	Firefox 3.6
+MOZILLA_NAME=	Firefox
 MOZILLA_ICON=	${WRKSRC}/other-licenses/branding/firefox/default48.png
 .else
-MOZILLA_NAME=	Browser 3.6
+MOZILLA_NAME=	Browser
 MOZILLA_ICON=	${WRKSRC}/browser/branding/unofficial/default48.png
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && autoconf
+# XXX not built here, just to make check-portability.awk shut up.
+	cd ${WRKSRC}/js/src && autoconf
 
 post-build:
 	${SED} -e 's|@MOZILLA@|${MOZILLA}|g'				\
@@ -54,8 +57,10 @@ post-install:
 BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 BUILD_DEPENDS+=				xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner
 .include "../../devel/xulrunner/buildlink3.mk"
+PLIST_VARS+=	gnome
 .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
 CONFIGURE_ARGS+=	--enable-gnomevfs --enable-dbus --enable-gnomeui
+PLIST.gnome=	yes
 .else
 CONFIGURE_ARGS+=	--disable-gnomevfs --disable-dbus --disable-gnomeui
 .endif
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 7f6f1e987fd..64d8b604be0 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,34 +1,342 @@
-@comment $NetBSD: PLIST,v 1.41 2010/12/29 22:38:49 tnn Exp $
+@comment $NetBSD: PLIST,v 1.42 2011/04/26 14:18:01 tnn Exp $
 bin/firefox
-lib/firefox/.autoreg
-lib/firefox/LICENSE
 lib/firefox/README.txt
 lib/firefox/application.ini
 lib/firefox/blocklist.xml
-lib/firefox/browserconfig.properties
-lib/firefox/chrome/browser.jar
-lib/firefox/chrome/browser.manifest
-lib/firefox/chrome/classic.jar
-lib/firefox/chrome/classic.manifest
-lib/firefox/chrome/en-US.jar
-lib/firefox/chrome/en-US.manifest
+lib/firefox/chrome.manifest
+lib/firefox/chrome/browser/content/branding/about-logo.png
+lib/firefox/chrome/browser/content/branding/about-wordmark.png
+lib/firefox/chrome/browser/content/branding/about.png
+lib/firefox/chrome/browser/content/branding/icon128.png
+lib/firefox/chrome/browser/content/branding/icon16.png
+lib/firefox/chrome/browser/content/branding/icon48.png
+lib/firefox/chrome/browser/content/branding/icon64.png
+lib/firefox/chrome/browser/content/browser/NetworkPanel.xhtml
+lib/firefox/chrome/browser/content/browser/aboutDialog.css
+lib/firefox/chrome/browser/content/browser/aboutDialog.js
+lib/firefox/chrome/browser/content/browser/aboutDialog.xul
+lib/firefox/chrome/browser/content/browser/aboutHome-restore-icon-small.png
+lib/firefox/chrome/browser/content/browser/aboutHome-restore-icon.png
+lib/firefox/chrome/browser/content/browser/aboutHome.css
+lib/firefox/chrome/browser/content/browser/aboutHome.js
+lib/firefox/chrome/browser/content/browser/aboutHome.xhtml
+lib/firefox/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml
+lib/firefox/chrome/browser/content/browser/aboutRobots-icon.png
+lib/firefox/chrome/browser/content/browser/aboutRobots-widget-left.png
+lib/firefox/chrome/browser/content/browser/aboutRobots.xhtml
+lib/firefox/chrome/browser/content/browser/aboutSessionRestore.js
+lib/firefox/chrome/browser/content/browser/aboutSessionRestore.xhtml
+lib/firefox/chrome/browser/content/browser/aboutSyncTabs-bindings.xml
+lib/firefox/chrome/browser/content/browser/aboutSyncTabs.css
+lib/firefox/chrome/browser/content/browser/aboutSyncTabs.js
+lib/firefox/chrome/browser/content/browser/aboutSyncTabs.xul
+lib/firefox/chrome/browser/content/browser/baseMenuOverlay.xul
+lib/firefox/chrome/browser/content/browser/bookmarks/bookmarksPanel.js
+lib/firefox/chrome/browser/content/browser/bookmarks/bookmarksPanel.xul
+lib/firefox/chrome/browser/content/browser/bookmarks/sidebarUtils.js
+lib/firefox/chrome/browser/content/browser/browser-tabPreviews.xml
+lib/firefox/chrome/browser/content/browser/browser.css
+lib/firefox/chrome/browser/content/browser/browser.js
+lib/firefox/chrome/browser/content/browser/browser.xul
+lib/firefox/chrome/browser/content/browser/certerror/aboutCertError.css
+lib/firefox/chrome/browser/content/browser/certerror/aboutCertError.xhtml
+lib/firefox/chrome/browser/content/browser/feeds/subscribe.css
+lib/firefox/chrome/browser/content/browser/feeds/subscribe.js
+lib/firefox/chrome/browser/content/browser/feeds/subscribe.xhtml
+lib/firefox/chrome/browser/content/browser/feeds/subscribe.xml
+lib/firefox/chrome/browser/content/browser/fullscreen-video.xhtml
+lib/firefox/chrome/browser/content/browser/hiddenWindow.xul
+lib/firefox/chrome/browser/content/browser/history/history-panel.xul
+lib/firefox/chrome/browser/content/browser/inspector.html
+lib/firefox/chrome/browser/content/browser/license.html
+lib/firefox/chrome/browser/content/browser/migration/migration.js
+lib/firefox/chrome/browser/content/browser/migration/migration.xul
+lib/firefox/chrome/browser/content/browser/nsContextMenu.js
+lib/firefox/chrome/browser/content/browser/openLocation.js
+lib/firefox/chrome/browser/content/browser/openLocation.xul
+lib/firefox/chrome/browser/content/browser/pageinfo/feeds.js
+lib/firefox/chrome/browser/content/browser/pageinfo/feeds.xml
+lib/firefox/chrome/browser/content/browser/pageinfo/pageInfo.css
+lib/firefox/chrome/browser/content/browser/pageinfo/pageInfo.js
+lib/firefox/chrome/browser/content/browser/pageinfo/pageInfo.xml
+lib/firefox/chrome/browser/content/browser/pageinfo/pageInfo.xul
+lib/firefox/chrome/browser/content/browser/pageinfo/permissions.js
+lib/firefox/chrome/browser/content/browser/pageinfo/security.js
+lib/firefox/chrome/browser/content/browser/places/bookmarkProperties.js
+lib/firefox/chrome/browser/content/browser/places/bookmarkProperties.xul
+lib/firefox/chrome/browser/content/browser/places/bookmarkProperties2.xul
+lib/firefox/chrome/browser/content/browser/places/browserPlacesViews.js
+lib/firefox/chrome/browser/content/browser/places/controller.js
+lib/firefox/chrome/browser/content/browser/places/editBookmarkOverlay.js
+lib/firefox/chrome/browser/content/browser/places/editBookmarkOverlay.xul
+lib/firefox/chrome/browser/content/browser/places/history-panel.js
+lib/firefox/chrome/browser/content/browser/places/menu.xml
+lib/firefox/chrome/browser/content/browser/places/moveBookmarks.js
+lib/firefox/chrome/browser/content/browser/places/moveBookmarks.xul
+lib/firefox/chrome/browser/content/browser/places/organizer.css
+lib/firefox/chrome/browser/content/browser/places/places.css
+lib/firefox/chrome/browser/content/browser/places/places.js
+lib/firefox/chrome/browser/content/browser/places/places.xul
+lib/firefox/chrome/browser/content/browser/places/placesOverlay.xul
+lib/firefox/chrome/browser/content/browser/places/tree.xml
+lib/firefox/chrome/browser/content/browser/places/treeView.js
+lib/firefox/chrome/browser/content/browser/preferences/advanced-scripts.xul
+lib/firefox/chrome/browser/content/browser/preferences/advanced.js
+lib/firefox/chrome/browser/content/browser/preferences/advanced.xul
+lib/firefox/chrome/browser/content/browser/preferences/applicationManager.js
+lib/firefox/chrome/browser/content/browser/preferences/applicationManager.xul
+lib/firefox/chrome/browser/content/browser/preferences/applications.js
+lib/firefox/chrome/browser/content/browser/preferences/applications.xul
+lib/firefox/chrome/browser/content/browser/preferences/colors.xul
+lib/firefox/chrome/browser/content/browser/preferences/connection.js
+lib/firefox/chrome/browser/content/browser/preferences/connection.xul
+lib/firefox/chrome/browser/content/browser/preferences/content.js
+lib/firefox/chrome/browser/content/browser/preferences/content.xul
+lib/firefox/chrome/browser/content/browser/preferences/cookies.js
+lib/firefox/chrome/browser/content/browser/preferences/cookies.xul
+lib/firefox/chrome/browser/content/browser/preferences/fonts.js
+lib/firefox/chrome/browser/content/browser/preferences/fonts.xul
+lib/firefox/chrome/browser/content/browser/preferences/handlers.css
+lib/firefox/chrome/browser/content/browser/preferences/handlers.xml
+lib/firefox/chrome/browser/content/browser/preferences/languages.js
+lib/firefox/chrome/browser/content/browser/preferences/languages.xul
+lib/firefox/chrome/browser/content/browser/preferences/main.js
+lib/firefox/chrome/browser/content/browser/preferences/main.xul
+lib/firefox/chrome/browser/content/browser/preferences/permissions.js
+lib/firefox/chrome/browser/content/browser/preferences/permissions.xul
+lib/firefox/chrome/browser/content/browser/preferences/permissionsutils.js
+lib/firefox/chrome/browser/content/browser/preferences/preferences.xul
+lib/firefox/chrome/browser/content/browser/preferences/privacy.js
+lib/firefox/chrome/browser/content/browser/preferences/privacy.xul
+lib/firefox/chrome/browser/content/browser/preferences/sanitize.xul
+lib/firefox/chrome/browser/content/browser/preferences/security.js
+lib/firefox/chrome/browser/content/browser/preferences/security.xul
+lib/firefox/chrome/browser/content/browser/preferences/selectBookmark.js
+lib/firefox/chrome/browser/content/browser/preferences/selectBookmark.xul
+lib/firefox/chrome/browser/content/browser/preferences/sync.js
+lib/firefox/chrome/browser/content/browser/preferences/sync.xul
+lib/firefox/chrome/browser/content/browser/preferences/tabs.js
+lib/firefox/chrome/browser/content/browser/preferences/tabs.xul
+lib/firefox/chrome/browser/content/browser/safeMode.js
+lib/firefox/chrome/browser/content/browser/safeMode.xul
+lib/firefox/chrome/browser/content/browser/safebrowsing/blockedSite.xhtml
+lib/firefox/chrome/browser/content/browser/safebrowsing/report-phishing-overlay.xul
+lib/firefox/chrome/browser/content/browser/safebrowsing/sb-loader.js
+lib/firefox/chrome/browser/content/browser/sanitize.js
+lib/firefox/chrome/browser/content/browser/sanitize.xul
+lib/firefox/chrome/browser/content/browser/sanitizeDialog.css
+lib/firefox/chrome/browser/content/browser/sanitizeDialog.js
+lib/firefox/chrome/browser/content/browser/search/engineManager.js
+lib/firefox/chrome/browser/content/browser/search/engineManager.xul
+lib/firefox/chrome/browser/content/browser/search/search.xml
+lib/firefox/chrome/browser/content/browser/search/searchbarBindings.css
+lib/firefox/chrome/browser/content/browser/setDesktopBackground.js
+lib/firefox/chrome/browser/content/browser/setDesktopBackground.xul
+lib/firefox/chrome/browser/content/browser/syncAddDevice.js
+lib/firefox/chrome/browser/content/browser/syncAddDevice.xul
+lib/firefox/chrome/browser/content/browser/syncGenericChange.js
+lib/firefox/chrome/browser/content/browser/syncGenericChange.xul
+lib/firefox/chrome/browser/content/browser/syncKey.xhtml
+lib/firefox/chrome/browser/content/browser/syncNotification.xml
+lib/firefox/chrome/browser/content/browser/syncQuota.js
+lib/firefox/chrome/browser/content/browser/syncQuota.xul
+lib/firefox/chrome/browser/content/browser/syncSetup.js
+lib/firefox/chrome/browser/content/browser/syncSetup.xul
+lib/firefox/chrome/browser/content/browser/syncUtils.js
+lib/firefox/chrome/browser/content/browser/tabbrowser.css
+lib/firefox/chrome/browser/content/browser/tabbrowser.xml
+lib/firefox/chrome/browser/content/browser/tabview.css
+lib/firefox/chrome/browser/content/browser/tabview.html
+lib/firefox/chrome/browser/content/browser/tabview.js
+lib/firefox/chrome/browser/content/browser/urlbarBindings.xml
+lib/firefox/chrome/browser/content/browser/utilityOverlay.js
+lib/firefox/chrome/browser/content/browser/viewSourceOverlay.xul
+lib/firefox/chrome/browser/content/browser/web-panels.js
+lib/firefox/chrome/browser/content/browser/web-panels.xul
+lib/firefox/chrome/browser/skin/classic/browser/Geolocation-16.png
+lib/firefox/chrome/browser/skin/classic/browser/Geolocation-64.png
+lib/firefox/chrome/browser/skin/classic/browser/Go-arrow.png
+lib/firefox/chrome/browser/skin/classic/browser/Info.png
+lib/firefox/chrome/browser/skin/classic/browser/KUI-close.png
+lib/firefox/chrome/browser/skin/classic/browser/Privacy-16.png
+lib/firefox/chrome/browser/skin/classic/browser/Privacy-48.png
+lib/firefox/chrome/browser/skin/classic/browser/Secure.png
+lib/firefox/chrome/browser/skin/classic/browser/Security-broken.png
+lib/firefox/chrome/browser/skin/classic/browser/Toolbar-small.png
+lib/firefox/chrome/browser/skin/classic/browser/Toolbar.png
+lib/firefox/chrome/browser/skin/classic/browser/aboutCertError.css
+lib/firefox/chrome/browser/skin/classic/browser/aboutPrivateBrowsing.css
+lib/firefox/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png
+lib/firefox/chrome/browser/skin/classic/browser/aboutSessionRestore.css
+lib/firefox/chrome/browser/skin/classic/browser/aboutSyncTabs.css
+lib/firefox/chrome/browser/skin/classic/browser/actionicon-tab.png
+lib/firefox/chrome/browser/skin/classic/browser/browser.css
+lib/firefox/chrome/browser/skin/classic/browser/engineManager.css
+lib/firefox/chrome/browser/skin/classic/browser/feeds/audioFeedIcon.png
+lib/firefox/chrome/browser/skin/classic/browser/feeds/audioFeedIcon16.png
+lib/firefox/chrome/browser/skin/classic/browser/feeds/feedIcon.png
+lib/firefox/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
+lib/firefox/chrome/browser/skin/classic/browser/feeds/subscribe-ui.css
+lib/firefox/chrome/browser/skin/classic/browser/feeds/subscribe.css
+lib/firefox/chrome/browser/skin/classic/browser/feeds/videoFeedIcon.png
+lib/firefox/chrome/browser/skin/classic/browser/feeds/videoFeedIcon16.png
+lib/firefox/chrome/browser/skin/classic/browser/fullscreen-video.css
+lib/firefox/chrome/browser/skin/classic/browser/identity.png
+lib/firefox/chrome/browser/skin/classic/browser/inspector.css
+lib/firefox/chrome/browser/skin/classic/browser/monitor.png
+lib/firefox/chrome/browser/skin/classic/browser/monitor_16-10.png
+lib/firefox/chrome/browser/skin/classic/browser/page-livemarks.png
+lib/firefox/chrome/browser/skin/classic/browser/pageInfo.css
+lib/firefox/chrome/browser/skin/classic/browser/pageInfo.png
+lib/firefox/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
+lib/firefox/chrome/browser/skin/classic/browser/places/bookmarksToolbar.png
+lib/firefox/chrome/browser/skin/classic/browser/places/calendar.png
+lib/firefox/chrome/browser/skin/classic/browser/places/editBookmarkOverlay.css
+lib/firefox/chrome/browser/skin/classic/browser/places/livemark-item.png
+lib/firefox/chrome/browser/skin/classic/browser/places/organizer.css
+lib/firefox/chrome/browser/skin/classic/browser/places/organizer.xml
+lib/firefox/chrome/browser/skin/classic/browser/places/pageStarred.png
+lib/firefox/chrome/browser/skin/classic/browser/places/places.css
+lib/firefox/chrome/browser/skin/classic/browser/places/query.png
+lib/firefox/chrome/browser/skin/classic/browser/places/searching_16.png
+lib/firefox/chrome/browser/skin/classic/browser/places/starPage.png
+lib/firefox/chrome/browser/skin/classic/browser/places/starred48.png
+lib/firefox/chrome/browser/skin/classic/browser/places/tag.png
+lib/firefox/chrome/browser/skin/classic/browser/places/toolbarDropMarker.png
+lib/firefox/chrome/browser/skin/classic/browser/places/unsortedBookmarks.png
+lib/firefox/chrome/browser/skin/classic/browser/places/unstarred48.png
+lib/firefox/chrome/browser/skin/classic/browser/preferences/Options-sync.png
+lib/firefox/chrome/browser/skin/classic/browser/preferences/Options.png
+lib/firefox/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
+lib/firefox/chrome/browser/skin/classic/browser/preferences/applications.css
+lib/firefox/chrome/browser/skin/classic/browser/preferences/mail.png
+lib/firefox/chrome/browser/skin/classic/browser/preferences/preferences.css
+lib/firefox/chrome/browser/skin/classic/browser/reload-stop-go.png
+lib/firefox/chrome/browser/skin/classic/browser/sanitizeDialog.css
+lib/firefox/chrome/browser/skin/classic/browser/searchbar.css
+lib/firefox/chrome/browser/skin/classic/browser/section_collapsed-rtl.png
+lib/firefox/chrome/browser/skin/classic/browser/section_collapsed.png
+lib/firefox/chrome/browser/skin/classic/browser/section_expanded.png
+lib/firefox/chrome/browser/skin/classic/browser/setDesktopBackground.css
+lib/firefox/chrome/browser/skin/classic/browser/sync-16-throbber.png
+lib/firefox/chrome/browser/skin/classic/browser/sync-16.png
+lib/firefox/chrome/browser/skin/classic/browser/sync-24-throbber.png
+lib/firefox/chrome/browser/skin/classic/browser/sync-32.png
+lib/firefox/chrome/browser/skin/classic/browser/sync-bg.png
+lib/firefox/chrome/browser/skin/classic/browser/sync-desktopIcon.png
+lib/firefox/chrome/browser/skin/classic/browser/sync-mobileIcon.png
+lib/firefox/chrome/browser/skin/classic/browser/syncCommon.css
+lib/firefox/chrome/browser/skin/classic/browser/syncQuota.css
+lib/firefox/chrome/browser/skin/classic/browser/syncSetup.css
+lib/firefox/chrome/browser/skin/classic/browser/tabbrowser/alltabs.png
+lib/firefox/chrome/browser/skin/classic/browser/tabbrowser/connecting.png
+lib/firefox/chrome/browser/skin/classic/browser/tabbrowser/loading.png
+lib/firefox/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-border.png
+lib/firefox/chrome/browser/skin/classic/browser/tabbrowser/tab.png
+lib/firefox/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
+lib/firefox/chrome/browser/skin/classic/browser/tabview/edit-light.png
+lib/firefox/chrome/browser/skin/classic/browser/tabview/new-tab.png
+lib/firefox/chrome/browser/skin/classic/browser/tabview/search.png
+lib/firefox/chrome/browser/skin/classic/browser/tabview/stack-expander.png
+lib/firefox/chrome/browser/skin/classic/browser/tabview/tabview.css
+lib/firefox/chrome/browser/skin/classic/browser/tabview/tabview.png
+lib/firefox/chrome/browser/skin/classic/browser/urlbar-favicon-glow.png
+lib/firefox/chrome/browser/skin/classic/communicator/communicator.css
+lib/firefox/chrome/en-US/locale/branding/brand.dtd
+lib/firefox/chrome/en-US/locale/branding/brand.properties
+lib/firefox/chrome/en-US/locale/branding/browserconfig.properties
+lib/firefox/chrome/en-US/locale/browser-region/region.properties
+lib/firefox/chrome/en-US/locale/browser/aboutCertError.dtd
+lib/firefox/chrome/en-US/locale/browser/aboutDialog.dtd
+lib/firefox/chrome/en-US/locale/browser/aboutHome.dtd
+lib/firefox/chrome/en-US/locale/browser/aboutPrivateBrowsing.dtd
+lib/firefox/chrome/en-US/locale/browser/aboutRobots.dtd
+lib/firefox/chrome/en-US/locale/browser/aboutSessionRestore.dtd
+lib/firefox/chrome/en-US/locale/browser/aboutSyncTabs.dtd
+lib/firefox/chrome/en-US/locale/browser/appstrings.properties
+lib/firefox/chrome/en-US/locale/browser/baseMenuOverlay.dtd
+lib/firefox/chrome/en-US/locale/browser/browser.dtd
+lib/firefox/chrome/en-US/locale/browser/browser.properties
+lib/firefox/chrome/en-US/locale/browser/downloads/settingsChange.dtd
+lib/firefox/chrome/en-US/locale/browser/engineManager.dtd
+lib/firefox/chrome/en-US/locale/browser/engineManager.properties
+lib/firefox/chrome/en-US/locale/browser/feeds/subscribe.dtd
+lib/firefox/chrome/en-US/locale/browser/feeds/subscribe.properties
+lib/firefox/chrome/en-US/locale/browser/inspector.properties
+lib/firefox/chrome/en-US/locale/browser/migration/migration.dtd
+lib/firefox/chrome/en-US/locale/browser/migration/migration.properties
+lib/firefox/chrome/en-US/locale/browser/netError.dtd
+lib/firefox/chrome/en-US/locale/browser/openLocation.dtd
+lib/firefox/chrome/en-US/locale/browser/openLocation.properties
+lib/firefox/chrome/en-US/locale/browser/pageInfo.dtd
+lib/firefox/chrome/en-US/locale/browser/pageInfo.properties
+lib/firefox/chrome/en-US/locale/browser/places/bookmarkProperties.properties
+lib/firefox/chrome/en-US/locale/browser/places/editBookmarkOverlay.dtd
+lib/firefox/chrome/en-US/locale/browser/places/moveBookmarks.dtd
+lib/firefox/chrome/en-US/locale/browser/places/places.dtd
+lib/firefox/chrome/en-US/locale/browser/places/places.properties
+lib/firefox/chrome/en-US/locale/browser/preferences/advanced-scripts.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/advanced.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/applicationManager.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/applicationManager.properties
+lib/firefox/chrome/en-US/locale/browser/preferences/applications.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/colors.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/connection.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/content.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/cookies.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/fonts.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/languages.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/main.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/permissions.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/preferences.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/preferences.properties
+lib/firefox/chrome/en-US/locale/browser/preferences/privacy.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/security.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/selectBookmark.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/sync.dtd
+lib/firefox/chrome/en-US/locale/browser/preferences/tabs.dtd
+lib/firefox/chrome/en-US/locale/browser/quitDialog.properties
+lib/firefox/chrome/en-US/locale/browser/safeMode.dtd
+lib/firefox/chrome/en-US/locale/browser/safebrowsing/phishing-afterload-warning-message.dtd
+lib/firefox/chrome/en-US/locale/browser/safebrowsing/report-phishing.dtd
+lib/firefox/chrome/en-US/locale/browser/sanitize.dtd
+lib/firefox/chrome/en-US/locale/browser/search.properties
+lib/firefox/chrome/en-US/locale/browser/searchbar.dtd
+lib/firefox/chrome/en-US/locale/browser/setDesktopBackground.dtd
+lib/firefox/chrome/en-US/locale/browser/shellservice.properties
+lib/firefox/chrome/en-US/locale/browser/sidebar/sidebar.properties
+lib/firefox/chrome/en-US/locale/browser/syncBrand.dtd
+lib/firefox/chrome/en-US/locale/browser/syncGenericChange.properties
+lib/firefox/chrome/en-US/locale/browser/syncKey.dtd
+lib/firefox/chrome/en-US/locale/browser/syncQuota.dtd
+lib/firefox/chrome/en-US/locale/browser/syncQuota.properties
+lib/firefox/chrome/en-US/locale/browser/syncSetup.dtd
+lib/firefox/chrome/en-US/locale/browser/syncSetup.properties
+lib/firefox/chrome/en-US/locale/browser/tabbrowser.dtd
+lib/firefox/chrome/en-US/locale/browser/tabbrowser.properties
+lib/firefox/chrome/en-US/locale/browser/tabview.properties
+lib/firefox/chrome/en-US/locale/browser/taskbar.properties
+lib/firefox/chrome/en-US/locale/en-US/services/errors.properties
+lib/firefox/chrome/en-US/locale/en-US/services/sync.properties
+lib/firefox/chrome/en-US/locale/feedback/main.dtd
+lib/firefox/chrome/en-US/locale/feedback/main.properties
 lib/firefox/chrome/icons/default/default16.png
 lib/firefox/chrome/icons/default/default32.png
 lib/firefox/chrome/icons/default/default48.png
-lib/firefox/chrome/reporter.jar
-lib/firefox/chrome/reporter.manifest
+lib/firefox/chrome/localized.manifest
+lib/firefox/chrome/nonlocalized.manifest
 lib/firefox/components/FeedConverter.js
 lib/firefox/components/FeedWriter.js
+lib/firefox/components/PlacesProtocolHandler.js
+lib/firefox/components/Weave.js
 lib/firefox/components/WebContentConverter.js
 lib/firefox/components/browser.xpt
-lib/firefox/components/components.list
+lib/firefox/components/components.manifest
 lib/firefox/components/fuelApplication.js
+lib/firefox/components/interfaces.manifest
 lib/firefox/components/libbrowsercomps.so
-lib/firefox/components/libbrowserdirprovider.so
 lib/firefox/components/nsBrowserContentHandler.js
 lib/firefox/components/nsBrowserGlue.js
-lib/firefox/components/nsMicrosummaryService.js
-lib/firefox/components/nsPlacesTransactionsService.js
 lib/firefox/components/nsPrivateBrowsingService.js
 lib/firefox/components/nsSafebrowsingApplication.js
 lib/firefox/components/nsSessionStartup.js
@@ -39,7 +347,7 @@ lib/firefox/defaults/preferences/channel-prefs.js
 lib/firefox/defaults/preferences/firefox-branding.js
 lib/firefox/defaults/preferences/firefox-l10n.js
 lib/firefox/defaults/preferences/firefox.js
-lib/firefox/defaults/preferences/reporter.js
+lib/firefox/defaults/preferences/services-sync.js
 lib/firefox/defaults/profile/bookmarks.html
 lib/firefox/defaults/profile/chrome/userChrome-example.css
 lib/firefox/defaults/profile/chrome/userContent-example.css
@@ -52,14 +360,44 @@ lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 lib/firefox/firefox
 lib/firefox/icons/document.png
 lib/firefox/icons/mozicon128.png
+lib/firefox/modules/HUDService.jsm
+lib/firefox/modules/NetworkHelper.jsm
 lib/firefox/modules/NetworkPrioritizer.jsm
+lib/firefox/modules/PlacesUIUtils.jsm
+lib/firefox/modules/PropertyPanel.jsm
 lib/firefox/modules/distribution.js
+lib/firefox/modules/domplate.jsm
 lib/firefox/modules/openLocationLastURL.jsm
+lib/firefox/modules/services-crypto/WeaveCrypto.js
+lib/firefox/modules/services-sync/constants.js
+lib/firefox/modules/services-sync/engines.js
+lib/firefox/modules/services-sync/engines/bookmarks.js
+lib/firefox/modules/services-sync/engines/clients.js
+lib/firefox/modules/services-sync/engines/forms.js
+lib/firefox/modules/services-sync/engines/history.js
+lib/firefox/modules/services-sync/engines/passwords.js
+lib/firefox/modules/services-sync/engines/prefs.js
+lib/firefox/modules/services-sync/engines/tabs.js
+lib/firefox/modules/services-sync/ext/Observers.js
+lib/firefox/modules/services-sync/ext/Preferences.js
+lib/firefox/modules/services-sync/ext/StringBundle.js
+lib/firefox/modules/services-sync/identity.js
+lib/firefox/modules/services-sync/jpakeclient.js
+lib/firefox/modules/services-sync/log4moz.js
+lib/firefox/modules/services-sync/main.js
+lib/firefox/modules/services-sync/notifications.js
+lib/firefox/modules/services-sync/record.js
+lib/firefox/modules/services-sync/resource.js
+lib/firefox/modules/services-sync/service.js
+lib/firefox/modules/services-sync/status.js
+lib/firefox/modules/services-sync/util.js
+lib/firefox/modules/stylePanel.jsm
+lib/firefox/modules/tabview/AllTabs.jsm
+lib/firefox/modules/tabview/utils.jsm
 lib/firefox/removed-files
 lib/firefox/run-mozilla.sh
 lib/firefox/searchplugins/amazondotcom.xml
-lib/firefox/searchplugins/answers.xml
-lib/firefox/searchplugins/creativecommons.xml
+lib/firefox/searchplugins/bing.xml
 lib/firefox/searchplugins/eBay.xml
 lib/firefox/searchplugins/google.xml
 lib/firefox/searchplugins/wikipedia.xml