summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2007-05-12 13:53:07 +0000
committerghen <ghen@pkgsrc.org>2007-05-12 13:53:07 +0000
commit800ce59e4113bde47081fa7cb69483e259827a06 (patch)
tree46d2b6ecdcd84072db37f20a6a98409187530fe1 /www/firefox
parent45ab269053f70db32960991d32fff5978a8cecce (diff)
downloadpkgsrc-800ce59e4113bde47081fa7cb69483e259827a06.tar.gz
Update to Firefox 2.0.0.3 (nb1), from www/firefox2* (see there for history
and change notes). Firefox 1.5.0.x will be maintained in www/firefox15*, as discussed on tech-pkg.
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/DESCR4
-rw-r--r--www/firefox/Makefile3
-rw-r--r--www/firefox/Makefile-firefox.common16
-rw-r--r--www/firefox/PLIST174
-rw-r--r--www/firefox/buildlink3.mk6
-rw-r--r--www/firefox/distinfo30
-rw-r--r--www/firefox/patches/patch-aa2
-rw-r--r--www/firefox/patches/patch-ab20
-rw-r--r--www/firefox/patches/patch-ac9
-rw-r--r--www/firefox/patches/patch-ad2
-rw-r--r--www/firefox/patches/patch-ae2
-rw-r--r--www/firefox/patches/patch-af2
-rw-r--r--www/firefox/patches/patch-ag2
-rw-r--r--www/firefox/patches/patch-ah2
-rw-r--r--www/firefox/patches/patch-ai24
-rw-r--r--www/firefox/patches/patch-aj2
-rw-r--r--www/firefox/patches/patch-ak2
-rw-r--r--www/firefox/patches/patch-al2
-rw-r--r--www/firefox/patches/patch-an2
-rw-r--r--www/firefox/patches/patch-ao2
-rw-r--r--www/firefox/patches/patch-ap6
-rw-r--r--www/firefox/patches/patch-aq2
-rw-r--r--www/firefox/patches/patch-at36
-rw-r--r--www/firefox/patches/patch-aw2
-rw-r--r--www/firefox/patches/patch-ax6
-rw-r--r--www/firefox/patches/patch-ba2
-rw-r--r--www/firefox/patches/patch-bb2
-rw-r--r--www/firefox/patches/patch-bm2
-rw-r--r--www/firefox/patches/patch-bo2
-rw-r--r--www/firefox/patches/patch-bq2
-rw-r--r--www/firefox/patches/patch-br2
-rw-r--r--www/firefox/patches/patch-bs2
-rw-r--r--www/firefox/patches/patch-bu180
-rw-r--r--www/firefox/patches/patch-bv212
-rw-r--r--www/firefox/patches/patch-bx2
-rw-r--r--www/firefox/patches/patch-by2
-rw-r--r--www/firefox/patches/patch-bz2
-rw-r--r--www/firefox/patches/patch-ca2
-rw-r--r--www/firefox/patches/patch-cb2
-rw-r--r--www/firefox/patches/patch-cd2
-rw-r--r--www/firefox/patches/patch-cg2
-rw-r--r--www/firefox/patches/patch-ch2
-rw-r--r--www/firefox/patches/patch-ci2
-rw-r--r--www/firefox/patches/patch-cj2
-rw-r--r--www/firefox/patches/patch-ck2
-rw-r--r--www/firefox/patches/patch-cl2
-rw-r--r--www/firefox/patches/patch-cm2
-rw-r--r--www/firefox/patches/patch-cn18
-rw-r--r--www/firefox/patches/patch-da12
-rw-r--r--www/firefox/patches/patch-db2
-rw-r--r--www/firefox/patches/patch-dc2
-rw-r--r--www/firefox/patches/patch-dd2
-rw-r--r--www/firefox/patches/patch-de13
-rw-r--r--www/firefox/patches/patch-df2
-rw-r--r--www/firefox/patches/patch-dh2
-rw-r--r--www/firefox/patches/patch-dj2
-rw-r--r--www/firefox/patches/patch-dk2
-rw-r--r--www/firefox/patches/patch-dl2
-rw-r--r--www/firefox/patches/patch-dm2
-rw-r--r--www/firefox/patches/patch-do2
-rw-r--r--www/firefox/patches/patch-dr2
-rw-r--r--www/firefox/patches/patch-ds2
-rw-r--r--www/firefox/patches/patch-dt2
-rw-r--r--www/firefox/patches/patch-du2
-rw-r--r--www/firefox/patches/patch-dv2
-rw-r--r--www/firefox/patches/patch-dw41
-rw-r--r--www/firefox/patches/patch-ea2
-rw-r--r--www/firefox/patches/patch-eb2
-rw-r--r--www/firefox/patches/patch-ec7
-rw-r--r--www/firefox/patches/patch-ed20
70 files changed, 742 insertions, 195 deletions
diff --git a/www/firefox/DESCR b/www/firefox/DESCR
index 98001994dc4..2f9713be943 100644
--- a/www/firefox/DESCR
+++ b/www/firefox/DESCR
@@ -7,7 +7,3 @@ windows.
Firefox also offers excellent bookmark and history management, and it
can be extended by developers using industry standards such as XML,
CSS, JavaScript, C++, etc. Many extensions are available.
-
-Note: Firefox 1.5.0.x will be maintained with security and stability
-updates until mid-May, 2007. All users are strongly encouraged to
-upgrade to Firefox 2 (pkgsrc/www/firefox2 and firefox2-gtk1).
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 021c96d6ec0..e0d162abfaa 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/03/21 13:33:04 ghen Exp $
+# $NetBSD: Makefile,v 1.44 2007/05/12 13:53:07 ghen Exp $
MOZILLA= firefox
+PKGREVISION= 1
COMMENT= Lightweight gecko-based web browser
MOZILLA_USE_GTK2= # yes
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 611c5ecd972..34d19af0971 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.42 2007/03/21 13:33:04 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.43 2007/05/12 13:53:07 ghen Exp $
MOZILLA_BIN= firefox-bin
-MOZ_VER= 1.5.0.11
+MOZ_VER= 2.0.0.3
EXTRACT_SUFX= .tar.bz2
DISTNAME= firefox-${MOZ_VER}-source
@@ -11,7 +11,9 @@ MASTER_SITES+= ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER
MASTER_SITES+= http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/
MASTER_SITES+= ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/source/
-HOMEPAGE= http://www.mozilla.org/projects/firefox/
+HOMEPAGE= http://www.mozilla.com/en-US/firefox/
+
+PKG_DESTDIR_SUPPORT= user-destdir
DISTINFO_FILE= ${.CURDIR}/../../www/firefox/distinfo
PATCHDIR= ${.CURDIR}/../../www/firefox/patches
@@ -26,7 +28,13 @@ MOZILLA_EXTENSIONS= default
CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS:Q}
CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
-USE_LANGUAGES= c++
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0
+.endif
+
+USE_LANGUAGES+= c++
BUILD_SVG= # yes
BUILD_MATHML= # yes
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index dd861ddec67..362843d97e9 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2007/03/07 21:32:54 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/05/12 13:53:07 ghen Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -43,6 +43,7 @@ lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
+lib/${MOZILLA}/components/libmyspell.${SO_SUFFIX}
lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
@@ -55,6 +56,8 @@ lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
lib/${MOZILLA}/components/libremoteservice.${SO_SUFFIX}
lib/${MOZILLA}/components/libsearchservice.${SO_SUFFIX}
+lib/${MOZILLA}/components/libspellchecker.${SO_SUFFIX}
+lib/${MOZILLA}/components/libstoragecomps.${SO_SUFFIX}
lib/${MOZILLA}/components/libsystem-pref.${SO_SUFFIX}
lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX}
@@ -69,7 +72,6 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-lib/${MOZILLA}/extensions/inspector@mozilla.org/components/libinspector.${SO_SUFFIX}
@comment libfreebl
lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
@@ -122,6 +124,10 @@ lib/${MOZILLA}/chrome/reporter.jar
lib/${MOZILLA}/chrome/reporter.manifest
lib/${MOZILLA}/chrome/toolkit.jar
lib/${MOZILLA}/chrome/toolkit.manifest
+lib/${MOZILLA}/components/FeedConverter.js
+lib/${MOZILLA}/components/FeedProcessor.js
+lib/${MOZILLA}/components/FeedWriter.js
+lib/${MOZILLA}/components/WebContentConverter.js
lib/${MOZILLA}/components/accessibility-atk.xpt
lib/${MOZILLA}/components/accessibility.xpt
lib/${MOZILLA}/components/alerts.xpt
@@ -130,7 +136,9 @@ lib/${MOZILLA}/components/appstartup.xpt
lib/${MOZILLA}/components/autocomplete.xpt
lib/${MOZILLA}/components/autoconfig.xpt
lib/${MOZILLA}/components/bookmarks.xpt
+lib/${MOZILLA}/components/browser-feeds.xpt
lib/${MOZILLA}/components/browsercompsbase.xpt
+lib/${MOZILLA}/components/browsersearch.xpt
lib/${MOZILLA}/components/caps.xpt
lib/${MOZILLA}/components/chardet.xpt
lib/${MOZILLA}/components/chrome.xpt
@@ -155,6 +163,8 @@ lib/${MOZILLA}/components/dom_events.xpt
lib/${MOZILLA}/components/dom_html.xpt
lib/${MOZILLA}/components/dom_loadsave.xpt
lib/${MOZILLA}/components/dom_range.xpt
+lib/${MOZILLA}/components/dom_sidebar.xpt
+lib/${MOZILLA}/components/dom_storage.xpt
lib/${MOZILLA}/components/dom_stylesheets.xpt
lib/${MOZILLA}/components/dom_svg.xpt
lib/${MOZILLA}/components/dom_traversal.xpt
@@ -168,6 +178,7 @@ lib/${MOZILLA}/components/embed_base.xpt
lib/${MOZILLA}/components/extensions.xpt
lib/${MOZILLA}/components/exthandler.xpt
lib/${MOZILLA}/components/fastfind.xpt
+lib/${MOZILLA}/components/feeds.xpt
lib/${MOZILLA}/components/filepicker.xpt
lib/${MOZILLA}/components/find.xpt
lib/${MOZILLA}/components/gfx.xpt
@@ -175,6 +186,7 @@ lib/${MOZILLA}/components/gksvgrenderer.xpt
lib/${MOZILLA}/components/history.xpt
lib/${MOZILLA}/components/htmlparser.xpt
lib/${MOZILLA}/components/imglib2.xpt
+lib/${MOZILLA}/components/inspector.xpt
lib/${MOZILLA}/components/intl.xpt
lib/${MOZILLA}/components/jar.xpt
lib/${MOZILLA}/components/jsconsole-clhandler.js
@@ -186,6 +198,7 @@ lib/${MOZILLA}/components/layout_xul.xpt
lib/${MOZILLA}/components/layout_xul_tree.xpt
lib/${MOZILLA}/components/locale.xpt
lib/${MOZILLA}/components/lwbrk.xpt
+lib/${MOZILLA}/components/microsummaries.xpt
lib/${MOZILLA}/components/migration.xpt
lib/${MOZILLA}/components/mimetype.xpt
lib/${MOZILLA}/components/mozbrwsr.xpt
@@ -204,6 +217,7 @@ lib/${MOZILLA}/components/necko_res.xpt
lib/${MOZILLA}/components/necko_socket.xpt
lib/${MOZILLA}/components/necko_strconv.xpt
lib/${MOZILLA}/components/necko_viewsource.xpt
+lib/${MOZILLA}/components/nsBookmarkTransactionManager.js
lib/${MOZILLA}/components/nsBrowserContentHandler.js
lib/${MOZILLA}/components/nsBrowserGlue.js
lib/${MOZILLA}/components/nsCloseAllWindows.js
@@ -214,12 +228,22 @@ lib/${MOZILLA}/components/nsFilePicker.js
lib/${MOZILLA}/components/nsHelperAppDlg.js
lib/${MOZILLA}/components/nsInterfaceInfoToIDL.js
lib/${MOZILLA}/components/nsKillAll.js
+lib/${MOZILLA}/components/nsMicrosummaryService.js
lib/${MOZILLA}/components/nsProgressDialog.js
lib/${MOZILLA}/components/nsProxyAutoConfig.js
lib/${MOZILLA}/components/nsResetPref.js
+lib/${MOZILLA}/components/nsSafebrowsingApplication.js
+lib/${MOZILLA}/components/nsSearchService.js
+lib/${MOZILLA}/components/nsSearchSuggestions.js
+lib/${MOZILLA}/components/nsSessionStartup.js
+lib/${MOZILLA}/components/nsSessionStore.js
lib/${MOZILLA}/components/nsSetDefaultBrowser.js
lib/${MOZILLA}/components/nsSidebar.js
+lib/${MOZILLA}/components/nsURLFormatter.js
lib/${MOZILLA}/components/nsUpdateService.js
+lib/${MOZILLA}/components/nsUrlClassifierLib.js
+lib/${MOZILLA}/components/nsUrlClassifierListManager.js
+lib/${MOZILLA}/components/nsUrlClassifierTable.js
lib/${MOZILLA}/components/nsXmlRpcClient.js
lib/${MOZILLA}/components/oji.xpt
lib/${MOZILLA}/components/passwordmgr.xpt
@@ -233,11 +257,15 @@ lib/${MOZILLA}/components/profile.xpt
lib/${MOZILLA}/components/progressDlg.xpt
lib/${MOZILLA}/components/proxyObjInst.xpt
lib/${MOZILLA}/components/rdf.xpt
+lib/${MOZILLA}/components/safebrowsing.xpt
lib/${MOZILLA}/components/satchel.xpt
+lib/${MOZILLA}/components/saxparser.xpt
lib/${MOZILLA}/components/search.xpt
+lib/${MOZILLA}/components/sessionstore.xpt
lib/${MOZILLA}/components/shellservice.xpt
lib/${MOZILLA}/components/shistory.xpt
-lib/${MOZILLA}/components/sidebar.xpt
+lib/${MOZILLA}/components/spellchecker.xpt
+lib/${MOZILLA}/components/storage.xpt
lib/${MOZILLA}/components/toolkitprofile.xpt
lib/${MOZILLA}/components/toolkitremote.xpt
lib/${MOZILLA}/components/txmgr.xpt
@@ -246,6 +274,8 @@ lib/${MOZILLA}/components/uconv.xpt
lib/${MOZILLA}/components/unicharutil.xpt
lib/${MOZILLA}/components/update.xpt
lib/${MOZILLA}/components/uriloader.xpt
+lib/${MOZILLA}/components/url-classifier.xpt
+lib/${MOZILLA}/components/urlformatter.xpt
lib/${MOZILLA}/components/webBrowser_core.xpt
lib/${MOZILLA}/components/webbrowserpersist.xpt
lib/${MOZILLA}/components/webshell_idls.xpt
@@ -254,7 +284,6 @@ lib/${MOZILLA}/components/widget.xpt
lib/${MOZILLA}/components/windowds.xpt
lib/${MOZILLA}/components/windowwatcher.xpt
lib/${MOZILLA}/components/xml-rpc.xpt
-lib/${MOZILLA}/components/xmlextras.xpt
lib/${MOZILLA}/components/xpcom_base.xpt
lib/${MOZILLA}/components/xpcom_components.xpt
lib/${MOZILLA}/components/xpcom_ds.xpt
@@ -270,6 +299,7 @@ lib/${MOZILLA}/components/xultmpl.xpt
lib/${MOZILLA}/defaults/autoconfig/platform.js
lib/${MOZILLA}/defaults/autoconfig/prefcalls.js
lib/${MOZILLA}/defaults/pref/channel-prefs.js
+lib/${MOZILLA}/defaults/pref/firefox-branding.js
lib/${MOZILLA}/defaults/pref/firefox-l10n.js
lib/${MOZILLA}/defaults/pref/firefox.js
lib/${MOZILLA}/defaults/pref/reporter.js
@@ -281,14 +311,16 @@ lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
lib/${MOZILLA}/defaults/profile/prefs.js
lib/${MOZILLA}/defaults/profile/search.rdf
lib/${MOZILLA}/dependentlibs.list
+lib/${MOZILLA}/dictionaries/en-US.aff
+lib/${MOZILLA}/dictionaries/en-US.dic
lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome.manifest
lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome/chromelist.txt
lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome/inspector.jar
lib/${MOZILLA}/extensions/inspector@mozilla.org/components/inspector-cmdline.js
-lib/${MOZILLA}/extensions/inspector@mozilla.org/components/inspector.xpt
lib/${MOZILLA}/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
lib/${MOZILLA}/extensions/inspector@mozilla.org/install.rdf
lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/${MOZILLA}/firefox
lib/${MOZILLA}/greprefs/all.js
lib/${MOZILLA}/greprefs/security-prefs.js
lib/${MOZILLA}/greprefs/xpinstall.js
@@ -299,6 +331,7 @@ lib/${MOZILLA}/icons/mozicon50.xpm
lib/${MOZILLA}/init.d/README
@comment libfreebl.chk
lib/${MOZILLA}/libsoftokn3.chk
+lib/${MOZILLA}/old-homepage-default.properties
lib/${MOZILLA}/res/EditorOverride.css
lib/${MOZILLA}/res/arrow.gif
lib/${MOZILLA}/res/arrowd.gif
@@ -454,18 +487,12 @@ lib/${MOZILLA}/res/ua.css
lib/${MOZILLA}/res/unixcharset.properties
lib/${MOZILLA}/res/viewer.properties
lib/${MOZILLA}/res/viewsource.css
-lib/${MOZILLA}/searchplugins/amazondotcom.png
-lib/${MOZILLA}/searchplugins/amazondotcom.src
-lib/${MOZILLA}/searchplugins/answers.png
-lib/${MOZILLA}/searchplugins/answers.src
-lib/${MOZILLA}/searchplugins/creativecommons.png
-lib/${MOZILLA}/searchplugins/creativecommons.src
-lib/${MOZILLA}/searchplugins/eBay.gif
-lib/${MOZILLA}/searchplugins/eBay.src
-lib/${MOZILLA}/searchplugins/google.gif
-lib/${MOZILLA}/searchplugins/google.src
-lib/${MOZILLA}/searchplugins/yahoo.gif
-lib/${MOZILLA}/searchplugins/yahoo.src
+lib/${MOZILLA}/searchplugins/amazondotcom.xml
+lib/${MOZILLA}/searchplugins/answers.xml
+lib/${MOZILLA}/searchplugins/creativecommons.xml
+lib/${MOZILLA}/searchplugins/eBay.xml
+lib/${MOZILLA}/searchplugins/google.xml
+lib/${MOZILLA}/searchplugins/yahoo.xml
lib/${MOZILLA}/updater
lib/${MOZILLA}/updater.ini
@comment end DATA
@@ -526,14 +553,19 @@ include/${MOZILLA}/autocomplete/nsIAutoCompletePopup.h
include/${MOZILLA}/autocomplete/nsIAutoCompleteResult.h
include/${MOZILLA}/autocomplete/nsIAutoCompleteResultTypes.h
include/${MOZILLA}/autocomplete/nsIAutoCompleteSearch.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteSimpleResult.h
include/${MOZILLA}/autoconfig/nsIAutoConfig.h
-include/${MOZILLA}/autoconfig/nsILDAPSyncQuery.h
include/${MOZILLA}/autoconfig/nsIReadConfig.h
+include/${MOZILLA}/bookmarks/nsIBookmarkTransactionManager.h
include/${MOZILLA}/bookmarks/nsIBookmarksService.h
+include/${MOZILLA}/browser-feeds/nsIFeedResultService.h
+include/${MOZILLA}/browser-feeds/nsIFeedWriter.h
+include/${MOZILLA}/browser-feeds/nsIWebContentConverterRegistrar.h
include/${MOZILLA}/browser/nsIBrowserInstance.h
include/${MOZILLA}/browsercomps/nsBrowserCompsCID.h
include/${MOZILLA}/browsercomps/nsIBrowserGlue.h
include/${MOZILLA}/browsercomps/nsIBrowserHandler.h
+include/${MOZILLA}/browsersearch/nsIBrowserSearchService.h
include/${MOZILLA}/caps/nsICryptoHash.h
include/${MOZILLA}/caps/nsIPrincipal.h
include/${MOZILLA}/caps/nsIScriptSecurityManager.h
@@ -583,8 +615,11 @@ include/${MOZILLA}/content/nsIContent.h
include/${MOZILLA}/content/nsIContentIterator.h
include/${MOZILLA}/content/nsIContentPolicy.h
include/${MOZILLA}/content/nsIContentSerializer.h
+include/${MOZILLA}/content/nsIDOMGCParticipant.h
+include/${MOZILLA}/content/nsIDOMParser.h
include/${MOZILLA}/content/nsIDOMSVGListener.h
include/${MOZILLA}/content/nsIDOMSVGZoomListener.h
+include/${MOZILLA}/content/nsIDOMSerializer.h
include/${MOZILLA}/content/nsIDocument.h
include/${MOZILLA}/content/nsIDocumentEncoder.h
include/${MOZILLA}/content/nsIDocumentObserver.h
@@ -621,6 +656,7 @@ include/${MOZILLA}/content/nsIRadioControlElement.h
include/${MOZILLA}/content/nsIRadioGroupContainer.h
include/${MOZILLA}/content/nsIRadioVisitor.h
include/${MOZILLA}/content/nsIRangeUtils.h
+include/${MOZILLA}/content/nsISVGPathFlatten.h
include/${MOZILLA}/content/nsISVGTextContentMetrics.h
include/${MOZILLA}/content/nsISVGValue.h
include/${MOZILLA}/content/nsISVGValueObserver.h
@@ -632,6 +668,7 @@ include/${MOZILLA}/content/nsIScriptLoader.h
include/${MOZILLA}/content/nsIScriptLoaderObserver.h
include/${MOZILLA}/content/nsISelectElement.h
include/${MOZILLA}/content/nsISelection.h
+include/${MOZILLA}/content/nsISelection2.h
include/${MOZILLA}/content/nsISelectionController.h
include/${MOZILLA}/content/nsISelectionDisplay.h
include/${MOZILLA}/content/nsISelectionListener.h
@@ -647,11 +684,13 @@ include/${MOZILLA}/content/nsIXBLService.h
include/${MOZILLA}/content/nsIXMLContent.h
include/${MOZILLA}/content/nsIXMLContentBuilder.h
include/${MOZILLA}/content/nsIXMLContentSink.h
+include/${MOZILLA}/content/nsIXMLHttpRequest.h
include/${MOZILLA}/content/nsIXPathEvaluatorInternal.h
include/${MOZILLA}/content/nsIXPointer.h
include/${MOZILLA}/content/nsIXSLTException.h
include/${MOZILLA}/content/nsIXSLTProcessor.h
include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
+include/${MOZILLA}/content/nsIXSLTProcessorPrivate.h
include/${MOZILLA}/content/nsIXTFAttributeHandler.h
include/${MOZILLA}/content/nsIXTFBindableElement.h
include/${MOZILLA}/content/nsIXTFBindableElementWrapper.h
@@ -702,6 +741,7 @@ include/${MOZILLA}/dbm/winfile.h
include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
include/${MOZILLA}/docshell/nsCDocShell.h
include/${MOZILLA}/docshell/nsDocShellCID.h
+include/${MOZILLA}/docshell/nsDocShellLoadTypes.h
include/${MOZILLA}/docshell/nsIContentViewer.h
include/${MOZILLA}/docshell/nsIContentViewerEdit.h
include/${MOZILLA}/docshell/nsIContentViewerFile.h
@@ -714,6 +754,7 @@ include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
include/${MOZILLA}/docshell/nsIEditorDocShell.h
include/${MOZILLA}/docshell/nsIGlobalHistory.h
include/${MOZILLA}/docshell/nsIGlobalHistory2.h
+include/${MOZILLA}/docshell/nsIGlobalHistory3.h
include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
include/${MOZILLA}/docshell/nsIScrollable.h
include/${MOZILLA}/docshell/nsITextScroll.h
@@ -757,6 +798,7 @@ include/${MOZILLA}/dom/nsIDOMCanvasRenderingContext2D.h
include/${MOZILLA}/dom/nsIDOMCharacterData.h
include/${MOZILLA}/dom/nsIDOMChromeWindow.h
include/${MOZILLA}/dom/nsIDOMClassInfo.h
+include/${MOZILLA}/dom/nsIDOMClientInformation.h
include/${MOZILLA}/dom/nsIDOMComment.h
include/${MOZILLA}/dom/nsIDOMCompositionListener.h
include/${MOZILLA}/dom/nsIDOMConstructor.h
@@ -977,6 +1019,7 @@ include/${MOZILLA}/dom/nsIDOMSVGSymbolElement.h
include/${MOZILLA}/dom/nsIDOMSVGTSpanElement.h
include/${MOZILLA}/dom/nsIDOMSVGTextContentElement.h
include/${MOZILLA}/dom/nsIDOMSVGTextElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTextPathElement.h
include/${MOZILLA}/dom/nsIDOMSVGTextPositionElem.h
include/${MOZILLA}/dom/nsIDOMSVGTitleElement.h
include/${MOZILLA}/dom/nsIDOMSVGTransform.h
@@ -984,16 +1027,23 @@ include/${MOZILLA}/dom/nsIDOMSVGTransformList.h
include/${MOZILLA}/dom/nsIDOMSVGTransformable.h
include/${MOZILLA}/dom/nsIDOMSVGURIReference.h
include/${MOZILLA}/dom/nsIDOMSVGUseElement.h
+include/${MOZILLA}/dom/nsIDOMSVGViewSpec.h
include/${MOZILLA}/dom/nsIDOMSVGZoomAndPan.h
include/${MOZILLA}/dom/nsIDOMSVGZoomEvent.h
include/${MOZILLA}/dom/nsIDOMScreen.h
include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
include/${MOZILLA}/dom/nsIDOMScrollListener.h
include/${MOZILLA}/dom/nsIDOMSmartCardEvent.h
+include/${MOZILLA}/dom/nsIDOMStorage.h
+include/${MOZILLA}/dom/nsIDOMStorageEvent.h
+include/${MOZILLA}/dom/nsIDOMStorageItem.h
+include/${MOZILLA}/dom/nsIDOMStorageList.h
+include/${MOZILLA}/dom/nsIDOMStorageWindow.h
include/${MOZILLA}/dom/nsIDOMStyleSheet.h
include/${MOZILLA}/dom/nsIDOMStyleSheetList.h
include/${MOZILLA}/dom/nsIDOMText.h
include/${MOZILLA}/dom/nsIDOMTextListener.h
+include/${MOZILLA}/dom/nsIDOMToString.h
include/${MOZILLA}/dom/nsIDOMTreeWalker.h
include/${MOZILLA}/dom/nsIDOMUIEvent.h
include/${MOZILLA}/dom/nsIDOMUIListener.h
@@ -1014,6 +1064,7 @@ include/${MOZILLA}/dom/nsIDOMXPathResult.h
include/${MOZILLA}/dom/nsIDOMXULButtonElement.h
include/${MOZILLA}/dom/nsIDOMXULCheckboxElement.h
include/${MOZILLA}/dom/nsIDOMXULCommandDispatcher.h
+include/${MOZILLA}/dom/nsIDOMXULCommandEvent.h
include/${MOZILLA}/dom/nsIDOMXULControlElement.h
include/${MOZILLA}/dom/nsIDOMXULDescriptionElement.h
include/${MOZILLA}/dom/nsIDOMXULDocument.h
@@ -1041,6 +1092,9 @@ include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
include/${MOZILLA}/dom/nsIScriptNameSpaceManager.h
include/${MOZILLA}/dom/nsIScriptObjectOwner.h
include/${MOZILLA}/dom/nsIScriptObjectPrincipal.h
+include/${MOZILLA}/dom/nsISidebar.h
+include/${MOZILLA}/dom/nsIWebContentHandlerRegistrar.h
+include/${MOZILLA}/dom/nsPIDOMStorage.h
include/${MOZILLA}/dom/nsPIDOMWindow.h
include/${MOZILLA}/dom/nsPIWindowRoot.h
include/${MOZILLA}/downloads/nsIDownloadManager.h
@@ -1071,6 +1125,7 @@ include/${MOZILLA}/embed_base/nsEmbedAPI.h
include/${MOZILLA}/embed_base/nsEmbedCID.h
include/${MOZILLA}/embed_base/nsIWindowCreator.h
include/${MOZILLA}/embed_base/nsIWindowCreator2.h
+include/${MOZILLA}/embed_base/nsIWindowProvider.h
include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.h
include/${MOZILLA}/expat/expat.h
include/${MOZILLA}/expat/expat_config.h
@@ -1081,6 +1136,17 @@ include/${MOZILLA}/exthandler/nsIExternalProtocolService.h
include/${MOZILLA}/exthandler/nsIHelperAppLauncherDialog.h
include/${MOZILLA}/exthandler/nsOSHelperAppService.h
include/${MOZILLA}/fastfind/nsITypeAheadFind.h
+include/${MOZILLA}/feeds/nsIFeed.h
+include/${MOZILLA}/feeds/nsIFeedContainer.h
+include/${MOZILLA}/feeds/nsIFeedElementBase.h
+include/${MOZILLA}/feeds/nsIFeedEntry.h
+include/${MOZILLA}/feeds/nsIFeedGenerator.h
+include/${MOZILLA}/feeds/nsIFeedListener.h
+include/${MOZILLA}/feeds/nsIFeedPerson.h
+include/${MOZILLA}/feeds/nsIFeedProcessor.h
+include/${MOZILLA}/feeds/nsIFeedResult.h
+include/${MOZILLA}/feeds/nsIFeedTextConstruct.h
+include/${MOZILLA}/feeds/nsIScriptableUnescapeHTML.h
include/${MOZILLA}/filepicker/nsIFileView.h
include/${MOZILLA}/find/nsIFind.h
include/${MOZILLA}/find/nsIWebBrowserFind.h
@@ -1142,6 +1208,7 @@ include/${MOZILLA}/htmlparser/nsIContentSink.h
include/${MOZILLA}/htmlparser/nsIDTD.h
include/${MOZILLA}/htmlparser/nsIElementObserver.h
include/${MOZILLA}/htmlparser/nsIExpatSink.h
+include/${MOZILLA}/htmlparser/nsIExtendedExpatSink.h
include/${MOZILLA}/htmlparser/nsIFragmentContentSink.h
include/${MOZILLA}/htmlparser/nsIHTMLContentSink.h
include/${MOZILLA}/htmlparser/nsIParser.h
@@ -1209,6 +1276,7 @@ include/${MOZILLA}/js/jsarena.h
include/${MOZILLA}/js/jsarray.h
include/${MOZILLA}/js/jsatom.h
include/${MOZILLA}/js/jsautocfg.h
+include/${MOZILLA}/js/jsautokw.h
include/${MOZILLA}/js/jsbit.h
include/${MOZILLA}/js/jsbool.h
include/${MOZILLA}/js/jsclist.h
@@ -1223,6 +1291,7 @@ include/${MOZILLA}/js/jsfun.h
include/${MOZILLA}/js/jsgc.h
include/${MOZILLA}/js/jshash.h
include/${MOZILLA}/js/jsinterp.h
+include/${MOZILLA}/js/jsiter.h
include/${MOZILLA}/js/jslock.h
include/${MOZILLA}/js/jslong.h
include/${MOZILLA}/js/jsmath.h
@@ -1234,6 +1303,7 @@ include/${MOZILLA}/js/jsosdep.h
include/${MOZILLA}/js/jsotypes.h
include/${MOZILLA}/js/jsparse.h
include/${MOZILLA}/js/jsprf.h
+include/${MOZILLA}/js/jsproto.tbl
include/${MOZILLA}/js/jsprvtd.h
include/${MOZILLA}/js/jspubtd.h
include/${MOZILLA}/js/jsregexp.h
@@ -1384,6 +1454,7 @@ include/${MOZILLA}/layout/nsLayoutAtomList.h
include/${MOZILLA}/layout/nsLayoutAtoms.h
include/${MOZILLA}/layout/nsLayoutCID.h
include/${MOZILLA}/layout/nsLayoutErrors.h
+include/${MOZILLA}/layout/nsLayoutStatics.h
include/${MOZILLA}/layout/nsLayoutStylesheetCache.h
include/${MOZILLA}/layout/nsLayoutUtils.h
include/${MOZILLA}/layout/nsPIBoxObject.h
@@ -1441,6 +1512,7 @@ include/${MOZILLA}/lwbrk/nsISemanticUnitScanner.h
include/${MOZILLA}/lwbrk/nsIWordBreaker.h
include/${MOZILLA}/lwbrk/nsIWordBreakerFactory.h
include/${MOZILLA}/lwbrk/nsLWBrkCIID.h
+include/${MOZILLA}/microsummaries/nsIMicrosummaryService.h
include/${MOZILLA}/migration/nsIBrowserProfileMigrator.h
include/${MOZILLA}/mimetype/nsIMIMEHeaderParam.h
include/${MOZILLA}/mimetype/nsIMIMEInfo.h
@@ -1494,6 +1566,7 @@ include/${MOZILLA}/necko/nsIFileChannel.h
include/${MOZILLA}/necko/nsIFileProtocolHandler.h
include/${MOZILLA}/necko/nsIFileStreams.h
include/${MOZILLA}/necko/nsIFileURL.h
+include/${MOZILLA}/necko/nsIHttpActivityObserver.h
include/${MOZILLA}/necko/nsIHttpAuthManager.h
include/${MOZILLA}/necko/nsIHttpAuthenticator.h
include/${MOZILLA}/necko/nsIHttpChannel.h
@@ -1503,6 +1576,7 @@ include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
include/${MOZILLA}/necko/nsIIDNService.h
include/${MOZILLA}/necko/nsIIOService.h
+include/${MOZILLA}/necko/nsIIOService2.h
include/${MOZILLA}/necko/nsIIncrementalDownload.h
include/${MOZILLA}/necko/nsIInputStreamChannel.h
include/${MOZILLA}/necko/nsIInputStreamPump.h
@@ -1510,6 +1584,7 @@ include/${MOZILLA}/necko/nsILoadGroup.h
include/${MOZILLA}/necko/nsIMIMEInputStream.h
include/${MOZILLA}/necko/nsIMultiPartChannel.h
include/${MOZILLA}/necko/nsINetUtil.h
+include/${MOZILLA}/necko/nsINetworkLinkService.h
include/${MOZILLA}/necko/nsIPasswordManager.h
include/${MOZILLA}/necko/nsIPasswordManagerInternal.h
include/${MOZILLA}/necko/nsIPermissionManager.h
@@ -1739,6 +1814,7 @@ include/${MOZILLA}/pipnss/nsIBadCertListener.h
include/${MOZILLA}/pipnss/nsICMSDecoder.h
include/${MOZILLA}/pipnss/nsICMSEncoder.h
include/${MOZILLA}/pipnss/nsICMSMessage.h
+include/${MOZILLA}/pipnss/nsICMSMessage2.h
include/${MOZILLA}/pipnss/nsICMSMessageErrors.h
include/${MOZILLA}/pipnss/nsICMSSecureMessage.h
include/${MOZILLA}/pipnss/nsICRLInfo.h
@@ -1752,6 +1828,7 @@ include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
+include/${MOZILLA}/pipnss/nsIKeyModule.h
include/${MOZILLA}/pipnss/nsIKeygenThread.h
include/${MOZILLA}/pipnss/nsINSSCertCache.h
include/${MOZILLA}/pipnss/nsIOCSPResponder.h
@@ -1762,10 +1839,12 @@ include/${MOZILLA}/pipnss/nsIPKCS11ModuleDB.h
include/${MOZILLA}/pipnss/nsIPKCS11Slot.h
include/${MOZILLA}/pipnss/nsISMimeCert.h
include/${MOZILLA}/pipnss/nsISSLStatus.h
+include/${MOZILLA}/pipnss/nsIStreamCipher.h
include/${MOZILLA}/pipnss/nsITokenDialogs.h
include/${MOZILLA}/pipnss/nsITokenPasswordDialogs.h
include/${MOZILLA}/pipnss/nsIUserCertPicker.h
include/${MOZILLA}/pipnss/nsIX509Cert.h
+include/${MOZILLA}/pipnss/nsIX509Cert3.h
include/${MOZILLA}/pipnss/nsIX509CertDB.h
include/${MOZILLA}/pipnss/nsIX509CertDB2.h
include/${MOZILLA}/pipnss/nsIX509CertValidity.h
@@ -1856,8 +1935,11 @@ include/${MOZILLA}/rdf/rdfIDataSource.h
include/${MOZILLA}/rdf/rdfISerializer.h
include/${MOZILLA}/rdf/rdfITripleVisitor.h
include/${MOZILLA}/rdfutil/nsRDFResource.h
+include/${MOZILLA}/safebrowsing/nsIDocNavStartProgressListener.h
include/${MOZILLA}/satchel/nsIFormFillController.h
include/${MOZILLA}/satchel/nsIFormHistory.h
+include/${MOZILLA}/sessionstore/nsISessionStartup.h
+include/${MOZILLA}/sessionstore/nsISessionStore.h
include/${MOZILLA}/shellservice/nsIShellService.h
include/${MOZILLA}/shistory/nsIHistoryEntry.h
include/${MOZILLA}/shistory/nsISHContainer.h
@@ -1866,7 +1948,21 @@ include/${MOZILLA}/shistory/nsISHTransaction.h
include/${MOZILLA}/shistory/nsISHistory.h
include/${MOZILLA}/shistory/nsISHistoryInternal.h
include/${MOZILLA}/shistory/nsISHistoryListener.h
-include/${MOZILLA}/sidebar/nsISidebar.h
+include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
+include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
+include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
+include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
+include/${MOZILLA}/sqlite3/sqlite3.h
+include/${MOZILLA}/sqlite3/sqlite3file.h
+include/${MOZILLA}/storage/mozIStorageConnection.h
+include/${MOZILLA}/storage/mozIStorageDataSet.h
+include/${MOZILLA}/storage/mozIStorageFunction.h
+include/${MOZILLA}/storage/mozIStorageService.h
+include/${MOZILLA}/storage/mozIStorageStatement.h
+include/${MOZILLA}/storage/mozIStorageStatementWrapper.h
+include/${MOZILLA}/storage/mozIStorageValueArray.h
+include/${MOZILLA}/storage/mozStorageCID.h
+include/${MOZILLA}/storage/mozStorageHelper.h
include/${MOZILLA}/string/nsAString.h
include/${MOZILLA}/string/nsAlgorithm.h
include/${MOZILLA}/string/nsCharTraits.h
@@ -1968,6 +2064,11 @@ include/${MOZILLA}/uriloader/nsIWebProgress.h
include/${MOZILLA}/uriloader/nsIWebProgressListener.h
include/${MOZILLA}/uriloader/nsIWebProgressListener2.h
include/${MOZILLA}/uriloader/nsURILoader.h
+include/${MOZILLA}/url-classifier/nsIUrlClassifierDBService.h
+include/${MOZILLA}/url-classifier/nsIUrlClassifierStreamUpdater.h
+include/${MOZILLA}/url-classifier/nsIUrlClassifierTable.h
+include/${MOZILLA}/url-classifier/nsIUrlListManager.h
+include/${MOZILLA}/urlformatter/nsIURLFormatter.h
include/${MOZILLA}/util/nsTimer.h
include/${MOZILLA}/util/stopwatch.h
include/${MOZILLA}/view/nsICompositeListener.h
@@ -2091,9 +2192,18 @@ include/${MOZILLA}/windowwatcher/nsPIWindowWatcher.h
include/${MOZILLA}/xml-rpc/nsIDictionary.h
include/${MOZILLA}/xml-rpc/nsIXmlRpcClient.h
include/${MOZILLA}/xml-rpc/nsIXmlRpcClientListener.h
-include/${MOZILLA}/xmlextras/nsIDOMParser.h
-include/${MOZILLA}/xmlextras/nsIDOMSerializer.h
-include/${MOZILLA}/xmlextras/nsIXMLHttpRequest.h
+include/${MOZILLA}/xml/nsISAXAttributes.h
+include/${MOZILLA}/xml/nsISAXContentHandler.h
+include/${MOZILLA}/xml/nsISAXDTDHandler.h
+include/${MOZILLA}/xml/nsISAXErrorHandler.h
+include/${MOZILLA}/xml/nsISAXLexicalHandler.h
+include/${MOZILLA}/xml/nsISAXLocator.h
+include/${MOZILLA}/xml/nsISAXMutableAttributes.h
+include/${MOZILLA}/xml/nsISAXXMLFilter.h
+include/${MOZILLA}/xml/nsISAXXMLReader.h
+include/${MOZILLA}/xml/nsSAXAttributes.h
+include/${MOZILLA}/xml/nsSAXLocator.h
+include/${MOZILLA}/xml/nsSAXXMLReader.h
include/${MOZILLA}/xpcom/nsAgg.h
include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
include/${MOZILLA}/xpcom/nsArray.h
@@ -2106,6 +2216,7 @@ include/${MOZILLA}/xpcom/nsBaseHashtable.h
include/${MOZILLA}/xpcom/nsCOMArray.h
include/${MOZILLA}/xpcom/nsCOMPtr.h
include/${MOZILLA}/xpcom/nsCRT.h
+include/${MOZILLA}/xpcom/nsCategoryCache.h
include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
include/${MOZILLA}/xpcom/nsCheapSets.h
include/${MOZILLA}/xpcom/nsClassHashtable.h
@@ -2228,6 +2339,7 @@ include/${MOZILLA}/xpcom/nsITimer.h
include/${MOZILLA}/xpcom/nsITimerInternal.h
include/${MOZILLA}/xpcom/nsITimerManager.h
include/${MOZILLA}/xpcom/nsITraceRefcnt.h
+include/${MOZILLA}/xpcom/nsIUUIDGenerator.h
include/${MOZILLA}/xpcom/nsIUnicharBuffer.h
include/${MOZILLA}/xpcom/nsIUnicharInputStream.h
include/${MOZILLA}/xpcom/nsIUnicharLineInputStream.h
@@ -2270,6 +2382,7 @@ include/${MOZILLA}/xpcom/nsStringIO.h
include/${MOZILLA}/xpcom/nsStringStream.h
include/${MOZILLA}/xpcom/nsSupportsArray.h
include/${MOZILLA}/xpcom/nsSupportsPrimitives.h
+include/${MOZILLA}/xpcom/nsTArray.h
include/${MOZILLA}/xpcom/nsTHashtable.h
include/${MOZILLA}/xpcom/nsTextFormatter.h
include/${MOZILLA}/xpcom/nsTime.h
@@ -2449,7 +2562,7 @@ include/${MOZILLA}/nss/sslproto.h
include/${MOZILLA}/nss/sslt.h
include/${MOZILLA}/nss/watcomfx.h
@comment end INCLUDE-PUBLIC
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib 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}/regxpcom
@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
@comment begin DIRS
@@ -2472,6 +2585,7 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome
@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org
@dirrm lib/${MOZILLA}/extensions
+@dirrm lib/${MOZILLA}/dictionaries
@dirrm lib/${MOZILLA}/defaults/profile/chrome
@dirrm lib/${MOZILLA}/defaults/profile
@dirrm lib/${MOZILLA}/defaults/pref
@@ -2491,8 +2605,8 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/xpconnect
@dirrm include/${MOZILLA}/xpcom_obsolete
@dirrm include/${MOZILLA}/xpcom
-@dirrm include/${MOZILLA}/xmlextras
@dirrm include/${MOZILLA}/xml-rpc
+@dirrm include/${MOZILLA}/xml
@dirrm include/${MOZILLA}/windowwatcher
@dirrm include/${MOZILLA}/widget
@dirrm include/${MOZILLA}/websrvcs
@@ -2501,6 +2615,8 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/webbrowserpersist
@dirrm include/${MOZILLA}/view
@dirrm include/${MOZILLA}/util
+@dirrm include/${MOZILLA}/urlformatter
+@dirrm include/${MOZILLA}/url-classifier
@dirrm include/${MOZILLA}/uriloader
@dirrm include/${MOZILLA}/update
@dirrm include/${MOZILLA}/unicharutil
@@ -2519,10 +2635,14 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/toolkitcomps
@dirrm include/${MOZILLA}/system-pref
@dirrm include/${MOZILLA}/string
-@dirrm include/${MOZILLA}/sidebar
+@dirrm include/${MOZILLA}/storage
+@dirrm include/${MOZILLA}/sqlite3
+@dirrm include/${MOZILLA}/spellchecker
@dirrm include/${MOZILLA}/shistory
@dirrm include/${MOZILLA}/shellservice
+@dirrm include/${MOZILLA}/sessionstore
@dirrm include/${MOZILLA}/satchel
+@dirrm include/${MOZILLA}/safebrowsing
@dirrm include/${MOZILLA}/rdfutil
@dirrm include/${MOZILLA}/rdf
@dirrm include/${MOZILLA}/progressDlg
@@ -2548,6 +2668,7 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/mork
@dirrm include/${MOZILLA}/mimetype
@dirrm include/${MOZILLA}/migration
+@dirrm include/${MOZILLA}/microsummaries
@dirrm include/${MOZILLA}/lwbrk
@dirrm include/${MOZILLA}/locale
@dirrm include/${MOZILLA}/liveconnect
@@ -2571,6 +2692,7 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/gfx
@dirrm include/${MOZILLA}/find
@dirrm include/${MOZILLA}/filepicker
+@dirrm include/${MOZILLA}/feeds
@dirrm include/${MOZILLA}/fastfind
@dirrm include/${MOZILLA}/exthandler
@dirrm include/${MOZILLA}/extensions
@@ -2589,7 +2711,9 @@ include/${MOZILLA}/nss/watcomfx.h
@dirrm include/${MOZILLA}/chrome
@dirrm include/${MOZILLA}/chardet
@dirrm include/${MOZILLA}/caps
+@dirrm include/${MOZILLA}/browsersearch
@dirrm include/${MOZILLA}/browsercomps
+@dirrm include/${MOZILLA}/browser-feeds
@dirrm include/${MOZILLA}/browser
@dirrm include/${MOZILLA}/bookmarks
@dirrm include/${MOZILLA}/autoconfig
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index 431effd1ac2..c3a61c1e3a4 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/05/12 13:53:07 ghen Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= firefox
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox
.if !empty(FIREFOX_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5
-BUILDLINK_ABI_DEPENDS.firefox+= firefox>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox+= firefox>=2.0
+BUILDLINK_ABI_DEPENDS.firefox+= firefox>=2.0.0.3nb1
BUILDLINK_PKGSRCDIR.firefox?= ../../www/firefox
.endif # FIREFOX_BUILDLINK3_MK
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 552634097ee..539326eb399 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,27 +1,26 @@
-$NetBSD: distinfo,v 1.64 2007/03/21 13:33:04 ghen Exp $
+$NetBSD: distinfo,v 1.65 2007/05/12 13:53:07 ghen Exp $
-SHA1 (firefox-1.5.0.11-source.tar.bz2) = a094ceca09306138828ffa1bce346953ff757ecc
-RMD160 (firefox-1.5.0.11-source.tar.bz2) = 060a6ad81b8312a444568a2609888d2ef1c58bfc
-Size (firefox-1.5.0.11-source.tar.bz2) = 35534921 bytes
+SHA1 (firefox-2.0.0.3-source.tar.bz2) = 58cb7251e5fdea7d82cbbc0c2fd92aa0be81f53d
+RMD160 (firefox-2.0.0.3-source.tar.bz2) = 23d3d0ae89ac257304647aabe236ef8caec4d05f
+Size (firefox-2.0.0.3-source.tar.bz2) = 37135441 bytes
SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
-SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
-SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
+SHA1 (patch-ab) = 19069a4e572744eccb04e9906e16dad28d2dac01
+SHA1 (patch-ac) = 3f28e27c100655aca4daaca02a77a76064359e94
SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b
SHA1 (patch-ag) = 1266333a482483f786d5f00e92e641e282266442
SHA1 (patch-ah) = c737519c8ab8a66993d4892a6efac73e2da979f5
-SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
+SHA1 (patch-ai) = 58d7d87295cfbcaeba3e6a27457e15533d4b8e78
SHA1 (patch-aj) = 84a5e3630c7dd9532bbb20e7444ff9582631ea24
SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff
SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e
SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff
SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602
-SHA1 (patch-ap) = 039baf9d4934eee1d672fd31808b9a75cd6f2766
+SHA1 (patch-ap) = 58b4867336c73c3908e508501025bdbd8e2e8b30
SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf
-SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a
-SHA1 (patch-ax) = d325173534e8a589f16fbf0a9cbfc492c62cb9ac
+SHA1 (patch-ax) = 1518e5bb0ee162d7c4135a6cfb8112da83a38855
SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037
SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
@@ -29,6 +28,8 @@ SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
+SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
+SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0
SHA1 (patch-by) = a6eeccfee4e7e3620be41b315c357575c8bd0635
SHA1 (patch-bz) = 7f939c1717b2df473217da9cf703a37e459731c7
@@ -42,10 +43,12 @@ SHA1 (patch-cj) = 3ae48c9a906f47cf32706a1d2b3b6b44918e99f4
SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
-SHA1 (patch-cn) = 77a0bbd42f8383b3167494e919e6338218c660e0
+SHA1 (patch-cn) = 54d21a622dee6b7edf3ca9fb44bd4f5e02ada974
+SHA1 (patch-da) = 356e37429832ffd296fa79b9aa7ef20c05d851e0
SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
+SHA1 (patch-de) = 1d845fd60ecd85554fa82f6c5f3cc7edc7d377a5
SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
@@ -58,7 +61,8 @@ SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
-SHA1 (patch-dw) = eb4acb8c6c59ef3c73a7ba7e6d6956e325de9d85
+SHA1 (patch-dw) = ab7606171564b6879effc3b37d9eadc6565cb74b
SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
-SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
+SHA1 (patch-ec) = 8235af6634306b2a5725754cd5a32285b311b714
+SHA1 (patch-ed) = ae922f591b871a1f427c4c32d76a2c25701382d4
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 3b8517eb686..99ae6ac9bc2 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-aa,v 1.4 2007/05/12 13:53:07 ghen Exp $
diff -ruN ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
--- ../Orig/mozilla/config/autoconf.mk.in 2005-08-18 02:17:17.000000000 +0900
diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab
index 855b84a3cd7..c4a545b06d6 100644
--- a/www/firefox/patches/patch-ab
+++ b/www/firefox/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/04/15 14:20:31 ghen Exp $
+$NetBSD: patch-ab,v 1.7 2007/05/12 13:53:07 ghen Exp $
---- configure.in.orig 2006-04-15 10:47:18.000000000 +0200
+--- configure.in.orig 2006-03-29 22:26:28.000000000 +0200
+++ configure.in
@@ -1418,7 +1418,7 @@ case "$target" in
LDFLAGS=$_SAVE_LDFLAGS
@@ -21,9 +21,9 @@ $NetBSD: patch-ab,v 1.6 2006/04/15 14:20:31 ghen Exp $
;;
*-hpux*)
-@@ -1826,6 +1829,13 @@ case "$target" in
+@@ -1903,6 +1906,13 @@ case "$target" in
if test "$LIBRUNPATH"; then
- DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
+ DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
fi
+
+ case "${target_cpu}" in
@@ -34,17 +34,17 @@ $NetBSD: patch-ab,v 1.6 2006/04/15 14:20:31 ghen Exp $
+ esac
;;
- *-nto*)
-@@ -2051,7 +2061,7 @@ dnl the qsort routine under solaris is f
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
+ *-openvms*)
+@@ -2100,7 +2110,7 @@ dnl the qsort routine under solaris is f
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -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 $@'
+- DSO_LDOPTS='-G -Qoption ld -z,muldefs'
++ DSO_LDOPTS='-G -z muldefs'
AR_LIST="$AR t"
AR_EXTRACT="$AR x"
AR_DELETE="$AR d"
-@@ -5279,7 +5289,7 @@ dnl ====================================
+@@ -5451,7 +5461,7 @@ dnl ====================================
dnl = Enable code optimization. ON by default.
dnl ========================================================
if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac
index 3b822817bb3..d2925ff6270 100644
--- a/www/firefox/patches/patch-ac
+++ b/www/firefox/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2006/04/13 14:47:50 taya Exp $
+$NetBSD: patch-ac,v 1.9 2007/05/12 13:53:07 ghen Exp $
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
+diff -ruN ../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 2005-06-15 17:32:21.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-04-09 23:31:15.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2005-12-04 19:03:04.000000000 +0900
@@ -61,10 +61,13 @@
#
# Lots of Unixish x86 flavors
@@ -13,7 +13,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
+ifeq (amd64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
+endif
endif
#
@@ -58,4 +58,3 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
#
# Solaris/SPARC
#
-Only in ./xpcom/reflect/xptcall/src/md/unix: Makefile.in.orig
diff --git a/www/firefox/patches/patch-ad b/www/firefox/patches/patch-ad
index f6da3476929..3a5bcf68b1c 100644
--- a/www/firefox/patches/patch-ad
+++ b/www/firefox/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ad,v 1.5 2007/05/12 13:53:07 ghen Exp $
diff -ruN ../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 2004-04-18 23:18:18.000000000 +0900
diff --git a/www/firefox/patches/patch-ae b/www/firefox/patches/patch-ae
index 31762cbdcd1..0723071a8e7 100644
--- a/www/firefox/patches/patch-ae
+++ b/www/firefox/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ae,v 1.5 2007/05/12 13:53:07 ghen Exp $
diff -ruN ../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 2004-04-18 23:18:18.000000000 +0900
diff --git a/www/firefox/patches/patch-af b/www/firefox/patches/patch-af
index 2f2c7f9f9b7..45c413de66d 100644
--- a/www/firefox/patches/patch-af
+++ b/www/firefox/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-af,v 1.5 2007/05/12 13:53:07 ghen Exp $
diff -ruN ../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 2005-10-11 08:22:50.000000000 +0900
diff --git a/www/firefox/patches/patch-ag b/www/firefox/patches/patch-ag
index b3a282e0c2f..72e2bd09033 100644
--- a/www/firefox/patches/patch-ag
+++ b/www/firefox/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ag,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2004-05-21 19:41:22.000000000 +0900
diff --git a/www/firefox/patches/patch-ah b/www/firefox/patches/patch-ah
index ed74dbd66b0..3c29dc6426f 100644
--- a/www/firefox/patches/patch-ah
+++ b/www/firefox/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ah,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 08:30:02.000000000 +0900
diff --git a/www/firefox/patches/patch-ai b/www/firefox/patches/patch-ai
index 333155fd14e..55bc45b441e 100644
--- a/www/firefox/patches/patch-ai
+++ b/www/firefox/patches/patch-ai
@@ -1,17 +1,9 @@
-$NetBSD: patch-ai,v 1.5 2006/10/19 10:25:17 markd Exp $
+$NetBSD: patch-ai,v 1.6 2007/05/12 13:53:08 ghen Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig 2006-05-07 14:01:25.000000000 +1200
-+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
-
- fontps *fps = new fontps;
- fps->entry = xftEntry;
-- fps->charset = fc_charset;
-+ fps->charset = FcCharSetCopy (fc_charset);
- fps->fontps = nsnull;
- fpi.fontps->AppendElement(fps);
- }
-@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2005-04-28 17:04:00.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp 2005-12-04 19:06:07.000000000 +0900
+@@ -1859,10 +1859,10 @@
mPixelSize = NSToIntRound(app2dev * mFont->size);
@@ -26,7 +18,7 @@ $NetBSD: patch-ai,v 1.5 2006/10/19 10:25:17 markd Exp $
nsresult rv;
mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1896,7 +1896,7 @@
if (!face)
return 0;
@@ -35,7 +27,7 @@ $NetBSD: patch-ai,v 1.5 2006/10/19 10:25:17 markd Exp $
nsresult rv = mFt2->GetImageCache(&iCache);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to get Image Cache");
-@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1934,8 +1934,8 @@
FTC_Manager cManager;
mFt2->GetFTCacheManager(&cManager);
@@ -46,7 +38,7 @@ $NetBSD: patch-ai,v 1.5 2006/10/19 10:25:17 markd Exp $
NS_ASSERTION(rv==0, "failed to get face/size");
if (rv)
return nsnull;
-@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
+@@ -2379,16 +2379,16 @@
mEntry->GetFamilyName(fontName);
mEntry->GetStyleName(styleName);
diff --git a/www/firefox/patches/patch-aj b/www/firefox/patches/patch-aj
index 46a37e8d58e..375d92af448 100644
--- a/www/firefox/patches/patch-aj
+++ b/www/firefox/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-aj,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2005-05-02 02:36:19.000000000 +0900
diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak
index ccf9b14e424..0a8dc4dc83e 100644
--- a/www/firefox/patches/patch-ak
+++ b/www/firefox/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ak,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2005-07-14 03:21:10.000000000 +0900
diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al
index 0d285db22bc..40bc902ecd9 100644
--- a/www/firefox/patches/patch-al
+++ b/www/firefox/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-al,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2005-06-29 03:29:10.000000000 +0900
diff --git a/www/firefox/patches/patch-an b/www/firefox/patches/patch-an
index b62e7969221..ea56dca73ac 100644
--- a/www/firefox/patches/patch-an
+++ b/www/firefox/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-an,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2004-04-18 06:52:34.000000000 +0900
diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao
index f18212998d5..5268f45814c 100644
--- a/www/firefox/patches/patch-ao
+++ b/www/firefox/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ao,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2004-04-18 06:52:34.000000000 +0900
diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap
index 70ef7233ae7..d16f8ab7de5 100644
--- a/www/firefox/patches/patch-ap
+++ b/www/firefox/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.7 2007/02/25 00:43:23 ghen Exp $
+$NetBSD: patch-ap,v 1.8 2007/05/12 13:53:08 ghen Exp $
---- ./security/coreconf/command.mk.orig 2005-10-11 01:46:12.000000000 +0200
-+++ ./security/coreconf/command.mk
+--- security/coreconf/command.mk.orig 2006-03-29 22:26:44.000000000 +0200
++++ security/coreconf/command.mk
@@ -45,7 +45,7 @@ ASFLAGS += $(CFLAGS)
CCF = $(CC) $(CFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
diff --git a/www/firefox/patches/patch-aq b/www/firefox/patches/patch-aq
index 1d24715cc59..de73be30bbd 100644
--- a/www/firefox/patches/patch-aq
+++ b/www/firefox/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-aq,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configure.in
--- ../Orig/mozilla/directory/c-sdk/configure.in 2005-06-15 06:27:33.000000000 +0900
diff --git a/www/firefox/patches/patch-at b/www/firefox/patches/patch-at
deleted file mode 100644
index 105ad05624f..00000000000
--- a/www/firefox/patches/patch-at
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/10/23 10:49:35 markd Exp $
-
---- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig 2006-05-25 11:38:04.000000000 +1200
-+++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c
-@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s
- * Set up address and open a TCP socket:
- */
- if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */
-- PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) {
-+ PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) {
- return( -1 );
- }
-
- if (( prsockp->prsock_prfd = PR_OpenTCPSocket(
-- PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) {
-+ PR_NetAddrFamily( addrp ))) == NULL ) {
- return( -1 );
- }
-
-@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in
-
- if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) {
-
-- if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
-+ /*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
- PR_AF_INET == PR_NetAddrFamily( &addr )) {
- PRUint32 ipv4ip = addr.inet.ip;
- memset( &addr, 0, sizeof(addr));
- PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip );
- addr.ipv6.family = PR_AF_INET6;
-
-- }
-+ }*/
- rc = prldap_try_one_address( prsockp, &addr, port,
- timeout, options );
- } else {
diff --git a/www/firefox/patches/patch-aw b/www/firefox/patches/patch-aw
index 702e71424d8..fcef2cf110d 100644
--- a/www/firefox/patches/patch-aw
+++ b/www/firefox/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-aw,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-12-15 14:52:41.000000000 +0900
diff --git a/www/firefox/patches/patch-ax b/www/firefox/patches/patch-ax
index 6e865f5e4b3..a314652ee45 100644
--- a/www/firefox/patches/patch-ax
+++ b/www/firefox/patches/patch-ax
@@ -1,7 +1,7 @@
-$NetBSD: patch-ax,v 1.5 2007/02/25 00:43:23 ghen Exp $
+$NetBSD: patch-ax,v 1.6 2007/05/12 13:53:08 ghen Exp $
---- ./security/coreconf/SunOS5.mk.orig 2006-04-25 03:32:16.000000000 +0200
-+++ ./security/coreconf/SunOS5.mk
+--- security/coreconf/SunOS5.mk.orig 2006-03-29 22:26:44.000000000 +0200
++++ security/coreconf/SunOS5.mk
@@ -176,6 +176,10 @@ endif
endif
DSO_LDOPTS += -z combreloc -z defs -z ignore
diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba
index dc6dc3c3f24..8f4eed6a8e5 100644
--- a/www/firefox/patches/patch-ba
+++ b/www/firefox/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ba,v 1.6 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900
diff --git a/www/firefox/patches/patch-bb b/www/firefox/patches/patch-bb
index fdcd37c1c2a..6839f9fa6f5 100644
--- a/www/firefox/patches/patch-bb
+++ b/www/firefox/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bb,v 1.6 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2004-05-20 00:37:10.000000000 +0900
diff --git a/www/firefox/patches/patch-bm b/www/firefox/patches/patch-bm
index 4e1b2f236e3..c48bea1ade7 100644
--- a/www/firefox/patches/patch-bm
+++ b/www/firefox/patches/patch-bm
@@ -1,4 +1,4 @@
-$NetBSD: patch-bm,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bm,v 1.5 2007/05/12 13:53:08 ghen Exp $
diff -ruN ../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 2004-04-18 23:18:18.000000000 +0900
diff --git a/www/firefox/patches/patch-bo b/www/firefox/patches/patch-bo
index 0364c4722fd..4d56e572400 100644
--- a/www/firefox/patches/patch-bo
+++ b/www/firefox/patches/patch-bo
@@ -1,4 +1,4 @@
-$NetBSD: patch-bo,v 1.6 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bo,v 1.7 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
--- ../Orig/mozilla/nsprpub/configure.in 2005-09-16 07:37:52.000000000 +0900
diff --git a/www/firefox/patches/patch-bq b/www/firefox/patches/patch-bq
index d5724b6e9fd..46e393fe428 100644
--- a/www/firefox/patches/patch-bq
+++ b/www/firefox/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.6 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bq,v 1.7 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h
--- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-04-18 23:18:14.000000000 +0900
diff --git a/www/firefox/patches/patch-br b/www/firefox/patches/patch-br
index 2e7ccd84162..87604a29eb2 100644
--- a/www/firefox/patches/patch-br
+++ b/www/firefox/patches/patch-br
@@ -1,4 +1,4 @@
-$NetBSD: patch-br,v 1.6 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-br,v 1.7 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-19 02:24:38.000000000 +0900
diff --git a/www/firefox/patches/patch-bs b/www/firefox/patches/patch-bs
index 9291cacab71..8296245cc59 100644
--- a/www/firefox/patches/patch-bs
+++ b/www/firefox/patches/patch-bs
@@ -1,4 +1,4 @@
-$NetBSD: patch-bs,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bs,v 1.6 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
--- ../Orig/mozilla/config/mkdepend/imakemdep.h 2004-04-21 06:38:14.000000000 +0900
diff --git a/www/firefox/patches/patch-bu b/www/firefox/patches/patch-bu
new file mode 100644
index 00000000000..3b27e69800d
--- /dev/null
+++ b/www/firefox/patches/patch-bu
@@ -0,0 +1,180 @@
+$NetBSD: patch-bu,v 1.6 2007/05/12 13:53:09 ghen Exp $
+
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2005-12-07 00:07:35.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/firefox/patches/patch-bv b/www/firefox/patches/patch-bv
new file mode 100644
index 00000000000..c4e44220a08
--- /dev/null
+++ b/www/firefox/patches/patch-bv
@@ -0,0 +1,212 @@
+$NetBSD: patch-bv,v 1.6 2007/05/12 13:53:09 ghen Exp $
+
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 1970-01-01 09:00:00.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2005-12-04 19:32: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/firefox/patches/patch-bx b/www/firefox/patches/patch-bx
index f0ec02b98c5..3faa7019540 100644
--- a/www/firefox/patches/patch-bx
+++ b/www/firefox/patches/patch-bx
@@ -1,4 +1,4 @@
-$NetBSD: patch-bx,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bx,v 1.5 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900
diff --git a/www/firefox/patches/patch-by b/www/firefox/patches/patch-by
index de9a3b89b3b..6d94f807caa 100644
--- a/www/firefox/patches/patch-by
+++ b/www/firefox/patches/patch-by
@@ -1,4 +1,4 @@
-$NetBSD: patch-by,v 1.4 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-by,v 1.5 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../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-11-24 03:01:01.000000000 +0900
diff --git a/www/firefox/patches/patch-bz b/www/firefox/patches/patch-bz
index 3baa5fe3bb7..b48c77816e9 100644
--- a/www/firefox/patches/patch-bz
+++ b/www/firefox/patches/patch-bz
@@ -1,4 +1,4 @@
-$NetBSD: patch-bz,v 1.3 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-bz,v 1.4 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s 2001-03-12 02:22:22.000000000 +0900
diff --git a/www/firefox/patches/patch-ca b/www/firefox/patches/patch-ca
index 78bccd76b8d..ec8ced0f3b5 100644
--- a/www/firefox/patches/patch-ca
+++ b/www/firefox/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.3 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ca,v 1.4 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s 2001-03-12 02:22:17.000000000 +0900
diff --git a/www/firefox/patches/patch-cb b/www/firefox/patches/patch-cb
index 562d8c13ed7..8062e2a076f 100644
--- a/www/firefox/patches/patch-cb
+++ b/www/firefox/patches/patch-cb
@@ -1,4 +1,4 @@
-$NetBSD: patch-cb,v 1.3 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cb,v 1.4 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp 2004-04-18 23:18:18.000000000 +0900
diff --git a/www/firefox/patches/patch-cd b/www/firefox/patches/patch-cd
index 9921bad5a51..8cdb681e49c 100644
--- a/www/firefox/patches/patch-cd
+++ b/www/firefox/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.3 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cd,v 1.4 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/modules/plugin/base/public/nptypes.h ./modules/plugin/base/public/nptypes.h
--- ../Orig/mozilla/modules/plugin/base/public/nptypes.h 2005-05-20 06:49:42.000000000 +0900
diff --git a/www/firefox/patches/patch-cg b/www/firefox/patches/patch-cg
index 822370bb201..993440508e0 100644
--- a/www/firefox/patches/patch-cg
+++ b/www/firefox/patches/patch-cg
@@ -1,4 +1,4 @@
-$NetBSD: patch-cg,v 1.7 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cg,v 1.8 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp ./extensions/transformiix/source/base/Double.cpp
--- ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp 2004-06-17 09:12:42.000000000 +0900
diff --git a/www/firefox/patches/patch-ch b/www/firefox/patches/patch-ch
index f09bae9b3bc..c961cfb48a1 100644
--- a/www/firefox/patches/patch-ch
+++ b/www/firefox/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ch,v 1.6 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/txCore.h ./extensions/transformiix/source/base/txCore.h
--- ../Orig/mozilla/extensions/transformiix/source/base/txCore.h 2004-05-26 20:54:37.000000000 +0900
diff --git a/www/firefox/patches/patch-ci b/www/firefox/patches/patch-ci
index f13de9f21cc..139eec8cdf8 100644
--- a/www/firefox/patches/patch-ci
+++ b/www/firefox/patches/patch-ci
@@ -1,4 +1,4 @@
-$NetBSD: patch-ci,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ci,v 1.6 2007/05/12 13:53:09 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp ./extensions/transformiix/source/xpath/FunctionCall.cpp
--- ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp 2005-01-29 20:07:14.000000000 +0900
diff --git a/www/firefox/patches/patch-cj b/www/firefox/patches/patch-cj
index a45def763d6..bbae7630513 100644
--- a/www/firefox/patches/patch-cj
+++ b/www/firefox/patches/patch-cj
@@ -1,4 +1,4 @@
-$NetBSD: patch-cj,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cj,v 1.6 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
--- ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp 2004-06-17 09:12:43.000000000 +0900
diff --git a/www/firefox/patches/patch-ck b/www/firefox/patches/patch-ck
index 12628eed38a..4cb924da12f 100644
--- a/www/firefox/patches/patch-ck
+++ b/www/firefox/patches/patch-ck
@@ -1,4 +1,4 @@
-$NetBSD: patch-ck,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ck,v 1.6 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp
--- ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp 2004-06-17 09:12:44.000000000 +0900
diff --git a/www/firefox/patches/patch-cl b/www/firefox/patches/patch-cl
index 0864987237d..40ca130e356 100644
--- a/www/firefox/patches/patch-cl
+++ b/www/firefox/patches/patch-cl
@@ -1,4 +1,4 @@
-$NetBSD: patch-cl,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cl,v 1.6 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp
--- ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp 2005-01-24 19:50:39.000000000 +0900
diff --git a/www/firefox/patches/patch-cm b/www/firefox/patches/patch-cm
index ed0338c42b9..3052e76181d 100644
--- a/www/firefox/patches/patch-cm
+++ b/www/firefox/patches/patch-cm
@@ -1,4 +1,4 @@
-$NetBSD: patch-cm,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cm,v 1.6 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp
--- ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp 2005-01-16 06:30:39.000000000 +0900
diff --git a/www/firefox/patches/patch-cn b/www/firefox/patches/patch-cn
index f3bd385b188..9c19667900a 100644
--- a/www/firefox/patches/patch-cn
+++ b/www/firefox/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
+$NetBSD: patch-cn,v 1.3 2007/05/12 13:53:10 ghen Exp $
---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig 2006-06-14 05:58:31.000000000 +0900
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig 2006-06-20 20:54:45.000000000 +0200
+++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
@@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
res = (res/i);
@@ -29,7 +29,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
rv = xformsService->GetRepeatIndex(repeatEle, &index);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -354,7 +354,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -355,7 +355,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
getter_AddRefs(nodes));
NS_ENSURE_SUCCESS(rv, rv);
@@ -38,7 +38,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
PRInt32 i;
for (i = 0; i < nodes->size(); ++i) {
double test;
-@@ -362,7 +362,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -363,7 +363,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
test = Double::toDouble(resultStr);
if (Double::isNaN(test)) {
@@ -47,7 +47,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
break;
}
if (test > res || i == 0) {
-@@ -382,7 +382,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -383,7 +383,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
getter_AddRefs(nodes));
NS_ENSURE_SUCCESS(rv, rv);
@@ -56,7 +56,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
PRInt32 i;
for (i = 0; i < nodes->size(); ++i) {
double test;
-@@ -390,7 +390,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -391,7 +391,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
test = Double::toDouble(resultStr);
if (Double::isNaN(test)) {
@@ -65,7 +65,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
break;
}
if ((test < res) || (i==0)) {
-@@ -413,7 +413,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -414,7 +414,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 result = 0;
@@ -74,7 +74,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
nsresult rv = xformsService->GetMonths(duration, &result);
if (NS_SUCCEEDED(rv)) {
res = result;
-@@ -489,7 +489,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -490,7 +490,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
// up the chain
return rv;
}
@@ -83,7 +83,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
}
return aContext->recycler()->getNumberResult(res, aResult);
-@@ -514,7 +514,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -515,7 +515,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
// up the chain
return rv;
}
diff --git a/www/firefox/patches/patch-da b/www/firefox/patches/patch-da
new file mode 100644
index 00000000000..112a3e338aa
--- /dev/null
+++ b/www/firefox/patches/patch-da
@@ -0,0 +1,12 @@
+$NetBSD: patch-da,v 1.1 2007/05/12 13:53:10 ghen Exp $
+
+--- layout/build/Makefile.in.orig 2006-12-06 17:28:45.000000000 +0000
++++ layout/build/Makefile.in
+@@ -282,6 +282,7 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
+ endif
+ endif
+
++LDFLAGS+= -lX11 -lXrender
+
+ export:: $(BUILD_DATE)
+
diff --git a/www/firefox/patches/patch-db b/www/firefox/patches/patch-db
index 3db56098bbc..2dc48c7d978 100644
--- a/www/firefox/patches/patch-db
+++ b/www/firefox/patches/patch-db
@@ -1,4 +1,4 @@
-$NetBSD: patch-db,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-db,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/gc/boehm/gcconfig.h ./gc/boehm/gcconfig.h
--- ../Orig/mozilla/gc/boehm/gcconfig.h 2000-08-11 09:13:36.000000000 +0900
diff --git a/www/firefox/patches/patch-dc b/www/firefox/patches/patch-dc
index df331dbbb0a..46c970b5b53 100644
--- a/www/firefox/patches/patch-dc
+++ b/www/firefox/patches/patch-dc
@@ -1,4 +1,4 @@
-$NetBSD: patch-dc,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dc,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c
--- ../Orig/mozilla/gc/boehm/mach_dep.c 1999-09-30 11:25:45.000000000 +0900
diff --git a/www/firefox/patches/patch-dd b/www/firefox/patches/patch-dd
index 38004eb12b8..e775b096878 100644
--- a/www/firefox/patches/patch-dd
+++ b/www/firefox/patches/patch-dd
@@ -1,4 +1,4 @@
-$NetBSD: patch-dd,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dd,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/mailnews/movemail/src/movemail.c ./mailnews/movemail/src/movemail.c
--- ../Orig/mozilla/mailnews/movemail/src/movemail.c 2004-04-18 03:33:14.000000000 +0900
diff --git a/www/firefox/patches/patch-de b/www/firefox/patches/patch-de
new file mode 100644
index 00000000000..fbc3726a830
--- /dev/null
+++ b/www/firefox/patches/patch-de
@@ -0,0 +1,13 @@
+$NetBSD: patch-de,v 1.1 2007/05/12 13:53:10 ghen Exp $
+
+--- security/nss/lib/freebl/Makefile.orig 2006-12-06 18:01:13.000000000 +0000
++++ security/nss/lib/freebl/Makefile
+@@ -192,7 +192,7 @@ endif
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET)))
+ MKSHLIB += -Wl,-Bsymbolic
+ endif
+
diff --git a/www/firefox/patches/patch-df b/www/firefox/patches/patch-df
index ab716fa7c8e..c885f17d8a2 100644
--- a/www/firefox/patches/patch-df
+++ b/www/firefox/patches/patch-df
@@ -1,4 +1,4 @@
-$NetBSD: patch-df,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-df,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h
--- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h 2004-11-24 06:22:35.000000000 +0900
diff --git a/www/firefox/patches/patch-dh b/www/firefox/patches/patch-dh
index 3cadbe26368..7c8cc2a8106 100644
--- a/www/firefox/patches/patch-dh
+++ b/www/firefox/patches/patch-dh
@@ -1,4 +1,4 @@
-$NetBSD: patch-dh,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dh,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2004-04-18 23:18:18.000000000 +0900
diff --git a/www/firefox/patches/patch-dj b/www/firefox/patches/patch-dj
index 883fbeb8003..6a1b4e23ff0 100644
--- a/www/firefox/patches/patch-dj
+++ b/www/firefox/patches/patch-dj
@@ -1,4 +1,4 @@
-$NetBSD: patch-dj,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dj,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c
--- ../Orig/mozilla/dbm/src/mktemp.c 2003-01-21 08:13:37.000000000 +0900
diff --git a/www/firefox/patches/patch-dk b/www/firefox/patches/patch-dk
index 0685dc302c7..d989b33f8ba 100644
--- a/www/firefox/patches/patch-dk
+++ b/www/firefox/patches/patch-dk
@@ -1,4 +1,4 @@
-$NetBSD: patch-dk,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dk,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk
--- ../Orig/mozilla/security/coreconf/config.mk 2004-04-26 00:02:17.000000000 +0900
diff --git a/www/firefox/patches/patch-dl b/www/firefox/patches/patch-dl
index 3cc23e2fca0..648405ebeea 100644
--- a/www/firefox/patches/patch-dl
+++ b/www/firefox/patches/patch-dl
@@ -1,4 +1,4 @@
-$NetBSD: patch-dl,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dl,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk
--- ../Orig/mozilla/security/coreconf/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900
diff --git a/www/firefox/patches/patch-dm b/www/firefox/patches/patch-dm
index 17714b5d77c..406845cdd0b 100644
--- a/www/firefox/patches/patch-dm
+++ b/www/firefox/patches/patch-dm
@@ -1,4 +1,4 @@
-$NetBSD: patch-dm,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dm,v 1.3 2007/05/12 13:53:10 ghen Exp $
diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk
--- ../Orig/mozilla/security/nss/cmd/platlibs.mk 2005-04-07 06:35:41.000000000 +0900
diff --git a/www/firefox/patches/patch-do b/www/firefox/patches/patch-do
index 2cc9352ab45..5a3094fe867 100644
--- a/www/firefox/patches/patch-do
+++ b/www/firefox/patches/patch-do
@@ -1,4 +1,4 @@
-$NetBSD: patch-do,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-do,v 1.3 2007/05/12 13:53:11 ghen Exp $
diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk
--- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk 1970-01-01 09:00:00.000000000 +0900
diff --git a/www/firefox/patches/patch-dr b/www/firefox/patches/patch-dr
index 8ac5764c933..616c892d473 100644
--- a/www/firefox/patches/patch-dr
+++ b/www/firefox/patches/patch-dr
@@ -1,4 +1,4 @@
-$NetBSD: patch-dr,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dr,v 1.3 2007/05/12 13:53:11 ghen Exp $
diff -ruN ../Orig/mozilla/config/config.mk ./config/config.mk
--- ../Orig/mozilla/config/config.mk 2005-07-29 04:48:11.000000000 +0900
diff --git a/www/firefox/patches/patch-ds b/www/firefox/patches/patch-ds
index 7c45dc8d4c0..3437640f6e9 100644
--- a/www/firefox/patches/patch-ds
+++ b/www/firefox/patches/patch-ds
@@ -1,4 +1,4 @@
-$NetBSD: patch-ds,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ds,v 1.3 2007/05/12 13:53:11 ghen Exp $
diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk
--- ../Orig/mozilla/security/coreconf/arch.mk 2005-10-11 08:30:12.000000000 +0900
diff --git a/www/firefox/patches/patch-dt b/www/firefox/patches/patch-dt
index 1caa16ebaed..c363e77557d 100644
--- a/www/firefox/patches/patch-dt
+++ b/www/firefox/patches/patch-dt
@@ -1,4 +1,4 @@
-$NetBSD: patch-dt,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dt,v 1.3 2007/05/12 13:53:11 ghen Exp $
diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk
--- ../Orig/mozilla/directory/c-sdk/config/arch.mk 2002-03-27 06:51:57.000000000 +0900
diff --git a/www/firefox/patches/patch-du b/www/firefox/patches/patch-du
index b36a107e0d5..1b948231080 100644
--- a/www/firefox/patches/patch-du
+++ b/www/firefox/patches/patch-du
@@ -1,4 +1,4 @@
-$NetBSD: patch-du,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-du,v 1.3 2007/05/12 13:53:11 ghen Exp $
diff -ruN ../Orig/mozilla/config/rules.mk ./config/rules.mk
--- ../Orig/mozilla/config/rules.mk 2005-10-11 08:16:39.000000000 +0900
diff --git a/www/firefox/patches/patch-dv b/www/firefox/patches/patch-dv
index 41ebac2bbe5..282daba0747 100644
--- a/www/firefox/patches/patch-dv
+++ b/www/firefox/patches/patch-dv
@@ -1,4 +1,4 @@
-$NetBSD: patch-dv,v 1.2 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-dv,v 1.3 2007/05/12 13:53:11 ghen Exp $
diff -ruN ../Orig/mozilla/js/src/Makefile.in ./js/src/Makefile.in
--- ../Orig/mozilla/js/src/Makefile.in 2005-06-01 23:26:26.000000000 +0900
diff --git a/www/firefox/patches/patch-dw b/www/firefox/patches/patch-dw
index e74d10f168a..4fe91796f92 100644
--- a/www/firefox/patches/patch-dw
+++ b/www/firefox/patches/patch-dw
@@ -1,13 +1,32 @@
-$NetBSD: patch-dw,v 1.3 2007/03/07 22:05:22 joerg Exp $
+$NetBSD: patch-dw,v 1.4 2007/05/12 13:53:11 ghen Exp $
---- security/nss/lib/freebl/Makefile.orig 2007-03-07 20:19:17.000000000 +0000
-+++ security/nss/lib/freebl/Makefile
-@@ -192,7 +192,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_TARGET)))
- MKSHLIB += -Wl,-Bsymbolic
- endif
+--- db/sqlite3/src/os_unix.c.orig 2006-05-22 19:12:32.000000000 +0000
++++ db/sqlite3/src/os_unix.c
+@@ -443,6 +443,7 @@ static int lockTrace(int fd, int op, str
+ #define fcntl lockTrace
+ #endif /* SQLITE_LOCK_TRACE */
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+ /*
+ ** The testThreadLockingBehavior() routine launches two separate
+ ** threads on this routine. This routine attempts to lock a file
+@@ -483,6 +484,7 @@ static void testThreadLockingBehavior(in
+ close(fd);
+ threadsOverrideEachOthersLocks = d[0].result==0 && d[1].result==0;
+ }
++#endif
+ #endif /* SQLITE_UNIX_THREADS */
+
+ /*
+@@ -536,9 +538,11 @@ static int findLockInfo(
+ key1.dev = statbuf.st_dev;
+ key1.ino = statbuf.st_ino;
+ #ifdef SQLITE_UNIX_THREADS
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+ if( threadsOverrideEachOthersLocks<0 ){
+ testThreadLockingBehavior(fd);
+ }
++#endif
+ key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
+ #endif
+ memset(&key2, 0, sizeof(key2));
diff --git a/www/firefox/patches/patch-ea b/www/firefox/patches/patch-ea
index 85351e744fd..d0f907f8e6e 100644
--- a/www/firefox/patches/patch-ea
+++ b/www/firefox/patches/patch-ea
@@ -1,4 +1,4 @@
-$NetBSD: patch-ea,v 1.1 2006/02/12 11:04:51 ghen Exp $
+$NetBSD: patch-ea,v 1.2 2007/05/12 13:53:11 ghen Exp $
--- toolkit/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100
+++ toolkit/components/history/src/nsGlobalHistory.cpp
diff --git a/www/firefox/patches/patch-eb b/www/firefox/patches/patch-eb
index 7a556ea6a73..946d9bf4c2d 100644
--- a/www/firefox/patches/patch-eb
+++ b/www/firefox/patches/patch-eb
@@ -1,4 +1,4 @@
-$NetBSD: patch-eb,v 1.1 2006/02/12 11:04:51 ghen Exp $
+$NetBSD: patch-eb,v 1.2 2007/05/12 13:53:11 ghen Exp $
--- xpfe/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100
+++ xpfe/components/history/src/nsGlobalHistory.cpp
diff --git a/www/firefox/patches/patch-ec b/www/firefox/patches/patch-ec
index 21892ed10fd..79c8e00e84a 100644
--- a/www/firefox/patches/patch-ec
+++ b/www/firefox/patches/patch-ec
@@ -1,6 +1,9 @@
-$NetBSD: patch-ec,v 1.1 2006/10/16 12:09:13 seb Exp $
+$NetBSD: patch-ec,v 1.2 2007/05/12 13:53:11 ghen Exp $
---- build/autoconf/mozconfig2configure.orig 2006-02-22 16:41:28.000000000 +0000
+ERROR: [check-portability.sh] => Found test ... == ...:
+ERROR: [check-portability.sh] build/autoconf/mozconfig2configure: if [ "$APP" == "$MOZ_BUILD_APP" ]; then
+
+--- build/autoconf/mozconfig2configure.orig 2006-02-22 17:19:52.000000000 +0100
+++ build/autoconf/mozconfig2configure
@@ -79,7 +79,7 @@ ac_add_options() {
ac_add_app_options() {
diff --git a/www/firefox/patches/patch-ed b/www/firefox/patches/patch-ed
new file mode 100644
index 00000000000..1208e143b06
--- /dev/null
+++ b/www/firefox/patches/patch-ed
@@ -0,0 +1,20 @@
+$NetBSD: patch-ed,v 1.3 2007/05/12 13:53:11 ghen Exp $
+
+--- profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2005-11-01 02:20:38.000000000 +0100
++++ profile/dirserviceprovider/src/nsProfileLock.cpp 2006-11-16 09:50:12.000000000 +0100
+@@ -384,6 +384,7 @@ nsresult nsProfileLock::LockWithSymlink(
+ act.sa_flags = 0;
+ sigfillset(&act.sa_mask);
+
++#ifndef DEBUG
+ #define CATCH_SIGNAL(signame) \
+ PR_BEGIN_MACRO \
+ if (sigaction(signame, NULL, &oldact) == 0 && \
+@@ -402,6 +403,7 @@ PR_BEGIN_MACRO
+ CATCH_SIGNAL(SIGTERM);
+
+ #undef CATCH_SIGNAL
++#endif
+ }
+ }
+ }