Update www/mozilla-firefox from 3.0.19 to 3.6.3, merging the wip done in

www/firefox36 mostly by martynas@ and naddy@. Note that the java plugin from devel/jdk currently doesn't work with this version of firefox, in the meantime users really needed it will have to use www/firefox35. ok naddy@
2010-04-26 19:55:58 +00:00 · 2010-04-26 19:55:58 +00:00 · ad076fd40f
commit ad076fd40f
parent 2b17a5c9b7
96 changed files with 5928 additions and 466 deletions
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@ -1,27 +1,19 @@
-# $OpenBSD: Makefile,v 1.133 2010/04/04 19:11:42 naddy Exp $
+# $OpenBSD: Makefile,v 1.134 2010/04/26 19:55:58 landry Exp $

 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64

 COMMENT=	redesign of Mozilla's browser component

-VER=		3.0.19
-DISTNAME=	mozilla
+VER=		3.6.3
+DISTNAME=	mozilla-1.9.2
 PKGNAME=	mozilla-firefox-${VER}
-SO_VERSION=	20.0
+SO_VERSION=	21.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
-.for _lib in accessibility appcomps auth autoconfig browsercomps \
-	browserdirprovider caps chardet chrome commandlines composer \
-	cookie docshell embedcomponents fileview gkgfxthebes gklayout \
-	gkplugin htmlpars i18n imgicon imglib2 intlapp jar50 jsd \
-	mozfind necko nsappshell oji permissions pipboot pipnss \
-	pippki places pref rdf remoteservice satchel spellchecker \
-	storagecomps system-pref tkautocomplete toolkitcomps txmgr \
-	uconv ucvmath universalchardet unixproxy webbrwsr widget_gtk2 \
-	windowds xmlextras xpconnect xpinstall zipwriter gfxpsshar \
-	gkgfx gtkxtbin jsj mozjs mozlcms thebes xpcom xpcom_core \
-	xul nullplugin unixprintplugin
+.for _lib in browsercomps browserdirprovider imgicon freebl3 mozjs \
+	nspr4 nss3 nssckbi nssdbm3 nssutil3 plc4 plds4 smime3 \
+	softokn3 ssl3 xpcom xul nullplugin unixprintplugin
 SHARED_LIBS+=	${_lib}	${SO_VERSION}
 .endfor

@ -38,22 +30,20 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${VER}-real/source/
-DISTFILES=	firefox-${VER}-source.tar.bz2
+MASTER_SITES=	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/
+DISTFILES=	firefox-${VER}.source.tar.bz2

 MODULES=	devel/gettext lang/python
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 BUILD_DEPENDS=	:libIDL-*:devel/libIDL \
 		:zip->=2.3:archivers/zip
 LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
-		nspr4.>=21,plc4.>=21,plds4.>=21:nspr->=4.8:devel/nspr \
-		nss3.>=23,smime3.>=23,softokn3.>=23,ssl3.>=23:nss->=3.12.3:security/nss \
-		sqlite3.>=10.0:sqlite3->=3.6.7:databases/sqlite3
-WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi \
+		sqlite3.>=13.3:sqlite3->=3.6.16:databases/sqlite3
+WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
 		Xinerama Xrandr Xrender Xt atk-1.0 c cairo expat fontconfig \
 		freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
 		gthread-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		pixman-1 png pthread pthread-stubs stdc++ xcb z
+		pixman-1 png pthread pthread-stubs sndio stdc++ xcb z

 VMEM_WARNING=	Yes

@ -62,14 +52,14 @@ USE_GMAKE=	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS=	Yes

-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf
+MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build/autoconf \
+				${WRKSRC}/js/src/build/autoconf \
+				${WRKSRC}/nsprpub/build/autoconf

 AUTOCONF_VERSION= 2.13
 CONFIGURE_STYLE= autoconf no-autoheader
 CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--with-system-zlib=/usr/lib	\
-		--with-system-nspr		\
-		--with-system-nss		\
 		--with-pthreads			\
 		--enable-xft			\
 		--disable-optimize		\
@ -92,8 +82,9 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOCALBASE}	\
 		--enable-system-cairo		\
 		--enable-system-sqlite		\
 		--enable-canvas			\
-		--disable-libxul		\
 		--disable-crashreporter		\
+		--disable-libnotify		\
+		--disable-necko-wifi		\
 		--enable-official-branding

 # from browser/config/mozconfig
@ -107,6 +98,8 @@ MAKE_ENV=	MOZ_CO_PROJECT=browser \
 		LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
 		BUILD_OFFICIAL=1 \
 		MOZILLA_OFFICIAL=1 \
+		NSS_ENABLE_ECC=1 \
+		NSS_USE_SYSTEM_SQLITE=1 \
 		SO_VERSION="${SO_VERSION}"
 CONFIGURE_ENV=	${MAKE_ENV} \
 		MOZ_ENABLE_COREXFONTS=1 \
@ -121,11 +114,16 @@ DATADIRS=	chrome components defaults dictionaries extensions \
 		greprefs icons modules plugins res searchplugins

 post-extract:
+	@find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
 	@cp -f ${FILESDIR}/nsSound.cpp ${WRKSRC}/widget/src/gtk2/
+	@cp -f ${FILESDIR}/sydney_audio_sndio.c \
+		${WRKSRC}/media/libsydneyaudio/src/

 pre-configure:
+	cd ${WRKSRC}/js/src && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
+	cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
 	perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
-		${WRKSRC}/browser/app/mozilla.in \
+		${WRKSRC}/build/unix/mozilla.in \
 		${WRKSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp \
 		${WRKSRC}/js/src/xpconnect/shell/Makefile.in \
 		${WRKSRC}/toolkit/xre/nsXREDirProvider.cpp
--- a/www/mozilla-firefox/distinfo
+++ b/www/mozilla-firefox/distinfo
@ -1,5 +1,5 @@
-MD5 (firefox-3.0.19-source.tar.bz2) = RR7h30OwV8es05gAvnJrdw==
-RMD160 (firefox-3.0.19-source.tar.bz2) = JtDQAZ3BiU5ou2feQpG3bFet/M4=
-SHA1 (firefox-3.0.19-source.tar.bz2) = TmHKEPU4ao/HElXW9tMzdQdqNio=
-SHA256 (firefox-3.0.19-source.tar.bz2) = LwC5QUTbfpgFTic2CKQoq+rfcmCdUjm1sk2NptfH89o=
-SIZE (firefox-3.0.19-source.tar.bz2) = 37392306
+MD5 (firefox-3.6.3.source.tar.bz2) = XkVBqyMIS3sUuiKCkc4miA==
+RMD160 (firefox-3.6.3.source.tar.bz2) = 3lVuhga7xhy30g/m8wjwxei53Xc=
+SHA1 (firefox-3.6.3.source.tar.bz2) = 87zYCDVtFr2ya/zxpkolFIjE/QI=
+SHA256 (firefox-3.6.3.source.tar.bz2) = NaCzXXm6pQK2xXge0+nEtetiO9rxlARg3PRlGShIotA=
+SIZE (firefox-3.6.3.source.tar.bz2) = 48633061
--- a/www/mozilla-firefox/files/README.OpenBSD
+++ b/www/mozilla-firefox/files/README.OpenBSD
@ -1,4 +1,4 @@
-$OpenBSD: README.OpenBSD,v 1.9 2008/12/16 22:33:27 naddy Exp $
+$OpenBSD: README.OpenBSD,v 1.10 2010/04/26 19:55:58 landry Exp $

 If you encounter strange problems relating to bookmarks, downloads,
 window placement, toolbars, history, or other settings, it is
--- a/www/mozilla-firefox/files/nsSound.cpp
+++ b/www/mozilla-firefox/files/nsSound.cpp
@ -1,4 +1,4 @@
-/*	$OpenBSD: nsSound.cpp,v 1.1 2009/05/01 22:53:25 martynas Exp $	*/
+/*	$OpenBSD: nsSound.cpp,v 1.2 2010/04/26 19:55:58 landry Exp $	*/

 /*
 * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@ -66,6 +66,7 @@
 #include "nsNetUtil.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
+#include "nsString.h"

 #include <prthread.h>
 #include <sndio.h>
@ -76,26 +77,26 @@

 #define WAV_MIN_LENGTH 44

-typedef struct sio_hdl * (PR_CALLBACK *SioOpenType)(char *,
-                          unsigned, int);
-typedef void (PR_CALLBACK *SioCloseType)(struct sio_hdl *);
-typedef int (PR_CALLBACK *SioSetparType)(struct sio_hdl *,
-                                         struct sio_par *);
-typedef int (PR_CALLBACK *SioGetparType)(struct sio_hdl *,
-                                         struct sio_par *);
-typedef int (PR_CALLBACK *SioStartType)(struct sio_hdl *);
-typedef size_t (PR_CALLBACK *SioWriteType)(struct sio_hdl *,
-                                           void *, size_t);
-typedef int (PR_CALLBACK *SioEofType)(struct sio_hdl *);
-typedef void (PR_CALLBACK *SioInitparType)(struct sio_par *);
-
 typedef struct {
    struct sio_hdl *sndio_hdl;
    void *audio;
    size_t audio_len;
 } SioThreadData;

-static PRLibrary *sndio_lib = nsnull;
+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)

@ -107,30 +108,13 @@ RunSioThread(void *arg)

    td = (SioThreadData *)arg;

-    /* Close the stream if fail. */
-    SioCloseType SioClose =
-        (SioCloseType) PR_FindFunctionSymbol(sndio_lib, "sio_close");
-
    /* Write stream. */
-    SioWriteType SioWrite =
-        (SioWriteType) PR_FindFunctionSymbol(sndio_lib, "sio_write");
-    SioEofType SioEof =
-        (SioEofType) PR_FindFunctionSymbol(sndio_lib, "sio_eof");
-    if (!SioWrite || !SioEof) {
-        if (SioClose)
-            (*SioClose)(td->sndio_hdl);
-        free(td->audio);
-        free(td);
-        return;
-    }
-
-    if ((*SioWrite)(td->sndio_hdl, (void *)td->audio,
-        td->audio_len) == 0 && (*SioEof)(td->sndio_hdl)) {
+    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");
    }

-    if (SioClose)
-        (*SioClose)(td->sndio_hdl);
+    sio_close(td->sndio_hdl);

    free(td->audio);
    free(td);
@ -148,26 +132,44 @@ 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;
-    if (sndio_lib)
-        return NS_OK;
-
-    sndio_lib = PR_LoadLibrary("libsndio.so");
-    if (!sndio_lib)
-        return NS_ERROR_FAILURE;

    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 (sndio_lib) {
-        PR_UnloadLibrary(sndio_lib);
-        sndio_lib = nsnull;
+    if (canberra_lib) {
+        PR_UnloadLibrary(canberra_lib);
+        canberra_lib = nsnull;
    }
 }

@ -280,31 +282,14 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
        return NS_OK;

    /* Open up connection to sndio. */
-    SioOpenType SioOpen =
-        (SioOpenType) PR_FindFunctionSymbol(sndio_lib, "sio_open");
-    if (!SioOpen)
-        return NS_ERROR_FAILURE;
-
-    sndio_hdl = SioOpen(NULL, SIO_PLAY, 0);
+    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;
    }

-    /* Close the stream if fail. */
-    SioCloseType SioClose =
-        (SioCloseType) PR_FindFunctionSymbol(sndio_lib, "sio_close");
-
    /* Initialize parameters structure. */
-    SioInitparType SioInitpar =
-        (SioInitparType) PR_FindFunctionSymbol(sndio_lib, "sio_initpar");
-    if (!SioInitpar) {
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    (*SioInitpar)(&sndio_par);
+    sio_initpar(&sndio_par);
    sndio_par.bits = bits_per_sample;
    sndio_par.le = SIO_LE_NATIVE;
    sndio_par.pchan = channels;
@ -313,23 +298,10 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,

    /* Set and get configuration set.
       Put the stream into writing state. */
-    SioSetparType SioSetpar =
-        (SioSetparType) PR_FindFunctionSymbol(sndio_lib, "sio_setpar");
-    SioGetparType SioGetpar =
-        (SioGetparType) PR_FindFunctionSymbol(sndio_lib, "sio_getpar");
-    SioStartType SioStart =
-        (SioStartType) PR_FindFunctionSymbol(sndio_lib, "sio_start");
-    if (!SioSetpar || !SioGetpar || !SioStart) {
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
-        return NS_ERROR_FAILURE;
-    }
-
-    if (!(*SioSetpar)(sndio_hdl, &sndio_par) ||
-        !(*SioGetpar)(sndio_hdl, &sndio_par) || !(*SioStart)(sndio_hdl)) {
+    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");
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
+        sio_close(sndio_hdl);
        return NS_ERROR_FAILURE;
    }

@ -337,15 +309,13 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
    if (sndio_par.bits != bits_per_sample || sndio_par.pchan != channels ||
        sndio_par.rate != samples_per_sec) {
        NS_WARNING("configuration is not available");
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
+        sio_close(sndio_hdl);
        return NS_ERROR_FAILURE;
    }

    if ((td = (SioThreadData *) malloc(sizeof(SioThreadData))) == NULL ||
        (td->audio = malloc(audio_len * sizeof(*audio))) == NULL) {
-        if (SioClose)
-            (*SioClose)(sndio_hdl);
+        sio_close(sndio_hdl);
        return NS_ERROR_FAILURE;
    }

@ -372,19 +342,105 @@ NS_METHOD nsSound::Play(nsIURL *aURL)
    if (!mInited)
        Init();

-    if (!sndio_lib)
-	    return NS_ERROR_FAILURE;
-
    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 (aSoundAlias.EqualsLiteral("_moz_mailbeep")) {
-        return Beep();
+    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;
@ -406,3 +462,4 @@ NS_IMETHODIMP nsSound::PlaySystemSound(const nsAString &aSoundAlias)

    return rv;
 }
+
--- a/www/mozilla-firefox/files/sydney_audio_sndio.c
+++ b/www/mozilla-firefox/files/sydney_audio_sndio.c
@ -0,0 +1,407 @@
+/* $OpenBSD: sydney_audio_sndio.c,v 1.1 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 Initial Developer of the Original Code is
+ * Copyright (C) 2008 Sun Microsystems, Inc.,
+ *                Brian Lu <brian.lu@sun.com>
+ *
+ * Contributor(s):
+ *
+ * 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 <sys/types.h>
+
+#include <pthread.h>
+#include <sndio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "sydney_audio.h"
+
+struct sa_buffer {
+	struct sa_buffer *next;
+	unsigned int size;
+	unsigned char data[];
+};
+
+struct sa_stream {
+	struct sio_hdl *handle;
+	pthread_mutex_t mutex;
+	pthread_t thread;
+	int64_t position;
+	unsigned int buffer, channels, format, rate;
+	struct sa_buffer *head, *tail;
+};
+
+static struct sa_buffer *allocate_buffer(size_t size);
+static void audio_callback(void *data);
+
+/*
+ * STARTUP AND SHUTDOWN FUNCTIONS
+ */
+
+int
+sa_stream_create_pcm(sa_stream_t **_s, const char *client_name,
+    sa_mode_t mode, sa_pcm_format_t format, unsigned int rate,
+    unsigned int channels)
+{
+	sa_stream_t *s;
+
+	if (_s == NULL)
+		return SA_ERROR_INVALID;
+
+	*_s = NULL;
+
+	if (mode != SA_MODE_WRONLY || (format != SA_PCM_FORMAT_S16_LE &&
+	    format != SA_PCM_FORMAT_S16_BE))
+		return SA_ERROR_NOT_SUPPORTED;
+
+	s = malloc(sizeof(sa_stream_t));
+	if (s == NULL)
+		return SA_ERROR_OOM;
+
+	if (pthread_mutex_init(&s->mutex, NULL) != 0) {
+		free(s);
+		return SA_ERROR_SYSTEM;
+	}
+
+	s->handle = NULL;
+	s->channels = channels;
+	s->format = 16;
+	s->rate = rate;
+	s->position = s->buffer = 0;
+	s->tail = s->head = NULL;
+
+	*_s = s;
+
+	return SA_SUCCESS;
+}
+
+int
+sa_stream_open(sa_stream_t *s)
+{
+	struct sio_hdl *handle;
+	struct sio_par par;
+
+	if (s == NULL)
+		return SA_ERROR_NO_INIT;
+
+	if (s->handle != NULL)
+		return SA_ERROR_INVALID;
+
+	handle = sio_open(NULL, SIO_PLAY, 0);
+	if (handle == NULL)
+		return SA_ERROR_NO_DEVICE;
+
+	sio_initpar(&par);
+	par.bits = s->format;
+	par.le = SIO_LE_NATIVE;
+	par.pchan = s->channels;
+	par.rate = s->rate;
+	par.sig = 1;
+
+	if (!sio_setpar(handle, &par) || !sio_getpar(handle, &par)) {
+		sio_close(handle);
+		return SA_ERROR_NOT_SUPPORTED;
+	}
+
+	if (par.bits != s->format || par.le != SIO_LE_NATIVE ||
+	    par.pchan != s->channels || par.rate != s->rate || par.sig != 1) {
+		sio_close(handle);
+		return SA_ERROR_NOT_SUPPORTED;
+	}
+
+	if (!sio_start(handle)) {
+		sio_close(handle);
+		return SA_ERROR_NOT_SUPPORTED;
+	}
+
+	s->buffer = par.bufsz;
+	s->handle = handle;
+
+	if (pthread_create(&s->thread, NULL, (void *)audio_callback, s) != 0) {
+		s->handle = NULL;
+		sio_close(handle);
+		return SA_ERROR_SYSTEM;
+	}
+
+	return SA_SUCCESS;
+}
+
+int
+sa_stream_destroy(sa_stream_t *s)
+{
+	if (s == NULL)
+		return SA_SUCCESS;
+
+	pthread_mutex_lock(&s->mutex);
+	s->thread = 0;
+	while (s->head != NULL) {
+		struct sa_buffer *next = s->head->next;
+		free(s->head);
+		s->head = next;
+	}
+	pthread_mutex_unlock(&s->mutex);
+
+	if (pthread_mutex_destroy(&s->mutex) != 0)
+		return SA_ERROR_SYSTEM;
+
+	return SA_SUCCESS;
+}
+
+/*
+ * DATA READ AND WRITE FUNCTIONS
+ */
+
+int
+sa_stream_write(sa_stream_t *s, const void *data, size_t nbytes)
+{
+	struct sa_buffer *buffer;
+
+	if (s == NULL || s->handle == NULL)
+		return SA_ERROR_NO_INIT;
+
+	if (nbytes == 0)
+		return SA_SUCCESS;
+
+	buffer = allocate_buffer(nbytes);
+	if (buffer == NULL)
+		return SA_ERROR_OOM;
+
+	memcpy(buffer->data, data, nbytes);
+
+	pthread_mutex_lock(&s->mutex);
+	if (!s->head)
+		s->head = buffer;
+	else
+		s->tail->next = buffer;
+	s->tail = buffer;
+	pthread_mutex_unlock(&s->mutex);
+
+	return SA_SUCCESS;
+}
+
+/*
+ * GENERAL QUERY AND SUPPORT FUNCTIONS
+ */
+
+int
+sa_stream_get_write_size(sa_stream_t *s, size_t *size)
+{
+	if (s == NULL || s->handle == NULL)
+		return SA_ERROR_NO_INIT;
+
+	*size = s->buffer;
+
+	return SA_SUCCESS;
+}
+
+int
+sa_stream_get_position(sa_stream_t *s, sa_position_t position, int64_t *pos)
+{
+	if (s == NULL)
+		return SA_ERROR_NO_INIT;
+
+	if (position != SA_POSITION_WRITE_SOFTWARE)
+		return SA_ERROR_NOT_SUPPORTED;
+
+	pthread_mutex_lock(&s->mutex);
+	*pos = s->position;
+	pthread_mutex_unlock(&s->mutex);
+
+	return SA_SUCCESS;
+}
+
+/*
+ * PRIVATE SNDIO API SPECIFIC FUNCTIONS
+ */
+
+static struct sa_buffer *
+allocate_buffer(size_t size)
+{
+	struct sa_buffer *buffer;
+
+	buffer = malloc(sizeof(struct sa_buffer) + size);
+	if (buffer != NULL) {
+		buffer->next  = NULL;
+		buffer->size  = size;
+	}
+
+	return buffer;
+}
+
+static void
+audio_callback(void *data)
+{
+	sa_stream_t *s = (sa_stream_t *)data;
+	struct sa_buffer *buffer;
+
+	while (1) {
+		if (s->thread == 0) {
+			sio_close(s->handle);
+			free(s);
+
+			break;
+		}
+
+		pthread_mutex_lock(&s->mutex);
+		if (!s->head) {
+			pthread_mutex_unlock(&s->mutex);
+			continue;
+		}
+		buffer = s->head;
+		s->head = s->head->next;
+		pthread_mutex_unlock(&s->mutex);
+
+		sio_write(s->handle, buffer->data, buffer->size);
+
+		pthread_mutex_lock(&s->mutex);
+		s->position += buffer->size;
+		pthread_mutex_unlock(&s->mutex);
+
+		free(buffer);
+	}
+}
+
+/*
+ * UNSUPPORTED FUNCTIONS
+ */
+
+#define UNSUPPORTED(func)	func { return SA_ERROR_NOT_SUPPORTED; }
+
+UNSUPPORTED(int sa_stream_set_volume_abs(sa_stream_t *s, float vol))
+UNSUPPORTED(int sa_stream_get_volume_abs(sa_stream_t *s, float *vol))
+UNSUPPORTED(int sa_stream_pause(sa_stream_t *s))
+UNSUPPORTED(int sa_stream_resume(sa_stream_t *s))
+UNSUPPORTED(int sa_stream_create_opaque(sa_stream_t **s,
+    const char *client_name, sa_mode_t mode, const char *codec))
+UNSUPPORTED(int sa_stream_set_write_lower_watermark(sa_stream_t *s,
+    size_t size))
+UNSUPPORTED(int sa_stream_set_read_lower_watermark(sa_stream_t *s, size_t size))
+UNSUPPORTED(int sa_stream_set_write_upper_watermark(sa_stream_t *s,
+    size_t size))
+UNSUPPORTED(int sa_stream_set_read_upper_watermark(sa_stream_t *s, size_t size))
+UNSUPPORTED(int sa_stream_set_channel_map(sa_stream_t *s,
+    const sa_channel_t map[], unsigned int n))
+UNSUPPORTED(int sa_stream_set_xrun_mode(sa_stream_t *s, sa_xrun_mode_t mode))
+UNSUPPORTED(int sa_stream_set_non_interleaved(sa_stream_t *s, int enable))
+UNSUPPORTED(int sa_stream_set_dynamic_rate(sa_stream_t *s, int enable))
+UNSUPPORTED(int sa_stream_set_driver(sa_stream_t *s, const char *driver))
+UNSUPPORTED(int sa_stream_start_thread(sa_stream_t *s,
+    sa_event_callback_t callback))
+UNSUPPORTED(int sa_stream_stop_thread(sa_stream_t *s))
+UNSUPPORTED(int sa_stream_change_device(sa_stream_t *s,
+    const char *device_name))
+UNSUPPORTED(int sa_stream_change_read_volume(sa_stream_t *s,
+    const int32_t vol[], unsigned int n))
+UNSUPPORTED(int sa_stream_change_write_volume(sa_stream_t *s,
+    const int32_t vol[], unsigned int n))
+UNSUPPORTED(int sa_stream_change_rate(sa_stream_t *s, unsigned int rate))
+UNSUPPORTED(int sa_stream_change_meta_data(sa_stream_t *s, const char *name,
+    const void *data, size_t size))
+UNSUPPORTED(int sa_stream_change_user_data(sa_stream_t *s, const void *value))
+UNSUPPORTED(int sa_stream_set_adjust_rate(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_set_adjust_nchannels(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_set_adjust_pcm_format(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_set_adjust_watermarks(sa_stream_t *s,
+    sa_adjust_t direction))
+UNSUPPORTED(int sa_stream_get_mode(sa_stream_t *s, sa_mode_t *access_mode))
+UNSUPPORTED(int sa_stream_get_codec(sa_stream_t *s, char *codec, size_t *size))
+UNSUPPORTED(int sa_stream_get_pcm_format(sa_stream_t *s,
+    sa_pcm_format_t *format))
+UNSUPPORTED(int sa_stream_get_rate(sa_stream_t *s, unsigned int *rate))
+UNSUPPORTED(int sa_stream_get_nchannels(sa_stream_t *s, int *nchannels))
+UNSUPPORTED(int sa_stream_get_user_data(sa_stream_t *s, void **value))
+UNSUPPORTED(int sa_stream_get_write_lower_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_read_lower_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_write_upper_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_read_upper_watermark(sa_stream_t *s,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_channel_map(sa_stream_t *s, sa_channel_t map[],
+    unsigned int *n))
+UNSUPPORTED(int sa_stream_get_xrun_mode(sa_stream_t *s, sa_xrun_mode_t *mode))
+UNSUPPORTED(int sa_stream_get_non_interleaved(sa_stream_t *s, int *enabled))
+UNSUPPORTED(int sa_stream_get_dynamic_rate(sa_stream_t *s, int *enabled))
+UNSUPPORTED(int sa_stream_get_driver(sa_stream_t *s, char *driver_name,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_device(sa_stream_t *s, char *device_name,
+    size_t *size))
+UNSUPPORTED(int sa_stream_get_read_volume(sa_stream_t *s, int32_t vol[],
+    unsigned int *n))
+UNSUPPORTED(int sa_stream_get_write_volume(sa_stream_t *s, int32_t vol[],
+    unsigned int *n))
+UNSUPPORTED(int sa_stream_get_meta_data(sa_stream_t *s, const char *name,
+    void *data, size_t *size))
+UNSUPPORTED(int sa_stream_get_adjust_rate(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_adjust_nchannels(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_adjust_pcm_format(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_adjust_watermarks(sa_stream_t *s,
+    sa_adjust_t *direction))
+UNSUPPORTED(int sa_stream_get_state(sa_stream_t *s, sa_state_t *state))
+UNSUPPORTED(int sa_stream_get_event_error(sa_stream_t *s, sa_error_t *error))
+UNSUPPORTED(int sa_stream_get_event_notify(sa_stream_t *s, sa_notify_t *notify))
+UNSUPPORTED(int sa_stream_read(sa_stream_t *s, void *data, size_t nbytes))
+UNSUPPORTED(int sa_stream_read_ni(sa_stream_t *s, unsigned int channel,
+    void *data, size_t nbytes))
+UNSUPPORTED(int sa_stream_write_ni(sa_stream_t *s, unsigned int channel,
+    const void *data, size_t nbytes))
+UNSUPPORTED(int sa_stream_pwrite(sa_stream_t *s, const void *data,
+    size_t nbytes, int64_t offset, sa_seek_t whence))
+UNSUPPORTED(int sa_stream_pwrite_ni(sa_stream_t *s, unsigned int channel,
+    const void *data, size_t nbytes, int64_t offset, sa_seek_t whence))
+UNSUPPORTED(int sa_stream_get_read_size(sa_stream_t *s, size_t *size))
+UNSUPPORTED(int sa_stream_drain(sa_stream_t *s))
+
+const char *sa_strerror(int code) { return NULL; }
+
--- a/www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
+++ b/www/mozilla-firefox/patches/patch-accessible_src_atk_nsAppRootAccessible_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- accessible/src/atk/nsAppRootAccessible.cpp.orig	Thu Oct 11 13:13:32 2007
-+++ accessible/src/atk/nsAppRootAccessible.cpp	Fri Jun 13 19:31:10 2008
-@@ -55,7 +55,7 @@ typedef GType (* AtkGetTypeType) (void);
+$OpenBSD: patch-accessible_src_atk_nsAppRootAccessible_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- accessible/src/atk/nsAppRootAccessible.cpp.orig	Wed Jan  6 05:35:10 2010
+++ accessible/src/atk/nsAppRootAccessible.cpp	Sun Jan 10 17:47:23 2010
+@@ -56,7 +56,7 @@ typedef GType (* AtkGetTypeType) (void);
 GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
 static PRBool sATKChecked = PR_FALSE;
 static PRLibrary *sATKLib = nsnull;
--- a/www/mozilla-firefox/patches/patch-browser_app_application_ini
+++ b/www/mozilla-firefox/patches/patch-browser_app_application_ini
@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_app_application_ini,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- browser/app/application.ini.orig	Tue Aug 26 22:20:03 2008
-+++ browser/app/application.ini	Tue Oct 14 04:13:51 2008
-@@ -56,7 +56,4 @@ EnableProfileMigrator=1
+$OpenBSD: patch-browser_app_application_ini,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- browser/app/application.ini.orig	Thu Mar  5 23:31:43 2009
+++ browser/app/application.ini	Fri Mar 13 16:36:21 2009
+@@ -59,7 +59,4 @@ EnableProfileMigrator=1
 EnableExtensionManager=1
 
 [Crash Reporter]
--- a/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
+++ b/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
@ -1,8 +1,8 @@
-$OpenBSD: patch-browser_app_profile_firefox_js,v 1.3 2010/03/31 15:46:12 naddy Exp $
--- browser/app/profile/firefox.js.orig	Thu Jan  1 18:57:29 2009
-+++ browser/app/profile/firefox.js	Tue Mar 30 23:26:44 2010
-@@ -89,7 +89,7 @@ pref("browser.dictionaries.download.url", "https://%LO
- // App-specific update preferences
+$OpenBSD: patch-browser_app_profile_firefox_js,v 1.4 2010/04/26 19:55:58 landry Exp $
+--- browser/app/profile/firefox.js.orig	Tue Mar 16 10:53:45 2010
+++ browser/app/profile/firefox.js	Tue Mar 30 23:51:47 2010
+@@ -100,7 +100,7 @@ pref("app.update.timer", 600000);
+ // firefox-branding.js
 
 // Whether or not app updates are enabled
 -pref("app.update.enabled", true);
@ -10,16 +10,16 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.3 2010/03/31 15:46:12 naddy E
 
 // 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
-@@ -487,7 +487,7 @@ pref("plugin.default_plugin_disabled", true);
+@@ -573,7 +573,7 @@ pref("plugin.default_plugin_disabled", true);
 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
+ // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
 -pref("plugins.hide_infobar_for_missing_plugin", false);
 +pref("plugins.hide_infobar_for_missing_plugin", true);
+ pref("plugins.hide_infobar_for_outdated_plugin", false);
 
- #ifdef XP_WIN
- pref("browser.preferences.instantApply", false);
-@@ -590,10 +590,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
+ pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
+@@ -692,10 +692,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.3 2010/03/31 15:46:12 naddy E
 
 // 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");
-@@ -658,10 +658,8 @@ pref("browser.EULA.version", 3);
+@@ -758,10 +758,8 @@ pref("browser.EULA.version", 3);
 pref("browser.rights.version", 3);
 pref("browser.rights.3.shown", false);
 
@ -42,5 +42,5 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.3 2010/03/31 15:46:12 naddy E
 pref("browser.rights.override", true);
 -#endif
 
- pref("browser.sessionstore.enabled", true);
- pref("browser.sessionstore.resume_from_crash", true);
+ #ifdef WINCE
+ pref("browser.sessionstore.resume_from_crash", false);
--- a/www/mozilla-firefox/patches/patch-browser_base_jar_mn
+++ b/www/mozilla-firefox/patches/patch-browser_base_jar_mn
@ -1,13 +0,0 @@
-$OpenBSD: patch-browser_base_jar_mn,v 1.2 2008/12/18 19:27:13 martynas Exp $
--- browser/base/jar.mn.orig	Sun Nov 16 08:46:26 2008
-+++ browser/base/jar.mn	Wed Dec 17 07:41:26 2008
-@@ -22,9 +22,6 @@ browser.jar:
- *       content/browser/browser.js                    (content/browser.js)
- *       content/browser/browser.xul                   (content/browser.xul)
- *       content/browser/credits.xhtml                 (content/credits.xhtml)
-*       content/browser/EULA.js                       (content/EULA.js)
-*       content/browser/EULA.xhtml                    (content/EULA.xhtml)
-*       content/browser/EULA.xul                      (content/EULA.xul)
- *       content/browser/metaData.js                   (content/metaData.js)
- *       content/browser/metaData.xul                  (content/metaData.xul)
- *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
--- a/www/mozilla-firefox/patches/patch-browser_components_certerror_content_aboutCertError_xhtml
+++ b/www/mozilla-firefox/patches/patch-browser_components_certerror_content_aboutCertError_xhtml
@ -0,0 +1,13 @@
+$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- browser/components/certerror/content/aboutCertError.xhtml.orig	Mon Jun 29 19:14:40 2009
+++ browser/components/certerror/content/aboutCertError.xhtml	Tue Jul  7 22:06:44 2009
+@@ -128,6 +128,9 @@
+           tech.textContent = getDescription();
+         
+         addDomainErrorLink();
+
+        var button = document.getElementById("exceptionDialogButton");
+        button.click();
+       }
+       
+       /* In the case of SSL error pages about domain mismatch, see if
--- a/www/mozilla-firefox/patches/patch-browser_components_nsBrowserGlue_js
+++ b/www/mozilla-firefox/patches/patch-browser_components_nsBrowserGlue_js
@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.2 2008/12/18 19:27:13 martynas Exp $
--- browser/components/nsBrowserGlue.js.orig	Wed Dec 17 07:51:28 2008
-+++ browser/components/nsBrowserGlue.js	Wed Dec 17 07:45:42 2008
-@@ -221,10 +221,6 @@ BrowserGlue.prototype = {
+$OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.3 2010/04/26 19:55:58 landry Exp $
+--- browser/components/nsBrowserGlue.js.orig	Wed Jan  6 05:35:10 2010
+++ browser/components/nsBrowserGlue.js	Sun Jan 10 17:49:03 2010
+@@ -307,10 +307,6 @@ BrowserGlue.prototype = {
   // Browser startup complete. All initial windows have opened.
   _onBrowserStartup: function()
   {
@ -9,15 +9,13 @@ $OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.2 2008/12/18 19:27:13 ma
 -    if (this._shouldShowRights())
 -      this._showRightsNotification();
 -
-     var prefBranch = Cc["@mozilla.org/preferences-service;1"].
-                      getService(Ci.nsIPrefBranch);
     // If new add-ons were installed during startup open the add-ons manager.
-@@ -363,81 +359,6 @@ BrowserGlue.prototype = {
-       }
-       break;
+     if (this._prefs.prefHasUserValue(PREF_EM_NEW_ADDONS_LIST)) {
+       var args = Cc["@mozilla.org/supports-array;1"].
+@@ -464,79 +460,6 @@ BrowserGlue.prototype = {
     }
-  },
-
+   },
+ 
 -  /*
 -   * _shouldShowRights - Determines if the user should be shown the
 -   * about:rights notification. The notification should *not* be shown if
@ -60,19 +58,17 @@ $OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.2 2008/12/18 19:27:13 ma
 -
 -  _showRightsNotification : function () {
 -    // Stick the notification onto the selected tab of the active browser window.
-    var win = this._getMostRecentBrowserWindow();
+-    var win = this.getMostRecentBrowserWindow();
 -    var browser = win.gBrowser; // for closure in notification bar callback
 -    var notifyBox = browser.getNotificationBox();
 -
-    var bundleService = Cc["@mozilla.org/intl/stringbundle;1"].
-                        getService(Ci.nsIStringBundleService);
-    var brandBundle  = bundleService.createBundle("chrome://branding/locale/brand.properties");
-    var rightsBundle = bundleService.createBundle("chrome://browser/locale/aboutRights.properties");
+-    var brandBundle  = this._bundleService.createBundle("chrome://branding/locale/brand.properties");
+-    var rightsBundle = this._bundleService.createBundle("chrome://global/locale/aboutRights.properties");
 -
-    var buttonLabel     = rightsBundle.GetStringFromName("buttonLabel");
-    var buttonAccessKey = rightsBundle.GetStringFromName("buttonAccessKey");
-    var productName     = brandBundle.GetStringFromName("brandFullName");
-    var notifyText      = rightsBundle.formatStringFromName("notifyText", [productName], 1);
+-    var buttonLabel      = rightsBundle.GetStringFromName("buttonLabel");
+-    var buttonAccessKey  = rightsBundle.GetStringFromName("buttonAccessKey");
+-    var productName      = brandBundle.GetStringFromName("brandFullName");
+-    var notifyRightsText = rightsBundle.formatStringFromName("notifyRightsText", [productName], 1);
 -    
 -    var buttons = [
 -                    {
@ -89,8 +85,10 @@ $OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.2 2008/12/18 19:27:13 ma
 -    var currentVersion = this._prefs.getIntPref("browser.rights.version");
 -    this._prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
 -
-    var box = notifyBox.appendNotification(notifyText, "about-rights", null, notifyBox.PRIORITY_INFO_LOW, buttons);
-    box.persistence = 3; // // arbitrary number, just so bar sticks around for a bit
-   },
+-    var box = notifyBox.appendNotification(notifyRightsText, "about-rights", null, notifyBox.PRIORITY_INFO_LOW, buttons);
+-    box.persistence = 3; // arbitrary number, just so bar sticks around for a bit
+-  },
+-  
+   _showPluginUpdatePage : function () {
+     this._prefs.setBoolPref(PREF_PLUGINS_NOTIFYUSER, false);
 
-   // returns the (cached) Sanitizer constructor
--- a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
+++ b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_app_mozilla_in,v 1.10 2008/11/20 23:41:32 martynas Exp $
--- browser/app/mozilla.in.orig	Fri Oct  5 10:29:26 2007
-+++ browser/app/mozilla.in	Sat Nov 17 16:13:18 2007
-@@ -52,6 +52,11 @@
+$OpenBSD: patch-build_unix_mozilla_in,v 1.1 2010/04/26 19:55:58 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 @@
 #uncomment for debugging
 #set -x
 
@ -13,7 +13,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.10 2008/11/20 23:41:32 martynas Exp $
 moz_libdir=%MOZAPPDIR%
 
 # Use run-mozilla.sh in the current dir if it exists
-@@ -130,6 +135,12 @@ do
+@@ -131,6 +136,12 @@ do
       ;;
   esac
 done
--- a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
+++ b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.6 2008/11/20 23:41:32 martynas Exp $
--- config/autoconf.mk.in.orig	Thu Oct 11 21:50:54 2007
-+++ config/autoconf.mk.in	Sun Nov 18 15:03:16 2007
+$OpenBSD: patch-config_autoconf_mk_in,v 1.7 2010/04/26 19:55:58 landry Exp $
+--- config/autoconf.mk.in.orig	Wed Jan  6 05:35:11 2010
+++ config/autoconf.mk.in	Sun Jan 10 17:47:23 2010
@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
--- a/www/mozilla-firefox/patches/patch-config_rules_mk
+++ b/www/mozilla-firefox/patches/patch-config_rules_mk
@ -1,7 +1,7 @@
-$OpenBSD: patch-config_rules_mk,v 1.6 2008/11/20 23:41:32 martynas Exp $
--- config/rules.mk.orig	Wed Jun 25 02:29:46 2008
-+++ config/rules.mk	Fri Jul 25 04:37:19 2008
-@@ -482,6 +482,12 @@ endif
+$OpenBSD: patch-config_rules_mk,v 1.7 2010/04/26 19:55:58 landry Exp $
+--- config/rules.mk.orig	Wed Jan  6 05:35:11 2010
+++ config/rules.mk	Sun Jan 10 17:47:23 2010
+@@ -606,6 +606,12 @@ endif
 endif
 endif
 
--- a/www/mozilla-firefox/patches/patch-configure_in
+++ b/www/mozilla-firefox/patches/patch-configure_in
@ -1,7 +1,16 @@
-$OpenBSD: patch-configure_in,v 1.16 2009/06/11 14:10:37 martynas Exp $
--- configure.in.orig	Fri Apr 17 21:10:52 2009
-+++ configure.in	Thu Jun 11 16:09:20 2009
-@@ -2223,7 +2223,7 @@ case "$target" in
+$OpenBSD: patch-configure_in,v 1.17 2010/04/26 19:55:58 landry Exp $
+--- configure.in.orig	Tue Mar 16 10:53:59 2010
+++ configure.in	Sat Mar 27 16:32:01 2010
+@@ -1063,7 +1063,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
+ 
+ MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -L$(LIBXUL_DIST)/bin'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+ XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
+@@ -2404,7 +2404,7 @@ case "$target" in
 	;;
 
 *-openbsd*)
@ -10,12 +19,16 @@ $OpenBSD: patch-configure_in,v 1.16 2009/06/11 14:10:37 martynas Exp $
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'
-@@ -4047,7 +4047,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
-     _USE_SYSTEM_NSS=1 )
+@@ -4133,9 +4133,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
+                             ac_cv_thread_keyword=yes,
+                             ac_cv_thread_keyword=no)])
+ LDFLAGS=$_SAVE_LDFLAGS
+-if test "$ac_cv_thread_keyword" = yes; then
+-  AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
+-fi
+dnl if test "$ac_cv_thread_keyword" = yes; then
+dnl   AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
+dnl fi
 
- if test -n "$_USE_SYSTEM_NSS"; then
-    AM_PATH_NSS(3.12.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
-+    AM_PATH_NSS(3.12, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
- fi
- 
- if test -n "$MOZ_NATIVE_NSS"; then
+ dnl End of C++ language/feature checks
+ AC_LANG_C
--- a/www/mozilla-firefox/patches/patch-content_canvas_src_nsGLPbufferGLX_cpp
+++ b/www/mozilla-firefox/patches/patch-content_canvas_src_nsGLPbufferGLX_cpp
@ -0,0 +1,25 @@
+$OpenBSD: patch-content_canvas_src_nsGLPbufferGLX_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- content/canvas/src/nsGLPbufferGLX.cpp.orig	Thu Jan 21 05:29:57 2010
+++ content/canvas/src/nsGLPbufferGLX.cpp	Thu Jan 21 13:57:30 2010
+@@ -132,8 +132,8 @@ nsGLPbufferGLX::Init(nsCanvasRenderingContextGLPrivate
+     nsresult rv;
+     const char *s;
+ 
+-    if (!gGLXWrap.OpenLibrary("libGL.so.1")) {
+-        LogMessage(NS_LITERAL_CSTRING("Canvas 3D: Couldn't find libGL.so.1"));
+    if (!gGLXWrap.OpenLibrary("libGL.so")) {
+        LogMessage(NS_LITERAL_CSTRING("Canvas 3D: Couldn't find libGL.so"));
+         return PR_FALSE;
+     }
+ 
+@@ -218,8 +218,8 @@ nsGLPbufferGLX::Init(nsCanvasRenderingContextGLPrivate
+ 
+     fprintf (stderr, "nsGLPbufferGLX::Init!\n");
+ 
+-    if (!mGLWrap.OpenLibrary("libGL.so.1")) {
+-        LogMessage(NS_LITERAL_CSTRING("Canvas 3D: GLWrap init failed, couldn't find libGL.so.1"));
+    if (!mGLWrap.OpenLibrary("libGL.so")) {
+        LogMessage(NS_LITERAL_CSTRING("Canvas 3D: GLWrap init failed, couldn't find libGL.so"));
+         return PR_FALSE;
+     }
+ 
--- a/www/mozilla-firefox/patches/patch-content_canvas_src_nsGLPbufferOSMesa_cpp
+++ b/www/mozilla-firefox/patches/patch-content_canvas_src_nsGLPbufferOSMesa_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-content_canvas_src_nsGLPbufferOSMesa_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- content/canvas/src/nsGLPbufferOSMesa.cpp.orig	Thu Jan 21 05:29:57 2010
+++ content/canvas/src/nsGLPbufferOSMesa.cpp	Thu Jan 21 13:57:03 2010
+@@ -110,7 +110,7 @@ nsGLPbufferOSMESA::Init(nsCanvasRenderingContextGLPriv
+         rv |= libfile->Append(NS_LITERAL_STRING("libOSMesa.7.dylib"));
+ #elif defined(XP_UNIX)
+         rv |= libfile->Append(NS_LITERAL_STRING("Linux"));
+-        rv |= libfile->Append(NS_LITERAL_STRING("libOSMesa.so.7"));
+        rv |= libfile->Append(NS_LITERAL_STRING("libOSMesa.so"));
+ #else
+ #warning No default osmesa library path available
+         LogMessage(NS_LITERAL_STRING("Canvas 3D: No default OSMesa lib path available -- please set the extensions.canvas3d.osmesalib pref to the full path to the OSMesa shared library"));
--- a/www/mozilla-firefox/patches/patch-content_events_src_nsContentEventHandler_cpp
+++ b/www/mozilla-firefox/patches/patch-content_events_src_nsContentEventHandler_cpp
@ -0,0 +1,13 @@
+$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- content/events/src/nsContentEventHandler.cpp.orig	Thu Jan 21 05:29:58 2010
+++ content/events/src/nsContentEventHandler.cpp	Thu Jan 21 13:51:51 2010
+@@ -925,7 +925,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
+   selPrivate->EndBatchChanges();
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-  nsCOMPtr<nsISelection2>(do_QueryInterface(sel))->ScrollIntoView(
+  nsCOMPtr<nsISelection2> sel2 = do_QueryInterface(sel);
+  sel2->ScrollIntoView(
+       nsISelectionController::SELECTION_FOCUS_REGION, PR_FALSE, -1, -1);
+   aEvent->mSucceeded = PR_TRUE;
+   return NS_OK;
--- a/www/mozilla-firefox/patches/patch-content_media_nsAudioStream_cpp
+++ b/www/mozilla-firefox/patches/patch-content_media_nsAudioStream_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-content_media_nsAudioStream_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- content/media/nsAudioStream.cpp.orig	Thu Jan 21 05:29:59 2010
+++ content/media/nsAudioStream.cpp	Thu Jan 21 13:49:36 2010
+@@ -246,7 +246,7 @@ float nsAudioStream::GetPosition()
+ #if defined(XP_WIN)
+   positionType = SA_POSITION_WRITE_HARDWARE;
+ #endif
+-  PRInt64 position = 0;
+  int64_t position = 0;
+   if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
+                              positionType, &position) == SA_SUCCESS) {
+     return (position / float(mRate) / mChannels / sizeof(short));
--- a/www/mozilla-firefox/patches/patch-content_xslt_public_txDouble_h
+++ b/www/mozilla-firefox/patches/patch-content_xslt_public_txDouble_h
@ -1,4 +1,4 @@
-$OpenBSD: patch-content_xslt_public_txDouble_h,v 1.1 2008/11/20 23:41:32 martynas Exp $
+$OpenBSD: patch-content_xslt_public_txDouble_h,v 1.2 2010/04/26 19:55:58 landry Exp $
 --- content/xslt/public/txDouble.h.orig	Fri Jan 25 09:02:04 2008
 +++ content/xslt/public/txDouble.h	Mon Jul 14 01:25:38 2008
@@ -63,7 +63,7 @@ static fp_except_t oldmask = fpsetmask(~allmask);
--- a/www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
+++ b/www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
@ -1,4 +1,4 @@
-$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
 --- content/xslt/src/base/txDouble.cpp.orig	Fri Jan 25 10:02:04 2008
 +++ content/xslt/src/base/txDouble.cpp	Thu Jun 19 22:39:42 2008
@@ -49,14 +49,16 @@
--- a/www/mozilla-firefox/patches/patch-extensions_auth_nsAuthGSSAPI_cpp
+++ b/www/mozilla-firefox/patches/patch-extensions_auth_nsAuthGSSAPI_cpp
@ -0,0 +1,15 @@
+$OpenBSD: patch-extensions_auth_nsAuthGSSAPI_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- extensions/auth/nsAuthGSSAPI.cpp.orig	Tue Mar 16 10:54:56 2010
+++ extensions/auth/nsAuthGSSAPI.cpp	Sat Mar 27 01:54:27 2010
+@@ -159,9 +159,8 @@ gssInit()
+         };
+         
+         const char *const verLibNames[] = {
+-            "libgssapi_krb5.so.2", /* MIT - FC, Suse10, Debian */
+-            "libgssapi.so.4",      /* Heimdal - Suse10, MDK */
+-            "libgssapi.so.1"       /* Heimdal - Suse9, CITI - FC, MDK, Suse10*/
+            "libgssapi_krb5.so",
+            "libgssapi.so"
+         };
+ 
+         for (size_t i = 0; i < NS_ARRAY_LENGTH(verLibNames) && !lib; ++i) {
--- a/www/mozilla-firefox/patches/patch-extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp
+++ b/www/mozilla-firefox/patches/patch-extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp
@ -0,0 +1,14 @@
+$OpenBSD: patch-extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp.orig	Wed Jan  6 05:35:15 2010
+++ extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp	Sun Jan 10 17:47:26 2010
+@@ -544,8 +544,8 @@ struct PrefNamePair {
+ 
+ const char
+ GConfProxy::sPrefGConfKey[] = "accessibility.unix.gconf2.shared-library";
+-const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so.4";
+-const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so";
+const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so";
+const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so.4";
+ 
+ #define GCONF_FUNCS_POINTER_BEGIN \
+     static GConfFuncListType sGConfFuncList[] = {
--- 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,4 +1,4 @@
-$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
+$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
 --- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig	Fri Oct  5 22:13:18 2007
 +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp	Thu Sep 25 01:30:45 2008
@@ -63,6 +63,7 @@
--- a/www/mozilla-firefox/patches/patch-gfx_qcms_qcmstypes_h
+++ b/www/mozilla-firefox/patches/patch-gfx_qcms_qcmstypes_h
@ -0,0 +1,19 @@
+$OpenBSD: patch-gfx_qcms_qcmstypes_h,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- gfx/qcms/qcmstypes.h.orig	Wed Jun 17 07:21:46 2009
+++ gfx/qcms/qcmstypes.h	Sun Jun 21 14:11:37 2009
+@@ -11,15 +11,6 @@
+ /* int_types.h gets included somehow, so avoid redefining the types differently */
+ #include <sys/int_types.h>
+ #else
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
--- a/www/mozilla-firefox/patches/patch-gfx_src_psshared_nsCUPSShim_cpp
+++ b/www/mozilla-firefox/patches/patch-gfx_src_psshared_nsCUPSShim_cpp
@ -1,4 +1,4 @@
-$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.3 2008/11/20 23:41:32 martynas Exp $
+$OpenBSD: patch-gfx_src_psshared_nsCUPSShim_cpp,v 1.4 2010/04/26 19:55:58 landry Exp $
 --- gfx/src/psshared/nsCUPSShim.cpp.orig	Sun May  8 18:01:20 2005
 +++ gfx/src/psshared/nsCUPSShim.cpp	Fri Apr  6 17:21:07 2007
@@ -59,7 +59,7 @@ static const int gSymNameCt = sizeof(gSymName) / sizeo
--- a/www/mozilla-firefox/patches/patch-gfx_src_thebes_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-gfx_src_thebes_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-gfx_src_thebes_Makefile_in,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- gfx/src/thebes/Makefile.in.orig	Mon Feb 18 10:50:16 2008
-+++ gfx/src/thebes/Makefile.in	Sun Apr 13 18:36:03 2008
-@@ -153,6 +153,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
+$OpenBSD: patch-gfx_src_thebes_Makefile_in,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- gfx/src/thebes/Makefile.in.orig	Wed Jan  6 05:35:16 2010
+++ gfx/src/thebes/Makefile.in	Sun Jan 10 17:47:26 2010
+@@ -149,6 +149,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
--- a/www/mozilla-firefox/patches/patch-js_ctypes_libffi_configure
+++ b/www/mozilla-firefox/patches/patch-js_ctypes_libffi_configure
@ -0,0 +1,31 @@
+$OpenBSD: patch-js_ctypes_libffi_configure,v 1.1 2010/04/26 19:55:58 landry Exp $
+backported from devel/libffi/patches/patch-configure
+--- js/ctypes/libffi/configure.orig	Tue Mar 30 09:45:39 2010
+++ js/ctypes/libffi/configure	Tue Mar 30 09:54:29 2010
+@@ -20976,7 +20976,7 @@ case "$host" in
+ 	TARGET=FRV; TARGETDIR=frv
+ 	;;
+ 
+-  hppa*-*-linux* | parisc*-*-linux*)
+  hppa*-*-linux* | hppa*-*-openbsd* | parisc*-*-linux*)
+ 	TARGET=PA_LINUX; TARGETDIR=pa
+ 	;;
+   hppa*64-*-hpux*)
+@@ -21017,7 +21017,7 @@ case "$host" in
+   mips-sgi-irix5.* | mips-sgi-irix6.*)
+ 	TARGET=MIPS; TARGETDIR=mips
+ 	;;
+-  mips*-*-linux*)
+  mips*-*-linux* | mips*-*-openbsd* )
+ 	TARGET=MIPS; TARGETDIR=mips
+ 	;;
+ 
+@@ -21033,7 +21033,7 @@ case "$host" in
+   powerpc-*-aix* | rs6000-*-aix*)
+ 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
+ 	;;
+-  powerpc-*-freebsd*)
+  powerpc-*-freebsd* | powerpc-*-openbsd* )
+ 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+ 	;;
+   powerpc*-*-rtems*)
--- a/www/mozilla-firefox/patches/patch-js_ctypes_libffi_src_dlmalloc_c
+++ b/www/mozilla-firefox/patches/patch-js_ctypes_libffi_src_dlmalloc_c
@ -0,0 +1,22 @@
+$OpenBSD: patch-js_ctypes_libffi_src_dlmalloc_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/ctypes/libffi/src/dlmalloc.c.orig	Thu Jan 21 05:30:17 2010
+++ js/ctypes/libffi/src/dlmalloc.c	Sun Jan 24 00:27:31 2010
+@@ -2463,17 +2463,15 @@ static int init_mparams(void) {
+ 
+ #if (FOOTERS && !INSECURE)
+     {
+-#if USE_DEV_RANDOM
+       int fd;
+       unsigned char buf[sizeof(size_t)];
+       /* Try to use /dev/urandom, else fall back on using time */
+-      if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
+      if ((fd = open("/dev/arandom", O_RDONLY)) >= 0 &&
+           read(fd, buf, sizeof(buf)) == sizeof(buf)) {
+         s = *((size_t *) buf);
+         close(fd);
+       }
+       else
+-#endif /* USE_DEV_RANDOM */
+         s = (size_t)(time(0) ^ (size_t)0x55555555U);
+ 
+       s |= (size_t)8U;    /* ensure nonzero */
--- a/www/mozilla-firefox/patches/patch-js_src_build_mk
+++ b/www/mozilla-firefox/patches/patch-js_src_build_mk
@ -1,10 +0,0 @@
-$OpenBSD: patch-js_src_build_mk,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- js/src/build.mk.orig	Wed Feb 14 18:58:53 2007
-+++ js/src/build.mk	Thu Aug 21 17:43:27 2008
-@@ -38,6 +38,5 @@
- TIERS += js
- 
- tier_js_dirs += \
-	js/src/fdlibm \
- 	js/src \
- 	$(NULL)
--- a/www/mozilla-firefox/patches/patch-js_src_configure_in
+++ b/www/mozilla-firefox/patches/patch-js_src_configure_in
@ -0,0 +1,59 @@
+$OpenBSD: patch-js_src_configure_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/src/configure.in.orig	Tue Mar 16 10:55:20 2010
+++ js/src/configure.in	Sat Mar 27 01:54:27 2010
+@@ -874,7 +874,7 @@ HOST_AR='$(AR)'
+ HOST_AR_FLAGS='$(AR_FLAGS)'
+ 
+ MOZ_JS_LIBS='-L$(libdir) -lmozjs'
+-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib -L$(LIBXUL_DIST)/bin'
+ 
+ MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
+ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
+@@ -2133,7 +2133,7 @@ case "$target" in
+ 	;;
+ 
+ *-openbsd*)
+-    DLL_SUFFIX=".so.1.0"
+    DLL_SUFFIX=".so.${SO_VERSION}"
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     DSO_LDOPTS='-shared -fPIC'
+@@ -2466,11 +2466,15 @@ i?86-*)
+     ENABLE_JIT=1
+     NANOJIT_ARCH=i386
+     ;;
+x86_64-*)
+    ENABLE_JIT=1
+    NANOJIT_ARCH=X64
+    ;;
+ arm*-*)
+     ENABLE_JIT=1
+     NANOJIT_ARCH=ARM
+     ;;
+-sparc*-*)
+sparc-*)
+     ENABLE_JIT=1
+     NANOJIT_ARCH=Sparc
+     ;;
+@@ -2489,7 +2493,10 @@ case "$target" in
+ i?86-*)
+     AC_DEFINE(AVMPLUS_IA32)
+     ;;
+-
+x86_64-*)
+    AC_DEFINE(AVMPLUS_64BIT)
+    AC_DEFINE(AVMPLUS_AMD64)
+    ;;
+ arm*-*)
+     AC_DEFINE(AVMPLUS_ARM)
+     ;;
+@@ -2509,7 +2516,7 @@ darwin*)
+ solaris*)
+     AC_DEFINE(AVMPLUS_UNIX)
+     ;;
+-freebsd*|kfreebsd*)
+freebsd*|kfreebsd*|openbsd*)
+     AC_DEFINE(AVMPLUS_UNIX)
+     ;;
+ *cygwin*|*mingw*|*mks*|*msvc*|*wince)
--- a/www/mozilla-firefox/patches/patch-js_src_jsgc_cpp
+++ b/www/mozilla-firefox/patches/patch-js_src_jsgc_cpp
@ -0,0 +1,11 @@
+$OpenBSD: patch-js_src_jsgc_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/src/jsgc.cpp.orig	Wed Jan  6 05:35:17 2010
+++ js/src/jsgc.cpp	Sun Jan 10 17:47:27 2010
+@@ -128,6 +128,7 @@ extern "C" {
+ #   ifndef JS_GC_USE_MMAP
+ #    define JS_GC_USE_MMAP 1
+ #   endif
+#   include <sys/types.h>
+ #   include <sys/mman.h>
+ 
+ /* On Mac OS X MAP_ANONYMOUS is not defined. */
--- a/www/mozilla-firefox/patches/patch-js_src_jslock_cpp
+++ b/www/mozilla-firefox/patches/patch-js_src_jslock_cpp
@ -0,0 +1,19 @@
+$OpenBSD: patch-js_src_jslock_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+Fix for infinite loop in js binary during build
+cf pkgsrc/devel/xulrunner/patches/patch-bb
+http://lists.freebsd.org/pipermail/freebsd-gecko/2010-January/000640.html
+https://bugzilla.mozilla.org/show_bug.cgi?id=550271
+--- js/src/jslock.cpp.orig	Sat Apr 24 16:47:57 2010
+++ js/src/jslock.cpp	Sat Apr 24 16:52:44 2010
+@@ -161,7 +161,11 @@ NativeCompareAndSwap(jsword *w, jsword ov, jsword nv)
+ 
+     __asm__ __volatile__ (
+                   "stbar\n"
+#if defined (__sparc64__)
+                  "casx [%1],%2,%3\n"
+#else
+                   "cas [%1],%2,%3\n"
+#endif
+                   "cmp %2,%3\n"
+                   "be,a 1f\n"
+                   "mov 1,%0\n"
--- a/www/mozilla-firefox/patches/patch-js_src_jsnum_h
+++ b/www/mozilla-firefox/patches/patch-js_src_jsnum_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-js_src_jsnum_h,v 1.3 2008/11/20 23:41:32 martynas Exp $
--- js/src/jsnum.h.orig	Mon Mar 10 20:27:44 2008
-+++ js/src/jsnum.h	Mon Jul 14 01:25:38 2008
-@@ -56,7 +56,7 @@ JS_BEGIN_EXTERN_C
+$OpenBSD: patch-js_src_jsnum_h,v 1.4 2010/04/26 19:55:58 landry Exp $
+--- js/src/jsnum.h.orig	Wed Jan  6 05:35:17 2010
+++ js/src/jsnum.h	Sun Jan 10 17:47:27 2010
+@@ -65,7 +65,7 @@ JS_BEGIN_EXTERN_C
  * the high and low words are in big endian order).
  */
 #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
--- a/www/mozilla-firefox/patches/patch-js_src_nanojit_NativeSparc_cpp
+++ b/www/mozilla-firefox/patches/patch-js_src_nanojit_NativeSparc_cpp
@ -0,0 +1,11 @@
+$OpenBSD: patch-js_src_nanojit_NativeSparc_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/src/nanojit/NativeSparc.cpp.orig	Wed Jan  6 05:35:17 2010
+++ js/src/nanojit/NativeSparc.cpp	Sun Jan 10 17:47:27 2010
+@@ -38,6 +38,7 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
+#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+ #include "nanojit.h"
--- a/www/mozilla-firefox/patches/patch-js_src_nanojit_Nativei386_cpp
+++ b/www/mozilla-firefox/patches/patch-js_src_nanojit_Nativei386_cpp
@ -0,0 +1,11 @@
+$OpenBSD: patch-js_src_nanojit_Nativei386_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/src/nanojit/Nativei386.cpp.orig	Wed Jan  6 05:35:17 2010
+++ js/src/nanojit/Nativei386.cpp	Sun Jan 10 17:47:27 2010
+@@ -46,6 +46,7 @@
+ #endif
+ 
+ #if defined AVMPLUS_UNIX || defined AVMPLUS_MAC
+#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+ #include <stdlib.h>
--- a/www/mozilla-firefox/patches/patch-js_src_nanojit_avmplus_h
+++ b/www/mozilla-firefox/patches/patch-js_src_nanojit_avmplus_h
@ -0,0 +1,11 @@
+$OpenBSD: patch-js_src_nanojit_avmplus_h,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/src/nanojit/avmplus.h.orig	Wed Jan  6 05:35:17 2010
+++ js/src/nanojit/avmplus.h	Sun Jan 10 17:47:27 2010
+@@ -44,6 +44,7 @@
+ 
+ #if defined(AVMPLUS_UNIX) || defined(AVMPLUS_OS2)
+ #include <unistd.h>
+#include <sys/types.h>
+ #include <sys/mman.h>
+ #endif
+ 
--- a/www/mozilla-firefox/patches/patch-js_src_xpconnect_shell_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-js_src_xpconnect_shell_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.2 2008/11/20 23:41:32 martynas Exp $
--- js/src/xpconnect/shell/Makefile.in.orig	Thu Aug  7 12:12:57 2008
-+++ js/src/xpconnect/shell/Makefile.in	Tue Sep 23 20:37:32 2008
-@@ -59,6 +59,8 @@ CMMSRCS += xpcshellMacUtils.mm
+$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.3 2010/04/26 19:55:58 landry Exp $
+--- js/src/xpconnect/shell/Makefile.in.orig	Wed Jun 17 07:21:48 2009
+++ js/src/xpconnect/shell/Makefile.in	Sat Jun 20 22:09:10 2009
+@@ -60,6 +60,8 @@ CMMSRCS += xpcshellMacUtils.mm
 endif
 
 LIBS		= \
-+		-Wl,-rpath-link,_LOCALBASE_/lib/ \
-+		-Wl,-rpath-link,_X11BASE_/lib/ \
+		-Wl,-rpath-link,_LOCALBASE_/lib \
+		-Wl,-rpath-link,_X11BASE_/lib \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
+ 		$(LIBXUL_LIBS) \
 		$(MOZ_JS_LIBS) \
- 		$(XPCOM_LIBS) \
--- a/www/mozilla-firefox/patches/patch-js_src_xpconnect_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-js_src_xpconnect_src_Makefile_in
@ -0,0 +1,11 @@
+$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- js/src/xpconnect/src/Makefile.in.orig	Tue Mar 16 10:55:57 2010
+++ js/src/xpconnect/src/Makefile.in	Tue Mar 30 18:17:58 2010
+@@ -223,6 +223,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
+ 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
+ 	  $(ENABLE_TRACEABLE_FLAGS) \
+ 	  $(srcdir)/dom_quickstubs.qsconf
+	perl -pi.bak -e 's/(nsCOMPtr<nsIVariant> arg1)\(/$$1 = nsCOMPtr<nsIVariant>(/' dom_quickstubs.cpp
+ 
+ GARBAGE += \
+ 		dom_quickstubs.h \
--- a/www/mozilla-firefox/patches/patch-layout_build_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-layout_build_Makefile_in
@ -0,0 +1,14 @@
+$OpenBSD: patch-layout_build_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- layout/build/Makefile.in.orig	Wed Jan  6 05:35:20 2010
+++ layout/build/Makefile.in	Sun Jan 10 17:47:27 2010
+@@ -277,6 +277,10 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
+ endif
+ 
+# Sydney audio sndio backend.
+EXTRA_DSO_LDOPTS += -lsndio \
+		    $(NULL)
+
+ ifdef MOZ_SYDNEYAUDIO
+ ifeq ($(OS_ARCH),Darwin)
+ OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
--- a/www/mozilla-firefox/patches/patch-media_liboggplay_src_liboggplay_std_semaphore_h
+++ b/www/mozilla-firefox/patches/patch-media_liboggplay_src_liboggplay_std_semaphore_h
@ -0,0 +1,15 @@
+$OpenBSD: patch-media_liboggplay_src_liboggplay_std_semaphore_h,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- media/liboggplay/src/liboggplay/std_semaphore.h.orig	Wed Nov 25 21:40:24 2009
+++ media/liboggplay/src/liboggplay/std_semaphore.h	Wed Nov 25 21:41:04 2009
+@@ -74,9 +74,9 @@
+  * @retval non-zero on error 
+  */
+ 
+-#if defined(linux) || defined(SOLARIS) || defined(AIX) || defined(__FreeBSD__)
+#if defined(linux) || defined(SOLARIS) || defined(AIX) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <semaphore.h>
+-#if defined(__FreeBSD__) 
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define SEM_CREATE(p,s) sem_init(&(p), 0, s)  
+ #else
+ #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
--- a/www/mozilla-firefox/patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h
+++ b/www/mozilla-firefox/patches/patch-media_liboggz_include_oggz_oggz_off_t_generated_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-media_liboggz_include_oggz_oggz_off_t_generated_h,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	Mon Aug 24 18:52:50 2009
+++ media/liboggz/include/oggz/oggz_off_t_generated.h	Thu Sep 10 23:38:17 2009
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__OpenBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
--- a/www/mozilla-firefox/patches/patch-media_libsydneyaudio_include_sydney_audio_h
+++ b/www/mozilla-firefox/patches/patch-media_libsydneyaudio_include_sydney_audio_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-media_libsydneyaudio_include_sydney_audio_h,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- media/libsydneyaudio/include/sydney_audio.h.orig	Wed Jul 15 18:35:02 2009
+++ media/libsydneyaudio/include/sydney_audio.h	Tue Jul 21 14:54:57 2009
+@@ -48,7 +48,7 @@ async-signal safe.
+ #if !defined (WIN32)
+ #include <sys/param.h>
+ #include <inttypes.h>
+-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/endian.h>
+ #endif
+ #else
--- a/www/mozilla-firefox/patches/patch-media_libsydneyaudio_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-media_libsydneyaudio_src_Makefile_in
@ -0,0 +1,16 @@
+$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- media/libsydneyaudio/src/Makefile.in.orig	Mon Aug 24 18:52:50 2009
+++ media/libsydneyaudio/src/Makefile.in	Thu Sep 10 23:35:11 2009
+@@ -77,6 +77,12 @@ CSRCS		= \
+ 		$(NULL)
+ endif
+ 
+ifeq ($(OS_ARCH),OpenBSD)
+CSRCS		= \
+		sydney_audio_sndio.c \
+		$(NULL)
+endif
+
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += winmm.lib
+ endif
--- a/www/mozilla-firefox/patches/patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp
+++ b/www/mozilla-firefox/patches/patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig	Sat Dec  8 02:08:09 2007
-+++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp	Tue May  6 03:25:21 2008
-@@ -208,7 +208,7 @@ ensure_libgnomeui()
+$OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig	Wed Jan  6 05:35:27 2010
+++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp	Sun Jan 10 17:47:27 2010
+@@ -202,7 +202,7 @@ ensure_libgnomeui()
   // Attempt to get the libgnomeui symbol references. We do it this way so that stock icons from Init()
   // don't get held back by InitWithGnome()'s libgnomeui dependency.
   if (!gTriedToLoadGnomeLibs) {
@ -10,7 +10,7 @@ $OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.1 2008/1
     if (!gLibGnomeUI)
       return NS_ERROR_NOT_AVAILABLE;
 
-@@ -234,7 +234,7 @@ static nsresult
+@@ -228,7 +228,7 @@ static nsresult
 ensure_libgnome()
 {
   if (!gTriedToLoadGnomeLibs) {
@ -19,7 +19,7 @@ $OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.1 2008/1
     if (!gLibGnome)
       return NS_ERROR_NOT_AVAILABLE;
 
-@@ -256,7 +256,7 @@ static nsresult
+@@ -250,7 +250,7 @@ static nsresult
 ensure_libgnomevfs()
 {
   if (!gTriedToLoadGnomeLibs) {
--- a/www/mozilla-firefox/patches/patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp
+++ b/www/mozilla-firefox/patches/patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp.orig	Thu Jan 21 05:30:55 2010
+++ modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp	Thu Jan 21 13:56:10 2010
+@@ -355,7 +355,7 @@ nsresult nsPluginNativeWindowGtk2::CreateXCompositedWi
+      * ensures that those functions stay around even after flash is gone. */
+     static void *libplayback_handle;
+     if (!libplayback_handle) {
+-      libplayback_handle = dlopen("libplayback-1.so.0", RTLD_NOW);
+      libplayback_handle = dlopen("libplayback-1.so", RTLD_NOW);
+     }
+ 
+   }
--- a/www/mozilla-firefox/patches/patch-modules_plugin_base_src_nsPluginsDirUnix_cpp
+++ b/www/mozilla-firefox/patches/patch-modules_plugin_base_src_nsPluginsDirUnix_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_plugin_base_src_nsPluginsDirUnix_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- modules/plugin/base/src/nsPluginsDirUnix.cpp.orig	Wed Jan  6 05:35:28 2010
+++ modules/plugin/base/src/nsPluginsDirUnix.cpp	Sun Jan 10 17:47:27 2010
+@@ -142,7 +142,7 @@ static PRBool LoadExtraSharedLib(const char *name, cha
+ #endif
+ /*
+  this function looks for
+- user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so.6:libXext.so");
+ user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so:libXext.so");
+  in user's pref.js
+  and loads all libs in specified order
+ */
--- a/www/mozilla-firefox/patches/patch-netwerk_cookie_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-netwerk_cookie_src_Makefile_in
@ -1,9 +0,0 @@
-$OpenBSD: patch-netwerk_cookie_src_Makefile_in,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- netwerk/cookie/src/Makefile.in.orig	Sun Oct  5 22:38:13 2008
-+++ netwerk/cookie/src/Makefile.in	Sun Oct  5 22:40:34 2008
-@@ -60,5 +60,4 @@ CPPSRCS		= \
- 
- include $(topsrcdir)/config/rules.mk
- 
-CXXFLAGS += $(WARNINGS_AS_ERRORS)
- DEFINES += -DIMPL_NS_NET
--- a/www/mozilla-firefox/patches/patch-nsprpub_config_rules_mk
+++ b/www/mozilla-firefox/patches/patch-nsprpub_config_rules_mk
@ -0,0 +1,12 @@
+$OpenBSD: patch-nsprpub_config_rules_mk,v 1.5 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/config/rules.mk.orig	Wed Jan  6 05:35:28 2010
+++ nsprpub/config/rules.mk	Sun Jan 10 17:47:27 2010
+@@ -214,7 +214,7 @@ ifdef RELEASE_HEADERS
+ 	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
+ endif
+ ifdef RELEASE_LIBS
+-	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+	$(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+ endif
+ 	+$(LOOP_OVER_DIRS)
+ 
--- a/www/mozilla-firefox/patches/patch-nsprpub_configure_in
+++ b/www/mozilla-firefox/patches/patch-nsprpub_configure_in
@ -0,0 +1,16 @@
+$OpenBSD: patch-nsprpub_configure_in,v 1.7 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/configure.in.orig	Mon Nov  2 22:43:08 2009
+++ nsprpub/configure.in	Wed Nov 25 22:04:30 2009
+@@ -1811,9 +1811,11 @@ mips-sony-newsos*)
+     AC_DEFINE(OPENBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
+     AC_DEFINE(HAVE_SOCKLEN_T)
+    AC_DEFINE(_PR_HAVE_GETPROTO_R)
+    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
+     CFLAGS="$CFLAGS -ansi -Wall"
+     CXXFLAGS="$CXXFLAGS -ansi -Wall"
+-    DLL_SUFFIX=so.1.0
+    DLL_SUFFIX="so.${SO_VERSION}"
+     DSO_CFLAGS=-fPIC
+     MDCPUCFG_H=_openbsd.cfg
+     PR_MD_CSRCS=openbsd.c
--- a/www/mozilla-firefox/patches/patch-nsprpub_lib_tests_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-nsprpub_lib_tests_Makefile_in
@ -0,0 +1,16 @@
+$OpenBSD: patch-nsprpub_lib_tests_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/lib/tests/Makefile.in.orig	Sun Jun 21 17:49:59 2009
+++ nsprpub/lib/tests/Makefile.in	Sun Jun 21 17:52:57 2009
+@@ -117,6 +117,12 @@ ifeq (,$(filter-out OpenBSD,$(OS_ARCH)))
+     endif
+ endif
+ 
+ifeq ($(OS_ARCH), OpenBSD)
+        ifeq ($(USE_PTHREADS),1)
+            EXTRA_LIBS = -lpthread
+        endif
+endif
+
+ ifeq ($(OS_ARCH), OSF1)
+ LDOPTS += -rpath $(PWD)/$(dist_libdir) -lpthread
+ endif
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_cfg
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_cfg
@ -0,0 +1,12 @@
+$OpenBSD: patch-nsprpub_pr_include_md__openbsd_cfg,v 1.3 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/include/md/_openbsd.cfg.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/include/md/_openbsd.cfg	Sun Jun 21 17:53:09 2009
+@@ -193,7 +193,7 @@
+ #define PR_BYTES_PER_WORD_LOG2  3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+ 
+-#elif defined(__sparc__)
+#elif defined(__sparc__) || defined(__hppa__)
+ 
+ #undef IS_LITTLE_ENDIAN
+ #define  IS_BIG_ENDIAN 1
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h
@ -0,0 +1,24 @@
+$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.10 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/include/md/_openbsd.h.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/include/md/_openbsd.h	Sun Jun 21 17:53:25 2009
+@@ -56,6 +56,8 @@
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__arm__)
+ #define _PR_SI_ARCHITECTURE "arm"
+#elif defined(__hppa__)
+#define _PR_SI_ARCHITECTURE "hppa"
+ #endif
+ 
+ #define PR_DLL_SUFFIX		".so"
+@@ -65,7 +67,11 @@
+ #define _MD_DEFAULT_STACK_SIZE	65536L
+ #define _MD_MMAP_FLAGS          MAP_PRIVATE
+ 
+#if defined(__hppa__)
+#define HAVE_STACK_GROWING_UP
+#else
+ #undef  HAVE_STACK_GROWING_UP
+#endif
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_md_unix_uxrng_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_md_unix_uxrng_c
@ -0,0 +1,15 @@
+$OpenBSD: patch-nsprpub_pr_src_md_unix_uxrng_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/src/md/unix/uxrng.c.orig	Thu Jan 21 05:31:00 2010
+++ nsprpub/pr/src/md/unix/uxrng.c	Sun Jan 24 00:25:49 2010
+@@ -132,7 +132,11 @@ static PRCallOnceType coOpenDevURandom;
+ 
+ static PRStatus OpenDevURandom( void )
+ {
+#if defined(OPENBSD)
+    fdDevURandom = open( "/dev/arandom", O_RDONLY );
+#else
+     fdDevURandom = open( "/dev/urandom", O_RDONLY );
+#endif
+     return((-1 == fdDevURandom)? PR_FAILURE : PR_SUCCESS );
+ } /* end OpenDevURandom() */
+ 
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prdtoa_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prdtoa_c
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prinit_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prinit_c
@ -0,0 +1,33 @@
+$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.4 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/src/misc/prinit.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/src/misc/prinit.c	Sun Jun 21 17:53:51 2009
+@@ -414,8 +414,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+         _PR_CleanupDtoa();
+         _PR_CleanupCallOnce();
+ 		_PR_ShutdownLinker();
+-        _PR_CleanupNet();
+-        _PR_CleanupIO();
+         /* Release the primordial thread's private data, etc. */
+         _PR_CleanupThread(me);
+ 
+@@ -426,6 +424,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+ 	    _PR_LogCleanup();
+ 
+         /*
+         * accesses the current thread
+         */
+        _PR_CleanupNet();
+        _PR_CleanupIO();
+
+        /*
+          * This part should look like the end of _PR_NativeRunThread
+          * and _PR_UserRunThread.
+          */
+@@ -437,6 +441,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+             PR_DELETE(me->stack);
+             PR_DELETE(me);
+         }
+        _PR_MD_SET_CURRENT_THREAD(NULL);
+ 
+         /*
+          * XXX: We are freeing the heap memory here so that Purify won't
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c
@ -0,0 +1,16 @@
+$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.6 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/src/misc/prnetdb.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/src/misc/prnetdb.c	Sun Jun 21 17:54:00 2009
+@@ -2039,7 +2039,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const 
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
+	LOCK_DNS();
+
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
+
+	UNLOCK_DNS();
+
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+ 
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_pthreads_ptthread_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_pthreads_ptthread_c
@ -0,0 +1,11 @@
+$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.4 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/src/pthreads/ptthread.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/src/pthreads/ptthread.c	Sun Jun 21 17:54:11 2009
+@@ -51,6 +51,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
+ 
+ #ifdef SYMBIAN
+ /* In Open C sched_get_priority_min/max do not work properly, so we undefine
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_nameshm1_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_nameshm1_c
@ -0,0 +1,13 @@
+$OpenBSD: patch-nsprpub_pr_tests_nameshm1_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/tests/nameshm1.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/nameshm1.c	Sun Jun 21 17:54:19 2009
+@@ -598,7 +598,9 @@ int main(int argc, char **argv)
+         ReadOnlyTest();
+         if ( failed_already != 0 )
+             goto Finished;
+#if !defined(__OpenBSD__)
+         ClientServerTest();
+#endif
+     }
+ 
+ Finished:
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_prpollml_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_prpollml_c
@ -0,0 +1,19 @@
+$OpenBSD: patch-nsprpub_pr_tests_prpollml_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/tests/prpollml.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/prpollml.c	Sun Jun 21 17:54:29 2009
+@@ -47,14 +47,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifdef SYMBIAN
+-#define POLL_DESC_COUNT 128
+-#else
+-#define POLL_DESC_COUNT 256  /* This should be greater than the
+#define POLL_DESC_COUNT 120  /* This should be greater than the
+                               * STACK_POLL_DESC_COUNT macro in
+                               * ptio.c to cause syspoll_list to
+                               * be created. */
+-#endif
+ 
+ static PRPollDesc pd[POLL_DESC_COUNT];
+ 
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_runtests_sh
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_runtests_sh
@ -0,0 +1,43 @@
+$OpenBSD: patch-nsprpub_pr_tests_runtests_sh,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/tests/runtests.sh.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/runtests.sh	Sun Jun 21 17:54:39 2009
+@@ -90,11 +90,10 @@ fi
+ # Tests not run (but should)
+ #
+ 
+-#forktest (failed on IRIX)
+#nameshm1 - runs with ClientServerTest deactivated (idles forever) under OpenBSD
+ #nbconn - fails on some platforms 
+-#poll_er - fails on some platforms? limited use?
+ #prpoll -  the bad-FD test needs to be moved to a different test
+-#sleep	-  specific to OS/2
+#sema,semaerr and semaping - idles forever under OpenBSD (semaphore/thread)
+ 
+ LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
+ 
+@@ -124,6 +123,7 @@ exit
+ fdcach
+ fileio
+ foreign
+forktest
+ formattm
+ fsync
+ gethost
+@@ -168,6 +168,7 @@ perf
+ pipeping
+ pipeping2
+ pipeself
+poll_er
+ poll_nm
+ poll_to
+ pollable
+@@ -184,9 +185,6 @@ selct_er
+ selct_nm
+ selct_to
+ selintr
+-sema
+-semaerr
+-semaping
+ sendzlf
+ server_test
+ servr_kk
--- a/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_socket_c
+++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_tests_socket_c
@ -0,0 +1,59 @@
+$OpenBSD: patch-nsprpub_pr_tests_socket_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- nsprpub/pr/tests/socket.c.orig	Wed Jun 17 07:22:05 2009
+++ nsprpub/pr/tests/socket.c	Sun Jun 21 17:54:48 2009
+@@ -2234,6 +2234,7 @@ int main(int argc, char **argv)
+     /*
+      * client-server test, Ipv6-Ipv4
+      */
+    #if !defined(__OpenBSD__)
+ 	client_domain = PR_AF_INET6;
+ 	printf("TCP Client/Server Test - IPv6/Ipv4\n");
+     if (TCP_Socket_Client_Server_Test() < 0) {
+@@ -2241,9 +2242,11 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("TCP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * client-server test, Ipv4-Ipv6
+      */
+    #if !defined(__OpenBSD__)
+ 	client_domain = PR_AF_INET;
+ 	server_domain = PR_AF_INET6;
+ 	printf("TCP Client/Server Test - IPv4/Ipv6\n");
+@@ -2252,6 +2255,7 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("TCP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * client-server test, Ipv6-Ipv6
+      */
+@@ -2281,6 +2285,7 @@ int main(int argc, char **argv)
+     /*
+      * run client-server test with UDP, IPv6/IPv4
+      */
+    #if !defined(__OpenBSD__)
+ 	printf("UDP Client/Server Test - IPv6/Ipv4\n");
+ 	client_domain = PR_AF_INET6;
+ 	server_domain = PR_AF_INET;
+@@ -2289,9 +2294,11 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("UDP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * run client-server test with UDP,IPv4-IPv6
+      */
+    #if !defined(__OpenBSD__)
+ 	printf("UDP Client/Server Test - IPv4/Ipv6\n");
+ 	client_domain = PR_AF_INET;
+ 	server_domain = PR_AF_INET6;
+@@ -2300,6 +2307,7 @@ int main(int argc, char **argv)
+         goto done;
+     } else
+         printf("UDP_Socket_Client_Server_Test Passed\n");
+    #endif
+     /*
+      * run client-server test with UDP,IPv6-IPv6
+      */
--- a/www/mozilla-firefox/patches/patch-other-licenses_branding_firefox_pref_firefox-branding_js
+++ b/www/mozilla-firefox/patches/patch-other-licenses_branding_firefox_pref_firefox-branding_js
@ -1,11 +1,11 @@
-$OpenBSD: patch-other-licenses_branding_firefox_pref_firefox-branding_js,v 1.2 2008/12/18 19:27:13 martynas Exp $
--- other-licenses/branding/firefox/pref/firefox-branding.js.orig	Sun Nov 16 08:46:32 2008
-+++ other-licenses/branding/firefox/pref/firefox-branding.js	Wed Dec 17 07:44:24 2008
+$OpenBSD: patch-other-licenses_branding_firefox_pref_firefox-branding_js,v 1.3 2010/04/26 19:55:58 landry Exp $
+--- other-licenses/branding/firefox/pref/firefox-branding.js.orig	Wed Jan  6 05:35:29 2010
+++ other-licenses/branding/firefox/pref/firefox-branding.js	Sun Jan 10 17:47:28 2010
@@ -1,5 +1,5 @@
-pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
-pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
+-pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
 +pref("startup.homepage_override_url","about:blank");
 +pref("startup.homepage_welcome_url","about:blank");
- // URL user can browse to manually if for some reason all update installation
- // attempts fail.
- pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/");
+ // Interval: Time between checks for a new version (in seconds)
+ // nightly=6 hours, official=24 hours
+ pref("app.update.interval", 86400);
--- a/www/mozilla-firefox/patches/patch-parser_html_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-parser_html_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-parser_html_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+
+gcc runs out of memory with optimization.
+
+--- parser/html/Makefile.in.orig	Sat Mar 27 20:59:47 2010
+++ parser/html/Makefile.in	Sat Mar 27 21:01:04 2010
+@@ -98,3 +98,5 @@ include $(topsrcdir)/config/rules.mk
+ INCLUDES	+= \
+ 		-I$(srcdir)/../../content/base/src \
+ 		$(NULL)
+
+nsHtml5NamedCharacters.o: CXXFLAGS := $(filter-out -O%,$(CXXFLAGS))
--- a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
+++ b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
@ -1,6 +1,6 @@
-$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.10 2008/11/20 23:41:32 martynas Exp $
--- security/coreconf/OpenBSD.mk.orig	Thu Nov 22 06:39:56 2007
-+++ security/coreconf/OpenBSD.mk	Sun Apr 13 18:35:49 2008
+$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.11 2010/04/26 19:55:58 landry Exp $
+--- security/coreconf/OpenBSD.mk.orig	Tue Mar 16 10:57:06 2010
+++ security/coreconf/OpenBSD.mk	Sat Mar 27 16:34:28 2010
@@ -56,7 +56,7 @@ OS_LIBS			+= -pthread
 DSO_LDOPTS		+= -pthread
 endif
@ -10,3 +10,16 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.10 2008/11/20 23:41:32 martynas
 
 OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
 
+@@ -64,10 +64,10 @@ OS_LIBS			= 
+ 
+ ARCH			= openbsd
+ 
+-DSO_CFLAGS		= -fPIC -DPIC
+DSO_CFLAGS		= -I${LOCALBASE}/include -DRAND_DEV=\"/dev/arandom\" -fPIC -DPIC
+ DSO_LDOPTS		= -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+ 
+ USE_SYSTEM_ZLIB		= 1
+ ZLIB_LIBS		= -lz
--- a/www/mozilla-firefox/patches/patch-security_coreconf_UNIX_mk
+++ b/www/mozilla-firefox/patches/patch-security_coreconf_UNIX_mk
@ -0,0 +1,12 @@
+$OpenBSD: patch-security_coreconf_UNIX_mk,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- security/coreconf/UNIX.mk.orig	Wed Jun 17 07:22:08 2009
+++ security/coreconf/UNIX.mk	Sun Jun 21 17:58:10 2009
+@@ -42,7 +42,7 @@ AR          = ar cr $@
+ LDOPTS     += -L$(SOURCE_LIB_DIR)
+ 
+ ifdef BUILD_OPT
+-	OPTIMIZER  += -O
+	OPTIMIZER  +=
+ 	DEFINES    += -UDEBUG -DNDEBUG
+ else
+ 	OPTIMIZER  += -g
--- 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
@ -0,0 +1,11 @@
+$OpenBSD: patch-security_manager_pki_resources_content_exceptionDialog_js,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- security/manager/pki/resources/content/exceptionDialog.js.orig	Mon Aug 24 18:52:58 2009
+++ security/manager/pki/resources/content/exceptionDialog.js	Thu Sep 10 23:40:10 2009
+@@ -287,6 +287,7 @@ function updateCertStatus() {
+       
+       // In these cases, we do want to enable the "Add Exception" button
+       gDialog.getButton("extra1").disabled = false;
+      gDialog.getButton("extra1").focus();
+ 
+       // If the Private Browsing service is available and the mode is active,
+       // don't store permanent exceptions, since they would persist after
--- 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.3 2008/11/20 23:41:32 martynas Exp $
--- security/manager/ssl/src/Makefile.in.orig	Wed Dec  5 09:34:57 2007
-+++ security/manager/ssl/src/Makefile.in	Sun Apr 13 20:35:35 2008
-@@ -135,7 +135,10 @@ REQUIRES	= nspr \
+$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.4 2010/04/26 19:55:58 landry Exp $
+--- security/manager/ssl/src/Makefile.in.orig	Wed Jun 17 07:22:08 2009
+++ security/manager/ssl/src/Makefile.in	Sat Jun 20 22:09:10 2009
+@@ -134,7 +134,10 @@ REQUIRES	= nspr \
 
 EXTRA_DEPS = $(NSS_DEP_LIBS)
 
--- 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,7 +1,7 @@
-$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.6 2009/09/10 21:28:25 martynas Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Thu Aug  6 17:03:53 2009
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Wed Sep  9 22:33:42 2009
-@@ -811,11 +811,10 @@ nsNSSComponent::InstallLoadableRoots()
+$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.7 2010/04/26 19:55:58 landry Exp $
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon Aug 24 18:52:58 2009
+++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Sep 10 23:35:13 2009
+@@ -812,11 +812,10 @@ nsNSSComponent::InstallLoadableRoots()
     return;
 
   const char *possible_ckbi_locations[] = {
@ -16,7 +16,7 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.6 2009/09/10 21:
   };
 
   for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
-@@ -824,7 +823,7 @@ nsNSSComponent::InstallLoadableRoots()
+@@ -825,7 +824,7 @@ nsNSSComponent::InstallLoadableRoots()
 
     if (!possible_ckbi_locations[il])
     {
--- a/www/mozilla-firefox/patches/patch-security_nss_cmd_platlibs_mk
+++ b/www/mozilla-firefox/patches/patch-security_nss_cmd_platlibs_mk
@ -0,0 +1,17 @@
+$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.3 2010/04/26 19:55:58 landry Exp $
+--- security/nss/cmd/platlibs.mk.orig	Tue Mar 16 10:57:08 2010
+++ security/nss/cmd/platlibs.mk	Sat Mar 27 01:54:27 2010
+@@ -179,10 +179,11 @@ endif
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+-	$(SQLITE) \
+ 	-L$(NSSUTIL_LIB_DIR) \
+-	-lnssutil3 \
+ 	-L$(NSPR_LIB_DIR) \
+	-L$(LOCALBASE)/lib \
+	$(SQLITE) \
+	-lnssutil3 \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
--- a/www/mozilla-firefox/patches/patch-security_nss_lib_ckfw_builtins_certdata_c
+++ b/www/mozilla-firefox/patches/patch-security_nss_lib_ckfw_builtins_certdata_c
@ -0,0 +1,374 @@
+$OpenBSD: patch-security_nss_lib_ckfw_builtins_certdata_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- security/nss/lib/ckfw/builtins/certdata.c.orig	Tue Mar 16 10:57:09 2010
+++ security/nss/lib/ckfw/builtins/certdata.c	Sat Mar 27 17:08:40 2010
+@@ -1020,6 +1020,18 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 
+ static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
+  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+ };
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_322 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_323 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_324 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_325 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+ #ifdef DEBUG
+ static const NSSItem nss_builtins_items_0 [] = {
+   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+@@ -21537,6 +21549,332 @@ static const NSSItem nss_builtins_items_321 [] = {
+   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+ };
+static const NSSItem nss_builtins_items_322 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
+"\103"
+, (PRUint32)1857 }
+};
+static const NSSItem nss_builtins_items_323 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 1 Certification Authority", (PRUint32)43 },
+  { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
+"\166\316\217\063"
+, (PRUint32)20 },
+  { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
+, (PRUint32)16 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_324 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
+"\063\040\122\157\157\164"
+, (PRUint32)86 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
+"\322\156\245\033\231\047\200\347\013\251\250\000"
+, (PRUint32)1548 }
+};
+static const NSSItem nss_builtins_items_325 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"CAcert.org Class 3 Certification Authority", (PRUint32)43 },
+  { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
+"\030\116\052\055"
+, (PRUint32)20 },
+  { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
+, (PRUint32)16 },
+  { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
+"\100\143\141\143\145\162\164\056\157\162\147"
+, (PRUint32)123 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+ 
+ builtinsInternalObject
+ nss_builtins_data[] = {
+@@ -21863,11 +22201,15 @@ nss_builtins_data[] = {
+   { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
+   { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
+   { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
+-  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
+  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} },
+  { 11, nss_builtins_types_322, nss_builtins_items_322, {NULL} },
+  { 13, nss_builtins_types_323, nss_builtins_items_323, {NULL} },
+  { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
+  { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }
+ };
+ const PRUint32
+ #ifdef DEBUG
+-  nss_builtins_nObjects = 321+1;
+  nss_builtins_nObjects = 325+1;
+ #else
+-  nss_builtins_nObjects = 321;
+  nss_builtins_nObjects = 325;
+ #endif /* DEBUG */
--- a/www/mozilla-firefox/patches/patch-security_nss_lib_ckfw_builtins_certdata_txt
+++ b/www/mozilla-firefox/patches/patch-security_nss_lib_ckfw_builtins_certdata_txt
@ -0,0 +1,356 @@
+$OpenBSD: patch-security_nss_lib_ckfw_builtins_certdata_txt,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- security/nss/lib/ckfw/builtins/certdata.txt.orig	Wed Jan  6 05:35:31 2010
+++ security/nss/lib/ckfw/builtins/certdata.txt	Sun Jan 10 17:47:29 2010
+@@ -19538,6 +19538,352 @@ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNK
+ CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+ 
+ #
+# Certificate "CAcert.org Class 1 Certification Authority"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 1 Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
+\103
+END
+
+# Trust for Certificate "CAcert.org Class 1 Certification Authority"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 1 Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
+\166\316\217\063
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "CAcert.org Class 3 Certification Authority"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 3 Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
+\063\040\122\157\157\164
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
+\322\156\245\033\231\047\200\347\013\251\250\000
+END
+
+# Trust for Certificate "CAcert.org Class 3 Certification Authority"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 3 Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
+\030\116\052\055
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+ # Certificate "ePKI Root Certification Authority"
+ #
+ CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
--- a/www/mozilla-firefox/patches/patch-security_nss_lib_freebl_blapi_h
+++ b/www/mozilla-firefox/patches/patch-security_nss_lib_freebl_blapi_h
@ -0,0 +1,17 @@
+$OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1 2010/04/26 19:55:58 landry Exp $
+
+SHA1_Update conflicts with openssl which may be dynamically loaded
+at runtime via libcups or libgssapi so causing a crash due to using
+the wrong binding.  So rename here to avoid conflict.
+
+--- security/nss/lib/freebl/blapi.h.orig	Mon Nov 16 13:51:11 2009
+++ security/nss/lib/freebl/blapi.h	Mon Nov 16 13:51:24 2009
+@@ -925,6 +925,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo
+ */
+ extern void SHA1_Begin(SHA1Context *cx);
+ 
+#define SHA1_Update NSS_SHA1_Update
+
+ /*
+ ** Update the SHA-1 hash function with more data.
+ **	"cx" the context
--- a/www/mozilla-firefox/patches/patch-security_nss_lib_freebl_unix_rand_c
+++ b/www/mozilla-firefox/patches/patch-security_nss_lib_freebl_unix_rand_c
@ -0,0 +1,29 @@
+$OpenBSD: patch-security_nss_lib_freebl_unix_rand_c,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- security/nss/lib/freebl/unix_rand.c.orig	Mon Nov  2 22:43:12 2009
+++ security/nss/lib/freebl/unix_rand.c	Wed Nov 25 22:04:30 2009
+@@ -849,7 +849,6 @@ safe_pclose(FILE *fp)
+ /* Fork netstat to collect its output by default. Do not unset this unless
+  * another source of entropy is available
+  */
+-#define DO_NETSTAT 1
+ 
+ void RNG_SystemInfoForRNG(void)
+ {
+@@ -916,7 +915,7 @@ void RNG_SystemInfoForRNG(void)
+     GiveSystemInfo();
+ 
+     /* grab some data from system's PRNG before any other files. */
+-    bytes = RNG_FileUpdate("/dev/urandom", SYSTEM_RNG_SEED_COUNT);
+    bytes = RNG_FileUpdate(RAND_DEV, SYSTEM_RNG_SEED_COUNT);
+ 
+     /* If the user points us to a random file, pass it through the rng */
+     randfile = getenv("NSRANDFILE");
+@@ -1159,7 +1158,7 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
+     size_t fileBytes = 0;
+     unsigned char *buffer = dest;
+ 
+-    file = fopen("/dev/urandom", "r");
+    file = fopen(RAND_DEV, "r");
+     if (file == NULL) {
+ 	return rng_systemFromNoise(dest, maxLen);
+     }
--- a/www/mozilla-firefox/patches/patch-security_nss_lib_softoken_config_mk
+++ b/www/mozilla-firefox/patches/patch-security_nss_lib_softoken_config_mk
@ -0,0 +1,27 @@
+$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.3 2010/04/26 19:55:58 landry Exp $
+--- security/nss/lib/softoken/config.mk.orig	Wed Nov 25 21:52:34 2009
+++ security/nss/lib/softoken/config.mk	Wed Nov 25 21:53:44 2009
+@@ -56,9 +56,10 @@ ifdef NS_USE_GCC
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) \
+	-L$(LOCALBASE)/lib \
+ 	-lnssutil3 \
+ 	-lsqlite3 \
+-	-L$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
+@@ -82,9 +83,10 @@ else
+ EXTRA_SHARED_LIBS += \
+ 	-L$(DIST)/lib \
+ 	-L$(NSSUTIL_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) \
+	-L$(LOCALBASE)/lib \
+ 	-lnssutil3 \
+ 	-lsqlite3 \
+-	-L$(NSPR_LIB_DIR) \
+ 	-lplc4 \
+ 	-lplds4 \
+ 	-lnspr4 \
--- a/www/mozilla-firefox/patches/patch-security_nss_lib_softoken_fipstokn_c
+++ b/www/mozilla-firefox/patches/patch-security_nss_lib_softoken_fipstokn_c
@ -0,0 +1,12 @@
+$OpenBSD: patch-security_nss_lib_softoken_fipstokn_c,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- security/nss/lib/softoken/fipstokn.c.orig	Wed Jul 15 18:35:28 2009
+++ security/nss/lib/softoken/fipstokn.c	Tue Jul 21 21:15:27 2009
+@@ -73,7 +73,7 @@
+ #ifdef LINUX
+ #include <pthread.h>
+ #include <dlfcn.h>
+-#define LIBAUDIT_NAME "libaudit.so.0"
+#define LIBAUDIT_NAME "libaudit.so"
+ #ifndef AUDIT_CRYPTO_TEST_USER
+ #define AUDIT_CRYPTO_TEST_USER          2400 /* Crypto test results */
+ #define AUDIT_CRYPTO_PARAM_CHANGE_USER  2401 /* Crypto attribute change */
--- a/www/mozilla-firefox/patches/patch-toolkit_components_downloads_src_nsDownloadManager_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_components_downloads_src_nsDownloadManager_cpp
@ -1,30 +1,21 @@
-$OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.1 2009/09/18 20:35:27 martynas Exp $
--- toolkit/components/downloads/src/nsDownloadManager.cpp.orig	Fri Jan  9 14:33:18 2009
-+++ toolkit/components/downloads/src/nsDownloadManager.cpp	Mon Sep 14 11:49:26 2009
-@@ -1294,7 +1294,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
-         NS_ENSURE_SUCCESS(rv, rv);
-         (*aResult)->Exists(&bRes);
-         if (!bRes) {
-          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0755);
-+          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0700);
-           NS_ENSURE_SUCCESS(rv, rv);
-         }
-         return NS_OK;
-@@ -1312,7 +1312,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
-             NS_ADDREF(*aResult = customDirectory);
-             return NS_OK;
-           }
-          rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0755);
-+          rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0700);
-           NS_ENSURE_SUCCESS(rv, rv);
-           NS_ADDREF(*aResult = customDirectory);
-           return NS_OK;
-@@ -1321,7 +1321,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
-         NS_ENSURE_SUCCESS(rv, rv);
-         (*aResult)->Exists(&bRes);
-         if (!bRes) {
-          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0755);
-+          rv = (*aResult)->Create(nsIFile::DIRECTORY_TYPE, 0700);
-           NS_ENSURE_SUCCESS(rv, rv);
-           // Update dir pref
-           prefBranch->SetComplexValue(NS_PREF_DIR,
+$OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- toolkit/components/downloads/src/nsDownloadManager.cpp.orig	Wed Jan  6 05:35:32 2010
+++ toolkit/components/downloads/src/nsDownloadManager.cpp	Sun Jan 10 17:52:45 2010
+@@ -1156,7 +1156,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
+     rv = downloadDir->Exists(&exists);
+     NS_ENSURE_SUCCESS(rv, rv);
+     if (!exists) {
+-      rv = downloadDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
+      rv = downloadDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
+       NS_ENSURE_SUCCESS(rv, rv);
+     }
+   }
+@@ -1252,7 +1252,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+           (void)customDirectory->Exists(&exists);
+ 
+           if (!exists) {
+-            rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0755);
+            rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0700);
+             if (NS_SUCCEEDED(rv)) {
+               customDirectory.forget(aResult);
+               return NS_OK;
--- a/www/mozilla-firefox/patches/patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp
@ -1,45 +0,0 @@
-$OpenBSD: patch-toolkit_components_url-classifier_src_nsUrlClassifierDBService_cpp,v 1.2 2010/03/31 15:46:12 naddy Exp $
--- toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp.orig	Mon Mar  8 19:47:53 2010
-+++ toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp	Tue Mar 30 21:54:19 2010
-@@ -2029,8 +2029,20 @@ nsUrlClassifierDBServiceWorker::GetShaEntries(PRUint32
-           return NS_ERROR_FAILURE;
-         }
-         const nsCSubstring& str = Substring(chunk, start, 4);
-+#if 0
-+        // You can't just cast a char* to an int* and access through it
-         const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
-         entry->mAddChunkId = PR_ntohl(*p);
-+#else
-+        // the old-school way...
-+        union {
-+          PRUint32 i;
-+          char c[4];
-+        } u;
-+
-+        memcpy(u.c, reinterpret_cast<const char *>(str.BeginReading()), 4);
-+        entry->mAddChunkId = PR_ntohl(u.i);
-+#endif
-         if (entry->mAddChunkId == 0) {
-           NS_WARNING("Received invalid chunk number.");
-           return NS_ERROR_FAILURE;
-@@ -2058,8 +2070,20 @@ nsUrlClassifierDBServiceWorker::GetShaEntries(PRUint32
- 
-         if (chunkType == CHUNK_SUB) {
-           const nsCSubstring& str = Substring(chunk, start, 4);
-+#if 0
-+          // You can't just cast a char* to an int* and access through it
-           const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
-           entry->mAddChunkId = PR_ntohl(*p);
-+#else
-+          // the old-school way...
-+          union {
-+            PRUint32 i;
-+            char c[4];
-+          } u;
-+
-+          memcpy(u.c, reinterpret_cast<const char *>(str.BeginReading()), 4);
-+          entry->mAddChunkId = PR_ntohl(u.i);
-+#endif
-           if (entry->mAddChunkId == 0) {
-             NS_WARNING("Received invalid chunk number.");
-             return NS_ERROR_FAILURE;
--- a/www/mozilla-firefox/patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_crashreporter_client_crashreporter_linux_cpp
@ -0,0 +1,26 @@
+$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig	Thu Jan 21 05:31:15 2010
+++ toolkit/crashreporter/client/crashreporter_linux.cpp	Thu Jan 21 14:00:53 2010
+@@ -205,7 +205,7 @@ static void LoadProxyinfo()
+   if (getenv ("http_proxy"))
+     return; // libcurl can use the value from the environment
+ 
+-  static void* gconfLib = dlopen("libgconf-2.so.4", RTLD_LAZY);
+  static void* gconfLib = dlopen("libgconf-2.so", RTLD_LAZY);
+   if (!gconfLib)
+     return;
+ 
+@@ -585,11 +585,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i
+ 
+ static 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
@ -0,0 +1,13 @@
+$OpenBSD: patch-toolkit_library_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- toolkit/library/Makefile.in.orig	Tue Mar 16 10:57:18 2010
+++ toolkit/library/Makefile.in	Sat Mar 27 01:54:28 2010
+@@ -282,6 +282,9 @@ ifdef MOZ_ENABLE_QT
+ EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
+ endif
+ 
+# GTK2 widget and Sydney audio sndio backends.
+EXTRA_DSO_LDOPTS += -lsndio
+
+ ifdef MOZ_JAVAXPCOM
+ dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
+ 	$(INSTALL) $^ .
--- a/www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsNativeAppSupportUnix_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- toolkit/xre/nsNativeAppSupportUnix.cpp.orig	Thu Feb 21 12:55:06 2008
-+++ toolkit/xre/nsNativeAppSupportUnix.cpp	Tue May  6 03:25:56 2008
-@@ -214,11 +214,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
+$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- toolkit/xre/nsNativeAppSupportUnix.cpp.orig	Wed Jan  6 05:35:34 2010
+++ toolkit/xre/nsNativeAppSupportUnix.cpp	Sun Jan 10 17:47:30 2010
+@@ -404,11 +404,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
 
-   *aRetVal = PR_TRUE;
+ #ifdef MOZ_X11
 
 -  PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so.0");
 +  PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so");
--- a/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- toolkit/xre/nsXREDirProvider.cpp.orig	Mon Mar 17 21:05:25 2008
-+++ toolkit/xre/nsXREDirProvider.cpp	Fri Jun 13 19:54:14 2008
-@@ -1119,11 +1119,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
+$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- toolkit/xre/nsXREDirProvider.cpp.orig	Wed Jan  6 05:35:34 2010
+++ toolkit/xre/nsXREDirProvider.cpp	Sun Jan 10 17:47:30 2010
+@@ -1230,11 +1230,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
   NS_ENSURE_SUCCESS(rv, rv);
 #elif defined(XP_UNIX)
   static const char *const sysSExtDir = 
--- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_gtk2_Makefile_in,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- widget/src/gtk2/Makefile.in.orig	Wed Jan  6 05:35:35 2010
+++ widget/src/gtk2/Makefile.in	Sun Jan 10 17:47:30 2010
+@@ -183,6 +183,8 @@ DEFINES         += -DUSE_POSTSCRIPT
+ EXTRA_DSO_LDOPTS += -lgfxpsshar
+ endif
+ 
+# GTK2 widget sndio backend.
+EXTRA_DSO_LDOPTS += -lsndio
+ 
+ DEFINES		+=
+ INCLUDES	+= \
--- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsBidiKeyboard_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsBidiKeyboard_cpp
@ -1,12 +1,16 @@
-$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- widget/src/gtk2/nsBidiKeyboard.cpp.orig	Wed Apr 16 23:03:19 2008
-+++ widget/src/gtk2/nsBidiKeyboard.cpp	Fri Jun 13 19:41:59 2008
-@@ -54,7 +54,7 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard)
- nsBidiKeyboard::nsBidiKeyboard()
+$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- widget/src/gtk2/nsBidiKeyboard.cpp.orig	Thu Mar  5 23:32:52 2009
+++ widget/src/gtk2/nsBidiKeyboard.cpp	Fri Mar 13 17:26:18 2009
+@@ -55,10 +55,10 @@ nsBidiKeyboard::nsBidiKeyboard()
 {
+ #if defined(MOZ_X11)
     if (!gtklib)
 -        gtklib = PR_LoadLibrary("libgtk-x11-2.0.so.0");
 +        gtklib = PR_LoadLibrary("libgtk-x11-2.0.so");
- 
-     if (gtklib && !GdkKeymapHaveBidiLayouts)
-             GdkKeymapHaveBidiLayouts = (GdkKeymapHaveBidiLayoutsType) PR_FindFunctionSymbol(gtklib, "gdk_keymap_have_bidi_layouts");
+ #elif defined(MOZ_DFB)
+     if (!gtklib)
+-        gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so.0");
+        gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so");
+ #else
+     return;
+ #endif
--- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsIdleServiceGTK_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsIdleServiceGTK_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- widget/src/gtk2/nsIdleServiceGTK.cpp.orig	Thu Sep 27 19:53:48 2007
-+++ widget/src/gtk2/nsIdleServiceGTK.cpp	Tue May  6 03:27:58 2008
-@@ -78,7 +78,7 @@ static void Initialize()
- #endif
- 
+$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- widget/src/gtk2/nsIdleServiceGTK.cpp.orig	Wed Jan  6 05:35:35 2010
+++ widget/src/gtk2/nsIdleServiceGTK.cpp	Sun Jan 10 17:47:30 2010
+@@ -68,7 +68,7 @@ NS_IMPL_ISUPPORTS1(nsIdleServiceGTK, nsIIdleService)
+ static void Initialize()
+ {
     // This will leak - See comments in ~nsIdleServiceGTK().
 -    PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
 +    PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
--- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsScreenManagerGtk_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsScreenManagerGtk_cpp
@ -1,12 +1,12 @@
-$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- widget/src/gtk2/nsScreenManagerGtk.cpp.orig	Wed May  2 23:07:33 2007
-+++ widget/src/gtk2/nsScreenManagerGtk.cpp	Tue May  6 03:27:26 2008
-@@ -80,7 +80,7 @@ nsScreenManagerGtk :: EnsureInit(void)
-     XineramaScreenInfo *screenInfo = NULL;
+$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- widget/src/gtk2/nsScreenManagerGtk.cpp.orig	Wed Jun 17 07:22:21 2009
+++ widget/src/gtk2/nsScreenManagerGtk.cpp	Sat Jun 20 22:09:11 2009
+@@ -174,7 +174,7 @@ nsScreenManagerGtk :: Init()
+   int numScreens;
 
-     // We are leaking xineramalib, but there is no other way to do this.
-    PRLibrary* xineramalib = PR_LoadLibrary("libXinerama.so.1");
-+    PRLibrary* xineramalib = PR_LoadLibrary("libXinerama.so");
-     if (xineramalib) {
-       _XnrmIsActive_fn _XnrmIsActive = (_XnrmIsActive_fn)
-           PR_FindFunctionSymbol(xineramalib, "XineramaIsActive");
+   if (!mXineramalib) {
+-    mXineramalib = PR_LoadLibrary("libXinerama.so.1");
+    mXineramalib = PR_LoadLibrary("libXinerama.so");
+     if (!mXineramalib) {
+       mXineramalib = SCREEN_MANAGER_LIBRARY_LOAD_FAILED;
+     }
--- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsWindow_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsWindow_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_gtk2_nsWindow_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- widget/src/gtk2/nsWindow.cpp.orig	Fri Apr  2 18:03:20 2010
+++ widget/src/gtk2/nsWindow.cpp	Sun Apr 25 23:45:31 2010
+@@ -38,6 +38,8 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
+#include <stdint.h>
+
+ #ifdef MOZ_PLATFORM_MAEMO
+ #define MAEMO_CHANGES
+ #endif
--- a/www/mozilla-firefox/patches/patch-widget_src_qt_nsIdleServiceQt_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_qt_nsIdleServiceQt_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_qt_nsIdleServiceQt_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- widget/src/qt/nsIdleServiceQt.cpp.orig	Thu Mar  5 23:32:52 2009
+++ widget/src/qt/nsIdleServiceQt.cpp	Fri Mar 13 17:47:56 2009
+@@ -72,7 +72,7 @@ static void Initialize()
+     sInitialized = PR_TRUE;
+ 
+     // This will leak - See comments in ~nsIdleServiceQt().
+-    PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
+    PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
+     if (!xsslib) {
+         return;
+     }
--- a/www/mozilla-firefox/patches/patch-widget_src_qt_nsSound_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_qt_nsSound_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-widget_src_qt_nsSound_cpp,v 1.1 2010/04/26 19:55:58 landry Exp $
+--- widget/src/qt/nsSound.cpp.orig	Wed Jul 15 18:36:06 2009
+++ widget/src/qt/nsSound.cpp	Tue Jul 21 21:18:28 2009
+@@ -123,7 +123,7 @@ nsSound::Init()
+ 
+     EsdOpenSoundType EsdOpenSound;
+ 
+-    elib = PR_LoadLibrary("libesd.so.0");
+    elib = PR_LoadLibrary("libesd.so");
+     if (!elib) return NS_ERROR_FAILURE;
+ 
+     EsdOpenSound = (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound");
--- a/www/mozilla-firefox/patches/patch-widget_src_xpwidgets_nsPrintSettingsImpl_cpp
+++ b/www/mozilla-firefox/patches/patch-widget_src_xpwidgets_nsPrintSettingsImpl_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-widget_src_xpwidgets_nsPrintSettingsImpl_cpp,v 1.1 2009/04/22 21:00:23 martynas Exp $
--- widget/src/xpwidgets/nsPrintSettingsImpl.cpp.orig	Thu Mar 20 07:58:48 2008
-+++ widget/src/xpwidgets/nsPrintSettingsImpl.cpp	Wed Apr 22 22:32:46 2009
-@@ -62,7 +62,7 @@ nsPrintSettings::nsPrintSettings() :
+$OpenBSD: patch-widget_src_xpwidgets_nsPrintSettingsImpl_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- widget/src/xpwidgets/nsPrintSettingsImpl.cpp.orig	Wed Jan  6 05:35:35 2010
+++ widget/src/xpwidgets/nsPrintSettingsImpl.cpp	Sun Jan 10 17:47:30 2010
+@@ -61,7 +61,7 @@ nsPrintSettings::nsPrintSettings() :
   mIsCancelled(PR_FALSE),
   mPrintSilent(PR_FALSE),
   mPrintPreview(PR_FALSE),
--- a/www/mozilla-firefox/patches/patch-xpcom_base_nsStackWalk_cpp
+++ b/www/mozilla-firefox/patches/patch-xpcom_base_nsStackWalk_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.1 2008/11/20 23:41:32 martynas Exp $
--- xpcom/base/nsStackWalk.cpp.orig	Wed Mar 12 00:46:31 2008
-+++ xpcom/base/nsStackWalk.cpp	Sun Apr 13 20:34:51 2008
-@@ -1124,7 +1124,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAdd
+$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- xpcom/base/nsStackWalk.cpp.orig	Wed Jan  6 05:35:35 2010
+++ xpcom/base/nsStackWalk.cpp	Sun Jan 10 17:47:30 2010
+@@ -1132,7 +1132,7 @@ NS_FormatCodeAddressDetails(void *aPC, const nsCodeAdd
 #define __USE_GNU
 #endif
 
@ -10,3 +10,12 @@ $OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.1 2008/11/20 23:41:32 martynas Ex
 #include <dlfcn.h>
 #endif
 
+@@ -1231,7 +1231,7 @@ myinit()
+     if (! initialized) {
+ #ifndef __GNUC__
+         void *handle;
+-        const char *libdem = "libdemangle.so.1";
+        const char *libdem = "libdemangle.so";
+ 
+         /* load libdemangle if we can and need to (only try this once) */
+         if ((handle = dlopen(libdem, RTLD_LAZY)) != NULL) {
--- 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.1 2009/09/10 21:34:55 martynas Exp $
--- xpcom/io/SpecialSystemDirectory.cpp.orig	Fri Mar 14 20:34:21 2008
-+++ xpcom/io/SpecialSystemDirectory.cpp	Wed Sep  9 22:46:39 2009
-@@ -444,7 +444,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
+$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
+--- xpcom/io/SpecialSystemDirectory.cpp.orig	Wed Jan  6 05:35:35 2010
+++ xpcom/io/SpecialSystemDirectory.cpp	Sun Jan 10 17:47:30 2010
+@@ -520,7 +520,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
     if (NS_FAILED(rv))
         return rv;
     if (!exists) {
--- 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,7 +1,7 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.10 2008/11/20 23:41:32 martynas Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Apr  9 09:34:20 2008
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Sep 14 16:48:09 2008
-@@ -192,7 +192,7 @@ endif
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.11 2010/04/26 19:55:58 landry Exp $
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Jan  6 05:35:35 2010
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Jan 10 17:47:30 2010
+@@ -207,7 +207,7 @@ endif
 #
 # OpenBSD/ARM
 #
@ -10,7 +10,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.10 2008/11/20
 CPPSRCS		:= xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp
 endif
 
-@@ -340,6 +340,7 @@ endif
+@@ -351,6 +351,7 @@ endif
 ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc)
 CPPSRCS		:= xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp
 ASFILES		:= xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s
--- a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
+++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
@ -1,4 +1,4 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.1 2008/11/20 23:41:32 martynas Exp $
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.2 2010/04/26 19:55:58 landry Exp $
 --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s.orig	Sun Dec 23 01:57:11 2007
 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s	Sun Sep 14 22:24:42 2008
@@ -1,43 +1,43 @@
--- a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
+++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
@ -1,4 +1,4 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.1 2008/11/20 23:41:32 martynas Exp $
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.2 2010/04/26 19:55:58 landry Exp $
 --- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s.orig	Sun Dec 23 01:57:11 2007
 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s	Sun Sep 14 22:21:55 2008
@@ -1,43 +1,43 @@
--- a/www/mozilla-firefox/pkg/PLIST
+++ b/www/mozilla-firefox/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.24 2009/12/22 13:02:12 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.25 2010/04/26 19:55:58 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@pkgpath www/firefox3
@ -37,9 +37,9 @@ mozilla-firefox/components/
 mozilla-firefox/components/FeedConverter.js
 mozilla-firefox/components/FeedProcessor.js
 mozilla-firefox/components/FeedWriter.js
+mozilla-firefox/components/GPSDGeolocationProvider.js
+mozilla-firefox/components/NetworkGeolocationProvider.js
 mozilla-firefox/components/WebContentConverter.js
-mozilla-firefox/components/aboutRights.js
-mozilla-firefox/components/aboutRobots.js
 mozilla-firefox/components/accessibility.xpt
 mozilla-firefox/components/alerts.xpt
 mozilla-firefox/components/appshell.xpt
@ -49,14 +49,15 @@ mozilla-firefox/components/autoconfig.xpt
 mozilla-firefox/components/browser-feeds.xpt
 mozilla-firefox/components/browsercompsbase.xpt
 mozilla-firefox/components/browserplaces.xpt
-mozilla-firefox/components/browsersearch.xpt
 mozilla-firefox/components/caps.xpt
 mozilla-firefox/components/chardet.xpt
 mozilla-firefox/components/chrome.xpt
 mozilla-firefox/components/commandhandler.xpt
 mozilla-firefox/components/commandlines.xpt
+mozilla-firefox/components/components.list
 mozilla-firefox/components/composer.xpt
 mozilla-firefox/components/content_base.xpt
+mozilla-firefox/components/content_events.xpt
 mozilla-firefox/components/content_html.xpt
 mozilla-firefox/components/content_htmldoc.xpt
 mozilla-firefox/components/content_xmldoc.xpt
@ -72,6 +73,7 @@ mozilla-firefox/components/dom_canvas.xpt
 mozilla-firefox/components/dom_core.xpt
 mozilla-firefox/components/dom_css.xpt
 mozilla-firefox/components/dom_events.xpt
+mozilla-firefox/components/dom_geolocation.xpt
 mozilla-firefox/components/dom_html.xpt
 mozilla-firefox/components/dom_json.xpt
 mozilla-firefox/components/dom_loadsave.xpt
@ -81,6 +83,7 @@ mozilla-firefox/components/dom_sidebar.xpt
 mozilla-firefox/components/dom_storage.xpt
 mozilla-firefox/components/dom_stylesheets.xpt
 mozilla-firefox/components/dom_svg.xpt
+mozilla-firefox/components/dom_threads.xpt
 mozilla-firefox/components/dom_traversal.xpt
 mozilla-firefox/components/dom_views.xpt
 mozilla-firefox/components/dom_xbl.xpt
@ -111,61 +114,9 @@ mozilla-firefox/components/layout_base.xpt
 mozilla-firefox/components/layout_printing.xpt
 mozilla-firefox/components/layout_xul.xpt
 mozilla-firefox/components/layout_xul_tree.xpt
-@lib mozilla-firefox/components/libaccessibility.so.${LIBaccessibility_VERSION}
-@lib mozilla-firefox/components/libappcomps.so.${LIBappcomps_VERSION}
-@lib mozilla-firefox/components/libauth.so.${LIBauth_VERSION}
-@lib mozilla-firefox/components/libautoconfig.so.${LIBautoconfig_VERSION}
@lib mozilla-firefox/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION}
@lib mozilla-firefox/components/libbrowserdirprovider.so.${LIBbrowserdirprovider_VERSION}
-@lib mozilla-firefox/components/libcaps.so.${LIBcaps_VERSION}
-@lib mozilla-firefox/components/libchardet.so.${LIBchardet_VERSION}
-@lib mozilla-firefox/components/libchrome.so.${LIBchrome_VERSION}
-@lib mozilla-firefox/components/libcommandlines.so.${LIBcommandlines_VERSION}
-@lib mozilla-firefox/components/libcomposer.so.${LIBcomposer_VERSION}
-@lib mozilla-firefox/components/libcookie.so.${LIBcookie_VERSION}
-@lib mozilla-firefox/components/libdocshell.so.${LIBdocshell_VERSION}
-@lib mozilla-firefox/components/libembedcomponents.so.${LIBembedcomponents_VERSION}
-@lib mozilla-firefox/components/libfileview.so.${LIBfileview_VERSION}
-@lib mozilla-firefox/components/libgkgfxthebes.so.${LIBgkgfxthebes_VERSION}
-@lib mozilla-firefox/components/libgklayout.so.${LIBgklayout_VERSION}
-@lib mozilla-firefox/components/libgkplugin.so.${LIBgkplugin_VERSION}
-@lib mozilla-firefox/components/libhtmlpars.so.${LIBhtmlpars_VERSION}
-@lib mozilla-firefox/components/libi18n.so.${LIBi18n_VERSION}
@lib mozilla-firefox/components/libimgicon.so.${LIBimgicon_VERSION}
-@lib mozilla-firefox/components/libimglib2.so.${LIBimglib2_VERSION}
-@lib mozilla-firefox/components/libintlapp.so.${LIBintlapp_VERSION}
-@lib mozilla-firefox/components/libjar50.so.${LIBjar50_VERSION}
-@lib mozilla-firefox/components/libjsd.so.${LIBjsd_VERSION}
-@lib mozilla-firefox/components/libmozfind.so.${LIBmozfind_VERSION}
-@lib mozilla-firefox/components/libnecko.so.${LIBnecko_VERSION}
-@lib mozilla-firefox/components/libnsappshell.so.${LIBnsappshell_VERSION}
-@lib mozilla-firefox/components/liboji.so.${LIBoji_VERSION}
-@lib mozilla-firefox/components/libpermissions.so.${LIBpermissions_VERSION}
-@lib mozilla-firefox/components/libpipboot.so.${LIBpipboot_VERSION}
-@lib mozilla-firefox/components/libpipnss.so.${LIBpipnss_VERSION}
-@lib mozilla-firefox/components/libpippki.so.${LIBpippki_VERSION}
-@lib mozilla-firefox/components/libplaces.so.${LIBplaces_VERSION}
-@lib mozilla-firefox/components/libpref.so.${LIBpref_VERSION}
-@lib mozilla-firefox/components/librdf.so.${LIBrdf_VERSION}
-@lib mozilla-firefox/components/libremoteservice.so.${LIBremoteservice_VERSION}
-@lib mozilla-firefox/components/libsatchel.so.${LIBsatchel_VERSION}
-@lib mozilla-firefox/components/libspellchecker.so.${LIBspellchecker_VERSION}
-@lib mozilla-firefox/components/libstoragecomps.so.${LIBstoragecomps_VERSION}
-@lib mozilla-firefox/components/libsystem-pref.so.${LIBsystem-pref_VERSION}
-@lib mozilla-firefox/components/libtkautocomplete.so.${LIBtkautocomplete_VERSION}
-@lib mozilla-firefox/components/libtoolkitcomps.so.${LIBtoolkitcomps_VERSION}
-@lib mozilla-firefox/components/libtxmgr.so.${LIBtxmgr_VERSION}
-@lib mozilla-firefox/components/libuconv.so.${LIBuconv_VERSION}
-@lib mozilla-firefox/components/libucvmath.so.${LIBucvmath_VERSION}
-@lib mozilla-firefox/components/libuniversalchardet.so.${LIBuniversalchardet_VERSION}
-@lib mozilla-firefox/components/libunixproxy.so.${LIBunixproxy_VERSION}
-@lib mozilla-firefox/components/libwebbrwsr.so.${LIBwebbrwsr_VERSION}
-@lib mozilla-firefox/components/libwidget_gtk2.so.${LIBwidget_gtk2_VERSION}
-@lib mozilla-firefox/components/libwindowds.so.${LIBwindowds_VERSION}
-@lib mozilla-firefox/components/libxmlextras.so.${LIBxmlextras_VERSION}
-@lib mozilla-firefox/components/libxpconnect.so.${LIBxpconnect_VERSION}
-@lib mozilla-firefox/components/libxpinstall.so.${LIBxpinstall_VERSION}
-@lib mozilla-firefox/components/libzipwriter.so.${LIBzipwriter_VERSION}
 mozilla-firefox/components/locale.xpt
 mozilla-firefox/components/loginmgr.xpt
 mozilla-firefox/components/lwbrk.xpt
@ -197,6 +148,7 @@ mozilla-firefox/components/nsDefaultCLH.js
 mozilla-firefox/components/nsDownloadManagerUI.js
 mozilla-firefox/components/nsExtensionManager.js
 mozilla-firefox/components/nsFilePicker.js
+mozilla-firefox/components/nsFormAutoComplete.js
 mozilla-firefox/components/nsHandlerService.js
 mozilla-firefox/components/nsHelperAppDlg.js
 mozilla-firefox/components/nsLivemarkService.js
@ -204,10 +156,12 @@ mozilla-firefox/components/nsLoginInfo.js
 mozilla-firefox/components/nsLoginManager.js
 mozilla-firefox/components/nsLoginManagerPrompter.js
 mozilla-firefox/components/nsMicrosummaryService.js
+mozilla-firefox/components/nsPlacesAutoComplete.js
+mozilla-firefox/components/nsPlacesDBFlush.js
 mozilla-firefox/components/nsPlacesTransactionsService.js
+mozilla-firefox/components/nsPrivateBrowsingService.js
 mozilla-firefox/components/nsProgressDialog.js
 mozilla-firefox/components/nsProxyAutoConfig.js
-mozilla-firefox/components/nsResetPref.js
 mozilla-firefox/components/nsSafebrowsingApplication.js
 mozilla-firefox/components/nsSearchService.js
 mozilla-firefox/components/nsSearchSuggestions.js
@ -218,11 +172,10 @@ mozilla-firefox/components/nsSidebar.js
 mozilla-firefox/components/nsTaggingService.js
 mozilla-firefox/components/nsTryToClose.js
 mozilla-firefox/components/nsURLFormatter.js
-mozilla-firefox/components/nsUpdateService.js
+mozilla-firefox/components/nsUpdateTimerManager.js
 mozilla-firefox/components/nsUrlClassifierLib.js
 mozilla-firefox/components/nsUrlClassifierListManager.js
 mozilla-firefox/components/nsWebHandlerApp.js
-mozilla-firefox/components/oji.xpt
 mozilla-firefox/components/parentalcontrols.xpt
 mozilla-firefox/components/pipboot.xpt
 mozilla-firefox/components/pipnss.xpt
@ -242,9 +195,11 @@ mozilla-firefox/components/shellservice.xpt
 mozilla-firefox/components/shistory.xpt
 mozilla-firefox/components/spellchecker.xpt
 mozilla-firefox/components/storage-Legacy.js
+mozilla-firefox/components/storage-mozStorage.js
 mozilla-firefox/components/storage.xpt
 mozilla-firefox/components/toolkitprofile.xpt
 mozilla-firefox/components/toolkitremote.xpt
+mozilla-firefox/components/toolkitsearch.xpt
 mozilla-firefox/components/txEXSLTRegExFunctions.js
 mozilla-firefox/components/txmgr.xpt
 mozilla-firefox/components/txtsvc.xpt
@ -296,7 +251,9 @@ mozilla-firefox/dictionaries/en-US.aff
 mozilla-firefox/dictionaries/en-US.dic
 mozilla-firefox/extensions/
 mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
+mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
@bin mozilla-firefox/firefox-bin
 mozilla-firefox/greprefs/
 mozilla-firefox/greprefs/all.js
@ -305,27 +262,40 @@ mozilla-firefox/greprefs/xpinstall.js
 mozilla-firefox/icons/
 mozilla-firefox/icons/document.png
 mozilla-firefox/icons/mozicon128.png
-mozilla-firefox/icons/mozicon16.xpm
-mozilla-firefox/icons/mozicon50.xpm
-@lib mozilla-firefox/libgfxpsshar.so.${LIBgfxpsshar_VERSION}
-@lib mozilla-firefox/libgkgfx.so.${LIBgkgfx_VERSION}
-@lib mozilla-firefox/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
-@lib mozilla-firefox/libjsj.so.${LIBjsj_VERSION}
+@lib mozilla-firefox/libfreebl3.so.${LIBfreebl3_VERSION}
@lib mozilla-firefox/libmozjs.so.${LIBmozjs_VERSION}
-@lib mozilla-firefox/libmozlcms.so.${LIBmozlcms_VERSION}
-@lib mozilla-firefox/libthebes.so.${LIBthebes_VERSION}
+@lib mozilla-firefox/libnspr4.so.${LIBnspr4_VERSION}
+@lib mozilla-firefox/libnss3.so.${LIBnss3_VERSION}
+@lib mozilla-firefox/libnssckbi.so.${LIBnssckbi_VERSION}
+@lib mozilla-firefox/libnssdbm3.so.${LIBnssdbm3_VERSION}
+@lib mozilla-firefox/libnssutil3.so.${LIBnssutil3_VERSION}
+@lib mozilla-firefox/libplc4.so.${LIBplc4_VERSION}
+@lib mozilla-firefox/libplds4.so.${LIBplds4_VERSION}
+@lib mozilla-firefox/libsmime3.so.${LIBsmime3_VERSION}
+@lib mozilla-firefox/libsoftokn3.so.${LIBsoftokn3_VERSION}
+@lib mozilla-firefox/libssl3.so.${LIBssl3_VERSION}
@lib mozilla-firefox/libxpcom.so.${LIBxpcom_VERSION}
-@lib mozilla-firefox/libxpcom_core.so.${LIBxpcom_core_VERSION}
@lib mozilla-firefox/libxul.so.${LIBxul_VERSION}
 mozilla-firefox/modules/
+mozilla-firefox/modules/CertUtils.jsm
+mozilla-firefox/modules/DownloadLastDir.jsm
 mozilla-firefox/modules/DownloadUtils.jsm
+mozilla-firefox/modules/FileUtils.jsm
 mozilla-firefox/modules/ISO8601DateUtils.jsm
-mozilla-firefox/modules/JSON.jsm
+mozilla-firefox/modules/LightweightThemeConsumer.jsm
+mozilla-firefox/modules/LightweightThemeManager.jsm
 mozilla-firefox/modules/Microformats.js
+mozilla-firefox/modules/NetUtil.jsm
+mozilla-firefox/modules/NetworkPrioritizer.jsm
+mozilla-firefox/modules/PlacesDBUtils.jsm
 mozilla-firefox/modules/PluralForm.jsm
+mozilla-firefox/modules/SpatialNavigation.js
+mozilla-firefox/modules/WindowDraggingUtils.jsm
 mozilla-firefox/modules/XPCOMUtils.jsm
+mozilla-firefox/modules/ctypes.jsm
 mozilla-firefox/modules/debug.js
 mozilla-firefox/modules/distribution.js
+mozilla-firefox/modules/openLocationLastURL.jsm
 mozilla-firefox/modules/utils.js
@bin mozilla-firefox/mozilla-firefox-bin
@bin mozilla-firefox/mozilla-xremote-client
@ -338,7 +308,7 @@ mozilla-firefox/res/
 mozilla-firefox/res/EditorOverride.css
 mozilla-firefox/res/arrow.gif
 mozilla-firefox/res/arrowd.gif
-mozilla-firefox/res/broken-image.gif
+mozilla-firefox/res/broken-image.png
 mozilla-firefox/res/charsetData.properties
 mozilla-firefox/res/charsetalias.properties
 mozilla-firefox/res/contenteditable.css
@ -367,7 +337,7 @@ mozilla-firefox/res/html.css
 mozilla-firefox/res/html/folder.png
 mozilla-firefox/res/langGroups.properties
 mozilla-firefox/res/language.properties
-mozilla-firefox/res/loading-image.gif
+mozilla-firefox/res/loading-image.png
 mozilla-firefox/res/mathml.css
 mozilla-firefox/res/quirk.css
 mozilla-firefox/res/svg.css