update mozilla-stable to 1.7.3

stable branch of mozilla was switched to 1.7-branch mostly copied from www/mozilla
author: taya <taya@pkgsrc.org> 2004-12-04 03:50:40 +0000
committer: taya <taya@pkgsrc.org> 2004-12-04 03:50:40 +0000
commit: 0f3646bf32eed38e8dc03a254ce3e886bc7ae3f6 (patch)
tree: 208c9ae50a1c5177a22a788057f8b7698a4a895c /www/mozilla-stable
parent: f327694b73e5d2317326c4f7372a96cf53f819d8 (diff)
download: pkgsrc-0f3646bf32eed38e8dc03a254ce3e886bc7ae3f6.tar.gz
46 files changed, 1718 insertions, 408 deletions
diff --git a/www/mozilla-stable/Makefile b/www/mozilla-stable/Makefile
index a8c67e2c83f..7aefdc38866 100644
--- a/www/mozilla-stable/Makefile
+++ b/www/mozilla-stable/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2004/11/13 22:04:54 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/12/04 03:50:40 taya Exp $
 
-PKGREVISION=	5
 MOZILLA=	mozilla-stable
 MOZILLA_BIN=	mozilla-bin
-DISTNAME=	mozilla-${MOZ_DIST_VER}
-MOZ_VER=	1.4.1
+MOZ_VER=	1.7.3
 EXTRACT_SUFX=	.tar.bz2
 
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	mozilla-source-1.4.1-libart_lgpl.tar.bz2
-
-SITES_mozilla-source-1.4.1-libart_lgpl.tar.bz2=	${MASTER_SITE_LOCAL}
+DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=     mozilla-source-1.7.3-libart_lgpl.tar.bz2
+SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
 
 COMMENT=	Full featured gecko-based browser (stable branch)
 
diff --git a/www/mozilla-stable/PLIST b/www/mozilla-stable/PLIST
index 38be409133c..d637c7be66a 100644
--- a/www/mozilla-stable/PLIST
+++ b/www/mozilla-stable/PLIST
@@ -1,16 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/20 19:29:38 snj Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/12/04 03:50:40 taya Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
 lib/${MOZILLA}/dirver
 lib/${MOZILLA}/mangle
+lib/${MOZILLA}/mozilla-ipcd
 lib/${MOZILLA}/mozilla-xremote-client
-lib/${MOZILLA}/mozipcd
 lib/${MOZILLA}/nsinstall
 lib/${MOZILLA}/regchrome
 lib/${MOZILLA}/regxpcom
 lib/${MOZILLA}/shlibsign
-lib/${MOZILLA}/timebombgen
 lib/${MOZILLA}/xpcshell
 lib/${MOZILLA}/xpicleanup
 lib/${MOZILLA}/xpidl
@@ -42,7 +41,6 @@ lib/${MOZILLA}/components/libgkplugin.${SO_SUFFIX}
 lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
 lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimgmng.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimpComm4xMail.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimpText.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimport.${SO_SUFFIX}
@@ -50,7 +48,6 @@ lib/${MOZILLA}/components/libinspector.${SO_SUFFIX}
 lib/${MOZILLA}/components/libipcdc.${SO_SUFFIX}
 lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
 lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjsdom.${SO_SUFFIX}
 lib/${MOZILLA}/components/liblocalmail.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmailnews.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmailview.${SO_SUFFIX}
@@ -99,7 +96,7 @@ lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxremote_client.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxremoteservice.${SO_SUFFIX}
 lib/${MOZILLA}/ipc/modules/liblockmodule.${SO_SUFFIX}
-lib/${MOZILLA}/ipc/modules/libtransmngr.${SO_SUFFIX}
+lib/${MOZILLA}/ipc/modules/libtransmgr.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
 lib/${MOZILLA}/libgtksuperwin.${SO_SUFFIX}
@@ -123,6 +120,8 @@ lib/${MOZILLA}/libxlibrgb.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
+${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
+${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
 @comment end DSO
 @comment begin DATA
 lib/${MOZILLA}/LICENSE
@@ -181,6 +180,7 @@ lib/${MOZILLA}/chrome/messenger.jar
 lib/${MOZILLA}/chrome/modern.jar
 lib/${MOZILLA}/chrome/pipnss.jar
 lib/${MOZILLA}/chrome/pippki.jar
+lib/${MOZILLA}/chrome/svg.jar
 lib/${MOZILLA}/chrome/toolkit.jar
 lib/${MOZILLA}/chrome/venkman.jar
 lib/${MOZILLA}/components/accessibility.xpt
@@ -190,10 +190,10 @@ lib/${MOZILLA}/components/autocomplete.xpt
 lib/${MOZILLA}/components/autoconfig.xpt
 lib/${MOZILLA}/components/bookmarks.xpt
 lib/${MOZILLA}/components/calendar.xpt
+lib/${MOZILLA}/components/calendarService.js
 lib/${MOZILLA}/components/caps.xpt
 lib/${MOZILLA}/components/chardet.xpt
 lib/${MOZILLA}/components/chatzilla-service.js
-lib/${MOZILLA}/components/chrome.xpt
 lib/${MOZILLA}/components/commandhandler.xpt
 lib/${MOZILLA}/components/composer.xpt
 lib/${MOZILLA}/components/content_base.xpt
@@ -225,6 +225,7 @@ lib/${MOZILLA}/components/exthandler.xpt
 lib/${MOZILLA}/components/filepicker.xpt
 lib/${MOZILLA}/components/find.xpt
 lib/${MOZILLA}/components/gfx.xpt
+lib/${MOZILLA}/components/gksvgrenderer.xpt
 lib/${MOZILLA}/components/helperAppDlg.xpt
 lib/${MOZILLA}/components/history.xpt
 lib/${MOZILLA}/components/htmlparser.xpt
@@ -291,6 +292,7 @@ lib/${MOZILLA}/components/nsResetPref.js
 lib/${MOZILLA}/components/nsSidebar.js
 lib/${MOZILLA}/components/nsUpdateNotifier.js
 lib/${MOZILLA}/components/nsXmlRpcClient.js
+lib/${MOZILLA}/components/offlineStartup.js
 lib/${MOZILLA}/components/oji.xpt
 lib/${MOZILLA}/components/p3p.xpt
 lib/${MOZILLA}/components/pipboot.xpt
@@ -312,16 +314,13 @@ lib/${MOZILLA}/components/sidebar.xpt
 lib/${MOZILLA}/components/signonviewer.xpt
 lib/${MOZILLA}/components/smime-service.js
 lib/${MOZILLA}/components/spellchecker.xpt
-lib/${MOZILLA}/components/timebomb.xpt
 lib/${MOZILLA}/components/txmgr.xpt
 lib/${MOZILLA}/components/txtsvc.xpt
 lib/${MOZILLA}/components/typeaheadfind.xpt
-lib/${MOZILLA}/components/ucnative.xpt
 lib/${MOZILLA}/components/uconv.xpt
 lib/${MOZILLA}/components/unicharutil.xpt
 lib/${MOZILLA}/components/uriloader.xpt
 lib/${MOZILLA}/components/urlbarhistory.xpt
-lib/${MOZILLA}/components/util.xpt
 lib/${MOZILLA}/components/venkman-service.js
 lib/${MOZILLA}/components/wallet.xpt
 lib/${MOZILLA}/components/walleteditor.xpt
@@ -349,18 +348,16 @@ lib/${MOZILLA}/components/xuldoc.xpt
 lib/${MOZILLA}/components/xultmpl.xpt
 lib/${MOZILLA}/defaults/autoconfig/platform.js
 lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
+lib/${MOZILLA}/defaults/isp/US/movemail.rdf
+lib/${MOZILLA}/defaults/isp/movemail.rdf
 lib/${MOZILLA}/defaults/messenger/US/mailViews.dat
 lib/${MOZILLA}/defaults/messenger/mailViews.dat
-lib/${MOZILLA}/defaults/pref/all.js
-lib/${MOZILLA}/defaults/pref/editor.js
+lib/${MOZILLA}/defaults/pref/browser-prefs.js
+lib/${MOZILLA}/defaults/pref/composer.js
 lib/${MOZILLA}/defaults/pref/inspector.js
 lib/${MOZILLA}/defaults/pref/mailnews.js
 lib/${MOZILLA}/defaults/pref/mdn.js
-lib/${MOZILLA}/defaults/pref/non-shared.txt
-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-example.css
 lib/${MOZILLA}/defaults/profile/US/chrome/userContent-example.css
@@ -382,8 +379,14 @@ 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}/greprefs/all.js
+lib/${MOZILLA}/greprefs/non-shared.txt
+lib/${MOZILLA}/greprefs/security-prefs.js
+lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
+lib/${MOZILLA}/init.d/README
+lib/${MOZILLA}/init.d/S80calendar_fix_permissions_bug_230617
 lib/${MOZILLA}/libsoftokn3.chk
 lib/${MOZILLA}/res/EditorOverride.css
 lib/${MOZILLA}/res/arrow.gif
@@ -414,6 +417,7 @@ lib/${MOZILLA}/res/fonts/mathfontMath4.properties
 lib/${MOZILLA}/res/fonts/mathfontPUA.properties
 lib/${MOZILLA}/res/fonts/mathfontSymbol.properties
 lib/${MOZILLA}/res/forms.css
+lib/${MOZILLA}/res/grabber.gif
 lib/${MOZILLA}/res/html.css
 lib/${MOZILLA}/res/html/gopher-audio.gif
 lib/${MOZILLA}/res/html/gopher-binary.gif
@@ -433,22 +437,11 @@ lib/${MOZILLA}/res/loading-image.gif
 lib/${MOZILLA}/res/mathml.css
 lib/${MOZILLA}/res/platform-forms.css
 lib/${MOZILLA}/res/quirk.css
-lib/${MOZILLA}/res/rdf/article.gif
-lib/${MOZILLA}/res/rdf/document.gif
-lib/${MOZILLA}/res/rdf/dom-test-1.xul
-lib/${MOZILLA}/res/rdf/dom-test-2.xul
-lib/${MOZILLA}/res/rdf/dom-test-3.xul
 lib/${MOZILLA}/res/rdf/dom-test-4.css
-lib/${MOZILLA}/res/rdf/dom-test-4.xul
-lib/${MOZILLA}/res/rdf/dom-test-5.xul
-lib/${MOZILLA}/res/rdf/dom-test-6.xul
-lib/${MOZILLA}/res/rdf/dom-test-7.xul
-lib/${MOZILLA}/res/rdf/dom-test-8.xul
 lib/${MOZILLA}/res/rdf/folder-closed.gif
 lib/${MOZILLA}/res/rdf/folder-open.gif
 lib/${MOZILLA}/res/rdf/ignore-test.xul
 lib/${MOZILLA}/res/rdf/loading.gif
-lib/${MOZILLA}/res/rdf/xpidl-test-1.xul
 lib/${MOZILLA}/res/sample.unixpsfonts.properties
 lib/${MOZILLA}/res/samples/Anieyes.gif
 lib/${MOZILLA}/res/samples/aform.css
@@ -518,6 +511,25 @@ lib/${MOZILLA}/res/samples/treeTest1.xul
 lib/${MOZILLA}/res/samples/widgets.xul
 lib/${MOZILLA}/res/samples/xpmenu.xul
 lib/${MOZILLA}/res/samples/xulTest.css
+lib/${MOZILLA}/res/svg.css
+lib/${MOZILLA}/res/table-add-column-after-active.gif
+lib/${MOZILLA}/res/table-add-column-after-hover.gif
+lib/${MOZILLA}/res/table-add-column-after.gif
+lib/${MOZILLA}/res/table-add-column-before-active.gif
+lib/${MOZILLA}/res/table-add-column-before-hover.gif
+lib/${MOZILLA}/res/table-add-column-before.gif
+lib/${MOZILLA}/res/table-add-row-after-active.gif
+lib/${MOZILLA}/res/table-add-row-after-hover.gif
+lib/${MOZILLA}/res/table-add-row-after.gif
+lib/${MOZILLA}/res/table-add-row-before-active.gif
+lib/${MOZILLA}/res/table-add-row-before-hover.gif
+lib/${MOZILLA}/res/table-add-row-before.gif
+lib/${MOZILLA}/res/table-remove-column-active.gif
+lib/${MOZILLA}/res/table-remove-column-hover.gif
+lib/${MOZILLA}/res/table-remove-column.gif
+lib/${MOZILLA}/res/table-remove-row-active.gif
+lib/${MOZILLA}/res/table-remove-row-hover.gif
+lib/${MOZILLA}/res/table-remove-row.gif
 lib/${MOZILLA}/res/throbber/anim.gif
 lib/${MOZILLA}/res/throbber/anims00.gif
 lib/${MOZILLA}/res/throbber/anims01.gif
@@ -553,18 +565,12 @@ lib/${MOZILLA}/res/ua.css
 lib/${MOZILLA}/res/unixcharset.properties
 lib/${MOZILLA}/res/viewer.properties
 lib/${MOZILLA}/res/viewsource.css
-lib/${MOZILLA}/searchplugins/NetscapeSearch.gif
-lib/${MOZILLA}/searchplugins/NetscapeSearch.src
-lib/${MOZILLA}/searchplugins/bugzilla.gif
-lib/${MOZILLA}/searchplugins/bugzilla.src
 lib/${MOZILLA}/searchplugins/dmoz.gif
 lib/${MOZILLA}/searchplugins/dmoz.src
 lib/${MOZILLA}/searchplugins/google.gif
 lib/${MOZILLA}/searchplugins/google.src
-lib/${MOZILLA}/searchplugins/lxrmozilla.gif
-lib/${MOZILLA}/searchplugins/lxrmozilla.src
-lib/${MOZILLA}/searchplugins/mozilla.gif
-lib/${MOZILLA}/searchplugins/mozilla.src
+lib/${MOZILLA}/searchplugins/jeeves.gif
+lib/${MOZILLA}/searchplugins/jeeves.src
 @comment end DATA
 @comment begin INCLUDE
 include/${MOZILLA}/accessibility/nsAccessNode.h
@@ -577,9 +583,13 @@ include/${MOZILLA}/accessibility/nsIAccessibilityService.h
 include/${MOZILLA}/accessibility/nsIAccessible.h
 include/${MOZILLA}/accessibility/nsIAccessibleCaret.h
 include/${MOZILLA}/accessibility/nsIAccessibleDocument.h
-include/${MOZILLA}/accessibility/nsIAccessibleEventReceiver.h
+include/${MOZILLA}/accessibility/nsIAccessibleEvent.h
 include/${MOZILLA}/accessibility/nsIAccessibleProvider.h
+include/${MOZILLA}/accessibility/nsIAccessibleRetrieval.h
 include/${MOZILLA}/accessibility/nsIAccessibleSelectable.h
+include/${MOZILLA}/accessibility/nsPIAccessNode.h
+include/${MOZILLA}/accessibility/nsPIAccessible.h
+include/${MOZILLA}/accessibility/nsPIAccessibleDocument.h
 include/${MOZILLA}/accessibility/nsRootAccessible.h
 include/${MOZILLA}/accessibility/nsRootAccessibleWrap.h
 include/${MOZILLA}/accessibility/nsTextAccessibleWrap.h
@@ -646,25 +656,25 @@ include/${MOZILLA}/addrbook/nsIAddrDBListener.h
 include/${MOZILLA}/addrbook/nsIAddrDatabase.h
 include/${MOZILLA}/addrbook/nsIAddressBook.h
 include/${MOZILLA}/addrbook/nsILDAPPrefsService.h
+include/${MOZILLA}/addrbook/nsIMsgVCardService.h
+include/${MOZILLA}/addrbook/nsMsgVCardService.h
+include/${MOZILLA}/addrbook/nsVCard.h
+include/${MOZILLA}/addrbook/nsVCardObj.h
 include/${MOZILLA}/appcomps/nsCharsetMenu.h
 include/${MOZILLA}/appcomps/nsFontPackageHandler.h
 include/${MOZILLA}/appcomps/nsIAutoCompleteListener.h
 include/${MOZILLA}/appcomps/nsIAutoCompleteResults.h
 include/${MOZILLA}/appcomps/nsIAutoCompleteSession.h
 include/${MOZILLA}/appcomps/nsIBookmarksService.h
-include/${MOZILLA}/appcomps/nsIBrowserHistory.h
 include/${MOZILLA}/appcomps/nsIFindService.h
-include/${MOZILLA}/appcomps/nsIGlobalHistory.h
 include/${MOZILLA}/appcomps/nsIHTTPIndex.h
 include/${MOZILLA}/appcomps/nsILDAPAutoCompFormatter.h
 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/nsIWindowDataSource.h
-include/${MOZILLA}/appcomps/nsTimeBomb.h
 include/${MOZILLA}/appshell/nsAppShellCIDs.h
 include/${MOZILLA}/appshell/nsIAppShellService.h
 include/${MOZILLA}/appshell/nsICloseAllWindows.h
@@ -673,7 +683,6 @@ include/${MOZILLA}/appshell/nsICmdLineService.h
 include/${MOZILLA}/appshell/nsINativeAppSupport.h
 include/${MOZILLA}/appshell/nsIPopupWindowManager.h
 include/${MOZILLA}/appshell/nsISplashScreen.h
-include/${MOZILLA}/appshell/nsITimingService.h
 include/${MOZILLA}/appshell/nsIUserInfo.h
 include/${MOZILLA}/appshell/nsIWebShellWindow.h
 include/${MOZILLA}/appshell/nsIWindowMediator.h
@@ -687,26 +696,18 @@ include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
 include/${MOZILLA}/browser/nsIBrowserInstance.h
 include/${MOZILLA}/browser/nsIXULBrowserWindow.h
 include/${MOZILLA}/calendar/oeIICal.h
-include/${MOZILLA}/caps/nsAggregatePrincipal.h
-include/${MOZILLA}/caps/nsBasePrincipal.h
-include/${MOZILLA}/caps/nsCertificatePrincipal.h
-include/${MOZILLA}/caps/nsCodebasePrincipal.h
-include/${MOZILLA}/caps/nsIAggregatePrincipal.h
-include/${MOZILLA}/caps/nsICertificatePrincipal.h
-include/${MOZILLA}/caps/nsICodebasePrincipal.h
 include/${MOZILLA}/caps/nsIPrincipal.h
 include/${MOZILLA}/caps/nsIScriptSecurityManager.h
 include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
 include/${MOZILLA}/caps/nsISignatureVerifier.h
 include/${MOZILLA}/caps/nsJSPrincipals.h
-include/${MOZILLA}/caps/nsScriptSecurityManager.h
-include/${MOZILLA}/caps/nsSystemPrincipal.h
 include/${MOZILLA}/chardet/nsCharsetDetectionAdaptorCID.h
 include/${MOZILLA}/chardet/nsDetectionConfident.h
 include/${MOZILLA}/chardet/nsDocumentCharsetInfoCID.h
 include/${MOZILLA}/chardet/nsICharsetDetectionAdaptor.h
 include/${MOZILLA}/chardet/nsICharsetDetectionObserver.h
 include/${MOZILLA}/chardet/nsICharsetDetector.h
+include/${MOZILLA}/chardet/nsICharsetResolver.h
 include/${MOZILLA}/chardet/nsIDocCharset.h
 include/${MOZILLA}/chardet/nsIDocumentCharsetInfo.h
 include/${MOZILLA}/chardet/nsIMetaCharsetService.h
@@ -714,7 +715,6 @@ include/${MOZILLA}/chardet/nsIStringCharsetDetector.h
 include/${MOZILLA}/chardet/nsIXMLEncodingService.h
 include/${MOZILLA}/chardet/nsMetaCharsetCID.h
 include/${MOZILLA}/chardet/nsXMLEncodingCID.h
-include/${MOZILLA}/chrome/nsIChromeRegistry.h
 include/${MOZILLA}/commandhandler/nsICommandManager.h
 include/${MOZILLA}/commandhandler/nsICommandParams.h
 include/${MOZILLA}/commandhandler/nsIControllerCommand.h
@@ -730,6 +730,7 @@ include/${MOZILLA}/content/nsCSSAnonBoxes.h
 include/${MOZILLA}/content/nsCSSKeywordList.h
 include/${MOZILLA}/content/nsCSSKeywords.h
 include/${MOZILLA}/content/nsCSSPropList.h
+include/${MOZILLA}/content/nsCSSProperty.h
 include/${MOZILLA}/content/nsCSSProps.h
 include/${MOZILLA}/content/nsCSSPseudoClassList.h
 include/${MOZILLA}/content/nsCSSPseudoClasses.h
@@ -743,13 +744,12 @@ include/${MOZILLA}/content/nsContentErrors.h
 include/${MOZILLA}/content/nsContentPolicyUtils.h
 include/${MOZILLA}/content/nsContentUtils.h
 include/${MOZILLA}/content/nsDOMCSSDeclaration.h
+include/${MOZILLA}/content/nsFrameManager.h
+include/${MOZILLA}/content/nsFrameManagerBase.h
 include/${MOZILLA}/content/nsHTMLAtomList.h
 include/${MOZILLA}/content/nsHTMLAtoms.h
-include/${MOZILLA}/content/nsHTMLUtils.h
 include/${MOZILLA}/content/nsHTMLValue.h
-include/${MOZILLA}/content/nsIAnonymousContent.h
 include/${MOZILLA}/content/nsIAttribute.h
-include/${MOZILLA}/content/nsIAttributeContent.h
 include/${MOZILLA}/content/nsIBindingManager.h
 include/${MOZILLA}/content/nsICSSGroupRule.h
 include/${MOZILLA}/content/nsICSSImportRule.h
@@ -762,8 +762,10 @@ include/${MOZILLA}/content/nsICSSParser.h
 include/${MOZILLA}/content/nsICSSPseudoComparator.h
 include/${MOZILLA}/content/nsICSSRule.h
 include/${MOZILLA}/content/nsICSSStyleRule.h
+include/${MOZILLA}/content/nsICSSStyleRuleDOMWrapper.h
 include/${MOZILLA}/content/nsICSSStyleRuleProcessor.h
 include/${MOZILLA}/content/nsICSSStyleSheet.h
+include/${MOZILLA}/content/nsIChromeRegistry.h
 include/${MOZILLA}/content/nsIComputedDOMStyle.h
 include/${MOZILLA}/content/nsIContent.h
 include/${MOZILLA}/content/nsIContentIterator.h
@@ -787,7 +789,6 @@ include/${MOZILLA}/content/nsIFrameLoader.h
 include/${MOZILLA}/content/nsIFrameSetElement.h
 include/${MOZILLA}/content/nsIHTMLCSSStyleSheet.h
 include/${MOZILLA}/content/nsIHTMLContent.h
-include/${MOZILLA}/content/nsIHTMLContentContainer.h
 include/${MOZILLA}/content/nsIHTMLDocument.h
 include/${MOZILLA}/content/nsIHTMLTableCellElement.h
 include/${MOZILLA}/content/nsIHTMLTableColElement.h
@@ -815,9 +816,11 @@ include/${MOZILLA}/content/nsIRadioControlElement.h
 include/${MOZILLA}/content/nsIRadioGroupContainer.h
 include/${MOZILLA}/content/nsIRadioVisitor.h
 include/${MOZILLA}/content/nsIRangeUtils.h
-include/${MOZILLA}/content/nsISVGAttribute.h
 include/${MOZILLA}/content/nsISVGStyleValue.h
+include/${MOZILLA}/content/nsISVGTextContentMetrics.h
 include/${MOZILLA}/content/nsISVGValue.h
+include/${MOZILLA}/content/nsISVGValueObserver.h
+include/${MOZILLA}/content/nsISVGValueUtils.h
 include/${MOZILLA}/content/nsIScriptElement.h
 include/${MOZILLA}/content/nsIScriptEventHandler.h
 include/${MOZILLA}/content/nsIScriptEventManager.h
@@ -836,7 +839,6 @@ include/${MOZILLA}/content/nsIStyleSheet.h
 include/${MOZILLA}/content/nsIStyleSheetLinkingElement.h
 include/${MOZILLA}/content/nsIStyledContent.h
 include/${MOZILLA}/content/nsISyncLoadDOMService.h
-include/${MOZILLA}/content/nsITextAreaElement.h
 include/${MOZILLA}/content/nsITextContent.h
 include/${MOZILLA}/content/nsITextControlElement.h
 include/${MOZILLA}/content/nsIWyciwygChannel.h
@@ -853,13 +855,17 @@ include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
 include/${MOZILLA}/content/nsImageMapUtils.h
 include/${MOZILLA}/content/nsLayoutAtomList.h
 include/${MOZILLA}/content/nsLayoutAtoms.h
+include/${MOZILLA}/content/nsLayoutStylesheetCache.h
 include/${MOZILLA}/content/nsMutationEvent.h
 include/${MOZILLA}/content/nsRuleNode.h
 include/${MOZILLA}/content/nsRuleWalker.h
 include/${MOZILLA}/content/nsSVGAtomList.h
 include/${MOZILLA}/content/nsSVGAtoms.h
+include/${MOZILLA}/content/nsSVGTypeCIDs.h
+include/${MOZILLA}/content/nsStubDocumentObserver.h
 include/${MOZILLA}/content/nsStyleContext.h
 include/${MOZILLA}/content/nsStyleCoord.h
+include/${MOZILLA}/content/nsStyleSet.h
 include/${MOZILLA}/content/nsStyleStruct.h
 include/${MOZILLA}/content/nsStyleStructList.h
 include/${MOZILLA}/content/nsStyleUtil.h
@@ -868,19 +874,10 @@ include/${MOZILLA}/content/nsXBLAtomList.h
 include/${MOZILLA}/content/nsXBLAtoms.h
 include/${MOZILLA}/content/nsXULAtomList.h
 include/${MOZILLA}/content/nsXULAtoms.h
-include/${MOZILLA}/cookie/nsCCookie.h
-include/${MOZILLA}/cookie/nsCCookieManager.h
-include/${MOZILLA}/cookie/nsCookieHTTPNotify.h
-include/${MOZILLA}/cookie/nsICookie.h
 include/${MOZILLA}/cookie/nsICookieAcceptDialog.h
-include/${MOZILLA}/cookie/nsICookieConsent.h
-include/${MOZILLA}/cookie/nsICookieManager.h
-include/${MOZILLA}/cookie/nsICookieManager2.h
-include/${MOZILLA}/cookie/nsICookiePermission.h
 include/${MOZILLA}/cookie/nsICookiePromptService.h
 include/${MOZILLA}/cookie/nsIImgManager.h
 include/${MOZILLA}/cookie/nsIPermission.h
-include/${MOZILLA}/cookie/nsIPermissionManager.h
 include/${MOZILLA}/dbm/cdefs.h
 include/${MOZILLA}/dbm/mcom_db.h
 include/${MOZILLA}/dbm/ncompat.h
@@ -888,6 +885,7 @@ include/${MOZILLA}/dbm/nsres.h
 include/${MOZILLA}/dbm/winfile.h
 include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
 include/${MOZILLA}/docshell/nsCDocShell.h
+include/${MOZILLA}/docshell/nsDocShellCID.h
 include/${MOZILLA}/docshell/nsIContentViewer.h
 include/${MOZILLA}/docshell/nsIContentViewerEdit.h
 include/${MOZILLA}/docshell/nsIContentViewerFile.h
@@ -898,6 +896,8 @@ include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
 include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
 include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
 include/${MOZILLA}/docshell/nsIEditorDocShell.h
+include/${MOZILLA}/docshell/nsIGlobalHistory.h
+include/${MOZILLA}/docshell/nsIGlobalHistory2.h
 include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
 include/${MOZILLA}/docshell/nsIScrollable.h
 include/${MOZILLA}/docshell/nsITextScroll.h
@@ -907,7 +907,9 @@ include/${MOZILLA}/docshell/nsIWebPageDescriptor.h
 include/${MOZILLA}/dom/domstubs.h
 include/${MOZILLA}/dom/nsDOMCID.h
 include/${MOZILLA}/dom/nsDOMError.h
+include/${MOZILLA}/dom/nsDOMString.h
 include/${MOZILLA}/dom/nsIBaseDOMException.h
+include/${MOZILLA}/dom/nsIDOM3Document.h
 include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
 include/${MOZILLA}/dom/nsIDOM3EventTarget.h
 include/${MOZILLA}/dom/nsIDOM3Node.h
@@ -940,8 +942,10 @@ include/${MOZILLA}/dom/nsIDOMContextMenuListener.h
 include/${MOZILLA}/dom/nsIDOMCounter.h
 include/${MOZILLA}/dom/nsIDOMCrypto.h
 include/${MOZILLA}/dom/nsIDOMCustomEvent.h
+include/${MOZILLA}/dom/nsIDOMDOMConfiguration.h
 include/${MOZILLA}/dom/nsIDOMDOMException.h
 include/${MOZILLA}/dom/nsIDOMDOMImplementation.h
+include/${MOZILLA}/dom/nsIDOMDOMStringList.h
 include/${MOZILLA}/dom/nsIDOMDocument.h
 include/${MOZILLA}/dom/nsIDOMDocumentCSS.h
 include/${MOZILLA}/dom/nsIDOMDocumentEvent.h
@@ -1046,6 +1050,7 @@ include/${MOZILLA}/dom/nsIDOMNSHTMLElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLFormControlList.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLFormElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLFrameElement.h
+include/${MOZILLA}/dom/nsIDOMNSHTMLHRElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLImageElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLInputElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLOptionCollectn.h
@@ -1057,6 +1062,7 @@ include/${MOZILLA}/dom/nsIDOMNSLocation.h
 include/${MOZILLA}/dom/nsIDOMNSRange.h
 include/${MOZILLA}/dom/nsIDOMNSUIEvent.h
 include/${MOZILLA}/dom/nsIDOMNSXBLFormControl.h
+include/${MOZILLA}/dom/nsIDOMNameList.h
 include/${MOZILLA}/dom/nsIDOMNamedNodeMap.h
 include/${MOZILLA}/dom/nsIDOMNavigator.h
 include/${MOZILLA}/dom/nsIDOMNode.h
@@ -1083,6 +1089,7 @@ include/${MOZILLA}/dom/nsIDOMSVGAnimatedNumberList.h
 include/${MOZILLA}/dom/nsIDOMSVGAnimatedPathData.h
 include/${MOZILLA}/dom/nsIDOMSVGAnimatedPoints.h
 include/${MOZILLA}/dom/nsIDOMSVGAnimatedRect.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedString.h
 include/${MOZILLA}/dom/nsIDOMSVGCircleElement.h
 include/${MOZILLA}/dom/nsIDOMSVGDocument.h
 include/${MOZILLA}/dom/nsIDOMSVGElement.h
@@ -1090,6 +1097,7 @@ include/${MOZILLA}/dom/nsIDOMSVGEllipseElement.h
 include/${MOZILLA}/dom/nsIDOMSVGFitToViewBox.h
 include/${MOZILLA}/dom/nsIDOMSVGForeignObjectElem.h
 include/${MOZILLA}/dom/nsIDOMSVGGElement.h
+include/${MOZILLA}/dom/nsIDOMSVGImageElement.h
 include/${MOZILLA}/dom/nsIDOMSVGLength.h
 include/${MOZILLA}/dom/nsIDOMSVGLengthList.h
 include/${MOZILLA}/dom/nsIDOMSVGLineElement.h
@@ -1116,6 +1124,7 @@ include/${MOZILLA}/dom/nsIDOMSVGTextPositionElem.h
 include/${MOZILLA}/dom/nsIDOMSVGTransform.h
 include/${MOZILLA}/dom/nsIDOMSVGTransformList.h
 include/${MOZILLA}/dom/nsIDOMSVGTransformable.h
+include/${MOZILLA}/dom/nsIDOMSVGURIReference.h
 include/${MOZILLA}/dom/nsIDOMScreen.h
 include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
 include/${MOZILLA}/dom/nsIDOMScrollListener.h
@@ -1125,8 +1134,10 @@ include/${MOZILLA}/dom/nsIDOMText.h
 include/${MOZILLA}/dom/nsIDOMTextListener.h
 include/${MOZILLA}/dom/nsIDOMTreeWalker.h
 include/${MOZILLA}/dom/nsIDOMUIEvent.h
+include/${MOZILLA}/dom/nsIDOMUserDataHandler.h
 include/${MOZILLA}/dom/nsIDOMViewCSS.h
 include/${MOZILLA}/dom/nsIDOMWindow.h
+include/${MOZILLA}/dom/nsIDOMWindow2.h
 include/${MOZILLA}/dom/nsIDOMWindowCollection.h
 include/${MOZILLA}/dom/nsIDOMWindowInternal.h
 include/${MOZILLA}/dom/nsIDOMXMLDocument.h
@@ -1152,13 +1163,13 @@ include/${MOZILLA}/dom/nsIDOMXULMultSelectCntrlEl.h
 include/${MOZILLA}/dom/nsIDOMXULPopupElement.h
 include/${MOZILLA}/dom/nsIDOMXULSelectCntrlEl.h
 include/${MOZILLA}/dom/nsIDOMXULSelectCntrlItemEl.h
+include/${MOZILLA}/dom/nsIDOMXULTextboxElement.h
 include/${MOZILLA}/dom/nsIEntropyCollector.h
 include/${MOZILLA}/dom/nsIFocusController.h
 include/${MOZILLA}/dom/nsIJSEventListener.h
 include/${MOZILLA}/dom/nsIJSNativeInitializer.h
 include/${MOZILLA}/dom/nsIScriptContext.h
 include/${MOZILLA}/dom/nsIScriptContextOwner.h
-include/${MOZILLA}/dom/nsIScriptEventListener.h
 include/${MOZILLA}/dom/nsIScriptExternalNameSet.h
 include/${MOZILLA}/dom/nsIScriptGlobalObject.h
 include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
@@ -1181,7 +1192,10 @@ include/${MOZILLA}/editor/nsIEditorMailSupport.h
 include/${MOZILLA}/editor/nsIEditorObserver.h
 include/${MOZILLA}/editor/nsIEditorSpellCheck.h
 include/${MOZILLA}/editor/nsIEditorStyleSheets.h
+include/${MOZILLA}/editor/nsIHTMLAbsPosEditor.h
 include/${MOZILLA}/editor/nsIHTMLEditor.h
+include/${MOZILLA}/editor/nsIHTMLInlineTableEditor.h
+include/${MOZILLA}/editor/nsIHTMLObjectResizeListener.h
 include/${MOZILLA}/editor/nsIHTMLObjectResizer.h
 include/${MOZILLA}/editor/nsIPlaintextEditor.h
 include/${MOZILLA}/editor/nsITableEditor.h
@@ -1191,12 +1205,8 @@ include/${MOZILLA}/embed_base/nsEmbedAPI.h
 include/${MOZILLA}/embed_base/nsIWindowCreator.h
 include/${MOZILLA}/embed_base/nsIWindowCreator2.h
 include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.h
-include/${MOZILLA}/embedstring/nsEmbedString.h
 include/${MOZILLA}/expat/xmlparse.h
 include/${MOZILLA}/exthandler/nsCExternalHandlerService.h
-include/${MOZILLA}/exthandler/nsExternalHelperAppService.h
-include/${MOZILLA}/exthandler/nsExternalProtocolHandler.h
-include/${MOZILLA}/exthandler/nsHelperAppRDF.h
 include/${MOZILLA}/exthandler/nsIExternalHelperAppService.h
 include/${MOZILLA}/exthandler/nsIExternalProtocolService.h
 include/${MOZILLA}/exthandler/nsOSHelperAppService.h
@@ -1209,7 +1219,6 @@ include/${MOZILLA}/gfx/gfxtypes.h
 include/${MOZILLA}/gfx/nsColor.h
 include/${MOZILLA}/gfx/nsColorNameList.h
 include/${MOZILLA}/gfx/nsColorNames.h
-include/${MOZILLA}/gfx/nsCompressedCharMap.h
 include/${MOZILLA}/gfx/nsCoord.h
 include/${MOZILLA}/gfx/nsDeviceContext.h
 include/${MOZILLA}/gfx/nsFont.h
@@ -1230,7 +1239,6 @@ include/${MOZILLA}/gfx/nsIFontEnumerator.h
 include/${MOZILLA}/gfx/nsIFontList.h
 include/${MOZILLA}/gfx/nsIFontMetrics.h
 include/${MOZILLA}/gfx/nsIFreeType2.h
-include/${MOZILLA}/gfx/nsIGraphics.h
 include/${MOZILLA}/gfx/nsIImage.h
 include/${MOZILLA}/gfx/nsIPrintOptions.h
 include/${MOZILLA}/gfx/nsIPrintSession.h
@@ -1243,11 +1251,12 @@ include/${MOZILLA}/gfx/nsIScreenManager.h
 include/${MOZILLA}/gfx/nsIScriptableRegion.h
 include/${MOZILLA}/gfx/nsITheme.h
 include/${MOZILLA}/gfx/nsMargin.h
+include/${MOZILLA}/gfx/nsPaperPS.h
 include/${MOZILLA}/gfx/nsPoint.h
-include/${MOZILLA}/gfx/nsPostScriptObj.h
 include/${MOZILLA}/gfx/nsRect.h
 include/${MOZILLA}/gfx/nsRegion.h
 include/${MOZILLA}/gfx/nsSize.h
+include/${MOZILLA}/gfx/nsTempfilePS.h
 include/${MOZILLA}/gfx/nsThemeConstants.h
 include/${MOZILLA}/gfx/nsTransform2D.h
 include/${MOZILLA}/gtkembedmoz/gtkmozembed.h
@@ -1255,6 +1264,7 @@ include/${MOZILLA}/gtkembedmoz/gtkmozembed_internal.h
 include/${MOZILLA}/gtkxtbin/gtk2xtbin.h
 include/${MOZILLA}/gtkxtbin/gtkxtbin.h
 include/${MOZILLA}/helperAppDlg/nsIHelperAppLauncherDialog.h
+include/${MOZILLA}/history/nsIBrowserHistory.h
 include/${MOZILLA}/htmlparser/nsHTMLTagList.h
 include/${MOZILLA}/htmlparser/nsHTMLTags.h
 include/${MOZILLA}/htmlparser/nsHTMLTokens.h
@@ -1271,6 +1281,7 @@ include/${MOZILLA}/htmlparser/nsIParserService.h
 include/${MOZILLA}/htmlparser/nsITokenizer.h
 include/${MOZILLA}/htmlparser/nsParserCIID.h
 include/${MOZILLA}/htmlparser/nsParserError.h
+include/${MOZILLA}/htmlparser/nsScannerString.h
 include/${MOZILLA}/htmlparser/nsToken.h
 include/${MOZILLA}/ical/ical.h
 include/${MOZILLA}/icalss/icalss.h
@@ -1295,17 +1306,12 @@ 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
@@ -1398,6 +1404,7 @@ include/${MOZILLA}/jsurl/nsJSProtocolHandler.h
 include/${MOZILLA}/layout/nsBidi.h
 include/${MOZILLA}/layout/nsBidiFrames.h
 include/${MOZILLA}/layout/nsBidiPresUtils.h
+include/${MOZILLA}/layout/nsCSSFrameConstructor.h
 include/${MOZILLA}/layout/nsCompatibility.h
 include/${MOZILLA}/layout/nsFrameList.h
 include/${MOZILLA}/layout/nsFrameTraversal.h
@@ -1417,7 +1424,6 @@ include/${MOZILLA}/layout/nsIBoxLayoutManager.h
 include/${MOZILLA}/layout/nsIBoxObject.h
 include/${MOZILLA}/layout/nsIBoxPaintManager.h
 include/${MOZILLA}/layout/nsIBrowserBoxObject.h
-include/${MOZILLA}/layout/nsICSSFrameConstructor.h
 include/${MOZILLA}/layout/nsICanvasFrame.h
 include/${MOZILLA}/layout/nsICaret.h
 include/${MOZILLA}/layout/nsICheckboxControlFrame.h
@@ -1431,7 +1437,6 @@ include/${MOZILLA}/layout/nsIFormSubmitObserver.h
 include/${MOZILLA}/layout/nsIFrame.h
 include/${MOZILLA}/layout/nsIFrameDebug.h
 include/${MOZILLA}/layout/nsIFrameFrame.h
-include/${MOZILLA}/layout/nsIFrameManager.h
 include/${MOZILLA}/layout/nsIFrameSelection.h
 include/${MOZILLA}/layout/nsIFrameTraversal.h
 include/${MOZILLA}/layout/nsIFrameUtil.h
@@ -1448,6 +1453,7 @@ include/${MOZILLA}/layout/nsIListBoxObject.h
 include/${MOZILLA}/layout/nsIListControlFrame.h
 include/${MOZILLA}/layout/nsIMenuBoxObject.h
 include/${MOZILLA}/layout/nsIMenuFrame.h
+include/${MOZILLA}/layout/nsIMenuParent.h
 include/${MOZILLA}/layout/nsIMutableStyleContext.h
 include/${MOZILLA}/layout/nsIObjectFrame.h
 include/${MOZILLA}/layout/nsIPageSequenceFrame.h
@@ -1461,6 +1467,18 @@ include/${MOZILLA}/layout/nsIPrintContext.h
 include/${MOZILLA}/layout/nsIPrintPreviewContext.h
 include/${MOZILLA}/layout/nsIRadioControlFrame.h
 include/${MOZILLA}/layout/nsIReflowCallback.h
+include/${MOZILLA}/layout/nsISVGGeometrySource.h
+include/${MOZILLA}/layout/nsISVGGlyphGeometrySource.h
+include/${MOZILLA}/layout/nsISVGGlyphMetricsSource.h
+include/${MOZILLA}/layout/nsISVGPathGeometrySource.h
+include/${MOZILLA}/layout/nsISVGRectangleSink.h
+include/${MOZILLA}/layout/nsISVGRenderer.h
+include/${MOZILLA}/layout/nsISVGRendererCanvas.h
+include/${MOZILLA}/layout/nsISVGRendererGlyphGeometry.h
+include/${MOZILLA}/layout/nsISVGRendererGlyphMetrics.h
+include/${MOZILLA}/layout/nsISVGRendererPathBuilder.h
+include/${MOZILLA}/layout/nsISVGRendererPathGeometry.h
+include/${MOZILLA}/layout/nsISVGRendererRegion.h
 include/${MOZILLA}/layout/nsIScrollBoxObject.h
 include/${MOZILLA}/layout/nsIScrollableFrame.h
 include/${MOZILLA}/layout/nsIScrollableViewProvider.h
@@ -1468,8 +1486,6 @@ include/${MOZILLA}/layout/nsIScrollbarMediator.h
 include/${MOZILLA}/layout/nsISelectControlFrame.h
 include/${MOZILLA}/layout/nsISelectionImageService.h
 include/${MOZILLA}/layout/nsIStatefulFrame.h
-include/${MOZILLA}/layout/nsIStyleFrameConstruction.h
-include/${MOZILLA}/layout/nsIStyleSet.h
 include/${MOZILLA}/layout/nsITableCellLayout.h
 include/${MOZILLA}/layout/nsITableLayout.h
 include/${MOZILLA}/layout/nsITextControlFrame.h
@@ -1505,6 +1521,7 @@ include/${MOZILLA}/libart_lgpl/art_rect_svp.h
 include/${MOZILLA}/libart_lgpl/art_rect_uta.h
 include/${MOZILLA}/libart_lgpl/art_render.h
 include/${MOZILLA}/libart_lgpl/art_render_gradient.h
+include/${MOZILLA}/libart_lgpl/art_render_mask.h
 include/${MOZILLA}/libart_lgpl/art_render_svp.h
 include/${MOZILLA}/libart_lgpl/art_rgb.h
 include/${MOZILLA}/libart_lgpl/art_rgb_a_affine.h
@@ -1530,6 +1547,7 @@ include/${MOZILLA}/libart_lgpl/art_uta_vpath.h
 include/${MOZILLA}/libart_lgpl/art_vpath.h
 include/${MOZILLA}/libart_lgpl/art_vpath_bpath.h
 include/${MOZILLA}/libart_lgpl/art_vpath_dash.h
+include/${MOZILLA}/libart_lgpl/art_vpath_filters.h
 include/${MOZILLA}/libart_lgpl/art_vpath_svp.h
 include/${MOZILLA}/libart_lgpl/config.h
 include/${MOZILLA}/libart_lgpl/libart-features.h
@@ -1613,12 +1631,10 @@ include/${MOZILLA}/mimeemitter/nsMimePlainEmitter.h
 include/${MOZILLA}/mimeemitter/nsMimeRawEmitter.h
 include/${MOZILLA}/mimeemitter/nsMimeRebuffer.h
 include/${MOZILLA}/mimeemitter/nsMimeXmlEmitter.h
+include/${MOZILLA}/mimetype/nsIMIMEHeaderParam.h
 include/${MOZILLA}/mimetype/nsIMIMEInfo.h
 include/${MOZILLA}/mimetype/nsIMIMEService.h
 include/${MOZILLA}/mimetype/nsMimeTypes.h
-include/${MOZILLA}/mng/libmng.h
-include/${MOZILLA}/mng/libmng_conf.h
-include/${MOZILLA}/mng/libmng_types.h
 include/${MOZILLA}/mork/mdb.h
 include/${MOZILLA}/mork/nsIMdbFactoryFactory.h
 include/${MOZILLA}/mork/nsMorkCID.h
@@ -1637,7 +1653,6 @@ include/${MOZILLA}/msgbase/msgCore.h
 include/${MOZILLA}/msgbase/nsCopyMessageStreamListener.h
 include/${MOZILLA}/msgbase/nsICopyMessageListener.h
 include/${MOZILLA}/msgbase/nsICopyMsgStreamListener.h
-include/${MOZILLA}/msgbase/nsIFolder.h
 include/${MOZILLA}/msgbase/nsIFolderListener.h
 include/${MOZILLA}/msgbase/nsIIncomingServerListener.h
 include/${MOZILLA}/msgbase/nsIMessenger.h
@@ -1686,7 +1701,6 @@ include/${MOZILLA}/msgbase/nsIMsgSignature.h
 include/${MOZILLA}/msgbase/nsIMsgStatusFeedback.h
 include/${MOZILLA}/msgbase/nsIMsgStringService.h
 include/${MOZILLA}/msgbase/nsIMsgThread.h
-include/${MOZILLA}/msgbase/nsIMsgVCard.h
 include/${MOZILLA}/msgbase/nsIMsgWindow.h
 include/${MOZILLA}/msgbase/nsISpamSettings.h
 include/${MOZILLA}/msgbase/nsISubscribableServer.h
@@ -1737,7 +1751,6 @@ include/${MOZILLA}/msgbase/nsUrlListenerManager.h
 include/${MOZILLA}/msgbaseutil/nsAdapterEnumerator.h
 include/${MOZILLA}/msgbaseutil/nsLocalFolderSummarySpec.h
 include/${MOZILLA}/msgbaseutil/nsMsgDBFolder.h
-include/${MOZILLA}/msgbaseutil/nsMsgFolder.h
 include/${MOZILLA}/msgbaseutil/nsMsgGroupRecord.h
 include/${MOZILLA}/msgbaseutil/nsMsgI18N.h
 include/${MOZILLA}/msgbaseutil/nsMsgIdentity.h
@@ -1858,6 +1871,7 @@ include/${MOZILLA}/msglocal/nsIMsgParseMailMsgState.h
 include/${MOZILLA}/msglocal/nsINoIncomingServer.h
 include/${MOZILLA}/msglocal/nsINoneService.h
 include/${MOZILLA}/msglocal/nsIPop3IncomingServer.h
+include/${MOZILLA}/msglocal/nsIPop3Protocol.h
 include/${MOZILLA}/msglocal/nsIPop3Service.h
 include/${MOZILLA}/msglocal/nsIPop3Sink.h
 include/${MOZILLA}/msglocal/nsIPop3URL.h
@@ -1917,14 +1931,23 @@ include/${MOZILLA}/necko/nsCPasswordManager.h
 include/${MOZILLA}/necko/nsCPasswordManagerInternal.h
 include/${MOZILLA}/necko/nsIAboutModule.h
 include/${MOZILLA}/necko/nsIAsyncStreamCopier.h
+include/${MOZILLA}/necko/nsIAuthModule.h
 include/${MOZILLA}/necko/nsIAuthPrompt.h
 include/${MOZILLA}/necko/nsIBufferedStreams.h
 include/${MOZILLA}/necko/nsIByteRangeRequest.h
 include/${MOZILLA}/necko/nsICachingChannel.h
 include/${MOZILLA}/necko/nsIChannel.h
+include/${MOZILLA}/necko/nsICookie.h
+include/${MOZILLA}/necko/nsICookie2.h
+include/${MOZILLA}/necko/nsICookieConsent.h
+include/${MOZILLA}/necko/nsICookieManager.h
+include/${MOZILLA}/necko/nsICookieManager2.h
+include/${MOZILLA}/necko/nsICookiePermission.h
 include/${MOZILLA}/necko/nsICookieService.h
 include/${MOZILLA}/necko/nsICryptoFIPSInfo.h
 include/${MOZILLA}/necko/nsIDNSListener.h
+include/${MOZILLA}/necko/nsIDNSRecord.h
+include/${MOZILLA}/necko/nsIDNSRequest.h
 include/${MOZILLA}/necko/nsIDNSService.h
 include/${MOZILLA}/necko/nsIDataChannel.h
 include/${MOZILLA}/necko/nsIDirIndex.h
@@ -1944,7 +1967,6 @@ include/${MOZILLA}/necko/nsIHttpChannel.h
 include/${MOZILLA}/necko/nsIHttpChannelInternal.h
 include/${MOZILLA}/necko/nsIHttpEventSink.h
 include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
-include/${MOZILLA}/necko/nsIHttpNotify.h
 include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
 include/${MOZILLA}/necko/nsIIDNService.h
 include/${MOZILLA}/necko/nsIIOService.h
@@ -1956,11 +1978,9 @@ include/${MOZILLA}/necko/nsIJARURI.h
 include/${MOZILLA}/necko/nsILoadGroup.h
 include/${MOZILLA}/necko/nsIMIMEInputStream.h
 include/${MOZILLA}/necko/nsIMultiPartChannel.h
-include/${MOZILLA}/necko/nsINetModRegEntry.h
-include/${MOZILLA}/necko/nsINetModuleMgr.h
-include/${MOZILLA}/necko/nsINetNotify.h
 include/${MOZILLA}/necko/nsIPasswordManager.h
 include/${MOZILLA}/necko/nsIPasswordManagerInternal.h
+include/${MOZILLA}/necko/nsIPermissionManager.h
 include/${MOZILLA}/necko/nsIProgressEventSink.h
 include/${MOZILLA}/necko/nsIPrompt.h
 include/${MOZILLA}/necko/nsIProtocolHandler.h
@@ -1975,15 +1995,13 @@ include/${MOZILLA}/necko/nsIRequestObserverProxy.h
 include/${MOZILLA}/necko/nsIResProtocolHandler.h
 include/${MOZILLA}/necko/nsIResumableChannel.h
 include/${MOZILLA}/necko/nsIResumableEntityID.h
-include/${MOZILLA}/necko/nsISOCKS4SocketInfo.h
-include/${MOZILLA}/necko/nsISOCKS4SocketProvider.h
 include/${MOZILLA}/necko/nsISOCKSSocketInfo.h
-include/${MOZILLA}/necko/nsISOCKSSocketProvider.h
 include/${MOZILLA}/necko/nsISSLSocketControl.h
 include/${MOZILLA}/necko/nsISSLSocketProvider.h
 include/${MOZILLA}/necko/nsISecretDecoderRing.h
 include/${MOZILLA}/necko/nsISecureBrowserUI.h
 include/${MOZILLA}/necko/nsISecurityEventSink.h
+include/${MOZILLA}/necko/nsIServerSocket.h
 include/${MOZILLA}/necko/nsISimpleStreamListener.h
 include/${MOZILLA}/necko/nsISocketProvider.h
 include/${MOZILLA}/necko/nsISocketProviderService.h
@@ -1997,6 +2015,7 @@ include/${MOZILLA}/necko/nsIStreamListenerProxy.h
 include/${MOZILLA}/necko/nsIStreamListenerTee.h
 include/${MOZILLA}/necko/nsIStreamLoader.h
 include/${MOZILLA}/necko/nsIStreamTransportService.h
+include/${MOZILLA}/necko/nsISyncStreamListener.h
 include/${MOZILLA}/necko/nsITXTToHTMLConv.h
 include/${MOZILLA}/necko/nsITransport.h
 include/${MOZILLA}/necko/nsITransportSecurityInfo.h
@@ -2010,6 +2029,7 @@ include/${MOZILLA}/necko/nsNetCID.h
 include/${MOZILLA}/necko/nsNetError.h
 include/${MOZILLA}/necko/nsNetUtil.h
 include/${MOZILLA}/necko/nsReadLine.h
+include/${MOZILLA}/necko/nsURIHashKey.h
 include/${MOZILLA}/necko/nsUnixColorPrintf.h
 include/${MOZILLA}/necko2/nsIViewSourceChannel.h
 include/${MOZILLA}/nkcache/nsCacheService.h
@@ -2153,6 +2173,7 @@ include/${MOZILLA}/oji/ProxyJNI.h
 include/${MOZILLA}/oji/jvmmgr.h
 include/${MOZILLA}/oji/nsIJRIPlugin.h
 include/${MOZILLA}/oji/nsIJVMAuthTools.h
+include/${MOZILLA}/oji/nsIJVMConfigManager.h
 include/${MOZILLA}/oji/nsIJVMConsole.h
 include/${MOZILLA}/oji/nsIJVMManager.h
 include/${MOZILLA}/oji/nsIJVMPlugin.h
@@ -2193,6 +2214,7 @@ include/${MOZILLA}/pipnss/nsICertificateDialogs.h
 include/${MOZILLA}/pipnss/nsICipherInfo.h
 include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
 include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
+include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
 include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
 include/${MOZILLA}/pipnss/nsIHash.h
 include/${MOZILLA}/pipnss/nsIKeygenThread.h
@@ -2210,6 +2232,7 @@ include/${MOZILLA}/pipnss/nsITokenPasswordDialogs.h
 include/${MOZILLA}/pipnss/nsIUserCertPicker.h
 include/${MOZILLA}/pipnss/nsIX509Cert.h
 include/${MOZILLA}/pipnss/nsIX509CertDB.h
+include/${MOZILLA}/pipnss/nsIX509CertDB2.h
 include/${MOZILLA}/pipnss/nsIX509CertValidity.h
 include/${MOZILLA}/pippki/nsIASN1Tree.h
 include/${MOZILLA}/pippki/nsIPKIParamBlock.h
@@ -2267,6 +2290,7 @@ include/${MOZILLA}/profile/nsIProfile.h
 include/${MOZILLA}/profile/nsIProfileChangeStatus.h
 include/${MOZILLA}/profile/nsIProfileInternal.h
 include/${MOZILLA}/profile/nsIProfileStartupListener.h
+include/${MOZILLA}/profile/nsISessionRoaming.h
 include/${MOZILLA}/profilesharingsetup/nsIProfileSharingSetup.h
 include/${MOZILLA}/progressDlg/nsIProgressDialog.h
 include/${MOZILLA}/rdf/nsILocalStore.h
@@ -2305,37 +2329,36 @@ include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
 include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
 include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
 include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
-include/${MOZILLA}/string/nsAFlatString.h
-include/${MOZILLA}/string/nsASingleFragmentString.h
 include/${MOZILLA}/string/nsAString.h
-include/${MOZILLA}/string/nsAStringGenerator.h
 include/${MOZILLA}/string/nsAlgorithm.h
-include/${MOZILLA}/string/nsBufferHandle.h
-include/${MOZILLA}/string/nsBufferHandleUtils.h
 include/${MOZILLA}/string/nsCharTraits.h
-include/${MOZILLA}/string/nsDependentConcatenation.h
 include/${MOZILLA}/string/nsDependentString.h
 include/${MOZILLA}/string/nsDependentSubstring.h
-include/${MOZILLA}/string/nsFragmentedString.h
+include/${MOZILLA}/string/nsEmbedString.h
 include/${MOZILLA}/string/nsLiteralString.h
+include/${MOZILLA}/string/nsObsoleteAString.h
 include/${MOZILLA}/string/nsPrintfCString.h
 include/${MOZILLA}/string/nsPromiseFlatString.h
 include/${MOZILLA}/string/nsReadableUtils.h
-include/${MOZILLA}/string/nsSharableString.h
-include/${MOZILLA}/string/nsSharedBufferList.h
-include/${MOZILLA}/string/nsSlidingString.h
-include/${MOZILLA}/string/nsStr.h
-include/${MOZILLA}/string/nsStrShared.h
 include/${MOZILLA}/string/nsString.h
-include/${MOZILLA}/string/nsString2.h
-include/${MOZILLA}/string/nsStringDefines.h
-include/${MOZILLA}/string/nsStringFragment.h
+include/${MOZILLA}/string/nsStringAPI.h
 include/${MOZILLA}/string/nsStringFwd.h
 include/${MOZILLA}/string/nsStringIterator.h
-include/${MOZILLA}/string/nsStringIteratorUtils.h
-include/${MOZILLA}/string/nsStringTraits.h
+include/${MOZILLA}/string/nsSubstring.h
+include/${MOZILLA}/string/nsSubstringTuple.h
+include/${MOZILLA}/string/nsTAString.h
+include/${MOZILLA}/string/nsTDependentString.h
+include/${MOZILLA}/string/nsTDependentSubstring.h
+include/${MOZILLA}/string/nsTObsoleteAString.h
+include/${MOZILLA}/string/nsTPromiseFlatString.h
+include/${MOZILLA}/string/nsTString.h
+include/${MOZILLA}/string/nsTSubstring.h
+include/${MOZILLA}/string/nsTSubstringTuple.h
 include/${MOZILLA}/string/nsUTF8Utils.h
 include/${MOZILLA}/string/nsXPIDLString.h
+include/${MOZILLA}/string/string-template-def-char.h
+include/${MOZILLA}/string/string-template-def-unichar.h
+include/${MOZILLA}/string/string-template-undef.h
 include/${MOZILLA}/txmgr/nsITransaction.h
 include/${MOZILLA}/txmgr/nsITransactionList.h
 include/${MOZILLA}/txmgr/nsITransactionListener.h
@@ -2347,21 +2370,22 @@ include/${MOZILLA}/txtsvc/nsITextServicesDocument.h
 include/${MOZILLA}/txtsvc/nsITextServicesFilter.h
 include/${MOZILLA}/txtsvc/nsTextServicesCID.h
 include/${MOZILLA}/typeaheadfind/nsITypeAheadFind.h
-include/${MOZILLA}/ucnative/nsINativeUConvService.h
+include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
 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
 include/${MOZILLA}/uconv/nsIScriptableUConv.h
 include/${MOZILLA}/uconv/nsITextToSubURI.h
+include/${MOZILLA}/uconv/nsIUTF8ConverterService.h
 include/${MOZILLA}/uconv/nsIUnicodeDecodeHelper.h
 include/${MOZILLA}/uconv/nsIUnicodeDecoder.h
 include/${MOZILLA}/uconv/nsIUnicodeEncodeHelper.h
 include/${MOZILLA}/uconv/nsIUnicodeEncoder.h
+include/${MOZILLA}/uconv/nsUConvCID.h
 include/${MOZILLA}/uconv/uconvutil.h
 include/${MOZILLA}/ucvcn/nsUCvCnCID.h
 include/${MOZILLA}/ucvibm/nsUCvIBMCID.h
@@ -2372,6 +2396,7 @@ include/${MOZILLA}/ucvlatin/nsUCvLatinCID.h
 include/${MOZILLA}/ucvmath/nsUCvMathCID.h
 include/${MOZILLA}/ucvtw/nsUCvTWCID.h
 include/${MOZILLA}/ucvtw2/nsUCvTW2CID.h
+include/${MOZILLA}/unicharutil/nsCompressedCharMap.h
 include/${MOZILLA}/unicharutil/nsHankakuToZenkakuCID.h
 include/${MOZILLA}/unicharutil/nsICaseConversion.h
 include/${MOZILLA}/unicharutil/nsIEntityConverter.h
@@ -2393,10 +2418,8 @@ include/${MOZILLA}/uriloader/nsIURILoader.h
 include/${MOZILLA}/uriloader/nsIWebProgress.h
 include/${MOZILLA}/uriloader/nsIWebProgressListener.h
 include/${MOZILLA}/uriloader/nsURILoader.h
-include/${MOZILLA}/util/nsITimeRecorder.h
 include/${MOZILLA}/util/nsTimer.h
 include/${MOZILLA}/util/stopwatch.h
-include/${MOZILLA}/util/xp_obs.h
 include/${MOZILLA}/view/nsICompositeListener.h
 include/${MOZILLA}/view/nsIScrollPositionListener.h
 include/${MOZILLA}/view/nsIScrollableView.h
@@ -2405,9 +2428,7 @@ include/${MOZILLA}/view/nsIViewManager.h
 include/${MOZILLA}/view/nsIViewObserver.h
 include/${MOZILLA}/view/nsViewsCID.h
 include/${MOZILLA}/wallet/nsCPassword.h
-include/${MOZILLA}/wallet/nsIKeyedStreamGenerator.h
 include/${MOZILLA}/wallet/nsIPassword.h
-include/${MOZILLA}/wallet/nsIPasswordSink.h
 include/${MOZILLA}/wallet/nsIWalletService.h
 include/${MOZILLA}/walletviewers/nsISignonViewer.h
 include/${MOZILLA}/walletviewers/nsIWalletEditor.h
@@ -2487,8 +2508,8 @@ include/${MOZILLA}/widget/nsIDragService.h
 include/${MOZILLA}/widget/nsIDragSession.h
 include/${MOZILLA}/widget/nsIDragSessionGTK.h
 include/${MOZILLA}/widget/nsIDragSessionMac.h
+include/${MOZILLA}/widget/nsIDragSessionOS2.h
 include/${MOZILLA}/widget/nsIDragSessionXlib.h
-include/${MOZILLA}/widget/nsIDragTracker.h
 include/${MOZILLA}/widget/nsIEventListener.h
 include/${MOZILLA}/widget/nsIFilePicker.h
 include/${MOZILLA}/widget/nsIFormatConverter.h
@@ -2504,7 +2525,6 @@ include/${MOZILLA}/widget/nsIMenuRollup.h
 include/${MOZILLA}/widget/nsIMouseListener.h
 include/${MOZILLA}/widget/nsINativeScrollbar.h
 include/${MOZILLA}/widget/nsIPluginWidget.h
-include/${MOZILLA}/widget/nsIPopUpMenu.h
 include/${MOZILLA}/widget/nsIRollupListener.h
 include/${MOZILLA}/widget/nsISound.h
 include/${MOZILLA}/widget/nsITextWidget.h
@@ -2535,13 +2555,13 @@ include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
 include/${MOZILLA}/xpcom/nsArray.h
 include/${MOZILLA}/xpcom/nsArrayEnumerator.h
 include/${MOZILLA}/xpcom/nsAtomService.h
+include/${MOZILLA}/xpcom/nsAutoBuffer.h
 include/${MOZILLA}/xpcom/nsAutoLock.h
 include/${MOZILLA}/xpcom/nsAutoPtr.h
 include/${MOZILLA}/xpcom/nsBaseHashtable.h
 include/${MOZILLA}/xpcom/nsCOMArray.h
 include/${MOZILLA}/xpcom/nsCOMPtr.h
 include/${MOZILLA}/xpcom/nsCRT.h
-include/${MOZILLA}/xpcom/nsCWeakReference.h
 include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
 include/${MOZILLA}/xpcom/nsCheapSets.h
 include/${MOZILLA}/xpcom/nsClassHashtable.h
@@ -2552,6 +2572,7 @@ include/${MOZILLA}/xpcom/nsComponentManagerUtils.h
 include/${MOZILLA}/xpcom/nsCppSharedAllocator.h
 include/${MOZILLA}/xpcom/nsDataHashtable.h
 include/${MOZILLA}/xpcom/nsDebug.h
+include/${MOZILLA}/xpcom/nsDebugImpl.h
 include/${MOZILLA}/xpcom/nsDeque.h
 include/${MOZILLA}/xpcom/nsDirectoryService.h
 include/${MOZILLA}/xpcom/nsDirectoryServiceDefs.h
@@ -2568,9 +2589,7 @@ include/${MOZILLA}/xpcom/nsGenericFactory.h
 include/${MOZILLA}/xpcom/nsHashKeys.h
 include/${MOZILLA}/xpcom/nsHashSets.h
 include/${MOZILLA}/xpcom/nsHashtable.h
-include/${MOZILLA}/xpcom/nsHashtableEnumerator.h
 include/${MOZILLA}/xpcom/nsIAllocator.h
-include/${MOZILLA}/xpcom/nsIArena.h
 include/${MOZILLA}/xpcom/nsIArray.h
 include/${MOZILLA}/xpcom/nsIAsyncInputStream.h
 include/${MOZILLA}/xpcom/nsIAsyncOutputStream.h
@@ -2592,11 +2611,14 @@ include/${MOZILLA}/xpcom/nsIConsoleListener.h
 include/${MOZILLA}/xpcom/nsIConsoleMessage.h
 include/${MOZILLA}/xpcom/nsIConsoleService.h
 include/${MOZILLA}/xpcom/nsID.h
+include/${MOZILLA}/xpcom/nsIDebug.h
 include/${MOZILLA}/xpcom/nsIDirectoryService.h
 include/${MOZILLA}/xpcom/nsIEnumerator.h
+include/${MOZILLA}/xpcom/nsIEnvironment.h
 include/${MOZILLA}/xpcom/nsIErrorService.h
 include/${MOZILLA}/xpcom/nsIEventQueue.h
 include/${MOZILLA}/xpcom/nsIEventQueueService.h
+include/${MOZILLA}/xpcom/nsIEventTarget.h
 include/${MOZILLA}/xpcom/nsIException.h
 include/${MOZILLA}/xpcom/nsIExceptionService.h
 include/${MOZILLA}/xpcom/nsIFactory.h
@@ -2642,7 +2664,6 @@ include/${MOZILLA}/xpcom/nsISimpleEnumerator.h
 include/${MOZILLA}/xpcom/nsIStorageStream.h
 include/${MOZILLA}/xpcom/nsIStreamBufferAccess.h
 include/${MOZILLA}/xpcom/nsIStringEnumerator.h
-include/${MOZILLA}/xpcom/nsIStringService.h
 include/${MOZILLA}/xpcom/nsIStringStream.h
 include/${MOZILLA}/xpcom/nsISupports.h
 include/${MOZILLA}/xpcom/nsISupportsArray.h
@@ -2653,11 +2674,11 @@ include/${MOZILLA}/xpcom/nsISupportsObsolete.h
 include/${MOZILLA}/xpcom/nsISupportsPrimitives.h
 include/${MOZILLA}/xpcom/nsISupportsUtils.h
 include/${MOZILLA}/xpcom/nsIThread.h
-include/${MOZILLA}/xpcom/nsIThreadPool.h
 include/${MOZILLA}/xpcom/nsITimelineService.h
 include/${MOZILLA}/xpcom/nsITimer.h
 include/${MOZILLA}/xpcom/nsITimerInternal.h
 include/${MOZILLA}/xpcom/nsITimerManager.h
+include/${MOZILLA}/xpcom/nsITraceRefcnt.h
 include/${MOZILLA}/xpcom/nsIUnicharBuffer.h
 include/${MOZILLA}/xpcom/nsIUnicharInputStream.h
 include/${MOZILLA}/xpcom/nsIVariant.h
@@ -2681,6 +2702,7 @@ include/${MOZILLA}/xpcom/nsProxyEvent.h
 include/${MOZILLA}/xpcom/nsProxyRelease.h
 include/${MOZILLA}/xpcom/nsQuickSort.h
 include/${MOZILLA}/xpcom/nsRecyclingAllocator.h
+include/${MOZILLA}/xpcom/nsRefPtrHashtable.h
 include/${MOZILLA}/xpcom/nsScriptableInputStream.h
 include/${MOZILLA}/xpcom/nsStaticAtom.h
 include/${MOZILLA}/xpcom/nsStaticComponent.h
@@ -2696,10 +2718,10 @@ include/${MOZILLA}/xpcom/nsTHashtable.h
 include/${MOZILLA}/xpcom/nsTextFormatter.h
 include/${MOZILLA}/xpcom/nsTime.h
 include/${MOZILLA}/xpcom/nsTraceRefcnt.h
+include/${MOZILLA}/xpcom/nsTraceRefcntImpl.h
 include/${MOZILLA}/xpcom/nsUnitConversion.h
 include/${MOZILLA}/xpcom/nsValueArray.h
 include/${MOZILLA}/xpcom/nsVariant.h
-include/${MOZILLA}/xpcom/nsVector.h
 include/${MOZILLA}/xpcom/nsVoidArray.h
 include/${MOZILLA}/xpcom/nsWeakPtr.h
 include/${MOZILLA}/xpcom/nsWeakReference.h
@@ -2710,8 +2732,8 @@ include/${MOZILLA}/xpcom/nscore.h
 include/${MOZILLA}/xpcom/nsrootidl.h
 include/${MOZILLA}/xpcom/pldhash.h
 include/${MOZILLA}/xpcom/plevent.h
-include/${MOZILLA}/xpcom/plvector.h
 include/${MOZILLA}/xpcom/xcDll.h
+include/${MOZILLA}/xpcom/xpcom-config.h
 include/${MOZILLA}/xpcom/xpt_arena.h
 include/${MOZILLA}/xpcom/xpt_struct.h
 include/${MOZILLA}/xpcom/xpt_xdr.h
@@ -2726,6 +2748,7 @@ include/${MOZILLA}/xpcom_obsolete/nsIFileStream.h
 include/${MOZILLA}/xpcom_obsolete/nsIRegistry.h
 include/${MOZILLA}/xpcom_obsolete/nsIRegistryUtils.h
 include/${MOZILLA}/xpcom_obsolete/nsSpecialSystemDirectory.h
+include/${MOZILLA}/xpcom_obsolete/xpcomobsolete.h
 include/${MOZILLA}/xpconnect/XPCIDispatch.h
 include/${MOZILLA}/xpconnect/mozIJSSubScriptLoader.h
 include/${MOZILLA}/xpconnect/nsIJSContextStack.h
@@ -2760,6 +2783,7 @@ include/${MOZILLA}/xuldoc/nsIController.h
 include/${MOZILLA}/xuldoc/nsIControllers.h
 include/${MOZILLA}/xuldoc/nsIXULContentSink.h
 include/${MOZILLA}/xuldoc/nsIXULDocument.h
+include/${MOZILLA}/xuldoc/nsIXULOverlayProvider.h
 include/${MOZILLA}/xuldoc/nsIXULPrototypeCache.h
 include/${MOZILLA}/xuldoc/nsIXULPrototypeDocument.h
 include/${MOZILLA}/xultmpl/nsIXULBuilderListener.h
@@ -2768,12 +2792,254 @@ include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h
 include/${MOZILLA}/zlib/zconf.h
 include/${MOZILLA}/zlib/zlib.h
 @comment end INCLUDE
+@comment begin INCLUDE-PUBLIC
+include/${MOZILLA}/ldap/ldap-standard.h
+include/${MOZILLA}/ldap/disptmpl.h
+include/${MOZILLA}/ldap/lber.h
+include/${MOZILLA}/ldap/ldap.h
+include/${MOZILLA}/ldap/ldap-extension.h
+include/${MOZILLA}/ldap/ldap-platform.h
+include/${MOZILLA}/ldap/ldap-to-be-deprecated.h
+include/${MOZILLA}/ldap/ldap-deprecated.h
+include/${MOZILLA}/ldap/ldap_ssl.h
+include/${MOZILLA}/ldap/ldappr.h
+include/${MOZILLA}/ldap/iutil.h
+include/${MOZILLA}/ldap/srchpref.h
+include/${MOZILLA}/ldap-private/ldap-int.h
+include/${MOZILLA}/ldap-private/lber-int.h
+include/${MOZILLA}/ldap-private/portable.h
+include/${MOZILLA}/ldap-private/ldaprot.h
+include/${MOZILLA}/ldap-private/ldaplog.h
+include/${MOZILLA}/ldap-nspr/obsolete/pralarm.h
+include/${MOZILLA}/ldap-nspr/obsolete/probslet.h
+include/${MOZILLA}/ldap-nspr/obsolete/protypes.h
+include/${MOZILLA}/ldap-nspr/obsolete/prsem.h
+include/${MOZILLA}/ldap-nspr/private/pprio.h
+include/${MOZILLA}/ldap-nspr/private/pprthred.h
+include/${MOZILLA}/ldap-nspr/private/prpriv.h
+include/${MOZILLA}/ldap-nspr/md/sunos4.h
+include/${MOZILLA}/ldap-nspr/md/_aix64.cfg
+include/${MOZILLA}/ldap-nspr/md/_beos.cfg
+include/${MOZILLA}/ldap-nspr/md/_bsdi.cfg
+include/${MOZILLA}/ldap-nspr/md/_darwin.cfg
+include/${MOZILLA}/ldap-nspr/md/_dgux.cfg
+include/${MOZILLA}/ldap-nspr/md/_freebsd.cfg
+include/${MOZILLA}/ldap-nspr/md/_hpux32.cfg
+include/${MOZILLA}/ldap-nspr/md/_hpux64.cfg
+include/${MOZILLA}/ldap-nspr/md/_irix32.cfg
+include/${MOZILLA}/ldap-nspr/md/_irix64.cfg
+include/${MOZILLA}/ldap-nspr/md/_linux.cfg
+include/${MOZILLA}/ldap-nspr/md/_ncr.cfg
+include/${MOZILLA}/ldap-nspr/md/_nec.cfg
+include/${MOZILLA}/ldap-nspr/md/_netbsd.cfg
+include/${MOZILLA}/ldap-nspr/md/_nextstep.cfg
+include/${MOZILLA}/ldap-nspr/md/_nto.cfg
+include/${MOZILLA}/ldap-nspr/md/_openbsd.cfg
+include/${MOZILLA}/ldap-nspr/md/_openvms.cfg
+include/${MOZILLA}/ldap-nspr/md/_os2.cfg
+include/${MOZILLA}/ldap-nspr/md/_osf1.cfg
+include/${MOZILLA}/ldap-nspr/md/_qnx.cfg
+include/${MOZILLA}/ldap-nspr/md/_reliantunix.cfg
+include/${MOZILLA}/ldap-nspr/md/_rhapsody.cfg
+include/${MOZILLA}/ldap-nspr/md/_scoos.cfg
+include/${MOZILLA}/ldap-nspr/md/_solaris32.cfg
+include/${MOZILLA}/ldap-nspr/md/_solaris64.cfg
+include/${MOZILLA}/ldap-nspr/md/_sony.cfg
+include/${MOZILLA}/ldap-nspr/md/_sunos4.cfg
+include/${MOZILLA}/ldap-nspr/md/_unixware.cfg
+include/${MOZILLA}/ldap-nspr/md/_unixware7.cfg
+include/${MOZILLA}/ldap-nspr/md/_win16.cfg
+include/${MOZILLA}/ldap-nspr/md/_win95.cfg
+include/${MOZILLA}/ldap-nspr/md/_winnt.cfg
+include/${MOZILLA}/ldap-nspr/md/_aix.h
+include/${MOZILLA}/ldap-nspr/md/_beos.h
+include/${MOZILLA}/ldap-nspr/md/_bsdi.h
+include/${MOZILLA}/ldap-nspr/md/_darwin.h
+include/${MOZILLA}/ldap-nspr/md/_dgux.h
+include/${MOZILLA}/ldap-nspr/md/_freebsd.h
+include/${MOZILLA}/ldap-nspr/md/_hpux.h
+include/${MOZILLA}/ldap-nspr/md/_irix.h
+include/${MOZILLA}/ldap-nspr/md/_linux.h
+include/${MOZILLA}/ldap-nspr/md/_macos.h
+include/${MOZILLA}/ldap-nspr/md/_ncr.h
+include/${MOZILLA}/ldap-nspr/md/_nec.h
+include/${MOZILLA}/ldap-nspr/md/_netbsd.h
+include/${MOZILLA}/ldap-nspr/md/_nextstep.h
+include/${MOZILLA}/ldap-nspr/md/_nspr_pthread.h
+include/${MOZILLA}/ldap-nspr/md/_nto.h
+include/${MOZILLA}/ldap-nspr/md/_openbsd.h
+include/${MOZILLA}/ldap-nspr/md/_openvms.h
+include/${MOZILLA}/ldap-nspr/md/_os2.h
+include/${MOZILLA}/ldap-nspr/md/_os2_errors.h
+include/${MOZILLA}/ldap-nspr/md/_osf1.h
+include/${MOZILLA}/ldap-nspr/md/_pcos.h
+include/${MOZILLA}/ldap-nspr/md/_pth.h
+include/${MOZILLA}/ldap-nspr/md/_qnx.h
+include/${MOZILLA}/ldap-nspr/md/_reliantunix.h
+include/${MOZILLA}/ldap-nspr/md/_rhapsody.h
+include/${MOZILLA}/ldap-nspr/md/_scoos.h
+include/${MOZILLA}/ldap-nspr/md/_solaris.h
+include/${MOZILLA}/ldap-nspr/md/_sony.h
+include/${MOZILLA}/ldap-nspr/md/_sunos4.h
+include/${MOZILLA}/ldap-nspr/md/_unix_errors.h
+include/${MOZILLA}/ldap-nspr/md/_unixos.h
+include/${MOZILLA}/ldap-nspr/md/_unixware.h
+include/${MOZILLA}/ldap-nspr/md/_win16.h
+include/${MOZILLA}/ldap-nspr/md/_win32_errors.h
+include/${MOZILLA}/ldap-nspr/md/_win95.h
+include/${MOZILLA}/ldap-nspr/md/_winnt.h
+include/${MOZILLA}/ldap-nspr/md/prosdep.h
+include/${MOZILLA}/ldap-nspr/md/_aix32.cfg
+include/${MOZILLA}/ldap-nspr/prtrace.h
+include/${MOZILLA}/ldap-nspr/prtpool.h
+include/${MOZILLA}/ldap-nspr/prtime.h
+include/${MOZILLA}/ldap-nspr/prthread.h
+include/${MOZILLA}/ldap-nspr/prsystem.h
+include/${MOZILLA}/ldap-nspr/prshma.h
+include/${MOZILLA}/ldap-nspr/prshm.h
+include/${MOZILLA}/ldap-nspr/prrwlock.h
+include/${MOZILLA}/ldap-nspr/prrng.h
+include/${MOZILLA}/ldap-nspr/prproces.h
+include/${MOZILLA}/ldap-nspr/prprf.h
+include/${MOZILLA}/ldap-nspr/prpdce.h
+include/${MOZILLA}/ldap-nspr/prolock.h
+include/${MOZILLA}/ldap-nspr/prnetdb.h
+include/${MOZILLA}/ldap-nspr/prmwait.h
+include/${MOZILLA}/ldap-nspr/prmon.h
+include/${MOZILLA}/ldap-nspr/prmem.h
+include/${MOZILLA}/ldap-nspr/prlong.h
+include/${MOZILLA}/ldap-nspr/prlog.h
+include/${MOZILLA}/ldap-nspr/prlock.h
+include/${MOZILLA}/ldap-nspr/prlink.h
+include/${MOZILLA}/ldap-nspr/pripcsem.h
+include/${MOZILLA}/ldap-nspr/prio.h
+include/${MOZILLA}/ldap-nspr/prinrval.h
+include/${MOZILLA}/ldap-nspr/prinit.h
+include/${MOZILLA}/ldap-nspr/prinet.h
+include/${MOZILLA}/ldap-nspr/prerror.h
+include/${MOZILLA}/ldap-nspr/prerr.h
+include/${MOZILLA}/ldap-nspr/prenv.h
+include/${MOZILLA}/ldap-nspr/prdtoa.h
+include/${MOZILLA}/ldap-nspr/prcvar.h
+include/${MOZILLA}/ldap-nspr/prcpucfg.h
+include/${MOZILLA}/ldap-nspr/prcountr.h
+include/${MOZILLA}/ldap-nspr/prcmon.h
+include/${MOZILLA}/ldap-nspr/prclist.h
+include/${MOZILLA}/ldap-nspr/prbit.h
+include/${MOZILLA}/ldap-nspr/pratom.h
+include/${MOZILLA}/ldap-nspr/plstr.h
+include/${MOZILLA}/ldap-nspr/plresolv.h
+include/${MOZILLA}/ldap-nspr/plhash.h
+include/${MOZILLA}/ldap-nspr/plgetopt.h
+include/${MOZILLA}/ldap-nspr/prwin16.h
+include/${MOZILLA}/ldap-nspr/plbase64.h
+include/${MOZILLA}/ldap-nspr/plarenas.h
+include/${MOZILLA}/ldap-nspr/plarena.h
+include/${MOZILLA}/ldap-nspr/nspr.h
+include/${MOZILLA}/ldap-nspr/plerror.h
+include/${MOZILLA}/ldap-nspr/prvrsion.h
+include/${MOZILLA}/ldap-nspr/prtypes.h
+include/${MOZILLA}/nss/base64.h
+include/${MOZILLA}/nss/ciferfam.h
+include/${MOZILLA}/nss/nssb64.h
+include/${MOZILLA}/nss/nssb64t.h
+include/${MOZILLA}/nss/nsslocks.h
+include/${MOZILLA}/nss/nssilock.h
+include/${MOZILLA}/nss/nssilckt.h
+include/${MOZILLA}/nss/nssrwlk.h
+include/${MOZILLA}/nss/nssrwlkt.h
+include/${MOZILLA}/nss/portreg.h
+include/${MOZILLA}/nss/secasn1.h
+include/${MOZILLA}/nss/secasn1t.h
+include/${MOZILLA}/nss/seccomon.h
+include/${MOZILLA}/nss/secder.h
+include/${MOZILLA}/nss/secdert.h
+include/${MOZILLA}/nss/secdig.h
+include/${MOZILLA}/nss/secdigt.h
+include/${MOZILLA}/nss/secitem.h
+include/${MOZILLA}/nss/secoid.h
+include/${MOZILLA}/nss/secoidt.h
+include/${MOZILLA}/nss/secport.h
+include/${MOZILLA}/nss/secerr.h
+include/${MOZILLA}/nss/watcomfx.h
+include/${MOZILLA}/nss/blapit.h
+include/${MOZILLA}/nss/shsign.h
+include/${MOZILLA}/nss/ecl-exp.h
+include/${MOZILLA}/nss/pkcs11.h
+include/${MOZILLA}/nss/pkcs11f.h
+include/${MOZILLA}/nss/pkcs11p.h
+include/${MOZILLA}/nss/pkcs11t.h
+include/${MOZILLA}/nss/pkcs11n.h
+include/${MOZILLA}/nss/pkcs11u.h
+include/${MOZILLA}/nss/nssbaset.h
+include/${MOZILLA}/nss/nssbase.h
+include/${MOZILLA}/nss/cert.h
+include/${MOZILLA}/nss/certt.h
+include/${MOZILLA}/nss/certdb.h
+include/${MOZILLA}/nss/ocsp.h
+include/${MOZILLA}/nss/ocspt.h
+include/${MOZILLA}/nss/secmod.h
+include/${MOZILLA}/nss/secmodt.h
+include/${MOZILLA}/nss/secpkcs5.h
+include/${MOZILLA}/nss/pk11func.h
+include/${MOZILLA}/nss/pk11sdr.h
+include/${MOZILLA}/nss/pk11pqg.h
+include/${MOZILLA}/nss/cryptohi.h
+include/${MOZILLA}/nss/cryptoht.h
+include/${MOZILLA}/nss/hasht.h
+include/${MOZILLA}/nss/key.h
+include/${MOZILLA}/nss/keyhi.h
+include/${MOZILLA}/nss/keyt.h
+include/${MOZILLA}/nss/keythi.h
+include/${MOZILLA}/nss/sechash.h
+include/${MOZILLA}/nss/nss.h
+include/${MOZILLA}/nss/ssl.h
+include/${MOZILLA}/nss/sslt.h
+include/${MOZILLA}/nss/sslerr.h
+include/${MOZILLA}/nss/sslproto.h
+include/${MOZILLA}/nss/preenc.h
+include/${MOZILLA}/nss/pkcs12t.h
+include/${MOZILLA}/nss/pkcs12.h
+include/${MOZILLA}/nss/p12plcy.h
+include/${MOZILLA}/nss/p12.h
+include/${MOZILLA}/nss/p12t.h
+include/${MOZILLA}/nss/secmime.h
+include/${MOZILLA}/nss/secpkcs7.h
+include/${MOZILLA}/nss/pkcs7t.h
+include/${MOZILLA}/nss/cms.h
+include/${MOZILLA}/nss/cmst.h
+include/${MOZILLA}/nss/smime.h
+include/${MOZILLA}/nss/cmsreclist.h
+include/${MOZILLA}/nss/crmf.h
+include/${MOZILLA}/nss/crmft.h
+include/${MOZILLA}/nss/cmmf.h
+include/${MOZILLA}/nss/cmmft.h
+include/${MOZILLA}/nss/jar.h
+include/${MOZILLA}/nss/jar-ds.h
+include/${MOZILLA}/nss/jarfile.h
+include/${MOZILLA}/nss/nssckbi.h
+include/${MOZILLA}/nss/nssck.api
+include/${MOZILLA}/nss/nssckepv.h
+include/${MOZILLA}/nss/nssckft.h
+include/${MOZILLA}/nss/nssckfw.h
+include/${MOZILLA}/nss/nssckfwc.h
+include/${MOZILLA}/nss/nssckfwt.h
+include/${MOZILLA}/nss/nssckg.h
+include/${MOZILLA}/nss/nssckmdt.h
+include/${MOZILLA}/nss/nssckt.h
+include/${MOZILLA}/nss/swfort.h
+include/${MOZILLA}/nss/swfortt.h
+include/${MOZILLA}/seccmd/secutil.h
+@comment end INCLUDE-PUBLIC
 @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}/chrome/chrome.rdf
+@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
+@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/skin/stylesheets.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/cookie/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/editor/content/overlays.rdf
+@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/global/skin/stylesheets.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/inspector/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
@@ -2785,12 +3051,17 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/messenger
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/inspector/content
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/inspector
+@dirrm lib/${MOZILLA}/chrome/overlayinfo/global/skin
+@dirrm lib/${MOZILLA}/chrome/overlayinfo/global
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/editor/content
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/editor
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/cookie/content
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/cookie
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/communicator/content
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/communicator
+@dirrm lib/${MOZILLA}/chrome/overlayinfo/browser/skin
+@dirrm lib/${MOZILLA}/chrome/overlayinfo/browser/content
+@dirrm lib/${MOZILLA}/chrome/overlayinfo/browser
 @dirrm lib/${MOZILLA}/chrome/overlayinfo
 @comment begin DIRS
 @dirrm lib/${MOZILLA}/searchplugins
@@ -2808,7 +3079,9 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/ipc/modules
 @dirrm lib/${MOZILLA}/ipc
+@dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/icons
+@dirrm lib/${MOZILLA}/greprefs
 @dirrm lib/${MOZILLA}/defaults/wallet
 @dirrm lib/${MOZILLA}/defaults/profile/chrome
 @dirrm lib/${MOZILLA}/defaults/profile/US/chrome
@@ -2817,6 +3090,8 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/defaults/pref
 @dirrm lib/${MOZILLA}/defaults/messenger/US
 @dirrm lib/${MOZILLA}/defaults/messenger
+@dirrm lib/${MOZILLA}/defaults/isp/US
+@dirrm lib/${MOZILLA}/defaults/isp
 @dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
 @dirrm lib/${MOZILLA}/components/myspell
@@ -2859,7 +3134,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/ucvibm
 @dirrm include/${MOZILLA}/ucvcn
 @dirrm include/${MOZILLA}/uconv
-@dirrm include/${MOZILLA}/ucnative
 @dirrm include/${MOZILLA}/typeaheadfind
 @dirrm include/${MOZILLA}/txtsvc
 @dirrm include/${MOZILLA}/txmgr
@@ -2867,6 +3141,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/spellchecker
 @dirrm include/${MOZILLA}/sidebar
 @dirrm include/${MOZILLA}/shistory
+@dirrm include/${MOZILLA}/seccmd
 @dirrm include/${MOZILLA}/rdfutil
 @dirrm include/${MOZILLA}/rdf
 @dirrm include/${MOZILLA}/progressDlg
@@ -2882,6 +3157,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/pipboot
 @dirrm include/${MOZILLA}/p3p
 @dirrm include/${MOZILLA}/oji
+@dirrm include/${MOZILLA}/nss
 @dirrm include/${MOZILLA}/nspr/private
 @dirrm include/${MOZILLA}/nspr/obsolete
 @dirrm include/${MOZILLA}/nspr/md
@@ -2900,7 +3176,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/msgbase
 @dirrm include/${MOZILLA}/mozldap
 @dirrm include/${MOZILLA}/mork
-@dirrm include/${MOZILLA}/mng
 @dirrm include/${MOZILLA}/mimetype
 @dirrm include/${MOZILLA}/mimeemitter
 @dirrm include/${MOZILLA}/mime
@@ -2911,6 +3186,12 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/liveconnect
 @dirrm include/${MOZILLA}/libreg
 @dirrm include/${MOZILLA}/libart_lgpl
+@dirrm include/${MOZILLA}/ldap-nspr/md
+@dirrm include/${MOZILLA}/ldap-nspr/private
+@dirrm include/${MOZILLA}/ldap-nspr/obsolete
+@dirrm include/${MOZILLA}/ldap-nspr
+@dirrm include/${MOZILLA}/ldap-private
+@dirrm include/${MOZILLA}/ldap
 @dirrm include/${MOZILLA}/layout
 @dirrm include/${MOZILLA}/jsurl
 @dirrm include/${MOZILLA}/jsdebug
@@ -2927,6 +3208,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/icalss
 @dirrm include/${MOZILLA}/ical
 @dirrm include/${MOZILLA}/htmlparser
+@dirrm include/${MOZILLA}/history
 @dirrm include/${MOZILLA}/helperAppDlg
 @dirrm include/${MOZILLA}/gtkxtbin
 @dirrm include/${MOZILLA}/gtkembedmoz
@@ -2935,7 +3217,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/filepicker
 @dirrm include/${MOZILLA}/exthandler
 @dirrm include/${MOZILLA}/expat
-@dirrm include/${MOZILLA}/embedstring
 @dirrm include/${MOZILLA}/embedcomponents
 @dirrm include/${MOZILLA}/embed_base
 @dirrm include/${MOZILLA}/editor
@@ -2947,7 +3228,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/content
 @dirrm include/${MOZILLA}/composer
 @dirrm include/${MOZILLA}/commandhandler
-@dirrm include/${MOZILLA}/chrome
 @dirrm include/${MOZILLA}/chardet
 @dirrm include/${MOZILLA}/caps
 @dirrm include/${MOZILLA}/calendar
diff --git a/www/mozilla-stable/buildlink3.mk b/www/mozilla-stable/buildlink3.mk
index f8bd9266d64..b8c754cca2b 100644
--- a/www/mozilla-stable/buildlink3.mk
+++ b/www/mozilla-stable/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/12/04 03:50:40 taya Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_STABLE_BUILDLINK3_MK:=	${MOZILLA_STABLE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmozilla-stable}
 BUILDLINK_PACKAGES+=	mozilla-stable
 
 .if !empty(MOZILLA_STABLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla-stable+=	mozilla-stable>=1.4.1nb2
+BUILDLINK_DEPENDS.mozilla-stable+=	mozilla-stable>=1.7.3
 BUILDLINK_PKGSRCDIR.mozilla-stable?=	../../www/mozilla-stable
 .endif	# MOZILLA_STABLE_BUILDLINK3_MK
 
diff --git a/www/mozilla-stable/distinfo b/www/mozilla-stable/distinfo
index 817c2c66173..f78a35c4876 100644
--- a/www/mozilla-stable/distinfo
+++ b/www/mozilla-stable/distinfo
@@ -1,30 +1,40 @@
-$NetBSD: distinfo,v 1.10 2004/06/05 10:20:55 taya Exp $
+$NetBSD: distinfo,v 1.11 2004/12/04 03:50:40 taya Exp $
 
-SHA1 (mozilla-1.4.1.tar.bz2) = e44aee7c8b3e3d13bdd2d654662694d14a0e40c3
-Size (mozilla-1.4.1.tar.bz2) = 32132892 bytes
-SHA1 (mozilla-source-1.4.1-libart_lgpl.tar.bz2) = 29a76a1049ddeb495cb2d4534e82320f0cfce44b
-Size (mozilla-source-1.4.1-libart_lgpl.tar.bz2) = 96745 bytes
-SHA1 (patch-ab) = 8447517ec289181829c958cd1b93b6663a86c87c
-SHA1 (patch-ac) = ead2209e8e7b2080d1813a084fc3ee60795d595f
-SHA1 (patch-ad) = a96cc108816a064200ad5064a2070c7cfd99e88b
-SHA1 (patch-ae) = 7f43871b9ba696e1c6a1a8fc3746221acb4a602b
-SHA1 (patch-af) = 009c8c699f04bdc0deaab984ec6b946ff8acf937
-SHA1 (patch-ag) = 99b1849e5c634c277c57834cb8ab7a6af4bc7357
-SHA1 (patch-ah) = 8559caee67d76a04710808fe880411abe9f661a0
-SHA1 (patch-ai) = e56bc681e5a30cf7be1cffdfb845a53478b49c55
-SHA1 (patch-aj) = c11a87177ec8ec7c96d367c4b9a8a72b4fbbc7ce
-SHA1 (patch-ak) = e5e3fb956538526fd7bc3cd43e1770cc08df7455
-SHA1 (patch-al) = 23298a74a4ab5fef3c21d397227b5b266398dafe
-SHA1 (patch-am) = a016a23caf3ff46dd5eaeac54fec2d059f68e555
-SHA1 (patch-an) = 59c152183b14c96ea7767b0aee8bba76f4ee12e2
-SHA1 (patch-ao) = d8a524f73edf0a6b447bd5fd1fd139a61d257077
-SHA1 (patch-aw) = be0e726ba8fbde4a9650786dc6f8ec04e9669c3d
-SHA1 (patch-ba) = 63baf096f81c96bdb7fc56c00939a07a01a672dd
-SHA1 (patch-bb) = c5350823464250546f95d1c0962ba7ba6a16aa2f
-SHA1 (patch-be) = f8046c3bd5c29214d5b9ace250fcf83e57a361fd
-SHA1 (patch-bm) = 7fa8e9701df888a52329b4ecc76ad166038fce06
-SHA1 (patch-bn) = 475190596a9d143b659ff95d23c8b024acf41d88
-SHA1 (patch-bo) = 6763f73c5736e9414e05495a9f92d7c7c8110d91
-SHA1 (patch-bp) = 470f8f2b359b5ee84eb050a4a55fb35ce696b3b1
-SHA1 (patch-bq) = 0c520287d97027da06a5aa65cbd038bf19a49dde
-SHA1 (patch-bugzilla220122) = ef65ed3f1da6452884d71aaf33b83c510dc3f0d2
+SHA1 (mozilla-source-1.7.3.tar.bz2) = ca588b12d944d478ebe193a76d4b487f8db1e38c
+Size (mozilla-source-1.7.3.tar.bz2) = 29716200 bytes
+SHA1 (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = cb8f05dc11eb6fd954a15f6c04e2904c8d4d3f94
+Size (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = 102926 bytes
+SHA1 (patch-aa) = be62070f062e8ae13f06bd7b3f4f0d4a9ee67bef
+SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f
+SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
+SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
+SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
+SHA1 (patch-af) = 547ebc0d72a012f636839f416f872125c15846ba
+SHA1 (patch-ag) = bdfc47157ac42ea826ee187ae0a23121561ec9f4
+SHA1 (patch-ah) = ffaa0800415c7e20a5242ae6b7369dc73354582a
+SHA1 (patch-ai) = dd468f36359ee4520ee104c7c5b4c2335d953a98
+SHA1 (patch-aj) = 408c80da132d65ed7fa50e403fa863c7a3e5e287
+SHA1 (patch-ak) = 13082ce164b46edd8025cbc2866018dc121a919a
+SHA1 (patch-al) = 4c76cff49af5d5ef39136548a4de657ec804be5a
+SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
+SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
+SHA1 (patch-aw) = b42ddb3075fe9eb84334aec27f1c8e4ab3714b9b
+SHA1 (patch-ax) = 480094894cb53dee8d51c15b24dc03502c52071b
+SHA1 (patch-ba) = f5b7bf6356ecc373e1d201ca58fa24b34d7e122a
+SHA1 (patch-bb) = 4e222846e2aba9ea7c3f8ac4b5c9c4164223b44b
+SHA1 (patch-bj) = 84c564a2a32c0bdbdb57b2afff5ad82c2b73cf45
+SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
+SHA1 (patch-bo) = 7d6e0353666810992ab0b09d804f9f48ef90b984
+SHA1 (patch-bq) = 2a08f3eb1b6a8ea00e712d08b4bcafad3b766a81
+SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168
+SHA1 (patch-bs) = fb9f8f13ce481c04a0f7ecfd0ad4d8016cddc2e4
+SHA1 (patch-bt) = 70746626648624b38cc6e8795eb9c061be992342
+SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
+SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
+SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
+SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85
+SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
+SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
+SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
+SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
+SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76
diff --git a/www/mozilla-stable/files/moz-install b/www/mozilla-stable/files/moz-install
index 44bf94d8d3a..9405117236e 100755
--- a/www/mozilla-stable/files/moz-install
+++ b/www/mozilla-stable/files/moz-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.2 2003/11/27 23:36:42 taya Exp $
+# $NetBSD: moz-install,v 1.3 2004/12/04 03:50:40 taya Exp $
 
 ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA}
 ${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA}
@@ -35,7 +35,13 @@ done
 # install DSO
 for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
-	${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${PREFIX}/$i
+	${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${PREFIX}/$i
+done
+
+# install PKGCONFIG
+for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
+	src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`;
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
 done
 
 # install DATA
@@ -50,6 +56,12 @@ for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${
 	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
 done
 
+# install INCLUDE-PUBLIC
+for i in `${SED} -n -e '/^@comment begin INCLUDE-PUBLIC$/,/^@comment end INCLUDE-PUBLIC$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
+	src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/public@"`;
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
+done
+
 ${RM} -f ${TMP_PLIST}
 #
 #
@@ -57,3 +69,8 @@ ${RM} -f ${TMP_PLIST}
 cd ${PREFIX}/lib/${MOZILLA}
 ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom
 ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome
+
+#
+# remove generated user conf directory ${WRKDIR}/.mozilla
+#
+${RM} -rf ${WRKDIR}/.mozilla
diff --git a/www/mozilla-stable/files/mozilla-Mach-O.in b/www/mozilla-stable/files/mozilla-Mach-O.in
new file mode 100644
index 00000000000..99470536423
--- /dev/null
+++ b/www/mozilla-stable/files/mozilla-Mach-O.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@
+export MOZILLA_FIVE_HOME
+exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@"
diff --git a/www/mozilla-stable/files/xptcinvoke_sparc64_netbsd.cpp b/www/mozilla-stable/files/xptcinvoke_sparc64_netbsd.cpp
index 936ec1135ec..82d7c9cc3b5 100644
--- a/www/mozilla-stable/files/xptcinvoke_sparc64_netbsd.cpp
+++ b/www/mozilla-stable/files/xptcinvoke_sparc64_netbsd.cpp
@@ -69,7 +69,7 @@ invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
       */
       case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
       case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-      case nsXPTType::T_BOOL  : *((PRBool*)l_d)      = l_s->val.b;     break;
+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)      = l_s->val.b;     break;
       case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
       case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
 
diff --git a/www/mozilla-stable/patches/patch-aa b/www/mozilla-stable/patches/patch-aa
new file mode 100644
index 00000000000..21538dc5b6a
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2004/12/04 03:50:40 taya Exp $
+
+diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
+--- ../Orig/mozilla/config/autoconf.mk.in	2004-03-21 11:31:17.000000000 +0900
++++ ./config/autoconf.mk.in	2004-06-10 22:55:06.000000000 +0900
+@@ -31,13 +31,13 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZILLA_PKG_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZILLA_PKG_NAME)
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
diff --git a/www/mozilla-stable/patches/patch-ab b/www/mozilla-stable/patches/patch-ab
index 352c53c5451..85983fe6ffd 100644
--- a/www/mozilla-stable/patches/patch-ab
+++ b/www/mozilla-stable/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-ab,v 1.4 2004/12/04 03:50:40 taya Exp $
 
---- configure.in.orig	7 Mar 2003 21:25:31 -0000
-+++ configure.in	15 Apr 2003 14:53:02 -0000
-@@ -859,6 +859,9 @@
+--- configure.in.orig	Thu May 13 17:57:46 2004
++++ configure.in
+@@ -996,7 +996,6 @@ case "$target" in
+     powerpc*)
+         _PLATFORM_DEFAULT_TOOLKIT='mac'
+         DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
+-        MOZ_ENABLE_POSTSCRIPT=
+         # set MACOSX to generate lib/mac/MoreFiles/Makefile
+         MACOSX=1
+         ;;
+@@ -1017,6 +1016,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -12,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2003/11/27 23:36:42 taya Exp $
      ;; 
  
  *-hpux*)
-@@ -1134,6 +1137,13 @@
+@@ -1308,6 +1310,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -26,22 +34,12 @@ $NetBSD: patch-ab,v 1.3 2003/11/27 23:36:42 taya Exp $
      ;;
  
  *-nto*) 
-@@ -1493,7 +1503,7 @@
-                  [siginfo_t* info;],
-                  [ac_cv_siginfo_t=true],
-                  [ac_cv_siginfo_t=false])])
--if test "$ac_cv_siginfo_t" = true ; then
-+if test "$OS_TARGET" != "NetBSD" -a "$ac_cv_siginfo_t" = true ; then
-   AC_DEFINE(HAVE_SIGINFO_T)
-   AC_MSG_RESULT(yes)
- else
-@@ -2037,9 +2047,6 @@
- 				CXXFLAGS="$CXXFLAGS -mt" 
- 			fi
- 			;;
--	*-*-netbsd*)
--		USE_PTHREADS=
--		_PTHREAD_LDFLAGS=
- 	esac
- fi
- 
+@@ -1531,7 +1540,7 @@ dnl the qsort routine under solaris is f
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -z muldefs -h $@'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
diff --git a/www/mozilla-stable/patches/patch-ac b/www/mozilla-stable/patches/patch-ac
index 0915a2a4c50..d08bfe568db 100644
--- a/www/mozilla-stable/patches/patch-ac
+++ b/www/mozilla-stable/patches/patch-ac
@@ -1,8 +1,18 @@
-$NetBSD: patch-ac,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-ac,v 1.4 2004/12/04 03:50:40 taya Exp $
 
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2003-01-28 06:52:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	2003-03-14 16:58:41.000000000 +0900
-@@ -129,7 +129,7 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2004-04-22 22:50:05.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD 
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ endif
++ifeq (amd64,$(OS_TEST))
++CPPSRCS                := xptcinvoke_unixish_amd64.cpp xptcstubs_unixish_amd64.cpp
++endif
+ endif
+ #
+ # New code for Linux, et. al., with gcc
+@@ -140,7 +143,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -11,7 +21,7 @@ $NetBSD: patch-ac,v 1.3 2003/11/27 23:36:42 taya Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -163,7 +163,7 @@
+@@ -174,7 +177,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -20,7 +30,15 @@ $NetBSD: patch-ac,v 1.3 2003/11/27 23:36:42 taya Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -287,6 +287,13 @@
+@@ -257,6 +260,7 @@ endif
+ ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
+ CPPSRCS		:= xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
++AS		:= $(CC) -c -x assembler-with-cpp
+ endif
+ 
+ #
+@@ -305,6 +309,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
  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-stable/patches/patch-ad b/www/mozilla-stable/patches/patch-ad
index f480d746371..2c334c38c63 100644
--- a/www/mozilla-stable/patches/patch-ad
+++ b/www/mozilla-stable/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-ad,v 1.4 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2001-09-29 05:12:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2003-03-14 16:58:43.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2004-06-10 22:55:53.000000000 +0900
 @@ -132,6 +132,15 @@
      }
  }
diff --git a/www/mozilla-stable/patches/patch-ae b/www/mozilla-stable/patches/patch-ae
index d79e38d05fd..5a071daa107 100644
--- a/www/mozilla-stable/patches/patch-ae
+++ b/www/mozilla-stable/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-ae,v 1.4 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2003-03-14 16:58:45.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2004-06-10 22:55:55.000000000 +0900
 @@ -123,17 +123,27 @@
      }
  }
diff --git a/www/mozilla-stable/patches/patch-af b/www/mozilla-stable/patches/patch-af
index a6ec2abf4e1..494565561f9 100644
--- a/www/mozilla-stable/patches/patch-af
+++ b/www/mozilla-stable/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-af,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c
---- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c	2002-05-18 09:52:09.000000000 +0900
-+++ ./security/nss/lib/freebl/unix_rand.c	2003-03-14 16:58:47.000000000 +0900
+--- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c	2003-05-31 08:31:19.000000000 +0900
++++ ./security/nss/lib/freebl/unix_rand.c	2004-06-10 22:55:57.000000000 +0900
 @@ -32,6 +32,7 @@
   */
  
diff --git a/www/mozilla-stable/patches/patch-ag b/www/mozilla-stable/patches/patch-ag
index 7abff80c961..2a169fa4843 100644
--- a/www/mozilla-stable/patches/patch-ag
+++ b/www/mozilla-stable/patches/patch-ag
@@ -1,6 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2003/11/27 23:36:42 taya Exp $
---- extensions/transformiix/source/base/ErrorObserver.h.orig	2003-01-17 23:39:36.000000000 +1100
-+++ extensions/transformiix/source/base/ErrorObserver.h	2003-08-02 23:15:09.000000000 +1000
+$NetBSD: patch-ag,v 1.2 2004/12/04 03:50:40 taya Exp $
+
+diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
+--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h	2003-01-17 21:39:36.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h	2004-06-10 22:56:01.000000000 +0900
 @@ -28,7 +28,8 @@
  
  #include "baseutils.h"
diff --git a/www/mozilla-stable/patches/patch-ah b/www/mozilla-stable/patches/patch-ah
index 05fa23413f0..31bc15ca033 100644
--- a/www/mozilla-stable/patches/patch-ah
+++ b/www/mozilla-stable/patches/patch-ah
@@ -1,9 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2004/06/05 10:20:55 taya Exp $
-
 diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2003-02-23 09:06:55.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl	2004-06-05 15:49:00.000000000 +0900
-@@ -72,10 +72,11 @@
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 10:09:33.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl	2004-06-11 00:32:42.000000000 +0900
+@@ -76,10 +76,11 @@
  native FT_Sfnt_Tag(FT_Sfnt_Tag);
  native FT_Size(FT_Size);
  
@@ -16,8 +14,8 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
 +native FTC_ImageCache(FTC_ImageCache);
  native FTC_Manager(FTC_Manager);
  
- /*
-@@ -87,7 +88,7 @@
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
  
      readonly attribute FT_Library library;
      readonly attribute FTC_Manager FTCacheManager;
@@ -26,7 +24,7 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
  
      void    doneFace(in FT_Face face);
      void    doneFreeType(in FT_Library lib);
-@@ -103,16 +104,16 @@
+@@ -115,16 +116,16 @@
      void    outlineDecompose(in FT_Outline_p outline,
                               in const_FT_Outline_Funcs_p funcs, in voidPtr p);
      void    setCharmap(in FT_Face face, in FT_CharMap charmap);
@@ -44,6 +42,6 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
                         out FTC_Manager manager);
 -    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
 +    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- 
-     FT_ULong getFirstChar(in FT_Face face, out FT_UInt gindex);
-     FT_ULong getNextChar(in FT_Face face, in FT_ULong charcode, out FT_UInt gindex);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);
diff --git a/www/mozilla-stable/patches/patch-ai b/www/mozilla-stable/patches/patch-ai
index 85872013c03..3efd7304c3f 100644
--- a/www/mozilla-stable/patches/patch-ai
+++ b/www/mozilla-stable/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.1 2004/06/05 10:20:55 taya Exp $
+$NetBSD: patch-ai,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2003-04-23 01:25:08.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.cpp	2004-06-05 15:49:03.000000000 +0900
-@@ -1110,10 +1110,10 @@
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-02-05 10:57:05.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp	2004-06-10 23:00:08.000000000 +0900
+@@ -1141,10 +1141,10 @@
    
    mPixelSize = NSToIntRound(app2dev * mFont->size);
  
@@ -18,7 +18,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri
  
    nsresult rv;
    mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1159,7 +1159,7 @@
+@@ -1190,7 +1190,7 @@
    if (!face)
      return 0;
  
@@ -27,7 +27,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri
    nsresult rv = mFt2->GetImageCache(&iCache);
    if (NS_FAILED(rv)) {
      NS_ERROR("Failed to get Image Cache");
-@@ -1197,8 +1197,8 @@
+@@ -1228,8 +1228,8 @@
    
    FTC_Manager cManager;
    mFt2->GetFTCacheManager(&cManager);
@@ -38,7 +38,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri
    NS_ASSERTION(rv==0, "failed to get face/size");
    if (rv)
      return nsnull;
-@@ -1593,16 +1593,16 @@
+@@ -1622,16 +1622,16 @@
    mEntry->GetFamilyName(fontName);
    mEntry->GetStyleName(styleName);
    
diff --git a/www/mozilla-stable/patches/patch-aj b/www/mozilla-stable/patches/patch-aj
index 935cf7f2446..387397c237e 100644
--- a/www/mozilla-stable/patches/patch-aj
+++ b/www/mozilla-stable/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2004/06/05 10:20:55 taya Exp $
+$NetBSD: patch-aj,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h	2003-04-23 01:25:02.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.h	2004-06-05 15:49:06.000000000 +0900
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h	2004-04-17 06:31:42.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h	2004-06-10 23:03:07.000000000 +0900
 @@ -104,13 +104,13 @@
  typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
  typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
@@ -18,10 +18,10 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFree
                         FTC_Face_Requester, FT_Pointer, FTC_Manager*);
 -typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
 +typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- 
- typedef FT_ULong (*FT_Get_First_Char_t)(FT_Face, FT_UInt*);
- typedef FT_ULong (*FT_Get_Next_Char_t)(FT_Face, FT_ULong, FT_UInt*);
-@@ -157,7 +157,7 @@
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -165,7 +165,7 @@
    FT_Outline_Decompose_t    nsFT_Outline_Decompose;
    FT_Set_Charmap_t          nsFT_Set_Charmap;
    FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
@@ -30,7 +30,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFree
    FTC_Manager_Done_t        nsFTC_Manager_Done;
    FTC_Manager_New_t         nsFTC_Manager_New;
    FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -195,7 +195,7 @@
+@@ -213,7 +213,7 @@
    PRLibrary      *mSharedLib;
    FT_Library      mFreeTypeLibrary;
    FTC_Manager     mFTCacheManager;
diff --git a/www/mozilla-stable/patches/patch-ak b/www/mozilla-stable/patches/patch-ak
index dd2d8261f2d..4cb3f9ee305 100644
--- a/www/mozilla-stable/patches/patch-ak
+++ b/www/mozilla-stable/patches/patch-ak
@@ -1,24 +1,24 @@
-$NetBSD: patch-ak,v 1.1 2004/06/05 10:20:55 taya Exp $
+$NetBSD: patch-ak,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp	2003-02-23 09:07:04.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.cpp	2004-06-05 15:49:08.000000000 +0900
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp	2004-02-08 00:22:30.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp	2004-06-10 23:05:42.000000000 +0900
 @@ -110,11 +110,11 @@
    {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
    {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
    {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
 -  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
 -  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
++  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
++  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
    {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
    {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
 -  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-   {"FT_Get_First_Char",       NS_FT2_OFFSET(nsFT_Get_First_Char),       PR_FALSE},
-   {"FT_Get_Next_Char",        NS_FT2_OFFSET(nsFT_Get_Next_Char),        PR_FALSE},
-   {nsnull,                    0, 0},
-@@ -276,7 +276,7 @@
++  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
+ // #ifdef MOZ_SVG
+   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
+   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
+@@ -282,7 +282,7 @@
  } 
   
  NS_IMETHODIMP
@@ -27,7 +27,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr
                                FT_UInt glyphID, FT_Glyph *glyph)
  { 
    // call the FreeType2 function via the function pointer
-@@ -285,11 +285,11 @@
+@@ -291,11 +291,11 @@
  } 
   
  NS_IMETHODIMP
@@ -42,7 +42,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr
    return error ? NS_ERROR_FAILURE : NS_OK;
  } 
   
-@@ -314,7 +314,7 @@
+@@ -320,7 +320,7 @@
  } 
   
  NS_IMETHODIMP
@@ -51,7 +51,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr
  { 
    // call the FreeType2 function via the function pointer
    FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -345,7 +345,7 @@
+@@ -389,7 +389,7 @@
  } 
   
  NS_IMETHODIMP
diff --git a/www/mozilla-stable/patches/patch-al b/www/mozilla-stable/patches/patch-al
index ea596596b01..93a30018e31 100644
--- a/www/mozilla-stable/patches/patch-al
+++ b/www/mozilla-stable/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2004/06/05 10:20:55 taya Exp $
+$NetBSD: patch-al,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
 --- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h	2003-04-23 01:25:09.000000000 +0900
-+++ ./gfx/src/ps/nsFontMetricsPS.h	2004-06-05 15:49:34.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h	2004-06-10 23:06:23.000000000 +0900
 @@ -320,7 +320,7 @@
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
    nsCOMPtr<nsIFreeType2> mFt2;
diff --git a/www/mozilla-stable/patches/patch-am b/www/mozilla-stable/patches/patch-am
deleted file mode 100644
index 3c2007a03dc..00000000000
--- a/www/mozilla-stable/patches/patch-am
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-am,v 1.4 2003/11/27 23:36:42 taya Exp $
-
-diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthreads/ptio.c
---- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c	2003-01-21 05:50:00.000000000 +0900
-+++ ./nsprpub/pr/src/pthreads/ptio.c	2003-03-14 16:58:52.000000000 +0900
-@@ -194,7 +194,7 @@
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
-     || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
-     || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \
--    || defined(UNIXWARE)
-+    || defined(UNIXWARE) || defined(NETBSD)
- #define _PRSockOptVal_t void *
- #else
- #error "Cannot determine architecture"
-@@ -3428,6 +3428,15 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if defined(__NetBSD__) && defined(_PR_INET6) && defined(IPV6_V6ONLY)
-+	if(domain == PR_AF_INET6) {
-+		int	opt = 0;
-+		if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt))){
-+			close(osfd);
-+			return NULL;
-+            	}
-+	}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/mozilla-stable/patches/patch-an b/www/mozilla-stable/patches/patch-an
index e878e991545..e673e52af7e 100644
--- a/www/mozilla-stable/patches/patch-an
+++ b/www/mozilla-stable/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2004/06/05 10:20:55 taya Exp $
+$NetBSD: patch-an,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
 --- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h	2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h	2004-06-05 15:49:37.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h	2004-06-10 23:06:35.000000000 +0900
 @@ -110,7 +110,7 @@
    XImage *GetXImage(PRUint32 width, PRUint32 height);
    nsITrueTypeFontCatalogEntry *mFaceID;
diff --git a/www/mozilla-stable/patches/patch-ao b/www/mozilla-stable/patches/patch-ao
index fa058810e48..a27372cbf7c 100644
--- a/www/mozilla-stable/patches/patch-ao
+++ b/www/mozilla-stable/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2004/06/05 10:20:55 taya Exp $
+$NetBSD: patch-ao,v 1.2 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2003-04-23 01:25:12.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp	2004-06-05 15:49:40.000000000 +0900
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2003-12-25 17:24:52.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp	2004-06-10 23:06:38.000000000 +0900
 @@ -177,7 +177,7 @@
    FTC_Manager mgr;
    nsresult rv;
@@ -65,7 +65,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share
    mFt2->GetImageCache(&icache);
    if (!icache)
      return 0;
-@@ -725,7 +717,7 @@
+@@ -723,7 +715,7 @@
      if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
  #endif
  
diff --git a/www/mozilla-stable/patches/patch-aw b/www/mozilla-stable/patches/patch-aw
index 4c6859ea1aa..f7ac54e6245 100644
--- a/www/mozilla-stable/patches/patch-aw
+++ b/www/mozilla-stable/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-aw,v 1.4 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	2002-12-12 09:08:47.000000000 +0900
-+++ ./widget/src/gtksuperwin/Makefile.in	2003-03-14 16:58:54.000000000 +0900
+--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	2004-01-07 22:36:54.000000000 +0900
++++ ./widget/src/gtksuperwin/Makefile.in	2004-06-10 23:06:44.000000000 +0900
 @@ -25,6 +25,7 @@
  MODULE		= widget
  LIBRARY_NAME	= gtksuperwin
  EXPORT_LIBRARY = 1
 +MKSHLIB		= $(MKCSHLIB)
  
+ PACKAGE_FILE = gtksuperwin.pkg
  
- CSRCS           = \
diff --git a/www/mozilla-stable/patches/patch-ax b/www/mozilla-stable/patches/patch-ax
new file mode 100644
index 00000000000..f165c90a920
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-ax
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1 2004/12/04 03:50:40 taya Exp $
+
+diff -ru ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk
+--- ../Orig/mozilla/security/coreconf/SunOS5.mk	2003-05-16 04:12:10.000000000 +0900
++++ ./security/coreconf/SunOS5.mk	2004-06-10 23:06:47.000000000 +0900
+@@ -165,6 +165,10 @@
+ 	DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+ 
++ifdef LIBRUNPATH
++DSO_LDOPTS += -R$(LIBRUNPATH)
++endif
++
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)
+ ifdef NS_USE_GCC
diff --git a/www/mozilla-stable/patches/patch-ba b/www/mozilla-stable/patches/patch-ba
index 7fbde1116be..266681bd178 100644
--- a/www/mozilla-stable/patches/patch-ba
+++ b/www/mozilla-stable/patches/patch-ba
@@ -1,15 +1,15 @@
-$NetBSD: patch-ba,v 1.3 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-ba,v 1.4 2004/12/04 03:50:40 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	2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg	2003-03-14 16:58:58.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg	2004-06-10 23:06:59.000000000 +0900
 @@ -45,7 +45,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
  
 -#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__arm__) || \
-+	defined(__armel__) || defined(__MIPSEL__)
++#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
++	defined(__MIPSEL__)
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
@@ -64,7 +64,63 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/
 +#define PR_ALIGN_OF_DOUBLE  8 
 +#define PR_ALIGN_OF_POINTER 8 
 +
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__armeb__)
++#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
+@@ -184,6 +231,55 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
++#elif defined(__amd64__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2  3
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#define HAVE_LONG_LONG
++#define HAVE_ALIGNED_DOUBLES
++#define HAVE_ALIGNED_LONGLONGS
++
+ #elif defined(__powerpc__) || defined(__m68k__)
+ 
+ #undef  IS_LITTLE_ENDIAN
diff --git a/www/mozilla-stable/patches/patch-bb b/www/mozilla-stable/patches/patch-bb
index 7d7c939c159..b620d100fa4 100644
--- a/www/mozilla-stable/patches/patch-bb
+++ b/www/mozilla-stable/patches/patch-bb
@@ -1,9 +1,15 @@
-$NetBSD: patch-bb,v 1.4 2004/03/10 12:51:45 taya Exp $
+$NetBSD: patch-bb,v 1.5 2004/12/04 03:50:40 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	2003-09-12 02:24:53.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h	2004-02-21 16:47:07.000000000 +0900
-@@ -48,12 +48,20 @@
++++ ./nsprpub/pr/include/md/_netbsd.h	2004-06-10 23:07:02.000000000 +0900
+@@ -44,16 +44,26 @@
+ #define _PR_SI_ARCHITECTURE "x86"
+ #elif defined(__alpha__)
+ #define _PR_SI_ARCHITECTURE "alpha"
++#elif defined(__amd64__)
++#define _PR_SI_ARCHITECTURE "amd64"
+ #elif defined(__m68k__)
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
  #define _PR_SI_ARCHITECTURE "powerpc"
@@ -15,16 +21,16 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #define _PR_SI_ARCHITECTURE "mips"
  #elif defined(__arm32__)
  #define _PR_SI_ARCHITECTURE "arm32"
-+#elif defined(__arm__)
-+#define _PR_SI_ARCHITECTURE "arm"
-+#elif defined(__armel__)
++#elif defined(__ARMEL__)
 +#define _PR_SI_ARCHITECTURE "armel"
-+#elif defined(__armeb__)
++#elif defined(__ARMEL__)
 +#define _PR_SI_ARCHITECTURE "armeb"
++#elif defined(__arm__)
++#define _PR_SI_ARCHITECTURE "arm"
  #endif
  
  #if defined(__ELF__)
-@@ -86,6 +94,12 @@
+@@ -86,6 +96,12 @@
  #define _PR_INET6_PROBE
  #endif
  
@@ -37,7 +43,7 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #define USE_SETJMP
  
  #ifndef _PR_PTHREADS
-@@ -108,7 +122,17 @@
+@@ -108,7 +124,17 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
  #endif
@@ -56,12 +62,12 @@ diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
  {									\
      sigsetjmp(CONTEXT(_thread), 1);					\
-@@ -150,7 +174,7 @@
+@@ -150,7 +176,7 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
  #endif
 -#ifdef __arm32__
-+#if defined(__arm32__) || defined(__arm__) || defined(__armel__) || defined(__armeb__)
++#ifdef __arm__
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
  {									\
      sigsetjmp(CONTEXT(_thread), 1);					\
diff --git a/www/mozilla-stable/patches/patch-be b/www/mozilla-stable/patches/patch-be
deleted file mode 100644
index 69b78e7bf26..00000000000
--- a/www/mozilla-stable/patches/patch-be
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-be,v 1.3 2003/11/27 23:36:42 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	2002-06-12 05:08:07.000000000 +0900
-+++ ./nsprpub/pr/src/io/prsocket.c	2003-03-14 16:59:05.000000000 +0900
-@@ -1299,6 +1299,15 @@
- 	if (osfd == -1) {
- 		return 0;
- 	}
-+#if defined(__NetBSD__) && defined(_PR_INET6) && defined(IPV6_V6ONLY)
-+	if(domain == PR_AF_INET6){
-+		int	opt = 0;
-+		if(setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &opt, sizeof(opt))){
-+			close(osfd);
-+			return -1;
-+		}
-+	}
-+#endif
- 	if (type == SOCK_STREAM)
- 		fd = PR_AllocFileDesc(osfd, PR_GetTCPMethods());
- 	else
diff --git a/www/mozilla-stable/patches/patch-bj b/www/mozilla-stable/patches/patch-bj
new file mode 100644
index 00000000000..5c56cb013a7
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bj
@@ -0,0 +1,24 @@
+$NetBSD: patch-bj,v 1.4 2004/12/04 03:50:40 taya Exp $
+
+--- uriloader/exthandler/nsExternalHelperAppService.cpp.orig	2004-11-11 15:56:52.000000000 +0100
++++ uriloader/exthandler/nsExternalHelperAppService.cpp
+@@ -1747,6 +1747,11 @@ nsresult nsExternalAppHandler::ExecuteDe
+       // XXX Put progress dialog in barber-pole mode
+       //     and change text to say "Copying from:".
+       rv = MoveFile(mFinalFileDestination);
++      if (NS_SUCCEEDED(rv) && action == nsIMIMEInfo::saveToDisk)
++      {
++        nsCOMPtr<nsILocalFile> destfile(do_QueryInterface(mFinalFileDestination));
++        sSrv->FixFilePermissions(destfile);
++      }
+     }
+     
+     // Notify dialog that download is complete.
+@@ -1913,7 +1918,6 @@ nsresult nsExternalAppHandler::MoveFile(
+      if (directoryLocation)
+      {
+        rv = mTempFile->MoveToNative(directoryLocation, fileName);
+-       sSrv->FixFilePermissions(fileToUse);
+      }
+      if (NS_FAILED(rv))
+      {
diff --git a/www/mozilla-stable/patches/patch-bm b/www/mozilla-stable/patches/patch-bm
index 9dfc8fd119b..dbe7c1bbb9e 100644
--- a/www/mozilla-stable/patches/patch-bm
+++ b/www/mozilla-stable/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.2 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-bm,v 1.3 2004/12/04 03:50:40 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2003-03-14 16:59:09.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2004-06-10 23:07:04.000000000 +0900
 @@ -118,18 +118,23 @@
   * so they are contiguous with values passed on the stack, and then calls
   * PrepareAndDispatch() to do the dirty work.
diff --git a/www/mozilla-stable/patches/patch-bn b/www/mozilla-stable/patches/patch-bn
deleted file mode 100644
index b992ae9a494..00000000000
--- a/www/mozilla-stable/patches/patch-bn
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bn,v 1.2 2003/11/27 23:36:42 taya Exp $
-
-diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp
---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	2002-10-06 12:42:55.000000000 +0900
-+++ ./xpcom/io/nsNativeCharsetUtils.cpp	2003-03-14 16:59:12.000000000 +0900
-@@ -256,7 +256,12 @@
- {
-     const char  *blank_list[] = { "", NULL };
-     const char **native_charset_list = blank_list;
-+#ifdef CODESET
-     const char  *native_charset = nl_langinfo(CODESET);
-+#else
-+    const char  *native_charset = nsnull;
-+#endif
-+
-     if (native_charset == nsnull) {
-         NS_ERROR("native charset is unknown");
-         // fallback to ISO-8859-1
diff --git a/www/mozilla-stable/patches/patch-bo b/www/mozilla-stable/patches/patch-bo
index f09390fb634..f4c8ef7020c 100644
--- a/www/mozilla-stable/patches/patch-bo
+++ b/www/mozilla-stable/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.1 2003/11/27 23:36:42 taya Exp $
+$NetBSD: patch-bo,v 1.2 2004/12/04 03:50:41 taya Exp $
 
---- nsprpub/configure.in.orig	20 Jan 2003 20:49:52 -0000
-+++ nsprpub/configure.in	15 Apr 2003 14:51:35 -0000
-@@ -929,6 +929,9 @@
+--- ../Orig/mozilla/nsprpub/configure.in	2004-04-17 07:28:02.000000000 +0900
++++ ./nsprpub/configure.in	2004-07-27 01:25:32.000000000 +0900
+@@ -933,6 +933,9 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -12,19 +12,11 @@ $NetBSD: patch-bo,v 1.1 2003/11/27 23:36:42 taya Exp $
      ;;
  
  *-hpux*)
-@@ -2144,7 +2147,14 @@
- 	        _PTHREAD_LDFLAGS="-lc_r"
- 	    fi
- 	    ;;
--    *-openbsd*|*-bsdi*|*-netbsd*)
-+    *-netbsd*)
-+	    AC_DEFINE(_REENTRANT)
-+	    AC_DEFINE(_THREAD_SAFE)
-+	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-+	        _PTHREAD_LDFLAGS="-pthread"
-+	    fi
-+	    ;;
-+    *-openbsd*|*-bsdi*)
- 	    AC_DEFINE(_THREAD_SAFE)
- 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
- 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
+@@ -1409,6 +1412,7 @@
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(NETBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
+     USE_NSPR_THREADS=1
+     MDCPUCFG_H=_netbsd.cfg
+     PR_MD_CSRCS=netbsd.c
diff --git a/www/mozilla-stable/patches/patch-bp b/www/mozilla-stable/patches/patch-bp
deleted file mode 100644
index e9484810a00..00000000000
--- a/www/mozilla-stable/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.2 2003/12/26 06:13:52 grant Exp $
-
-diff -ru ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in ./other-licenses/libical/src/libical/Makefile.in
---- ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in	2003-01-08 13:59:28.000000000 +0900
-+++ ./other-licenses/libical/src/libical/Makefile.in	2003-03-14 16:59:16.000000000 +0900
-@@ -179,7 +179,7 @@
- 	$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl  -i $(srcdir)/icalrestriction.c.in \
-                 $(DESIGNDATA)/restrictions.csv > icalrestriction.c
- 
--ifneq (,$(filter BeOS Darwin OpenVMS,$(OS_ARCH)))
-+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
- DEFINES	+= -D__USE_BSD=1
- endif
- 
diff --git a/www/mozilla-stable/patches/patch-bq b/www/mozilla-stable/patches/patch-bq
index e26165b7ab4..15a841ea147 100644
--- a/www/mozilla-stable/patches/patch-bq
+++ b/www/mozilla-stable/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.2 2004/04/24 02:57:07 taya Exp $
+$NetBSD: patch-bq,v 1.3 2004/12/04 03:50:41 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h
---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h	2003-07-19 07:14:16.000000000 +0900
-+++ ./xpcom/io/nsLocalFileUnix.h	2004-04-23 15:01:23.000000000 +0900
+--- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h	2004-01-15 15:14:13.000000000 +0900
++++ ./xpcom/io/nsLocalFileUnix.h	2004-06-10 23:07:36.000000000 +0900
 @@ -57,7 +57,7 @@
  #endif
  
diff --git a/www/mozilla-stable/patches/patch-br b/www/mozilla-stable/patches/patch-br
new file mode 100644
index 00000000000..aebb664fc39
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-br
@@ -0,0 +1,22 @@
+$NetBSD: patch-br,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2004-04-28 22:00:17.000000000 +1000
++++ nsprpub/pr/src/misc/prnetdb.c
+@@ -2097,7 +2097,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
++/* NetBSD 2.0F */
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000
++	LOCK_DNS();
++#endif
++
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
++
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000
++	UNLOCK_DNS();
++#endif
++
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+ 
diff --git a/www/mozilla-stable/patches/patch-bs b/www/mozilla-stable/patches/patch-bs
new file mode 100644
index 00000000000..e5692eb91bf
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bs
@@ -0,0 +1,15 @@
+$NetBSD: patch-bs,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+diff -ru ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
+--- ../Orig/mozilla/config/mkdepend/imakemdep.h	1998-09-05 13:22:25.000000000 +0900
++++ ./config/mkdepend/imakemdep.h	2004-06-10 23:07:44.000000000 +0900
+@@ -277,6 +277,9 @@
+ # ifdef __i386__
+ 	"-D__i386__",
+ # endif
++#if defined(__amd64__) || defined(__x86_64__)
++	"-D__amd64__ -D__x86_64__",
++# endif
+ # ifdef __GNUC__
+ 	"-traditional",
+ # endif
diff --git a/www/mozilla-stable/patches/patch-bt b/www/mozilla-stable/patches/patch-bt
new file mode 100644
index 00000000000..c919d54663f
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bt
@@ -0,0 +1,17 @@
+$NetBSD: patch-bt,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c
+--- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c	2004-03-09 12:18:19.000000000 +0900
++++ ./nsprpub/pr/src/io/prprf.c	2004-06-10 23:42:04.000000000 +0900
+@@ -53,6 +53,11 @@
+ */
+ #if (defined(LINUX) && defined(__x86_64__))
+ #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
++#elif (defined (__NetBSD__) && \
++	(defined(__amd64__) || \
++	(defined(__powerpc__) && __NetBSD_Version__ >= 105000000)))
++#include <stdarg.h>
++#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
+ #elif (defined(LINUX) && defined(__powerpc__)) || \
+     (defined(LINUX) && defined(__s390__)) || \
+     (defined(LINUX) && defined(__s390x__)) || \
diff --git a/www/mozilla-stable/patches/patch-bu b/www/mozilla-stable/patches/patch-bu
new file mode 100644
index 00000000000..e47a109ecfa
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bu
@@ -0,0 +1,179 @@
+$NetBSD: patch-bu,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig	2004-05-30 21:38:13.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp	2004-05-30 21:37:22.000000000 +0900
+@@ -0,0 +1,174 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++// Platform specific code to invoke XPCOM methods on native objects
++
++#include "xptcprivate.h"
++
++// 6 integral parameters are passed in registers
++const PRUint32 GPR_COUNT = 6;
++
++// 8 floating point parameters are passed in SSE registers
++const PRUint32 FPR_COUNT = 8;
++
++// Remember that these 'words' are 64-bit long
++static inline void
++invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
++                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
++{
++    nr_gpr = 1; // skip one GP register for 'that'
++    nr_fpr = 0;
++    nr_stack = 0;
++
++    /* Compute number of eightbytes of class MEMORY.  */
++    for (uint32 i = 0; i < paramCount; i++, s++) {
++        if (!s->IsPtrData()
++            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
++            if (nr_fpr < FPR_COUNT)
++                nr_fpr++;
++            else
++                nr_stack++;
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                nr_gpr++;
++            else
++                nr_stack++;
++        }
++    }
++}
++
++static void
++invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
++                     PRUint64 * gpregs, double * fpregs)
++{
++    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
++    PRUint32 nr_fpr = 0;
++    PRUint64 value;
++
++    for (uint32 i = 0; i < paramCount; i++, s++) {
++        if (s->IsPtrData())
++            value = (PRUint64) s->ptr;
++        else {
++            switch (s->type) {
++            case nsXPTType::T_FLOAT:                                break;
++            case nsXPTType::T_DOUBLE:                               break;
++            case nsXPTType::T_I8:     value = s->val.i8;            break;
++            case nsXPTType::T_I16:    value = s->val.i16;           break;
++            case nsXPTType::T_I32:    value = s->val.i32;           break;
++            case nsXPTType::T_I64:    value = s->val.i64;           break;
++            case nsXPTType::T_U8:     value = s->val.u8;            break;
++            case nsXPTType::T_U16:    value = s->val.u16;           break;
++            case nsXPTType::T_U32:    value = s->val.u32;           break;
++            case nsXPTType::T_U64:    value = s->val.u64;           break;
++            case nsXPTType::T_BOOL:   value = s->val.b;             break;
++            case nsXPTType::T_CHAR:   value = s->val.c;             break;
++            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
++            default:                  value = (PRUint64) s->val.p;  break;
++            }
++        }
++
++        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
++            if (nr_fpr < FPR_COUNT)
++                fpregs[nr_fpr++] = s->val.d;
++            else {
++                *((double *)d) = s->val.d;
++                d++;
++            }
++        }
++        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
++            if (nr_fpr < FPR_COUNT)
++                // The value in %xmm register is already prepared to
++                // be retrieved as a float. Therefore, we pass the
++                // value verbatim, as a double without conversion.
++                fpregs[nr_fpr++] = s->val.d;
++            else {
++                *((float *)d) = s->val.f;
++                d++;
++            }
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                gpregs[nr_gpr++] = value;
++            else
++                *d++ = value;
++        }
++    }
++}
++
++extern "C"
++XPTC_PUBLIC_API(nsresult)
++XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
++                   PRUint32 paramCount, nsXPTCVariant * params)
++{
++    PRUint32 nr_gpr, nr_fpr, nr_stack;
++    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
++    
++    // Stack, if used, must be 16-bytes aligned
++    if (nr_stack)
++        nr_stack = (nr_stack + 1) & ~1;
++
++    // Load parameters to stack, if necessary
++    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
++    PRUint64 gpregs[GPR_COUNT];
++    double fpregs[FPR_COUNT];
++    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
++
++    // Load FPR registers from fpregs[]
++    register double d0 asm("xmm0");
++    register double d1 asm("xmm1");
++    register double d2 asm("xmm2");
++    register double d3 asm("xmm3");
++    register double d4 asm("xmm4");
++    register double d5 asm("xmm5");
++    register double d6 asm("xmm6");
++    register double d7 asm("xmm7");
++
++    switch (nr_fpr) {
++#define ARG_FPR(N) \
++    case N+1: d##N = fpregs[N];
++        ARG_FPR(7);
++        ARG_FPR(6);
++        ARG_FPR(5);
++        ARG_FPR(4);
++        ARG_FPR(3);
++        ARG_FPR(2);
++        ARG_FPR(1);
++        ARG_FPR(0);
++    case 0:;
++#undef ARG_FPR
++    }
++    
++    // Load GPR registers from gpregs[]
++    register PRUint64 a0 asm("rdi");
++    register PRUint64 a1 asm("rsi");
++    register PRUint64 a2 asm("rdx");
++    register PRUint64 a3 asm("rcx");
++    register PRUint64 a4 asm("r8");
++    register PRUint64 a5 asm("r9");
++    
++    switch (nr_gpr) {
++#define ARG_GPR(N) \
++    case N+1: a##N = gpregs[N];
++        ARG_GPR(5);
++        ARG_GPR(4);
++        ARG_GPR(3);
++        ARG_GPR(2);
++        ARG_GPR(1);
++    case 1: a0 = (PRUint64) that;
++    case 0:;
++#undef ARG_GPR
++    }
++
++    // Ensure that assignments to SSE registers won't be optimized away
++    asm("" ::
++        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
++        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
++    
++    // Get pointer to method
++    PRUint64 methodAddress = *((PRUint64 *)that);
++    methodAddress += 8 * methodIndex;
++    methodAddress = *((PRUint64 *)methodAddress);
++    
++    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
++    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
++    return result;
++}
diff --git a/www/mozilla-stable/patches/patch-bugzilla220122 b/www/mozilla-stable/patches/patch-bugzilla220122
deleted file mode 100644
index bb946a2fb8f..00000000000
--- a/www/mozilla-stable/patches/patch-bugzilla220122
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bugzilla220122,v 1.1 2003/11/27 23:36:42 taya Exp $
-
-diff -ru ../Orig/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp ./netwerk/protocol/http/src/nsHttpChannel.cpp
---- ../Orig/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp	2003-05-30 04:29:03.000000000 +0900
-+++ ./netwerk/protocol/http/src/nsHttpChannel.cpp	2003-11-28 00:24:58.000000000 +0900
-@@ -1960,7 +1960,12 @@
-     nsHttpAuthIdentity *ident;
-     nsCAutoString path;
- 
--    if (proxyAuth) {
-+    // it is possible for the origin server to fake a proxy challenge.  if
-+    // that happens we need to be sure to use the origin server as the auth
-+    // domain.  otherwise, we could inadvertantly expose the user's proxy
-+    // credentials to an origin server.
-+
-+    if (proxyAuth && mConnectionInfo->ProxyHost()) {
-         host = mConnectionInfo->ProxyHost();
-         port = mConnectionInfo->ProxyPort();
-         ident = &mProxyIdent;
diff --git a/www/mozilla-stable/patches/patch-bv b/www/mozilla-stable/patches/patch-bv
new file mode 100644
index 00000000000..fdd30629738
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bv
@@ -0,0 +1,211 @@
+$NetBSD: patch-bv,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig	2004-05-30 21:38:22.000000000 +0900
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp	2004-05-30 21:37:22.000000000 +0900
+@@ -0,0 +1,206 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
++
++// Implement shared vtbl methods.
++
++#include "xptcprivate.h"
++
++// The Linux/x86-64 ABI passes the first 6 integral parameters and the
++// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
++// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
++// caller.  The rest of the parameters are passed in the callers stack
++// area.
++
++const PRUint32 PARAM_BUFFER_COUNT   = 16;
++const PRUint32 GPR_COUNT            = 6;
++const PRUint32 FPR_COUNT            = 8;
++
++// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
++//
++// - 'args[]' contains the arguments passed on stack
++// - 'gpregs[]' contains the arguments passed in integer registers
++// - 'fpregs[]' contains the arguments passed in floating point registers
++// 
++// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
++// and then the method gets called.
++
++extern "C" nsresult
++PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
++                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
++{
++    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
++    nsXPTCMiniVariant* dispatchParams = NULL;
++    nsIInterfaceInfo* iface_info = NULL;
++    const nsXPTMethodInfo* info;
++    PRUint32 paramCount;
++    PRUint32 i;
++    nsresult result = NS_ERROR_FAILURE;
++
++    NS_ASSERTION(self,"no self");
++
++    self->GetInterfaceInfo(&iface_info);
++    NS_ASSERTION(iface_info,"no interface info");
++    if (! iface_info)
++        return NS_ERROR_UNEXPECTED;
++
++    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
++    NS_ASSERTION(info,"no method info");
++    if (! info)
++        return NS_ERROR_UNEXPECTED;
++
++    paramCount = info->GetParamCount();
++
++    // setup variant array pointer
++    if(paramCount > PARAM_BUFFER_COUNT)
++        dispatchParams = new nsXPTCMiniVariant[paramCount];
++    else
++        dispatchParams = paramBuffer;
++
++    NS_ASSERTION(dispatchParams,"no place for params");
++    if (! dispatchParams)
++        return NS_ERROR_OUT_OF_MEMORY;
++
++    PRUint64* ap = args;
++    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
++    PRUint32 nr_fpr = 0;
++    PRUint64 value;
++
++    for(i = 0; i < paramCount; i++) {
++        const nsXPTParamInfo& param = info->GetParam(i);
++        const nsXPTType& type = param.GetType();
++        nsXPTCMiniVariant* dp = &dispatchParams[i];
++	
++        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
++            if (nr_fpr < FPR_COUNT)
++                dp->val.d = fpregs[nr_fpr++];
++            else
++                dp->val.d = *(double*) ap++;
++            continue;
++        }
++        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
++            if (nr_fpr < FPR_COUNT)
++                // The value in %xmm register is already prepared to
++                // be retrieved as a float. Therefore, we pass the
++                // value verbatim, as a double without conversion.
++                dp->val.d = *(double*) ap++;
++            else
++                dp->val.f = *(float*) ap++;
++            continue;
++        }
++        else {
++            if (nr_gpr < GPR_COUNT)
++                value = gpregs[nr_gpr++];
++            else
++                value = *ap++;
++        }
++
++        if (param.IsOut() || !type.IsArithmetic()) {
++            dp->val.p = (void*) value;
++            continue;
++        }
++
++        switch (type) {
++        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
++        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
++        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
++        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
++        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
++        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
++        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
++        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
++        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
++        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
++        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
++
++        default:
++            NS_ASSERTION(0, "bad type");
++            break;
++        }
++    }
++
++    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
++
++    NS_RELEASE(iface_info);
++
++    if (dispatchParams != paramBuffer)
++        delete [] dispatchParams;
++
++    return result;
++}
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++// Linux/x86-64 uses gcc >= 3.1
++#define STUB_ENTRY(n) \
++asm(".section	\".text\"\n\t" \
++    ".align	2\n\t" \
++    ".if	" #n " < 10\n\t" \
++    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
++    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
++    ".elseif	" #n " < 100\n\t" \
++    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
++    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
++    ".elseif    " #n " < 1000\n\t" \
++    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
++    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
++    ".else\n\t" \
++    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
++    ".endif\n\t" \
++    "movl	$" #n ", %eax\n\t" \
++    "jmp	SharedStub\n\t" \
++    ".if	" #n " < 10\n\t" \
++    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
++    ".elseif	" #n " < 100\n\t" \
++    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
++    ".else\n\t" \
++    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
++    ".endif");
++
++// static nsresult SharedStub(PRUint32 methodIndex)
++asm(".section   \".text\"\n\t"
++    ".align     2\n\t"
++    ".type      SharedStub,@function\n\t"
++    "SharedStub:\n\t"
++    // make room for gpregs (48), fpregs (64)
++    "pushq      %rbp\n\t"
++    "movq       %rsp,%rbp\n\t"
++    "subq       $112,%rsp\n\t"
++    // save GP registers
++    "movq       %rdi,-112(%rbp)\n\t"
++    "movq       %rsi,-104(%rbp)\n\t"
++    "movq       %rdx, -96(%rbp)\n\t"
++    "movq       %rcx, -88(%rbp)\n\t"
++    "movq       %r8 , -80(%rbp)\n\t"
++    "movq       %r9 , -72(%rbp)\n\t"
++    "leaq       -112(%rbp),%rcx\n\t"
++    // save FP registers
++    "movsd      %xmm0,-64(%rbp)\n\t"
++    "movsd      %xmm1,-56(%rbp)\n\t"
++    "movsd      %xmm2,-48(%rbp)\n\t"
++    "movsd      %xmm3,-40(%rbp)\n\t"
++    "movsd      %xmm4,-32(%rbp)\n\t"
++    "movsd      %xmm5,-24(%rbp)\n\t"
++    "movsd      %xmm6,-16(%rbp)\n\t"
++    "movsd      %xmm7, -8(%rbp)\n\t"
++    "leaq       -64(%rbp),%r8\n\t"
++    // rdi has the 'self' pointer already
++    "movl       %eax,%esi\n\t"
++    "leaq       16(%rbp),%rdx\n\t"
++    "call       PrepareAndDispatch\n\t"
++    "leave\n\t"
++    "ret\n\t"
++    ".size      SharedStub,.-SharedStub");
++
++#define SENTINEL_ENTRY(n) \
++nsresult nsXPTCStubBase::Sentinel##n() \
++{ \
++    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
++    return NS_ERROR_NOT_IMPLEMENTED; \
++}
++
++#include "xptcstubsdef.inc"
++
++#else
++#error "can't find a compiler to use"
++#endif /* __GNUC__ */
diff --git a/www/mozilla-stable/patches/patch-bw b/www/mozilla-stable/patches/patch-bw
new file mode 100644
index 00000000000..a658d76fb74
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bw
@@ -0,0 +1,64 @@
+$NetBSD: patch-bw,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2001-09-29 05:12:52.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2004-05-11 16:29:31.000000000 +0900
+@@ -188,6 +188,50 @@
+  * nsresult nsXPTCStubBase::Stub##n()
+  *  Sets register $1 to "methodIndex" and jumps to SharedStub.
+  */
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++#define STUB_ENTRY(n)					\
++__asm__(						\
++"#### Stub"#n" ####\n"					\
++".text\n"						\
++"	.align 5\n"					\
++"	.if "#n" < 10 \n"				\
++"	.globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n"	\
++"	.ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n"		\
++"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n"			\
++"	.frame $30,0,$26,0\n"				\
++"	ldgp $29,0($27)\n"				\
++"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n"		\
++"	.prologue 1\n"					\
++"	lda $1,"#n"\n"					\
++"	br $31,$SharedStub..ng\n"			\
++"	.end _ZN14nsXPTCStubBase5Stub"#n"Ev\n"		\
++"      .elseif  "#n" < 100 \n"				\
++"	.globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n"	\
++"	.ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n"		\
++"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n"			\
++"	.frame $30,0,$26,0\n"				\
++"	ldgp $29,0($27)\n"				\
++"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n"		\
++"	.prologue 1\n"					\
++"	lda $1,"#n"\n"					\
++"	br $31,$SharedStub..ng\n"			\
++"	.end _ZN14nsXPTCStubBase6Stub"#n"Ev\n"		\
++"	.elseif "#n" < 1000 \n"				\
++"	.globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n"	\
++"	.ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n"		\
++"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n"			\
++"	.frame $30,0,$26,0\n"				\
++"	ldgp $29,0($27)\n"				\
++"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n"		\
++"	.prologue 1\n"					\
++"	lda $1,"#n"\n"					\
++"	br $31,$SharedStub..ng\n"			\
++"	.end _ZN14nsXPTCStubBase7Stub"#n"Ev\n"		\
++"	.else\n"					\
++"	.err \"stub number "#n"> 1000 not yet supported\"\n" \
++"	.endif\n"					\
++    );
++#else /* G++2.95 ABI */
+ #define STUB_ENTRY(n) \
+ __asm__( \
+     "#### Stub"#n" ####\n" \
+@@ -204,6 +248,7 @@
+     "br $31,$SharedStub..ng\n\t" \
+     ".end Stub"#n"__14nsXPTCStubBase" \
+     );
++#endif
+ 
+ #define SENTINEL_ENTRY(n) \
+ nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/www/mozilla-stable/patches/patch-bx b/www/mozilla-stable/patches/patch-bx
new file mode 100644
index 00000000000..b8cabda8095
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bx
@@ -0,0 +1,84 @@
+$NetBSD: patch-bx,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2001-09-28 22:12:53.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
+@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+                 if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
+                 dp->val.d = *(double*) ap;
+                 ap += 2;
++#if __GXX_ABI_VERSION < 100
+ 		if (gpr < GPR_COUNT)
+ 		    gpr += 2;
++#endif
+             }
+             continue;
+         }
+@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+             else {
+                 dp->val.f = *(float*) ap;
+ 		ap += 1;
++#if __GXX_ABI_VERSION < 100
+ 		if (gpr < GPR_COUNT)
+ 		    gpr += 1;
++#endif
+             }
+             continue;
+         }
+@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ // however, it's quick, dirty, and'll break when the ABI changes on
+ // us, which is what we want ;-).
+ 
+-#define STUB_ENTRY(n)                                       \
++#if __GXX_ABI_VERSION < 100
++// gcc-2 version
++# define STUB_ENTRY(n)                                       \
+ __asm__ (                                                   \
+         ".section \".text\" \n\t"                           \
+         ".align 2 \n\t"                                     \
+@@ -206,6 +212,46 @@ __asm__ (                               
+ 	"li     11,"#n" \n\t"                               \
+ 	"b      SharedStub@local \n"                        \
+ );
++#else
++// gcc-3 version
++//
++// As G++3 ABI contains the length of the functionname in the mangled
++// name, it is difficult to get a generic assembler mechanism like
++// in the G++ 2.95 case.
++// Create names would be like:
++// _ZN14nsXPTCStubBase5Stub1Ev
++// _ZN14nsXPTCStubBase6Stub12Ev
++// _ZN14nsXPTCStubBase7Stub123Ev
++// _ZN14nsXPTCStubBase8Stub1234Ev
++// etc.
++// Use assembler directives to get the names right...
++
++# define STUB_ENTRY(n)							\
++__asm__ (								\
++	".align	2 \n\t"							\
++	".if	"#n" < 10 \n\t"						\
++	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
++	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
++"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
++									\
++	".elseif "#n" < 100 \n\t"					\
++	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
++	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
++"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
++									\
++	".elseif "#n" < 1000 \n\t"					\
++	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
++	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
++"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
++									\
++	".else \n\t"							\
++	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
++	".endif \n\t"							\
++									\
++	"li	11,"#n" \n\t"						\
++	"b	SharedStub@local \n"					\
++);
++#endif
+ 
+ #define SENTINEL_ENTRY(n)                            \
+ nsresult nsXPTCStubBase::Sentinel##n()               \
diff --git a/www/mozilla-stable/patches/patch-by b/www/mozilla-stable/patches/patch-by
new file mode 100644
index 00000000000..a1e6c05ec7b
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-by
@@ -0,0 +1,50 @@
+$NetBSD: patch-by,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
+--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-03-19 10:36:16.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-07-04 22:59:19.000000000 +0900
+@@ -155,15 +155,15 @@
+ 
+   static NS_NAMED_LITERAL_STRING(arial, "arial");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
+-                                              &arial);
++                                              (nsDependentString *)&arial);
+ 
+   static NS_NAMED_LITERAL_STRING(courier, "courier new");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
+-                                              &courier);
++                                              (nsDependentString *)&courier);
+ 
+   static NS_NAMED_LITERAL_STRING(times, "times new roman");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
+-                                              &times);
++                                              (nsDependentString *)&times);
+ }
+ 
+ void NS_FreeSVGLibartGlyphMetricsFTGlobals()
+@@ -440,19 +440,19 @@
+     return;
+   }
+ 
+-  FTC_Image_Desc imageDesc;
+-  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
++  FTC_ImageType imageDesc;
++  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
+   float twipstopixel = GetTwipsToPixels();
+   float scale = GetPixelScale();
+-  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
+-  imageDesc.image_type |= ftc_image_grays;
++  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
++  imageDesc->flags = 0;
+ 
+   // get the face
+   nsresult rv;
+   FTC_Manager mgr;
+   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
+-  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
++  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
+   NS_ASSERTION(mFace, "failed to get face/size");
+ }
+ 
diff --git a/www/mozilla-stable/patches/patch-bz b/www/mozilla-stable/patches/patch-bz
new file mode 100644
index 00000000000..7763ce1b6a3
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-bz
@@ -0,0 +1,122 @@
+$NetBSD: patch-bz,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2001-03-11 18:22:22.000000000 +0100
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
+@@ -1,27 +1,27 @@
+-# -*- Mode: Asm -*-
+-#
+-# The contents of this file are subject to the Netscape Public
+-# License Version 1.1 (the "License"); you may not use this file
+-# except in compliance with the License. You may obtain a copy of
+-# the License at http://www.mozilla.org/NPL/
+-#
+-# Software distributed under the License is distributed on an "AS
+-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+-# implied. See the License for the specific language governing
+-# rights and limitations under the License.
+-#
+-# The Original Code is mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is Netscape
+-# Communications Corporation.  Portions created by Netscape are
+-# Copyright (C) 1999 Netscape Communications Corporation. All
+-# Rights Reserved.
+-#
+-# Contributor(s): 
+-#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+-#   beard@netscape.com (Patrick Beard)
+-#   waterson@netscape.com (Chris Waterson)
+-#
++// -*- Mode: Asm -*-
++//
++// The contents of this file are subject to the Netscape Public
++// License Version 1.1 (the "License"); you may not use this file
++// except in compliance with the License. You may obtain a copy of
++// the License at http://www.mozilla.org/NPL/
++//
++// Software distributed under the License is distributed on an "AS
++// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++// implied. See the License for the specific language governing
++// rights and limitations under the License.
++//
++// The Original Code is mozilla.org code.
++//
++// The Initial Developer of the Original Code is Netscape
++// Communications Corporation.  Portions created by Netscape are
++// Copyright (C) 1999 Netscape Communications Corporation. All
++// Rights Reserved.
++//
++// Contributor(s): 
++//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
++//   beard@netscape.com (Patrick Beard)
++//   waterson@netscape.com (Chris Waterson)
++//
+ 
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+@@ -44,23 +44,23 @@
+ 	.type  SharedStub,@function
+ 
+ SharedStub:
+-        stwu	sp,-112(sp)			# room for 
+-						# linkage (8),
+-						# gprData (32),
+-						# fprData (64), 
+-						# stack alignment(8)
++        stwu	sp,-112(sp)			// room for 
++						// linkage (8),
++						// gprData (32),
++						// fprData (64), 
++						// stack alignment(8)
+         mflr	r0
+-	stw	r0,116(sp)			# save LR backchain
++	stw	r0,116(sp)			// save LR backchain
+ 
+-	stw	r4,12(sp)			# save GP registers
+-	stw	r5,16(sp)			# (n.b. that we don't save r3
+-	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
++	stw	r4,12(sp)			// save GP registers
++	stw	r5,16(sp)			// (n.b. that we don't save r3
++	stw	r6,20(sp)			// because PrepareAndDispatch() is savvy)
+ 	stw	r7,24(sp)
+ 	stw	r8,28(sp)
+ 	stw	r9,32(sp)
+ 	stw	r10,36(sp)
+ 
+-	stfd	f1,40(sp)			# save FP registers
++	stfd	f1,40(sp)			// save FP registers
+ 	stfd	f2,48(sp)
+ 	stfd	f3,56(sp)
+ 	stfd	f4,64(sp)
+@@ -69,21 +69,20 @@ SharedStub:
+ 	stfd	f7,88(sp)
+ 	stfd	f8,96(sp)
+ 
+-						# r3 has the 'self' pointer already
++						// r3 has the 'self' pointer already
+ 	
+-	mr      r4,r11				# r4 <= methodIndex selector, passed
+-						# via r11 in the nsXPTCStubBase::StubXX() call
++	mr      r4,r11				// r4 <= methodIndex selector, passed
++						// via r11 in the nsXPTCStubBase::StubXX() call
+ 	
+-	addi	r5,sp,120			# r5 <= pointer to callers args area,
+-						# beyond r3-r10/f1-f8 mapped range
++	addi	r5,sp,120			// r5 <= pointer to callers args area,
++						// beyond r3-r10/f1-f8 mapped range
+ 	
+-	addi	r6,sp,8				# r6 <= gprData
+-	addi	r7,sp,40			# r7 <= fprData
++	addi	r6,sp,8				// r6 <= gprData
++	addi	r7,sp,40			// r7 <= fprData
+       
+-	bl	PrepareAndDispatch@local	# Go!
++	bl	PrepareAndDispatch@local	// Go!
+     
+-	lwz	r0,116(sp)			# restore LR
++	lwz	r0,116(sp)			// restore LR
+ 	mtlr	r0
+-	la	sp,112(sp)			# clean up the stack
++	la	sp,112(sp)			// clean up the stack
+ 	blr
+-
diff --git a/www/mozilla-stable/patches/patch-ca b/www/mozilla-stable/patches/patch-ca
new file mode 100644
index 00000000000..006313db3bb
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-ca
@@ -0,0 +1,166 @@
+$NetBSD: patch-ca,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2001-03-11 18:22:17.000000000 +0100
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
+@@ -1,27 +1,28 @@
+-# -*- Mode: Asm -*-
+-#
+-# The contents of this file are subject to the Netscape Public
+-# License Version 1.1 (the "License"); you may not use this file
+-# except in compliance with the License. You may obtain a copy of
+-# the License at http://www.mozilla.org/NPL/
+-#
+-# Software distributed under the License is distributed on an "AS
+-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+-# implied. See the License for the specific language governing
+-# rights and limitations under the License.
+-#
+-# The Original Code is mozilla.org code.
+-#
+-# The Initial Developer of the Original Code is Netscape
+-# Communications Corporation.  Portions created by Netscape are
+-# Copyright (C) 1999 Netscape Communications Corporation. All
+-# Rights Reserved.
+-#
+-# Contributor(s):
+-#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
+-#   beard@netscape.com (Patrick Beard)
+-#   waterson@netscape.com (Chris Waterson)
+-#
++// -*- Mode: Asm -*-
++//
++// The contents of this file are subject to the Netscape Public
++// License Version 1.1 (the "License"); you may not use this file
++// except in compliance with the License. You may obtain a copy of
++// the License at http://www.mozilla.org/NPL/
++//
++// Software distributed under the License is distributed on an "AS
++// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
++// implied. See the License for the specific language governing
++// rights and limitations under the License.
++//
++// The Original Code is mozilla.org code.
++//
++// The Initial Developer of the Original Code is Netscape
++// Communications Corporation.  Portions created by Netscape are
++// Copyright (C) 1999 Netscape Communications Corporation. All
++// Rights Reserved.
++//
++// Contributor(s):
++//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
++//   beard@netscape.com (Patrick Beard)
++//   waterson@netscape.com (Chris Waterson)
++//
++
+ .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
+ .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+ .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+@@ -42,38 +43,38 @@
+ 	.globl XPTC_InvokeByIndex
+ 	.type  XPTC_InvokeByIndex,@function
+ 
+-#
+-# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+-#                    PRUint32 paramCount, nsXPTCVariant* params)
+-#
++//
++// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
++//                    PRUint32 paramCount, nsXPTCVariant* params)
++//
+ 
+ XPTC_InvokeByIndex:
+-	stwu    sp,-32(sp)			# setup standard stack frame
+-	mflr    r0				# save LR
+-	stw     r3,8(sp)			# r3 <= that
+-	stw     r4,12(sp)			# r4 <= methodIndex
++	stwu    sp,-32(sp)			// setup standard stack frame
++	mflr    r0				// save LR
++	stw     r3,8(sp)			// r3 <= that
++	stw     r4,12(sp)			// r4 <= methodIndex
+ 	stw     r30,16(sp)
+ 	stw     r31,20(sp)
+ 
+-	stw     r0,36(sp)			# store LR backchain
++	stw     r0,36(sp)			// store LR backchain
+ 	mr      r31,sp
+ 
+-	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
+-	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
+-	lwz     r9,0(sp)			# r9 = backchain
++	rlwinm  r10,r5,3,0,27			// r10 = (ParamCount * 2 * 4) & ~0x0f
++	addi    r0,r10,96			// reserve stack for GPR and FPR register save area r0 = r10 + 96
++	lwz     r9,0(sp)			// r9 = backchain
+ 	neg     r0,r0
+-	stwux   r9,sp,r0			# reserve stack sapce and save SP backchain
+-	
+-	addi    r3,sp,8				# r3 <= args
+-	mr      r4,r5				# r4 <= paramCount
+-	mr      r5,r6				# r5 <= params
+-	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
+-	mr      r30,r6				# store in r30 for use later...
+-	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
++	stwux   r9,sp,r0			// reserve stack space and save SP backchain
++
++	addi    r3,sp,8				// r3 <= args
++	mr      r4,r5				// r4 <= paramCount
++	mr      r5,r6				// r5 <= params
++	add     r6,r3,r10			// r6 <= gpregs ( == args + r10 )
++	mr      r30,r6				// store in r30 for use later...
++	addi    r7,r6,32			// r7 <= fpregs ( == gpregs + 32 )
+ 
+-	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
++	bl      invoke_copy_to_stack@local	// (args, paramCount, params, gpregs, fpregs)
+ 
+-	lfd     f1,32(r30)			# load FP registers with method parameters
++	lfd     f1,32(r30)			// load FP registers with method parameters
+ 	lfd     f2,40(r30)   
+ 	lfd     f3,48(r30)  
+ 	lfd     f4,56(r30)  
+@@ -82,18 +83,18 @@ XPTC_InvokeByIndex:
+ 	lfd     f7,80(r30)  
+ 	lfd     f8,88(r30)
+ 
+-	lwz     r3,8(r31)			# r3 <= that
+-	lwz     r4,12(r31)			# r4 <= methodIndex
+-	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
+-	slwi    r4,r4,3				# convert to offset ( *= 8 )
+-	addi	r4,r4,8				# skip first two vtable entries
+-	add	r4,r4,r5
+-	lhz	r0,0(r4)			# virtual base offset
+-	extsh	r0,r0
+-	add	r3,r3,r0
+-	lwz     r0,4(r4)			# r0 <= methodpointer ( == vtable + offset )
++	lwz     r3,8(r31)			// r3 <= that
++	lwz     r4,12(r31)			// r4 <= methodIndex
++	lwz     r5,0(r3)			// r5 <= vtable ( == *that )
++#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION  >= 100) // G++ pre-V3 ABI is like that of AIX under NetBSD
++	slwi    r4,r4,3				// convert to offset ( *= 8 )
++	addi	r4,r4,8				// skip garbage before vtable
++#else
++	slwi    r4,r4,2				// convert to offset ( *= 4 )
++#endif
++	lwzx    r0,r5,r4			// r0 <= methodpointer ( == vtable + offset )
+ 
+-        lwz     r4,4(r30)			# load GP regs with method parameters
++        lwz     r4,4(r30)			// load GP regs with method parameters
+ 	lwz     r5,8(r30)   
+ 	lwz     r6,12(r30)  
+ 	lwz     r7,16(r30)  
+@@ -101,13 +102,13 @@ XPTC_InvokeByIndex:
+ 	lwz     r9,24(r30)  
+ 	lwz     r10,28(r30)
+ 
+-	mtlr    r0				# copy methodpointer to LR    
+-	blrl					# call method
++	mtlr    r0				// copy methodpointer to LR    
++	blrl					// call method
+ 	
+-	lwz     r30,16(r31)			# restore r30 & r31
++	lwz     r30,16(r31)			// restore r30 & r31
+ 	lwz     r31,20(r31)
+ 	
+-	lwz     r11,0(sp)			# clean up the stack
++	lwz     r11,0(sp)			// clean up the stack
+ 	lwz     r0,4(r11)
+ 	mtlr    r0
+ 	mr      sp,r11
diff --git a/www/mozilla-stable/patches/patch-cb b/www/mozilla-stable/patches/patch-cb
new file mode 100644
index 00000000000..c63c55e5250
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-cb
@@ -0,0 +1,26 @@
+$NetBSD: patch-cb,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2001-09-28 22:12:52.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
+@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
+                 if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
+                 *((double*) d) = s->val.d;
+                 d += 2;
++#if __GXX_ABI_VERSION < 100
+ 		if (gpr < GPR_COUNT)
+ 		    gpr += 2;
++#endif
+             }
+         }
+         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
+@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
+             else {
+                 *((float*) d) = s->val.f;
+ 		d += 1;
++#if __GXX_ABI_VERSION < 100
+ 		if (gpr < GPR_COUNT)
+ 		    gpr += 1;
++#endif
+ 	    }
+         }
+         else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
diff --git a/www/mozilla-stable/patches/patch-cc b/www/mozilla-stable/patches/patch-cc
new file mode 100644
index 00000000000..e33f8f7b469
--- /dev/null
+++ b/www/mozilla-stable/patches/patch-cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-cc,v 1.1 2004/12/04 03:50:41 taya Exp $
+
+--- /mnt/local/src/mozilla-1.7rc3/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2004-08-13 01:24:00.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2004-08-13 01:23:35.000000000 +0900
+@@ -163,7 +163,11 @@
+     "bis $16,$16,$1\n\t"    /* load "this" */
+     "ldq $2,16($15)\n\t"    /* load "methodIndex" */
+     "ldq $1,0($1)\n\t"      /* load vtable */
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++    "s8addq $2,0,$2\n\t"   /* vtable index = "methodIndex" * 8 */
++#else /* G++2.95 ABI */
+     "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
++#endif
+     "addq $1,$2,$1\n\t"
+     "ldq $27,0($1)\n\t"     /* load address of function */
+     "jsr $26,($27),0\n\t"   /* call virtual function */
author	taya <taya@pkgsrc.org>	2004-12-04 03:50:40 +0000
committer	taya <taya@pkgsrc.org>	2004-12-04 03:50:40 +0000
commit	0f3646bf32eed38e8dc03a254ce3e886bc7ae3f6 (patch)
tree	208c9ae50a1c5177a22a788057f8b7698a4a895c /www/mozilla-stable
parent	f327694b73e5d2317326c4f7372a96cf53f819d8 (diff)
download	pkgsrc-0f3646bf32eed38e8dc03a254ce3e886bc7ae3f6.tar.gz