Update to firefox 15.0.

- see http://www.mozilla.org/en-US/firefox/15.0/releasenotes/ - add -Os hack to fix a relocation error when linking on ppc (as was done in tb since 10..) - garbage collect nsSound.cpp, the original one uses libcanberra properly and thus sndio. - remove patch from #750620, merged upstream (mfbt/double-conversion) - remove patches from #747257, merged upstream (gstreamer fix) - remove patches from #691898, merged upstream (yarr jit ppc)
2012-09-01 13:56:45 +00:00 · 2012-09-01 13:56:45 +00:00 · 617089342c
commit 617089342c
parent 2a512d2377
51 changed files with 236 additions and 1062 deletions
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.205 2012/08/07 16:16:52 landry Exp $
+# $OpenBSD: Makefile,v 1.206 2012/09/01 13:56:45 landry Exp $

 COMMENT =	Mozilla web browser
 BROKEN-sparc64 =	https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@ -6,13 +6,12 @@ BROKEN-sparc64 =	https://bugzilla.mozilla.org/show_bug.cgi?id=577056
 # Don't forget to bump www/firefox-i18n after updates.
 # Don't forget to update devel/xulrunner/2.0 if patches changes.

-MOZILLA_VERSION =	14.0.1
+MOZILLA_VERSION =	15.0
 MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	firefox
 MOZILLA_CODENAME =	browser
-REVISION =	0

-SO_VERSION =	33.0
+SO_VERSION =	34.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 MOZILLA_LIBS =	browsercomps mozalloc \
@ -54,6 +53,12 @@ RUN_DEPENDS +=	multimedia/gstreamer-0.10/plugins-good
 CONFIGURE_ARGS +=	--disable-tracejit --disable-methodjit
 .endif

+# XXX needed since 15.0b5, relocation overflow otherwise...
+# replaces -g by -Os
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ENV +=	MOZ_DEBUG_FLAGS="-Os"
+.endif
+
 # needed during make install
 BUILD_DEPENDS +=	archivers/unzip

--- a/www/mozilla-firefox/distinfo
+++ b/www/mozilla-firefox/distinfo
@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-14.0.1.source.tar.bz2) = whmI8CB7Z4N2w9lvZHqt9taU6Dbwtckz7BXZO3Xqiao=
-SIZE (mozilla/firefox-14.0.1.source.tar.bz2) = 82478218
+SHA256 (mozilla/firefox-15.0.source.tar.bz2) = VBbw1qsTmEY0PeuG9gQ1LQakh+0UKSBhOi0tPdlrx4k=
+SIZE (mozilla/firefox-15.0.source.tar.bz2) = 83713360
--- a/www/mozilla-firefox/files/nsSound.cpp
+++ b/www/mozilla-firefox/files/nsSound.cpp
@ -1,465 +0,0 @@
-/*	$OpenBSD: nsSound.cpp,v 1.2 2010/04/26 19:55:58 landry Exp $	*/
-
-/*
- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <string.h>
-
-#include "nscore.h"
-#include "plstr.h"
-#include "prlink.h"
-
-#include "nsSound.h"
-
-#include "nsIURL.h"
-#include "nsIFileURL.h"
-#include "nsNetUtil.h"
-#include "nsCOMPtr.h"
-#include "nsAutoPtr.h"
-#include "nsString.h"
-
-#include <prthread.h>
-#include <sndio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <gtk/gtk.h>
-
-#define WAV_MIN_LENGTH 44
-
-typedef struct {
-    struct sio_hdl *sndio_hdl;
-    void *audio;
-    size_t audio_len;
-} SioThreadData;
-
-typedef struct _ca_context ca_context;
-
-/* used to find and play common system event sounds */
-typedef int (*ca_context_create_fn) (ca_context **);
-typedef int (*ca_context_destroy_fn) (ca_context *);
-typedef int (*ca_context_play_fn) (ca_context *c, uint32_t id, ...);
-typedef int (*ca_context_change_props_fn) (ca_context *c, ...);
-
-static ca_context_create_fn ca_context_create;
-static ca_context_destroy_fn ca_context_destroy;
-static ca_context_play_fn ca_context_play;
-static ca_context_change_props_fn ca_context_change_props;
-
-static PRLibrary *canberra_lib = nsnull;
-
-NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver)
-
-////////////////////////////////////////////////////////////////////////
-static void
-RunSioThread(void *arg)
-{
-    SioThreadData *td;
-
-    td = (SioThreadData *)arg;
-
-    /* Write stream. */
-    if (sio_write(td->sndio_hdl, (void *)td->audio,
-        td->audio_len) == 0 && sio_eof(td->sndio_hdl)) {
-        NS_WARNING("sio_write: couldn't write the stream");
-    }
-
-    sio_close(td->sndio_hdl);
-
-    free(td->audio);
-    free(td);
-}
-
-nsSound::nsSound()
-{
-    mInited = PR_FALSE;
-}
-
-nsSound::~nsSound()
-{
-}
-
-NS_IMETHODIMP
-nsSound::Init()
-{
-    /*
-     * This function is designed so that no library is compulsory, and
-     * one library missing doesn't cause the other(s) to not be used.
-     */
-    if (mInited)
-        return NS_OK;
-
-    mInited = PR_TRUE;
-
-    if (!canberra_lib) {
-        canberra_lib = PR_LoadLibrary("libcanberra.so");
-        if (canberra_lib) {
-            ca_context_create = (ca_context_create_fn) PR_FindFunctionSymbol(
-                canberra_lib, "ca_context_create");
-            if (!ca_context_create) {
-                PR_UnloadLibrary(canberra_lib);
-                canberra_lib = nsnull;
-            } else {
-                ca_context_destroy = (ca_context_destroy_fn)
-                    PR_FindFunctionSymbol(canberra_lib, "ca_context_destroy");
-                ca_context_play = (ca_context_play_fn) PR_FindFunctionSymbol(
-                    canberra_lib, "ca_context_play");
-                ca_context_change_props = (ca_context_change_props_fn)
-                    PR_FindFunctionSymbol(canberra_lib,
-                    "ca_context_change_props");
-            }
-        }
-    }
-
-    return NS_OK;
-}
-
-/* static */ void
-nsSound::Shutdown()
-{
-    if (canberra_lib) {
-        PR_UnloadLibrary(canberra_lib);
-        canberra_lib = nsnull;
-    }
-}
-
-#define GET_WORD(s, i) (s[i+1] << 8) | s[i]
-#define GET_DWORD(s, i) (s[i+3] << 24) | (s[i+2] << 16) | (s[i+1] << 8) | s[i]
-
-NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
-                                        nsISupports *context,
-                                        nsresult aStatus,
-                                        PRUint32 dataLen,
-                                        const PRUint8 *data)
-{
-    struct sio_hdl *sndio_hdl;
-    struct sio_par sndio_par;
-    SioThreadData *td;
-    PRUint32 samples_per_sec = 0, avg_bytes_per_sec = 0, chunk_len = 0;
-    PRUint16 format, channels = 1, bits_per_sample = 0;
-    const PRUint8 *audio = nsnull;
-    size_t audio_len = 0;
-
-    /* Print a load error on bad status, and return. */
-    if (NS_FAILED(aStatus)) {
-        return aStatus;
-    }
-
-    if (dataLen < 4) {
-        NS_WARNING("Sound stream too short to determine its type");
-        return NS_ERROR_FAILURE;
-    }
-
-    if (memcmp(data, "RIFF", 4)) {
-#ifdef DEBUG
-        printf("We only support WAV files currently.\n");
-#endif
-        return NS_ERROR_FAILURE;
-    }
-
-    if (dataLen <= WAV_MIN_LENGTH) {
-        NS_WARNING("WAV files should be longer than 44 bytes.");
-        return NS_ERROR_FAILURE;
-    }
-
-    PRUint32 i = 12;
-    while (i + 7 < dataLen) {
-        if (!memcmp(data + i, "fmt ", 4) && !chunk_len) {
-            i += 4;
-
-            /* length of the rest of this subblock (should be 16 for PCM data */
-            chunk_len = GET_DWORD(data, i);
-            i += 4;
-
-            if (chunk_len < 16 || i + chunk_len >= dataLen) {
-                NS_WARNING("Invalid WAV file: bad fmt chunk.");
-                return NS_ERROR_FAILURE;
-            }
-
-            format = GET_WORD(data, i);
-            i += 2;
-
-            channels = GET_WORD(data, i);
-            i += 2;
-
-            samples_per_sec = GET_DWORD(data, i);
-            i += 4;
-
-            avg_bytes_per_sec = GET_DWORD(data, i);
-            i += 4;
-
-            /* block align */
-            i += 2;
-
-            bits_per_sample = GET_WORD(data, i);
-            i += 2;
-
-            /* we don't support WAVs with odd compression codes */
-            if (chunk_len != 16)
-                NS_WARNING("Extra format bits found in WAV. Ignoring");
-
-            i += chunk_len - 16;
-        } else if (!memcmp(data + i, "data", 4)) {
-            i += 4;
-            if (!chunk_len) {
-                NS_WARNING("Invalid WAV file: no fmt chunk found");
-                return NS_ERROR_FAILURE;
-            }
-
-            audio_len = GET_DWORD(data, i);
-            i += 4;
-
-            /* try to play truncated WAVs */
-            if (i + audio_len > dataLen)
-                audio_len = dataLen - i;
-
-            audio = data + i;
-            break;
-        } else {
-            i += 4;
-            i += GET_DWORD(data, i);
-            i += 4;
-        }
-    }
-
-    if (!audio) {
-        NS_WARNING("Invalid WAV file: no data chunk found");
-        return NS_ERROR_FAILURE;
-    }
-
-    /* No audio data? well, at least the WAV was valid. */
-    if (!audio_len)
-        return NS_OK;
-
-    /* Open up connection to sndio. */
-    sndio_hdl = sio_open(NULL, SIO_PLAY, 0);
-    if (sndio_hdl == NULL) {
-        NS_WARNING("sio_open: couldn't open the stream");
-        return NS_ERROR_FAILURE;
-    }
-
-    /* Initialize parameters structure. */
-    sio_initpar(&sndio_par);
-    sndio_par.bits = bits_per_sample;
-    sndio_par.le = SIO_LE_NATIVE;
-    sndio_par.pchan = channels;
-    sndio_par.rate = samples_per_sec;
-    sndio_par.sig = (bits_per_sample == 8) ? 0 : 1;
-
-    /* Set and get configuration set.
-       Put the stream into writing state. */
-    if (!sio_setpar(sndio_hdl, &sndio_par) ||
-        !sio_getpar(sndio_hdl, &sndio_par) || !sio_start(sndio_hdl)) {
-        NS_WARNING("sio_setpar: couldn't set configuration");
-        sio_close(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    /* Check configuration. */
-    if (sndio_par.bits != bits_per_sample || sndio_par.pchan != channels ||
-        sndio_par.rate != samples_per_sec) {
-        NS_WARNING("configuration is not available");
-        sio_close(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    if ((td = (SioThreadData *) malloc(sizeof(SioThreadData))) == NULL ||
-        (td->audio = malloc(audio_len * sizeof(*audio))) == NULL) {
-        sio_close(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    td->sndio_hdl = sndio_hdl;
-    td->audio_len = audio_len;
-    memcpy(td->audio, audio, audio_len);
-
-    PR_CreateThread(PR_SYSTEM_THREAD, RunSioThread, td, PR_PRIORITY_NORMAL,
-        PR_GLOBAL_THREAD, PR_UNJOINABLE_THREAD, 0);
-
-    return NS_OK;
-}
-
-NS_METHOD nsSound::Beep()
-{
-    ::gdk_beep();
-    return NS_OK;
-}
-
-NS_METHOD nsSound::Play(nsIURL *aURL)
-{
-    nsresult rv;
-
-    if (!mInited)
-        Init();
-
-    nsCOMPtr<nsIStreamLoader> loader;
-    rv = NS_NewStreamLoader(getter_AddRefs(loader), aURL, this);
-
-    return rv;
-}
-
-NS_IMETHODIMP nsSound::PlayEventSound(PRUint32 aEventId)
-{
-    if (!mInited)
-        Init();
-
-    if (!canberra_lib)
-        return NS_OK;
-  
-    /*
-     * Do we even want alert sounds?
-     * If so, what sound theme are we using?
-     */
-    GtkSettings* settings = gtk_settings_get_default();
-    gchar* sound_theme_name = nsnull;
-
-    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings),
-        "gtk-sound-theme-name") && g_object_class_find_property(
-        G_OBJECT_GET_CLASS(settings), "gtk-enable-event-sounds")) {
-        gboolean enable_sounds = TRUE;
-        g_object_get(settings, "gtk-enable-event-sounds", &enable_sounds,
-            "gtk-sound-theme-name", &sound_theme_name, NULL);
-
-        if (!enable_sounds) {
-            g_free(sound_theme_name);
-            return NS_OK;
-        }
-     }
-
-    /*
-     * This allows us to avoid race conditions with freeing the
-     * context by handing that responsibility to Glib, and still
-     * use one context at a time.
-     */
-    ca_context* ctx = nsnull;
-    static GStaticPrivate ctx_static_private = G_STATIC_PRIVATE_INIT;
-    ctx = (ca_context*) g_static_private_get(&ctx_static_private);
-    if (!ctx) {
-        ca_context_create(&ctx);
-        if (!ctx) {
-            g_free(sound_theme_name);
-            return NS_ERROR_OUT_OF_MEMORY;
-        }
-
-        g_static_private_set(&ctx_static_private, ctx, (GDestroyNotify)
-            ca_context_destroy);
-    }
-
-    if (sound_theme_name) {
-        ca_context_change_props(ctx, "canberra.xdg-theme.name",
-            sound_theme_name, NULL);
-        g_free(sound_theme_name);
-    }
-
-    switch (aEventId) {
-        case EVENT_ALERT_DIALOG_OPEN:
-            ca_context_play(ctx, 0, "event.id", "dialog-warning", NULL);
-            break;
-        case EVENT_CONFIRM_DIALOG_OPEN:
-            ca_context_play(ctx, 0, "event.id", "dialog-question", NULL);
-            break;
-        case EVENT_NEW_MAIL_RECEIVED:
-            ca_context_play(ctx, 0, "event.id", "message-new-email", NULL);
-            break;
-        case EVENT_MENU_EXECUTE:
-            ca_context_play(ctx, 0, "event.id", "menu-click", NULL);
-            break;
-        case EVENT_MENU_POPUP:
-            ca_context_play(ctx, 0, "event.id", "menu-popup", NULL);
-            break;
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)
-{
-    if (NS_IsMozAliasSound(aSoundAlias)) {
-        NS_WARNING("nsISound::playSystemSound is called with \"_moz_\" events, "
-            "they are obsolete, use nsISound::playEventSound instead");
-        PRUint32 eventId;
-        if (aSoundAlias.Equals(NS_SYSSOUND_ALERT_DIALOG))
-            eventId = EVENT_ALERT_DIALOG_OPEN;
-        else if (aSoundAlias.Equals(NS_SYSSOUND_CONFIRM_DIALOG))
-            eventId = EVENT_CONFIRM_DIALOG_OPEN;
-        else if (aSoundAlias.Equals(NS_SYSSOUND_MAIL_BEEP))
-            eventId = EVENT_NEW_MAIL_RECEIVED;
-        else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_EXECUTE))
-            eventId = EVENT_MENU_EXECUTE;
-        else if (aSoundAlias.Equals(NS_SYSSOUND_MENU_POPUP))
-            eventId = EVENT_MENU_POPUP;
-        else
-            return NS_OK;
-        return PlayEventSound(eventId);
-    }
-
-    nsresult rv;
-    nsCOMPtr <nsIURI> fileURI;
-
-    /* create a nsILocalFile and then a nsIFileURL from that */
-    nsCOMPtr <nsILocalFile> soundFile;
-    rv = NS_NewLocalFile(aSoundAlias, PR_TRUE,
-                         getter_AddRefs(soundFile));
-    NS_ENSURE_SUCCESS(rv,rv);
-
-    rv = NS_NewFileURI(getter_AddRefs(fileURI), soundFile);
-    NS_ENSURE_SUCCESS(rv,rv);
-
-    nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(fileURI,&rv);
-    NS_ENSURE_SUCCESS(rv,rv);
-
-    rv = Play(fileURL);
-
-    return rv;
-}
-
--- a/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
+++ b/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_app_profile_firefox_js,v 1.15 2012/08/07 08:55:40 landry Exp $
--- browser/app/profile/firefox.js.orig	Wed Jun 13 01:46:28 2012
-+++ browser/app/profile/firefox.js	Sun Jun 17 12:04:00 2012
-@@ -157,7 +157,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
+$OpenBSD: patch-browser_app_profile_firefox_js,v 1.16 2012/09/01 13:56:45 landry Exp $
+--- browser/app/profile/firefox.js.orig	Wed Aug 15 07:47:02 2012
+++ browser/app/profile/firefox.js	Sun Aug 19 13:30:25 2012
+@@ -124,7 +124,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
 pref("app.update.certs.2.commonName", "aus3.mozilla.org");
 
 // Whether or not app updates are enabled
@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.15 2012/08/07 08:55:40 landry
 
 // This preference turns on app.update.mode and allows automatic download and
 // install to take place. We use a separate boolean toggle for this to make
-@@ -616,7 +616,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
+@@ -587,7 +587,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
 pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
 
 // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
@ -19,7 +19,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.15 2012/08/07 08:55:40 landry
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 
 #ifdef XP_MACOSX
-@@ -742,10 +742,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
+@@ -716,10 +716,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
 
 #ifdef MOZ_SAFE_BROWSING
 // Safe browsing does nothing unless this pref is set
@ -32,7 +32,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.15 2012/08/07 08:55:40 landry
 
 // Non-enhanced mode (local url lists) URL list to check for updates
 pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
-@@ -799,10 +799,8 @@ pref("browser.EULA.version", 3);
+@@ -773,10 +773,8 @@ pref("browser.EULA.version", 3);
 pref("browser.rights.version", 3);
 pref("browser.rights.3.shown", false);
 
--- a/www/mozilla-firefox/patches/patch-browser_components_certerror_content_aboutCertError_xhtml
+++ b/www/mozilla-firefox/patches/patch-browser_components_certerror_content_aboutCertError_xhtml
@ -1,8 +1,8 @@
-$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.5 2012/06/11 15:29:56 landry Exp $
+$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.6 2012/09/01 13:56:45 landry Exp $
 Click the 'get certificate' checkbox ?
--- browser/components/certerror/content/aboutCertError.xhtml.orig	Wed May  2 05:16:33 2012
-+++ browser/components/certerror/content/aboutCertError.xhtml	Wed May  9 23:06:34 2012
-@@ -134,6 +134,9 @@
+--- browser/components/certerror/content/aboutCertError.xhtml.orig	Wed Aug 15 07:47:03 2012
+++ browser/components/certerror/content/aboutCertError.xhtml	Sun Aug 19 13:30:25 2012
+@@ -96,6 +96,9 @@
           tech.textContent = getDescription();
         
         addDomainErrorLink();
--- a/www/mozilla-firefox/patches/patch-browser_installer_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-browser_installer_Makefile_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-browser_installer_Makefile_in,v 1.1 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-browser_installer_Makefile_in,v 1.2 2012/09/01 13:56:45 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/ede54971747f
--- browser/installer/Makefile.in.orig	Sun Jun 17 17:05:01 2012
-+++ browser/installer/Makefile.in	Sun Jun 17 17:05:53 2012
-@@ -78,6 +78,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+--- browser/installer/Makefile.in.orig	Wed Aug 15 07:47:06 2012
+++ browser/installer/Makefile.in	Sun Aug 19 13:30:25 2012
+@@ -44,6 +44,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_GTK2=1
 endif
 
--- a/www/mozilla-firefox/patches/patch-browser_installer_package-manifest_in
+++ b/www/mozilla-firefox/patches/patch-browser_installer_package-manifest_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-browser_installer_package-manifest_in,v 1.1 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-browser_installer_package-manifest_in,v 1.2 2012/09/01 13:56:45 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/ede54971747f
--- browser/installer/package-manifest.in.orig	Sun Jun 17 17:00:56 2012
-+++ browser/installer/package-manifest.in	Sun Jun 17 17:02:09 2012
-@@ -54,9 +54,11 @@
+--- browser/installer/package-manifest.in.orig	Wed Aug 15 07:47:06 2012
+++ browser/installer/package-manifest.in	Sun Aug 19 13:30:25 2012
+@@ -58,9 +58,11 @@
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
@ -14,7 +14,7 @@ https://hg.mozilla.org/mozilla-central/rev/ede54971747f
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
-@@ -105,7 +107,9 @@
+@@ -109,7 +111,9 @@
 #endif
 @BINPATH@/platform.ini
 #ifndef XP_OS2
@ -24,7 +24,7 @@ https://hg.mozilla.org/mozilla-central/rev/ede54971747f
 #else
 @BINPATH@/mozsqlt3@DLL_SUFFIX@
 #endif
-@@ -560,6 +564,7 @@
+@@ -579,6 +583,7 @@
 ; NSS libraries are signed in the staging directory,
 ; meaning their .chk files are created there directly.
 ;
@ -32,7 +32,7 @@ https://hg.mozilla.org/mozilla-central/rev/ede54971747f
 @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-@@ -570,6 +575,7 @@
+@@ -589,6 +594,7 @@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
--- a/www/mozilla-firefox/patches/patch-build_unix_mozilla_in
+++ b/www/mozilla-firefox/patches/patch-build_unix_mozilla_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-build_unix_mozilla_in,v 1.2 2010/04/28 06:56:38 landry Exp $
--- build/unix/mozilla.in.orig	Wed Jan  6 05:35:11 2010
-+++ build/unix/mozilla.in	Sun Jan 10 17:47:23 2010
-@@ -50,6 +50,11 @@
+$OpenBSD: patch-build_unix_mozilla_in,v 1.3 2012/09/01 13:56:45 landry Exp $
+--- build/unix/mozilla.in.orig	Wed Aug 15 07:47:07 2012
+++ build/unix/mozilla.in	Sun Aug 19 13:30:25 2012
+@@ -18,6 +18,11 @@
 #uncomment for debugging
 #set -x
 
@ -13,7 +13,7 @@ $OpenBSD: patch-build_unix_mozilla_in,v 1.2 2010/04/28 06:56:38 landry Exp $
 moz_libdir=%MOZAPPDIR%
 
 # Use run-mozilla.sh in the current dir if it exists
-@@ -131,6 +136,12 @@ do
+@@ -99,6 +104,12 @@ do
       ;;
   esac
 done
--- a/www/mozilla-firefox/patches/patch-build_unix_run-mozilla_sh
+++ b/www/mozilla-firefox/patches/patch-build_unix_run-mozilla_sh
@ -1,8 +1,8 @@
-$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.2 2011/03/30 21:39:14 landry Exp $
+$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.3 2012/09/01 13:56:45 landry Exp $
 find our gdb by default
--- build/unix/run-mozilla.sh.orig	Thu Nov  4 21:05:18 2010
-+++ build/unix/run-mozilla.sh	Sat Nov 13 12:00:19 2010
-@@ -103,25 +103,7 @@ moz_test_binary()
+--- build/unix/run-mozilla.sh.orig	Wed Aug 15 07:47:07 2012
+++ build/unix/run-mozilla.sh	Sun Aug 19 13:30:25 2012
+@@ -71,25 +71,7 @@ moz_test_binary()
 ##########################################################################
 moz_get_debugger()
 {
--- a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
+++ b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.20 2012/08/07 08:55:40 landry Exp $
--- config/autoconf.mk.in.orig	Wed Jun 13 01:46:32 2012
-+++ config/autoconf.mk.in	Sun Jun 17 12:04:02 2012
-@@ -324,7 +324,7 @@ OS_LDFLAGS	= @LDFLAGS@
+$OpenBSD: patch-config_autoconf_mk_in,v 1.21 2012/09/01 13:56:45 landry Exp $
+--- config/autoconf.mk.in.orig	Wed Aug 15 07:47:07 2012
+++ config/autoconf.mk.in	Sun Aug 19 13:30:25 2012
+@@ -301,7 +301,7 @@ OS_LDFLAGS	= @LDFLAGS@
 OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
 
--- a/www/mozilla-firefox/patches/patch-configure_in
+++ b/www/mozilla-firefox/patches/patch-configure_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-configure_in,v 1.24 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-configure_in,v 1.25 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=776838
--- configure.in.orig	Tue Jul 24 11:02:39 2012
-+++ configure.in	Tue Jul 24 11:02:51 2012
-@@ -5825,7 +5825,7 @@ if test "$MOZ_GSTREAMER"; then
+--- configure.in.orig	Wed Aug 15 07:47:09 2012
+++ configure.in	Sun Aug 19 13:30:26 2012
+@@ -5909,7 +5909,7 @@ if test "$MOZ_GSTREAMER"; then
                       gstreamer-plugins-base-$GST_API_VERSION)
     if test -n "$GSTREAMER_LIBS"; then
        _SAVE_LDFLAGS=$LDFLAGS
--- a/www/mozilla-firefox/patches/patch-content_base_src_nsContentUtils_cpp
+++ b/www/mozilla-firefox/patches/patch-content_base_src_nsContentUtils_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-content_base_src_nsContentUtils_cpp,v 1.1 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-content_base_src_nsContentUtils_cpp,v 1.2 2012/09/01 13:56:45 landry Exp $
 https://hg.mozilla.org/mozilla-central/raw-rev/45118cc6518b
--- content/base/src/nsContentUtils.cpp.orig	Fri Jul 13 23:42:48 2012
-+++ content/base/src/nsContentUtils.cpp	Wed Jul 25 00:02:48 2012
-@@ -6324,6 +6324,21 @@ nsContentUtils::FindInternalContentViewer(const char* 
+--- content/base/src/nsContentUtils.cpp.orig	Wed Aug 15 07:47:09 2012
+++ content/base/src/nsContentUtils.cpp	Sun Aug 19 13:30:27 2012
+@@ -6496,6 +6496,21 @@ nsContentUtils::FindInternalContentViewer(const char* 
     }
   }
 #endif
--- a/www/mozilla-firefox/patches/patch-content_html_content_src_nsHTMLMediaElement_cpp
+++ b/www/mozilla-firefox/patches/patch-content_html_content_src_nsHTMLMediaElement_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-content_html_content_src_nsHTMLMediaElement_cpp,v 1.1 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-content_html_content_src_nsHTMLMediaElement_cpp,v 1.2 2012/09/01 13:56:45 landry Exp $
 https://hg.mozilla.org/mozilla-central/raw-rev/45118cc6518b
--- content/html/content/src/nsHTMLMediaElement.cpp.orig	Fri Jul 13 23:42:49 2012
-+++ content/html/content/src/nsHTMLMediaElement.cpp	Wed Jul 25 00:02:48 2012
-@@ -1942,6 +1942,10 @@ bool nsHTMLMediaElement::ShouldHandleMediaType(const c
-   if (IsWebMType(nsDependentCString(aMIMEType)))
+--- content/html/content/src/nsHTMLMediaElement.cpp.orig	Wed Aug 15 07:47:12 2012
+++ content/html/content/src/nsHTMLMediaElement.cpp	Sun Aug 19 13:30:27 2012
+@@ -2189,6 +2189,10 @@ bool nsHTMLMediaElement::ShouldHandleMediaType(const c
+   if (GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), NULL))
     return true;
 #endif
 +#ifdef MOZ_GSTREAMER
--- a/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
+++ b/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp
@ -1,6 +1,6 @@
-$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.9 2012/04/30 15:28:42 landry Exp $
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig	Thu Feb  2 00:39:01 2012
-+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp	Tue Feb 14 18:42:02 2012
+$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.10 2012/09/01 13:56:45 landry Exp $
+--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig	Wed Aug 15 07:47:22 2012
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp	Sun Aug 19 13:30:27 2012
@@ -64,6 +64,7 @@
 #include "nsISimpleEnumerator.h"
 #include "nsIDirectoryEnumerator.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.9 2012/04
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "mozISpellI18NManager.h"
-@@ -400,6 +401,16 @@ mozHunspell::LoadDictionaryList()
+@@ -398,6 +399,16 @@ mozHunspell::LoadDictionaryList()
       appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries"));
       LoadDictionariesFromDir(appDir);
     }
--- a/www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.10 2012/08/07 08:55:40 landry Exp $
--- gfx/thebes/Makefile.in.orig	Wed Jun 13 01:46:41 2012
-+++ gfx/thebes/Makefile.in	Sun Jun 17 12:04:02 2012
-@@ -388,6 +388,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.11 2012/09/01 13:56:45 landry Exp $
+--- gfx/thebes/Makefile.in.orig	Wed Aug 15 07:47:27 2012
+++ gfx/thebes/Makefile.in	Sun Aug 19 13:30:27 2012
+@@ -365,6 +365,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
--- a/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
+++ b/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.3 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.4 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=715658
--- gfx/thebes/gfxPlatform.cpp.orig	Wed Jun 13 01:46:41 2012
-+++ gfx/thebes/gfxPlatform.cpp	Sun Jun 17 12:04:02 2012
-@@ -459,6 +459,7 @@ void SourceBufferDestroy(void *srcBuffer)
+--- gfx/thebes/gfxPlatform.cpp.orig	Wed Aug 15 07:47:27 2012
+++ gfx/thebes/gfxPlatform.cpp	Sun Aug 19 13:30:27 2012
+@@ -443,6 +443,7 @@ void SourceBufferDestroy(void *srcBuffer)
   static_cast<SourceSurface*>(srcBuffer)->Release();
 }
 
@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
 void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 {
   gfxImageSurface* origSurf =
-@@ -466,6 +467,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+@@ -450,6 +451,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 
   origSurf->SetData(&kSourceSurface, NULL, NULL);
 }
@ -18,16 +18,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
 
 RefPtr<SourceSurface>
 gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -535,6 +537,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
-                                                      imgSurface->Stride(),
-                                                      format);
+@@ -544,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+ 
+     }
 
 +    #ifdef MOZ_TREE_CAIRO
     cairo_surface_t *nullSurf =
 	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
     cairo_surface_set_user_data(nullSurf,
-@@ -543,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
- 				NULL);
+@@ -552,6 +555,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+                                 NULL);
     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
     cairo_surface_destroy(nullSurf);
 +    #endif
--- a/www/mozilla-firefox/patches/patch-js_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-js_src_Makefile_in
@ -1,38 +0,0 @@
-$OpenBSD: patch-js_src_Makefile_in,v 1.12 2012/08/07 08:55:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/Makefile.in.orig	Wed Jun 13 01:46:43 2012
-+++ js/src/Makefile.in	Sun Jun 17 12:04:02 2012
-@@ -320,20 +320,24 @@ endif
- 
- endif
- 
-# For architectures without YARR JIT, PCRE is faster than the YARR
-# interpreter (bug 684559).
- 
- ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
- 
-VPATH +=        $(srcdir)/yarr/pcre \
-+VPATH +=        $(srcdir)/assembler \
-+                $(srcdir)/assembler/wtf \
-+                $(srcdir)/assembler/jit \
-+                $(srcdir)/yarr \
- 		$(NULL)
- 
-CPPSRCS += \
-                pcre_compile.cpp \
-                pcre_exec.cpp \
-                pcre_tables.cpp \
-                pcre_xclass.cpp \
-                pcre_ucp_searchfuncs.cpp \
-+CPPSRCS +=      ExecutableAllocator.cpp \
-+                ExecutableAllocatorPosix.cpp \
-+                OSAllocatorOS2.cpp \
-+                OSAllocatorPosix.cpp \
-+                OSAllocatorWin.cpp \
-+                PageBlock.cpp \
-+                YarrInterpreter.cpp \
-+                YarrPattern.cpp \
-+                YarrSyntaxChecker.cpp \
- 		$(NULL)
- else
- 
--- a/www/mozilla-firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator_h
+++ b/www/mozilla-firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator_h
@ -1,13 +0,0 @@
-$OpenBSD: patch-js_src_assembler_jit_ExecutableAllocator_h,v 1.3 2012/08/07 08:55:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/assembler/jit/ExecutableAllocator.h.orig	Wed Jun 13 01:46:43 2012
-+++ js/src/assembler/jit/ExecutableAllocator.h	Sun Jun 17 12:04:02 2012
-@@ -468,8 +468,6 @@ class ExecutableAllocator { (public)
-     {
-         sync_instruction_memory((caddr_t)code, size);
-     }
-#else
-    #error "The cacheFlush support is missing on this platform."
- #endif
- 
- private:
--- a/www/mozilla-firefox/patches/patch-js_src_configure_in
+++ b/www/mozilla-firefox/patches/patch-js_src_configure_in
@ -1,10 +1,10 @@
-$OpenBSD: patch-js_src_configure_in,v 1.14 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-js_src_configure_in,v 1.15 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648721
 https://bugzilla.mozilla.org/show_bug.cgi?id=589754
 chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
--- js/src/configure.in.orig	Wed Jun 13 01:46:43 2012
-+++ js/src/configure.in	Sun Jun 17 12:04:02 2012
-@@ -2351,7 +2351,12 @@ ia64*-hpux*)
+--- js/src/configure.in.orig	Wed Aug 15 07:47:31 2012
+++ js/src/configure.in	Sun Aug 19 13:50:22 2012
+@@ -2300,7 +2300,12 @@ ia64*-hpux*)
     ;;
 
 *-openbsd*)
@ -18,7 +18,7 @@ chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'
-@@ -2639,6 +2644,10 @@ mips*-*)
+@@ -2588,6 +2593,10 @@ mips*-*)
     ENABLE_METHODJIT_TYPED_ARRAY=1
     AC_DEFINE(JS_CPU_MIPS)
     AC_DEFINE(JS_NUNBOX32)
--- a/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_configure
+++ b/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_configure
@ -1,6 +1,6 @@
-$OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.3 2012/04/30 15:28:42 landry Exp $
--- js/src/ctypes/libffi/configure.orig	Wed Apr 11 15:55:00 2012
-+++ js/src/ctypes/libffi/configure	Wed Apr 18 22:08:49 2012
+$OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.4 2012/09/01 13:56:45 landry Exp $
+--- js/src/ctypes/libffi/configure.orig	Wed Aug 15 07:47:31 2012
+++ js/src/ctypes/libffi/configure	Sun Aug 19 13:56:24 2012
@@ -11213,7 +11213,7 @@ case "$host" in
 	TARGET=FRV; TARGETDIR=frv
 	;;
@ -14,8 +14,8 @@ $OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.3 2012/04/30 15:28:42 landry
   mips-sgi-irix5.* | mips-sgi-irix6.*)
 	TARGET=MIPS; TARGETDIR=mips
 	;;
-  mips*-*-linux*)
-+  mips*-*-linux* | mips*-*-openbsd* )
+-  mips*-*linux*)
+  mips*-*linux* | mips*-*-openbsd*)
 	# Support 128-bit long double for NewABI.
 	HAVE_LONG_DOUBLE='defined(__mips64)'
 	TARGET=MIPS; TARGETDIR=mips
--- a/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject-inl_h
+++ b/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject-inl_h
@ -1,20 +0,0 @@
-$OpenBSD: patch-js_src_vm_RegExpObject-inl_h,v 1.5 2012/06/11 15:29:56 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject-inl.h.orig	Wed May  2 05:16:54 2012
-+++ js/src/vm/RegExpObject-inl.h	Wed May  9 23:14:31 2012
-@@ -137,6 +137,7 @@ RegExpObject::setSticky(bool enabled)
-     setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
- }
- 
-+#if ENABLE_YARR_JIT
- /* This function should be deleted once bad Android platforms phase out. See bug 604774. */
- inline bool
- detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
-@@ -147,6 +148,7 @@ detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
-     return true;
- #endif
- }
-+#endif
- 
- inline bool
- RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)
--- a/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_cpp
+++ b/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_cpp
@ -1,112 +0,0 @@
-$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.5 2012/08/07 08:55:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject.cpp.orig	Wed Jun 13 01:46:48 2012
-+++ js/src/vm/RegExpObject.cpp	Sun Jun 17 12:04:02 2012
-@@ -168,7 +168,6 @@ MatchPairs::checkAgainst(size_t inputLength)
- 
- /* detail::RegExpCode */
- 
-#if ENABLE_YARR_JIT
- void
- RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
- {
-@@ -200,46 +199,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
-     }
- }
- 
-#else /* !ENABLE_YARR_JIT */
-
-void
-RegExpCode::reportPCREError(JSContext *cx, int error)
-{
-#define REPORT(msg_) \
-    JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
-    return
-    switch (error) {
-      case -2: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      case 0: JS_NOT_REACHED("Precondition violation: an error must have occurred.");
-      case 1: REPORT(JSMSG_TRAILING_SLASH);
-      case 2: REPORT(JSMSG_TRAILING_SLASH);
-      case 3: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      case 4: REPORT(JSMSG_BAD_QUANTIFIER);
-      case 5: REPORT(JSMSG_BAD_QUANTIFIER);
-      case 6: REPORT(JSMSG_BAD_CLASS_RANGE);
-      case 7: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      case 8: REPORT(JSMSG_BAD_CLASS_RANGE);
-      case 9: REPORT(JSMSG_BAD_QUANTIFIER);
-      case 10: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN);
-      case 11: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      case 12: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN);
-      case 13: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      case 14: REPORT(JSMSG_MISSING_PAREN);
-      case 15: REPORT(JSMSG_BAD_BACKREF);
-      case 16: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      case 17: REPORT(JSMSG_REGEXP_TOO_COMPLEX);
-      default:
-        JS_NOT_REACHED("Precondition violation: unknown PCRE error code.");
-    }
-#undef REPORT
-}
-
-#endif /* ENABLE_YARR_JIT */
-
- bool
- RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags)
- {
-#if ENABLE_YARR_JIT
-     /* Parse the pattern. */
-     ErrorCode yarrError;
-     YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
-@@ -256,7 +218,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
-      * case we have to bytecode compile it.
-      */
- 
-#ifdef JS_METHODJIT
-+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
-     if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
-         JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
-         if (!execAlloc) {
-@@ -277,21 +239,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
-         return false;
-     }
- 
-+#if ENABLE_YARR_JIT
-     codeBlock.setFallBack(true);
-+#endif
-     byteCode = byteCompile(yarrPattern, bumpAlloc).get();
-     return true;
-#else /* !defined(ENABLE_YARR_JIT) */
-    int error = 0;
-    compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
-                  ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
-                  multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
-                  parenCount, &error);
-    if (error) {
-        reportPCREError(cx, error);
-        return false;
-    }
-    return true;
-#endif
- }
- 
- RegExpRunStatus
-@@ -306,18 +258,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
-     else
-         result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
- #else
-    result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
-+    result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
- #endif
- 
-     if (result == -1)
-         return RegExpRunStatus_Success_NotFound;
-
-#if !ENABLE_YARR_JIT
-    if (result < 0) {
-        reportPCREError(cx, result);
-        return RegExpRunStatus_Error;
-    }
-#endif
- 
-     JS_ASSERT(result >= 0);
-     return RegExpRunStatus_Success;
--- a/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_h
+++ b/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_h
@ -1,91 +0,0 @@
-$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.6 2012/08/07 08:55:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject.h.orig	Wed Jun 13 01:46:48 2012
-+++ js/src/vm/RegExpObject.h	Sun Jun 17 12:04:02 2012
-@@ -52,10 +52,8 @@
- #include "yarr/Yarr.h"
- #if ENABLE_YARR_JIT
- #include "yarr/YarrJIT.h"
-#include "yarr/YarrSyntaxChecker.h"
-#else
-#include "yarr/pcre/pcre.h"
- #endif
-+#include "yarr/YarrSyntaxChecker.h"
- 
- /*
-  * JavaScript Regular Expressions
-@@ -113,68 +111,51 @@ namespace detail {
- 
- class RegExpCode
- {
-#if ENABLE_YARR_JIT
-     typedef JSC::Yarr::BytecodePattern BytecodePattern;
-     typedef JSC::Yarr::ErrorCode ErrorCode;
-+    typedef JSC::Yarr::YarrPattern YarrPattern;
-+#if ENABLE_YARR_JIT
-     typedef JSC::Yarr::JSGlobalData JSGlobalData;
-     typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock;
-    typedef JSC::Yarr::YarrPattern YarrPattern;
- 
-     /* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */
-     YarrCodeBlock   codeBlock;
-    BytecodePattern *byteCode;
-#else
-    JSRegExp        *compiled;
- #endif
-+    BytecodePattern *byteCode;
- 
-   public:
-     RegExpCode()
-       :
- #if ENABLE_YARR_JIT
-         codeBlock(),
-        byteCode(NULL)
-#else
-        compiled(NULL)
- #endif
-+        byteCode(NULL)
-     { }
- 
-     ~RegExpCode() {
- #if ENABLE_YARR_JIT
-         codeBlock.release();
-+#endif
-         if (byteCode)
-             Foreground::delete_<BytecodePattern>(byteCode);
-#else
-        if (compiled)
-            jsRegExpFree(compiled);
-#endif
-     }
- 
-     static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
-#if ENABLE_YARR_JIT
-         ErrorCode error = JSC::Yarr::checkSyntax(*source);
-         if (error == JSC::Yarr::NoError)
-             return true;
- 
-         reportYarrError(cx, tokenStream, error);
-         return false;
-#else
-# error "Syntax checking not implemented for !ENABLE_YARR_JIT"
-#endif
-     }
- 
- #if ENABLE_YARR_JIT
-     static inline bool isJITRuntimeEnabled(JSContext *cx);
-    static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
-#else
-    static void reportPCREError(JSContext *cx, int error);
- #endif
-+    static void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error);
- 
-     static size_t getOutputSize(size_t pairCount) {
-#if ENABLE_YARR_JIT
-         return pairCount * 2;
-#else
-        return pairCount * 3; /* Should be x2, but PCRE has... needs. */
-#endif
-     }
- 
-     bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);
--- a/www/mozilla-firefox/patches/patch-js_src_yarr_wtfbridge_h
+++ b/www/mozilla-firefox/patches/patch-js_src_yarr_wtfbridge_h
@ -1,14 +0,0 @@
-$OpenBSD: patch-js_src_yarr_wtfbridge_h,v 1.2 2012/05/09 20:36:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/yarr/wtfbridge.h.orig	Wed Jan 11 18:14:49 2012
-+++ js/src/yarr/wtfbridge.h	Mon Jan 16 17:07:48 2012
-@@ -49,9 +49,7 @@
- #include "jsprvtd.h"
- #include "vm/String.h"
- #include "assembler/wtf/Platform.h"
-#if ENABLE_YARR_JIT
- #include "assembler/jit/ExecutableAllocator.h"
-#endif
- 
- namespace JSC { namespace Yarr {
- 
--- a/www/mozilla-firefox/patches/patch-media_libsydneyaudio_include_sydney_audio_h
+++ b/www/mozilla-firefox/patches/patch-media_libsydneyaudio_include_sydney_audio_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-media_libsydneyaudio_include_sydney_audio_h,v 1.2 2012/02/20 20:15:04 landry Exp $
--- media/libsydneyaudio/include/sydney_audio.h.orig	Wed Jan 11 18:14:57 2012
-+++ media/libsydneyaudio/include/sydney_audio.h	Sat Jan 14 20:31:04 2012
-@@ -48,7 +48,7 @@ async-signal safe.
+$OpenBSD: patch-media_libsydneyaudio_include_sydney_audio_h,v 1.3 2012/09/01 13:56:45 landry Exp $
+--- media/libsydneyaudio/include/sydney_audio.h.orig	Wed Aug 15 07:48:04 2012
+++ media/libsydneyaudio/include/sydney_audio.h	Sun Aug 19 13:50:30 2012
+@@ -20,7 +20,7 @@ async-signal safe.
 #if !defined (WIN32)
 #include <sys/param.h>
 #include <inttypes.h>
--- a/www/mozilla-firefox/patches/patch-media_libsydneyaudio_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-media_libsydneyaudio_src_Makefile_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.5 2012/03/16 21:31:24 landry Exp $
+$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.6 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- media/libsydneyaudio/src/Makefile.in.orig	Thu Feb  2 00:39:20 2012
-+++ media/libsydneyaudio/src/Makefile.in	Tue Feb 14 18:42:12 2012
-@@ -100,6 +100,12 @@ CSRCS		= \
+--- media/libsydneyaudio/src/Makefile.in.orig	Wed Aug 15 07:48:04 2012
+++ media/libsydneyaudio/src/Makefile.in	Sun Aug 19 13:50:30 2012
+@@ -68,6 +68,12 @@ CSRCS		= \
 		$(NULL)
 endif
 
--- a/www/mozilla-firefox/patches/patch-memory_mozalloc_mozalloc_cpp
+++ b/www/mozilla-firefox/patches/patch-memory_mozalloc_mozalloc_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-memory_mozalloc_mozalloc_cpp,v 1.2 2011/08/23 20:14:52 landry Exp $
--- memory/mozalloc/mozalloc.cpp.orig	Fri Jul 22 00:18:49 2011
-+++ memory/mozalloc/mozalloc.cpp	Sat Jul 30 15:37:51 2011
-@@ -45,6 +45,7 @@
+$OpenBSD: patch-memory_mozalloc_mozalloc_cpp,v 1.3 2012/09/01 13:56:45 landry Exp $
+--- memory/mozalloc/mozalloc.cpp.orig	Wed Aug 15 07:48:05 2012
+++ memory/mozalloc/mozalloc.cpp	Sun Aug 19 13:50:30 2012
+@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #if defined(MALLOC_H)
--- a/www/mozilla-firefox/patches/patch-mfbt_double-conversion_utils_h
+++ b/www/mozilla-firefox/patches/patch-mfbt_double-conversion_utils_h
@ -1,17 +0,0 @@
-$OpenBSD: patch-mfbt_double-conversion_utils_h,v 1.1 2012/08/07 08:55:40 landry Exp $
-http://hg.mozilla.org/mozilla-central/rev/72e4dea9d2b2
--- mfbt/double-conversion/utils.h.orig	Wed Jul 18 09:14:14 2012
-+++ mfbt/double-conversion/utils.h	Wed Jul 18 09:14:30 2012
-@@ -53,7 +53,11 @@
- // disabled.)
- // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
- #if defined(_M_X64) || defined(__x86_64__) || \
-    defined(__ARMEL__) || \
-+    defined(__ARMEL__) || defined(__avr32__) || \
-+    defined(__hppa__) || defined(__ia64__) || \
-+    defined(__mips__) || defined(__powerpc__) || \
-+    defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-+    defined(__SH4__) || defined(__alpha__) || \
-     defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
--- a/www/mozilla-firefox/patches/patch-netwerk_base_src_nsSocketTransportService2_cpp
+++ b/www/mozilla-firefox/patches/patch-netwerk_base_src_nsSocketTransportService2_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-netwerk_base_src_nsSocketTransportService2_cpp,v 1.2 2012/06/11 15:29:56 landry Exp $
+$OpenBSD: patch-netwerk_base_src_nsSocketTransportService2_cpp,v 1.3 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
 xpcshell hang during fake
--- netwerk/base/src/nsSocketTransportService2.cpp.orig	Wed May  2 05:17:08 2012
-+++ netwerk/base/src/nsSocketTransportService2.cpp	Wed May  9 23:06:35 2012
-@@ -54,14 +54,6 @@
+--- netwerk/base/src/nsSocketTransportService2.cpp.orig	Wed Aug 15 07:48:11 2012
+++ netwerk/base/src/nsSocketTransportService2.cpp	Sun Aug 19 13:50:34 2012
+@@ -21,14 +21,6 @@
 
 #include "mozilla/FunctionTimer.h"
 
@ -18,7 +18,7 @@ xpcshell hang during fake
 using namespace mozilla;
 
 #if defined(PR_LOGGING)
-@@ -617,8 +609,6 @@ nsSocketTransportService::Run()
+@@ -584,8 +576,6 @@ nsSocketTransportService::Run()
 {
     SOCKET_LOG(("STS thread init\n"));
 
@ -27,7 +27,7 @@ xpcshell hang during fake
     gSocketThread = PR_GetCurrentThread();
 
     // add thread event to poll list (mThreadEvent may be NULL)
-@@ -677,8 +667,6 @@ nsSocketTransportService::Run()
+@@ -644,8 +634,6 @@ nsSocketTransportService::Run()
     NS_ProcessPendingEvents(thread);
 
     gSocketThread = nsnull;
--- a/www/mozilla-firefox/patches/patch-netwerk_mime_nsMimeTypes_h
+++ b/www/mozilla-firefox/patches/patch-netwerk_mime_nsMimeTypes_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-netwerk_mime_nsMimeTypes_h,v 1.1 2012/08/07 08:55:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/a19f0356c09d
--- netwerk/mime/nsMimeTypes.h.orig	Fri Jul 13 23:43:11 2012
-+++ netwerk/mime/nsMimeTypes.h	Wed Jul 25 00:01:44 2012
-@@ -159,6 +159,7 @@
- #define TEXT_EVENT_STREAM                   "text/event-stream"
- 
- #define VIDEO_MPEG                          "video/mpeg"
-+#define VIDEO_MP4                           "video/mp4"
- #define VIDEO_RAW                           "video/x-raw-yuv"
- #define VIDEO_OGG                           "video/ogg"
- #define VIDEO_WEBM                          "video/webm"
--- a/www/mozilla-firefox/patches/patch-parser_html_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-parser_html_Makefile_in
@ -1,10 +1,10 @@
-$OpenBSD: patch-parser_html_Makefile_in,v 1.9 2012/06/11 15:29:56 landry Exp $
+$OpenBSD: patch-parser_html_Makefile_in,v 1.10 2012/09/01 13:56:45 landry Exp $

 gcc runs out of memory with optimization.

--- parser/html/Makefile.in.orig	Wed May  2 05:17:09 2012
-+++ parser/html/Makefile.in	Wed May  9 23:06:35 2012
-@@ -128,4 +128,7 @@ INCLUDES	+= \
+--- parser/html/Makefile.in.orig	Wed Aug 15 07:48:14 2012
+++ parser/html/Makefile.in	Sun Aug 19 13:50:38 2012
+@@ -96,4 +96,7 @@ INCLUDES	+= \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
--- a/www/mozilla-firefox/patches/patch-security_manager_pki_resources_content_exceptionDialog_js
+++ b/www/mozilla-firefox/patches/patch-security_manager_pki_resources_content_exceptionDialog_js
@ -1,8 +1,8 @@
-$OpenBSD: patch-security_manager_pki_resources_content_exceptionDialog_js,v 1.3 2011/06/19 21:14:02 landry Exp $
+$OpenBSD: patch-security_manager_pki_resources_content_exceptionDialog_js,v 1.4 2012/09/01 13:56:45 landry Exp $
 Focus the 'add exception' button in the unknown ssl cert warning window
--- security/manager/pki/resources/content/exceptionDialog.js.orig	Wed Jul 21 02:52:39 2010
-+++ security/manager/pki/resources/content/exceptionDialog.js	Sun Aug  1 12:58:33 2010
-@@ -283,6 +283,7 @@ function updateCertStatus() {
+--- security/manager/pki/resources/content/exceptionDialog.js.orig	Wed Aug 15 07:48:16 2012
+++ security/manager/pki/resources/content/exceptionDialog.js	Sun Aug 19 13:50:38 2012
+@@ -249,6 +249,7 @@ function updateCertStatus() {
       
       // In these cases, we do want to enable the "Add Exception" button
       gDialog.getButton("extra1").disabled = false;
--- a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.10 2012/06/11 15:29:56 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig	Wed May  2 05:17:09 2012
-+++ security/manager/ssl/src/Makefile.in	Wed May  9 23:06:35 2012
-@@ -116,7 +116,10 @@ CSRCS += md4.c
+$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.11 2012/09/01 13:56:45 landry Exp $
+--- security/manager/ssl/src/Makefile.in.orig	Wed Aug 15 07:48:16 2012
+++ security/manager/ssl/src/Makefile.in	Sun Aug 19 13:50:38 2012
+@@ -83,7 +83,10 @@ CSRCS += md4.c
 
 EXTRA_DEPS = $(NSS_DEP_LIBS)
 
--- a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_SSLServerCertVerification_cpp
+++ b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_SSLServerCertVerification_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-security_manager_ssl_src_SSLServerCertVerification_cpp,v 1.2 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-security_manager_ssl_src_SSLServerCertVerification_cpp,v 1.3 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
 xpcshell hang during fake
--- security/manager/ssl/src/SSLServerCertVerification.cpp.orig	Wed Apr 11 15:55:18 2012
-+++ security/manager/ssl/src/SSLServerCertVerification.cpp	Thu Apr 19 10:40:52 2012
-@@ -164,23 +164,25 @@ NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+--- security/manager/ssl/src/SSLServerCertVerification.cpp.orig	Wed Aug 15 07:48:16 2012
+++ security/manager/ssl/src/SSLServerCertVerification.cpp	Sun Aug 19 13:50:38 2012
+@@ -128,23 +128,25 @@ NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
 NSSCleanupAutoPtrClass_WithParam(PRArenaPool, PORT_FreeArena, FalseParam, false)
 
@ -39,7 +39,7 @@ xpcshell hang during fake
   // TODO: tuning, make parameters preferences
   // XXX: instantiate nsThreadPool directly, to make this more bulletproof.
   // Currently, the nsThreadPool.h header isn't exported for us to do so.
-@@ -208,10 +210,19 @@ InitializeSSLServerCertVerificationThreads()
+@@ -172,10 +174,19 @@ InitializeSSLServerCertVerificationThreads()
 // nsNSSShutdownPreventionLock where needed (not here) to prevent that.
 void StopSSLServerCertVerificationThreads()
 {
--- a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_SSLServerCertVerification_h
+++ b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_SSLServerCertVerification_h
@ -1,9 +1,9 @@
-$OpenBSD: patch-security_manager_ssl_src_SSLServerCertVerification_h,v 1.2 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-security_manager_ssl_src_SSLServerCertVerification_h,v 1.3 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
 xpcshell hang during fake
--- security/manager/ssl/src/SSLServerCertVerification.h.orig	Wed Apr 11 15:55:18 2012
-+++ security/manager/ssl/src/SSLServerCertVerification.h	Wed Apr 18 22:30:32 2012
-@@ -51,6 +51,10 @@ namespace mozilla { namespace psm {
+--- security/manager/ssl/src/SSLServerCertVerification.h.orig	Wed Aug 15 07:48:16 2012
+++ security/manager/ssl/src/SSLServerCertVerification.h	Sun Aug 19 13:50:39 2012
+@@ -14,6 +14,10 @@ namespace mozilla { namespace psm {
 SECStatus AuthCertificateHook(void *arg, PRFileDesc *fd, 
                               PRBool checkSig, PRBool isServer);
 
--- a/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
+++ b/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.16 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.17 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
 xpcshell hang during fake
--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Wed Jun 13 01:47:04 2012
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Sun Jun 17 12:04:03 2012
-@@ -111,6 +111,7 @@
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Wed Aug 15 07:48:16 2012
+++ security/manager/ssl/src/nsNSSComponent.cpp	Sun Aug 19 13:50:39 2012
+@@ -71,6 +71,7 @@
 #include "secerr.h"
 #include "sslerr.h"
 #include "cert.h"
@ -11,15 +11,7 @@ xpcshell hang during fake
 
 #include "nsXULAppAPI.h"
 
-@@ -124,6 +125,7 @@ extern "C" {
- }
- 
- using namespace mozilla;
-+using namespace mozilla::psm;
- 
- #ifdef PR_LOGGING
- PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -395,6 +397,8 @@ nsNSSComponent::deleteBackgroundThreads()
+@@ -356,6 +357,8 @@ nsNSSComponent::deleteBackgroundThreads()
     delete mCertVerificationThread;
     mCertVerificationThread = nsnull;
   }
@ -28,7 +20,7 @@ xpcshell hang during fake
 }
 
 void
-@@ -402,21 +406,20 @@ nsNSSComponent::createBackgroundThreads()
+@@ -363,21 +366,20 @@ nsNSSComponent::createBackgroundThreads()
 {
   NS_ASSERTION(mCertVerificationThread == nsnull,
                "Cert verification thread already created.");
@ -52,7 +44,7 @@ xpcshell hang during fake
   if (mUpdateTimerInitialized) {
     {
       MutexAutoLock lock(mCrlTimerLock);
-@@ -844,7 +847,7 @@ nsNSSComponent::InstallLoadableRoots()
+@@ -806,7 +808,7 @@ nsNSSComponent::InstallLoadableRoots()
 
     if (!possible_ckbi_locations[il])
     {
@ -61,7 +53,7 @@ xpcshell hang during fake
     }
     else
     {
-@@ -1907,6 +1910,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
+@@ -1869,6 +1871,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
 
       LaunchSmartCardThreads();
 
@ -70,7 +62,7 @@ xpcshell hang during fake
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
     }
   }
-@@ -2049,16 +2054,6 @@ nsNSSComponent::Init()
+@@ -2012,16 +2016,6 @@ nsNSSComponent::Init()
   if (mClientAuthRememberService)
     mClientAuthRememberService->Init();
 
@ -87,7 +79,7 @@ xpcshell hang during fake
   InitializeCRLUpdateTimer();
   RegisterPSMContentListener();
 
-@@ -2273,6 +2268,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
+@@ -2236,6 +2230,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
     DoProfileChangeTeardown(aSubject);
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
@ -95,7 +87,7 @@ xpcshell hang during fake
     mShutdownObjectList->allowUI();
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
-@@ -2320,6 +2316,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
+@@ -2283,6 +2278,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
     InitializeCRLUpdateTimer();
   }
   else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
@ -103,7 +95,7 @@ xpcshell hang during fake
 
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
 
-@@ -2610,6 +2607,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
+@@ -2573,6 +2569,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
 void
 nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
 {
@ -113,7 +105,7 @@ xpcshell hang during fake
   bool callVeto = false;
 
   if (!mShutdownObjectList->ifPossibleDisallowUI()) {
-@@ -2663,9 +2663,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
+@@ -2626,9 +2625,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
 void
 nsNSSComponent::DoProfileChangeNetRestore()
 {
--- a/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp
+++ b/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.12 2012/06/11 15:29:56 landry Exp $
+$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.13 2012/09/01 13:56:45 landry Exp $
 set secure_delete PRAGMA on by default, instead of using internal sqlite copy
 https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- storage/src/mozStorageConnection.cpp.orig	Wed May  2 05:17:12 2012
-+++ storage/src/mozStorageConnection.cpp	Wed May  9 23:06:35 2012
-@@ -700,6 +700,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
+--- storage/src/mozStorageConnection.cpp.orig	Wed Aug 15 07:48:19 2012
+++ storage/src/mozStorageConnection.cpp	Sun Aug 19 13:50:39 2012
+@@ -663,6 +663,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
     return convertResultCode(srv);
   }
 
--- a/www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.6 2012/08/07 08:55:40 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig	Wed Jun 13 01:47:08 2012
-+++ toolkit/components/downloads/nsDownloadManager.cpp	Sun Jun 17 12:04:03 2012
-@@ -1197,7 +1197,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
+$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.7 2012/09/01 13:56:45 landry Exp $
+--- toolkit/components/downloads/nsDownloadManager.cpp.orig	Wed Aug 15 07:48:28 2012
+++ toolkit/components/downloads/nsDownloadManager.cpp	Sun Aug 19 13:50:39 2012
+@@ -1165,7 +1165,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
     rv = downloadDir->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
     if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.6 2012/08
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
-@@ -1305,7 +1305,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+@@ -1273,7 +1273,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
           (void)customDirectory->Exists(&exists);
 
           if (!exists) {
--- a/www/mozilla-firefox/patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp
@ -1,18 +0,0 @@
-$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.5 2011/04/19 09:16:33 landry Exp $
-OBSD specific patch
--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig	Wed Feb 23 06:53:51 2011
-+++ toolkit/crashreporter/client/crashreporter_linux.cpp	Sat Feb 26 09:25:37 2011
-@@ -364,11 +364,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
- 
- void TryInitGnome()
- {
-  gnomeLib = dlopen("libgnome-2.so.0", RTLD_LAZY);
-+  gnomeLib = dlopen("libgnome-2.so", RTLD_LAZY);
-   if (!gnomeLib)
-     return;
- 
-  gnomeuiLib = dlopen("libgnomeui-2.so.0", RTLD_LAZY);
-+  gnomeuiLib = dlopen("libgnomeui-2.so", RTLD_LAZY);
-   if (!gnomeuiLib)
-     return;
- 
--- a/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-toolkit_library_Makefile_in,v 1.17 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-toolkit_library_Makefile_in,v 1.18 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
 https://bugzilla.mozilla.org/show_bug.cgi?id=648730
--- toolkit/library/Makefile.in.orig	Wed Jun 13 01:47:09 2012
-+++ toolkit/library/Makefile.in	Sun Jun 17 12:04:03 2012
-@@ -457,6 +457,12 @@ OS_LIBS += \
+--- toolkit/library/Makefile.in.orig	Wed Aug 15 07:48:32 2012
+++ toolkit/library/Makefile.in	Sun Aug 19 13:50:39 2012
+@@ -464,6 +464,12 @@ OS_LIBS += \
   $(NULL)
 endif
 
@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
 ifeq ($(OS_ARCH),Darwin)
 ifdef MOZ_SYDNEYAUDIO
 OS_LIBS += \
-@@ -468,12 +474,6 @@ OS_LIBS += \
+@@ -475,12 +481,6 @@ OS_LIBS += \
   -framework Foundation \
   -framework AppKit \
   $(NULL)
--- a/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
+++ b/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.12 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.13 2012/09/01 13:56:45 landry Exp $
 install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig	Fri Jul 13 23:43:16 2012
-+++ toolkit/mozapps/installer/packager.mk	Tue Jul 17 18:05:03 2012
-@@ -934,7 +934,7 @@ endif
+--- toolkit/mozapps/installer/packager.mk.orig	Wed Aug 15 07:48:33 2012
+++ toolkit/mozapps/installer/packager.mk	Sun Aug 19 13:50:39 2012
+@@ -907,7 +907,7 @@ endif
 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
 	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--- a/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.13 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.14 2012/09/01 13:56:45 landry Exp $
 Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig	Wed Jun 13 01:47:14 2012
-+++ toolkit/xre/nsXREDirProvider.cpp	Sun Jun 17 12:04:03 2012
-@@ -1171,11 +1171,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
+--- toolkit/xre/nsXREDirProvider.cpp.orig	Wed Aug 15 07:48:34 2012
+++ toolkit/xre/nsXREDirProvider.cpp	Sun Aug 19 13:50:39 2012
+@@ -1177,11 +1177,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
   NS_ENSURE_SUCCESS(rv, rv);
 #elif defined(XP_UNIX)
   static const char *const sysSExtDir = 
--- a/www/mozilla-firefox/patches/patch-uriloader_exthandler_nsExternalHelperAppService_cpp
+++ b/www/mozilla-firefox/patches/patch-uriloader_exthandler_nsExternalHelperAppService_cpp
@ -1,22 +0,0 @@
-$OpenBSD: patch-uriloader_exthandler_nsExternalHelperAppService_cpp,v 1.1 2012/08/07 08:55:40 landry Exp $
-https://hg.mozilla.org/mozilla-central/rev/a19f0356c09d
--- uriloader/exthandler/nsExternalHelperAppService.cpp.orig	Fri Jul 13 23:43:17 2012
-+++ uriloader/exthandler/nsExternalHelperAppService.cpp	Wed Jul 25 00:02:32 2012
-@@ -437,6 +437,9 @@ static nsDefaultMimeTypeEntry defaultMimeEntries [] = 
-   { VIDEO_WEBM, "webm" },
-   { AUDIO_WEBM, "webm" },
- #endif
-+#ifdef MOZ_GSTREAMER
-+  { VIDEO_MP4, "mp4" },
-+#endif
- #ifdef MOZ_RAW
-   { VIDEO_RAW, "yuv" }
- #endif
-@@ -507,6 +510,7 @@ static nsExtraMimeTypeEntry extraMimeEntries [] =
-   { AUDIO_OGG, "oga", "Ogg Audio" },
-   { VIDEO_WEBM, "webm", "Web Media Video" },
-   { AUDIO_WEBM, "webm", "Web Media Audio" },
-+  { VIDEO_MP4, "mp4", "MPEG-4 Video" },
-   { VIDEO_RAW, "yuv", "Raw YUV Video" },
-   { AUDIO_WAV, "wav", "Waveform Audio" }
- };
--- a/www/mozilla-firefox/patches/patch-widget_gtk2_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-widget_gtk2_Makefile_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-widget_gtk2_Makefile_in,v 1.1 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-widget_gtk2_Makefile_in,v 1.2 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- widget/gtk2/Makefile.in.orig	Wed Apr 11 15:55:23 2012
-+++ widget/gtk2/Makefile.in	Wed Apr 18 22:09:30 2012
-@@ -53,6 +53,11 @@ LIBXUL_LIBRARY = 1
+--- widget/gtk2/Makefile.in.orig	Wed Aug 15 07:48:37 2012
+++ widget/gtk2/Makefile.in	Sun Aug 19 13:50:41 2012
+@@ -21,6 +21,11 @@ LIBXUL_LIBRARY = 1
 NATIVE_THEME_SUPPORT = 1
 
 
--- a/www/mozilla-firefox/patches/patch-widget_xpwidgets_nsPrintSettingsImpl_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_xpwidgets_nsPrintSettingsImpl_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-widget_xpwidgets_nsPrintSettingsImpl_cpp,v 1.1 2012/04/30 15:28:42 landry Exp $
--- widget/xpwidgets/nsPrintSettingsImpl.cpp.orig	Wed Apr 11 15:55:24 2012
-+++ widget/xpwidgets/nsPrintSettingsImpl.cpp	Wed Apr 18 22:09:41 2012
-@@ -61,7 +61,7 @@ nsPrintSettings::nsPrintSettings() :
+$OpenBSD: patch-widget_xpwidgets_nsPrintSettingsImpl_cpp,v 1.2 2012/09/01 13:56:45 landry Exp $
+--- widget/xpwidgets/nsPrintSettingsImpl.cpp.orig	Wed Aug 15 07:48:38 2012
+++ widget/xpwidgets/nsPrintSettingsImpl.cpp	Sun Aug 19 13:50:41 2012
+@@ -29,7 +29,7 @@ nsPrintSettings::nsPrintSettings() :
   mIsCancelled(false),
   mPrintSilent(false),
   mPrintPreview(false),
--- a/www/mozilla-firefox/patches/patch-xpcom_io_SpecialSystemDirectory_cpp
+++ b/www/mozilla-firefox/patches/patch-xpcom_io_SpecialSystemDirectory_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.6 2012/04/30 15:28:42 landry Exp $
--- xpcom/io/SpecialSystemDirectory.cpp.orig	Wed Apr 11 15:55:24 2012
-+++ xpcom/io/SpecialSystemDirectory.cpp	Wed Apr 18 22:09:41 2012
-@@ -445,7 +445,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
+$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.7 2012/09/01 13:56:45 landry Exp $
+--- xpcom/io/SpecialSystemDirectory.cpp.orig	Wed Aug 15 07:48:38 2012
+++ xpcom/io/SpecialSystemDirectory.cpp	Sun Aug 19 13:50:41 2012
+@@ -408,7 +408,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
     if (NS_FAILED(rv))
         return rv;
     if (!exists) {
--- a/www/mozilla-firefox/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
+++ b/www/mozilla-firefox/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-xpcom_io_nsAppFileLocationProvider_cpp,v 1.5 2012/02/20 20:15:04 landry Exp $
+$OpenBSD: patch-xpcom_io_nsAppFileLocationProvider_cpp,v 1.6 2012/09/01 13:56:45 landry Exp $
 Lookup for plugins in LOCALBASE
--- xpcom/io/nsAppFileLocationProvider.cpp.orig	Wed Jan 11 18:15:09 2012
-+++ xpcom/io/nsAppFileLocationProvider.cpp	Sat Jan 14 20:33:38 2012
-@@ -240,12 +240,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, b
+--- xpcom/io/nsAppFileLocationProvider.cpp.orig	Wed Aug 15 07:48:38 2012
+++ xpcom/io/nsAppFileLocationProvider.cpp	Sun Aug 19 13:50:41 2012
+@@ -206,12 +206,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, b
 #ifdef XP_UNIX
     else if (nsCRT::strcmp(prop, NS_SYSTEM_PLUGINS_DIR) == 0) {
 #ifdef ENABLE_SYSTEM_EXTENSION_DIRS
--- a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.17 2012/03/16 21:31:24 landry Exp $
-chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Feb  2 00:39:44 2012
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Tue Feb 14 18:42:23 2012
-@@ -197,7 +197,7 @@ endif
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.18 2012/09/01 13:56:45 landry Exp $
+https://bugzilla.mozilla.org/show_bug.cgi?id=783875
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Aug 15 07:48:38 2012
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Aug 19 13:50:41 2012
+@@ -165,7 +165,7 @@ endif
 #
 # OpenBSD/ARM
 #
--- a/www/mozilla-firefox/patches/patch-xulrunner_app_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-xulrunner_app_Makefile_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.8 2012/08/07 08:55:40 landry Exp $
+$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.9 2012/09/01 13:56:45 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- xulrunner/app/Makefile.in.orig	Wed Jun 13 01:47:16 2012
-+++ xulrunner/app/Makefile.in	Sun Jun 17 12:04:03 2012
-@@ -83,6 +83,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+--- xulrunner/app/Makefile.in.orig	Wed Aug 15 07:48:39 2012
+++ xulrunner/app/Makefile.in	Sun Aug 19 13:50:41 2012
+@@ -41,6 +41,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 endif
 
--- a/www/mozilla-firefox/patches/patch-xulrunner_setup_nsXULAppInstall_js
+++ b/www/mozilla-firefox/patches/patch-xulrunner_setup_nsXULAppInstall_js
@ -1,6 +1,6 @@
--- xulrunner/setup/nsXULAppInstall.js.orig	Wed Jul 21 02:53:09 2010
-+++ xulrunner/setup/nsXULAppInstall.js	Sun Aug  1 13:01:43 2010
-@@ -243,7 +243,7 @@ AppInstall.prototype = {
+--- xulrunner/setup/nsXULAppInstall.js.orig	Wed Aug 15 07:48:39 2012
+++ xulrunner/setup/nsXULAppInstall.js	Sun Aug 19 13:50:41 2012
+@@ -210,7 +210,7 @@ AppInstall.prototype = {
 #else
       aDirectory = Components.classes["@mozilla.org/file/local;1"].
         createInstance(nsILocalFile);
--- a/www/mozilla-firefox/pkg/PLIST
+++ b/www/mozilla-firefox/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.45 2012/08/07 08:55:40 landry Exp $
+@comment $OpenBSD: PLIST,v 1.46 2012/09/01 13:56:45 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@conflict mozilla-firefox-*
@ -7,53 +7,52 @@
@pkgpath www/mozilla-firefox,-main
 bin/${MOZILLA_PROJECT}
 bin/mozilla-${MOZILLA_PROJECT}
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/blocklist.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome.manifest
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default16.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default32.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default48.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/binary.manifest
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION}
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/pref/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/pref/channel-prefs.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dependentlibs.list
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.aff
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.dic
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}-bin
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/mozicon128.png
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/mozilla-xremote-client
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/omni.ja
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/platform.ini
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/plugin-container
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/removed-files
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/run-mozilla.sh
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/amazondotcom.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/bing.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/eBay.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/google.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/twitter.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/wikipedia.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/yahoo.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/application.ini
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/blocklist.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome.manifest
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default.png
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default16.png
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default32.png
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default48.png
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/components/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/components/binary.manifest
+@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION}
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/channel-prefs.js
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dependentlibs.list
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/en-US.aff
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/en-US.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/${MOZILLA_PROJECT}
+@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/${MOZILLA_PROJECT}-bin
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/icons/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/icons/mozicon128.png
+@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozalloc.so.${LIBmozalloc_VERSION}
+@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libxpcom.so.${LIBxpcom_VERSION}
+@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libxul.so.${LIBxul_VERSION}
+@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/mozilla-xremote-client
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/omni.ja
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/platform.ini
+@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/plugin-container
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/removed-files
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/run-mozilla.sh
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/amazondotcom.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/bing.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/eBay.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/google.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/twitter.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/wikipedia.xml
+lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/searchplugins/yahoo.xml
@man man/man1/${MOZILLA_PROJECT}.1
@man man/man1/mozilla-${MOZILLA_PROJECT}.1
 share/applications/${MOZILLA_PROJECT}.desktop