7 files changed, 249 insertions, 123 deletions

diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 0875403d73af..5d59a5ac8c9c 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION= 	M18
+PORTVERSION= 	0.7
+PORTEPOCH=	1
 PKGNAMESUFFIX=	+ipv6
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTVERSION:S/M/m/}/src
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	sumikawa@FreeBSD.org
 
-LIB_DEPENDS=	IDL.2:${PORTSDIR}/devel/ORBit
+LIB_DEPENDS=	IDL.2:${PORTSDIR}/devel/ORBit \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -30,6 +33,7 @@ CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-debug			\
 		--disable-idltool		\
+		--disable-jar-packaging		\
 		--disable-md			\
 		--disable-pedantic		\
 		--disable-xterm-updates		\
@@ -47,7 +51,7 @@ CONFIGURE_ARGS=					\
 		--with-jpeg=${LOCALBASE}	\
 		--with-png=${LOCALBASE}
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
-		CC_ONLY_FLAGS="${FLAGS}" CCC_ONLY_FLAGS="${CXXFLAGS}"
+		CC_ONLY_FLAGS="${CFLAGS}" CCC_ONLY_FLAGS="${CXXFLAGS}"
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/mozilla+ipv6/distinfo b/www/mozilla+ipv6/distinfo
index e132ab8bb70e..85e089374bde 100644
--- a/www/mozilla+ipv6/distinfo
+++ b/www/mozilla+ipv6/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-M18.tar.bz2) = c92aadfd0a15ca7f48fafc2bbf321e0d
+MD5 (mozilla-source-0.7.tar.bz2) = 0cb8c0d2623654cc831f503b394fac97
diff --git a/www/mozilla+ipv6/files/patch-am b/www/mozilla+ipv6/files/patch-am
deleted file mode 100644
index e55359232533..000000000000
--- a/www/mozilla+ipv6/files/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
---- embedding/config/basebrowser-unix	2000/08/16 15:12:58	1.1
-+++ embedding/config/basebrowser-unix	2000/08/16 15:20:12
-@@ -193,8 +193,12 @@
- res/html.css   
- res/quirk.css  
- res/ua.css
-+res/mathml.css
- 
- 
-+; ???:
-+libjsj.so
-+components/liboji.so
- 
- 
- 
diff --git a/www/mozilla+ipv6/files/patch-an b/www/mozilla+ipv6/files/patch-an
new file mode 100644
index 000000000000..2904080e1e35
--- /dev/null
+++ b/www/mozilla+ipv6/files/patch-an
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in.orig	Thu Dec 21 01:23:12 2000
++++ js/src/Makefile.in	Thu Dec 21 01:23:22 2000
+@@ -218,7 +218,7 @@
+ endif
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-LDFLAGS		+= -pthread
++LDFLAGS		+= -pthread -lgcc_r
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
diff --git a/www/mozilla+ipv6/files/patch-ba b/www/mozilla+ipv6/files/patch-ba
deleted file mode 100644
index 26f6213423c5..000000000000
--- a/www/mozilla+ipv6/files/patch-ba
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/autoconf/make-makefile.orig	Tue Mar 14 12:17:32 2000
-+++ build/autoconf/make-makefile	Sun Aug 27 02:52:27 2000
-@@ -43,7 +43,8 @@
- #    called from "mozilla/gfx/src", then $source_subdir would be
- #    "gfx/src/".
- $source_subdir = "$object_fullpath/";
--$source_subdir =~ s|^$object_root/||;
-+my $quoted_object_root = quotemeta($object_root);
-+$source_subdir =~ s|^$quoted_object_root/||;
- 
- # Prefix makefiles with $source_subdir so that paths
- # will be relative to the top of the object tree.
diff --git a/www/mozilla+ipv6/files/patch-qt b/www/mozilla+ipv6/files/patch-qt
index b7964a4911ff..361bf6cbdd5d 100644
--- a/www/mozilla+ipv6/files/patch-qt
+++ b/www/mozilla+ipv6/files/patch-qt
@@ -1,21 +1,39 @@
---- configure.orig	Thu Apr 13 19:18:25 2000
-+++ configure	Thu Apr 20 09:07:57 2000
-@@ -5618,7 +5618,7 @@
+--- configure.orig	Sat Sep 30 23:16:14 2000
++++ configure	Thu Dec 21 00:49:23 2000
+@@ -5786,7 +5786,7 @@
  	echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6
- echo "configure:5620: checking for Qt insanity" >&5
+ echo "configure:5788: checking for Qt insanity" >&5
  
 -    QT_CFLAGS="-I${QTDIR}/include/qt"
 +    QT_CFLAGS="-I${QTDIR}/include/X11/qt"
      QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
  
      # Check whether --with-static-qt or --without-static-qt was given.
-@@ -7108,6 +7108,9 @@
- case "$target_os" in
+@@ -7702,6 +7702,9 @@
  os2*)
      LIBS=
-+    ;;
+     ;;
 +freebsd*)
 +    CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
-     ;;
++    ;;
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
+ do
+@@ -8655,8 +8658,6 @@
+ 	if test $? -eq 0; then
+ 		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 			ac_cv_have_dash_pthread=yes
+-			CFLAGS="$CFLAGS -pthread"
+-			CXXFLAGS="$CXXFLAGS -pthread"
+ 		fi
+ 	fi
+ 	rm -f conftest*
+@@ -8672,7 +8673,7 @@
+ EOF
+ 
+ 						if test "$ac_cv_have_dash_pthread" = "yes"; then
+-				_PTHREAD_LDFLAGS=""
++				_PTHREAD_LDFLAGS="-pthread -lgcc_r"
+ 			else
+ 				_PTHREAD_LDFLAGS="-lc_r"
+ 			fi
diff --git a/www/mozilla+ipv6/pkg-plist b/www/mozilla+ipv6/pkg-plist
index 3512f7980920..d8bcfede1292 100644
--- a/www/mozilla+ipv6/pkg-plist
+++ b/www/mozilla+ipv6/pkg-plist
@@ -56,9 +56,11 @@ lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
 lib/mozilla/TestStreamConv
+lib/mozilla/TestSyncHTTP
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
 lib/mozilla/TestVoidBTree
+lib/mozilla/TestXMLExtras
 lib/mozilla/TestXPC
 lib/mozilla/TestXPIDLString
 lib/mozilla/TestXPTCInvoke
@@ -305,7 +307,7 @@ lib/mozilla/chrome/blue/skin/blue/global/opentwisty-selected.gif
 lib/mozilla/chrome/blue/skin/blue/global/opentwisty.gif
 lib/mozilla/chrome/blue/skin/blue/global/otherbutton28-bg-active.gif
 lib/mozilla/chrome/blue/skin/blue/global/otherbutton28-bg-hover.gif
-lib/mozilla/chrome/blue/skin/blue/global/preview.png
+lib/mozilla/chrome/blue/skin/blue/global/preview.gif
 lib/mozilla/chrome/blue/skin/blue/global/print.gif
 lib/mozilla/chrome/blue/skin/blue/global/progressmeter-busy.gif
 lib/mozilla/chrome/blue/skin/blue/global/question-icon.gif
@@ -789,6 +791,7 @@ lib/mozilla/chrome/classic/skin/classic/global/message-icon.gif
 lib/mozilla/chrome/classic/skin/classic/global/moreCols.gif
 lib/mozilla/chrome/classic/skin/classic/global/moreCols_dis.gif
 lib/mozilla/chrome/classic/skin/classic/global/moreCols_mo.gif
+lib/mozilla/chrome/classic/skin/classic/global/preview.gif
 lib/mozilla/chrome/classic/skin/classic/global/preview.png
 lib/mozilla/chrome/classic/skin/classic/global/print-disabled.gif
 lib/mozilla/chrome/classic/skin/classic/global/print-hover-active.gif
@@ -1089,6 +1092,10 @@ lib/mozilla/chrome/comm/content/communicator/bookmarks/bookmarksDD.js
 lib/mozilla/chrome/comm/content/communicator/browserBindings.xul
 lib/mozilla/chrome/comm/content/communicator/builtinURLs.js
 lib/mozilla/chrome/comm/content/communicator/communicatorOverlay.xul
+lib/mozilla/chrome/comm/content/communicator/contentAreaClick.js
+lib/mozilla/chrome/comm/content/communicator/contentAreaContextOverlay.xul
+lib/mozilla/chrome/comm/content/communicator/contentAreaDD.js
+lib/mozilla/chrome/comm/content/communicator/contentAreaUtils.js
 lib/mozilla/chrome/comm/content/communicator/contents.rdf
 lib/mozilla/chrome/comm/content/communicator/dialogBindings.xml
 lib/mozilla/chrome/comm/content/communicator/directory/directory.js
@@ -1103,6 +1110,7 @@ lib/mozilla/chrome/comm/content/communicator/history/history-test.js
 lib/mozilla/chrome/comm/content/communicator/history/history-test.xul
 lib/mozilla/chrome/comm/content/communicator/history/history.js
 lib/mozilla/chrome/comm/content/communicator/history/history.xul
+lib/mozilla/chrome/comm/content/communicator/nsContextMenu.js
 lib/mozilla/chrome/comm/content/communicator/platformBrowserBindings.xul
 lib/mozilla/chrome/comm/content/communicator/platformEditorBindings.xul
 lib/mozilla/chrome/comm/content/communicator/platformGlobalOverlay.xul
@@ -1218,10 +1226,23 @@ lib/mozilla/chrome/comm/content/communicator/wallet/CookieViewer.js
 lib/mozilla/chrome/comm/content/communicator/wallet/CookieViewer.xul
 lib/mozilla/chrome/comm/content/communicator/wallet/SignonViewer.js
 lib/mozilla/chrome/comm/content/communicator/wallet/SignonViewer.xul
-lib/mozilla/chrome/comm/content/communicator/wallet/WalletEditor.js
-lib/mozilla/chrome/comm/content/communicator/wallet/WalletEditor.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletAddress.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletBilling.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletConcatenated.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletCredit.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletEmploy.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletMisc.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletName.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletOther.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletPhone.xul
 lib/mozilla/chrome/comm/content/communicator/wallet/WalletPreview.js
 lib/mozilla/chrome/comm/content/communicator/wallet/WalletPreview.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletPrimary.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletShipping.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletTree.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletUrlspecific.xul
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletViewer.js
+lib/mozilla/chrome/comm/content/communicator/wallet/WalletViewer.xul
 lib/mozilla/chrome/comm/content/communicator/wallet/privacy.xul
 lib/mozilla/chrome/comm/content/communicator/xpinstall/institems.js
 lib/mozilla/chrome/comm/content/communicator/xpinstall/institems.xul
@@ -1402,13 +1423,11 @@ lib/mozilla/chrome/comm/content/navigator/NetSupportConfirmYN.xul
 lib/mozilla/chrome/comm/content/navigator/askViewZoom.js
 lib/mozilla/chrome/comm/content/navigator/askViewZoom.xul
 lib/mozilla/chrome/comm/content/navigator/contents.rdf
-lib/mozilla/chrome/comm/content/navigator/keywords.js
 lib/mozilla/chrome/comm/content/navigator/navExtraOverlay.xul
 lib/mozilla/chrome/comm/content/navigator/navigator.js
 lib/mozilla/chrome/comm/content/navigator/navigator.xul
 lib/mozilla/chrome/comm/content/navigator/navigatorDD.js
 lib/mozilla/chrome/comm/content/navigator/navigatorOverlay.xul
-lib/mozilla/chrome/comm/content/navigator/nsContextMenu.js
 lib/mozilla/chrome/comm/content/navigator/openLocation.js
 lib/mozilla/chrome/comm/content/navigator/openLocation.xul
 lib/mozilla/chrome/comm/content/navigator/pageInfo.js
@@ -1417,8 +1436,8 @@ lib/mozilla/chrome/comm/content/navigator/platformNavigationBindings.xul
 lib/mozilla/chrome/comm/content/navigator/sessionHistoryUI.js
 lib/mozilla/chrome/comm/content/navigator/tooltip.js
 lib/mozilla/chrome/comm/content/navigator/viewSource.xul
-lib/mozilla/chrome/comm/content/navigator/viewSourceDD.js
 lib/mozilla/chrome/comm/content/navigator/viewsource.js
+lib/mozilla/chrome/comm/content/necko/contents.rdf
 lib/mozilla/chrome/comm/content/necko/redirect_loop.xul
 lib/mozilla/chrome/embed/content/embed/back.gif
 lib/mozilla/chrome/embed/content/embed/contents.rdf
@@ -1438,6 +1457,7 @@ lib/mozilla/chrome/en-US/locale/en-US/communicator/bookmarks/bm-find.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/bookmarks/bm-props.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/bookmarks/bookmark.properties
 lib/mozilla/chrome/en-US/locale/en-US/communicator/bookmarks/bookmarks.dtd
+lib/mozilla/chrome/en-US/locale/en-US/communicator/contentAreaCommands.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/contents.rdf
 lib/mozilla/chrome/en-US/locale/en-US/communicator/directory/directory.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/history/history.dtd
@@ -1460,6 +1480,7 @@ lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-fonts.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-history.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-images.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-languages.dtd
+lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-languages.properties
 lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-mousewheel.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-navigator.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/pref/pref-offline.dtd
@@ -1522,9 +1543,9 @@ lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/SignonViewer.propertie
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/WalletEditor.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/WalletEditor.properties
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/WalletPreview.properties
+lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/WalletViewer.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/cookie.properties
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/index.html
-lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/interview.html
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/privacy.dtd
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/privacy.html
 lib/mozilla/chrome/en-US/locale/en-US/communicator/wallet/sample1.html
@@ -1592,6 +1613,7 @@ lib/mozilla/chrome/en-US/locale/en-US/global/downloadProgress.properties
 lib/mozilla/chrome/en-US/locale/en-US/global/filepicker.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/filepicker.properties
 lib/mozilla/chrome/en-US/locale/en-US/global/finddialog.dtd
+lib/mozilla/chrome/en-US/locale/en-US/global/finddialog.properties
 lib/mozilla/chrome/en-US/locale/en-US/global/globalOverlay.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/helperAppLauncher.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/helperAppLauncher.properties
@@ -1601,6 +1623,7 @@ lib/mozilla/chrome/en-US/locale/en-US/global/platformDialogOverlay.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/platformGlobalOverlay.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/printdialog.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/regionNames.properties
+lib/mozilla/chrome/en-US/locale/en-US/global/textcontext.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/unknownContent.dtd
 lib/mozilla/chrome/en-US/locale/en-US/global/unknownContent.properties
 lib/mozilla/chrome/en-US/locale/en-US/global/wizardManager.properties
@@ -1647,6 +1670,7 @@ lib/mozilla/chrome/en-US/locale/en-US/messenger/eudoraImportMsgs.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/fieldMapExport.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/fieldMapImport.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/filter.properties
+lib/mozilla/chrome/en-US/locale/en-US/messenger/folderProps.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/folderpane.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/imapMsgs.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/importDialog.dtd
@@ -1669,7 +1693,7 @@ lib/mozilla/chrome/en-US/locale/en-US/messenger/mime.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/mimeheader.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/msgFolderPickerOverlay.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/msgHdrViewOverlay.dtd
-lib/mozilla/chrome/en-US/locale/en-US/messenger/newFolderNameDialog.dtd
+lib/mozilla/chrome/en-US/locale/en-US/messenger/newFolderDialog.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/news.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/oeImportMsgs.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/outlookImportMsgs.properties
@@ -1678,6 +1702,7 @@ lib/mozilla/chrome/en-US/locale/en-US/messenger/pref-mailnews.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/pref-receipts.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/pref-viewing_messages.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/prefs.properties
+lib/mozilla/chrome/en-US/locale/en-US/messenger/renameFolderDialog.dtd
 lib/mozilla/chrome/en-US/locale/en-US/messenger/search-attributes.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/search-operators.properties
 lib/mozilla/chrome/en-US/locale/en-US/messenger/search.properties
@@ -1700,6 +1725,7 @@ lib/mozilla/chrome/en-US/locale/en-US/navigator/openLocation.properties
 lib/mozilla/chrome/en-US/locale/en-US/navigator/pageInfo.dtd
 lib/mozilla/chrome/en-US/locale/en-US/navigator/platformNavigationBindings.dtd
 lib/mozilla/chrome/en-US/locale/en-US/navigator/viewSource.dtd
+lib/mozilla/chrome/en-US/locale/en-US/necko/contents.rdf
 lib/mozilla/chrome/en-US/locale/en-US/necko/necko.properties
 lib/mozilla/chrome/en-US/locale/en-US/necko/redirect_loop.dtd
 lib/mozilla/chrome/installed-chrome.txt
@@ -1786,6 +1812,8 @@ lib/mozilla/chrome/messenger/content/messenger/fieldMapExport.xul
 lib/mozilla/chrome/messenger/content/messenger/fieldMapImport.js
 lib/mozilla/chrome/messenger/content/messenger/fieldMapImport.xul
 lib/mozilla/chrome/messenger/content/messenger/folderPane.xul
+lib/mozilla/chrome/messenger/content/messenger/folderProps.js
+lib/mozilla/chrome/messenger/content/messenger/imapFolderProps.xul
 lib/mozilla/chrome/messenger/content/messenger/imapTest.js
 lib/mozilla/chrome/messenger/content/messenger/imapTest.xul
 lib/mozilla/chrome/messenger/content/messenger/importDialog.js
@@ -1832,8 +1860,8 @@ lib/mozilla/chrome/messenger/content/messenger/msgMail3PaneWindow.js
 lib/mozilla/chrome/messenger/content/messenger/msgPrintEngine.js
 lib/mozilla/chrome/messenger/content/messenger/msgPrintEngine.xul
 lib/mozilla/chrome/messenger/content/messenger/msgViewNavigation.js
-lib/mozilla/chrome/messenger/content/messenger/newFolderNameDialog.js
-lib/mozilla/chrome/messenger/content/messenger/newFolderNameDialog.xul
+lib/mozilla/chrome/messenger/content/messenger/newFolderDialog.js
+lib/mozilla/chrome/messenger/content/messenger/newFolderDialog.xul
 lib/mozilla/chrome/messenger/content/messenger/openSaveAttachment.js
 lib/mozilla/chrome/messenger/content/messenger/openSaveAttachment.xul
 lib/mozilla/chrome/messenger/content/messenger/platformMailnewsOverlay.xul
@@ -1845,7 +1873,8 @@ lib/mozilla/chrome/messenger/content/messenger/pref-mailnews.js
 lib/mozilla/chrome/messenger/content/messenger/pref-mailnews.xul
 lib/mozilla/chrome/messenger/content/messenger/pref-receipts.xul
 lib/mozilla/chrome/messenger/content/messenger/pref-viewing_messages.xul
-lib/mozilla/chrome/messenger/content/messenger/renameFolderNameDialog.xul
+lib/mozilla/chrome/messenger/content/messenger/renameFolderDialog.js
+lib/mozilla/chrome/messenger/content/messenger/renameFolderDialog.xul
 lib/mozilla/chrome/messenger/content/messenger/searchTermOverlay.js
 lib/mozilla/chrome/messenger/content/messenger/searchTermOverlay.xul
 lib/mozilla/chrome/messenger/content/messenger/shareglue.js
@@ -1905,6 +1934,30 @@ lib/mozilla/chrome/modern/skin/modern/communicator/profile/newProfile1_2.css
 lib/mozilla/chrome/modern/skin/modern/communicator/profile/profile.css
 lib/mozilla/chrome/modern/skin/modern/communicator/profile/profileManager.css
 lib/mozilla/chrome/modern/skin/modern/communicator/profile/profileicon-large.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-grippy-btm-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-grippy-btm.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-grippy-mid-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-grippy-mid.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-grippy-top-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-grippy-top.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/prtb-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-grippy-bg-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-grippy-bg.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-grippy-btm-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-grippy-btm.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-grippy-top-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-grippy-top.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/pt-separator.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/ptc-grippy-bg-active.gif
+lib/mozilla/chrome/modern/skin/modern/communicator/ptc-grippy-bg.gif
 lib/mozilla/chrome/modern/skin/modern/communicator/regviewer/regviewer.css
 lib/mozilla/chrome/modern/skin/modern/communicator/related/related.css
 lib/mozilla/chrome/modern/skin/modern/communicator/related/sitemap.gif
@@ -2114,24 +2167,51 @@ lib/mozilla/chrome/modern/skin/modern/global/button-3slice-active-right.gif
 lib/mozilla/chrome/modern/skin/modern/global/button-3slice-normal-left.gif
 lib/mozilla/chrome/modern/skin/modern/global/button-3slice-normal-middle.gif
 lib/mozilla/chrome/modern/skin/modern/global/button-3slice-normal-right.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-clicked-left.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-clicked-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-clicked-right.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-clicked-left.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-clicked-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-clicked-right.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-disabled-left.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-disabled-mid.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-disabled-right.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-left.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-def-right.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-disabled-left.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-disabled-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-disabled-right.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-left.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/button-right.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-active-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-active-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-def-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-dis-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/button-right-top.gif
 lib/mozilla/chrome/modern/skin/modern/global/button.css
 lib/mozilla/chrome/modern/skin/modern/global/button28-bg-active.gif
 lib/mozilla/chrome/modern/skin/modern/global/button28-bg-disabled.gif
@@ -2175,18 +2255,22 @@ lib/mozilla/chrome/modern/skin/modern/global/globalBindings.xml
 lib/mozilla/chrome/modern/skin/modern/global/gray-bottomleft.gif
 lib/mozilla/chrome/modern/skin/modern/global/gray-bottomright.gif
 lib/mozilla/chrome/modern/skin/modern/global/gray-topright.gif
-lib/mozilla/chrome/modern/skin/modern/global/grippy-horizontal-after-h.gif
+lib/mozilla/chrome/modern/skin/modern/global/grippy-horizontal-active.gif
 lib/mozilla/chrome/modern/skin/modern/global/grippy-horizontal-after.gif
-lib/mozilla/chrome/modern/skin/modern/global/grippy-horizontal-before-h.gif
 lib/mozilla/chrome/modern/skin/modern/global/grippy-horizontal-before.gif
-lib/mozilla/chrome/modern/skin/modern/global/grippy-vertical-after-h.gif
+lib/mozilla/chrome/modern/skin/modern/global/grippy-vertical-active.gif
 lib/mozilla/chrome/modern/skin/modern/global/grippy-vertical-after.gif
-lib/mozilla/chrome/modern/skin/modern/global/grippy-vertical-before-h.gif
 lib/mozilla/chrome/modern/skin/modern/global/grippy-vertical-before.gif
 lib/mozilla/chrome/modern/skin/modern/global/lessCOls_dis.gif
 lib/mozilla/chrome/modern/skin/modern/global/lessCols.gif
 lib/mozilla/chrome/modern/skin/modern/global/lessCols_mo.gif
 lib/mozilla/chrome/modern/skin/modern/global/loading.gif
+lib/mozilla/chrome/modern/skin/modern/global/mb-grippy-bg-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/mb-grippy-bg.gif
+lib/mozilla/chrome/modern/skin/modern/global/mb-grippy-btm-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/mb-grippy-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/mb-grippy-top-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/mb-grippy-top.gif
 lib/mozilla/chrome/modern/skin/modern/global/mb-single-arrow.gif
 lib/mozilla/chrome/modern/skin/modern/global/menu-arrow-disabled.gif
 lib/mozilla/chrome/modern/skin/modern/global/menu-arrow-hover.gif
@@ -2199,15 +2283,35 @@ lib/mozilla/chrome/modern/skin/modern/global/menu-radio-hover.gif
 lib/mozilla/chrome/modern/skin/modern/global/menu-radio.gif
 lib/mozilla/chrome/modern/skin/modern/global/menu.css
 lib/mozilla/chrome/modern/skin/modern/global/menubutton.css
-lib/mozilla/chrome/modern/skin/modern/global/menulist-clicked-leftcap.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-clicked-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-clicked-rightcap.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-disabled-leftcap.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-disabled-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-disabled-rightcap.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-leftcap.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/menulist-rightcap.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-active-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-arrow.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-arrow.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-dis-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-mid-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-mid-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-mid-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/global/menulist-right-top.gif
 lib/mozilla/chrome/modern/skin/modern/global/menulist.css
 lib/mozilla/chrome/modern/skin/modern/global/message-icon.gif
 lib/mozilla/chrome/modern/skin/modern/global/moreCols.gif
@@ -2224,7 +2328,7 @@ lib/mozilla/chrome/modern/skin/modern/global/opentwisty-selected.gif
 lib/mozilla/chrome/modern/skin/modern/global/opentwisty.gif
 lib/mozilla/chrome/modern/skin/modern/global/otherbutton28-bg-active.gif
 lib/mozilla/chrome/modern/skin/modern/global/otherbutton28-bg-hover.gif
-lib/mozilla/chrome/modern/skin/modern/global/preview.png
+lib/mozilla/chrome/modern/skin/modern/global/preview.gif
 lib/mozilla/chrome/modern/skin/modern/global/print-clicked.gif
 lib/mozilla/chrome/modern/skin/modern/global/print-disabled.gif
 lib/mozilla/chrome/modern/skin/modern/global/print-hover.gif
@@ -2307,17 +2411,23 @@ lib/mozilla/chrome/modern/skin/modern/global/tab-bot-select-right.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-bot-unselect-left.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-bot-unselect-middle.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-bot-unselect-right.gif
+lib/mozilla/chrome/modern/skin/modern/global/tab-clicked-left-mid.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-clicked-left.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-clicked-middle.gif
+lib/mozilla/chrome/modern/skin/modern/global/tab-clicked-right-mid.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-clicked-right.gif
+lib/mozilla/chrome/modern/skin/modern/global/tab-select-left-btm.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-select-left.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-select-middle.gif
+lib/mozilla/chrome/modern/skin/modern/global/tab-select-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/tab-select-right-mid.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-select-right.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-top-border-leftcap.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-top-border-rightcap.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-top-border.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-unselect-left.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-unselect-middle.gif
+lib/mozilla/chrome/modern/skin/modern/global/tab-unselect-right-mid.gif
 lib/mozilla/chrome/modern/skin/modern/global/tab-unselect-right.gif
 lib/mozilla/chrome/modern/skin/modern/global/tabcontrol.css
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-addressbook-clicked.gif
@@ -2327,11 +2437,15 @@ lib/mozilla/chrome/modern/skin/modern/global/taskbar-bg-right.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-bg.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-composer-clicked.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-composer.gif
+lib/mozilla/chrome/modern/skin/modern/global/taskbar-groove-left-bg.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-groove-left.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-groove-middle.gif
+lib/mozilla/chrome/modern/skin/modern/global/taskbar-groove-right-bg.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-groove-right.gif
+lib/mozilla/chrome/modern/skin/modern/global/taskbar-image-right-bg.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-mail-clicked.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-mail.gif
+lib/mozilla/chrome/modern/skin/modern/global/taskbar-mailnew-clicked.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-mailnew.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-navigator-clicked.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-navigator.gif
@@ -2340,20 +2454,14 @@ lib/mozilla/chrome/modern/skin/modern/global/taskbar-tab-hover.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-tab-minimized.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-tab-trans.gif
 lib/mozilla/chrome/modern/skin/modern/global/taskbar-tab.gif
-lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-down-clicked.gif
-lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-down.gif
-lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-up-bg.gif
-lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-up-clicked-bg.gif
-lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-up-clicked.gif
-lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-up.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-left-bottom.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-left-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-left-top.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-middle-bottom.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-middle-top.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-right-bottom.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-right-middle.gif
-lib/mozilla/chrome/modern/skin/modern/global/textfield-right-top.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-bg-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-bg.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-btm-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-btm.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-collapsed-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-collapsed.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-top-active.gif
+lib/mozilla/chrome/modern/skin/modern/global/tb-grippy-top.gif
 lib/mozilla/chrome/modern/skin/modern/global/textfield.css
 lib/mozilla/chrome/modern/skin/modern/global/toolbar-begincap.gif
 lib/mozilla/chrome/modern/skin/modern/global/toolbar-dropdown-hover.gif
@@ -2369,6 +2477,8 @@ lib/mozilla/chrome/modern/skin/modern/messenger/AccountManager.css
 lib/mozilla/chrome/modern/skin/modern/messenger/abookstat.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/abnewmsg.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/addressbook.css
+lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/directory-open.gif
+lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/directory.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/edit-clicked.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/edit-disabled.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/addressbook/edit-hover.gif
@@ -2415,7 +2525,6 @@ lib/mozilla/chrome/modern/skin/modern/messenger/folder-inbox-share-open.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/folder-inbox-share.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/folder-inbox.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/folder-mailserver.gif
-lib/mozilla/chrome/modern/skin/modern/messenger/folder-new-closed.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/folder-new-open.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/folder-new.gif
 lib/mozilla/chrome/modern/skin/modern/messenger/folder-newsgroup-new.gif
@@ -2560,6 +2669,12 @@ lib/mozilla/chrome/modern/skin/modern/navigator/location.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/messagel.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/mynetscape.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/n-box-persbar.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/nav-groove-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/nav-groove-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/nav-groove-left-top.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/nav-groove-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/nav-groove-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/nav-groove-right-top.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/navbar-inner-groove-left.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/navbar-inner-groove-middle.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/navbar-inner-groove-right.gif
@@ -2577,8 +2692,14 @@ lib/mozilla/chrome/modern/skin/modern/navigator/stop-hover.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/stop.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/ubhist-keyword-popup-active.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/ubhist-keyword-popup.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-left-btm.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-left-mid.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-left-top.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-left.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-middle.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-right-btm.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-right-mid.gif
+lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-right-top.gif
 lib/mozilla/chrome/modern/skin/modern/navigator/urlbar-right.gif
 lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
@@ -2586,6 +2707,7 @@ lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/toolkit/content/global/about.xul
 lib/mozilla/chrome/toolkit/content/global/autocomplete.xml
+lib/mozilla/chrome/toolkit/content/global/build.dtd
 lib/mozilla/chrome/toolkit/content/global/charsetDetectorsOverlay.js
 lib/mozilla/chrome/toolkit/content/global/charsetDetectorsOverlay.xul
 lib/mozilla/chrome/toolkit/content/global/charsetOverlay.js
@@ -2597,7 +2719,6 @@ lib/mozilla/chrome/toolkit/content/global/console.js
 lib/mozilla/chrome/toolkit/content/global/console.xul
 lib/mozilla/chrome/toolkit/content/global/consoleBindings.xml
 lib/mozilla/chrome/toolkit/content/global/contents.rdf
-lib/mozilla/chrome/toolkit/content/global/credits.html
 lib/mozilla/chrome/toolkit/content/global/dialogOverlay.js
 lib/mozilla/chrome/toolkit/content/global/dialogOverlay.xul
 lib/mozilla/chrome/toolkit/content/global/downloadProgress.js
@@ -2614,7 +2735,6 @@ lib/mozilla/chrome/toolkit/content/global/helperAppDldProgress.xul
 lib/mozilla/chrome/toolkit/content/global/helperAppLauncher.js
 lib/mozilla/chrome/toolkit/content/global/helperAppLauncher.xul
 lib/mozilla/chrome/toolkit/content/global/hiddenWindow.xul
-lib/mozilla/chrome/toolkit/content/global/htmlBindings.xml
 lib/mozilla/chrome/toolkit/content/global/logo.gif
 lib/mozilla/chrome/toolkit/content/global/menulistBindings.xml
 lib/mozilla/chrome/toolkit/content/global/mozilla.html
@@ -2623,11 +2743,12 @@ lib/mozilla/chrome/toolkit/content/global/nsDragAndDrop.js
 lib/mozilla/chrome/toolkit/content/global/nsJSComponentManager.js
 lib/mozilla/chrome/toolkit/content/global/nsJSSupportsUtils.js
 lib/mozilla/chrome/toolkit/content/global/nsTransferable.js
+lib/mozilla/chrome/toolkit/content/global/nsTreeController.js
+lib/mozilla/chrome/toolkit/content/global/nsTreeUtils.js
 lib/mozilla/chrome/toolkit/content/global/nsUserSettings.js
 lib/mozilla/chrome/toolkit/content/global/nsWidgetStateManager.js
 lib/mozilla/chrome/toolkit/content/global/platformDialogOverlay.xul
 lib/mozilla/chrome/toolkit/content/global/platformGlobalOverlay.xul
-lib/mozilla/chrome/toolkit/content/global/platformHTMLBindings.xml
 lib/mozilla/chrome/toolkit/content/global/plugins.html
 lib/mozilla/chrome/toolkit/content/global/printdialog.js
 lib/mozilla/chrome/toolkit/content/global/printdialog.xul
@@ -2659,6 +2780,7 @@ lib/mozilla/components/appshell.xpt
 lib/mozilla/components/autocomplete.xpt
 lib/mozilla/components/bookmarks.xpt
 lib/mozilla/components/caps.xpt
+lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/cookieviewer.xpt
 lib/mozilla/components/directory.xpt
@@ -2724,7 +2846,6 @@ lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
 lib/mozilla/components/libpref.so
 lib/mozilla/components/libprofile.so
-lib/mozilla/components/libpsmglue.so
 lib/mozilla/components/librdf.so
 lib/mozilla/components/librdfdomds.so
 lib/mozilla/components/libregviewer.so
@@ -2757,6 +2878,7 @@ lib/mozilla/components/libxmlextras.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpctest.so
 lib/mozilla/components/libxpinstall.so
+lib/mozilla/components/libxremote_client.so
 lib/mozilla/components/locale.xpt
 lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
@@ -2797,7 +2919,6 @@ lib/mozilla/components/prefmigr.xpt
 lib/mozilla/components/profile.xpt
 lib/mozilla/components/proxyObjInst.xpt
 lib/mozilla/components/proxytest.xpt
-lib/mozilla/components/psmglue.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/rdfdomds.xpt
 lib/mozilla/components/regviewer.xpt
@@ -2856,8 +2977,10 @@ lib/mozilla/defaults/profile/panels.rdf
 lib/mozilla/defaults/profile/search.rdf
 lib/mozilla/defaults/wallet/DistinguishedSchema.tbl
 lib/mozilla/defaults/wallet/FieldSchema.tbl
+lib/mozilla/defaults/wallet/PositionalSchema.tbl
 lib/mozilla/defaults/wallet/SchemaConcat.tbl
-lib/mozilla/defaults/wallet/URLFieldSchema.tbl
+lib/mozilla/defaults/wallet/SchemaStrings.tbl
+lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/dtd/mathml.dtd
 lib/mozilla/geturl
 lib/mozilla/gtkEmbed
@@ -2865,12 +2988,10 @@ lib/mozilla/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libDebugRobot.so
-lib/mozilla/libcmt.so
 lib/mozilla/libgkgfx.so
 lib/mozilla/libgtkembedmoz.so
 lib/mozilla/libgtksuperwin.so
 lib/mozilla/libgtkxtbin.so
-lib/mozilla/libjpeg.so
 lib/mozilla/libjsdom.so
 lib/mozilla/libjsj.so
 lib/mozilla/libmozjs.so
@@ -2879,7 +3000,6 @@ lib/mozilla/libnspr4.so
 lib/mozilla/libnullplugin.so
 lib/mozilla/libplc4.so
 lib/mozilla/libplds4.so
-lib/mozilla/libprotocol.so
 lib/mozilla/libxpcom.so
 lib/mozilla/libxpistub.so
 lib/mozilla/lots
@@ -2902,6 +3022,9 @@ lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/builtin/htmlBindings.xml
+lib/mozilla/res/builtin/platformHTMLBindings.xml
+lib/mozilla/res/builtin/xbl-forms.css
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/entityTables/html40Latin1.properties
@@ -2909,6 +3032,9 @@ lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
 lib/mozilla/res/entityTables/transliterate.properties
+lib/mozilla/res/forms.css
+lib/mozilla/res/gfx/icon_0.gif
+lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
 lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
@@ -3053,26 +3179,18 @@ lib/mozilla/res/ua.css
 lib/mozilla/res/unixcharset.properties
 lib/mozilla/res/viewer.properties
 lib/mozilla/run-mozilla.sh
-lib/mozilla/searchplugins/AOLSearch.gif
-lib/mozilla/searchplugins/AOLSearch.src
-lib/mozilla/searchplugins/ClassifiedPlus.gif
-lib/mozilla/searchplugins/ClassifiedPlus.src
-lib/mozilla/searchplugins/CompuServe.jpg
-lib/mozilla/searchplugins/CompuServe.src
-lib/mozilla/searchplugins/ICQ.gif
-lib/mozilla/searchplugins/ICQ.src
-lib/mozilla/searchplugins/Music_Artist.gif
-lib/mozilla/searchplugins/Music_Artist.src
 lib/mozilla/searchplugins/NetscapeSearch.gif
 lib/mozilla/searchplugins/NetscapeSearch.src
-lib/mozilla/searchplugins/Shareware.gif
-lib/mozilla/searchplugins/Shareware.src
-lib/mozilla/searchplugins/ShopNetscape.gif
-lib/mozilla/searchplugins/ShopNetscape.src
-lib/mozilla/searchplugins/Tech_News.gif
-lib/mozilla/searchplugins/Tech_News.src
+lib/mozilla/searchplugins/bugzilla.gif
+lib/mozilla/searchplugins/bugzilla.src
+lib/mozilla/searchplugins/dmoz.gif
+lib/mozilla/searchplugins/dmoz.src
 lib/mozilla/searchplugins/google.gif
 lib/mozilla/searchplugins/google.src
+lib/mozilla/searchplugins/lxrmozilla.gif
+lib/mozilla/searchplugins/lxrmozilla.src
+lib/mozilla/searchplugins/mozilla.gif
+lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/sendlatertest
 lib/mozilla/sendpage
 lib/mozilla/splash.xpm
@@ -3095,7 +3213,9 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/mailnews/tests
 @dirrm lib/mozilla/res/mailnews
 @dirrm lib/mozilla/res/html
+@dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/builtin
 @dirrm lib/mozilla/res
 @dirrm lib/mozilla/plugins
 @dirrm lib/mozilla/icons