Update to 33.0

Changelog:
New
OpenH264 support (sandboxed)

New
Improved search experience through the location bar

New
Slimmer and faster JavaScript strings

New
Search suggestions on the Firefox Start (about:home) and new tab (about:newtab) pages

New
Windows: OMTC enabled by default

New
New CSP (Content Security Policy) backend

New
Support for connecting to HTTP proxy over HTTPS

New
Improved reliability of the session restoration

New
Azerbaijani [az] locale added

Changed
Proprietary window.crypto properties/functions removed

Changed
JSD (JavaScript Debugger Service) removed in favor of the Debugger interface

HTML5
@counter-style rule from CSS3 Counter Styles specification implemented

HTML5
DOMMatrix interface implemented

Developer
Cubic-bezier curves editor

Developer
Display which elements have listeners attached

Developer
New sidebar which displays a list of shortcuts to every @media rule in the current stylesheet

Developer
Paint flashing for browser content repaints

Developer
Editable @keyframes rules in the Rules section of the Inspector

Developer
CSS transform highlighter in the style-inspector

Fixed
Fix incomplete downloads being marked as complete by detecting broken HTTP1.1 transfers (237623)

Fixed
Various security fixes

Fixed in Firefox 33
MFSA 2014-82 Accessing cross-origin objects via the Alarms API
MFSA 2014-81 Inconsistent video sharing within iframe
MFSA 2014-80 Key pinning bypasses
MFSA 2014-79 Use-after-free interacting with text directionality
MFSA 2014-78 Further uninitialized memory use during GIF
MFSA 2014-77 Out-of-bounds write with WebM video
MFSA 2014-76 Web Audio memory corruption issues with custom waveforms
MFSA 2014-75 Buffer overflow during CSS manipulation
MFSA 2014-74 Miscellaneous memory safety hazards (rv:33.0 / rv:31.2)

38 files changed, 960 insertions, 1071 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 2f809b60a01..063a3faadfe 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.176 2014/10/07 16:47:37 adam Exp $
+# $NetBSD: Makefile,v 1.177 2014/10/15 13:07:07 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=	32.0.3
+MOZ_BRANCH=	33.0
 MOZ_BRANCH_MINOR=
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index f156d5c7d47..2b23a8f9381 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.84 2014/10/05 01:59:08 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.85 2014/10/15 13:07:07 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -141,6 +141,8 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/connect.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/connect.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/connect.xhtml
 lib/firefox/browser/chrome/browser/content/browser/devtools/cssruleview.xhtml
+lib/firefox/browser/chrome/browser/content/browser/devtools/cubic-bezier-frame.xhtml
+lib/firefox/browser/chrome/browser/content/browser/devtools/cubic-bezier.css
 lib/firefox/browser/chrome/browser/content/browser/devtools/d3.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/dagre-d3.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/debugger-controller.js
@@ -191,7 +193,7 @@ lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/j
 lib/firefox/browser/chrome/browser/content/browser/devtools/profiler/cleopatra/js/ui.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-loader.xul
-lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-test.html
+lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor-test.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/projecteditor.xul
 lib/firefox/browser/chrome/browser/content/browser/devtools/readdir.js
 lib/firefox/browser/chrome/browser/content/browser/devtools/responsivedesign/resize-commands.js
@@ -233,6 +235,54 @@ lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xml
 lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul
 lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul
 lib/firefox/browser/chrome/browser/content/browser/license.html
+lib/firefox/browser/chrome/browser/content/browser/loop/conversation.html
+lib/firefox/browser/chrome/browser/content/browser/loop/js/client.js
+lib/firefox/browser/chrome/browser/content/browser/loop/js/conversation.js
+lib/firefox/browser/chrome/browser/content/browser/loop/js/desktopRouter.js
+lib/firefox/browser/chrome/browser/content/browser/loop/js/panel.js
+lib/firefox/browser/chrome/browser/content/browser/loop/libs/l10n.js
+lib/firefox/browser/chrome/browser/content/browser/loop/libs/sdk.js
+lib/firefox/browser/chrome/browser/content/browser/loop/panel.html
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/css/ot.css
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-chrome.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-copy-firefox.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-denied-firefox.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-predenied-chrome.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/access-prompt-chrome.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/audioonly-publisher.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/audioonly-subscriber.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/buttons.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/loader.gif
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/mic-off.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/mic-on.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-off.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/images/rtc/speaker-on.png
+lib/firefox/browser/chrome/browser/content/browser/loop/sdk-content/js/dynamic_config.min.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/common.css
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/conversation.css
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/css/panel.css
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/audio-inverse-14x14@2x.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/facemute-14x14.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/facemute-14x14@2x.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/hangup-inverse-14x14.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/hangup-inverse-14x14@2x.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icon_32.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/icon_64.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/loading-icon.gif
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/mute-inverse-14x14@2x.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/video-inverse-14x14.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/img/video-inverse-14x14@2x.png
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/models.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/router.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/views.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/js/websocket.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/backbone-1.1.2.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/jquery-2.1.0.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/lodash-2.4.1.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/libs/react-0.10.0.js
+lib/firefox/browser/chrome/browser/content/browser/loop/shared/sounds/Firefox-Long.ogg
 lib/firefox/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
 lib/firefox/browser/chrome/browser/content/browser/migration/migration.js
 lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul
@@ -296,6 +346,7 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/prefer
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/preferences.xul
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/privacy.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/security.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/subdialogs.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/sync.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/languages.js
 lib/firefox/browser/chrome/browser/content/browser/preferences/languages.xul
@@ -330,6 +381,8 @@ lib/firefox/browser/chrome/browser/content/browser/search/engineManager.js
 lib/firefox/browser/chrome/browser/content/browser/search/engineManager.xul
 lib/firefox/browser/chrome/browser/content/browser/search/search.xml
 lib/firefox/browser/chrome/browser/content/browser/search/searchbarBindings.css
+lib/firefox/browser/chrome/browser/content/browser/searchSuggestionUI.css
+lib/firefox/browser/chrome/browser/content/browser/searchSuggestionUI.js
 lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.js
 lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.xul
 lib/firefox/browser/chrome/browser/content/browser/socialchat.xml
@@ -366,6 +419,8 @@ lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js
 lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul
 lib/firefox/browser/chrome/browser/content/browser/web-panels.js
 lib/firefox/browser/chrome/browser/content/browser/web-panels.xul
+lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js
+lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul
 lib/firefox/browser/chrome/browser/skin/classic/browser/Geolocation-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/Geolocation-64.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png
@@ -380,6 +435,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionCollapsed.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutCertError_sectionExpanded.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/aboutNetError.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutPrivateBrowsing.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore.css
@@ -456,6 +512,8 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/computedview.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/controls.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/controls@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/cubic-bezier-swatch.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/cubic-bezier-swatch@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/dark-theme.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/debugger-blackbox@2x.png
@@ -601,7 +659,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/mixed-content-blocked-16
 lib/firefox/browser/chrome/browser/skin/classic/browser/mixed-content-blocked-64.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-64.png
@@ -686,9 +744,13 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-toolbar.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/syncQuota.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/syncSetup.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs-inverted.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/connecting.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/loading.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-start.png
@@ -708,13 +770,21 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16@2x.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16@2x.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/undoCloseTab.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-arrow.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-camera-white-16.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-indicator.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-microphone-white-16.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-screen-white-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareDevice-64.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareMicrophone-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareMicrophone-64.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareScreen-16.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-shareScreen-64.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-sharingDevice-16.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-sharingMicrophone-16.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-sharingScreen-16.png
 lib/firefox/browser/chrome/browser/skin/classic/communicator/communicator.css
 lib/firefox/browser/chrome/chrome.manifest
 lib/firefox/browser/chrome/en-US/locale/branding/brand.dtd
@@ -781,6 +851,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/engineManager.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/engineManager.properties
 lib/firefox/browser/chrome/en-US/locale/browser/feeds/subscribe.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/feeds/subscribe.properties
+lib/firefox/browser/chrome/en-US/locale/browser/loop/loop.properties
 lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/migration/migration.properties
 lib/firefox/browser/chrome/en-US/locale/browser/netError.dtd
@@ -840,6 +911,7 @@ lib/firefox/browser/chrome/en-US/locale/browser/tabview.properties
 lib/firefox/browser/chrome/en-US/locale/browser/taskbar.properties
 lib/firefox/browser/chrome/en-US/locale/browser/translation.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/translation.properties
+lib/firefox/browser/chrome/en-US/locale/browser/webrtcIndicator.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
 lib/firefox/browser/chrome/icons/default/default16.png
@@ -1106,6 +1178,30 @@ lib/firefox/browser/chrome/pdfjs/content/web/viewer.css
 lib/firefox/browser/chrome/pdfjs/content/web/viewer.html
 lib/firefox/browser/chrome/pdfjs/content/web/viewer.js
 lib/firefox/browser/chrome/pdfjs/pdfjs.manifest
+lib/firefox/browser/chrome/webide/content/addons.js
+lib/firefox/browser/chrome/webide/content/addons.xhtml
+lib/firefox/browser/chrome/webide/content/details.js
+lib/firefox/browser/chrome/webide/content/details.xhtml
+lib/firefox/browser/chrome/webide/content/newapp.js
+lib/firefox/browser/chrome/webide/content/newapp.xul
+lib/firefox/browser/chrome/webide/content/permissionstable.js
+lib/firefox/browser/chrome/webide/content/permissionstable.xhtml
+lib/firefox/browser/chrome/webide/content/prefs.js
+lib/firefox/browser/chrome/webide/content/prefs.xhtml
+lib/firefox/browser/chrome/webide/content/runtimedetails.js
+lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml
+lib/firefox/browser/chrome/webide/content/webide.dtd
+lib/firefox/browser/chrome/webide/content/webide.js
+lib/firefox/browser/chrome/webide/content/webide.properties
+lib/firefox/browser/chrome/webide/content/webide.xul
+lib/firefox/browser/chrome/webide/skin/addons.css
+lib/firefox/browser/chrome/webide/skin/details.css
+lib/firefox/browser/chrome/webide/skin/icons.png
+lib/firefox/browser/chrome/webide/skin/newapp.css
+lib/firefox/browser/chrome/webide/skin/prefs.css
+lib/firefox/browser/chrome/webide/skin/tabledoc.css
+lib/firefox/browser/chrome/webide/skin/throbber.svg
+lib/firefox/browser/chrome/webide/skin/webide.css
 lib/firefox/browser/components/ChromeProfileMigrator.js
 lib/firefox/browser/components/DownloadsStartup.js
 lib/firefox/browser/components/DownloadsUI.js
@@ -1130,6 +1226,7 @@ lib/firefox/browser/components/nsSidebar.js
 lib/firefox/browser/defaults/preferences/firefox-branding.js
 lib/firefox/browser/defaults/preferences/firefox-l10n.js
 lib/firefox/browser/defaults/preferences/firefox.js
+lib/firefox/browser/defaults/preferences/webide-prefs.js
 lib/firefox/browser/defaults/profile/bookmarks.html
 lib/firefox/browser/defaults/profile/chrome/userChrome-example.css
 lib/firefox/browser/defaults/profile/chrome/userContent-example.css
@@ -1157,6 +1254,7 @@ lib/firefox/browser/modules/DragPositionManager.jsm
 lib/firefox/browser/modules/Feeds.jsm
 lib/firefox/browser/modules/MigrationUtils.jsm
 lib/firefox/browser/modules/NetworkPrioritizer.jsm
+lib/firefox/browser/modules/PanelFrame.jsm
 lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
 lib/firefox/browser/modules/PlacesUIUtils.jsm
 lib/firefox/browser/modules/RecentWindow.jsm
@@ -1204,6 +1302,7 @@ lib/firefox/browser/modules/devtools/eyedropper/eyedropper.js
 lib/firefox/browser/modules/devtools/framework/selection.js
 lib/firefox/browser/modules/devtools/framework/sidebar.js
 lib/firefox/browser/modules/devtools/framework/target.js
+lib/firefox/browser/modules/devtools/framework/toolbox-highlighter-utils.js
 lib/firefox/browser/modules/devtools/framework/toolbox-hosts.js
 lib/firefox/browser/modules/devtools/framework/toolbox-options.js
 lib/firefox/browser/modules/devtools/framework/toolbox-process-window.js
@@ -1228,6 +1327,7 @@ lib/firefox/browser/modules/devtools/projecteditor/helpers/event.js
 lib/firefox/browser/modules/devtools/projecteditor/helpers/file-picker.js
 lib/firefox/browser/modules/devtools/projecteditor/helpers/l10n.js
 lib/firefox/browser/modules/devtools/projecteditor/helpers/promise.js
+lib/firefox/browser/modules/devtools/projecteditor/helpers/prompts.js
 lib/firefox/browser/modules/devtools/projecteditor/helpers/readdir.js
 lib/firefox/browser/modules/devtools/projecteditor/plugins/app-manager/app-project-editor.js
 lib/firefox/browser/modules/devtools/projecteditor/plugins/app-manager/plugin.js
@@ -1259,7 +1359,7 @@ lib/firefox/browser/modules/devtools/shared/observable-object.js
 lib/firefox/browser/modules/devtools/shared/telemetry.js
 lib/firefox/browser/modules/devtools/shared/theme-switching.js
 lib/firefox/browser/modules/devtools/shared/undo.js
-lib/firefox/browser/modules/devtools/shared/widgets/CSSTransformPreviewer.js
+lib/firefox/browser/modules/devtools/shared/widgets/CubicBezierWidget.js
 lib/firefox/browser/modules/devtools/shared/widgets/FastListWidget.js
 lib/firefox/browser/modules/devtools/shared/widgets/Spectrum.js
 lib/firefox/browser/modules/devtools/shared/widgets/TableWidget.js
@@ -1276,6 +1376,7 @@ lib/firefox/browser/modules/devtools/styleeditor/utils.js
 lib/firefox/browser/modules/devtools/styleinspector/computed-view.js
 lib/firefox/browser/modules/devtools/styleinspector/css-parsing-utils.js
 lib/firefox/browser/modules/devtools/styleinspector/rule-view.js
+lib/firefox/browser/modules/devtools/styleinspector/style-inspector-overlays.js
 lib/firefox/browser/modules/devtools/styleinspector/style-inspector.js
 lib/firefox/browser/modules/devtools/tilt/TiltWorkerCrafter.js
 lib/firefox/browser/modules/devtools/tilt/TiltWorkerPicker.js
@@ -1293,8 +1394,16 @@ lib/firefox/browser/modules/devtools/webconsole/hudservice.js
 lib/firefox/browser/modules/devtools/webconsole/network-panel.js
 lib/firefox/browser/modules/devtools/webconsole/panel.js
 lib/firefox/browser/modules/devtools/webconsole/webconsole.js
+lib/firefox/browser/modules/devtools/webide/addons.js
+lib/firefox/browser/modules/devtools/webide/app-manager.js
+lib/firefox/browser/modules/devtools/webide/remote-resources.js
+lib/firefox/browser/modules/devtools/webide/runtimes.js
 lib/firefox/browser/modules/distribution.js
 lib/firefox/browser/modules/experiments/Experiments.jsm
+lib/firefox/browser/modules/loop/MozLoopAPI.jsm
+lib/firefox/browser/modules/loop/MozLoopPushHandler.jsm
+lib/firefox/browser/modules/loop/MozLoopService.jsm
+lib/firefox/browser/modules/loop/MozLoopWorker.js
 lib/firefox/browser/modules/offlineAppCache.jsm
 lib/firefox/browser/modules/sessionstore/ContentRestore.jsm
 lib/firefox/browser/modules/sessionstore/DocShellCapabilities.jsm
@@ -1312,6 +1421,7 @@ lib/firefox/browser/modules/sessionstore/SessionSaver.jsm
 lib/firefox/browser/modules/sessionstore/SessionStorage.jsm
 lib/firefox/browser/modules/sessionstore/SessionStore.jsm
 lib/firefox/browser/modules/sessionstore/SessionWorker.js
+lib/firefox/browser/modules/sessionstore/SessionWorker.jsm
 lib/firefox/browser/modules/sessionstore/TabAttributes.jsm
 lib/firefox/browser/modules/sessionstore/TabState.jsm
 lib/firefox/browser/modules/sessionstore/TabStateCache.jsm
@@ -1340,6 +1450,7 @@ lib/firefox/chrome/en-US/locale/en-US/alerts/notificationNames.properties
 lib/firefox/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties
 lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.dtd
 lib/firefox/chrome/en-US/locale/en-US/cookie/cookieAcceptDialog.properties
+lib/firefox/chrome/en-US/locale/en-US/formautofill/requestAutocomplete.dtd
 lib/firefox/chrome/en-US/locale/en-US/global-platform/mac/accessible.properties
 lib/firefox/chrome/en-US/locale/en-US/global-platform/mac/intl.properties
 lib/firefox/chrome/en-US/locale/en-US/global-platform/mac/platformKeys.properties
@@ -1465,7 +1576,6 @@ lib/firefox/chrome/en-US/locale/en-US/mozapps/handling/handling.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/plugins/plugins.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/plugins/plugins.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/changemp.dtd
-lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/ocsp.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/preferences.properties
 lib/firefox/chrome/en-US/locale/en-US/mozapps/preferences/removemp.dtd
 lib/firefox/chrome/en-US/locale/en-US/mozapps/profile/createProfileWizard.dtd
@@ -1518,8 +1628,6 @@ lib/firefox/chrome/pippki/content/pippki/certDump.xul
 lib/firefox/chrome/pippki/content/pippki/certManager.js
 lib/firefox/chrome/pippki/content/pippki/certManager.xul
 lib/firefox/chrome/pippki/content/pippki/certViewer.xul
-lib/firefox/chrome/pippki/content/pippki/certerror.js
-lib/firefox/chrome/pippki/content/pippki/certerror.xul
 lib/firefox/chrome/pippki/content/pippki/certpicker.js
 lib/firefox/chrome/pippki/content/pippki/certpicker.xul
 lib/firefox/chrome/pippki/content/pippki/changepassword.xul
@@ -1560,6 +1668,8 @@ lib/firefox/chrome/recording/content/recording.js
 lib/firefox/chrome/recording/content/recording.xul
 lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.js
 lib/firefox/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
+lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.js
+lib/firefox/chrome/toolkit/content/formautofill/requestAutocomplete.xhtml
 lib/firefox/chrome/toolkit/content/global/BrowserElementChild.js
 lib/firefox/chrome/toolkit/content/global/BrowserElementChildPreload.js
 lib/firefox/chrome/toolkit/content/global/BrowserElementPanning.js
@@ -1654,7 +1764,6 @@ lib/firefox/chrome/toolkit/content/global/devicestorage.properties
 lib/firefox/chrome/toolkit/content/global/dialogOverlay.js
 lib/firefox/chrome/toolkit/content/global/dialogOverlay.xul
 lib/firefox/chrome/toolkit/content/global/directionDetector.html
-lib/firefox/chrome/toolkit/content/global/directoryLinks.json
 lib/firefox/chrome/toolkit/content/global/editMenuOverlay.js
 lib/firefox/chrome/toolkit/content/global/editMenuOverlay.xul
 lib/firefox/chrome/toolkit/content/global/filepicker.js
@@ -1729,6 +1838,7 @@ lib/firefox/chrome/toolkit/content/mozapps/downloads/downloads.js
 lib/firefox/chrome/toolkit/content/mozapps/downloads/downloads.xul
 lib/firefox/chrome/toolkit/content/mozapps/downloads/helperApps.js
 lib/firefox/chrome/toolkit/content/mozapps/downloads/unknownContentType.xul
+lib/firefox/chrome/toolkit/content/mozapps/extensions/OpenH264-license.txt
 lib/firefox/chrome/toolkit/content/mozapps/extensions/about.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/about.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/blocklist.css
@@ -1745,6 +1855,7 @@ lib/firefox/chrome/toolkit/content/mozapps/extensions/list.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/list.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.js
 lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.xul
+lib/firefox/chrome/toolkit/content/mozapps/extensions/openH264Prefs.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
 lib/firefox/chrome/toolkit/content/mozapps/extensions/selectAddons.css
 lib/firefox/chrome/toolkit/content/mozapps/extensions/selectAddons.js
@@ -1770,8 +1881,6 @@ lib/firefox/chrome/toolkit/content/mozapps/plugins/pluginProblemContent.css
 lib/firefox/chrome/toolkit/content/mozapps/preferences/changemp.js
 lib/firefox/chrome/toolkit/content/mozapps/preferences/changemp.xul
 lib/firefox/chrome/toolkit/content/mozapps/preferences/fontbuilder.js
-lib/firefox/chrome/toolkit/content/mozapps/preferences/ocsp.js
-lib/firefox/chrome/toolkit/content/mozapps/preferences/ocsp.xul
 lib/firefox/chrome/toolkit/content/mozapps/preferences/removemp.js
 lib/firefox/chrome/toolkit/content/mozapps/preferences/removemp.xul
 lib/firefox/chrome/toolkit/content/mozapps/profile/createProfileWizard.js
@@ -1799,6 +1908,7 @@ lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
 lib/firefox/chrome/toolkit/res/arrow.gif
 lib/firefox/chrome/toolkit/res/arrowd.gif
 lib/firefox/chrome/toolkit/res/broken-image.png
+lib/firefox/chrome/toolkit/res/counterstyles.css
 lib/firefox/chrome/toolkit/res/forms.css
 lib/firefox/chrome/toolkit/res/full-screen-override.css
 lib/firefox/chrome/toolkit/res/hiddenWindow.html
@@ -1930,6 +2040,7 @@ lib/firefox/chrome/toolkit/skin/classic/global/inContentUI.css
 lib/firefox/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
 lib/firefox/chrome/toolkit/skin/classic/global/linkTree.css
 lib/firefox/chrome/toolkit/skin/classic/global/listbox.css
+lib/firefox/chrome/toolkit/skin/classic/global/loop/loop-call.png
 lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
 lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css
 lib/firefox/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png
@@ -2045,6 +2156,7 @@ lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric-16.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/update.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/utilities.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/formautofill/requestAutocomplete.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/handling/handling.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png
@@ -2080,7 +2192,6 @@ lib/firefox/components/ActivityRequestHandler.js
 lib/firefox/components/ActivityWrapper.js
 lib/firefox/components/AlarmsManager.js
 lib/firefox/components/AppsService.js
-lib/firefox/components/AutofillController.js
 lib/firefox/components/BrowserElementParent.js
 lib/firefox/components/ChromeNotifications.js
 lib/firefox/components/ColorAnalyzer.js
@@ -2090,6 +2201,7 @@ lib/firefox/components/DataReportingService.js
 lib/firefox/components/DataStoreImpl.js
 lib/firefox/components/DownloadLegacy.js
 lib/firefox/components/FeedProcessor.js
+lib/firefox/components/FormAutofillContentService.js
 lib/firefox/components/FormHistoryStartup.js
 lib/firefox/components/MozKeyboard.js
 lib/firefox/components/NetworkGeolocationProvider.js
@@ -2130,6 +2242,7 @@ lib/firefox/components/libmozgnome.so
 ${PLIST.gnome}lib/firefox/components/libnkgnomevfs.so
 lib/firefox/components/marionettecomponent.js
 lib/firefox/components/messageWakeupService.js
+lib/firefox/components/multiprocessShims.js
 lib/firefox/components/nsBlocklistService.js
 lib/firefox/components/nsContentDispatchChooser.js
 lib/firefox/components/nsContentPrefService.js
@@ -2225,6 +2338,7 @@ lib/firefox/modules/AsyncShutdown.jsm
 lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
 lib/firefox/modules/AutoCompleteE10S.jsm
 lib/firefox/modules/BackgroundPageThumbs.jsm
+lib/firefox/modules/Battery.jsm
 lib/firefox/modules/BinarySearch.jsm
 lib/firefox/modules/BookmarkHTMLUtils.jsm
 lib/firefox/modules/BookmarkJSONUtils.jsm
@@ -2270,6 +2384,8 @@ lib/firefox/modules/Downloads.jsm
 lib/firefox/modules/FileUtils.jsm
 lib/firefox/modules/Finder.jsm
 lib/firefox/modules/ForgetAboutSite.jsm
+lib/firefox/modules/FormAutofill.jsm
+lib/firefox/modules/FormAutofillIntegration.jsm
 lib/firefox/modules/FormData.jsm
 lib/firefox/modules/FormHistory.jsm
 lib/firefox/modules/FrameWorker.jsm
@@ -2278,6 +2394,7 @@ lib/firefox/modules/FreeSpaceWatcher.jsm
 lib/firefox/modules/FxAccounts.jsm
 lib/firefox/modules/FxAccountsClient.jsm
 lib/firefox/modules/FxAccountsCommon.js
+lib/firefox/modules/GMPInstallManager.jsm
 lib/firefox/modules/Geometry.jsm
 lib/firefox/modules/HealthReport.jsm
 lib/firefox/modules/Http.jsm
@@ -2294,6 +2411,7 @@ lib/firefox/modules/Log.jsm
 lib/firefox/modules/LoginHelper.jsm
 lib/firefox/modules/LoginImport.jsm
 lib/firefox/modules/LoginManagerContent.jsm
+lib/firefox/modules/LoginManagerParent.jsm
 lib/firefox/modules/LoginStore.jsm
 lib/firefox/modules/MessagePortBase.jsm
 lib/firefox/modules/MessagePortWorker.js
@@ -2304,7 +2422,6 @@ lib/firefox/modules/NativeApp.jsm
 lib/firefox/modules/NetUtil.jsm
 lib/firefox/modules/NewTabUtils.jsm
 lib/firefox/modules/NotificationDB.jsm
-lib/firefox/modules/ObjectWrapper.jsm
 lib/firefox/modules/OfflineCacheInstaller.jsm
 lib/firefox/modules/OperatorApps.jsm
 lib/firefox/modules/PageMenu.jsm
@@ -2331,6 +2448,7 @@ lib/firefox/modules/PriorityUrlProvider.jsm
 lib/firefox/modules/PrivateBrowsingUtils.jsm
 lib/firefox/modules/Promise-backend.js
 lib/firefox/modules/Promise.jsm
+lib/firefox/modules/PromiseWorker.jsm
 lib/firefox/modules/PropertyListUtils.jsm
 lib/firefox/modules/PushService.jsm
 lib/firefox/modules/RemoteAddonsChild.jsm
@@ -2340,10 +2458,14 @@ lib/firefox/modules/RemoteFinder.jsm
 lib/firefox/modules/RemoteSecurityUI.jsm
 lib/firefox/modules/RemoteWebNavigation.jsm
 lib/firefox/modules/RemoteWebProgress.jsm
+lib/firefox/modules/RequestAutocompleteUI.jsm
 lib/firefox/modules/ResetProfile.jsm
+lib/firefox/modules/ResourceStatsDB.jsm
+lib/firefox/modules/ResourceStatsService.jsm
 lib/firefox/modules/SafeBrowsing.jsm
 lib/firefox/modules/ScriptPreloader.jsm
 lib/firefox/modules/ScrollPosition.jsm
+lib/firefox/modules/SearchSuggestionController.jsm
 lib/firefox/modules/SelectContentHelper.jsm
 lib/firefox/modules/SelectParentHelper.jsm
 lib/firefox/modules/Services.jsm
@@ -2395,6 +2517,7 @@ lib/firefox/modules/addons/AddonRepository_SQLiteMigrator.jsm
 lib/firefox/modules/addons/AddonUpdateChecker.jsm
 lib/firefox/modules/addons/Content.js
 lib/firefox/modules/addons/LightweightThemeImageOptimizer.jsm
+lib/firefox/modules/addons/OpenH264Provider.jsm
 lib/firefox/modules/addons/PluginProvider.jsm
 lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js
 lib/firefox/modules/addons/XPIProvider.jsm
@@ -2412,6 +2535,8 @@ lib/firefox/modules/commonjs/diffpatcher/test/diff.js
 lib/firefox/modules/commonjs/diffpatcher/test/index.js
 lib/firefox/modules/commonjs/diffpatcher/test/patch.js
 lib/firefox/modules/commonjs/diffpatcher/test/tap.js
+lib/firefox/modules/commonjs/framescript/FrameScriptManager.jsm
+lib/firefox/modules/commonjs/framescript/tab-events.js
 lib/firefox/modules/commonjs/method/History.md
 lib/firefox/modules/commonjs/method/License.md
 lib/firefox/modules/commonjs/method/Readme.md
@@ -2533,6 +2658,7 @@ lib/firefox/modules/commonjs/sdk/platform/xpcom.js
 lib/firefox/modules/commonjs/sdk/preferences/event-target.js
 lib/firefox/modules/commonjs/sdk/preferences/native-options.js
 lib/firefox/modules/commonjs/sdk/preferences/service.js
+lib/firefox/modules/commonjs/sdk/preferences/utils.js
 lib/firefox/modules/commonjs/sdk/private-browsing.js
 lib/firefox/modules/commonjs/sdk/private-browsing/utils.js
 lib/firefox/modules/commonjs/sdk/querystring.js
@@ -2633,6 +2759,7 @@ lib/firefox/modules/commonjs/sdk/windows/observer.js
 lib/firefox/modules/commonjs/sdk/windows/tabs-fennec.js
 lib/firefox/modules/commonjs/sdk/windows/tabs-firefox.js
 lib/firefox/modules/commonjs/sdk/worker/utils.js
+lib/firefox/modules/commonjs/sdk/zip/utils.js
 lib/firefox/modules/commonjs/test.js
 lib/firefox/modules/commonjs/toolkit/loader.js
 lib/firefox/modules/ctypes.jsm
@@ -2658,6 +2785,7 @@ lib/firefox/modules/devtools/css-color.js
 lib/firefox/modules/devtools/dbg-client.jsm
 lib/firefox/modules/devtools/dbg-server.jsm
 lib/firefox/modules/devtools/deprecated-sync-thenables.js
+lib/firefox/modules/devtools/discovery/discovery.js
 lib/firefox/modules/devtools/event-emitter.js
 lib/firefox/modules/devtools/gcli.jsm
 lib/firefox/modules/devtools/gcli/api.js
@@ -2673,8 +2801,11 @@ lib/firefox/modules/devtools/gcli/commands/context.js
 lib/firefox/modules/devtools/gcli/commands/cookie.js
 lib/firefox/modules/devtools/gcli/commands/csscoverage.js
 lib/firefox/modules/devtools/gcli/commands/exec.js
+lib/firefox/modules/devtools/gcli/commands/folder.js
 lib/firefox/modules/devtools/gcli/commands/global.js
 lib/firefox/modules/devtools/gcli/commands/help.js
+lib/firefox/modules/devtools/gcli/commands/highlight.js
+lib/firefox/modules/devtools/gcli/commands/inject.js
 lib/firefox/modules/devtools/gcli/commands/intro.js
 lib/firefox/modules/devtools/gcli/commands/jsb.js
 lib/firefox/modules/devtools/gcli/commands/lang.js
@@ -2727,6 +2858,8 @@ lib/firefox/modules/devtools/gcli/types/selection.js
 lib/firefox/modules/devtools/gcli/types/setting.js
 lib/firefox/modules/devtools/gcli/types/string.js
 lib/firefox/modules/devtools/gcli/types/types.js
+lib/firefox/modules/devtools/gcli/types/union.js
+lib/firefox/modules/devtools/gcli/types/url.js
 lib/firefox/modules/devtools/gcli/ui/focus.js
 lib/firefox/modules/devtools/gcli/ui/history.js
 lib/firefox/modules/devtools/gcli/ui/intro.js
@@ -2744,6 +2877,13 @@ lib/firefox/modules/devtools/gcli/util/prism.js
 lib/firefox/modules/devtools/gcli/util/promise.js
 lib/firefox/modules/devtools/gcli/util/spell.js
 lib/firefox/modules/devtools/gcli/util/util.js
+lib/firefox/modules/devtools/jsbeautify/beautify-css.js
+lib/firefox/modules/devtools/jsbeautify/beautify-html.js
+lib/firefox/modules/devtools/jsbeautify/beautify-js.js
+lib/firefox/modules/devtools/jsbeautify/beautify-tests.js
+lib/firefox/modules/devtools/jsbeautify/beautify.js
+lib/firefox/modules/devtools/jsbeautify/sanitytest.js
+lib/firefox/modules/devtools/jsbeautify/urlencode_unpacker.js
 lib/firefox/modules/devtools/output-parser.js
 lib/firefox/modules/devtools/pretty-fast.js
 lib/firefox/modules/devtools/qrcode/decoder/index.js
@@ -2762,6 +2902,7 @@ lib/firefox/modules/devtools/server/actors/highlighter.js
 lib/firefox/modules/devtools/server/actors/inspector.js
 lib/firefox/modules/devtools/server/actors/layout.js
 lib/firefox/modules/devtools/server/actors/memory.js
+lib/firefox/modules/devtools/server/actors/monitor.js
 lib/firefox/modules/devtools/server/actors/preference.js
 lib/firefox/modules/devtools/server/actors/pretty-print-worker.js
 lib/firefox/modules/devtools/server/actors/profiler.js
@@ -2815,9 +2956,9 @@ lib/firefox/modules/jsdebugger.jsm
 lib/firefox/modules/mcc_iso3166_table.jsm
 lib/firefox/modules/media/IdpProxy.jsm
 lib/firefox/modules/media/PeerConnectionIdp.jsm
+lib/firefox/modules/media/RTCStatsReport.jsm
 lib/firefox/modules/nsFormAutoCompleteResult.jsm
 lib/firefox/modules/osfile.jsm
-lib/firefox/modules/osfile/_PromiseWorker.jsm
 lib/firefox/modules/osfile/osfile_async_front.jsm
 lib/firefox/modules/osfile/osfile_async_worker.js
 lib/firefox/modules/osfile/osfile_native.jsm
@@ -2886,6 +3027,7 @@ lib/firefox/modules/services/metrics/providermanager.jsm
 lib/firefox/modules/services/metrics/storage.jsm
 lib/firefox/modules/sqlite/sqlite_internal.js
 lib/firefox/modules/vtt.jsm
+lib/firefox/modules/workers/PromiseWorker.js
 lib/firefox/modules/workers/lz4.js
 lib/firefox/modules/workers/lz4_internal.js
 lib/firefox/modules/workers/require.js
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index be6c789bc70..0e9dc8f7278 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.161 2014/10/13 20:53:46 joerg Exp $
+$NetBSD: distinfo,v 1.162 2014/10/15 13:07:07 ryoon Exp $
 
-SHA1 (firefox-32.0.3.source.tar.bz2) = 1f831147365478e353212714038e812ca3e9fe42
-RMD160 (firefox-32.0.3.source.tar.bz2) = f09e2cc92a35f0f3e88079d063c22bf16215327a
-Size (firefox-32.0.3.source.tar.bz2) = 150323569 bytes
-SHA1 (patch-aa) = b1bc5485f573392950595a7c93abeaaa14fb190c
+SHA1 (firefox-33.0.source.tar.bz2) = ad10e8fefcd9687d2b67bacafa4ecb5f5ca4af66
+RMD160 (firefox-33.0.source.tar.bz2) = f1f961927e12563db73cda811fe9557d5bc27f17
+Size (firefox-33.0.source.tar.bz2) = 155177527 bytes
+SHA1 (patch-aa) = 9975c507837d3894ca4915e5c5fd65264f1cd526
 SHA1 (patch-ak) = ebbb0c0c6e7923acc056f15ebd11307726ec65dc
 SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
@@ -12,7 +12,6 @@ SHA1 (patch-b2g_installer_Makefile.in) = 7b3cca1da34c444c1055deec21723db909ec3d9
 SHA1 (patch-b2g_installer_package-manifest.in) = 56d73f510fb807ad11f40b0ceec50961049549da
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = d6c02294765265d9e85cf49c22320d88573c2e25
-SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
 SHA1 (patch-browser_app_nsBrowserApp.cpp) = 00914f7656fff6785d737ce6e569a97fe39aafe8
 SHA1 (patch-browser_app_profile_firefox.js) = 108efbe1ae65669912d2f76caec546753e1ac8f3
 SHA1 (patch-browser_installer_package-manifest.in) = 83a0073525c607e05414688aa07035cc3f08e50a
@@ -33,8 +32,10 @@ SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598
 SHA1 (patch-config_system-headers) = c586c07d96ba3bd6ac35247ed50eab0978ccc949
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f44
-SHA1 (patch-content_media_AudioStream.h) = 84e7c5457baf01da37468c3536d30a9003a2bbb6
+SHA1 (patch-content_media_AudioStream.h) = 4a1ef292295623815bc56afd36bb86ab68d2b567
 SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
+SHA1 (patch-content_media_gmp_GMPChild.cpp) = 45ef3a46c624c38dbb5b81deb6409277997c7239
+SHA1 (patch-content_media_gmp_GMPParent.cpp) = ff5ff0d044874ea9cf5cbe27aebc91b24d30c803
 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 0a7f3167e939822013ae6195406657453578453e
@@ -47,7 +48,7 @@ SHA1 (patch-gfx_skia_Makefile.in) = 03349db0ff9b14c2012c36d746adf2ee6cb87e62
 SHA1 (patch-gfx_thebes_Makefile.in) = 16b63bc42870aa8c042416c6e04b3513981ca6f0
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574
 SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee
-SHA1 (patch-intl_unicharutil_util_Makefile.in) = c8f37cc420ba26b63c66fbbf69b13a8b4fea43fc
+SHA1 (patch-intl_unicharutil_util_Makefile.in) = 77ee18c5a8d5745f6350862109e0ccf028736d9f
 SHA1 (patch-ipc_chromium_Makefile.in) = edd85b79cd3879f7595b932442bb0e93505d5506
 SHA1 (patch-ipc_chromium_moz.build) = de12255865e45cfdf0f7dc57ce101be75ac8ad54
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 7bc83577a9678542db4dff7dda19d751ff6d78c1
@@ -58,52 +59,58 @@ SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 16158489773bbcba35e224d30b
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 12f3e063cf3fef23f0e3e0fdba5d5a4c1fc32af3
 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = e6d7ac39a8b2a1b232638f7671e8530acfed0b97
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ff1371ffb84abf2d2adcf25e66502943992d5109
-SHA1 (patch-ipc_chromium_src_base_process__util.h) = 31b592d69d3c4f63642dae3c81c771ee3dfa8502
-SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 4f05fce050796f86b5aedf910eb709c9969fa982
+SHA1 (patch-ipc_chromium_src_base_process__util.h) = 8c5b88c04ff46ce3d0b694637c3d58d599a37bf3
+SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = efe1c242efded89b7a69a83429bc30843f330367
 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 6b2611cc902f17e726aabcf4fb5fff2c71852408
 SHA1 (patch-ipc_chromium_src_base_scoped__nsautorelease__pool.h) = 8c61a35e99e7f54e4b2bf5931c59eb2b7a04127a
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 27890c56194e483fc0758ed767ca5795cc5112eb
 SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 337a0b4a5d51d68c7699b79c7591b953ea23ca67
 SHA1 (patch-ipc_chromium_src_build_build__config.h) = af5a10df7d8fe9715f0e43cd6be14f8f20c53517
 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b144a225bacf41833e059cb400
-SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 9a158075e31e2c8d6159bd4b97d0b272e193f3db
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = f3d8bc36a2c3ea7e79afbb668ee4d8dc9e71fb81
 SHA1 (patch-ipc_glue_ScopedXREEmbed.cpp) = 97c39f25527dac4c22b38ce446ca2cd4cef08fd0
 SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0
 SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8
 SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
 SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
-SHA1 (patch-js_src_Makefile.in) = 780e408dfddfd90c6013b316e2e52800c62eee5e
+SHA1 (patch-js_src_Makefile.in) = fffae52dcb5f267e6553a7de69c21fdfec0f3072
 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
 SHA1 (patch-js_src_gc_Memory.cpp) = f2ee54f0a05d870651a3235b95bbb346586f3c3c
 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9
 SHA1 (patch-js_src_vm_WeakMapPtr.cpp) = c1778892afa6fb97de911221715a14f6dd9cab2f
-SHA1 (patch-mb) = b661abce429a88554fca6c930b4dbf71ba6bb5cb
+SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
 SHA1 (patch-media_libcubeb_src_Makefile.in) = fe880774789b0be54dec6fd83b89457fc8c2cabc
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 5ef0de0ac875334e959ff0d4bfa43a2e5ab087b9
-SHA1 (patch-media_libcubeb_src_moz.build) = 822833bc0fd60cd4936550dc43af3294ebac40cd
+SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 833a7d863de5099aa8f860142b33ea11d2a26582
+SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = d662f0f4c4a326071f59f7fff14018c6239c64ee
+SHA1 (patch-media_libcubeb_src_moz.build) = a56289d1387e93bc62d7852520a488443bec233c
 SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
 SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
+SHA1 (patch-media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp) = fdadd8b7e28290aabae4bab78597b4968f63eaf1
 SHA1 (patch-media_libtheora_Makefile.in) = 80ac9cb20760fe4d94047f7cb1c6a16bbdd6b505
 SHA1 (patch-media_libtremor_Makefile.in) = 497d03646caa721bdd129de365aadea8466043af
 SHA1 (patch-media_libvorbis_Makefile.in) = fd1ce15268eed9c97dd0774398d559cdbed63e53
 SHA1 (patch-media_mtransport_third__party_nICEr_src_util_mbslen.c) = 087e8788c72b96d2059ca82ce4282d78aed546da
 SHA1 (patch-media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h) = de7055f891387f96f8fd32366c7189d480354e9e
 SHA1 (patch-media_webrtc_signaling_signaling.gyp) = 91d5fcc2409b1398c84dedc9697107f815de48fc
-SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 509e07cba9aeca256ef28674862ce81bac7253bd
+SHA1 (patch-media_webrtc_signaling_test_Makefile.in) = 4cbc1c8b168033eaecdf1dd65eae16820a6a2443
 SHA1 (patch-media_webrtc_trunk_webrtc_build_common.gypi) = 4ff5796e15d9aa6adb8495d6f2e5a7f0445a0fac
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi) = ae0fcc32f7d146d2a494b42a58a9fcbb73c2a74c
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc) = 53481a80b410afe962146f08eafe8ff38ac6a241
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h) = b972e59204760eb885a9a0432ec977f604208a53
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ffc1d956e826a0005b76285596ba24a2f4a3806c
-SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = eb585898f92a7782e85c01262c26c9ad47fbcb89
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = d310cf4ebf4701d25a1865c7e651829be6d63b8c
 SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp) = 78a9522f0e37cfc3ec8267e6c15de9dba0ec7ff3
 SHA1 (patch-memory_jemalloc_Makefile.in) = 772e996c8da254f952d0f3a0c9325a177c838543
 SHA1 (patch-memory_jemalloc_src_configure) = 563834e1a0dc0eba17b4f263de26787672ff9200
 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9d9036ddd28c7b8ce37860e0120df2997a3a0c59
 SHA1 (patch-mfbt_Alignment.h) = 9ebc9892fd11eba7105974979b54f4f8759b7749
-SHA1 (patch-mfbt_Attributes.h) = e99809555ce743e7e393cdf20efa3a00c0b9098a
-SHA1 (patch-mfbt_Poison.cpp) = b582943c02f57835451c9eecd004c9912d42ce84
+SHA1 (patch-mfbt_Atomics.h) = c02d517365276cef4cec178993375b54345c0d9a
+SHA1 (patch-mfbt_Attributes.h) = 0cf62084c0220a3fa46226714cea5c30b1b155e9
+SHA1 (patch-mfbt_Poison.cpp) = a37c8a35637f24813f22588c4c14c28c391384e0
 SHA1 (patch-mobile_android_installer_Makefile.in) = b2ea844a0145f4c15ef1b350dde6b000bd231fa5
 SHA1 (patch-mobile_android_installer_package-manifest.in) = 9664858fe3b4593eb29dd0180d5a2df3cd245bb2
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
@@ -112,31 +119,30 @@ SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
 SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
 SHA1 (patch-probes_Makefile.in) = 9a8d48556daaaa17996133a6183b1d27f0510361
 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
-SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
-SHA1 (patch-storage_src_moz.build) = 1e08d96f6be012286547c723bfeb445c50d3ad83
+SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890
-SHA1 (patch-toolkit_library_libxul.mk) = ceba8edf009787ad68a1d2b284c090d8c140c139
+SHA1 (patch-toolkit_library_libxul.mk) = e72967ccfa040bda8fdf5ead75822d7b97730244
+SHA1 (patch-toolkit_modules_GMPInstallManager.jsm) = 7e410806f44e7f20109260bef96cd13101c27664
+SHA1 (patch-toolkit_mozapps_extensions_internal_OpenH264Provider.jsm) = 75647c1b705bcac8b64064e1eea26cb15b435613
 SHA1 (patch-toolkit_toolkit.mozbuild) = 0993d50cc02c2b421e6de087dfb0a9cb30562c6b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8
 SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c
-SHA1 (patch-xb) = 30eea880b40cee45d1235d3292fead4b5a54bbaa
-SHA1 (patch-xc) = 8575fdac2b47966ccfb5e1cc7ca8505163e358c9
-SHA1 (patch-xe) = ca4c87dbf9bb09e0e6c270d0fa76fc69a7d6df7f
-SHA1 (patch-xf) = 1720ae5cf3cf0df6f2e9519c83a332585bdd67bf
-SHA1 (patch-xg) = b80e660e85b06e4f71146bd41bd4bc0d2e3b6488
-SHA1 (patch-xl) = 9555b86c72b2e144e341d6af1dbfbc07cc8c94db
-SHA1 (patch-xm) = 81e02e410c00175cbb98c646dda90c7adf199657
 SHA1 (patch-xpcom_base_nsStackWalk.cpp) = 2475818905150a4779607ab24ea6bd261e62f5bd
-SHA1 (patch-xpcom_base_nsUUIDGenerator.cpp) = 36343baeafef7bf923cae1fe4e844ca360181b83
-SHA1 (patch-xpcom_base_nsUUIDGenerator.h) = 43e9704cde02cca793af47c47627e2df1b770d5b
 SHA1 (patch-xpcom_base_nscore.h) = f4fe66cc9e714a2101a4d1287359d1c300574438
-SHA1 (patch-xpcom_build_PoisonIOInterposer.h) = fdb961a615e5c66a1d0a3c724cf124a2b47f2ed6
 SHA1 (patch-xpcom_build_nsXPComInit.cpp) = 727fd1ce934f129de5fcc5e6059d3cb8c30b1e17
-SHA1 (patch-xpcom_ds_TimeStamp.h) = a1fb060f91720eb330f102b28d9373bbdbe96e30
-SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_moz.build) = 954b60998c5621b896fae372fe067df693574ea4
-SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__asm__mips.S) = b2b81fcdf6591089fcc5de4c8f820e96c0a50256
-SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cd42915cd32756b55894a773a1e6d7c012b4467
-SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__asm__mips.S) = 1bb4baf0baa223cd87a8cb85b16b37c368c45b94
-SHA1 (patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp) = e9e336817c172187f3e15ddf539a8a2176e3e952
+SHA1 (patch-xpcom_ds_TimeStamp.h) = fe7dd3f21a2998b72f3cb7505002338f36781bed
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 1e4d71a06b34556fa9339f97b75a065539baa511
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = a0445488bbcabe7a67a83df3d75f2d956e172a1f
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = f310105510bb5fa6c6de122ebdebbfa18423d8d3
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s) = 8e367d4d0baf24714ee80449fc8d6849ff08ca1c
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb72e1bc9a38e3f123539d7bb2aca6793f2b574
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = d04f9f5642b41f4f8f37f878a47fa0ca13cc4e38
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp) = d246f0695eb43d43bfd5571297945a4b7a88f72c
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
 SHA1 (patch-xulrunner_installer_Makefile.in) = 9d32ff87d0962c0406ed38de995c0350dd372e49
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 7409a8adf92..68d5b63d4b8 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.43 2014/10/05 01:59:08 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.44 2014/10/15 13:07:07 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -207,7 +207,7 @@ BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.10.6
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+=	nss>=3.16.2
+BUILDLINK_API_DEPENDS.nss+=	nss>=3.17.1
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index bfec0e3b9e7..55b58c76902 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
+$NetBSD: patch-aa,v 1.31 2014/10/15 13:07:07 ryoon Exp $
 
 * The profiler does not support Darwin/PPC so don't try to enable it
   on that platform.
@@ -13,9 +13,9 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
   heavy patching. Ideally they should be fixed individually but that
   will be an extremely hard work, so don't define XP_MACOSX for now.
 
---- configure.in.orig	2014-09-24 01:05:10.000000000 +0000
+--- configure.in.orig	2014-10-11 09:06:18.000000000 +0000
 +++ configure.in
-@@ -958,7 +958,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH
+@@ -966,7 +966,7 @@ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH
  MOZ_PNG_CFLAGS="-I$_objdir/dist/include" # needed for freetype compilation
  MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
  
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
  MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
  XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
-@@ -1672,7 +1672,13 @@ Linux)
+@@ -1680,7 +1680,13 @@ Linux)
          MOZ_ENABLE_PROFILER_SPS=
      esac
      ;;
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  *)
      MOZ_ENABLE_PROFILER_SPS=
      ;;
-@@ -1776,7 +1782,7 @@ case "$host" in
+@@ -1784,7 +1790,7 @@ case "$host" in
      ;;
  
  *-darwin*)
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
      HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
      ;;
-@@ -1908,7 +1914,6 @@ case "$target" in
+@@ -1916,7 +1922,6 @@ case "$target" in
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit'
      else
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
          AC_DEFINE(XP_DARWIN)
          _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
          # The ExceptionHandling framework is needed for Objective-C exception
-@@ -2527,8 +2532,7 @@ MOZ_CXX11
+@@ -2539,8 +2544,7 @@ MOZ_CXX11
  
  AC_LANG_C
  
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  dnl ===============================================================
  if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
-@@ -2667,7 +2671,7 @@ if test "$ac_cv_sockaddr_sa_len" = true 
+@@ -2679,7 +2683,7 @@ if test "$ac_cv_sockaddr_sa_len" = true 
    AC_DEFINE(HAVE_SA_LEN)
  fi
  
@@ -75,16 +75,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
                [  --enable-dtrace         build with dtrace support if available (default=no)],
                [enable_dtrace="yes"],)
  if test "x$enable_dtrace" = "xyes"; then
-@@ -2928,7 +2932,7 @@ dnl Checks for library functions.
- dnl ========================================================
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_MEMCMP
--AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
-+AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
- 
- dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
- AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
-@@ -3625,6 +3629,14 @@ if test -n "$YASM"; then
+@@ -3576,6 +3580,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -99,7 +90,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -3652,11 +3664,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -3603,11 +3615,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -112,7 +103,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
                     MOZ_NATIVE_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4342,6 +4350,10 @@ cairo-gonk)
+@@ -4293,6 +4301,10 @@ cairo-gonk)
  
  esac
  
@@ -123,7 +114,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  AC_SUBST(MOZ_PDF_PRINTING)
  if test "$MOZ_PDF_PRINTING"; then
     PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
-@@ -5068,6 +5080,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5012,6 +5024,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_VPX=1
      MOZ_VPX_ERROR_CONCEALMENT=1
  
@@ -133,7 +124,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5154,6 +5169,63 @@ if test "${ac_cv_c_attribute_aligned}" !
+@@ -5102,6 +5117,63 @@ if test "${ac_cv_c_attribute_aligned}" !
  fi
  
  dnl ========================================================
@@ -197,7 +188,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  dnl = Disable Opus audio codec support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5162,6 +5234,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5110,6 +5182,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
      MOZ_OPUS=1)
  
  dnl ========================================================
@@ -295,7 +286,92 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-@@ -5944,7 +6107,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
+@@ -5462,6 +5625,60 @@ fi
+ AC_SUBST(MOZ_WEBM_ENCODER)
+ 
+ dnl ==================================
++dnl = Check OSS availability
++dnl ==================================
++
++dnl If using Linux, Solaris or BSDs, ensure that OSS is available
++case "$OS_TARGET" in
++Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD)
++    MOZ_OSS=1
++    ;;
++esac
++
++MOZ_ARG_DISABLE_BOOL(oss,
++[  --disable-oss           Disable OpenSoundSystem support],
++   MOZ_OSS=,
++   MOZ_OSS=1)
++
++_SAVE_CFLAGS=$CFLAGS
++_SAVE_LIBS=$LIBS
++if test -n "$MOZ_OSS"; then
++    dnl Prefer 4Front implementation
++    AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
++    if test -z "$MOZ_OSS_CFLAGS"; then
++        for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do
++            if test -e "$oss_conf"; then
++                . "$oss_conf"
++            fi
++        done
++        if test -d "$OSSLIBDIR"; then
++            MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include"
++        fi
++    fi
++    AC_MSG_RESULT([$MOZ_OSS_CFLAGS])
++
++    CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS"
++    MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h)
++
++    if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \
++            "$ac_cv_header_linux_soundcard_h" != "yes" -a \
++            "$ac_cv_header_soundcard_h" != "yes"; then
++        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --disable-ogg --disable-wave --disable-webm.])
++    fi
++
++    dnl Assume NetBSD implementation over SunAudio
++    AC_CHECK_LIB(ossaudio, _oss_ioctl,
++        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
++         MOZ_OSS_LIBS="-lossaudio"])
++fi
++CFLAGS=$_SAVE_CFLAGS
++LIBS=$_SAVE_LIBS
++
++AC_SUBST(MOZ_OSS)
++AC_SUBST_LIST(MOZ_OSS_CFLAGS)
++AC_SUBST_LIST(MOZ_OSS_LIBS)
++
++dnl ==================================
+ dnl = Check alsa availability on Linux
+ dnl ==================================
+ 
+@@ -5475,12 +5692,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
+    MOZ_ALSA=1,
+    MOZ_ALSA=)
+ 
++MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
++[  --disable-alsa-dlopen   Disable runtime linking of libasound.so],
++   DISABLE_LIBASOUND_DLOPEN=1,
++   DISABLE_LIBASOUND_DLOPEN=)
++
+ if test -n "$MOZ_ALSA"; then
+     PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
+          [echo "$MOZ_ALSA_PKG_ERRORS"
+           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
+ fi
+ 
++if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
++    AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
++else
++    MOZ_ALSA_LIBS=
++fi
++
+ AC_SUBST(MOZ_ALSA)
+ AC_SUBST(MOZ_ALSA_CFLAGS)
+ AC_SUBST(MOZ_ALSA_LIBS)
+@@ -5904,7 +6132,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad,
  if test "$MOZ_GAMEPAD"; then
      case "$OS_TARGET" in
      Darwin)
@@ -306,7 +382,7 @@ $NetBSD: patch-aa,v 1.30 2014/10/05 01:59:08 ryoon Exp $
          ;;
      WINNT)
          case "$MOZ_WINSDK_MAXVER" in
-@@ -8074,6 +8239,52 @@ if test "$USE_FC_FREETYPE"; then
+@@ -8014,6 +8244,52 @@ if test "$USE_FC_FREETYPE"; then
  fi
  
  dnl ========================================================
diff --git a/www/firefox/patches/patch-bi b/www/firefox/patches/patch-bi
deleted file mode 100644
index 38f841eb062..00000000000
--- a/www/firefox/patches/patch-bi
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bi,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- gfx/angle/src/compiler/osinclude.h.orig	2013-01-04 23:44:32.000000000 +0000
-+++ gfx/angle/src/compiler/osinclude.h
-@@ -16,6 +16,7 @@
- #define ANGLE_OS_WIN
- #elif defined(__APPLE__) || defined(__linux__) || \
-       defined(__FreeBSD__) || defined(__OpenBSD__) || \
-+      defined(__NetBSD__) || defined(__DragonFly__) || \
-       defined(__sun) || defined(ANDROID) || \
-       defined(__GLIBC__) || defined(__GNU__) || \
-       defined(__QNX__)
diff --git a/www/firefox/patches/patch-content_media_AudioStream.h b/www/firefox/patches/patch-content_media_AudioStream.h
index 71f2d58467c..0c088181a9e 100644
--- a/www/firefox/patches/patch-content_media_AudioStream.h
+++ b/www/firefox/patches/patch-content_media_AudioStream.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-content_media_AudioStream.h,v 1.7 2014/10/13 20:53:46 joerg Exp $
+$NetBSD: patch-content_media_AudioStream.h,v 1.8 2014/10/15 13:07:07 ryoon Exp $
 
---- content/media/AudioStream.h.orig	2014-09-24 01:05:11.000000000 +0000
+--- content/media/AudioStream.h.orig	2014-10-11 09:06:20.000000000 +0000
 +++ content/media/AudioStream.h
 @@ -17,6 +17,7 @@
  #include "mozilla/RefPtr.h"
@@ -10,14 +10,12 @@ $NetBSD: patch-content_media_AudioStream.h,v 1.7 2014/10/13 20:53:46 joerg Exp $
  
  template <>
  class nsAutoRefTraits<cubeb_stream> : public nsPointerRefTraits<cubeb_stream>
-@@ -25,10 +26,6 @@ public:
-   static void Release(cubeb_stream* aStream) { cubeb_stream_destroy(aStream); }
+@@ -26,7 +27,7 @@ public:
  };
  
--namespace soundtouch {
+ namespace soundtouch {
 -class SoundTouch;
--}
--
- namespace mozilla {
++class MOZ_IMPORT_API SoundTouch;
+ }
  
- class AudioStream;
+ namespace mozilla {
diff --git a/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in b/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in
index d854df35093..4babeb2c3d8 100644
--- a/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in
+++ b/www/firefox/patches/patch-intl_unicharutil_util_Makefile.in
@@ -1,12 +1,16 @@
-$NetBSD: patch-intl_unicharutil_util_Makefile.in,v 1.2 2014/04/30 15:07:18 ryoon Exp $
+$NetBSD: patch-intl_unicharutil_util_Makefile.in,v 1.3 2014/10/15 13:07:07 ryoon Exp $
 
---- intl/unicharutil/util/Makefile.in.orig	2014-04-18 02:03:03.000000000 +0000
+--- intl/unicharutil/util/Makefile.in.orig	2014-10-11 09:06:28.000000000 +0000
 +++ intl/unicharutil/util/Makefile.in
-@@ -23,3 +23,7 @@ ifdef _MSC_VER
- OS_COMPILE_CXXFLAGS += -Zl
- OS_COMPILE_CFLAGS += -Zl
+@@ -15,3 +15,11 @@ include $(topsrcdir)/config/rules.mk
+ ifdef ENABLE_INTL_API
+ LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
  endif
 +
 +ifdef MOZ_NATIVE_HARFBUZZ
 +CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
 +endif
++
++ifdef MOZ_NATIVE_HARFBUZZ
++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
++endif
diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h b/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h
index 425d862bb43..500fa4a786a 100644
--- a/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h
+++ b/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.4 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.5 2014/10/15 13:07:07 ryoon Exp $
 
---- ipc/chromium/src/base/process_util.h.orig	2013-09-10 03:43:34.000000000 +0000
+--- ipc/chromium/src/base/process_util.h.orig	2014-10-11 09:06:28.000000000 +0000
 +++ ipc/chromium/src/base/process_util.h
 @@ -13,7 +13,7 @@
  #if defined(OS_WIN)
@@ -21,12 +21,3 @@ $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.4 2014/02/20 13:19:03 r
  // TODO(port): we should not rely on a Win32 structure.
  struct ProcessEntry {
    int pid;
-@@ -316,7 +319,7 @@ class NamedProcessIterator {
- #if defined(OS_WIN)
-   HANDLE snapshot_;
-   bool started_iteration_;
--#elif defined(OS_LINUX) || defined(__GLIBC__)
-+#elif defined(OS_LINUX) || defined(__GLIBC__) || defined(OS_SOLARIS)
-   DIR *procfs_dir_;
- #elif defined(OS_BSD)
-   std::vector<ProcessEntry> content;
diff --git a/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
index dd0837d2c11..b6697e8e122 100644
--- a/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
+++ b/www/firefox/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
@@ -1,166 +1,17 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.1 2014/05/28 10:08:18 pho Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2014/10/15 13:07:07 ryoon Exp $
 
 Darwin does not provide kvm_getprocs(3). The code for OS_MACOSX is
 simply copied from process_util_mac.mm
 
---- ipc/chromium/src/base/process_util_bsd.cc.orig	2014-05-06 22:55:41.000000000 +0000
+--- ipc/chromium/src/base/process_util_bsd.cc.orig	2014-10-11 09:06:28.000000000 +0000
 +++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -15,7 +15,9 @@
+@@ -9,6 +9,9 @@
+ #include <sys/wait.h>
  
- #include <ctype.h>
  #include <fcntl.h>
 +#if defined(OS_BSD)
- #include <kvm.h>
++#include <kvm.h>
 +#endif
  #include <unistd.h>
  
  #include <string>
-@@ -311,6 +313,141 @@ void SetCurrentProcessPrivileges(ChildPr
- 
- #endif
- 
-+#if defined(OS_MACOSX)
-+NamedProcessIterator::NamedProcessIterator(const std::wstring& executable_name,
-+                                           const ProcessFilter* filter)
-+  : executable_name_(executable_name),
-+    index_of_kinfo_proc_(0),
-+    filter_(filter) {
-+  // Get a snapshot of all of my processes (yes, as we loop it can go stale, but
-+  // but trying to find where we were in a constantly changing list is basically
-+  // impossible.
-+
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, int(geteuid()) };
-+
-+  // Since more processes could start between when we get the size and when
-+  // we get the list, we do a loop to keep trying until we get it.
-+  bool done = false;
-+  int try_num = 1;
-+  const int max_tries = 10;
-+  do {
-+    // Get the size of the buffer
-+    size_t len = 0;
-+    if (sysctl(mib, arraysize(mib), NULL, &len, NULL, 0) < 0) {
-+      CHROMIUM_LOG(ERROR) << "failed to get the size needed for the process list";
-+      kinfo_procs_.resize(0);
-+      done = true;
-+    } else {
-+      size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+      // Leave some spare room for process table growth (more could show up
-+      // between when we check and now)
-+      num_of_kinfo_proc += 4;
-+      kinfo_procs_.resize(num_of_kinfo_proc);
-+      len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
-+      // Load the list of processes
-+      if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) {
-+        // If we get a mem error, it just means we need a bigger buffer, so
-+        // loop around again.  Anything else is a real error and give up.
-+        if (errno != ENOMEM) {
-+          CHROMIUM_LOG(ERROR) << "failed to get the process list";
-+          kinfo_procs_.resize(0);
-+          done = true;
-+        }
-+      } else {
-+        // Got the list, just make sure we're sized exactly right
-+        size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+        kinfo_procs_.resize(num_of_kinfo_proc);
-+        done = true;
-+      }
-+    }
-+  } while (!done && (try_num++ < max_tries));
-+
-+  if (!done) {
-+    CHROMIUM_LOG(ERROR) << "failed to collect the process list in a few tries";
-+    kinfo_procs_.resize(0);
-+  }
-+}
-+
-+NamedProcessIterator::~NamedProcessIterator() {
-+}
-+
-+const ProcessEntry* NamedProcessIterator::NextProcessEntry() {
-+  bool result = false;
-+  do {
-+    result = CheckForNextProcess();
-+  } while (result && !IncludeEntry());
-+
-+  if (result) {
-+    return &entry_;
-+  }
-+
-+  return NULL;
-+}
-+
-+bool NamedProcessIterator::CheckForNextProcess() {
-+  std::string executable_name_utf8(WideToUTF8(executable_name_));
-+
-+  std::string data;
-+  std::string exec_name;
-+
-+  for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
-+    kinfo_proc* kinfo = &kinfo_procs_[index_of_kinfo_proc_];
-+
-+    // Skip processes just awaiting collection
-+    if ((kinfo->kp_proc.p_pid > 0) && (kinfo->kp_proc.p_stat == SZOMB))
-+      continue;
-+
-+    int mib[] = { CTL_KERN, KERN_PROCARGS, kinfo->kp_proc.p_pid };
-+
-+    // Found out what size buffer we need
-+    size_t data_len = 0;
-+    if (sysctl(mib, arraysize(mib), NULL, &data_len, NULL, 0) < 0) {
-+      CHROMIUM_LOG(ERROR) << "failed to figure out the buffer size for a commandline";
-+      continue;
-+    }
-+
-+    data.resize(data_len);
-+    if (sysctl(mib, arraysize(mib), &data[0], &data_len, NULL, 0) < 0) {
-+      CHROMIUM_LOG(ERROR) << "failed to fetch a commandline";
-+      continue;
-+    }
-+
-+    // Data starts w/ the full path null termed, so we have to extract just the
-+    // executable name from the path.
-+
-+    size_t exec_name_end = data.find('\0');
-+    if (exec_name_end == std::string::npos) {
-+      CHROMIUM_LOG(ERROR) << "command line data didn't match expected format";
-+      continue;
-+    }
-+    size_t last_slash = data.rfind('/', exec_name_end);
-+    if (last_slash == std::string::npos)
-+      exec_name = data.substr(0, exec_name_end);
-+    else
-+      exec_name = data.substr(last_slash + 1, exec_name_end - last_slash - 1);
-+
-+    // Check the name
-+    if (executable_name_utf8 == exec_name) {
-+      entry_.pid = kinfo->kp_proc.p_pid;
-+      entry_.ppid = kinfo->kp_eproc.e_ppid;
-+      base::strlcpy(entry_.szExeFile, exec_name.c_str(),
-+                    sizeof(entry_.szExeFile));
-+      // Start w/ the next entry next time through
-+      ++index_of_kinfo_proc_;
-+      // Done
-+      return true;
-+    }
-+  }
-+  return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+  // Don't need to check the name, we did that w/in CheckForNextProcess.
-+  if (!filter_)
-+    return true;
-+  return filter_->Includes(entry_.pid, entry_.ppid);
-+}
-+#else
- NamedProcessIterator::NamedProcessIterator(const std::wstring& executable_name,
-                                            const ProcessFilter* filter)
- {
-@@ -370,5 +507,6 @@ const ProcessEntry* NamedProcessIterator
-   if (nextEntry >= content.size()) return NULL;
-   return &content[nextEntry++];
- }
-+#endif
- 
- }  // namespace base
diff --git a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 98d1d90157c..c9794ab016b 100644
--- a/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.8 2014/06/11 00:40:59 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.9 2014/10/15 13:07:07 ryoon Exp $
 
 * Just because OS_ARCH is Darwin does not mean MacOS X specific
   kludges are needed.
 
---- ipc/glue/GeckoChildProcessHost.cpp.orig	2014-05-29 23:30:53.000000000 +0000
+--- ipc/glue/GeckoChildProcessHost.cpp.orig	2014-10-11 09:06:28.000000000 +0000
 +++ ipc/glue/GeckoChildProcessHost.cpp
 @@ -4,7 +4,13 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -17,9 +17,9 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.8 2014/06/11 00:40:59 ryoo
 +_Pragma("GCC visibility pop")
 +#endif
  
- #if defined(XP_WIN) && defined(MOZ_CONTENT_SANDBOX)
- #include "sandboxBroker.h"
-@@ -548,7 +554,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+ #include "base/command_line.h"
+ #include "base/path_service.h"
+@@ -504,7 +510,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    // and passing wstrings from one config to the other is unsafe.  So
    // we split the logic here.
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.8 2014/06/11 00:40:59 ryoo
    base::environment_map newEnvVars;
    ChildPrivileges privs = mPrivileges;
    if (privs == base::PRIVILEGES_DEFAULT) {
-@@ -671,7 +677,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -643,7 +649,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    childArgv.push_back(pidstring);
  
  #if defined(MOZ_CRASHREPORTER)
@@ -37,7 +37,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.8 2014/06/11 00:40:59 ryoo
    int childCrashFd, childCrashRemapFd;
    if (!CrashReporter::CreateNotificationPipeForChild(
          &childCrashFd, &childCrashRemapFd))
-@@ -704,7 +710,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -676,7 +682,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    childArgv.push_back(childProcessType);
  
    base::LaunchApp(childArgv, mFileMap,
diff --git a/www/firefox/patches/patch-js_src_Makefile.in b/www/firefox/patches/patch-js_src_Makefile.in
index f5ee7f4fdd3..32c0f420d51 100644
--- a/www/firefox/patches/patch-js_src_Makefile.in
+++ b/www/firefox/patches/patch-js_src_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_Makefile.in,v 1.8 2014/07/24 14:57:12 ryoon Exp $
+$NetBSD: patch-js_src_Makefile.in,v 1.9 2014/10/15 13:07:07 ryoon Exp $
 
---- js/src/Makefile.in.orig	2014-07-17 01:45:18.000000000 +0000
+--- js/src/Makefile.in.orig	2014-10-11 09:06:29.000000000 +0000
 +++ js/src/Makefile.in
-@@ -20,8 +20,6 @@ run_for_side_effects := $(shell echo 'MA
+@@ -18,8 +18,6 @@ run_for_side_effects := $(shell echo 'MA
  STATIC_LIBRARY_NAME = js_static
  LIBS		= $(NSPR_LIBS)
  
@@ -10,8 +10,8 @@ $NetBSD: patch-js_src_Makefile.in,v 1.8 2014/07/24 14:57:12 ryoon Exp $
 -
  ifdef JS_STANDALONE
  SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
- endif
-@@ -226,7 +224,7 @@ endif
+ ifndef MOZ_NATIVE_ZLIB
+@@ -226,7 +224,7 @@ EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
  ifdef MOZ_SHARED_ICU
  EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
  else
@@ -19,8 +19,8 @@ $NetBSD: patch-js_src_Makefile.in,v 1.8 2014/07/24 14:57:12 ryoon Exp $
 +SHARED_LIBRARY_LIBS += $(filter-out -L% -l% -Wl%,$(MOZ_ICU_LIBS))
  endif
  
- # Prevent floating point errors caused by VC++ optimizations
-@@ -350,7 +348,7 @@ endif
+ ifeq ($(OS_ARCH),FreeBSD)
+@@ -344,7 +342,7 @@ endif
  
  ifdef HAVE_DTRACE
  $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
diff --git a/www/firefox/patches/patch-mb b/www/firefox/patches/patch-mb
deleted file mode 100644
index 491839768ac..00000000000
--- a/www/firefox/patches/patch-mb
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-mb,v 1.9 2014/03/20 21:02:00 ryoon Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2014-03-15 05:19:39.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -83,6 +83,39 @@ endif
- # SPARC
- ######################################################################
- #
-+# Linux/SPARC
-+#
-+ifeq ($(OS_ARCH),Linux)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+ASFILES		:= xptcinvoke_asm_sparc_linux_GCC3.s xptcstubs_asm_sparc_solaris.s
-+endif
-+endif
-+#
-+# NetBSD/SPARC
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
-+ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# OpenBSD/SPARC
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
-+ASFILES		:= xptcinvoke_asm_sparc_openbsd.s xptcstubs_asm_sparc_openbsd.s
-+endif
-+#
-+# OpenBSD/SPARC64
-+#
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
-+ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
-+endif
-+#
-+# NetBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
-+CPPSRCS                := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES                := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_netbsd.s
-+endif
-+#
- # Solaris/SPARC
- #
- ifeq ($(OS_ARCH),SunOS)
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
index fed47c5c560..bad45d0d925 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.3 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.4 2014/10/15 13:07:07 ryoon Exp $
 
---- media/libcubeb/src/cubeb_alsa.c.orig	2013-10-25 22:27:33.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig	2014-10-11 09:06:39.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
-@@ -6,6 +6,9 @@
+@@ -6,11 +6,15 @@
   */
  #undef NDEBUG
  #define _BSD_SOURCE
@@ -12,3 +12,532 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.3 2014/02/20 13:19:03 ryoon
  #define _XOPEN_SOURCE 500
  #include <pthread.h>
  #include <sys/time.h>
+ #include <assert.h>
+ #include <limits.h>
++#include <dlfcn.h>
+ #include <poll.h>
+ #include <unistd.h>
+ #include <alsa/asoundlib.h>
+@@ -24,6 +28,50 @@
+ 
+ #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
+ 
++#ifdef DISABLE_LIBASOUND_DLOPEN
++#define WRAP(x) x
++#else
++#define WRAP(x) cubeb_##x
++#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x
++MAKE_TYPEDEF(snd_config);
++MAKE_TYPEDEF(snd_config_add);
++MAKE_TYPEDEF(snd_config_copy);
++MAKE_TYPEDEF(snd_config_delete);
++MAKE_TYPEDEF(snd_config_get_id);
++MAKE_TYPEDEF(snd_config_get_string);
++MAKE_TYPEDEF(snd_config_imake_integer);
++MAKE_TYPEDEF(snd_config_search);
++MAKE_TYPEDEF(snd_config_search_definition);
++MAKE_TYPEDEF(snd_lib_error_set_handler);
++MAKE_TYPEDEF(snd_pcm_avail_update);
++MAKE_TYPEDEF(snd_pcm_close);
++MAKE_TYPEDEF(snd_pcm_delay);
++MAKE_TYPEDEF(snd_pcm_drain);
++MAKE_TYPEDEF(snd_pcm_frames_to_bytes);
++MAKE_TYPEDEF(snd_pcm_get_params);
++/* snd_pcm_hw_params_alloca is actually a macro */
++/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */
++MAKE_TYPEDEF(snd_pcm_hw_params_sizeof);
++#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
++MAKE_TYPEDEF(snd_pcm_hw_params_any);
++MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max);
++MAKE_TYPEDEF(snd_pcm_hw_params_get_rate);
++MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near);
++MAKE_TYPEDEF(snd_pcm_nonblock);
++MAKE_TYPEDEF(snd_pcm_open);
++MAKE_TYPEDEF(snd_pcm_open_lconf);
++MAKE_TYPEDEF(snd_pcm_pause);
++MAKE_TYPEDEF(snd_pcm_poll_descriptors);
++MAKE_TYPEDEF(snd_pcm_poll_descriptors_count);
++MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents);
++MAKE_TYPEDEF(snd_pcm_recover);
++MAKE_TYPEDEF(snd_pcm_set_params);
++MAKE_TYPEDEF(snd_pcm_state);
++MAKE_TYPEDEF(snd_pcm_writei);
++
++#undef MAKE_TYPEDEF
++#endif
++
+ /* ALSA is not thread-safe.  snd_pcm_t instances are individually protected
+    by the owning cubeb_stream's mutex.  snd_pcm_t creation and destruction
+    is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1),
+@@ -64,6 +112,8 @@ struct cubeb {
+      workaround is not required. */
+   snd_config_t * local_config;
+   int is_pa;
++
++  void * libasound;
+ };
+ 
+ enum stream_state {
+@@ -261,7 +311,7 @@ alsa_refill_stream(cubeb_stream * stm)
+ 
+   pthread_mutex_lock(&stm->mutex);
+ 
+-  r = snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
++  r = WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
+   if (r < 0 || revents != POLLOUT) {
+     /* This should be a stream error; it makes no sense for poll(2) to wake
+        for this stream and then have the stream report that it's not ready.
+@@ -270,10 +320,10 @@ alsa_refill_stream(cubeb_stream * stm)
+     return RUNNING;
+   }
+ 
+-  avail = snd_pcm_avail_update(stm->pcm);
++  avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+   if (avail == -EPIPE) {
+-    snd_pcm_recover(stm->pcm, avail, 1);
+-    avail = snd_pcm_avail_update(stm->pcm);
++    WRAP(snd_pcm_recover)(stm->pcm, avail, 1);
++    avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+   }
+ 
+   /* Failed to recover from an xrun, this stream must be broken. */
+@@ -292,8 +342,8 @@ alsa_refill_stream(cubeb_stream * stm)
+      available to write.  If avail is still zero here, the stream must be in
+      a funky state, so recover and try again. */
+   if (avail == 0) {
+-    snd_pcm_recover(stm->pcm, -EPIPE, 1);
+-    avail = snd_pcm_avail_update(stm->pcm);
++    WRAP(snd_pcm_recover)(stm->pcm, -EPIPE, 1);
++    avail = WRAP(snd_pcm_avail_update)(stm->pcm);
+     if (avail <= 0) {
+       pthread_mutex_unlock(&stm->mutex);
+       stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
+@@ -301,7 +351,7 @@ alsa_refill_stream(cubeb_stream * stm)
+     }
+   }
+ 
+-  p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail));
++  p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail));
+   assert(p);
+ 
+   pthread_mutex_unlock(&stm->mutex);
+@@ -313,10 +363,10 @@ alsa_refill_stream(cubeb_stream * stm)
+     return ERROR;
+   }
+   if (got > 0) {
+-    snd_pcm_sframes_t wrote = snd_pcm_writei(stm->pcm, p, got);
++    snd_pcm_sframes_t wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
+     if (wrote == -EPIPE) {
+-      snd_pcm_recover(stm->pcm, wrote, 1);
+-      wrote = snd_pcm_writei(stm->pcm, p, got);
++      WRAP(snd_pcm_recover)(stm->pcm, wrote, 1);
++      wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got);
+     }
+     assert(wrote >= 0 && wrote == got);
+     stm->write_position += wrote;
+@@ -328,7 +378,7 @@ alsa_refill_stream(cubeb_stream * stm)
+ 
+     /* Fill the remaining buffer with silence to guarantee one full period
+        has been written. */
+-    snd_pcm_writei(stm->pcm, (char *) p + got, avail - got);
++    WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got);
+ 
+     set_timeout(&stm->drain_timeout, buffer_time * 1000);
+ 
+@@ -439,26 +489,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+ 
+   slave_def = NULL;
+ 
+-  r = snd_config_search(root_pcm, "slave", &slave_pcm);
++  r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
+   if (r < 0) {
+     return NULL;
+   }
+ 
+-  r = snd_config_get_string(slave_pcm, &string);
++  r = WRAP(snd_config_get_string)(slave_pcm, &string);
+   if (r >= 0) {
+-    r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
+     if (r < 0) {
+       return NULL;
+     }
+   }
+ 
+   do {
+-    r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
++    r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
++    r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -467,7 +517,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm);
+     if (r < 0) {
+       break;
+     }
+@@ -476,7 +526,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+   } while (0);
+ 
+   if (slave_def) {
+-    snd_config_delete(slave_def);
++    WRAP(snd_config_delete)(slave_def);
+   }
+ 
+   return NULL;
+@@ -499,22 +549,22 @@ init_local_config_with_workaround(char c
+ 
+   lconf = NULL;
+ 
+-  if (snd_config == NULL) {
++  if (*WRAP(snd_config) == NULL) {
+     return NULL;
+   }
+ 
+-  r = snd_config_copy(&lconf, snd_config);
++  r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
+   if (r < 0) {
+     return NULL;
+   }
+ 
+   do {
+-    r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
++    r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_id(pcm_node, &string);
++    r = WRAP(snd_config_get_id)(pcm_node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -523,7 +573,7 @@ init_local_config_with_workaround(char c
+     if (r < 0 || r > (int) sizeof(node_name)) {
+       break;
+     }
+-    r = snd_config_search(lconf, node_name, &pcm_node);
++    r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
+     if (r < 0) {
+       break;
+     }
+@@ -534,12 +584,12 @@ init_local_config_with_workaround(char c
+     }
+ 
+     /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
+-    r = snd_config_search(pcm_node, "type", &node);
++    r = WRAP(snd_config_search)(pcm_node, "type", &node);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_get_string(node, &string);
++    r = WRAP(snd_config_get_string)(node, &string);
+     if (r < 0) {
+       break;
+     }
+@@ -550,18 +600,18 @@ init_local_config_with_workaround(char c
+ 
+     /* Don't clobber an explicit existing handle_underrun value, set it only
+        if it doesn't already exist. */
+-    r = snd_config_search(pcm_node, "handle_underrun", &node);
++    r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
+     if (r != -ENOENT) {
+       break;
+     }
+ 
+     /* Disable pcm_pulse's asynchronous underrun handling. */
+-    r = snd_config_imake_integer(&node, "handle_underrun", 0);
++    r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
+     if (r < 0) {
+       break;
+     }
+ 
+-    r = snd_config_add(pcm_node, node);
++    r = WRAP(snd_config_add)(pcm_node, node);
+     if (r < 0) {
+       break;
+     }
+@@ -569,7 +619,7 @@ init_local_config_with_workaround(char c
+     return lconf;
+   } while (0);
+ 
+-  snd_config_delete(lconf);
++  WRAP(snd_config_delete)(lconf);
+ 
+   return NULL;
+ }
+@@ -581,9 +631,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (local_config) {
+-    r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
++    r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);
+   } else {
+-    r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
++    r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+@@ -596,7 +646,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+   int r;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+-  r = snd_pcm_close(pcm);
++  r = WRAP(snd_pcm_close)(pcm);
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+ 
+   return r;
+@@ -653,12 +703,65 @@ alsa_init(cubeb ** context, char const *
+   pthread_attr_t attr;
+   snd_pcm_t * dummy;
+ 
++  void * libasound = NULL;
++
++#ifndef DISABLE_LIBASOUND_DLOPEN
++  libasound = dlopen("libasound.so", RTLD_LAZY);
++  if (!libasound) {
++    return CUBEB_ERROR;
++  }
++
++#define LOAD(x) do { \
++    cubeb_##x = dlsym(libasound, #x); \
++    if (!cubeb_##x) { \
++      dlclose(libasound); \
++      return CUBEB_ERROR; \
++    } \
++  } while(0)
++
++  LOAD(snd_config);
++  LOAD(snd_config_add);
++  LOAD(snd_config_copy);
++  LOAD(snd_config_delete);
++  LOAD(snd_config_get_id);
++  LOAD(snd_config_get_string);
++  LOAD(snd_config_imake_integer);
++  LOAD(snd_config_search);
++  LOAD(snd_config_search_definition);
++  LOAD(snd_lib_error_set_handler);
++  LOAD(snd_pcm_avail_update);
++  LOAD(snd_pcm_close);
++  LOAD(snd_pcm_delay);
++  LOAD(snd_pcm_drain);
++  LOAD(snd_pcm_frames_to_bytes);
++  LOAD(snd_pcm_get_params);
++  /* snd_pcm_hw_params_alloca is actually a macro */
++  /* LOAD(snd_pcm_hw_params_alloca); */
++  LOAD(snd_pcm_hw_params_sizeof);
++  LOAD(snd_pcm_hw_params_any);
++  LOAD(snd_pcm_hw_params_get_channels_max);
++  LOAD(snd_pcm_hw_params_get_rate);
++  LOAD(snd_pcm_hw_params_set_rate_near);
++  LOAD(snd_pcm_nonblock);
++  LOAD(snd_pcm_open);
++  LOAD(snd_pcm_open_lconf);
++  LOAD(snd_pcm_pause);
++  LOAD(snd_pcm_poll_descriptors);
++  LOAD(snd_pcm_poll_descriptors_count);
++  LOAD(snd_pcm_poll_descriptors_revents);
++  LOAD(snd_pcm_recover);
++  LOAD(snd_pcm_set_params);
++  LOAD(snd_pcm_state);
++  LOAD(snd_pcm_writei);
++
++#undef LOAD
++#endif
+   assert(context);
+   *context = NULL;
+ 
+   pthread_mutex_lock(&cubeb_alsa_mutex);
+   if (!cubeb_alsa_error_handler_set) {
+-    snd_lib_error_set_handler(silent_error_handler);
++    WRAP(snd_lib_error_set_handler)(silent_error_handler);
+     cubeb_alsa_error_handler_set = 1;
+   }
+   pthread_mutex_unlock(&cubeb_alsa_mutex);
+@@ -666,6 +769,8 @@ alsa_init(cubeb ** context, char const *
+   ctx = calloc(1, sizeof(*ctx));
+   assert(ctx);
+ 
++  ctx->libasound = libasound;
++
+   ctx->ops = &alsa_ops;
+ 
+   r = pthread_mutex_init(&ctx->mutex, NULL);
+@@ -715,7 +820,7 @@ alsa_init(cubeb ** context, char const *
+        config fails with EINVAL, the PA PCM is too old for this workaround. */
+     if (r == -EINVAL) {
+       pthread_mutex_lock(&cubeb_alsa_mutex);
+-      snd_config_delete(ctx->local_config);
++      WRAP(snd_config_delete)(ctx->local_config);
+       pthread_mutex_unlock(&cubeb_alsa_mutex);
+       ctx->local_config = NULL;
+     } else if (r >= 0) {
+@@ -754,9 +859,13 @@ alsa_destroy(cubeb * ctx)
+   pthread_mutex_destroy(&ctx->mutex);
+   free(ctx->fds);
+ 
++  if (ctx->libasound) {
++    dlclose(ctx->libasound);
++  }
++
+   if (ctx->local_config) {
+     pthread_mutex_lock(&cubeb_alsa_mutex);
+-    snd_config_delete(ctx->local_config);
++    WRAP(snd_config_delete)(ctx->local_config);
+     pthread_mutex_unlock(&cubeb_alsa_mutex);
+   }
+ 
+@@ -823,7 +932,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+     return CUBEB_ERROR;
+   }
+ 
+-  r = snd_pcm_nonblock(stm->pcm, 1);
++  r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
+   assert(r == 0);
+ 
+   /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
+@@ -833,23 +942,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+     latency = latency < 500 ? 500 : latency;
+   }
+ 
+-  r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+-                         stm->params.channels, stm->params.rate, 1,
+-                         latency * 1000);
++  r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
++                               stm->params.channels, stm->params.rate, 1,
++                               latency * 1000);
+   if (r < 0) {
+     alsa_stream_destroy(stm);
+     return CUBEB_ERROR_INVALID_FORMAT;
+   }
+ 
+-  r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &stm->period_size);
++  r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &stm->period_size);
+   assert(r == 0);
+ 
+-  stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
++  stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
+   assert(stm->nfds > 0);
+ 
+   stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
+   assert(stm->saved_fds);
+-  r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
++  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
+   assert((nfds_t) r == stm->nfds);
+ 
+   r = pthread_cond_init(&stm->cond, NULL);
+@@ -880,7 +989,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+   pthread_mutex_lock(&stm->mutex);
+   if (stm->pcm) {
+     if (stm->state == DRAINING) {
+-      snd_pcm_drain(stm->pcm);
++      WRAP(snd_pcm_drain)(stm->pcm);
+     }
+     alsa_locked_pcm_close(stm->pcm);
+     stm->pcm = NULL;
+@@ -922,12 +1031,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
+     return CUBEB_ERROR;
+   }
+ 
+-  rv = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (rv < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (rv < 0) {
+     return CUBEB_ERROR;
+   }
+@@ -947,34 +1056,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+ 
+   /* get a pcm, disabling resampling, so we get a rate the
+    * hardware/dmix/pulse/etc. supports. */
+-  rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
++  rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+   if (rv < 0) {
+     return CUBEB_ERROR;
+   }
+ 
+-  rv = snd_pcm_hw_params_any(pcm, hw_params);
++  rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (rv < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (rv >= 0) {
+     /* There is a default rate: use it. */
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_OK;
+   }
+ 
+   /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
+   *rate = 44100;
+ 
+-  rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (rv < 0) {
+-    snd_pcm_close(pcm);
++    WRAP(snd_pcm_close)(pcm);
+     return CUBEB_ERROR;
+   }
+ 
+-  snd_pcm_close(pcm);
++  WRAP(snd_pcm_close)(pcm);
+ 
+   return CUBEB_OK;
+ }
+@@ -998,7 +1107,7 @@ alsa_stream_start(cubeb_stream * stm)
+   ctx = stm->context;
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 0);
++  WRAP(snd_pcm_pause)(stm->pcm, 0);
+   gettimeofday(&stm->last_activity, NULL);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+@@ -1032,7 +1141,7 @@ alsa_stream_stop(cubeb_stream * stm)
+   pthread_mutex_unlock(&ctx->mutex);
+ 
+   pthread_mutex_lock(&stm->mutex);
+-  snd_pcm_pause(stm->pcm, 1);
++  WRAP(snd_pcm_pause)(stm->pcm, 1);
+   pthread_mutex_unlock(&stm->mutex);
+ 
+   return CUBEB_OK;
+@@ -1048,8 +1157,8 @@ alsa_stream_get_position(cubeb_stream * 
+   pthread_mutex_lock(&stm->mutex);
+ 
+   delay = -1;
+-  if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
+-      snd_pcm_delay(stm->pcm, &delay) != 0) {
++  if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
++      WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
+     *position = stm->last_position;
+     pthread_mutex_unlock(&stm->mutex);
+     return CUBEB_OK;
+@@ -1074,7 +1183,7 @@ alsa_stream_get_latency(cubeb_stream * s
+   snd_pcm_sframes_t delay;
+   /* This function returns the delay in frames until a frame written using
+      snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */
+-  if (snd_pcm_delay(stm->pcm, &delay)) {
++  if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
+     return CUBEB_ERROR;
+   }
+ 
diff --git a/www/firefox/patches/patch-media_libcubeb_src_moz.build b/www/firefox/patches/patch-media_libcubeb_src_moz.build
index aa4e4db390f..6ad39e4ac60 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_moz.build
+++ b/www/firefox/patches/patch-media_libcubeb_src_moz.build
@@ -1,10 +1,23 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.1 2014/05/30 03:03:36 pho Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.2 2014/10/15 13:07:07 ryoon Exp $
 
 Don't assume cocoa toolkit just because OS_TARGET is Darwin.
 
---- media/libcubeb/src/moz.build.orig	2014-05-06 22:56:07.000000000 +0000
+--- media/libcubeb/src/moz.build.orig	2014-10-11 09:06:39.000000000 +0000
 +++ media/libcubeb/src/moz.build
-@@ -28,7 +28,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD':
+@@ -16,6 +16,12 @@ if CONFIG['MOZ_ALSA']:
+     ]
+     DEFINES['USE_ALSA'] = True
+ 
++if CONFIG['MOZ_OSS']:
++    SOURCES += [
++        'cubeb_oss.c',
++    ]
++    DEFINES['USE_OSS'] = True
++
+ if CONFIG['MOZ_PULSEAUDIO']:
+     SOURCES += [
+         'cubeb_pulse.c',
+@@ -30,7 +36,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD':
      ]
      DEFINES['USE_SNDIO'] = True
  
@@ -13,3 +26,9 @@ Don't assume cocoa toolkit just because OS_TARGET is Darwin.
      SOURCES += [
          'cubeb_audiounit.c',
      ]
+@@ -71,4 +77,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
+         ]
+     ]
+ 
++CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
+ FAIL_ON_WARNINGS = True
diff --git a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in
index 570fad93a08..7cb6977b373 100644
--- a/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in
+++ b/www/firefox/patches/patch-media_webrtc_signaling_test_Makefile.in
@@ -1,16 +1,16 @@
-$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.6 2014/04/30 15:07:18 ryoon Exp $
+$NetBSD: patch-media_webrtc_signaling_test_Makefile.in,v 1.7 2014/10/15 13:07:07 ryoon Exp $
 
---- media/webrtc/signaling/test/Makefile.in.orig	2014-04-18 02:03:51.000000000 +0000
+--- media/webrtc/signaling/test/Makefile.in.orig	2014-10-11 09:06:40.000000000 +0000
 +++ media/webrtc/signaling/test/Makefile.in
-@@ -7,6 +7,7 @@ LIBS = \
-   $(NSPR_LIBS) \
+@@ -8,6 +8,7 @@ LIBS = \
    $(NSS_LIBS) \
+   $(MOZ_WEBRTC_X11_LIBS) \
    $(REALTIME_LIBS) \
 +  $(MOZ_LIBV4L2_LIBS) \
    $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
    $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
    $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
-@@ -43,6 +44,12 @@ LIBS += \
+@@ -49,6 +50,12 @@ LIBS += \
    $(NULL)
  endif
  
diff --git a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
index ebf6bf6a07e..9b8c65d271d 100644
--- a/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
+++ b/www/firefox/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.5 2014/10/05 01:59:08 ryoon Exp $
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.6 2014/10/15 13:07:07 ryoon Exp $
 
---- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig	2014-09-24 01:05:32.000000000 +0000
+--- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig	2014-10-11 09:06:41.000000000 +0000
 +++ media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
 @@ -7,6 +7,9 @@
  # be found in the AUTHORS file in the root of the source tree.
@@ -12,7 +12,7 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
    'targets': [
      {
        'target_name': 'video_capture_module',
-@@ -46,6 +49,16 @@
+@@ -46,6 +49,19 @@
                  'linux/video_capture_linux.cc',
                  'linux/video_capture_linux.h',
                ],
@@ -21,6 +21,9 @@ $NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.g
 +                  'defines': [
 +                    'HAVE_LIBV4L2',
 +                  ],
++                  'cflags_mozilla': [
++                    '$(MOZ_LIBV4L2_CFLAGS)',
++                  ],
 +                  'libraries': [
 +                    '-lv4l2',
 +                  ],
diff --git a/www/firefox/patches/patch-mfbt_Attributes.h b/www/firefox/patches/patch-mfbt_Attributes.h
index fa549e6b960..58636ab1292 100644
--- a/www/firefox/patches/patch-mfbt_Attributes.h
+++ b/www/firefox/patches/patch-mfbt_Attributes.h
@@ -1,8 +1,16 @@
-$NetBSD: patch-mfbt_Attributes.h,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+$NetBSD: patch-mfbt_Attributes.h,v 1.2 2014/10/15 13:07:07 ryoon Exp $
 
---- mfbt/Attributes.h.orig	2014-07-17 01:45:32.000000000 +0000
+--- mfbt/Attributes.h.orig	2014-10-11 09:06:41.000000000 +0000
 +++ mfbt/Attributes.h
-@@ -54,6 +54,9 @@
+@@ -51,6 +51,7 @@
+  * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
+  */
+ #  if _MSC_VER >= 1800
++#    define MOZ_HAVE_CXX11_ALIGNAS
+ #    define MOZ_HAVE_CXX11_DELETE
+ #  endif
+ #  if _MSC_VER >= 1700
+@@ -74,6 +75,9 @@
  #  ifndef __has_extension
  #    define __has_extension __has_feature /* compatibility, for older versions of clang */
  #  endif
@@ -12,7 +20,7 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.1 2014/07/24 14:57:12 ryoon Exp $
  #  if __has_extension(cxx_constexpr)
  #    define MOZ_HAVE_CXX11_CONSTEXPR
  #  endif
-@@ -75,6 +78,9 @@
+@@ -95,6 +99,9 @@
  #  endif
  #elif defined(__GNUC__)
  #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
@@ -22,11 +30,3 @@ $NetBSD: patch-mfbt_Attributes.h,v 1.1 2014/07/24 14:57:12 ryoon Exp $
  #    if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
  #      define MOZ_HAVE_CXX11_OVERRIDE
  #      define MOZ_HAVE_CXX11_FINAL       final
-@@ -96,6 +102,7 @@
- #  define MOZ_HAVE_NORETURN              __attribute__((noreturn))
- #elif defined(_MSC_VER)
- #  if _MSC_VER >= 1800
-+#    define MOZ_HAVE_CXX11_ALIGNAS
- #    define MOZ_HAVE_CXX11_DELETE
- #  endif
- #  if _MSC_VER >= 1700
diff --git a/www/firefox/patches/patch-mfbt_Poison.cpp b/www/firefox/patches/patch-mfbt_Poison.cpp
index eac27861cad..e880dd530ee 100644
--- a/www/firefox/patches/patch-mfbt_Poison.cpp
+++ b/www/firefox/patches/patch-mfbt_Poison.cpp
@@ -1,19 +1,20 @@
-$NetBSD: patch-mfbt_Poison.cpp,v 1.4 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-mfbt_Poison.cpp,v 1.5 2014/10/15 13:07:07 ryoon Exp $
 
 * Use posix_madvise(3) instead of madvise(3) for Solaris/SunOS.
   Solaris/SunOS's madvise(3) is not enabled in this context,
   and its first argument type is different from NetBSD/Linux's one.
 
---- mfbt/Poison.cpp.orig	2013-09-11 03:22:45.000000000 +0000
+--- mfbt/Poison.cpp.orig	2014-10-11 09:06:41.000000000 +0000
 +++ mfbt/Poison.cpp
-@@ -125,7 +125,11 @@ ReleaseRegion(void *region, uintptr_t si
+@@ -129,7 +129,11 @@ ReleaseRegion(void* aRegion, uintptr_t a
  static bool
- ProbeRegion(uintptr_t region, uintptr_t size)
+ ProbeRegion(uintptr_t aRegion, uintptr_t aSize)
  {
+-  if (madvise(reinterpret_cast<void*>(aRegion), aSize, MADV_NORMAL)) {
 +#if !defined(__sun__)
-   if (madvise(reinterpret_cast<void*>(region), size, MADV_NORMAL)) {
++  if (madvise(reinterpret_cast<void*>(aRegion), aSize, MADV_NORMAL)) {
 +#else
-+  if (posix_madvise(reinterpret_cast<void*>(region), size, MADV_NORMAL)) {
++  if (posix_madvise(reinterpret_cast<void*>(aRegion), aSize, MADV_NORMAL)) {
 +#endif
      return true;
    } else {
diff --git a/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
index 8eadb48aeca..7ef098cca3c 100644
--- a/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
+++ b/www/firefox/patches/patch-security_manager_ssl_src_nsNSSComponent.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-security_manager_ssl_src_nsNSSComponent.cpp,v 1.4 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-security_manager_ssl_src_nsNSSComponent.cpp,v 1.5 2014/10/15 13:07:07 ryoon Exp $
 
---- security/manager/ssl/src/nsNSSComponent.cpp.orig	2013-09-10 03:43:51.000000000 +0000
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	2014-10-11 09:06:44.000000000 +0000
 +++ security/manager/ssl/src/nsNSSComponent.cpp
-@@ -49,6 +49,7 @@
- 
+@@ -53,6 +53,7 @@
  #include "nss.h"
+ #include "pkix/pkixnss.h"
  #include "ssl.h"
 +#define NSS_ENABLE_ECC 1
  #include "sslproto.h"
  #include "secmod.h"
- #include "secmime.h"
+ #include "secerr.h"
diff --git a/www/firefox/patches/patch-storage_src_moz.build b/www/firefox/patches/patch-storage_src_moz.build
deleted file mode 100644
index 9d3dda749eb..00000000000
--- a/www/firefox/patches/patch-storage_src_moz.build
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-storage_src_moz.build,v 1.1 2014/07/24 14:57:12 ryoon Exp $
-
---- storage/src/moz.build.orig	2014-07-17 01:45:38.000000000 +0000
-+++ storage/src/moz.build
-@@ -48,11 +48,14 @@ FINAL_LIBRARY = 'storagecomps'
- # (such as NSS) might trigger an initialization of sqlite and allocation
- # of memory using the default allocator, prior to the storage service
- # registering its allocator, causing memory management failures (bug 938730).
-+# However, this is not an issue if both the jemalloc allocator and the default
-+# allocator are the same thing.
- #
- # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
- # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
- # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
--if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
-+if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
-+                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
-     if CONFIG['OS_TARGET'] != 'Android':
-         DEFINES['MOZ_STORAGE_MEMORY'] = True
- 
diff --git a/www/firefox/patches/patch-toolkit_library_libxul.mk b/www/firefox/patches/patch-toolkit_library_libxul.mk
index 310a5beecae..dcb176cdfaf 100644
--- a/www/firefox/patches/patch-toolkit_library_libxul.mk
+++ b/www/firefox/patches/patch-toolkit_library_libxul.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-toolkit_library_libxul.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $
+$NetBSD: patch-toolkit_library_libxul.mk,v 1.2 2014/10/15 13:07:07 ryoon Exp $
 
---- toolkit/library/libxul.mk.orig	2014-07-17 01:45:41.000000000 +0000
+--- toolkit/library/libxul.mk.orig	2014-10-11 09:06:48.000000000 +0000
 +++ toolkit/library/libxul.mk
 @@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL
  EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
@@ -37,7 +37,7 @@ $NetBSD: patch-toolkit_library_libxul.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $
  ifdef MOZ_NATIVE_LIBEVENT
  EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
  endif
-@@ -89,12 +117,24 @@ ifndef MOZ_TREE_PIXMAN
+@@ -89,12 +117,28 @@ ifndef MOZ_TREE_PIXMAN
  EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
  endif
  
@@ -53,16 +53,31 @@ $NetBSD: patch-toolkit_library_libxul.mk,v 1.1 2014/07/24 14:57:12 ryoon Exp $
  EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib)
  endif
  
- EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
+ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DEPTH)/layout/media)
  
 +ifdef MOZ_LIBV4L2_LIBS
 +EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS)
 +endif
 +
++ifdef MOZ_LIBV4L2_LIBS
++EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS)
++endif
++
  ifdef MOZ_WEBRTC
  ifeq (WINNT,$(OS_TARGET))
  ifndef MOZ_HAS_WINSDK_WITH_D3D
-@@ -231,7 +271,7 @@ ifdef MOZ_ENABLE_QT
+@@ -106,6 +150,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32
+ endif
+ endif
+ 
++ifdef MOZ_OSS
++EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS)
++endif
++
+ ifdef MOZ_ALSA
+ EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+ endif
+@@ -223,7 +271,7 @@ ifdef MOZ_ENABLE_QT
  EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS)
  endif
  
diff --git a/www/firefox/patches/patch-xb b/www/firefox/patches/patch-xb
deleted file mode 100644
index a530a7b4bdd..00000000000
--- a/www/firefox/patches/patch-xb
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-xb,v 1.5 2014/02/20 13:19:03 ryoon Exp $
-
-NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig	2013-01-09 15:25:54.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp
-@@ -0,0 +1,84 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ *
-+ * The contents of this file are subject to the Netscape Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation.  Portions created by Netscape are
-+ * Copyright (C) 1998 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s): 
-+ */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc64__) && !defined(_LP64)
-+#error "This code is for Sparc64 only"
-+#endif
-+
-+extern "C" PRUint32
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)      = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/www/firefox/patches/patch-xc b/www/firefox/patches/patch-xc
deleted file mode 100644
index 22d8e866d88..00000000000
--- a/www/firefox/patches/patch-xc
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-xc,v 1.5 2014/02/20 13:19:03 ryoon Exp $
-
-NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig	2013-01-09 15:25:54.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s
-@@ -0,0 +1,66 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ *
-+ * The contents of this file are subject to the Netscape Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation.  Portions created by Netscape are
-+ * Copyright (C) 1999 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s): 
-+ */
-+
-+        .global SharedStub
-+
-+/*
-+    in the frame for the function that called SharedStub are the
-+    rest of the parameters we need
-+
-+*/
-+
-+SharedStub:
-+! we don't create a new frame yet, but work within the frame of the calling
-+! function to give ourselves the other parameters we want
-+
-+	mov	%o0, %o1	       ! shuffle the index up to 2nd place
-+	mov	%i0, %o0	       ! the original 'this'
-+	add	%fp, 0x7ff + 136, %o2  ! previous stack top adjusted to the first argument slot (beyond 'this')
-+
-+! save off the original incoming parameters that arrived in 
-+! registers, the ABI guarantees the space for us to do this
-+	stx	%i1, [%fp + 0x7ff + 136]
-+	stx	%i2, [%fp + 0x7ff + 144]
-+	stx	%i3, [%fp + 0x7ff + 152]
-+	stx	%i4, [%fp + 0x7ff + 160]
-+	stx	%i5, [%fp + 0x7ff + 168]
-+! now we can build our own stack frame
-+	save	%sp,-(128 + 64),%sp    ! room for the register window and
-+				       ! struct pointer, rounded up to 0 % 64
-+! our function now appears to have been called
-+! as SharedStub(nsISupports* that, PRUint32 index, PRUint32* args)
-+! so we can just copy these through
-+
-+	mov	%i0, %o0
-+	mov	%i1, %o1
-+	mov	%i2, %o2
-+	call	PrepareAndDispatch
-+	 nop
-+	mov	%o0,%i0 	    ! propagate return value
-+	b .LL1
-+	 nop
-+.LL1:
-+	ret
-+	 restore
-+
-+       .size	SharedStub, .-SharedStub
-+       .type	SharedStub, #function
diff --git a/www/firefox/patches/patch-xe b/www/firefox/patches/patch-xe
deleted file mode 100644
index 8b240dbc3c7..00000000000
--- a/www/firefox/patches/patch-xe
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-xe,v 1.5 2014/02/20 13:19:03 ryoon Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2013-01-04 23:44:47.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
-@@ -100,6 +100,15 @@ extern "C" {
-     }
- }
- 
-+/*
-+ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF
-+ */
-+#ifndef __ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
-+
- XPTC_PUBLIC_API(nsresult)
- XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-                    uint32_t paramCount, nsXPTCVariant* params)
-@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, ui
-     uint32_t result;
- 
-  __asm__ __volatile__(
--    "movl  %4, sp@-\n\t"
--    "movl  %3, sp@-\n\t"
--    "jbsr  _invoke_count_words\n\t"     /* count words */
--    "addql #8, sp\n\t"
--    "lsll  #2, d0\n\t"      /* *= 4 */
--    "movl  sp, a2\n\t"	    /* save original sp */
--    "subl  d0, sp\n\t"      /* make room for params */
--    "movl  sp, a0\n\t"
--    "movl  %4, sp@-\n\t"
--    "movl  %3, sp@-\n\t"
--    "movl  a0, sp@-\n\t"
--    "jbsr  _invoke_copy_to_stack\n\t"   /* copy params */
--    "addl  #12, sp\n\t"
--    "movl  %1, a0\n\t"
--    "movl  a0@, a1\n\t"
--    "movl  %2, d0\n\t"      /* function index */
--    "movl  a0, d1\n\t"
--    "movw  a1@(8,d0:l:8), a0\n\t"
--    "addl  a0, d1\n\t"
--    "movl  a1@(12,d0:l:8), a1\n\t"
--    "movl  d1, sp@-\n\t"
--    "jbsr  a1@\n\t"
--    "movl  a2, sp\n\t"	    /* restore original sp */
--    "movl  d0, %0\n\t"
-+    "movl  %4, %%sp@-\n\t"
-+    "movl  %3, %%sp@-\n\t"
-+    "jbsr  "SYMBOLPREFIX"invoke_count_words\n\t"     /* count words */
-+    "addql #8, %%sp\n\t"
-+    "lsll  #2, %%d0\n\t"      /* *= 4 */
-+    "movl  %%sp, %%a2\n\t"         /* save original sp */
-+    "subl  %%d0, %%sp\n\t"      /* make room for params */
-+    "movl  %%sp, %%a0\n\t"
-+    "movl  %4, %%sp@-\n\t"
-+    "movl  %3, %%sp@-\n\t"
-+    "movl  %%a0, %%sp@-\n\t"
-+    "jbsr  "SYMBOLPREFIX"invoke_copy_to_stack\n\t"   /* copy params */
-+    "addl  #12, %%sp\n\t"
-+    "movl  %1, %%a0\n\t"
-+    "movl  %%a0@, %%a1\n\t"
-+    "movl  %2, %%d0\n\t"      /* function index */
-+    "movl  %%a0, %%d1\n\t"
-+    "movw  %%a1@(8,%%d0:l:8), %%a0\n\t"
-+    "addl  %%a0, %%d1\n\t"
-+    "movl  %%a1@(12,%%d0:l:8), %%a1\n\t"
-+    "movl  %%d1, %%sp@-\n\t"
-+    "jbsr  %%a1@\n\t"
-+    "movl  %%a2, %%sp\n\t"         /* restore original sp */
-+    "movl  %%d0, %0\n\t"
-     : "=g" (result)         /* %0 */
-     : "g" (that),           /* %1 */
-       "g" (methodIndex),    /* %2 */
diff --git a/www/firefox/patches/patch-xf b/www/firefox/patches/patch-xf
deleted file mode 100644
index 52a6ca971bd..00000000000
--- a/www/firefox/patches/patch-xf
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-xf,v 1.5 2014/02/20 13:19:03 ryoon Exp $
-
-NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae.
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	2013-01-04 23:44:47.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
-@@ -91,17 +91,27 @@ extern "C" {
-     }
- }
- 
-+/*
-+ * Beware: use % instead of %% for register identifiers in a preprocessor macro
-+ * SYMBOL PREFIX must be "_" for aout and "" for ELF 
-+ */
-+#ifndef	__ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
-+
- #define STUB_ENTRY(n)							\
- __asm__(								\
--    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
--"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
--    "link  a6,#0			\n\t"				\
--    "lea   a6@(12), a0			\n\t"	/* pointer to args */	\
--    "movl  a0, sp@-			\n\t"				\
--    "movl  #"#n", sp@-			\n\t"	/* method index */	\
--    "movl  a6@(8), sp@-			\n\t"	/* this */		\
--    "jbsr  _PrepareAndDispatch		\n\t"				\
--    "unlk  a6				\n\t"				\
-+    ".global   "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"           \
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"                          \
-+    "link  %a6,#0                      \n\t"                           \
-+    "lea   %a6@(12), %a0               \n\t"   /* pointer to args */   \
-+    "movl  %a0, %sp@-                  \n\t"                           \
-+    "movl  #"#n", %sp@-                        \n\t"   /* method index */      \
-+    "movl  %a6@(8), %sp@-              \n\t"   /* this */              \
-+    "jbsr  "SYMBOLPREFIX"PrepareAndDispatch\n\t"                       \
-+    "unlk  %a6                         \n\t"                           \
-     "rts				\n\t"				\
- );
- 
diff --git a/www/firefox/patches/patch-xg b/www/firefox/patches/patch-xg
deleted file mode 100644
index a3460d30e08..00000000000
--- a/www/firefox/patches/patch-xg
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-xg,v 1.5 2014/02/20 13:19:03 ryoon Exp $
-
-NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm.
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig	2013-01-04 23:44:47.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
-@@ -86,18 +86,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-  * so they are contiguous with values passed on the stack, and then calls
-  * PrepareAndDispatch() to do the dirty work.
-  */
-+#ifndef	__ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
- 
- #define STUB_ENTRY(n)							\
- __asm__(								\
--    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
--"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
-+    ".global	"SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"		\
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"				\
-     "stmfd	sp!, {r1, r2, r3}	\n\t"				\
-     "mov	ip, sp			\n\t"				\
-     "stmfd	sp!, {fp, ip, lr, pc}	\n\t"				\
-     "sub	fp, ip, #4		\n\t"				\
-     "mov	r1, #"#n"		\n\t"    /* = methodIndex 	*/ \
-     "add	r2, sp, #16		\n\t"				\
--    "bl		_PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
-+    "bl		"SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
-     "ldmea	fp, {fp, sp, lr}	\n\t"				\
-     "add	sp, sp, #12		\n\t"				\
-     "mov	pc, lr			\n\t"				\
diff --git a/www/firefox/patches/patch-xl b/www/firefox/patches/patch-xl
deleted file mode 100644
index c1e454ee9cf..00000000000
--- a/www/firefox/patches/patch-xl
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-xl,v 1.6 2014/02/20 13:19:03 ryoon Exp $
-
-NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2014-02-12 21:29:26.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -20,15 +20,15 @@
- 		      
-         .section ".text"
- 	.align 2
--	.globl XPTC_InvokeByIndex
--	.type  XPTC_InvokeByIndex,@function
-+	.globl NS_InvokeByIndex_P
-+	.type  NS_InvokeByIndex_P,@function
- 
- #
--# XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
--#                    uint32_t paramCount, nsXPTCVariant* params)
-+# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+#                    PRUint32 paramCount, nsXPTCVariant* params)
- #
- 
--XPTC_InvokeByIndex:
-+NS_InvokeByIndex_P:
- 	stwu    sp,-32(sp)			# setup standard stack frame
- 	mflr    r0				# save LR
- 	stw     r3,8(sp)			# r3 <= that
diff --git a/www/firefox/patches/patch-xm b/www/firefox/patches/patch-xm
deleted file mode 100644
index c9958e85f1f..00000000000
--- a/www/firefox/patches/patch-xm
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-xm,v 1.5 2014/02/20 13:19:03 ryoon Exp $
-
-NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2013-01-04 23:44:47.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -5,9 +5,9 @@
- 
- // Platform specific code to invoke XPCOM methods on native objects
- 
--// The purpose of XPTC_InvokeByIndex() is to map a platform
-+// The purpose of NS_InvokeByIndex_P() is to map a platform
- // indepenpent call to the platform ABI. To do that,
--// XPTC_InvokeByIndex() has to determine the method to call via vtable
-+// NS_InvokeByIndex_P() has to determine the method to call via vtable
- // access. The parameters for the method are read from the
- // nsXPTCVariant* and prepared for the native ABI.  For the Linux/PPC
- // ABI this means that the first 8 integral and floating point
-@@ -69,8 +69,10 @@ invoke_copy_to_stack(uint32_t* d,
-                 if ((uint32_t) d & 4) d++; // doubles are 8-byte aligned on stack
-                 *((double*) d) = s->val.d;
-                 d += 2;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 2;
-+#endif
-             }
-         }
-         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -79,8 +81,10 @@ invoke_copy_to_stack(uint32_t* d,
-             else {
-                 *((float*) d) = s->val.f;
- 		d += 1;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 1;
-+#endif
- 	    }
-         }
-         else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-@@ -107,6 +111,6 @@ invoke_copy_to_stack(uint32_t* d,
- }
- 
- extern "C"
--XPTC_PUBLIC_API(nsresult)
--XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-                    uint32_t paramCount, nsXPTCVariant* params);
diff --git a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
deleted file mode 100644
index aa3f45ec8a3..00000000000
--- a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-xpcom_base_nsUUIDGenerator.cpp,v 1.5 2014/10/05 01:59:08 ryoon Exp $
-
---- xpcom/base/nsUUIDGenerator.cpp.orig	2014-09-24 01:05:41.000000000 +0000
-+++ xpcom/base/nsUUIDGenerator.cpp
-@@ -16,6 +16,10 @@
- 
- #include "nsUUIDGenerator.h"
- 
-+#ifdef ANDROID
-+extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
-+#endif
-+
- using namespace mozilla;
- 
- NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator)
-@@ -35,7 +39,7 @@ nsUUIDGenerator::Init()
-   // We're a service, so we're guaranteed that Init() is not going
-   // to be reentered while we're inside Init().
- 
--#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
-   /* initialize random number generator using NSPR random noise */
-   unsigned int seed;
- 
-@@ -72,7 +76,7 @@ nsUUIDGenerator::Init()
-   }
- #endif
- 
--#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
- 
-   return NS_OK;
- }
-@@ -122,13 +126,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
-    * back to it; instead, we use the value returned when we called
-    * initstate, since older glibc's have broken setstate() return values
-    */
--#ifndef ANDROID
-+#ifndef HAVE_ARC4RANDOM
-   setstate(mState);
- #endif
- 
-+#ifdef HAVE_ARC4RANDOM_BUF
-+  arc4random_buf(aId, sizeof(nsID));
-+#else /* HAVE_ARC4RANDOM_BUF */
-   size_t bytesLeft = sizeof(nsID);
-   while (bytesLeft > 0) {
--#ifdef ANDROID
-+#ifdef HAVE_ARC4RANDOM
-     long rval = arc4random();
-     const size_t mRBytes = 4;
- #else
-@@ -150,6 +157,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
- 
-     bytesLeft -= toWrite;
-   }
-+#endif /* HAVE_ARC4RANDOM_BUF */
- 
-   /* Put in the version */
-   aId->m2 &= 0x0fff;
-@@ -159,7 +167,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
-   aId->m3[0] &= 0x3f;
-   aId->m3[0] |= 0x80;
- 
--#ifndef ANDROID
-+#ifndef HAVE_ARC4RANDOM
-   /* Restore the previous RNG state */
-   setstate(mSavedState);
- #endif
diff --git a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h b/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h
deleted file mode 100644
index 919edf99b8d..00000000000
--- a/www/firefox/patches/patch-xpcom_base_nsUUIDGenerator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xpcom_base_nsUUIDGenerator.h,v 1.4 2014/10/05 01:59:08 ryoon Exp $
-
---- xpcom/base/nsUUIDGenerator.h.orig	2014-09-24 01:05:41.000000000 +0000
-+++ xpcom/base/nsUUIDGenerator.h
-@@ -29,7 +29,7 @@ private:
- protected:
- 
-   mozilla::Mutex mLock;
--#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
-   char mState[128];
-   char* mSavedState;
-   uint8_t mRBytes;
diff --git a/www/firefox/patches/patch-xpcom_build_PoisonIOInterposer.h b/www/firefox/patches/patch-xpcom_build_PoisonIOInterposer.h
deleted file mode 100644
index 7ef92090c76..00000000000
--- a/www/firefox/patches/patch-xpcom_build_PoisonIOInterposer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-xpcom_build_PoisonIOInterposer.h,v 1.2 2014/06/11 00:40:59 ryoon Exp $
-
-Replace XP_MACOSX with XP_DARWIN as the former is not defined when
-the toolkit is not cocoa.
-
---- xpcom/build/PoisonIOInterposer.h.orig	2014-05-29 23:31:50.000000000 +0000
-+++ xpcom/build/PoisonIOInterposer.h
-@@ -44,7 +44,7 @@ bool IsDebugFile(intptr_t aFileID);

-  */

- void InitPoisonIOInterposer();

- 

--#ifdef XP_MACOSX

-+#ifdef XP_DARWIN

- /**

-  * Check that writes are dirty before reporting I/O (Mac OS X only)

-  * This is necessary for late-write checks on Mac OS X, but reading the buffer

-@@ -52,7 +52,7 @@ void InitPoisonIOInterposer();

-  * to do this for everything else that uses

-  */

- void OnlyReportDirtyWrites();

--#endif /* XP_MACOSX */

-+#endif /* XP_DARWIN */

- 

- /**

-  * Clear IO poisoning, this is only safe to do on the main-thread when no other

-@@ -70,9 +70,9 @@ namespace mozilla {

- inline bool IsDebugFile(intptr_t aFileID){ return true; }

- inline void InitPoisonIOInterposer(){}

- inline void ClearPoisonIOInterposer(){}

--#ifdef XP_MACOSX

-+#ifdef XP_DARWIN

- inline void OnlyReportDirtyWrites(){}

--#endif /* XP_MACOSX */

-+#endif /* XP_DARWIN */

- } // namespace mozilla

- #endif /* __cplusplus */

- 

diff --git a/www/firefox/patches/patch-xpcom_ds_TimeStamp.h b/www/firefox/patches/patch-xpcom_ds_TimeStamp.h
index d59184208d1..96d5315a949 100644
--- a/www/firefox/patches/patch-xpcom_ds_TimeStamp.h
+++ b/www/firefox/patches/patch-xpcom_ds_TimeStamp.h
@@ -1,19 +1,24 @@
-$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.3 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-xpcom_ds_TimeStamp.h,v 1.4 2014/10/15 13:07:07 ryoon Exp $
 
 http://gnats.netbsd.org/47233
 
---- xpcom/ds/TimeStamp.h.orig	2013-01-04 23:44:47.000000000 +0000
+--- xpcom/ds/TimeStamp.h.orig	2014-10-11 09:06:50.000000000 +0000
 +++ xpcom/ds/TimeStamp.h
-@@ -130,11 +130,11 @@ private:
+@@ -199,14 +199,12 @@ private:
+   {
      // NOTE: this MUST be a >= test, because int64_t(double(INT64_MAX))
      // overflows and gives INT64_MIN.
-     if (aTicks >= double(INT64_MAX))
+-    if (aTicks >= double(INT64_MAX)) {
 -      return TimeDuration::FromTicks(INT64_MAX);
+-    }
++    if (aTicks >= double(INT64_MAX))
 +      return TimeDuration::FromTicks(int64_t(INT64_MAX));
  
      // This MUST be a <= test.
-     if (aTicks <= double(INT64_MIN))
+-    if (aTicks <= double(INT64_MIN)) {
 -      return TimeDuration::FromTicks(INT64_MIN);
+-    }
++    if (aTicks <= double(INT64_MIN))
 +      return TimeDuration::FromTicks(int64_t(INT64_MIN));
  
      return TimeDuration::FromTicks(int64_t(aTicks));
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build
deleted file mode 100644
index 3a192409c20..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_moz.build
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_moz.build,v 1.6 2014/05/28 07:18:28 pho Exp $
-
-* Support NetBSD/amd64 and DragonFly/amd64.
-
-* OS_TEST can never be powerpc.
-
---- xpcom/reflect/xptcall/src/md/unix/moz.build.orig	2014-05-06 22:56:39.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/moz.build
-@@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
-         'xptcinvoke_darwin.cpp',
-         'xptcstubs_darwin.cpp',
-     ]
--    if CONFIG['OS_TEST'] == 'powerpc':
-+    if CONFIG['OS_TEST'] == 'ppc':
-         SOURCES += [
-             'xptcinvoke_asm_ppc_rhapsody.s',
-         ]
-@@ -19,14 +19,14 @@ if CONFIG['OS_ARCH'] == 'Darwin':
-     if '86' in CONFIG['OS_TEST'] and CONFIG['OS_TEST'] != 'x86_64':
-         DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True
- 
--if CONFIG['OS_ARCH'] in ('NetBSD', 'OpenBSD', 'GNU'):
-+if CONFIG['OS_ARCH'] in ('OpenBSD', 'GNU'):
-     if CONFIG['CPU_ARCH'] == 'x86':
-         SOURCES += [
-             'xptcinvoke_gcc_x86_unix.cpp',
-             'xptcstubs_gcc_x86_unix.cpp'
-         ]
- 
--if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD') or \
-+if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'DragonFly') or \
-    CONFIG['OS_ARCH'].startswith('GNU_'):
-     if CONFIG['OS_TEST'] == 'x86_64':
-         SOURCES += [
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__asm__mips.S b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__asm__mips.S
deleted file mode 100644
index c897f719e43..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__asm__mips.S
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__asm__mips.S,v 1.1 2014/03/20 21:02:00 ryoon Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.S.orig	2014-03-15 05:19:39.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.S
-@@ -16,6 +16,47 @@
- #include <sys/asm.h>
- #endif
- 
-+#ifdef __NetBSD__
-+# include <machine/regdef.h>
-+# include <machine/asm.h>
-+# ifndef fp
-+#  define      fp      s8
-+# endif
-+# ifndef PTRLOG
-+#  if SZREG == 4
-+#   define     PTRLOG  2
-+#  else
-+#   define     PTRLOG  3
-+#  endif
-+# endif
-+# ifndef SETUP_GP
-+#  if defined(__mips_o32)
-+#   define     SETUP_GP        \
-+               .set push;      \
-+               .set noreorder; \
-+               .cpload t9;     \
-+               .set pop
-+#   define     SAVE_GP(x)      \
-+               .cprestore x
-+#  else
-+#   define     SETUP_GP
-+#   define     SAVE_GP(x)
-+#  endif
-+# endif
-+# ifndef ALSZ
-+#  if defined(__mips_n32) || defined(__mips_n64)
-+#   define     ALSZ    15
-+#   define     ALMASK  ~15
-+#  else
-+#   define     ALSZ    7
-+#   define     ALMASK  ~7
-+#  endif
-+# endif
-+#else
-+# include <sys/regdef.h>
-+# include <sys/asm.h>
-+#endif
-+
- # NARGSAVE is the argument space in the callers frame, including extra
- # 'shadowed' space for the argument registers. The minimum of 4
- # argument slots is sometimes predefined in the header files.
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp
deleted file mode 100644
index db9bf7fac0a..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig	2013-05-11 19:19:56.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp
-@@ -9,7 +9,7 @@
- #include "xptc_gcc_x86_unix.h"
- 
- extern "C" {
--static void ATTRIBUTE_USED __attribute__ ((regparm(3)))
-+void ATTRIBUTE_USED __attribute__ ((regparm(3)))
- invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d)
- {
-     for(uint32_t i = paramCount; i >0; i--, d++, s++)
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__asm__mips.S b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__asm__mips.S
deleted file mode 100644
index 574949c7757..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__asm__mips.S
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__asm__mips.S,v 1.1 2014/03/20 21:02:00 ryoon Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.S.orig	2014-03-15 05:19:39.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.S
-@@ -14,6 +14,47 @@
- #include <sys/asm.h>
- #endif
- 
-+#ifdef __NetBSD__
-+# include <machine/regdef.h>
-+# include <machine/asm.h>
-+# ifndef fp
-+#  define      fp      s8
-+# endif
-+# ifndef PTRLOG
-+#  if SZREG == 4
-+#   define     PTRLOG  2
-+#  else
-+#   define     PTRLOG  3
-+#  endif
-+# endif
-+# ifndef SETUP_GP
-+#  if defined(__mips_o32)
-+#   define     SETUP_GP        \
-+               .set push;      \
-+               .set noreorder; \
-+               .cpload t9;     \
-+               .set pop
-+#   define     SAVE_GP(x)      \
-+               .cprestore x
-+#  else
-+#   define     SETUP_GP
-+#   define     SAVE_GP(x)
-+#  endif
-+# endif
-+# ifndef ALSZ
-+#  if defined(__mips_n32) || defined(__mips_n64)
-+#   define     ALSZ    15
-+#   define     ALMASK  ~15
-+#  else
-+#   define     ALSZ    7
-+#   define     ALMASK  ~7
-+#  endif
-+# endif
-+#else
-+# include <sys/regdef.h>
-+# include <sys/asm.h>
-+#endif
-+
- # NARGSAVE is the argument space in the callers frame, including extra
- # 'shadowed' space for the argument registers. The minimum of 4
- # argument slots is sometimes predefined in the header files.
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp
deleted file mode 100644
index 9a2120d3c10..00000000000
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp.orig	2013-05-11 19:19:56.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
-@@ -10,7 +10,7 @@
- #include "xptc_gcc_x86_unix.h"
- 
- extern "C" {
--static nsresult ATTRIBUTE_USED
-+nsresult ATTRIBUTE_USED
- __attribute__ ((regparm (3)))
- PrepareAndDispatch(uint32_t methodIndex, nsXPTCStubBase* self, uint32_t* args)
- {