Update to firefox 13.0.

See https://www.mozilla.org/en-US/firefox/13.0/releasenotes/ for details - set SEPARATE_BUILD (workarounds #736961) - cleanup useless dirs (from #717616)
2012-06-11 15:29:56 +00:00 · 2012-06-11 15:29:56 +00:00 · 3cb9f81e00
commit 3cb9f81e00
parent d589e08e50
25 changed files with 209 additions and 210 deletions
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.200 2012/04/30 15:28:42 landry Exp $
+# $OpenBSD: Makefile,v 1.201 2012/06/11 15:29:56 landry Exp $

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

-MOZILLA_VERSION =	12.0
+MOZILLA_VERSION =	13.0
 MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	firefox
 MOZILLA_CODENAME =	browser

-SO_VERSION =	31.0
+SO_VERSION =	32.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 MOZILLA_LIBS =	browsercomps mozalloc \
@ -33,6 +33,7 @@ MODPY_RUNDEP =	No
 USE_GROFF =	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS =	Yes
+SEPARATE_BUILD =	Yes

 CONFIGURE_STYLE =	autoconf no-autoheader
 CONFIGURE_ARGS +=	--enable-official-branding
@ -68,4 +69,8 @@ post-install:
 	# link default48.png to default.png to be used by default by non-icccm compliant wm
 	ln ${PREFIX}/lib/firefox-${MOZILLA_VERSION:C/b.//}/chrome/icons/default/default{48,}.png

+	# cleanup useless dirs from #717616
+	rm -Rf ${PREFIX}/lib/firefox-${MOZILLA_VERSION:C/b.//}/js{sub,}loader
+
+
 .include <bsd.port.mk>
--- a/www/mozilla-firefox/distinfo
+++ b/www/mozilla-firefox/distinfo
@ -1,5 +1,5 @@
-MD5 (mozilla/firefox-12.0.source.tar.bz2) = gMPlknJ03n8YH7X5Maxf1A==
-RMD160 (mozilla/firefox-12.0.source.tar.bz2) = 2D65dUP8CfhLMKRrqCF8F/ML1XI=
-SHA1 (mozilla/firefox-12.0.source.tar.bz2) = AXcYXlS31j3Da9W9XIC6av1S4Zk=
-SHA256 (mozilla/firefox-12.0.source.tar.bz2) = miMqEOWAOw5Khb2Ybj6IuHzN573DNj6nAi1XYZRNux0=
-SIZE (mozilla/firefox-12.0.source.tar.bz2) = 78956707
+MD5 (mozilla/firefox-13.0.source.tar.bz2) = 9QynZW7sRwMLOW85B1+pgA==
+RMD160 (mozilla/firefox-13.0.source.tar.bz2) = jbue8X+1pH865TrpYm52aBFhEcc=
+SHA1 (mozilla/firefox-13.0.source.tar.bz2) = +QYIh0pUiDufu5C41t09x1owVXI=
+SHA256 (mozilla/firefox-13.0.source.tar.bz2) = 3IAShudSujwgBsqgcoAky1uSRg2aOhY2wRHB9PT1C1U=
+SIZE (mozilla/firefox-13.0.source.tar.bz2) = 79605635
--- a/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
+++ b/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
@ -1,6 +1,6 @@
-$OpenBSD: patch-browser_app_profile_firefox_js,v 1.13 2012/04/30 15:28:42 landry Exp $
--- browser/app/profile/firefox.js.orig	Thu Feb 16 07:38:14 2012
-+++ browser/app/profile/firefox.js	Mon Feb 20 22:25:18 2012
+$OpenBSD: patch-browser_app_profile_firefox_js,v 1.14 2012/06/11 15:29:56 landry Exp $
+--- browser/app/profile/firefox.js.orig	Wed May  2 05:16:33 2012
+++ browser/app/profile/firefox.js	Wed May  9 23:06:34 2012
@@ -152,7 +152,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
 pref("app.update.certs.2.commonName", "aus3.mozilla.org");
 
@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.13 2012/04/30 15:28:42 landry
 
 // This preference turns on app.update.mode and allows automatic download and
 // install to take place. We use a separate boolean toggle for this to make
-@@ -589,7 +589,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
+@@ -596,7 +596,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
 pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
 
 // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
@ -19,7 +19,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.13 2012/04/30 15:28:42 landry
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 
 #ifdef XP_MACOSX
-@@ -713,10 +713,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
+@@ -720,10 +720,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.13 2012/04/30 15:28:42 landry
 
 // Non-enhanced mode (local url lists) URL list to check for updates
 pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
-@@ -770,10 +770,8 @@ pref("browser.EULA.version", 3);
+@@ -777,10 +777,8 @@ pref("browser.EULA.version", 3);
 pref("browser.rights.version", 3);
 pref("browser.rights.3.shown", false);
 
--- a/www/mozilla-firefox/patches/patch-browser_components_certerror_content_aboutCertError_xhtml
+++ b/www/mozilla-firefox/patches/patch-browser_components_certerror_content_aboutCertError_xhtml
@ -1,8 +1,8 @@
-$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.4 2012/03/16 21:31:24 landry Exp $
+$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.5 2012/06/11 15:29:56 landry Exp $
 Click the 'get certificate' checkbox ?
--- browser/components/certerror/content/aboutCertError.xhtml.orig	Thu Feb  2 00:38:53 2012
-+++ browser/components/certerror/content/aboutCertError.xhtml	Tue Feb 14 18:42:02 2012
-@@ -136,6 +136,9 @@
+--- browser/components/certerror/content/aboutCertError.xhtml.orig	Wed May  2 05:16:33 2012
+++ browser/components/certerror/content/aboutCertError.xhtml	Wed May  9 23:06:34 2012
+@@ -134,6 +134,9 @@
           tech.textContent = getDescription();
         
         addDomainErrorLink();
--- a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
+++ b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-config_autoconf_mk_in,v 1.18 2012/04/30 15:28:42 landry Exp $
--- config/autoconf.mk.in.orig	Sat Apr 21 00:03:44 2012
-+++ config/autoconf.mk.in	Wed Apr 25 12:51:37 2012
-@@ -312,7 +312,7 @@ OS_LDFLAGS	= @LDFLAGS@
+$OpenBSD: patch-config_autoconf_mk_in,v 1.19 2012/06/11 15:29:56 landry Exp $
+--- config/autoconf.mk.in.orig	Wed May  2 05:16:35 2012
+++ config/autoconf.mk.in	Wed May  9 23:06:34 2012
+@@ -320,7 +320,7 @@ OS_LDFLAGS	= @LDFLAGS@
 OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
 
--- a/www/mozilla-firefox/patches/patch-config_rules_mk
+++ b/www/mozilla-firefox/patches/patch-config_rules_mk
@ -1,9 +1,10 @@
-$OpenBSD: patch-config_rules_mk,v 1.17 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-config_rules_mk,v 1.18 2012/06/11 15:29:56 landry Exp $
 Add -rpath $(installdir) to be sure libxul/libxpcom can open their
 depending libs when being dlopen()'ed themselves
--- config/rules.mk.orig	Wed Apr 11 15:54:48 2012
-+++ config/rules.mk	Wed Apr 18 22:08:47 2012
-@@ -601,6 +601,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+https://bugzilla.mozilla.org/show_bug.cgi?id=552864
+--- config/rules.mk.orig	Wed May  2 05:16:35 2012
+++ config/rules.mk	Wed May  9 23:06:34 2012
+@@ -588,6 +588,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
 endif
 endif
 
--- a/www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.8 2012/04/30 15:28:42 landry Exp $
--- gfx/thebes/Makefile.in.orig	Sat Apr 21 00:03:51 2012
-+++ gfx/thebes/Makefile.in	Wed Apr 25 12:51:55 2012
-@@ -387,6 +387,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.9 2012/06/11 15:29:56 landry Exp $
+--- gfx/thebes/Makefile.in.orig	Wed May  2 05:16:45 2012
+++ gfx/thebes/Makefile.in	Wed May  9 23:06:34 2012
+@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
--- a/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
+++ b/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.1 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:29:56 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=715658
--- gfx/thebes/gfxPlatform.cpp.orig	Wed Apr 11 15:54:58 2012
-+++ gfx/thebes/gfxPlatform.cpp	Thu Apr 19 00:04:57 2012
-@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer)
+--- gfx/thebes/gfxPlatform.cpp.orig	Wed May  2 05:16:45 2012
+++ gfx/thebes/gfxPlatform.cpp	Wed May  9 23:06:34 2012
+@@ -458,6 +458,7 @@ void SourceBufferDestroy(void *srcBuffer)
   static_cast<SourceSurface*>(srcBuffer)->Release();
 }
 
@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
 void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 {
   gfxImageSurface* origSurf =
-@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+@@ -465,6 +466,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 
   origSurf->SetData(&kSourceSurface, NULL, NULL);
 }
@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
 
 RefPtr<SourceSurface>
 gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+@@ -534,6 +536,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
                                                      imgSurface->Stride(),
                                                      format);
 
@ -26,7 +26,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
     cairo_surface_t *nullSurf =
 	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
     cairo_surface_set_user_data(nullSurf,
-@@ -520,6 +523,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+@@ -542,6 +545,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
 				NULL);
     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
     cairo_surface_destroy(nullSurf);
--- a/www/mozilla-firefox/patches/patch-js_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-js_src_Makefile_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-js_src_Makefile_in,v 1.10 2012/05/09 20:36:40 landry Exp $
+$OpenBSD: patch-js_src_Makefile_in,v 1.11 2012/06/11 15:29:56 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/Makefile.in.orig	Sat Apr 21 00:03:53 2012
-+++ js/src/Makefile.in	Wed May  9 22:03:57 2012
-@@ -349,20 +349,24 @@ CPPSRCS += 	checks.cc \
+--- js/src/Makefile.in.orig	Wed May  2 05:16:48 2012
+++ js/src/Makefile.in	Wed May  9 23:06:34 2012
+@@ -337,20 +337,24 @@ CPPSRCS += 	checks.cc \
 # END enclude sources for V8 dtoa
 #############################################
 
--- a/www/mozilla-firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator_h
+++ b/www/mozilla-firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator_h
@ -1,8 +1,8 @@
-$OpenBSD: patch-js_src_assembler_jit_ExecutableAllocator_h,v 1.1 2012/05/09 20:36:40 landry Exp $
+$OpenBSD: patch-js_src_assembler_jit_ExecutableAllocator_h,v 1.2 2012/06/11 15:29:56 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/assembler/jit/ExecutableAllocator.h.orig	Wed May  9 22:01:13 2012
-+++ js/src/assembler/jit/ExecutableAllocator.h	Wed May  9 22:01:28 2012
-@@ -445,8 +445,6 @@ class ExecutableAllocator { (public)
+--- js/src/assembler/jit/ExecutableAllocator.h.orig	Wed May  2 05:16:48 2012
+++ js/src/assembler/jit/ExecutableAllocator.h	Wed May  9 23:06:34 2012
+@@ -467,8 +467,6 @@ class ExecutableAllocator { (public)
     {
         sync_instruction_memory((caddr_t)code, size);
     }
--- a/www/mozilla-firefox/patches/patch-js_src_configure_in
+++ b/www/mozilla-firefox/patches/patch-js_src_configure_in
@ -1,10 +1,10 @@
-$OpenBSD: patch-js_src_configure_in,v 1.12 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-js_src_configure_in,v 1.13 2012/06/11 15:29:56 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648721
 https://bugzilla.mozilla.org/show_bug.cgi?id=589754
 chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
--- js/src/configure.in.orig	Wed Apr 11 15:55:00 2012
-+++ js/src/configure.in	Wed Apr 18 22:24:28 2012
-@@ -2534,7 +2534,12 @@ ia64*-hpux*)
+--- js/src/configure.in.orig	Wed May  2 05:16:48 2012
+++ js/src/configure.in	Wed May  9 23:06:34 2012
+@@ -2583,7 +2583,12 @@ ia64*-hpux*)
     ;;
 
 *-openbsd*)
@ -18,16 +18,7 @@ chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'
-@@ -2805,7 +2810,7 @@ arm*-*)
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
-     ;;
-sparc*-*)
-+sparc-*)
-     ENABLE_METHODJIT=1
-     ENABLE_MONOIC=1
-     ENABLE_POLYIC=1
-@@ -2820,6 +2825,10 @@ mips*-*)
+@@ -2871,6 +2876,10 @@ mips*-*)
     ENABLE_METHODJIT_TYPED_ARRAY=1
     AC_DEFINE(JS_CPU_MIPS)
     AC_DEFINE(JS_NUNBOX32)
--- a/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject-inl_h
+++ b/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject-inl_h
@ -1,79 +1,20 @@
-$OpenBSD: patch-js_src_vm_RegExpObject-inl_h,v 1.4 2012/05/09 20:36:40 landry Exp $
+$OpenBSD: patch-js_src_vm_RegExpObject-inl_h,v 1.5 2012/06/11 15:29:56 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject-inl.h.orig	Wed Apr 11 15:55:04 2012
-+++ js/src/vm/RegExpObject-inl.h	Wed Apr 18 22:09:15 2012
-@@ -357,6 +357,7 @@ detail::RegExpPrivate::create(JSContext *cx, JSLinearS
-     return RetType(priv);
+--- js/src/vm/RegExpObject-inl.h.orig	Wed May  2 05:16:54 2012
+++ js/src/vm/RegExpObject-inl.h	Wed May  9 23:14:31 2012
+@@ -137,6 +137,7 @@ RegExpObject::setSticky(bool enabled)
+     setSlot(STICKY_FLAG_SLOT, BooleanValue(enabled));
 }
 
 +#if ENABLE_YARR_JIT
 /* This function should be deleted once bad Android platforms phase out. See bug 604774. */
 inline bool
- detail::RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
-@@ -367,12 +368,12 @@ detail::RegExpPrivateCode::isJITRuntimeEnabled(JSConte
+ detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
+@@ -147,6 +148,7 @@ detail::RegExpCode::isJITRuntimeEnabled(JSContext *cx)
     return true;
 #endif
 }
 +#endif
 
 inline bool
- detail::RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
-                                    uintN *parenCount, RegExpFlag flags)
- {
-#if ENABLE_YARR_JIT
-     /* Parse the pattern. */
-     ErrorCode yarrError;
-     YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
-@@ -389,7 +390,7 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
-      * case we have to bytecode compile it.
-      */
- 
-#ifdef JS_METHODJIT
-+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
-     if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
-         JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
-         if (!execAlloc) {
-@@ -410,21 +411,11 @@ detail::RegExpPrivateCode::compile(JSContext *cx, JSLi
-         return false;
-     }
- 
-+#if ENABLE_YARR_JIT
-     codeBlock.setFallBack(true);
-+#endif
-     byteCode = byteCompile(yarrPattern, bumpAlloc).get();
-     return true;
-#else /* !defined(ENABLE_YARR_JIT) */
-    int error = 0;
-    compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
-                  ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
-                  multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
-                  parenCount, &error);
-    if (error) {
-        reportPCREError(cx, error);
-        return false;
-    }
-    return true;
-#endif
- }
- 
- inline bool
-@@ -466,18 +457,11 @@ detail::RegExpPrivateCode::execute(JSContext *cx, cons
-     else
-         result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
- #else
-    result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
-+    result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
- #endif
- 
-     if (result == -1)
-         return RegExpRunStatus_Success_NotFound;
-
-#if !ENABLE_YARR_JIT
-    if (result < 0) {
-        reportPCREError(cx, result);
-        return RegExpRunStatus_Error;
-    }
-#endif
- 
-     JS_ASSERT(result >= 0);
-     return RegExpRunStatus_Success;
+ RegExpToShared(JSContext *cx, JSObject &obj, RegExpGuard *g)
--- a/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_cpp
+++ b/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_cpp
@ -1,24 +1,23 @@
-$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.3 2012/05/09 20:36:40 landry Exp $
+$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:29:56 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject.cpp.orig	Thu Feb  2 00:39:11 2012
-+++ js/src/vm/RegExpObject.cpp	Tue Feb 14 18:50:40 2012
-@@ -392,7 +392,6 @@ Class js::RegExpClass = {
-     regexp_trace
- };
+--- js/src/vm/RegExpObject.cpp.orig	Wed May  2 05:16:54 2012
+++ js/src/vm/RegExpObject.cpp	Wed May  9 23:17:01 2012
+@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLength)
+ 
+ /* detail::RegExpCode */
 
 -#if ENABLE_YARR_JIT
 void
- RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
+ RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
 {
-@@ -423,42 +422,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, Toke
-         JS_NOT_REACHED("Unknown Yarr error code");
+@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
     }
 }
-
+ 
 -#else /* !ENABLE_YARR_JIT */
 -
 -void
-RegExpPrivateCode::reportPCREError(JSContext *cx, int error)
+-RegExpCode::reportPCREError(JSContext *cx, int error)
 -{
 -#define REPORT(msg_) \
 -    JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \
@ -50,6 +49,64 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
 -}
 -
 -#endif /* ENABLE_YARR_JIT */
- 
+-
 bool
- js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut)
+ RegExpCode::compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags)
+ {
+-#if ENABLE_YARR_JIT
+     /* Parse the pattern. */
+     ErrorCode yarrError;
+     YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
+@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
+      * case we have to bytecode compile it.
+      */
+ 
+-#ifdef JS_METHODJIT
+#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
+     if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
+         JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
+         if (!execAlloc) {
+@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
+         return false;
+     }
+ 
+#if ENABLE_YARR_JIT
+     codeBlock.setFallBack(true);
+#endif
+     byteCode = byteCompile(yarrPattern, bumpAlloc).get();
+     return true;
+-#else /* !defined(ENABLE_YARR_JIT) */
+-    int error = 0;
+-    compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
+-                  ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
+-                  multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
+-                  parenCount, &error);
+-    if (error) {
+-        reportPCREError(cx, error);
+-        return false;
+-    }
+-    return true;
+-#endif
+ }
+ 
+ RegExpRunStatus
+@@ -305,18 +257,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
+     else
+         result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
+ #else
+-    result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
+    result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
+ #endif
+ 
+     if (result == -1)
+         return RegExpRunStatus_Success_NotFound;
+-
+-#if !ENABLE_YARR_JIT
+-    if (result < 0) {
+-        reportPCREError(cx, result);
+-        return RegExpRunStatus_Error;
+-    }
+-#endif
+ 
+     JS_ASSERT(result >= 0);
+     return RegExpRunStatus_Success;
--- a/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_h
+++ b/www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_h
@ -1,19 +1,22 @@
-$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.4 2012/05/09 20:36:40 landry Exp $
+$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.5 2012/06/11 15:29:56 landry Exp $
 https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject.h.orig	Wed Apr 11 15:55:04 2012
-+++ js/src/vm/RegExpObject.h	Wed Apr 18 22:09:15 2012
-@@ -52,8 +52,6 @@
+--- js/src/vm/RegExpObject.h.orig	Wed May  2 05:16:54 2012
+++ js/src/vm/RegExpObject.h	Wed May  9 23:24:14 2012
+@@ -51,10 +51,8 @@
+ #include "yarr/Yarr.h"
 #if ENABLE_YARR_JIT
 #include "yarr/YarrJIT.h"
- #include "yarr/YarrSyntaxChecker.h"
+-#include "yarr/YarrSyntaxChecker.h"
 -#else
 -#include "yarr/pcre/pcre.h"
 #endif
+#include "yarr/YarrSyntaxChecker.h"
 
- namespace js {
-@@ -242,40 +240,33 @@ static const jschar GreedyStarChars[] = {'.', '*'};
- /* Abstracts away the gross |RegExpPrivate| backend details. */
- class RegExpPrivateCode
+ /*
+  * JavaScript Regular Expressions
+@@ -112,68 +110,51 @@ namespace detail {
+ 
+ class RegExpCode
 {
 -#if ENABLE_YARR_JIT
     typedef JSC::Yarr::BytecodePattern BytecodePattern;
@ -33,7 +36,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
 +    BytecodePattern *byteCode;
 
   public:
-     RegExpPrivateCode()
+     RegExpCode()
       :
 #if ENABLE_YARR_JIT
         codeBlock(),
@ -44,7 +47,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
 +        byteCode(NULL)
     { }
 
-     ~RegExpPrivateCode() {
+     ~RegExpCode() {
 #if ENABLE_YARR_JIT
         codeBlock.release();
 +#endif
@ -57,13 +60,16 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
     }
 
     static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
-@@ -287,23 +278,17 @@ class RegExpPrivateCode
+-#if ENABLE_YARR_JIT
+         ErrorCode error = JSC::Yarr::checkSyntax(*source);
+         if (error == JSC::Yarr::NoError)
+             return true;
+ 
         reportYarrError(cx, tokenStream, error);
         return false;
- #else
+-#else
 -# error "Syntax checking not implemented for !ENABLE_YARR_JIT"
-+        return true; /* XXX !*/
- #endif
+-#endif
     }
 
 #if ENABLE_YARR_JIT
@ -82,4 +88,4 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
 -#endif
     }
 
-     inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount,
+     bool compile(JSContext *cx, JSLinearString &pattern, unsigned *parenCount, RegExpFlag flags);
--- a/www/mozilla-firefox/patches/patch-netwerk_base_src_nsSocketTransportService2_cpp
+++ b/www/mozilla-firefox/patches/patch-netwerk_base_src_nsSocketTransportService2_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-netwerk_base_src_nsSocketTransportService2_cpp,v 1.1 2012/03/16 21:31:24 landry Exp $
+$OpenBSD: patch-netwerk_base_src_nsSocketTransportService2_cpp,v 1.2 2012/06/11 15:29:56 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
 xpcshell hang during fake
--- netwerk/base/src/nsSocketTransportService2.cpp.orig	Mon Mar 12 19:28:27 2012
-+++ netwerk/base/src/nsSocketTransportService2.cpp	Mon Mar 12 19:29:13 2012
+--- netwerk/base/src/nsSocketTransportService2.cpp.orig	Wed May  2 05:17:08 2012
+++ netwerk/base/src/nsSocketTransportService2.cpp	Wed May  9 23:06:35 2012
@@ -54,14 +54,6 @@
 
 #include "mozilla/FunctionTimer.h"
@ -27,7 +27,7 @@ xpcshell hang during fake
     gSocketThread = PR_GetCurrentThread();
 
     // add thread event to poll list (mThreadEvent may be NULL)
-@@ -674,8 +664,6 @@ nsSocketTransportService::Run()
+@@ -677,8 +667,6 @@ nsSocketTransportService::Run()
     NS_ProcessPendingEvents(thread);
 
     gSocketThread = nsnull;
--- a/www/mozilla-firefox/patches/patch-parser_html_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-parser_html_Makefile_in
@ -1,10 +1,10 @@
-$OpenBSD: patch-parser_html_Makefile_in,v 1.8 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-parser_html_Makefile_in,v 1.9 2012/06/11 15:29:56 landry Exp $

 gcc runs out of memory with optimization.

--- parser/html/Makefile.in.orig	Wed Apr 11 15:55:18 2012
-+++ parser/html/Makefile.in	Wed Apr 18 22:09:15 2012
-@@ -122,4 +122,7 @@ INCLUDES	+= \
+--- parser/html/Makefile.in.orig	Wed May  2 05:17:09 2012
+++ parser/html/Makefile.in	Wed May  9 23:06:35 2012
+@@ -128,4 +128,7 @@ INCLUDES	+= \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
--- 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.9 2012/03/16 21:31:24 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig	Thu Feb  2 00:39:26 2012
-+++ security/manager/ssl/src/Makefile.in	Tue Feb 14 18:54:37 2012
-@@ -115,7 +115,10 @@ CSRCS += md4.c
+$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.10 2012/06/11 15:29:56 landry Exp $
+--- security/manager/ssl/src/Makefile.in.orig	Wed May  2 05:17:09 2012
+++ security/manager/ssl/src/Makefile.in	Wed May  9 23:06:35 2012
+@@ -116,7 +116,10 @@ CSRCS += md4.c
 
 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,9 +1,9 @@
-$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.14 2012/03/16 21:31:24 landry Exp $
+$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.15 2012/06/11 15:29:56 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
 xpcshell hang during fake
--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Fri Mar  9 22:19:19 2012
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Mon Mar 12 19:35:44 2012
-@@ -112,6 +112,7 @@
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Wed May  2 05:17:09 2012
+++ security/manager/ssl/src/nsNSSComponent.cpp	Wed May  9 23:06:35 2012
+@@ -111,6 +111,7 @@
 #include "secerr.h"
 #include "sslerr.h"
 #include "cert.h"
@ -11,7 +11,7 @@ xpcshell hang during fake
 
 #include "nsXULAppAPI.h"
 
-@@ -125,6 +126,7 @@ extern "C" {
+@@ -124,6 +125,7 @@ extern "C" {
 }
 
 using namespace mozilla;
@ -19,7 +19,7 @@ xpcshell hang during fake
 
 #ifdef PR_LOGGING
 PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -396,6 +398,8 @@ nsNSSComponent::deleteBackgroundThreads()
+@@ -395,6 +397,8 @@ nsNSSComponent::deleteBackgroundThreads()
     delete mCertVerificationThread;
     mCertVerificationThread = nsnull;
   }
@ -28,7 +28,7 @@ xpcshell hang during fake
 }
 
 void
-@@ -403,21 +407,20 @@ nsNSSComponent::createBackgroundThreads()
+@@ -402,21 +406,20 @@ nsNSSComponent::createBackgroundThreads()
 {
   NS_ASSERTION(mCertVerificationThread == nsnull,
                "Cert verification thread already created.");
@ -52,7 +52,7 @@ xpcshell hang during fake
   if (mUpdateTimerInitialized) {
     {
       MutexAutoLock lock(mCrlTimerLock);
-@@ -845,7 +848,7 @@ nsNSSComponent::InstallLoadableRoots()
+@@ -844,7 +847,7 @@ nsNSSComponent::InstallLoadableRoots()
 
     if (!possible_ckbi_locations[il])
     {
@ -61,7 +61,7 @@ xpcshell hang during fake
     }
     else
     {
-@@ -1863,6 +1866,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
+@@ -1881,6 +1884,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
 
       LaunchSmartCardThreads();
 
@ -70,7 +70,7 @@ xpcshell hang during fake
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
     }
   }
-@@ -2006,16 +2011,6 @@ nsNSSComponent::Init()
+@@ -2023,16 +2028,6 @@ nsNSSComponent::Init()
   if (mClientAuthRememberService)
     mClientAuthRememberService->Init();
 
@ -87,7 +87,7 @@ xpcshell hang during fake
   InitializeCRLUpdateTimer();
   RegisterPSMContentListener();
 
-@@ -2230,6 +2225,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
+@@ -2247,6 +2242,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
     DoProfileChangeTeardown(aSubject);
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
@ -95,7 +95,7 @@ xpcshell hang during fake
     mShutdownObjectList->allowUI();
   }
   else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
-@@ -2277,6 +2273,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
+@@ -2294,6 +2290,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
     InitializeCRLUpdateTimer();
   }
   else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
@ -103,7 +103,7 @@ xpcshell hang during fake
 
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
 
-@@ -2565,6 +2562,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
+@@ -2584,6 +2581,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
 void
 nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
 {
@ -113,7 +113,7 @@ xpcshell hang during fake
   bool callVeto = false;
 
   if (!mShutdownObjectList->ifPossibleDisallowUI()) {
-@@ -2618,9 +2618,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
+@@ -2637,9 +2637,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
 void
 nsNSSComponent::DoProfileChangeNetRestore()
 {
--- a/www/mozilla-firefox/patches/patch-services_crypto_modules_WeaveCrypto_js
+++ b/www/mozilla-firefox/patches/patch-services_crypto_modules_WeaveCrypto_js
@ -1,8 +1,8 @@
-$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.3 2011/08/23 20:14:52 landry Exp $
+$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.4 2012/06/11 15:29:56 landry Exp $
 Fix libnss3 opening
--- services/crypto/modules/WeaveCrypto.js.orig	Thu Aug 11 23:41:22 2011
-+++ services/crypto/modules/WeaveCrypto.js	Fri Aug 19 11:16:12 2011
-@@ -158,12 +158,12 @@ WeaveCrypto.prototype = {
+--- services/crypto/modules/WeaveCrypto.js.orig	Wed May  2 05:17:12 2012
+++ services/crypto/modules/WeaveCrypto.js	Wed May  9 23:06:35 2012
+@@ -157,12 +157,12 @@ WeaveCrypto.prototype = {
         Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
 
         // Open the NSS library.
--- a/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp
+++ b/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.11 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.12 2012/06/11 15:29:56 landry Exp $
 set secure_delete PRAGMA on by default, instead of using internal sqlite copy
 https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- storage/src/mozStorageConnection.cpp.orig	Wed Apr 11 15:55:19 2012
-+++ storage/src/mozStorageConnection.cpp	Wed Apr 18 22:09:15 2012
-@@ -701,6 +701,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
+--- storage/src/mozStorageConnection.cpp.orig	Wed May  2 05:17:12 2012
+++ storage/src/mozStorageConnection.cpp	Wed May  9 23:06:35 2012
+@@ -700,6 +700,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
     return convertResultCode(srv);
   }
 
--- a/www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.4 2012/04/30 15:28:42 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig	Wed Apr 11 15:55:20 2012
-+++ toolkit/components/downloads/nsDownloadManager.cpp	Wed Apr 18 22:09:16 2012
-@@ -1165,7 +1165,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
+$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.5 2012/06/11 15:29:56 landry Exp $
+--- toolkit/components/downloads/nsDownloadManager.cpp.orig	Wed May  2 05:17:13 2012
+++ toolkit/components/downloads/nsDownloadManager.cpp	Wed May  9 23:06:35 2012
+@@ -1162,7 +1162,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
     rv = downloadDir->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
     if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.4 2012/04
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
-@@ -1273,7 +1273,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
+@@ -1270,7 +1270,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
           (void)customDirectory->Exists(&exists);
 
           if (!exists) {
--- a/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-toolkit_library_Makefile_in,v 1.15 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-toolkit_library_Makefile_in,v 1.16 2012/06/11 15:29:56 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
 https://bugzilla.mozilla.org/show_bug.cgi?id=648730
--- toolkit/library/Makefile.in.orig	Wed Apr 11 15:55:21 2012
-+++ toolkit/library/Makefile.in	Wed Apr 18 22:09:16 2012
-@@ -484,6 +484,12 @@ OS_LIBS += \
+--- toolkit/library/Makefile.in.orig	Wed May  2 05:17:14 2012
+++ toolkit/library/Makefile.in	Wed May  9 23:06:35 2012
+@@ -455,6 +455,12 @@ OS_LIBS += \
   $(NULL)
 endif
 
@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
 ifeq ($(OS_ARCH),Darwin)
 ifdef MOZ_SYDNEYAUDIO
 OS_LIBS += \
-@@ -495,12 +501,6 @@ OS_LIBS += \
+@@ -466,12 +472,6 @@ OS_LIBS += \
   -framework Foundation \
   -framework AppKit \
   $(NULL)
--- a/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
+++ b/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.10 2012/04/30 15:28:42 landry Exp $
+$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $
 install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig	Wed Apr 11 15:55:22 2012
-+++ toolkit/mozapps/installer/packager.mk	Wed Apr 18 22:09:16 2012
-@@ -861,7 +861,7 @@ endif
+--- toolkit/mozapps/installer/packager.mk.orig	Fri Jun  1 14:04:20 2012
+++ toolkit/mozapps/installer/packager.mk	Tue Jun  5 07:55:51 2012
+@@ -886,7 +886,7 @@ endif
 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
 	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--- a/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.11 2012/03/16 21:31:24 landry Exp $
+$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.12 2012/06/11 15:29:56 landry Exp $
 Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig	Thu Feb  2 00:39:43 2012
-+++ toolkit/xre/nsXREDirProvider.cpp	Tue Feb 14 18:42:23 2012
-@@ -1131,11 +1131,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
+--- toolkit/xre/nsXREDirProvider.cpp.orig	Wed May  2 05:17:15 2012
+++ toolkit/xre/nsXREDirProvider.cpp	Wed May  9 23:06:35 2012
+@@ -1168,11 +1168,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
   NS_ENSURE_SUCCESS(rv, rv);
 #elif defined(XP_UNIX)
   static const char *const sysSExtDir = 
--- a/www/mozilla-firefox/pkg/PLIST
+++ b/www/mozilla-firefox/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.43 2012/04/30 15:28:42 landry Exp $
+@comment $OpenBSD: PLIST,v 1.44 2012/06/11 15:29:56 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@conflict mozilla-firefox-*
@ -37,8 +37,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-32
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}-bin
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/mozicon128.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/jsloader/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/jsloader/resource/
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}