Update mozilla to 0.9.6

From "What's New" section of release notes:

* Mozilla now displays page icons in the url bar (Expect support for
 shortcut icons (aka favicon) in Mozilla 0.9.7). Page icons can be defined
 in the html head section of a document like so:

	<LINK REL="icon" HREF="images/mozilla-16.png" TYPE="image/png">
	<LINK REL="SHORTCUT ICON" HREF="/images/global/branding/dellecomicon.ico">

* Mozilla can now display Windows .BMP and .ICO images on all platforms.
* Print Preview has been implemented.
* Macintosh Page Setup has been implemented (Bug 36796)
* Mail message "labels" support has been implemented. (Bug 81292)
* Mail "prefill mail filter" support has been implemented (Bug 65761)
* The new Search for item on the context menu lets you search for any text
 you highlight on a web page.
* Select some text in browser window.
* Right click in the browser window and a context menu will pop up.
* Choose the Search for item and Mozilla will search for the highlighted text at your default engine.

14 files changed, 304 insertions, 163 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index f9cb5e0f3ad..5ca36621873 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2001/11/14 23:03:38 enami Exp $
+# $NetBSD: Makefile,v 1.77 2001/11/22 16:25:36 taya Exp $
 
-MOZ_VER=	0.9.5
-NB_VER=		nb1
+MOZ_VER=	0.9.6
+NB_VER=
 DISTNAME=	mozilla-source-${MOZ_VER}
 PKGNAME=	mozilla-${MOZ_VER}${NB_VER}
 WRKSRC=		${WRKDIR}/mozilla
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${MOZ_VER}/src/
 		ftp://ftp.fu-berlin.de/pub/unix/network/www/mozilla/releases/mozilla${MOZ_VER}/src/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	taya@netbsd.org
 HOMEPAGE=	http://www.mozilla.org/
 COMMENT=	The open-source version of the Netscape browser
 
@@ -27,6 +27,7 @@ CONFIGURE_ARGS=	--disable-tests \
 		--enable-mathml \
 		--enable-svg \
 		--enable-crypto
+SHAREMODE?=	644
 
 .include	"../../x11/gtk/buildlink.mk"
 .include	"../../graphics/gdk-pixbuf/buildlink.mk"
@@ -56,7 +57,6 @@ SCRIPTS_ENV+=	BINOWN=${BINOWN}
 SCRIPTS_ENV+=	BINGRP=${BINGRP}
 SCRIPTS_ENV+=	BINMODE=${BINMODE}
 SCRIPTS_ENV+=	SETENV=${SETENV}
-SHAREMODE?=	644
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/mozilla/PLIST-ELF b/www/mozilla/PLIST-ELF
index 9a4116d500a..dc6348842f1 100644
--- a/www/mozilla/PLIST-ELF
+++ b/www/mozilla/PLIST-ELF
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST-ELF,v 1.1 2001/11/01 02:25:37 zuntum Exp $
+@comment $NetBSD: PLIST-ELF,v 1.2 2001/11/22 16:25:36 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
+lib/mozilla/dirver
 lib/mozilla/mozilla-bin
 lib/mozilla/nsinstall
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/timebombgen
+lib/mozilla/xpcshell
+lib/mozilla/xpicleanup
 lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
-lib/mozilla/xpcshell
 @comment end PROGRAMS
 @comment begin SCRIPTS
 lib/mozilla/mozilla-config
@@ -37,6 +38,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -130,6 +132,7 @@ lib/mozilla/TestGtkEmbedNotebook
 lib/mozilla/TestGtkEmbedSocket
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -196,7 +199,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
-lib/mozilla/components/mozcomps.xpt
 lib/mozilla/components/mozfind.xpt
 lib/mozilla/components/mozldap.xpt
 lib/mozilla/components/mozxfer.xpt
@@ -237,13 +239,10 @@ lib/mozilla/components/proxyObjInst.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -257,6 +256,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -302,12 +302,9 @@ lib/mozilla/defaults/wallet/SchemaConcat.tbl
 lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
-lib/mozilla/dirver
 lib/mozilla/dtd/mathml.dtd
-lib/mozilla/gtkEmbed
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -343,6 +340,7 @@ 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/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -481,8 +479,6 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
-lib/mozilla/startup-test.html
-lib/mozilla/xpicleanup
 @comment end DATA
 @comment begin INCLUDE
 include/mozilla/absyncsvc/nsABSyncDriver.h
@@ -576,9 +572,7 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
 include/mozilla/appcomps/nsIRelatedLinksHandler.h
 include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
-include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
-include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
 include/mozilla/appshell/nsICmdLineHandler.h
@@ -648,6 +642,7 @@ include/mozilla/content/nsICSSLoader.h
 include/mozilla/content/nsICSSLoaderObserver.h
 include/mozilla/content/nsICSSMediaRule.h
 include/mozilla/content/nsICSSNameSpaceRule.h
+include/mozilla/content/nsICSSOMFactory.h
 include/mozilla/content/nsICSSParser.h
 include/mozilla/content/nsICSSPseudoComparator.h
 include/mozilla/content/nsICSSRule.h
@@ -683,14 +678,13 @@ include/mozilla/content/nsIMediaList.h
 include/mozilla/content/nsINameSpace.h
 include/mozilla/content/nsINameSpaceManager.h
 include/mozilla/content/nsINodeInfo.h
+include/mozilla/content/nsIOptionElement.h
 include/mozilla/content/nsIPrivateCompositionEvent.h
 include/mozilla/content/nsIPrivateDOMEvent.h
 include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
-include/mozilla/content/nsIRuleNode.h
-include/mozilla/content/nsIRuleWalker.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -706,6 +700,7 @@ include/mozilla/content/nsIStyleSheet.h
 include/mozilla/content/nsIStyleSheetLinkingElement.h
 include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextContent.h
+include/mozilla/content/nsITextControlElement.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
 include/mozilla/content/nsIXBLDocumentInfo.h
@@ -721,10 +716,14 @@ include/mozilla/content/nsImageMapUtils.h
 include/mozilla/content/nsLayoutAtomList.h
 include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
+include/mozilla/content/nsRuleNode.h
+include/mozilla/content/nsRuleWalker.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
+include/mozilla/content/nsXBLAtomList.h
+include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
 include/mozilla/content_xsl/nsIDocumentTransformer.h
@@ -938,6 +937,8 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
+include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
 include/mozilla/dom/nsIEntropyCollector.h
 include/mozilla/dom/nsIFocusController.h
@@ -1012,6 +1013,7 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSettings.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -1051,13 +1053,14 @@ include/mozilla/htmlparser/nsITokenizer.h
 include/mozilla/htmlparser/nsParserCIID.h
 include/mozilla/htmlparser/nsParserError.h
 include/mozilla/htmlparser/nsToken.h
-include/mozilla/htmlparser/nshtmlpars.h
+include/mozilla/imglib2/ImageErrors.h
 include/mozilla/imglib2/ImageLogging.h
 include/mozilla/imglib2/imgICache.h
 include/mozilla/imglib2/imgIContainer.h
 include/mozilla/imglib2/imgIContainerObserver.h
 include/mozilla/imglib2/imgIDecoder.h
 include/mozilla/imglib2/imgIDecoderObserver.h
+include/mozilla/imglib2/imgILoad.h
 include/mozilla/imglib2/imgILoader.h
 include/mozilla/imglib2/imgIRequest.h
 include/mozilla/import/nsIImportABDescriptor.h
@@ -1070,7 +1073,6 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
-include/mozilla/intl/nsIAcceptLang.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -1154,6 +1156,14 @@ include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
+include/mozilla/layout/nsGrid.h
+include/mozilla/layout/nsGridCell.h
+include/mozilla/layout/nsGridLayout2.h
+include/mozilla/layout/nsGridRow.h
+include/mozilla/layout/nsGridRowGroupLayout.h
+include/mozilla/layout/nsGridRowLayout.h
+include/mozilla/layout/nsGridRowLeafFrame.h
+include/mozilla/layout/nsGridRowLeafLayout.h
 include/mozilla/layout/nsHTMLParts.h
 include/mozilla/layout/nsHTMLReflowMetrics.h
 include/mozilla/layout/nsHTMLReflowState.h
@@ -1181,9 +1191,11 @@ include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
 include/mozilla/layout/nsIGfxTextControlFrame.h
+include/mozilla/layout/nsIGridPart.h
 include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
+include/mozilla/layout/nsIImageControlFrame.h
 include/mozilla/layout/nsIImageFrame.h
 include/mozilla/layout/nsIIndependentSelection.h
 include/mozilla/layout/nsILayoutDebugger.h
@@ -1206,6 +1218,7 @@ include/mozilla/layout/nsIPresShell.h
 include/mozilla/layout/nsIPresState.h
 include/mozilla/layout/nsIPrintContext.h
 include/mozilla/layout/nsIPrintListener.h
+include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
@@ -1214,7 +1227,6 @@ include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
 include/mozilla/layout/nsISelectControlFrame.h
-include/mozilla/layout/nsISpaceManager.h
 include/mozilla/layout/nsIStatefulFrame.h
 include/mozilla/layout/nsIStyleContext.h
 include/mozilla/layout/nsIStyleFrameConstruction.h
@@ -1232,7 +1244,6 @@ include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
 include/mozilla/layout/nsTextTransformer.h
-include/mozilla/layout/nslayout.h
 include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
@@ -1312,8 +1323,6 @@ include/mozilla/mng/libmng_types.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
-include/mozilla/mozcomps/nsIAppShellComponent.h
-include/mozilla/mozcomps/nsIAppShellComponentImpl.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -1440,10 +1449,12 @@ include/mozilla/msgbaseutil/nsMsgUtils.h
 include/mozilla/msgbaseutil/nsNewsSummarySpec.h
 include/mozilla/msgbaseutil/nsUInt32Array.h
 include/mozilla/msgbaseutil/nsUint8Array.h
+include/mozilla/msgcompose/nsIMsgAttachment.h
 include/mozilla/msgcompose/nsIMsgCompFields.h
 include/mozilla/msgcompose/nsIMsgCompose.h
 include/mozilla/msgcompose/nsIMsgComposeParams.h
 include/mozilla/msgcompose/nsIMsgComposeProgressParams.h
+include/mozilla/msgcompose/nsIMsgComposeSecure.h
 include/mozilla/msgcompose/nsIMsgComposeService.h
 include/mozilla/msgcompose/nsIMsgDraft.h
 include/mozilla/msgcompose/nsIMsgQuote.h
@@ -1457,6 +1468,7 @@ include/mozilla/msgcompose/nsISmtpServer.h
 include/mozilla/msgcompose/nsISmtpService.h
 include/mozilla/msgcompose/nsISmtpUrl.h
 include/mozilla/msgcompose/nsIURLFetcher.h
+include/mozilla/msgcompose/nsMsgAttachment.h
 include/mozilla/msgcompose/nsMsgAttachmentHandler.h
 include/mozilla/msgcompose/nsMsgCompCID.h
 include/mozilla/msgcompose/nsMsgCompFields.h
@@ -1674,6 +1686,80 @@ include/mozilla/nkcache/nsICacheVisitor.h
 include/mozilla/npapi.h
 include/mozilla/npupp.h
 include/mozilla/nsBuildID.h
+include/mozilla/nspr/md/_aix.h
+include/mozilla/nspr/md/_aix32.cfg
+include/mozilla/nspr/md/_aix32in6.cfg
+include/mozilla/nspr/md/_aix64.cfg
+include/mozilla/nspr/md/_beos.cfg
+include/mozilla/nspr/md/_beos.h
+include/mozilla/nspr/md/_bsdi.cfg
+include/mozilla/nspr/md/_bsdi.h
+include/mozilla/nspr/md/_darwin.cfg
+include/mozilla/nspr/md/_darwin.h
+include/mozilla/nspr/md/_dgux.cfg
+include/mozilla/nspr/md/_dgux.h
+include/mozilla/nspr/md/_freebsd.cfg
+include/mozilla/nspr/md/_freebsd.h
+include/mozilla/nspr/md/_hpux.h
+include/mozilla/nspr/md/_hpux32.cfg
+include/mozilla/nspr/md/_hpux64.cfg
+include/mozilla/nspr/md/_irix.h
+include/mozilla/nspr/md/_irix32.cfg
+include/mozilla/nspr/md/_irix64.cfg
+include/mozilla/nspr/md/_linux.cfg
+include/mozilla/nspr/md/_linux.h
+include/mozilla/nspr/md/_macos.h
+include/mozilla/nspr/md/_ncr.cfg
+include/mozilla/nspr/md/_ncr.h
+include/mozilla/nspr/md/_nec.cfg
+include/mozilla/nspr/md/_nec.h
+include/mozilla/nspr/md/_netbsd.cfg
+include/mozilla/nspr/md/_netbsd.h
+include/mozilla/nspr/md/_nextstep.cfg
+include/mozilla/nspr/md/_nextstep.h
+include/mozilla/nspr/md/_nspr_pthread.h
+include/mozilla/nspr/md/_nto.cfg
+include/mozilla/nspr/md/_nto.h
+include/mozilla/nspr/md/_openbsd.cfg
+include/mozilla/nspr/md/_openbsd.h
+include/mozilla/nspr/md/_openvms.cfg
+include/mozilla/nspr/md/_openvms.h
+include/mozilla/nspr/md/_os2.cfg
+include/mozilla/nspr/md/_os2.h
+include/mozilla/nspr/md/_os2_errors.h
+include/mozilla/nspr/md/_osf1.cfg
+include/mozilla/nspr/md/_osf1.h
+include/mozilla/nspr/md/_pcos.h
+include/mozilla/nspr/md/_pth.h
+include/mozilla/nspr/md/_qnx.cfg
+include/mozilla/nspr/md/_qnx.h
+include/mozilla/nspr/md/_reliantunix.cfg
+include/mozilla/nspr/md/_reliantunix.h
+include/mozilla/nspr/md/_rhapsody.cfg
+include/mozilla/nspr/md/_rhapsody.h
+include/mozilla/nspr/md/_scoos.cfg
+include/mozilla/nspr/md/_scoos.h
+include/mozilla/nspr/md/_solaris.h
+include/mozilla/nspr/md/_solaris32.cfg
+include/mozilla/nspr/md/_solaris64.cfg
+include/mozilla/nspr/md/_sony.cfg
+include/mozilla/nspr/md/_sony.h
+include/mozilla/nspr/md/_sunos4.cfg
+include/mozilla/nspr/md/_sunos4.h
+include/mozilla/nspr/md/_unix_errors.h
+include/mozilla/nspr/md/_unixos.h
+include/mozilla/nspr/md/_unixware.cfg
+include/mozilla/nspr/md/_unixware.h
+include/mozilla/nspr/md/_unixware7.cfg
+include/mozilla/nspr/md/_win16.cfg
+include/mozilla/nspr/md/_win16.h
+include/mozilla/nspr/md/_win32_errors.h
+include/mozilla/nspr/md/_win95.cfg
+include/mozilla/nspr/md/_win95.h
+include/mozilla/nspr/md/_winnt.cfg
+include/mozilla/nspr/md/_winnt.h
+include/mozilla/nspr/md/prosdep.h
+include/mozilla/nspr/md/sunos4.h
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -1749,6 +1835,8 @@ include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
 include/mozilla/pipnss/nsIBadCertListener.h
+include/mozilla/pipnss/nsICMS.h
+include/mozilla/pipnss/nsICMSSecureMessage.h
 include/mozilla/pipnss/nsICertOutliner.h
 include/mozilla/pipnss/nsICertSelect.h
 include/mozilla/pipnss/nsIKeygenThread.h
@@ -1756,6 +1844,7 @@ include/mozilla/pipnss/nsINSSDialogs.h
 include/mozilla/pipnss/nsIPK11TokenDB.h
 include/mozilla/pipnss/nsIPKCS11Slot.h
 include/mozilla/pipnss/nsISSLStatus.h
+include/mozilla/pipnss/nsIUserCertPicker.h
 include/mozilla/pipnss/nsIX509Cert.h
 include/mozilla/pipnss/nsIX509CertDB.h
 include/mozilla/pippki/nsIASN1Outliner.h
@@ -1837,7 +1926,6 @@ include/mozilla/rdf/nsRDFCID.h
 include/mozilla/rdf/rdf.h
 include/mozilla/rdfutil/nsRDFResource.h
 include/mozilla/regviewer/nsIRegistryDataSource.h
-include/mozilla/remote/nsIRemoteBrowserControl.h
 include/mozilla/shistory/nsIHistoryEntry.h
 include/mozilla/shistory/nsISHContainer.h
 include/mozilla/shistory/nsISHEntry.h
@@ -1849,6 +1937,7 @@ include/mozilla/sidebar/nsISidebar.h
 include/mozilla/string/nsAFlatString.h
 include/mozilla/string/nsAPromiseString.h
 include/mozilla/string/nsAReadableString.h
+include/mozilla/string/nsASingleFragmentString.h
 include/mozilla/string/nsAString.h
 include/mozilla/string/nsAStringGenerator.h
 include/mozilla/string/nsAWritableString.h
@@ -1862,7 +1951,6 @@ include/mozilla/string/nsDependentSubstring.h
 include/mozilla/string/nsFragmentedString.h
 include/mozilla/string/nsLiteralString.h
 include/mozilla/string/nsPrintfCString.h
-include/mozilla/string/nsPrivateSharableString.h
 include/mozilla/string/nsPromiseFlatString.h
 include/mozilla/string/nsReadableUtils.h
 include/mozilla/string/nsSharableString.h
@@ -1929,6 +2017,7 @@ include/mozilla/unicharutil/nsIUBidiUtils.h
 include/mozilla/unicharutil/nsIUGenCategory.h
 include/mozilla/unicharutil/nsIUGenDetailCategory.h
 include/mozilla/unicharutil/nsUnicharUtilCIID.h
+include/mozilla/unicharutil/nsUnicharUtils.h
 include/mozilla/uriloader/nsCURILoader.h
 include/mozilla/uriloader/nsDocLoader.h
 include/mozilla/uriloader/nsIContentHandler.h
@@ -1944,6 +2033,7 @@ 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
 include/mozilla/view/nsIScrollableView.h
 include/mozilla/view/nsIView.h
@@ -1957,6 +2047,8 @@ include/mozilla/wallet/nsIWalletService.h
 include/mozilla/walletviewers/nsISignonViewer.h
 include/mozilla/walletviewers/nsIWalletEditor.h
 include/mozilla/walletviewers/nsIWalletPreview.h
+include/mozilla/webbrowserpersist/nsCWebBrowserPersist.h
+include/mozilla/webbrowserpersist/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsCTooltipTextProvider.h
 include/mozilla/webbrwsr/nsCWebBrowser.h
 include/mozilla/webbrwsr/nsICommandHandler.h
@@ -1968,7 +2060,6 @@ include/mozilla/webbrwsr/nsIWebBrowser.h
 include/mozilla/webbrwsr/nsIWebBrowserChrome.h
 include/mozilla/webbrwsr/nsIWebBrowserChromeFocus.h
 include/mozilla/webbrwsr/nsIWebBrowserFocus.h
-include/mozilla/webbrwsr/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsIWebBrowserPrint.h
 include/mozilla/webbrwsr/nsIWebBrowserSetup.h
 include/mozilla/webshell/nsIClipboardCommands.h
@@ -2110,13 +2201,11 @@ include/mozilla/xpcom/nsIInterfaceRequestor.h
 include/mozilla/xpcom/nsIInterfaceRequestorUtils.h
 include/mozilla/xpcom/nsILineInputStream.h
 include/mozilla/xpcom/nsILocalFile.h
-include/mozilla/xpcom/nsILoggingService.h
 include/mozilla/xpcom/nsIMemory.h
 include/mozilla/xpcom/nsIModule.h
 include/mozilla/xpcom/nsIObjectInputStream.h
 include/mozilla/xpcom/nsIObjectOutputStream.h
 include/mozilla/xpcom/nsIObserver.h
-include/mozilla/xpcom/nsIObserverList.h
 include/mozilla/xpcom/nsIObserverService.h
 include/mozilla/xpcom/nsIOutputStream.h
 include/mozilla/xpcom/nsIPersistentProperties2.h
@@ -2124,6 +2213,7 @@ include/mozilla/xpcom/nsIPipe.h
 include/mozilla/xpcom/nsIProcess.h
 include/mozilla/xpcom/nsIProgrammingLanguage.h
 include/mozilla/xpcom/nsIProperties.h
+include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
 include/mozilla/xpcom/nsIPtr.h
@@ -2134,9 +2224,10 @@ include/mozilla/xpcom/nsIScriptableInputStream.h
 include/mozilla/xpcom/nsISeekableStream.h
 include/mozilla/xpcom/nsISerializable.h
 include/mozilla/xpcom/nsIServiceManager.h
+include/mozilla/xpcom/nsIServiceManagerObsolete.h
+include/mozilla/xpcom/nsIServiceManagerUtils.h
 include/mozilla/xpcom/nsISimpleEnumerator.h
 include/mozilla/xpcom/nsISizeOfHandler.h
-include/mozilla/xpcom/nsIStopwatch.h
 include/mozilla/xpcom/nsIStorageStream.h
 include/mozilla/xpcom/nsIStreamBufferAccess.h
 include/mozilla/xpcom/nsIStringStream.h
@@ -2153,12 +2244,15 @@ include/mozilla/xpcom/nsIThreadPool.h
 include/mozilla/xpcom/nsITimelineService.h
 include/mozilla/xpcom/nsIUnicharBuffer.h
 include/mozilla/xpcom/nsIUnicharInputStream.h
+include/mozilla/xpcom/nsIVariant.h
 include/mozilla/xpcom/nsIWeakReference.h
+include/mozilla/xpcom/nsIWeakReferenceUtils.h
 include/mozilla/xpcom/nsInt64.h
 include/mozilla/xpcom/nsLinebreakConverter.h
 include/mozilla/xpcom/nsLocalFile.h
 include/mozilla/xpcom/nsLocalFileUnix.h
 include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsObserverService.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
@@ -2176,14 +2270,15 @@ include/mozilla/xpcom/nsTextFormatter.h
 include/mozilla/xpcom/nsTime.h
 include/mozilla/xpcom/nsTraceRefcnt.h
 include/mozilla/xpcom/nsUnitConversion.h
+include/mozilla/xpcom/nsVariant.h
 include/mozilla/xpcom/nsVector.h
 include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsVoidBTree.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
+include/mozilla/xpcom/nsXPCOM.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
-include/mozilla/xpcom/nslog.h
 include/mozilla/xpcom/nsrootidl.h
 include/mozilla/xpcom/pldhash.h
 include/mozilla/xpcom/plevent.h
@@ -2294,6 +2389,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/widget
 @dirrm include/mozilla/webshell
 @dirrm include/mozilla/webbrwsr
+@dirrm include/mozilla/webbrowserpersist
 @dirrm include/mozilla/walletviewers
 @dirrm include/mozilla/wallet
 @dirrm include/mozilla/view
@@ -2316,7 +2412,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/string
 @dirrm include/mozilla/sidebar
 @dirrm include/mozilla/shistory
-@dirrm include/mozilla/remote
 @dirrm include/mozilla/regviewer
 @dirrm include/mozilla/rdfutil
 @dirrm include/mozilla/rdf
@@ -2329,6 +2424,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
+@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
@@ -2343,7 +2439,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/mpfilelocprovider
 @dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
-@dirrm include/mozilla/mozcomps
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mng
 @dirrm include/mozilla/mimetype
diff --git a/www/mozilla/PLIST-a.out b/www/mozilla/PLIST-a.out
index 014f7e93a1b..025b269c8a5 100644
--- a/www/mozilla/PLIST-a.out
+++ b/www/mozilla/PLIST-a.out
@@ -1,16 +1,17 @@
-@comment $NetBSD: PLIST-a.out,v 1.1 2001/11/01 02:25:37 zuntum Exp $
+@comment $NetBSD: PLIST-a.out,v 1.2 2001/11/22 16:25:36 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
+lib/mozilla/dirver
 lib/mozilla/mozilla-bin
 lib/mozilla/nsinstall
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/timebombgen
+lib/mozilla/xpcshell
+lib/mozilla/xpicleanup
 lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
-lib/mozilla/xpcshell
 @comment end PROGRAMS
 @comment begin SCRIPTS
 lib/mozilla/mozilla-config
@@ -37,6 +38,7 @@ lib/mozilla/components/libgklayout.so.1.0
 lib/mozilla/components/libgkplugin.so.1.0
 lib/mozilla/components/libgkview.so.1.0
 lib/mozilla/components/libhtmlpars.so.1.0
+lib/mozilla/components/libimgbmp.so.1.0
 lib/mozilla/components/libimggif.so.1.0
 lib/mozilla/components/libimgjpeg.so.1.0
 lib/mozilla/components/libimglib2.so.1.0
@@ -130,6 +132,7 @@ lib/mozilla/TestGtkEmbedNotebook
 lib/mozilla/TestGtkEmbedSocket
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -196,7 +199,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
-lib/mozilla/components/mozcomps.xpt
 lib/mozilla/components/mozfind.xpt
 lib/mozilla/components/mozldap.xpt
 lib/mozilla/components/mozxfer.xpt
@@ -237,13 +239,10 @@ lib/mozilla/components/proxyObjInst.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -257,6 +256,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -302,12 +302,9 @@ lib/mozilla/defaults/wallet/SchemaConcat.tbl
 lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
-lib/mozilla/dirver
 lib/mozilla/dtd/mathml.dtd
-lib/mozilla/gtkEmbed
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -343,6 +340,7 @@ 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/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -481,8 +479,6 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
-lib/mozilla/startup-test.html
-lib/mozilla/xpicleanup
 @comment end DATA
 @comment begin INCLUDE
 include/mozilla/absyncsvc/nsABSyncDriver.h
@@ -576,9 +572,7 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
 include/mozilla/appcomps/nsIRelatedLinksHandler.h
 include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
-include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
-include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
 include/mozilla/appshell/nsICmdLineHandler.h
@@ -648,6 +642,7 @@ include/mozilla/content/nsICSSLoader.h
 include/mozilla/content/nsICSSLoaderObserver.h
 include/mozilla/content/nsICSSMediaRule.h
 include/mozilla/content/nsICSSNameSpaceRule.h
+include/mozilla/content/nsICSSOMFactory.h
 include/mozilla/content/nsICSSParser.h
 include/mozilla/content/nsICSSPseudoComparator.h
 include/mozilla/content/nsICSSRule.h
@@ -683,14 +678,13 @@ include/mozilla/content/nsIMediaList.h
 include/mozilla/content/nsINameSpace.h
 include/mozilla/content/nsINameSpaceManager.h
 include/mozilla/content/nsINodeInfo.h
+include/mozilla/content/nsIOptionElement.h
 include/mozilla/content/nsIPrivateCompositionEvent.h
 include/mozilla/content/nsIPrivateDOMEvent.h
 include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
-include/mozilla/content/nsIRuleNode.h
-include/mozilla/content/nsIRuleWalker.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -706,6 +700,7 @@ include/mozilla/content/nsIStyleSheet.h
 include/mozilla/content/nsIStyleSheetLinkingElement.h
 include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextContent.h
+include/mozilla/content/nsITextControlElement.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
 include/mozilla/content/nsIXBLDocumentInfo.h
@@ -721,10 +716,14 @@ include/mozilla/content/nsImageMapUtils.h
 include/mozilla/content/nsLayoutAtomList.h
 include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
+include/mozilla/content/nsRuleNode.h
+include/mozilla/content/nsRuleWalker.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
+include/mozilla/content/nsXBLAtomList.h
+include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
 include/mozilla/content_xsl/nsIDocumentTransformer.h
@@ -938,6 +937,8 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
+include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
 include/mozilla/dom/nsIEntropyCollector.h
 include/mozilla/dom/nsIFocusController.h
@@ -1012,6 +1013,7 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSettings.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -1051,13 +1053,14 @@ include/mozilla/htmlparser/nsITokenizer.h
 include/mozilla/htmlparser/nsParserCIID.h
 include/mozilla/htmlparser/nsParserError.h
 include/mozilla/htmlparser/nsToken.h
-include/mozilla/htmlparser/nshtmlpars.h
+include/mozilla/imglib2/ImageErrors.h
 include/mozilla/imglib2/ImageLogging.h
 include/mozilla/imglib2/imgICache.h
 include/mozilla/imglib2/imgIContainer.h
 include/mozilla/imglib2/imgIContainerObserver.h
 include/mozilla/imglib2/imgIDecoder.h
 include/mozilla/imglib2/imgIDecoderObserver.h
+include/mozilla/imglib2/imgILoad.h
 include/mozilla/imglib2/imgILoader.h
 include/mozilla/imglib2/imgIRequest.h
 include/mozilla/import/nsIImportABDescriptor.h
@@ -1070,7 +1073,6 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
-include/mozilla/intl/nsIAcceptLang.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -1154,6 +1156,14 @@ include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
+include/mozilla/layout/nsGrid.h
+include/mozilla/layout/nsGridCell.h
+include/mozilla/layout/nsGridLayout2.h
+include/mozilla/layout/nsGridRow.h
+include/mozilla/layout/nsGridRowGroupLayout.h
+include/mozilla/layout/nsGridRowLayout.h
+include/mozilla/layout/nsGridRowLeafFrame.h
+include/mozilla/layout/nsGridRowLeafLayout.h
 include/mozilla/layout/nsHTMLParts.h
 include/mozilla/layout/nsHTMLReflowMetrics.h
 include/mozilla/layout/nsHTMLReflowState.h
@@ -1181,9 +1191,11 @@ include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
 include/mozilla/layout/nsIGfxTextControlFrame.h
+include/mozilla/layout/nsIGridPart.h
 include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
+include/mozilla/layout/nsIImageControlFrame.h
 include/mozilla/layout/nsIImageFrame.h
 include/mozilla/layout/nsIIndependentSelection.h
 include/mozilla/layout/nsILayoutDebugger.h
@@ -1206,6 +1218,7 @@ include/mozilla/layout/nsIPresShell.h
 include/mozilla/layout/nsIPresState.h
 include/mozilla/layout/nsIPrintContext.h
 include/mozilla/layout/nsIPrintListener.h
+include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
@@ -1214,7 +1227,6 @@ include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
 include/mozilla/layout/nsISelectControlFrame.h
-include/mozilla/layout/nsISpaceManager.h
 include/mozilla/layout/nsIStatefulFrame.h
 include/mozilla/layout/nsIStyleContext.h
 include/mozilla/layout/nsIStyleFrameConstruction.h
@@ -1232,7 +1244,6 @@ include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
 include/mozilla/layout/nsTextTransformer.h
-include/mozilla/layout/nslayout.h
 include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
@@ -1312,8 +1323,6 @@ include/mozilla/mng/libmng_types.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
-include/mozilla/mozcomps/nsIAppShellComponent.h
-include/mozilla/mozcomps/nsIAppShellComponentImpl.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -1440,10 +1449,12 @@ include/mozilla/msgbaseutil/nsMsgUtils.h
 include/mozilla/msgbaseutil/nsNewsSummarySpec.h
 include/mozilla/msgbaseutil/nsUInt32Array.h
 include/mozilla/msgbaseutil/nsUint8Array.h
+include/mozilla/msgcompose/nsIMsgAttachment.h
 include/mozilla/msgcompose/nsIMsgCompFields.h
 include/mozilla/msgcompose/nsIMsgCompose.h
 include/mozilla/msgcompose/nsIMsgComposeParams.h
 include/mozilla/msgcompose/nsIMsgComposeProgressParams.h
+include/mozilla/msgcompose/nsIMsgComposeSecure.h
 include/mozilla/msgcompose/nsIMsgComposeService.h
 include/mozilla/msgcompose/nsIMsgDraft.h
 include/mozilla/msgcompose/nsIMsgQuote.h
@@ -1457,6 +1468,7 @@ include/mozilla/msgcompose/nsISmtpServer.h
 include/mozilla/msgcompose/nsISmtpService.h
 include/mozilla/msgcompose/nsISmtpUrl.h
 include/mozilla/msgcompose/nsIURLFetcher.h
+include/mozilla/msgcompose/nsMsgAttachment.h
 include/mozilla/msgcompose/nsMsgAttachmentHandler.h
 include/mozilla/msgcompose/nsMsgCompCID.h
 include/mozilla/msgcompose/nsMsgCompFields.h
@@ -1674,6 +1686,80 @@ include/mozilla/nkcache/nsICacheVisitor.h
 include/mozilla/npapi.h
 include/mozilla/npupp.h
 include/mozilla/nsBuildID.h
+include/mozilla/nspr/md/_aix.h
+include/mozilla/nspr/md/_aix32.cfg
+include/mozilla/nspr/md/_aix32in6.cfg
+include/mozilla/nspr/md/_aix64.cfg
+include/mozilla/nspr/md/_beos.cfg
+include/mozilla/nspr/md/_beos.h
+include/mozilla/nspr/md/_bsdi.cfg
+include/mozilla/nspr/md/_bsdi.h
+include/mozilla/nspr/md/_darwin.cfg
+include/mozilla/nspr/md/_darwin.h
+include/mozilla/nspr/md/_dgux.cfg
+include/mozilla/nspr/md/_dgux.h
+include/mozilla/nspr/md/_freebsd.cfg
+include/mozilla/nspr/md/_freebsd.h
+include/mozilla/nspr/md/_hpux.h
+include/mozilla/nspr/md/_hpux32.cfg
+include/mozilla/nspr/md/_hpux64.cfg
+include/mozilla/nspr/md/_irix.h
+include/mozilla/nspr/md/_irix32.cfg
+include/mozilla/nspr/md/_irix64.cfg
+include/mozilla/nspr/md/_linux.cfg
+include/mozilla/nspr/md/_linux.h
+include/mozilla/nspr/md/_macos.h
+include/mozilla/nspr/md/_ncr.cfg
+include/mozilla/nspr/md/_ncr.h
+include/mozilla/nspr/md/_nec.cfg
+include/mozilla/nspr/md/_nec.h
+include/mozilla/nspr/md/_netbsd.cfg
+include/mozilla/nspr/md/_netbsd.h
+include/mozilla/nspr/md/_nextstep.cfg
+include/mozilla/nspr/md/_nextstep.h
+include/mozilla/nspr/md/_nspr_pthread.h
+include/mozilla/nspr/md/_nto.cfg
+include/mozilla/nspr/md/_nto.h
+include/mozilla/nspr/md/_openbsd.cfg
+include/mozilla/nspr/md/_openbsd.h
+include/mozilla/nspr/md/_openvms.cfg
+include/mozilla/nspr/md/_openvms.h
+include/mozilla/nspr/md/_os2.cfg
+include/mozilla/nspr/md/_os2.h
+include/mozilla/nspr/md/_os2_errors.h
+include/mozilla/nspr/md/_osf1.cfg
+include/mozilla/nspr/md/_osf1.h
+include/mozilla/nspr/md/_pcos.h
+include/mozilla/nspr/md/_pth.h
+include/mozilla/nspr/md/_qnx.cfg
+include/mozilla/nspr/md/_qnx.h
+include/mozilla/nspr/md/_reliantunix.cfg
+include/mozilla/nspr/md/_reliantunix.h
+include/mozilla/nspr/md/_rhapsody.cfg
+include/mozilla/nspr/md/_rhapsody.h
+include/mozilla/nspr/md/_scoos.cfg
+include/mozilla/nspr/md/_scoos.h
+include/mozilla/nspr/md/_solaris.h
+include/mozilla/nspr/md/_solaris32.cfg
+include/mozilla/nspr/md/_solaris64.cfg
+include/mozilla/nspr/md/_sony.cfg
+include/mozilla/nspr/md/_sony.h
+include/mozilla/nspr/md/_sunos4.cfg
+include/mozilla/nspr/md/_sunos4.h
+include/mozilla/nspr/md/_unix_errors.h
+include/mozilla/nspr/md/_unixos.h
+include/mozilla/nspr/md/_unixware.cfg
+include/mozilla/nspr/md/_unixware.h
+include/mozilla/nspr/md/_unixware7.cfg
+include/mozilla/nspr/md/_win16.cfg
+include/mozilla/nspr/md/_win16.h
+include/mozilla/nspr/md/_win32_errors.h
+include/mozilla/nspr/md/_win95.cfg
+include/mozilla/nspr/md/_win95.h
+include/mozilla/nspr/md/_winnt.cfg
+include/mozilla/nspr/md/_winnt.h
+include/mozilla/nspr/md/prosdep.h
+include/mozilla/nspr/md/sunos4.h
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -1749,6 +1835,8 @@ include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
 include/mozilla/pipnss/nsIBadCertListener.h
+include/mozilla/pipnss/nsICMS.h
+include/mozilla/pipnss/nsICMSSecureMessage.h
 include/mozilla/pipnss/nsICertOutliner.h
 include/mozilla/pipnss/nsICertSelect.h
 include/mozilla/pipnss/nsIKeygenThread.h
@@ -1756,6 +1844,7 @@ include/mozilla/pipnss/nsINSSDialogs.h
 include/mozilla/pipnss/nsIPK11TokenDB.h
 include/mozilla/pipnss/nsIPKCS11Slot.h
 include/mozilla/pipnss/nsISSLStatus.h
+include/mozilla/pipnss/nsIUserCertPicker.h
 include/mozilla/pipnss/nsIX509Cert.h
 include/mozilla/pipnss/nsIX509CertDB.h
 include/mozilla/pippki/nsIASN1Outliner.h
@@ -1837,7 +1926,6 @@ include/mozilla/rdf/nsRDFCID.h
 include/mozilla/rdf/rdf.h
 include/mozilla/rdfutil/nsRDFResource.h
 include/mozilla/regviewer/nsIRegistryDataSource.h
-include/mozilla/remote/nsIRemoteBrowserControl.h
 include/mozilla/shistory/nsIHistoryEntry.h
 include/mozilla/shistory/nsISHContainer.h
 include/mozilla/shistory/nsISHEntry.h
@@ -1849,6 +1937,7 @@ include/mozilla/sidebar/nsISidebar.h
 include/mozilla/string/nsAFlatString.h
 include/mozilla/string/nsAPromiseString.h
 include/mozilla/string/nsAReadableString.h
+include/mozilla/string/nsASingleFragmentString.h
 include/mozilla/string/nsAString.h
 include/mozilla/string/nsAStringGenerator.h
 include/mozilla/string/nsAWritableString.h
@@ -1862,7 +1951,6 @@ include/mozilla/string/nsDependentSubstring.h
 include/mozilla/string/nsFragmentedString.h
 include/mozilla/string/nsLiteralString.h
 include/mozilla/string/nsPrintfCString.h
-include/mozilla/string/nsPrivateSharableString.h
 include/mozilla/string/nsPromiseFlatString.h
 include/mozilla/string/nsReadableUtils.h
 include/mozilla/string/nsSharableString.h
@@ -1929,6 +2017,7 @@ include/mozilla/unicharutil/nsIUBidiUtils.h
 include/mozilla/unicharutil/nsIUGenCategory.h
 include/mozilla/unicharutil/nsIUGenDetailCategory.h
 include/mozilla/unicharutil/nsUnicharUtilCIID.h
+include/mozilla/unicharutil/nsUnicharUtils.h
 include/mozilla/uriloader/nsCURILoader.h
 include/mozilla/uriloader/nsDocLoader.h
 include/mozilla/uriloader/nsIContentHandler.h
@@ -1944,6 +2033,7 @@ 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
 include/mozilla/view/nsIScrollableView.h
 include/mozilla/view/nsIView.h
@@ -1957,6 +2047,8 @@ include/mozilla/wallet/nsIWalletService.h
 include/mozilla/walletviewers/nsISignonViewer.h
 include/mozilla/walletviewers/nsIWalletEditor.h
 include/mozilla/walletviewers/nsIWalletPreview.h
+include/mozilla/webbrowserpersist/nsCWebBrowserPersist.h
+include/mozilla/webbrowserpersist/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsCTooltipTextProvider.h
 include/mozilla/webbrwsr/nsCWebBrowser.h
 include/mozilla/webbrwsr/nsICommandHandler.h
@@ -1968,7 +2060,6 @@ include/mozilla/webbrwsr/nsIWebBrowser.h
 include/mozilla/webbrwsr/nsIWebBrowserChrome.h
 include/mozilla/webbrwsr/nsIWebBrowserChromeFocus.h
 include/mozilla/webbrwsr/nsIWebBrowserFocus.h
-include/mozilla/webbrwsr/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsIWebBrowserPrint.h
 include/mozilla/webbrwsr/nsIWebBrowserSetup.h
 include/mozilla/webshell/nsIClipboardCommands.h
@@ -2110,13 +2201,11 @@ include/mozilla/xpcom/nsIInterfaceRequestor.h
 include/mozilla/xpcom/nsIInterfaceRequestorUtils.h
 include/mozilla/xpcom/nsILineInputStream.h
 include/mozilla/xpcom/nsILocalFile.h
-include/mozilla/xpcom/nsILoggingService.h
 include/mozilla/xpcom/nsIMemory.h
 include/mozilla/xpcom/nsIModule.h
 include/mozilla/xpcom/nsIObjectInputStream.h
 include/mozilla/xpcom/nsIObjectOutputStream.h
 include/mozilla/xpcom/nsIObserver.h
-include/mozilla/xpcom/nsIObserverList.h
 include/mozilla/xpcom/nsIObserverService.h
 include/mozilla/xpcom/nsIOutputStream.h
 include/mozilla/xpcom/nsIPersistentProperties2.h
@@ -2124,6 +2213,7 @@ include/mozilla/xpcom/nsIPipe.h
 include/mozilla/xpcom/nsIProcess.h
 include/mozilla/xpcom/nsIProgrammingLanguage.h
 include/mozilla/xpcom/nsIProperties.h
+include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
 include/mozilla/xpcom/nsIPtr.h
@@ -2134,9 +2224,10 @@ include/mozilla/xpcom/nsIScriptableInputStream.h
 include/mozilla/xpcom/nsISeekableStream.h
 include/mozilla/xpcom/nsISerializable.h
 include/mozilla/xpcom/nsIServiceManager.h
+include/mozilla/xpcom/nsIServiceManagerObsolete.h
+include/mozilla/xpcom/nsIServiceManagerUtils.h
 include/mozilla/xpcom/nsISimpleEnumerator.h
 include/mozilla/xpcom/nsISizeOfHandler.h
-include/mozilla/xpcom/nsIStopwatch.h
 include/mozilla/xpcom/nsIStorageStream.h
 include/mozilla/xpcom/nsIStreamBufferAccess.h
 include/mozilla/xpcom/nsIStringStream.h
@@ -2153,12 +2244,15 @@ include/mozilla/xpcom/nsIThreadPool.h
 include/mozilla/xpcom/nsITimelineService.h
 include/mozilla/xpcom/nsIUnicharBuffer.h
 include/mozilla/xpcom/nsIUnicharInputStream.h
+include/mozilla/xpcom/nsIVariant.h
 include/mozilla/xpcom/nsIWeakReference.h
+include/mozilla/xpcom/nsIWeakReferenceUtils.h
 include/mozilla/xpcom/nsInt64.h
 include/mozilla/xpcom/nsLinebreakConverter.h
 include/mozilla/xpcom/nsLocalFile.h
 include/mozilla/xpcom/nsLocalFileUnix.h
 include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsObserverService.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
@@ -2176,14 +2270,15 @@ include/mozilla/xpcom/nsTextFormatter.h
 include/mozilla/xpcom/nsTime.h
 include/mozilla/xpcom/nsTraceRefcnt.h
 include/mozilla/xpcom/nsUnitConversion.h
+include/mozilla/xpcom/nsVariant.h
 include/mozilla/xpcom/nsVector.h
 include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsVoidBTree.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
+include/mozilla/xpcom/nsXPCOM.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
-include/mozilla/xpcom/nslog.h
 include/mozilla/xpcom/nsrootidl.h
 include/mozilla/xpcom/pldhash.h
 include/mozilla/xpcom/plevent.h
@@ -2294,6 +2389,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/widget
 @dirrm include/mozilla/webshell
 @dirrm include/mozilla/webbrwsr
+@dirrm include/mozilla/webbrowserpersist
 @dirrm include/mozilla/walletviewers
 @dirrm include/mozilla/wallet
 @dirrm include/mozilla/view
@@ -2316,7 +2412,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/string
 @dirrm include/mozilla/sidebar
 @dirrm include/mozilla/shistory
-@dirrm include/mozilla/remote
 @dirrm include/mozilla/regviewer
 @dirrm include/mozilla/rdfutil
 @dirrm include/mozilla/rdf
@@ -2329,6 +2424,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
+@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
@@ -2343,7 +2439,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/mpfilelocprovider
 @dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
-@dirrm include/mozilla/mozcomps
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mng
 @dirrm include/mozilla/mimetype
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 175f19c7831..6d6755262b6 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.11 2001/10/26 15:27:56 taya Exp $
+$NetBSD: distinfo,v 1.12 2001/11/22 16:25:37 taya Exp $
 
-SHA1 (mozilla-source-0.9.5.tar.bz2) = c733e03e5b8fc9fe9b192461667c705b05a7d48a
-Size (mozilla-source-0.9.5.tar.bz2) = 26903227 bytes
-SHA1 (patch-au) = eddbcb219cc1d005dfb3cbcca3b367056b1ba204
-SHA1 (patch-aw) = e36c6ef68e6bede3313ce7139691a1b48fe95d7a
-SHA1 (patch-ax) = 5ed187233de5a0ce97beb89b18e6759f62d94b2a
-SHA1 (patch-ay) = da096ab6bbd723210bcca63d95f58a77945172ad
-SHA1 (patch-az) = 4988a1565afc4650e191ecfc94773b133152654d
-SHA1 (patch-ba) = c3acb53bbe934ca6f5e6984d9714897e08a578a5
-SHA1 (patch-bb) = 6a296dc2356be031a7f1b7da1b3b0fae78ab73c6
-SHA1 (patch-bc) = 641f631ff52dccf8640b0b6a3ca25e54bbd1a595
-SHA1 (patch-bd) = 1005fb1bbe8f9b773dedd05e2a69d6deb09b3135
-SHA1 (patch-be) = 99660354cd6dd3eecf235625cf047f0d5bba1b0c
+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
diff --git a/www/mozilla/patches/patch-au b/www/mozilla/patches/patch-au
deleted file mode 100644
index a0e75a1f146..00000000000
--- a/www/mozilla/patches/patch-au
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-au,v 1.6 2001/10/16 15:52:09 taya Exp $
-
-diff -ru ../Orig/mozilla/security/coreconf/NetBSD.mk ./security/coreconf/NetBSD.mk
---- ../Orig/mozilla/security/coreconf/NetBSD.mk	Sat Sep 30 02:42:36 2000
-+++ ./security/coreconf/NetBSD.mk	Sat Oct 13 19:56:43 2001
-@@ -40,8 +40,13 @@
- CCC			= g++
- RANLIB			= ranlib
- 
-+ifeq ($(OS_TEST),i386)
-+CPU_ARCH		:= x86
- OS_REL_CFLAGS		= -Di386
--CPU_ARCH		= x86
-+else
-+CPU_ARCH		:= $(shell uname -p)
-+OS_REL_CFLAGS		= -D$(CPU_ARCH)
-+endif
- 
- ifndef OBJECT_FMT
- OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
diff --git a/www/mozilla/patches/patch-aw b/www/mozilla/patches/patch-aw
index 09d6f49282d..808e2acf964 100644
--- a/www/mozilla/patches/patch-aw
+++ b/www/mozilla/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.5 2001/10/16 15:52:09 taya Exp $
+$NetBSD: patch-aw,v 1.6 2001/11/22 16:25:37 taya Exp $
 
 diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	Sun Apr 29 04:46:11 2001
-+++ ./widget/src/gtksuperwin/Makefile.in	Sat Oct 13 19:56:53 2001
+--- ../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
 @@ -25,6 +25,7 @@
  MODULE		= widget
  LIBRARY_NAME	= gtksuperwin
diff --git a/www/mozilla/patches/patch-ax b/www/mozilla/patches/patch-ax
index f9f867e7173..f34655fc24e 100644
--- a/www/mozilla/patches/patch-ax
+++ b/www/mozilla/patches/patch-ax
@@ -1,9 +1,9 @@
-$NetBSD: patch-ax,v 1.4 2001/10/16 15:52:09 taya Exp $
+$NetBSD: patch-ax,v 1.5 2001/11/22 16:25:37 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/src/nsSocketTransport.cpp
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Sat Sep 29 17:27:36 2001
-+++ ./netwerk/base/src/nsSocketTransport.cpp	Sat Oct 13 19:56:58 2001
-@@ -187,8 +187,7 @@
+--- ../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 @@
      //
      // 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...
-@@ -237,6 +236,13 @@
+@@ -238,6 +237,13 @@
          nsAutoMonitor::DestroyMonitor(mMonitor);
          mMonitor = nsnull;
      }
@@ -27,7 +27,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
  }
  
  
-@@ -641,15 +647,7 @@
+@@ -642,15 +648,7 @@
      //
      // The hostname has not been resolved yet...
      //
@@ -44,7 +44,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
          nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
          if (NS_FAILED(rv)) return rv;
  
-@@ -672,7 +670,7 @@
+@@ -673,7 +671,7 @@
              //
              // The DNS lookup has finished...  It has either failed or succeeded.
              //
@@ -53,7 +53,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
                  mDNSRequest = 0;
                  rv = mStatus;
              } 
-@@ -832,7 +830,8 @@
+@@ -833,7 +831,8 @@
          //    This is only done the first time doConnection(...) is called.
          //
          if (NS_SUCCEEDED(rv)) {
@@ -63,7 +63,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
              if (PR_SUCCESS != status) {
                  PRErrorCode code = PR_GetError();
                  //
-@@ -857,6 +856,12 @@
+@@ -858,6 +857,12 @@
                  //
                  else {
                      // Connection refused...
@@ -76,7 +76,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
                      LOG(("nsSocketTransport: Connection Refused [%s:%d %x].  PRErrorCode = %x\n",
                          mHostName, mPort, this, code));
                      rv = NS_ERROR_CONNECTION_REFUSED;
-@@ -870,11 +875,23 @@
+@@ -871,11 +876,23 @@
      //
      else if (aSelectFlags) {
          if (PR_POLL_EXCEPT & aSelectFlags) {
@@ -100,7 +100,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
              LOG(("nsSocketTransport: Connection Refused via PR_POLL_HUP. [%s:%d %x].\n", 
                  mHostName, mPort, this));
              rv = NS_ERROR_CONNECTION_REFUSED;
-@@ -917,7 +934,7 @@
+@@ -918,7 +935,7 @@
      //
      // The hostname has not been resolved yet...
      //
@@ -109,7 +109,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
          nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
          if (NS_FAILED(rv)) return rv;
  
-@@ -936,16 +953,18 @@
+@@ -937,16 +954,18 @@
              return NS_ERROR_FAILURE;
          }
  
@@ -132,7 +132,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      }
  
      //
-@@ -1410,21 +1429,27 @@
+@@ -1411,21 +1430,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...
-@@ -1457,7 +1482,7 @@
+@@ -1458,7 +1483,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...
-@@ -1778,7 +1803,7 @@
+@@ -1779,7 +1804,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 a8253661642..91824e53b8a 100644
--- a/www/mozilla/patches/patch-ay
+++ b/www/mozilla/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.4 2001/10/16 15:52:09 taya Exp $
+$NetBSD: patch-ay,v 1.5 2001/11/22 16:25:37 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src/nsSocketTransport.h
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h	Sat Sep 29 05:09:03 2001
-+++ ./netwerk/base/src/nsSocketTransport.h	Sat Oct 13 19:56:59 2001
+--- ../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
 @@ -123,6 +123,11 @@
    eSocketDNS_Wait             = 0x2020
  };
diff --git a/www/mozilla/patches/patch-az b/www/mozilla/patches/patch-az
index 354dde0057e..89c2d1b1775 100644
--- a/www/mozilla/patches/patch-az
+++ b/www/mozilla/patches/patch-az
@@ -1,14 +1,14 @@
-$NetBSD: patch-az,v 1.3 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-az,v 1.4 2001/11/22 16:25:37 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	Wed Aug 15 16:14:54 2001
-+++ ./directory/c-sdk/ldap/include/portable.h	Sat Oct 13 19:57:01 2001
+--- ../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
 @@ -98,7 +98,7 @@
   * some systems don't have the BSD re_comp and re_exec routines
   */
  #ifndef NEED_BSDREGEX
--#if ( defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux )) && !defined(sgi)
-+#if ( defined( SYSV ) || defined( VMS ) || defined( NETBSD ) || defined( freebsd ) || defined( linux )) && !defined(sgi)
+-#if ( defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( VMS ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
  #define NEED_BSDREGEX
  #endif
  #endif
diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba
index d2c420c07e6..e51e0ff6b59 100644
--- a/www/mozilla/patches/patch-ba
+++ b/www/mozilla/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-ba,v 1.3 2001/11/22 16:25:37 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	Sat Oct 13 19:57:09 2001
++++ ./nsprpub/pr/include/md/_netbsd.cfg	Thu Nov 22 12:31:06 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 42b8fa3df3d..55710fccde8 100644
--- a/www/mozilla/patches/patch-bb
+++ b/www/mozilla/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-bb,v 1.3 2001/11/22 16:25:37 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	Sat Oct 13 19:57:11 2001
++++ ./nsprpub/pr/include/md/_netbsd.h	Thu Nov 22 12:31:08 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 2900d79e20d..ff3d1046e92 100644
--- a/www/mozilla/patches/patch-bc
+++ b/www/mozilla/patches/patch-bc
@@ -1,9 +1,9 @@
-$NetBSD: patch-bc,v 1.2 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-bc,v 1.3 2001/11/22 16:25:37 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	Thu Sep  6 17:23:09 2001
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Oct 13 19:57:23 2001
-@@ -235,6 +235,13 @@
+--- ../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 @@
  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-bd b/www/mozilla/patches/patch-bd
deleted file mode 100644
index 06bfaf67d62..00000000000
--- a/www/mozilla/patches/patch-bd
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2001/10/16 15:52:10 taya Exp $
-
-diff -ru ../Orig/mozilla/netwerk/base/public/nsNetUtil.h ./netwerk/base/public/nsNetUtil.h
---- ../Orig/mozilla/netwerk/base/public/nsNetUtil.h	Sat Sep 29 05:08:56 2001
-+++ ./netwerk/base/public/nsNetUtil.h	Sat Oct 13 20:33:47 2001
-@@ -604,8 +604,8 @@
-                         PRUint32 aOffset=0,
-                         PRUint32 aCount=0,
-                         PRUint32 aFlags=0,
--                        nsIRequestObserver *aObserver=NULL,
--                        nsISupports *aContext=NULL)
-+                        nsIRequestObserver *aObserver=(nsIRequestObserver *)NULL,
-+                        nsISupports *aContext=(nsISupports *)NULL)
- {
-     NS_ENSURE_ARG_POINTER(aTransport);
- 
-@@ -646,8 +646,8 @@
-                      PRUint32 aOffset=0,
-                      PRUint32 aCount=0,
-                      PRUint32 aFlags=0,
--                     nsIRequestObserver *aObserver=NULL,
--                     nsISupports *aContext=NULL)
-+                     nsIRequestObserver *aObserver=(nsIRequestObserver *)NULL,
-+                     nsISupports *aContext=(nsISupports *)NULL)
- {
-     NS_ENSURE_ARG_POINTER(aTransport);
- 
diff --git a/www/mozilla/patches/patch-be b/www/mozilla/patches/patch-be
index 20e7c2c520f..9ec4094794a 100644
--- a/www/mozilla/patches/patch-be
+++ b/www/mozilla/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1 2001/10/26 15:27:57 taya Exp $
+$NetBSD: patch-be,v 1.2 2001/11/22 16:25:37 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 Oct 25 21:41:45 2001
++++ ./nsprpub/pr/src/io/prsocket.c	Thu Nov 22 12:31:25 2001
 @@ -1300,6 +1300,15 @@
  	if (osfd == -1) {
  		return 0;