Update mozilla to 0.9.7

See the release notes for detail.

http://www.mozilla.org/releases/mozilla0.9.7/

12 files changed, 173 insertions, 89 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 5ca36621873..d2b3b0bac04 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2001/11/22 16:25:36 taya Exp $
+# $NetBSD: Makefile,v 1.78 2001/12/27 15:02:36 taya Exp $
 
-MOZ_VER=	0.9.6
-NB_VER=
+MOZ_VER=	0.9.7
 DISTNAME=	mozilla-source-${MOZ_VER}
-PKGNAME=	mozilla-${MOZ_VER}${NB_VER}
+PKGNAME=	mozilla-${MOZ_VER}
 WRKSRC=		${WRKDIR}/mozilla
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${MOZ_VER}/src/ \
@@ -22,12 +21,13 @@ USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-debug \
-		--with-jpeg=${BUILDLINK_DIR} \
-		--with-png=${BUILDLINK_DIR} \
+		--with-system-jpeg=${BUILDLINK_DIR} \
+		--with-system-png=${BUILDLINK_DIR} \
 		--enable-mathml \
-		--enable-svg \
 		--enable-crypto
 SHAREMODE?=	644
+#ALL_TARGET=	default
+ALL_TARGET=
 
 .include	"../../x11/gtk/buildlink.mk"
 .include	"../../graphics/gdk-pixbuf/buildlink.mk"
diff --git a/www/mozilla/PLIST-ELF b/www/mozilla/PLIST-ELF
index dc6348842f1..688b0c1260a 100644
--- a/www/mozilla/PLIST-ELF
+++ b/www/mozilla/PLIST-ELF
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-ELF,v 1.2 2001/11/22 16:25:36 taya Exp $
+@comment $NetBSD: PLIST-ELF,v 1.3 2001/12/27 15:02:37 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/dirver
@@ -29,6 +29,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libfileview.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
@@ -46,6 +47,7 @@ lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
+lib/mozilla/components/libinspector.so
 lib/mozilla/components/libjar50.so
 lib/mozilla/components/libjsd.so
 lib/mozilla/components/libjsdom.so
@@ -65,6 +67,7 @@ lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
+lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
 lib/mozilla/components/libnkcache.so
@@ -72,6 +75,7 @@ lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnslocale.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipboot.so
 lib/mozilla/components/libpipnss.so
 lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
@@ -79,7 +83,6 @@ lib/mozilla/components/libprofile.so
 lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtimer_gtk.so
 lib/mozilla/components/libtransformiix.so
@@ -136,12 +139,13 @@ lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
@@ -178,6 +182,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -185,6 +190,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -209,6 +215,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -229,6 +236,7 @@ lib/mozilla/components/nsProxyAutoConfig.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -243,6 +251,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -277,20 +286,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -306,6 +317,7 @@ lib/mozilla/dtd/mathml.dtd
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -330,7 +342,6 @@ 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
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -340,11 +351,12 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
-lib/mozilla/res/html/loading-image.gif
+lib/mozilla/res/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -707,7 +719,6 @@ include/mozilla/content/nsIXBLDocumentInfo.h
 include/mozilla/content/nsIXBLInsertionPoint.h
 include/mozilla/content/nsIXBLPrototypeBinding.h
 include/mozilla/content/nsIXBLPrototypeHandler.h
-include/mozilla/content/nsIXBLPrototypeProperty.h
 include/mozilla/content/nsIXBLService.h
 include/mozilla/content/nsIXMLContent.h
 include/mozilla/content/nsIXMLContentSink.h
@@ -758,6 +769,7 @@ include/mozilla/docshell/nsIWebNavigation.h
 include/mozilla/dom/domstubs.h
 include/mozilla/dom/nsDOMCID.h
 include/mozilla/dom/nsDOMError.h
+include/mozilla/dom/nsIDOM3Node.h
 include/mozilla/dom/nsIDOMAbstractView.h
 include/mozilla/dom/nsIDOMAttr.h
 include/mozilla/dom/nsIDOMBarProp.h
@@ -880,6 +892,7 @@ include/mozilla/dom/nsIDOMMouseMotionListener.h
 include/mozilla/dom/nsIDOMMutationEvent.h
 include/mozilla/dom/nsIDOMMutationListener.h
 include/mozilla/dom/nsIDOMNSDocument.h
+include/mozilla/dom/nsIDOMNSEvent.h
 include/mozilla/dom/nsIDOMNSHTMLAnchorElement.h
 include/mozilla/dom/nsIDOMNSHTMLAreaElement.h
 include/mozilla/dom/nsIDOMNSHTMLButtonElement.h
@@ -937,6 +950,7 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULPopupElement.h
 include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
 include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
@@ -985,6 +999,7 @@ include/mozilla/exthandler/nsHelperAppRDF.h
 include/mozilla/exthandler/nsIExternalHelperAppService.h
 include/mozilla/exthandler/nsIExternalProtocolService.h
 include/mozilla/exthandler/nsOSHelperAppService.h
+include/mozilla/filepicker/nsIFileView.h
 include/mozilla/find/nsIWebBrowserFind.h
 include/mozilla/gfx/imgScaler.h
 include/mozilla/gfx/nsColor.h
@@ -1073,6 +1088,19 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
+include/mozilla/inspector/inIBitmap.h
+include/mozilla/inspector/inIBitmapDepot.h
+include/mozilla/inspector/inIBitmapURI.h
+include/mozilla/inspector/inICSSValueSearch.h
+include/mozilla/inspector/inIDOMUtils.h
+include/mozilla/inspector/inIDOMView.h
+include/mozilla/inspector/inIDeepTreeWalker.h
+include/mozilla/inspector/inIFileSearch.h
+include/mozilla/inspector/inIFlasher.h
+include/mozilla/inspector/inIPNGEncoder.h
+include/mozilla/inspector/inIScreenCapturer.h
+include/mozilla/inspector/inISearchObserver.h
+include/mozilla/inspector/inISearchProcess.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -1208,9 +1236,11 @@ include/mozilla/layout/nsIMutableStyleContext.h
 include/mozilla/layout/nsIObjectFrame.h
 include/mozilla/layout/nsIOutlinerBoxObject.h
 include/mozilla/layout/nsIOutlinerColFrame.h
+include/mozilla/layout/nsIOutlinerContentView.h
 include/mozilla/layout/nsIOutlinerSelection.h
 include/mozilla/layout/nsIOutlinerView.h
 include/mozilla/layout/nsIPageSequenceFrame.h
+include/mozilla/layout/nsIPercentHeightObserver.h
 include/mozilla/layout/nsIPopupBoxObject.h
 include/mozilla/layout/nsIPopupSetFrame.h
 include/mozilla/layout/nsIPresContext.h
@@ -1222,7 +1252,6 @@ include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
-include/mozilla/layout/nsISVGFrame.h
 include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
@@ -1239,7 +1268,9 @@ include/mozilla/layout/nsITreeFrame.h
 include/mozilla/layout/nsLayoutCID.h
 include/mozilla/layout/nsOutlinerBodyFrame.h
 include/mozilla/layout/nsOutlinerColFrame.h
+include/mozilla/layout/nsOutlinerContentView.h
 include/mozilla/layout/nsOutlinerSelection.h
+include/mozilla/layout/nsOutlinerUtils.h
 include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
@@ -1593,6 +1624,10 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
+include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
+include/mozilla/msgsmime/nsMsgComposeSecure.h
+include/mozilla/msgsmime/nsMsgSMIMECID.h
 include/mozilla/necko/mozITXTToHTMLConv.h
 include/mozilla/necko/netCore.h
 include/mozilla/necko/nsHTTPChunkConv.h
@@ -1622,6 +1657,7 @@ include/mozilla/necko/nsIJARChannel.h
 include/mozilla/necko/nsIJARProtocolHandler.h
 include/mozilla/necko/nsIJARURI.h
 include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMultiPartChannel.h
 include/mozilla/necko/nsINetModRegEntry.h
 include/mozilla/necko/nsINetModuleMgr.h
 include/mozilla/necko/nsINetNotify.h
@@ -1834,6 +1870,9 @@ include/mozilla/oji/nsIThreadManager.h
 include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
+include/mozilla/pipboot/nsIBufEntropyCollector.h
+include/mozilla/pipboot/nsISSLStatusProvider.h
+include/mozilla/pipboot/nsISecurityWarningDialogs.h
 include/mozilla/pipnss/nsIBadCertListener.h
 include/mozilla/pipnss/nsICMS.h
 include/mozilla/pipnss/nsICMSSecureMessage.h
@@ -1986,6 +2025,7 @@ include/mozilla/uconv/nsICharRepresentable.h
 include/mozilla/uconv/nsICharsetAlias.h
 include/mozilla/uconv/nsICharsetConverterManager.h
 include/mozilla/uconv/nsICharsetConverterManager2.h
+include/mozilla/uconv/nsIConverterInputStream.h
 include/mozilla/uconv/nsICurrentCharsetListener.h
 include/mozilla/uconv/nsIMappingCache.h
 include/mozilla/uconv/nsIPlatformCharset.h
@@ -2031,7 +2071,6 @@ include/mozilla/util/nsITimeRecorder.h
 include/mozilla/util/nsTimer.h
 include/mozilla/util/stopwatch.h
 include/mozilla/util/xp_obs.h
-include/mozilla/view/nsIClipView.h
 include/mozilla/view/nsICompositeListener.h
 include/mozilla/view/nsIEventProcessor.h
 include/mozilla/view/nsIScrollPositionListener.h
@@ -2330,21 +2369,19 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @unexec rm %D/lib/mozilla/component.reg
-@unexec rm %D/lib/mozilla/chrome/user-locales.rdf
-@unexec rm %D/lib/mozilla/chrome/user-skins.rdf
-@unexec rm %D/lib/mozilla/chrome/all-locales.rdf
-@unexec rm %D/lib/mozilla/chrome/all-packages.rdf
-@unexec rm %D/lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 @unexec rm %D/lib/mozilla/components/xpti.dat
-@unexec rm %D/lib/mozilla/components/xptitemp.dat
 @dirrm lib/mozilla/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
@@ -2356,6 +2393,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -2421,6 +2459,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/plugin
 @dirrm include/mozilla/pippki
 @dirrm include/mozilla/pipnss
+@dirrm include/mozilla/pipboot
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
@@ -2429,6 +2468,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
 @dirrm include/mozilla/necko
+@dirrm include/mozilla/msgsmime
 @dirrm include/mozilla/msgnews
 @dirrm include/mozilla/msglocal
 @dirrm include/mozilla/msgimap
@@ -2457,6 +2497,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/java
 @dirrm include/mozilla/jar
 @dirrm include/mozilla/intl
+@dirrm include/mozilla/inspector
 @dirrm include/mozilla/import
 @dirrm include/mozilla/imglib2
 @dirrm include/mozilla/htmlparser
@@ -2466,6 +2507,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/gfx2
 @dirrm include/mozilla/gfx
 @dirrm include/mozilla/find
+@dirrm include/mozilla/filepicker
 @dirrm include/mozilla/exthandler
 @dirrm include/mozilla/expat
 @dirrm include/mozilla/embedcomponents
diff --git a/www/mozilla/PLIST-a.out b/www/mozilla/PLIST-a.out
index 025b269c8a5..b5b6630dc47 100644
--- a/www/mozilla/PLIST-a.out
+++ b/www/mozilla/PLIST-a.out
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-a.out,v 1.2 2001/11/22 16:25:36 taya Exp $
+@comment $NetBSD: PLIST-a.out,v 1.3 2001/12/27 15:02:38 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/dirver
@@ -29,6 +29,7 @@ lib/mozilla/components/libcookie.so.1.0
 lib/mozilla/components/libdocshell.so.1.0
 lib/mozilla/components/libeditor.so.1.0
 lib/mozilla/components/libembedcomponents.so.1.0
+lib/mozilla/components/libfileview.so.1.0
 lib/mozilla/components/libgfx2.so.1.0
 lib/mozilla/components/libgfx_gtk.so.1.0
 lib/mozilla/components/libgfxps.so.1.0
@@ -46,6 +47,7 @@ lib/mozilla/components/libimgpng.so.1.0
 lib/mozilla/components/libimgppm.so.1.0
 lib/mozilla/components/libimpText.so.1.0
 lib/mozilla/components/libimport.so.1.0
+lib/mozilla/components/libinspector.so.1.0
 lib/mozilla/components/libjar50.so.1.0
 lib/mozilla/components/libjsd.so.1.0
 lib/mozilla/components/libjsdom.so.1.0
@@ -65,6 +67,7 @@ lib/mozilla/components/libmsgcompose.so.1.0
 lib/mozilla/components/libmsgdb.so.1.0
 lib/mozilla/components/libmsgimap.so.1.0
 lib/mozilla/components/libmsgnews.so.1.0
+lib/mozilla/components/libmsgsmime.so.1.0
 lib/mozilla/components/libnecko.so.1.0
 lib/mozilla/components/libnecko2.so.1.0
 lib/mozilla/components/libnkcache.so.1.0
@@ -72,6 +75,7 @@ lib/mozilla/components/libnsappshell.so.1.0
 lib/mozilla/components/libnslocale.so.1.0
 lib/mozilla/components/libnsprefm.so.1.0
 lib/mozilla/components/liboji.so.1.0
+lib/mozilla/components/libpipboot.so.1.0
 lib/mozilla/components/libpipnss.so.1.0
 lib/mozilla/components/libpippki.so.1.0
 lib/mozilla/components/libpref.so.1.0
@@ -79,7 +83,6 @@ lib/mozilla/components/libprofile.so.1.0
 lib/mozilla/components/librdf.so.1.0
 lib/mozilla/components/libregviewer.so.1.0
 lib/mozilla/components/libshistory.so.1.0
-lib/mozilla/components/libsmimestb.so.1.0
 lib/mozilla/components/libstrres.so.1.0
 lib/mozilla/components/libtimer_gtk.so.1.0
 lib/mozilla/components/libtransformiix.so.1.0
@@ -136,12 +139,13 @@ lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
@@ -178,6 +182,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -185,6 +190,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -209,6 +215,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -229,6 +236,7 @@ lib/mozilla/components/nsProxyAutoConfig.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -243,6 +251,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -277,20 +286,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -306,6 +317,7 @@ lib/mozilla/dtd/mathml.dtd
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -330,7 +342,6 @@ 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
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -340,11 +351,12 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
-lib/mozilla/res/html/loading-image.gif
+lib/mozilla/res/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -707,7 +719,6 @@ include/mozilla/content/nsIXBLDocumentInfo.h
 include/mozilla/content/nsIXBLInsertionPoint.h
 include/mozilla/content/nsIXBLPrototypeBinding.h
 include/mozilla/content/nsIXBLPrototypeHandler.h
-include/mozilla/content/nsIXBLPrototypeProperty.h
 include/mozilla/content/nsIXBLService.h
 include/mozilla/content/nsIXMLContent.h
 include/mozilla/content/nsIXMLContentSink.h
@@ -758,6 +769,7 @@ include/mozilla/docshell/nsIWebNavigation.h
 include/mozilla/dom/domstubs.h
 include/mozilla/dom/nsDOMCID.h
 include/mozilla/dom/nsDOMError.h
+include/mozilla/dom/nsIDOM3Node.h
 include/mozilla/dom/nsIDOMAbstractView.h
 include/mozilla/dom/nsIDOMAttr.h
 include/mozilla/dom/nsIDOMBarProp.h
@@ -880,6 +892,7 @@ include/mozilla/dom/nsIDOMMouseMotionListener.h
 include/mozilla/dom/nsIDOMMutationEvent.h
 include/mozilla/dom/nsIDOMMutationListener.h
 include/mozilla/dom/nsIDOMNSDocument.h
+include/mozilla/dom/nsIDOMNSEvent.h
 include/mozilla/dom/nsIDOMNSHTMLAnchorElement.h
 include/mozilla/dom/nsIDOMNSHTMLAreaElement.h
 include/mozilla/dom/nsIDOMNSHTMLButtonElement.h
@@ -937,6 +950,7 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULPopupElement.h
 include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
 include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
@@ -985,6 +999,7 @@ include/mozilla/exthandler/nsHelperAppRDF.h
 include/mozilla/exthandler/nsIExternalHelperAppService.h
 include/mozilla/exthandler/nsIExternalProtocolService.h
 include/mozilla/exthandler/nsOSHelperAppService.h
+include/mozilla/filepicker/nsIFileView.h
 include/mozilla/find/nsIWebBrowserFind.h
 include/mozilla/gfx/imgScaler.h
 include/mozilla/gfx/nsColor.h
@@ -1073,6 +1088,19 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
+include/mozilla/inspector/inIBitmap.h
+include/mozilla/inspector/inIBitmapDepot.h
+include/mozilla/inspector/inIBitmapURI.h
+include/mozilla/inspector/inICSSValueSearch.h
+include/mozilla/inspector/inIDOMUtils.h
+include/mozilla/inspector/inIDOMView.h
+include/mozilla/inspector/inIDeepTreeWalker.h
+include/mozilla/inspector/inIFileSearch.h
+include/mozilla/inspector/inIFlasher.h
+include/mozilla/inspector/inIPNGEncoder.h
+include/mozilla/inspector/inIScreenCapturer.h
+include/mozilla/inspector/inISearchObserver.h
+include/mozilla/inspector/inISearchProcess.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -1208,9 +1236,11 @@ include/mozilla/layout/nsIMutableStyleContext.h
 include/mozilla/layout/nsIObjectFrame.h
 include/mozilla/layout/nsIOutlinerBoxObject.h
 include/mozilla/layout/nsIOutlinerColFrame.h
+include/mozilla/layout/nsIOutlinerContentView.h
 include/mozilla/layout/nsIOutlinerSelection.h
 include/mozilla/layout/nsIOutlinerView.h
 include/mozilla/layout/nsIPageSequenceFrame.h
+include/mozilla/layout/nsIPercentHeightObserver.h
 include/mozilla/layout/nsIPopupBoxObject.h
 include/mozilla/layout/nsIPopupSetFrame.h
 include/mozilla/layout/nsIPresContext.h
@@ -1222,7 +1252,6 @@ include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
-include/mozilla/layout/nsISVGFrame.h
 include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
@@ -1239,7 +1268,9 @@ include/mozilla/layout/nsITreeFrame.h
 include/mozilla/layout/nsLayoutCID.h
 include/mozilla/layout/nsOutlinerBodyFrame.h
 include/mozilla/layout/nsOutlinerColFrame.h
+include/mozilla/layout/nsOutlinerContentView.h
 include/mozilla/layout/nsOutlinerSelection.h
+include/mozilla/layout/nsOutlinerUtils.h
 include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
@@ -1593,6 +1624,10 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
+include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
+include/mozilla/msgsmime/nsMsgComposeSecure.h
+include/mozilla/msgsmime/nsMsgSMIMECID.h
 include/mozilla/necko/mozITXTToHTMLConv.h
 include/mozilla/necko/netCore.h
 include/mozilla/necko/nsHTTPChunkConv.h
@@ -1622,6 +1657,7 @@ include/mozilla/necko/nsIJARChannel.h
 include/mozilla/necko/nsIJARProtocolHandler.h
 include/mozilla/necko/nsIJARURI.h
 include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMultiPartChannel.h
 include/mozilla/necko/nsINetModRegEntry.h
 include/mozilla/necko/nsINetModuleMgr.h
 include/mozilla/necko/nsINetNotify.h
@@ -1834,6 +1870,9 @@ include/mozilla/oji/nsIThreadManager.h
 include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
+include/mozilla/pipboot/nsIBufEntropyCollector.h
+include/mozilla/pipboot/nsISSLStatusProvider.h
+include/mozilla/pipboot/nsISecurityWarningDialogs.h
 include/mozilla/pipnss/nsIBadCertListener.h
 include/mozilla/pipnss/nsICMS.h
 include/mozilla/pipnss/nsICMSSecureMessage.h
@@ -1986,6 +2025,7 @@ include/mozilla/uconv/nsICharRepresentable.h
 include/mozilla/uconv/nsICharsetAlias.h
 include/mozilla/uconv/nsICharsetConverterManager.h
 include/mozilla/uconv/nsICharsetConverterManager2.h
+include/mozilla/uconv/nsIConverterInputStream.h
 include/mozilla/uconv/nsICurrentCharsetListener.h
 include/mozilla/uconv/nsIMappingCache.h
 include/mozilla/uconv/nsIPlatformCharset.h
@@ -2031,7 +2071,6 @@ include/mozilla/util/nsITimeRecorder.h
 include/mozilla/util/nsTimer.h
 include/mozilla/util/stopwatch.h
 include/mozilla/util/xp_obs.h
-include/mozilla/view/nsIClipView.h
 include/mozilla/view/nsICompositeListener.h
 include/mozilla/view/nsIEventProcessor.h
 include/mozilla/view/nsIScrollPositionListener.h
@@ -2330,21 +2369,19 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @unexec rm %D/lib/mozilla/component.reg
-@unexec rm %D/lib/mozilla/chrome/user-locales.rdf
-@unexec rm %D/lib/mozilla/chrome/user-skins.rdf
-@unexec rm %D/lib/mozilla/chrome/all-locales.rdf
-@unexec rm %D/lib/mozilla/chrome/all-packages.rdf
-@unexec rm %D/lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 @unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
+@unexec rm %D/lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 @unexec rm %D/lib/mozilla/components/xpti.dat
-@unexec rm %D/lib/mozilla/components/xptitemp.dat
 @dirrm lib/mozilla/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
@@ -2356,6 +2393,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -2421,6 +2459,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/plugin
 @dirrm include/mozilla/pippki
 @dirrm include/mozilla/pipnss
+@dirrm include/mozilla/pipboot
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
@@ -2429,6 +2468,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
 @dirrm include/mozilla/necko
+@dirrm include/mozilla/msgsmime
 @dirrm include/mozilla/msgnews
 @dirrm include/mozilla/msglocal
 @dirrm include/mozilla/msgimap
@@ -2457,6 +2497,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/java
 @dirrm include/mozilla/jar
 @dirrm include/mozilla/intl
+@dirrm include/mozilla/inspector
 @dirrm include/mozilla/import
 @dirrm include/mozilla/imglib2
 @dirrm include/mozilla/htmlparser
@@ -2466,6 +2507,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/gfx2
 @dirrm include/mozilla/gfx
 @dirrm include/mozilla/find
+@dirrm include/mozilla/filepicker
 @dirrm include/mozilla/exthandler
 @dirrm include/mozilla/expat
 @dirrm include/mozilla/embedcomponents
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index fe989966e4f..152e667853d 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2001/12/22 06:08:53 lukem Exp $
+$NetBSD: distinfo,v 1.14 2001/12/27 15:02:39 taya Exp $
 
-SHA1 (mozilla-source-0.9.6.tar.bz2) = 57eff503cf907025337e36629601e20355cf7005
-Size (mozilla-source-0.9.6.tar.bz2) = 27021140 bytes
-SHA1 (patch-aw) = 7f7f47cf724d4ba36be5e3d30d5286d51c792ff0
-SHA1 (patch-ax) = 8626976df813af6ed0c87ae6024daa1d1b6a7693
-SHA1 (patch-ay) = e58ade7debd9e34380ffb8fd9fc42f20bc08669c
-SHA1 (patch-az) = 222b350b0d02e86566ec8fee396bc650097f6234
-SHA1 (patch-ba) = 4ee9d4cd176a7f3780d618308b5d4189c216e686
-SHA1 (patch-bb) = 3d440c0d533b1baeae6e66108f19d1ef5077c431
-SHA1 (patch-bc) = 17e949e9d43d7df0c03704ba785d548021876a5e
-SHA1 (patch-be) = 67bd8416e7c3d0f68d5dc65c763d5394c5069778
+SHA1 (mozilla-source-0.9.7.tar.bz2) = ea68e382b0178d20ceafc4b1bf5ba35b421eb4c3
+Size (mozilla-source-0.9.7.tar.bz2) = 27159136 bytes
+SHA1 (patch-aw) = 604f67e076f70758f9370904c3e77532bf384a7e
+SHA1 (patch-ax) = a0d25cc593d80d66b2026eb943a921487165d748
+SHA1 (patch-ay) = ac5e4c71d3bf91eb31d573701682393b584bf918
+SHA1 (patch-az) = d9675d0e05f8990e539b598fa223ebfce588a62e
+SHA1 (patch-ba) = 25f52a9d6981cbea18a214284529abb24a4f18d5
+SHA1 (patch-bb) = a453dc4397f79cbc67b44c6beb154e635596ea34
+SHA1 (patch-bc) = 7bc9061fda23ae46730c8be8a25d951ea8642fd6
+SHA1 (patch-be) = df5db916335f54516866cc57fc46c888dd7a682a
 SHA1 (patch-bf) = cc03475150d03d580a7cfe1db189214ef4e20865
diff --git a/www/mozilla/patches/patch-aw b/www/mozilla/patches/patch-aw
index 808e2acf964..a41172872db 100644
--- a/www/mozilla/patches/patch-aw
+++ b/www/mozilla/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.6 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-aw,v 1.7 2001/12/27 15:02:40 taya Exp $
 
 diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
 --- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	Sat Oct 27 14:49:19 2001
-+++ ./widget/src/gtksuperwin/Makefile.in	Thu Nov 22 12:30:43 2001
++++ ./widget/src/gtksuperwin/Makefile.in	Sat Dec 22 13:02:34 2001
 @@ -25,6 +25,7 @@
  MODULE		= widget
  LIBRARY_NAME	= gtksuperwin
diff --git a/www/mozilla/patches/patch-ax b/www/mozilla/patches/patch-ax
index f34655fc24e..5bf0d63e092 100644
--- a/www/mozilla/patches/patch-ax
+++ b/www/mozilla/patches/patch-ax
@@ -1,9 +1,9 @@
-$NetBSD: patch-ax,v 1.5 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-ax,v 1.6 2001/12/27 15:02:41 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/src/nsSocketTransport.cpp
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Tue Oct  9 07:17:25 2001
-+++ ./netwerk/base/src/nsSocketTransport.cpp	Thu Nov 22 12:30:55 2001
-@@ -188,8 +188,7 @@
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Tue Dec  4 11:47:19 2001
++++ ./netwerk/base/src/nsSocketTransport.cpp	Sat Dec 22 13:02:36 2001
+@@ -186,8 +186,7 @@
      //
      // Set up Internet defaults...
      //
@@ -13,7 +13,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      
      //
      // Initialize the global connect timeout value if necessary...
-@@ -238,6 +237,13 @@
+@@ -236,6 +235,13 @@
          nsAutoMonitor::DestroyMonitor(mMonitor);
          mMonitor = nsnull;
      }
@@ -27,7 +27,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
  }
  
  
-@@ -642,15 +648,7 @@
+@@ -640,15 +646,7 @@
      //
      // The hostname has not been resolved yet...
      //
@@ -41,9 +41,9 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
 -        mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
 -
 +    if (mNetAddressList == nsnull) {
-         nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
-         if (NS_FAILED(rv)) return rv;
+         PR_ExitMonitor(mMonitor);
  
+         nsIDNSService* pDNSService = mService->GetCachedDNSService();
 @@ -673,7 +671,7 @@
              //
              // The DNS lookup has finished...  It has either failed or succeeded.
@@ -106,10 +106,10 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      //
 -    if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
 +    if (mNetAddressList == nsnull) {
-         nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
-         if (NS_FAILED(rv)) return rv;
- 
-@@ -937,16 +954,18 @@
+         nsIDNSService* pDNSService = mService->GetCachedDNSService();
+         if (!pDNSService) {
+             return NS_ERROR_UNEXPECTED;
+@@ -939,16 +956,18 @@
              return NS_ERROR_FAILURE;
          }
  
@@ -132,7 +132,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      }
  
      //
-@@ -1411,21 +1430,27 @@
+@@ -1470,21 +1489,27 @@
      // Enter the socket transport lock...
      nsAutoMonitor mon(mMonitor);
      nsresult rv = NS_OK;
@@ -171,7 +171,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      } else {
          // XXX: What should happen here?  The GetHostByName(...) succeeded but 
          //      there are *no* A records...
-@@ -1458,7 +1483,7 @@
+@@ -1517,7 +1542,7 @@
      // If the lookup failed, set the status...
      if (NS_FAILED(aStatus))
          mStatus = aStatus;
@@ -180,7 +180,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
          mStatus = NS_ERROR_ABORT;
  
      // Start processing the transport again - if necessary...
-@@ -1779,7 +1804,7 @@
+@@ -1838,7 +1863,7 @@
      *_retval = (char*)nsMemory::Alloc(aLen);
      if (!*_retval) return NS_ERROR_FAILURE;
  
diff --git a/www/mozilla/patches/patch-ay b/www/mozilla/patches/patch-ay
index 91824e53b8a..fb8fa2fb93a 100644
--- a/www/mozilla/patches/patch-ay
+++ b/www/mozilla/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.5 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-ay,v 1.6 2001/12/27 15:02:41 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src/nsSocketTransport.h
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h	Tue Oct  9 07:17:25 2001
-+++ ./netwerk/base/src/nsSocketTransport.h	Thu Nov 22 12:30:57 2001
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h	Wed Nov 28 09:42:57 2001
++++ ./netwerk/base/src/nsSocketTransport.h	Sat Dec 22 13:02:38 2001
 @@ -123,6 +123,11 @@
    eSocketDNS_Wait             = 0x2020
  };
@@ -15,7 +15,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src
  //
  // This is the default timeout value (in milliseconds) for sockets which have
  // no activity...
-@@ -246,7 +251,7 @@
+@@ -249,7 +254,7 @@
      PRIntervalTime                  mLastActiveTime;
      PRCList                         mListLink;
      PRMonitor*                      mMonitor;
diff --git a/www/mozilla/patches/patch-az b/www/mozilla/patches/patch-az
index 89c2d1b1775..2c7794d3afa 100644
--- a/www/mozilla/patches/patch-az
+++ b/www/mozilla/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.4 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-az,v 1.5 2001/12/27 15:02:41 taya Exp $
 
 diff -ru ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h ./directory/c-sdk/ldap/include/portable.h
 --- ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h	Sat Oct 27 05:47:18 2001
-+++ ./directory/c-sdk/ldap/include/portable.h	Thu Nov 22 12:31:02 2001
++++ ./directory/c-sdk/ldap/include/portable.h	Sat Dec 22 13:02:39 2001
 @@ -98,7 +98,7 @@
   * some systems don't have the BSD re_comp and re_exec routines
   */
diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba
index e51e0ff6b59..b859652acbb 100644
--- a/www/mozilla/patches/patch-ba
+++ b/www/mozilla/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-ba,v 1.4 2001/12/27 15:02:42 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	Sat Dec  2 06:29:17 2000
-+++ ./nsprpub/pr/include/md/_netbsd.cfg	Thu Nov 22 12:31:06 2001
++++ ./nsprpub/pr/include/md/_netbsd.cfg	Sat Dec 22 13:02:41 2001
 @@ -91,6 +91,52 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb
index 55710fccde8..4c60c0cd49c 100644
--- a/www/mozilla/patches/patch-bb
+++ b/www/mozilla/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.3 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-bb,v 1.4 2001/12/27 15:02:42 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	Fri Dec 29 02:04:04 2000
-+++ ./nsprpub/pr/include/md/_netbsd.h	Thu Nov 22 12:31:08 2001
++++ ./nsprpub/pr/include/md/_netbsd.h	Sat Dec 22 13:02:42 2001
 @@ -48,6 +48,8 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
diff --git a/www/mozilla/patches/patch-bc b/www/mozilla/patches/patch-bc
index ff3d1046e92..664fd51dbaf 100644
--- a/www/mozilla/patches/patch-bc
+++ b/www/mozilla/patches/patch-bc
@@ -1,9 +1,9 @@
-$NetBSD: patch-bc,v 1.3 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-bc,v 1.4 2001/12/27 15:02:43 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Oct 27 16:38:10 2001
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Nov 22 12:31:19 2001
-@@ -247,6 +247,13 @@
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Dec  6 19:51:45 2001
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Dec 22 13:02:44 2001
+@@ -249,6 +249,13 @@
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
diff --git a/www/mozilla/patches/patch-be b/www/mozilla/patches/patch-be
index 9ec4094794a..5db7f72549b 100644
--- a/www/mozilla/patches/patch-be
+++ b/www/mozilla/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.2 2001/11/22 16:25:37 taya Exp $
+$NetBSD: patch-be,v 1.3 2001/12/27 15:02:43 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c ./nsprpub/pr/src/io/prsocket.c
 --- ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c	Sat Jun  9 04:54:54 2001
-+++ ./nsprpub/pr/src/io/prsocket.c	Thu Nov 22 12:31:25 2001
++++ ./nsprpub/pr/src/io/prsocket.c	Sat Dec 22 13:02:46 2001
 @@ -1300,6 +1300,15 @@
  	if (osfd == -1) {
  		return 0;