summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortaya <taya@pkgsrc.org>2004-05-08 04:35:37 +0000
committertaya <taya@pkgsrc.org>2004-05-08 04:35:37 +0000
commit6675b59eb1fae5c3b610e98db89694b761081164 (patch)
treec7b4e2d457d962dede90780956e9ca85d3370549 /mail
parente993257ed59f0ed8ceb6f27653741c04cc0a77d7 (diff)
downloadpkgsrc-6675b59eb1fae5c3b610e98db89694b761081164.tar.gz
Update thunderbird to 0.6
What's new from release notes: * Improved Junk Mail Controls The algorithm for the adaptive junk mail controls has been heavily redesigned to learn faster and catch more spam. * New Brand Identity To be consistent with the Mozilla Foundation's goal of brand identity, Thunderbird has a new logo and supporting artwork thanks to the fine work of the Mozilla Visual Identity team. * Other New Features... - IMAP users can now benefit from support for the IMAP IDLE command which allows the mail server to push notifications such as new mail arriving as soon as it arrives. - Thunderbird supports server-wide news filters that apply to all newsgroups on a server. - Thunderbird includes Secure Password Authentication using a new cross-platform NTLM authentication mechanism for IMAP, POP3 and SMTP. - Mail filters can now mark messages as junk. - Tools > Options > Compose > HTML Options allows you to set up default HTML compose options such as font, size and color. - Attachments can be opened directly from the compose window to verify their contents before sending. - Thunderbird now supports the notion of multiple identities per mail account. This makes it easy to have several e-mail addresses which end up going into the same account. Read More about how to set this up. * Recently Fixed Bugs - In the case of a failure when copying a message to an online Sent folder, Thunderbird will now ask if you would like it to try again. - Pasting data from an OpenOffice.org spreadsheet no longer pastes random HTML garbage before the actual spreadsheet data into HTML compose. - Fixed several situations where LDAP connections were left open when using LDAP auto complete or performing searches on LDAP directories. - Improved view source behavior. - Mail notification for POP3 messages that are marked deleted or marked read by mail filters no longer occurs. - The "Mark All Read" keyboard shortcut now works for Linux GTK2.
Diffstat (limited to 'mail')
-rw-r--r--mail/thunderbird/Makefile23
-rw-r--r--mail/thunderbird/PLIST181
-rw-r--r--mail/thunderbird/distinfo47
-rw-r--r--mail/thunderbird/patches/patch-aa17
-rw-r--r--mail/thunderbird/patches/patch-ab29
-rw-r--r--mail/thunderbird/patches/patch-ac12
-rw-r--r--mail/thunderbird/patches/patch-ad4
-rw-r--r--mail/thunderbird/patches/patch-ae4
-rw-r--r--mail/thunderbird/patches/patch-af4
-rw-r--r--mail/thunderbird/patches/patch-ag4
-rw-r--r--mail/thunderbird/patches/patch-ah49
-rw-r--r--mail/thunderbird/patches/patch-ai63
-rw-r--r--mail/thunderbird/patches/patch-aj41
-rw-r--r--mail/thunderbird/patches/patch-ak62
-rw-r--r--mail/thunderbird/patches/patch-al23
-rw-r--r--mail/thunderbird/patches/patch-am14
-rw-r--r--mail/thunderbird/patches/patch-an14
-rw-r--r--mail/thunderbird/patches/patch-ao76
-rw-r--r--mail/thunderbird/patches/patch-aw8
-rw-r--r--mail/thunderbird/patches/patch-ax16
-rw-r--r--mail/thunderbird/patches/patch-ba4
-rw-r--r--mail/thunderbird/patches/patch-bb4
-rw-r--r--mail/thunderbird/patches/patch-bm4
-rw-r--r--mail/thunderbird/patches/patch-bn8
-rw-r--r--mail/thunderbird/patches/patch-bo22
-rw-r--r--mail/thunderbird/patches/patch-bp14
-rw-r--r--mail/thunderbird/patches/patch-bq6
-rw-r--r--mail/thunderbird/patches/patch-br9
-rw-r--r--mail/thunderbird/patches/patch-bs14
29 files changed, 492 insertions, 284 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 6b8e55bf7e9..901f13b2f90 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2004/04/26 13:56:09 taya Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/08 04:35:37 taya Exp $
MOZILLA= thunderbird
MOZILLA_BIN= thunderbird-bin
-MOZ_VER= 0.5
-PKGREVISION= 1
-EXTRACT_SUFX= .tar.gz
-DISTNAME= thunderbird-${MOZ_VER}-source
+MOZ_VER= 0.6
+EXTRACT_SUFX= .tar.bz2
+DISTNAME= thunderbird-source-${MOZ_VER}
MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/ \
ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/
@@ -17,18 +16,4 @@ MAKE_ENV+= MOZ_THUNDERBIRD=1
CONFIGURE_ARGS+= --enable-extensions=wallet,spellcheck,xmlextras
-#
-# XXX
-#
-DISTFILES= thunderbird-${MOZ_VER}-source.tar.gz
-EXTRACT_SUFX+= .tar.bz2
-do-extract:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- extract_file="${_DISTDIR}/${DISTFILES}"; \
- export extract_file; \
- cd ${WRKDIR}; ${EXTRACT_CMD}; \
- extract_file="${WRKDIR}/mozilla-thunderbird/archives/thunderbird-0.5-source.tar.bz2"; \
- export extract_file; \
- ${EXTRACT_CMD}
-
.include "../../www/mozilla/Makefile.common"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 43f19e077cf..857dcd1de5b 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/26 13:56:09 taya Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/08 04:35:37 taya Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
lib/${MOZILLA}/dirver
lib/${MOZILLA}/mangle
lib/${MOZILLA}/mozilla-xremote-client
-lib/${MOZILLA}/mozipcd
lib/${MOZILLA}/nsinstall
lib/${MOZILLA}/regchrome
lib/${MOZILLA}/regxpcom
@@ -17,7 +16,7 @@ lib/${MOZILLA}/xpt_dump
lib/${MOZILLA}/xpt_link
@comment end PROGRAMS
@comment begin SCRIPTS
-lib/${MOZILLA}/mozilla-config
+lib/${MOZILLA}/thunderbird-config
@comment end SCRIPTS
@comment begin DSO
lib/${MOZILLA}/components/libaccessibility.${SO_SUFFIX}
@@ -33,14 +32,13 @@ lib/${MOZILLA}/components/libgfx_gtk.${SO_SUFFIX}
lib/${MOZILLA}/components/libgfxps.${SO_SUFFIX}
lib/${MOZILLA}/components/libgfxxprint.${SO_SUFFIX}
lib/${MOZILLA}/components/libgklayout.${SO_SUFFIX}
+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/libimport.${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/libmail.${SO_SUFFIX}
lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
@@ -51,7 +49,6 @@ lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
lib/${MOZILLA}/components/libnsprefm.${SO_SUFFIX}
-lib/${MOZILLA}/components/liboji.${SO_SUFFIX}
lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
@@ -61,7 +58,6 @@ lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
-lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX}
lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
@@ -72,13 +68,10 @@ lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
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/libtransmgr.${SO_SUFFIX}
lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
lib/${MOZILLA}/libgtksuperwin.${SO_SUFFIX}
lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
-lib/${MOZILLA}/libjsj.${SO_SUFFIX}
lib/${MOZILLA}/libldap50.${SO_SUFFIX}
lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
lib/${MOZILLA}/libmozz.${SO_SUFFIX}
@@ -97,6 +90,8 @@ lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
@comment end DSO
@comment begin DATA
+lib/${MOZILLA}/LICENSE.txt
+lib/${MOZILLA}/README.txt
lib/${MOZILLA}/bloaturls.txt
lib/${MOZILLA}/chrome/US.jar
lib/${MOZILLA}/chrome/chromelist.txt
@@ -117,6 +112,7 @@ lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow.xpm
lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow16.xpm
lib/${MOZILLA}/chrome/installed-chrome.txt
lib/${MOZILLA}/chrome/messenger.jar
+lib/${MOZILLA}/chrome/offline.jar
lib/${MOZILLA}/chrome/pipnss.jar
lib/${MOZILLA}/chrome/pippki.jar
lib/${MOZILLA}/chrome/toolkit.jar
@@ -127,7 +123,6 @@ lib/${MOZILLA}/components/autocomplete.xpt
lib/${MOZILLA}/components/bookmarks.xpt
lib/${MOZILLA}/components/caps.xpt
lib/${MOZILLA}/components/chardet.xpt
-lib/${MOZILLA}/components/chrome.xpt
lib/${MOZILLA}/components/commandhandler.xpt
lib/${MOZILLA}/components/composer.xpt
lib/${MOZILLA}/components/content_base.xpt
@@ -152,6 +147,7 @@ lib/${MOZILLA}/components/dom_xul.xpt
lib/${MOZILLA}/components/downloadmanager.xpt
lib/${MOZILLA}/components/editor.xpt
lib/${MOZILLA}/components/embed_base.xpt
+lib/${MOZILLA}/components/extensions.xpt
lib/${MOZILLA}/components/exthandler.xpt
lib/${MOZILLA}/components/filepicker.xpt
lib/${MOZILLA}/components/find.xpt
@@ -163,7 +159,6 @@ lib/${MOZILLA}/components/imglib2.xpt
lib/${MOZILLA}/components/impComm4xMail.xpt
lib/${MOZILLA}/components/import.xpt
lib/${MOZILLA}/components/intl.xpt
-lib/${MOZILLA}/components/ipcd.xpt
lib/${MOZILLA}/components/jar.xpt
lib/${MOZILLA}/components/jsconsole-clhandler.js
lib/${MOZILLA}/components/jsconsole.xpt
@@ -208,13 +203,13 @@ lib/${MOZILLA}/components/necko_strconv.xpt
lib/${MOZILLA}/components/necko_viewsource.xpt
lib/${MOZILLA}/components/nsCloseAllWindows.js
lib/${MOZILLA}/components/nsDownloadProgressListener.js
+lib/${MOZILLA}/components/nsExtensionManager.js
lib/${MOZILLA}/components/nsFilePicker.js
lib/${MOZILLA}/components/nsHelperAppDlg.js
lib/${MOZILLA}/components/nsLDAPPrefsService.js
lib/${MOZILLA}/components/nsProgressDialog.js
lib/${MOZILLA}/components/nsProxyAutoConfig.js
lib/${MOZILLA}/components/offlineStartup.js
-lib/${MOZILLA}/components/oji.xpt
lib/${MOZILLA}/components/pipboot.xpt
lib/${MOZILLA}/components/pipnss.xpt
lib/${MOZILLA}/components/pippki.xpt
@@ -223,7 +218,6 @@ lib/${MOZILLA}/components/pref.xpt
lib/${MOZILLA}/components/prefetch.xpt
lib/${MOZILLA}/components/prefmigr.xpt
lib/${MOZILLA}/components/profile.xpt
-lib/${MOZILLA}/components/profilesharingsetup.xpt
lib/${MOZILLA}/components/progressDlg.xpt
lib/${MOZILLA}/components/proxyObjInst.xpt
lib/${MOZILLA}/components/rdf.xpt
@@ -234,11 +228,9 @@ lib/${MOZILLA}/components/smime-service.js
lib/${MOZILLA}/components/spellchecker.xpt
lib/${MOZILLA}/components/txmgr.xpt
lib/${MOZILLA}/components/txtsvc.xpt
-lib/${MOZILLA}/components/ucnative.xpt
lib/${MOZILLA}/components/uconv.xpt
lib/${MOZILLA}/components/unicharutil.xpt
lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/util.xpt
lib/${MOZILLA}/components/wallet.xpt
lib/${MOZILLA}/components/walleteditor.xpt
lib/${MOZILLA}/components/walletpreview.xpt
@@ -265,15 +257,11 @@ 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/composer.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/pref/thunderbird.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
@@ -295,8 +283,12 @@ 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/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}/libsoftokn3.chk
lib/${MOZILLA}/res/EditorOverride.css
lib/${MOZILLA}/res/arrow.gif
@@ -308,23 +300,12 @@ lib/${MOZILLA}/res/builtin/platformHTMLBindings.xml
lib/${MOZILLA}/res/charsetData.properties
lib/${MOZILLA}/res/charsetalias.properties
lib/${MOZILLA}/res/cmessage.txt
-lib/${MOZILLA}/res/dtd/mathml.dtd
lib/${MOZILLA}/res/dtd/xhtml11.dtd
lib/${MOZILLA}/res/entityTables/html40Latin1.properties
lib/${MOZILLA}/res/entityTables/html40Special.properties
lib/${MOZILLA}/res/entityTables/html40Symbols.properties
lib/${MOZILLA}/res/entityTables/htmlEntityVersions.properties
-lib/${MOZILLA}/res/entityTables/mathml20.properties
lib/${MOZILLA}/res/entityTables/transliterate.properties
-lib/${MOZILLA}/res/fonts/mathfont.properties
-lib/${MOZILLA}/res/fonts/mathfontCMEX10.properties
-lib/${MOZILLA}/res/fonts/mathfontCMSY10.properties
-lib/${MOZILLA}/res/fonts/mathfontMTExtra.properties
-lib/${MOZILLA}/res/fonts/mathfontMath1.properties
-lib/${MOZILLA}/res/fonts/mathfontMath2.properties
-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
@@ -341,7 +322,6 @@ lib/${MOZILLA}/res/html/gopher-unknown.gif
lib/${MOZILLA}/res/langGroups.properties
lib/${MOZILLA}/res/language.properties
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/dom-test-4.css
@@ -579,7 +559,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
@@ -608,7 +587,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
@@ -638,12 +616,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/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
@@ -659,6 +637,7 @@ 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
@@ -682,7 +661,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
@@ -745,11 +723,14 @@ 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/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
@@ -765,6 +746,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
@@ -775,6 +757,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
@@ -784,6 +768,7 @@ 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
@@ -1000,7 +985,6 @@ 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
@@ -1036,12 +1020,9 @@ 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}/extensions/nsIExtensionManager.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
@@ -1074,7 +1055,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
@@ -1087,11 +1067,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
@@ -1100,7 +1081,6 @@ include/${MOZILLA}/gtkxtbin/gtk2xtbin.h
include/${MOZILLA}/gtkxtbin/gtkxtbin.h
include/${MOZILLA}/helperAppDlg/nsIHelperAppLauncherDialog.h
include/${MOZILLA}/history/nsIBrowserHistory.h
-include/${MOZILLA}/history/nsIGlobalHistory.h
include/${MOZILLA}/htmlparser/nsHTMLTagList.h
include/${MOZILLA}/htmlparser/nsHTMLTags.h
include/${MOZILLA}/htmlparser/nsHTMLTokens.h
@@ -1117,6 +1097,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}/imglib2/ImageErrors.h
include/${MOZILLA}/imglib2/ImageLogging.h
@@ -1155,18 +1136,6 @@ include/${MOZILLA}/import/nsImportStringBundle.h
include/${MOZILLA}/import/nsImportTranslator.h
include/${MOZILLA}/intl/nsIStringBundle.h
include/${MOZILLA}/intl/nsIStringBundleOverride.h
-include/${MOZILLA}/ipcd/ipcIClientObserver.h
-include/${MOZILLA}/ipcd/ipcIClientQueryHandler.h
-include/${MOZILLA}/ipcd/ipcILockNotify.h
-include/${MOZILLA}/ipcd/ipcILockService.h
-include/${MOZILLA}/ipcd/ipcIMessageObserver.h
-include/${MOZILLA}/ipcd/ipcIService.h
-include/${MOZILLA}/ipcd/ipcITransactionObserver.h
-include/${MOZILLA}/ipcd/ipcITransactionService.h
-include/${MOZILLA}/ipcd/ipcMessageReader.h
-include/${MOZILLA}/ipcd/ipcMessageWriter.h
-include/${MOZILLA}/ipcd/ipcModule.h
-include/${MOZILLA}/ipcd/ipcModuleUtil.h
include/${MOZILLA}/jar/nsIJAR.h
include/${MOZILLA}/jar/nsIZipReader.h
include/${MOZILLA}/jar/zipfile.h
@@ -1243,6 +1212,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
@@ -1262,7 +1232,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
@@ -1276,7 +1245,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
@@ -1293,6 +1261,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
@@ -1313,8 +1282,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
@@ -1337,12 +1304,6 @@ include/${MOZILLA}/layout/nsTreeSelection.h
include/${MOZILLA}/layout/nsTreeUtils.h
include/${MOZILLA}/libreg/NSReg.h
include/${MOZILLA}/libreg/VerReg.h
-include/${MOZILLA}/liveconnect/jsjava.h
-include/${MOZILLA}/liveconnect/netscape_javascript_JSException.h
-include/${MOZILLA}/liveconnect/netscape_javascript_JSObject.h
-include/${MOZILLA}/liveconnect/nsILiveconnect.h
-include/${MOZILLA}/liveconnect/nsISecureLiveconnect.h
-include/${MOZILLA}/liveconnect/nsISecurityContext.h
include/${MOZILLA}/locale/nsCollation.h
include/${MOZILLA}/locale/nsCollationCID.h
include/${MOZILLA}/locale/nsDateTimeFormatCID.h
@@ -1952,26 +1913,6 @@ include/${MOZILLA}/nspr/prtrace.h
include/${MOZILLA}/nspr/prtypes.h
include/${MOZILLA}/nspr/prvrsion.h
include/${MOZILLA}/nspr/prwin16.h
-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
-include/${MOZILLA}/oji/nsIJVMPluginInstance.h
-include/${MOZILLA}/oji/nsIJVMPluginTagInfo.h
-include/${MOZILLA}/oji/nsIJVMPrefsWindow.h
-include/${MOZILLA}/oji/nsIJVMWindow.h
-include/${MOZILLA}/oji/nsILiveConnectManager.h
-include/${MOZILLA}/oji/nsISecureEnv.h
-include/${MOZILLA}/oji/nsISymantecDebugManager.h
-include/${MOZILLA}/oji/nsISymantecDebugger.h
-include/${MOZILLA}/oji/nsIThreadManager.h
-include/${MOZILLA}/oji/nsJVMManager.h
-include/${MOZILLA}/oji/nsJVMPluginTagInfo.h
-include/${MOZILLA}/oji/nsjvm.h
include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
include/${MOZILLA}/pipboot/nsISecurityWarningDialogs.h
@@ -1993,6 +1934,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
@@ -2069,7 +2011,6 @@ 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
include/${MOZILLA}/rdf/nsIRDFCompositeDataSource.h
@@ -2107,37 +2048,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
@@ -2148,7 +2088,6 @@ include/${MOZILLA}/txtsvc/nsITextService.h
include/${MOZILLA}/txtsvc/nsITextServicesDocument.h
include/${MOZILLA}/txtsvc/nsITextServicesFilter.h
include/${MOZILLA}/txtsvc/nsTextServicesCID.h
-include/${MOZILLA}/ucnative/nsINativeUConvService.h
include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
include/${MOZILLA}/uconv/nsICharRepresentable.h
include/${MOZILLA}/uconv/nsICharsetAlias.h
@@ -2172,7 +2111,6 @@ include/${MOZILLA}/ucvja/nsUCVJA2CID.h
include/${MOZILLA}/ucvja/nsUCVJACID.h
include/${MOZILLA}/ucvko/nsUCvKOCID.h
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
@@ -2197,10 +2135,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
@@ -2304,13 +2240,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
@@ -2363,6 +2299,7 @@ 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
@@ -2412,7 +2349,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
@@ -2451,6 +2387,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
@@ -2470,7 +2407,6 @@ 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
@@ -2481,7 +2417,6 @@ 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
@@ -2498,6 +2433,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
@@ -2533,6 +2469,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
@@ -2565,15 +2502,14 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm lib/${MOZILLA}/res/samples
@dirrm lib/${MOZILLA}/res/rdf
@dirrm lib/${MOZILLA}/res/html
-@dirrm lib/${MOZILLA}/res/fonts
@dirrm lib/${MOZILLA}/res/entityTables
@dirrm lib/${MOZILLA}/res/dtd
@dirrm lib/${MOZILLA}/res/builtin
@dirrm lib/${MOZILLA}/res
@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
@@ -2617,14 +2553,12 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/unicharutil
@dirrm include/${MOZILLA}/ucvtw2
@dirrm include/${MOZILLA}/ucvtw
-@dirrm include/${MOZILLA}/ucvmath
@dirrm include/${MOZILLA}/ucvlatin
@dirrm include/${MOZILLA}/ucvko
@dirrm include/${MOZILLA}/ucvja
@dirrm include/${MOZILLA}/ucvibm
@dirrm include/${MOZILLA}/ucvcn
@dirrm include/${MOZILLA}/uconv
-@dirrm include/${MOZILLA}/ucnative
@dirrm include/${MOZILLA}/txtsvc
@dirrm include/${MOZILLA}/txmgr
@dirrm include/${MOZILLA}/string
@@ -2634,7 +2568,6 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/rdfutil
@dirrm include/${MOZILLA}/rdf
@dirrm include/${MOZILLA}/progressDlg
-@dirrm include/${MOZILLA}/profilesharingsetup
@dirrm include/${MOZILLA}/profile
@dirrm include/${MOZILLA}/profdirserviceprovider
@dirrm include/${MOZILLA}/prefmigr
@@ -2644,7 +2577,6 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/pippki
@dirrm include/${MOZILLA}/pipnss
@dirrm include/${MOZILLA}/pipboot
-@dirrm include/${MOZILLA}/oji
@dirrm include/${MOZILLA}/nspr/private
@dirrm include/${MOZILLA}/nspr/obsolete
@dirrm include/${MOZILLA}/nspr/md
@@ -2670,7 +2602,6 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/mailnews
@dirrm include/${MOZILLA}/lwbrk
@dirrm include/${MOZILLA}/locale
-@dirrm include/${MOZILLA}/liveconnect
@dirrm include/${MOZILLA}/libreg
@dirrm include/${MOZILLA}/layout
@dirrm include/${MOZILLA}/jsurl
@@ -2679,7 +2610,6 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/js
@dirrm include/${MOZILLA}/java
@dirrm include/${MOZILLA}/jar
-@dirrm include/${MOZILLA}/ipcd
@dirrm include/${MOZILLA}/intl
@dirrm include/${MOZILLA}/import
@dirrm include/${MOZILLA}/impText
@@ -2694,8 +2624,8 @@ include/${MOZILLA}/zlib/zlib.h
@dirrm include/${MOZILLA}/find
@dirrm include/${MOZILLA}/filepicker
@dirrm include/${MOZILLA}/exthandler
+@dirrm include/${MOZILLA}/extensions
@dirrm include/${MOZILLA}/expat
-@dirrm include/${MOZILLA}/embedstring
@dirrm include/${MOZILLA}/embedcomponents
@dirrm include/${MOZILLA}/embed_base
@dirrm include/${MOZILLA}/editor
@@ -2706,7 +2636,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}/browser
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index fdeaf8ab6b1..46f22e61a70 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,22 +1,27 @@
-$NetBSD: distinfo,v 1.2 2004/04/26 13:56:09 taya Exp $
+$NetBSD: distinfo,v 1.3 2004/05/08 04:35:37 taya Exp $
-SHA1 (thunderbird-0.5-source.tar.gz) = eb47a2e56f6f50bdf6586d1eeee80e01493579ce
-Size (thunderbird-0.5-source.tar.gz) = 31783591 bytes
-SHA1 (patch-aa) = 03f158fe673a54b8060d541c80f9ebda2977afc5
-SHA1 (patch-ab) = 3abad84d0768de60f845f26c61cc2629a6e25ce3
-SHA1 (patch-ac) = 4cddfd0bfc8acd97db3b974289a79c9ae41c9edf
-SHA1 (patch-ad) = 5408db4b7585dcf5855f64a342cc721a23aec449
-SHA1 (patch-ae) = e10936ff84d8f5b631c5c9f18271f21e902ea351
-SHA1 (patch-af) = 8fcedb0bdd48f9527fff8c9b970a0e6ea68711e4
-SHA1 (patch-ag) = c52586f92fc801571ccaf5a80c081103a99ed4e7
-SHA1 (patch-am) = 6646e8f1e5dbc3532ba45945ad2054756de2186a
-SHA1 (patch-aw) = 5beeefa214a3003a74ccc68776a97a414c6acff1
-SHA1 (patch-ba) = e11ab3e2baa19c9db9e320868a9860fedf5c8cec
-SHA1 (patch-bb) = c5350823464250546f95d1c0962ba7ba6a16aa2f
-SHA1 (patch-bm) = f557aa3ce9a25c91884cfd42bb505422e52ac958
-SHA1 (patch-bn) = 07573c79b22821873954d7c70821a382ea42fe4e
-SHA1 (patch-bo) = a6bba31568b60818455911279e7db01c49c94498
-SHA1 (patch-bp) = 5f5eed098d2763ca6a4987d012c9377b81300aa3
-SHA1 (patch-bq) = 0c520287d97027da06a5aa65cbd038bf19a49dde
-SHA1 (patch-br) = 560d738c648b864711d663323bdd1478b7d28103
-SHA1 (patch-bs) = 212db65f7eb1f71898468004c1e735609377baec
+SHA1 (thunderbird-source-0.6.tar.bz2) = 480d11b4f058139837e9d8b961c0099a779c3ebd
+Size (thunderbird-source-0.6.tar.bz2) = 32442259 bytes
+SHA1 (patch-aa) = 688706f89820d7d0ee044e9fb475458d923a85a9
+SHA1 (patch-ab) = e1674b4585cd219da0d92979f6051150f8e5fc4e
+SHA1 (patch-ac) = 2ad5ebefc6bdf27f05a9dcd09cd702ad1a778ce8
+SHA1 (patch-ad) = 844e4335ae5d1b43501b11c6cb1cc503346cd738
+SHA1 (patch-ae) = 1232c91dc65ac5065fbafb21e290d8601c4af339
+SHA1 (patch-af) = c5388568bf1f050a09ecde1f8ae986eab2436850
+SHA1 (patch-ag) = 2073ca1245b4b4c4940361c6d88642320db43d88
+SHA1 (patch-ah) = 416c173d70866cab1312f4e9a33f0d82f90d83f3
+SHA1 (patch-ai) = a1eb47484d12b163d0c5cfc47108d9937abcda91
+SHA1 (patch-aj) = 340fd6df5dee0385aed87204eb6129cc634712f9
+SHA1 (patch-ak) = 18b01acd17899fe36f0a55addf33abe36a320819
+SHA1 (patch-al) = af9d1da6ecdfc6372412f460795aa81f36d1b552
+SHA1 (patch-an) = 69a87262438467349324494e6e1ae6d8af0adeb4
+SHA1 (patch-ao) = be7967c69315ee096d55c464f8d7b3a86f20ad1f
+SHA1 (patch-aw) = 25b351796022b1c47f7f07d88d7f3aa3828e9493
+SHA1 (patch-ax) = af25ec155ffbd6ad288f11393172dd37bdbf82e9
+SHA1 (patch-ba) = 6fa8b415333452e965e0fbc7e5ee199fb8aeff15
+SHA1 (patch-bb) = b92de91377bf3cb9ffc780799343ec6bbafb1f5d
+SHA1 (patch-bm) = b119519d880f071ae193caa4cc3d379f417a63b3
+SHA1 (patch-bn) = d8d721dca97c239996271aaecdf0f367a752d20b
+SHA1 (patch-bo) = 2a8019ae8604d56b4c3c53da30190824a9c41ec1
+SHA1 (patch-bq) = a9fd9ac386eca49aec1daaef8f2612a345eaf963
+SHA1 (patch-br) = d7abd08157585a0ce1fbe159526f3360cc45878d
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 88e799e8bcf..ad733d97994 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,21 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/08 04:35:37 taya Exp $
---- config/autoconf.mk.in.orig 2003-10-30 22:11:05.000000000 +0100
-+++ config/autoconf.mk.in
-@@ -29,13 +29,13 @@ MOZILLA_VERSION = @MOZILLA_VERSION@
+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-05-05 23:08:22.000000000 +0900
+@@ -31,13 +31,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
--includedir = @includedir@/mozilla-$(MOZILLA_VERSION)
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir = @includedir@/$(MOZILLA_PKG_NAME)
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
--idldir = @datadir@/idl/mozilla-$(MOZILLA_VERSION)
+-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = @datadir@/idl/$(MOZILLA_PKG_NAME)
--mozappdir = $(libdir)/mozilla-$(MOZILLA_VERSION)
+-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir = $(libdir)/$(MOZILLA_PKG_NAME)
- mredir = $(libdir)/mre/mre-$(MOZILLA_VERSION)
+ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir = $(mredir)/lib
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index 7f9a46ff5d6..33fdcea6a21 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/08 04:35:38 taya Exp $
diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in 2003-12-12 08:30:36.000000000 +0900
-+++ ./configure.in 2004-01-16 23:17:19.000000000 +0900
-@@ -959,6 +959,9 @@
+--- ../Orig/mozilla/configure.in 2004-04-21 10:39:17.000000000 +0900
++++ ./configure.in 2004-05-05 23:08:54.000000000 +0900
+@@ -1017,6 +1017,9 @@
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
# MKSHLIB_UNFORCE_ALL=''
# fi
@@ -13,7 +13,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
;;
*-hpux*)
-@@ -1248,6 +1251,13 @@
+@@ -1308,6 +1311,13 @@
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
fi
@@ -27,13 +27,12 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
;;
*-nto*)
-@@ -2192,9 +2202,6 @@
- CXXFLAGS="$CXXFLAGS -mt"
- fi
- ;;
-- *-*-netbsd*)
-- USE_PTHREADS=
-- _PTHREAD_LDFLAGS=
- esac
- fi
-
+@@ -1531,7 +1541,7 @@
+ 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/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 57eceb46372..365a28a2e53 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ac,v 1.2 2004/05/08 04:35:38 taya Exp $
diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2003-08-15 13:00:23.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-01-16 23:17:21.000000000 +0900
-@@ -135,7 +135,7 @@
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-04-23 05:50:05.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-05-05 23:09:39.000000000 +0900
+@@ -140,7 +140,7 @@
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -12,7 +12,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -169,7 +169,7 @@
+@@ -174,7 +174,7 @@
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +21,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -295,6 +295,13 @@
+@@ -305,6 +305,13 @@
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
index d0dd9f64f91..a279449fb7d 100644
--- a/mail/thunderbird/patches/patch-ad
+++ b/mail/thunderbird/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ad,v 1.2 2004/05/08 04:35:38 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 2004-01-16 23:17:22.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-05-05 23:09:42.000000000 +0900
@@ -132,6 +132,15 @@
}
}
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index c5fc12b258e..3e81b3efc2d 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/08 04:35:38 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 2004-01-16 23:17:24.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-05-05 23:09:44.000000000 +0900
@@ -123,17 +123,27 @@
}
}
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
index 7b415895080..2dc92c9d667 100644
--- a/mail/thunderbird/patches/patch-af
+++ b/mail/thunderbird/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-af,v 1.2 2004/05/08 04:35:38 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 2003-05-31 08:31:19.000000000 +0900
-+++ ./security/nss/lib/freebl/unix_rand.c 2004-01-16 23:17:26.000000000 +0900
++++ ./security/nss/lib/freebl/unix_rand.c 2004-05-05 23:09:46.000000000 +0900
@@ -32,6 +32,7 @@
*/
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index 14ab1d2bde5..9450af5478f 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ag,v 1.2 2004/05/08 04:35:38 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-01-16 23:17:34.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-05-05 23:09:56.000000000 +0900
@@ -28,7 +28,8 @@
#include "baseutils.h"
diff --git a/mail/thunderbird/patches/patch-ah b/mail/thunderbird/patches/patch-ah
new file mode 100644
index 00000000000..94be2602af7
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ah
@@ -0,0 +1,49 @@
+$NetBSD: patch-ah,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl 2004-05-05 23:15:51.000000000 +0900
+@@ -76,10 +76,11 @@
+ native FT_Sfnt_Tag(FT_Sfnt_Tag);
+ native FT_Size(FT_Size);
+
+-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
++[ptr] native FTC_ImageType_p(FTC_ImageType);
+ native FTC_Face_Requester(FTC_Face_Requester);
+ native FTC_Font(FTC_Font);
+-native FTC_Image_Cache(FTC_Image_Cache);
++native FTC_FaceID(FTC_FaceID);
++native FTC_ImageCache(FTC_ImageCache);
+ native FTC_Manager(FTC_Manager);
+
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
+
+ readonly attribute FT_Library library;
+ readonly attribute FTC_Manager FTCacheManager;
+- readonly attribute FTC_Image_Cache ImageCache;
++ readonly attribute FTC_ImageCache ImageCache;
+
+ void doneFace(in FT_Face face);
+ void doneFreeType(in FT_Library lib);
+@@ -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);
+- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
++ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
+ in FT_UInt gindex, out FT_Glyph glyph);
+- void managerLookupSize(in FTC_Manager manager, in FTC_Font font,
+- out FT_Face face, out FT_Size size);
++ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
++ out FT_Face face);
+ void managerDone(in FTC_Manager manager);
+ void managerNew(in FT_Library lib, in FT_UInt max_faces,
+ in FT_UInt max_sizes, in FT_ULong max_bytes,
+ in FTC_Face_Requester requester, in FT_Pointer req_data,
+ 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);
+ /* #ifdef MOZ_SVG */
+ void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+ in FT_Vector_p delta);
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
new file mode 100644
index 00000000000..b99c77433e9
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ai
@@ -0,0 +1,63 @@
+$NetBSD: patch-ai,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 10:57:05.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-05-05 23:17:00.000000000 +0900
+@@ -1141,10 +1141,10 @@
+
+ mPixelSize = NSToIntRound(app2dev * mFont->size);
+
+- mImageDesc.font.face_id = (void*)mEntry;
+- mImageDesc.font.pix_width = mPixelSize;
+- mImageDesc.font.pix_height = mPixelSize;
+- mImageDesc.image_type = 0;
++ mImageDesc->face_id = (FTC_FaceID)&mEntry;
++ mImageDesc->width = mPixelSize;
++ mImageDesc->height = mPixelSize;
++ mImageDesc->flags = 0;
+
+ nsresult rv;
+ mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
+@@ -1190,7 +1190,7 @@
+ if (!face)
+ return 0;
+
+- FTC_Image_Cache iCache;
++ FTC_ImageCache iCache;
+ nsresult rv = mFt2->GetImageCache(&iCache);
+ if (NS_FAILED(rv)) {
+ NS_ERROR("Failed to get Image Cache");
+@@ -1228,8 +1228,8 @@
+
+ FTC_Manager cManager;
+ mFt2->GetFTCacheManager(&cManager);
+- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+- &face, nsnull);
++ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++ &face);
+ NS_ASSERTION(rv==0, "failed to get face/size");
+ if (rv)
+ return nsnull;
+@@ -1622,16 +1622,16 @@
+ mEntry->GetFamilyName(fontName);
+ mEntry->GetStyleName(styleName);
+
+- mImageDesc.font.face_id = (void*)mEntry;
++ mImageDesc->face_id = (FTC_FaceID)&mEntry;
+ // TT glyph has no relation to size
+- mImageDesc.font.pix_width = 16;
+- mImageDesc.font.pix_height = 16;
+- mImageDesc.image_type = 0;
++ mImageDesc->width = 16;
++ mImageDesc->height = 16;
++ mImageDesc->flags = 0;
+ FT_Face face = nsnull;
+ FTC_Manager cManager;
+ mFt2->GetFTCacheManager(&cManager);
+- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+- &face, nsnull);
++ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++ &face);
+ if (NS_FAILED(rv))
+ return;
+
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
new file mode 100644
index 00000000000..e334b6c261a
--- /dev/null
+++ b/mail/thunderbird/patches/patch-aj
@@ -0,0 +1,41 @@
+$NetBSD: patch-aj,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2004-04-17 06:31:42.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h 2004-05-05 23:20: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);
+ typedef FT_Error (*FTC_Image_Cache_Lookup_t)
+- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
+-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
+- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
++ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
++typedef FT_Error (*FTC_Manager_LookupFace_t)
++ (FTC_Manager, FTC_FaceID, FT_Face*);
+ typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
+ typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
+ 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*);
+ // #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;
+- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
++ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace;
+ FTC_Manager_Done_t nsFTC_Manager_Done;
+ FTC_Manager_New_t nsFTC_Manager_New;
+ FTC_Image_Cache_New_t nsFTC_Image_Cache_New;
+@@ -213,7 +213,7 @@
+ PRLibrary *mSharedLib;
+ FT_Library mFreeTypeLibrary;
+ FTC_Manager mFTCacheManager;
+- FTC_Image_Cache mImageCache;
++ FTC_ImageCache mImageCache;
+
+ static nsHashtable *sFontFamilies;
+ static nsHashtable *sRange1CharSetNames;
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
new file mode 100644
index 00000000000..259fac5cfc9
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ak
@@ -0,0 +1,62 @@
+$NetBSD: patch-ak,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp 2004-05-06 08:26:21.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_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},
+ // #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
+-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
+ FT_UInt glyphID, FT_Glyph *glyph)
+ {
+ // call the FreeType2 function via the function pointer
+@@ -291,11 +291,11 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
+- FT_Face *face, FT_Size *size)
++nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
++ FT_Face *face)
+ {
+ // call the FreeType2 function via the function pointer
+- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
++ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
+ return error ? NS_ERROR_FAILURE : NS_OK;
+ }
+
+@@ -320,7 +320,7 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
+ {
+ // call the FreeType2 function via the function pointer
+ FT_Error error = nsFTC_Image_Cache_New(manager, cache);
+@@ -389,7 +389,7 @@
+ }
+
+ NS_IMETHODIMP
+-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
++nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
+ {
+ *aCache = mImageCache;
+ return NS_OK;
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
new file mode 100644
index 00000000000..fd9de33f0c1
--- /dev/null
+++ b/mail/thunderbird/patches/patch-al
@@ -0,0 +1,23 @@
+$NetBSD: patch-al,v 1.1 2004/05/08 04:35:38 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-05-05 23:22:27.000000000 +0900
+@@ -320,7 +320,7 @@
+ nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
+ nsCOMPtr<nsIFreeType2> mFt2;
+ PRUint16 mPixelSize;
+- FTC_Image_Desc mImageDesc;
++ FTC_ImageType mImageDesc;
+
+
+ static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
+@@ -363,7 +363,7 @@
+ protected:
+ nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
+ nsCOMPtr<nsIFreeType2> mFt2;
+- FTC_Image_Desc mImageDesc;
++ FTC_ImageType mImageDesc;
+ };
+ #endif
+
diff --git a/mail/thunderbird/patches/patch-am b/mail/thunderbird/patches/patch-am
deleted file mode 100644
index 12dba027d3d..00000000000
--- a/mail/thunderbird/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/04/19 23:25:29 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-11-27 10:30:44.000000000 +0900
-+++ ./nsprpub/pr/src/pthreads/ptio.c 2004-01-16 23:17:38.000000000 +0900
-@@ -205,7 +205,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"
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
new file mode 100644
index 00000000000..ea0c00585e0
--- /dev/null
+++ b/mail/thunderbird/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2004/05/08 04:35:38 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-05-05 23:22:39.000000000 +0900
+@@ -110,7 +110,7 @@
+ XImage *GetXImage(PRUint32 width, PRUint32 height);
+ nsITrueTypeFontCatalogEntry *mFaceID;
+ PRUint16 mPixelSize;
+- FTC_Image_Desc mImageDesc;
++ FTC_ImageType mImageDesc;
+ nsCOMPtr<nsIFreeType2> mFt2;
+ };
+
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
new file mode 100644
index 00000000000..bcc7eea153a
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ao
@@ -0,0 +1,76 @@
+$NetBSD: patch-ao,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-05-05 23:22:43.000000000 +0900
+@@ -177,7 +177,7 @@
+ FTC_Manager mgr;
+ nsresult rv;
+ mFt2->GetFTCacheManager(&mgr);
+- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
++ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
+ NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
+ if (NS_FAILED(rv))
+ return nsnull;
+@@ -191,22 +191,15 @@
+ PRBool embedded_bimap = PR_FALSE;
+ mFaceID = aFaceID;
+ mPixelSize = aPixelSize;
+- mImageDesc.font.face_id = (void*)mFaceID;
+- mImageDesc.font.pix_width = aPixelSize;
+- mImageDesc.font.pix_height = aPixelSize;
+- mImageDesc.image_type = 0;
++ mImageDesc->face_id = (FTC_FaceID)&mFaceID;
++ mImageDesc->width = aPixelSize;
++ mImageDesc->height = aPixelSize;
++ mImageDesc->flags = 0;
+
+ if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
+- mImageDesc.image_type |= ftc_image_mono;
+ anti_alias = PR_FALSE;
+ }
+
+- if (nsFreeType2::gFreeType2Autohinted)
+- mImageDesc.image_type |= ftc_image_flag_autohinted;
+-
+- if (nsFreeType2::gFreeType2Unhinted)
+- mImageDesc.image_type |= ftc_image_flag_unhinted;
+-
+ PRUint32 num_embedded_bitmaps, i;
+ PRInt32* embedded_bitmapheights;
+ mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
+@@ -218,7 +211,6 @@
+ if (embedded_bitmapheights[i] == aPixelSize) {
+ embedded_bimap = PR_TRUE;
+ // unhinted must be set for embedded bitmaps to be used
+- mImageDesc.image_type |= ftc_image_flag_unhinted;
+ break;
+ }
+ }
+@@ -312,7 +304,7 @@
+ if (!face)
+ return NS_ERROR_FAILURE;
+
+- FTC_Image_Cache icache;
++ FTC_ImageCache icache;
+ mFt2->GetImageCache(&icache);
+ if (!icache)
+ return NS_ERROR_FAILURE;
+@@ -401,7 +393,7 @@
+ if (!face)
+ return 0;
+
+- FTC_Image_Cache icache;
++ FTC_ImageCache icache;
+ mFt2->GetImageCache(&icache);
+ if (!icache)
+ return 0;
+@@ -723,7 +715,7 @@
+ if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
+ #endif
+
+- FTC_Image_Cache icache;
++ FTC_ImageCache icache;
+ mFt2->GetImageCache(&icache);
+ if (!icache)
+ return 0;
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index a75074eb46a..74b1d67db9d 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-aw,v 1.2 2004/05/08 04:35:38 taya Exp $
diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2003-04-19 05:14:09.000000000 +0900
-+++ ./widget/src/gtksuperwin/Makefile.in 2004-01-16 23:17:41.000000000 +0900
+--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-01-07 22:36:54.000000000 +0900
++++ ./widget/src/gtksuperwin/Makefile.in 2004-05-05 23:22:48.000000000 +0900
@@ -25,6 +25,7 @@
MODULE = widget
LIBRARY_NAME = gtksuperwin
EXPORT_LIBRARY = 1
+MKSHLIB = $(MKCSHLIB)
+ PACKAGE_FILE = gtksuperwin.pkg
- CSRCS = \
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
new file mode 100644
index 00000000000..c4e442c253d
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ax
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1 2004/05/08 04:35:38 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-05-05 23:22:51.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/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index 3c73f5a878a..daea145d6f2 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ba,v 1.2 2004/05/08 04:35:38 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 2004-01-16 23:17:44.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-05-05 23:23:03.000000000 +0900
@@ -45,7 +45,8 @@
#define PR_AF_INET6 24 /* same as AF_INET6 */
diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb
index 3bd87285967..e5c8128c2a3 100644
--- a/mail/thunderbird/patches/patch-bb
+++ b/mail/thunderbird/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bb,v 1.2 2004/05/08 04:35:39 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
++++ ./nsprpub/pr/include/md/_netbsd.h 2004-05-05 23:23:04.000000000 +0900
@@ -48,12 +48,20 @@
#define _PR_SI_ARCHITECTURE "m68k"
#elif defined(__powerpc__)
diff --git a/mail/thunderbird/patches/patch-bm b/mail/thunderbird/patches/patch-bm
index b59abb44b99..11ba7ca1760 100644
--- a/mail/thunderbird/patches/patch-bm
+++ b/mail/thunderbird/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bm,v 1.2 2004/05/08 04:35:39 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 2004-01-16 23:17:51.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-05-05 23:23:13.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/mail/thunderbird/patches/patch-bn b/mail/thunderbird/patches/patch-bn
index 0b9cebbbad6..fd17b9e3b3c 100644
--- a/mail/thunderbird/patches/patch-bn
+++ b/mail/thunderbird/patches/patch-bn
@@ -1,9 +1,9 @@
-$NetBSD: patch-bn,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bn,v 1.2 2004/05/08 04:35:39 taya Exp $
diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp
---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-01-08 10:25:56.000000000 +0900
-+++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-01-16 23:17:54.000000000 +0900
-@@ -294,7 +294,12 @@
+--- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-03-26 14:29:18.000000000 +0900
++++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-05-05 23:23:15.000000000 +0900
+@@ -295,7 +295,12 @@
{
const char *blank_list[] = { "", NULL };
const char **native_charset_list = blank_list;
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
index ee9bfdfd8df..e6621de427b 100644
--- a/mail/thunderbird/patches/patch-bo
+++ b/mail/thunderbird/patches/patch-bo
@@ -1,9 +1,9 @@
-$NetBSD: patch-bo,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bo,v 1.2 2004/05/08 04:35:39 taya Exp $
diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in 2003-12-16 04:58:56.000000000 +0900
-+++ ./nsprpub/configure.in 2004-01-31 21:30:19.000000000 +0900
-@@ -930,6 +930,9 @@
+--- ../Orig/mozilla/nsprpub/configure.in 2004-04-17 07:28:02.000000000 +0900
++++ ./nsprpub/configure.in 2004-05-05 23:23:18.000000000 +0900
+@@ -933,6 +933,9 @@
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MDCPUCFG_H=_freebsd.cfg
PR_MD_CSRCS=freebsd.c
@@ -13,17 +13,3 @@ diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
;;
*-hpux*)
-@@ -2182,7 +2185,12 @@
- _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
-- *-openbsd*|*-bsdi*|*-netbsd*)
-+ *-netbsd*)
-+ 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
diff --git a/mail/thunderbird/patches/patch-bp b/mail/thunderbird/patches/patch-bp
deleted file mode 100644
index 2a12c14c9ed..00000000000
--- a/mail/thunderbird/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.1.1.1 2004/04/19 23:25:29 taya 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 2004-01-16 23:18:03.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/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq
index 2764d16688d..6f8f4d85455 100644
--- a/mail/thunderbird/patches/patch-bq
+++ b/mail/thunderbird/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.2 2004/04/26 13:56:09 taya Exp $
+$NetBSD: patch-bq,v 1.3 2004/05/08 04:35:39 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-05-05 23:24:31.000000000 +0900
@@ -57,7 +57,7 @@
#endif
diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br
index d5a6b21f384..7ddd32c3a74 100644
--- a/mail/thunderbird/patches/patch-br
+++ b/mail/thunderbird/patches/patch-br
@@ -1,7 +1,8 @@
-$NetBSD: patch-br,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-br,v 1.2 2004/05/08 04:35:39 taya Exp $
---- nsprpub/pr/src/misc/prnetdb.c.orig 2004-02-19 21:45:15.000000000 +0900
-+++ nsprpub/pr/src/misc/prnetdb.c 2004-02-19 21:50:57.000000000 +0900
+diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
+--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2004-01-23 07:22:37.000000000 +0900
++++ ./nsprpub/pr/src/misc/prnetdb.c 2004-05-05 23:24:35.000000000 +0900
@@ -2094,7 +2094,12 @@
*/
hints.ai_socktype = SOCK_STREAM;
@@ -14,4 +15,4 @@ $NetBSD: patch-br,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+
if (rv == 0)
return (PRAddrInfo *) res;
-
+
diff --git a/mail/thunderbird/patches/patch-bs b/mail/thunderbird/patches/patch-bs
deleted file mode 100644
index 207ea50a407..00000000000
--- a/mail/thunderbird/patches/patch-bs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bs,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
-
-diff -ru ../Orig/mozilla/toolkit/mozapps/downloads/src/Makefile.in ./toolkit/mozapps/downloads/src/Makefile.in
---- ../Orig/mozilla/toolkit/mozapps/downloads/src/Makefile.in 2003-12-11 06:59:41.000000000 +0900
-+++ ./toolkit/mozapps/downloads/src/Makefile.in 2004-04-19 18:42:20.000000000 +0900
-@@ -31,7 +31,7 @@
- libs:: nsHelperAppDlg.js
-
- nsHelperAppDlg.js: nsHelperAppDlg.js.in
-- $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@
-+ $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@
- $(NSINSTALL) $@ $(DIST)/bin/components/
-
- include $(topsrcdir)/config/rules.mk