On 11/10/11 22:06, Amit Kulkarni wrote: >> Hi, >> >> Refer to release notes for changes. >> >> This has been built and tested on amd64 current. >> Please give this more testing, sites I visit normally >> all seem fine. >> >> Test for other arch? Comments? Ok? > > port-lib-depends-check whines about ossaudio. Otherwise no problems > after couple of hours of browsing. > > thanks > > Hi,
revised diff to remove ossaudio. Nigel
Index: Makefile =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/Makefile,v retrieving revision 1.193 diff -u -p -r1.193 Makefile --- Makefile 28 Oct 2011 13:01:13 -0000 1.193 +++ Makefile 8 Nov 2011 22:11:49 -0000 @@ -6,16 +6,14 @@ BROKEN-sparc64 = https://bugzilla.mozill # Don't forget to bump www/firefox-i18n after updates. # Don't forget to update devel/xulrunner/2.0 if patches changes. -MOZILLA_VERSION = 7.0.1 +MOZILLA_VERSION = 8.0 MOZILLA_BRANCH = release MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser -REVISION = 0 - # url for beta releases # MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/releases/${MOZILLA_VERSION}/source/ -SO_VERSION = 26.0 +SO_VERSION = 27.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 \ Index: distinfo =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/distinfo,v retrieving revision 1.71 diff -u -p -r1.71 distinfo --- distinfo 3 Oct 2011 21:06:09 -0000 1.71 +++ distinfo 9 Nov 2011 21:45:03 -0000 @@ -1,5 +1,5 @@ -MD5 (mozilla/firefox-7.0.1.source.tar.bz2) = WyEttIYwupO7MOxjzKF/TQ== -RMD160 (mozilla/firefox-7.0.1.source.tar.bz2) = yr2D+Cm6VHEfEydJKC19SeM7YzQ= -SHA1 (mozilla/firefox-7.0.1.source.tar.bz2) = lLvHFSgyNx3AvoL0EXMN8EPFxqw= -SHA256 (mozilla/firefox-7.0.1.source.tar.bz2) = gez2P8pnGGCU1J3Vpv5/Xb0UOjn4cq0SbeOPJGM0/AQ= -SIZE (mozilla/firefox-7.0.1.source.tar.bz2) = 69278554 +MD5 (mozilla/firefox-8.0.source.tar.bz2) = k5WlvhPaEZvY1TwyJeXRfA== +RMD160 (mozilla/firefox-8.0.source.tar.bz2) = +H7HZostzBu1gbl+Hb6F5Ll8sxw= +SHA1 (mozilla/firefox-8.0.source.tar.bz2) = hDz0rXDS/EsWZUw/+bCA0+s1dFI= +SHA256 (mozilla/firefox-8.0.source.tar.bz2) = 2VAyTs1TYqZIqJGmbD8t3l5psJ8w74Rwt3WewAdpETk= +SIZE (mozilla/firefox-8.0.source.tar.bz2) = 70377448 Index: patches/patch-browser_app_profile_firefox_js =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js,v retrieving revision 1.8 diff -u -p -r1.8 patch-browser_app_profile_firefox_js --- patches/patch-browser_app_profile_firefox_js 3 Oct 2011 21:06:09 -0000 1.8 +++ patches/patch-browser_app_profile_firefox_js 10 Nov 2011 00:21:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.8 2011/10/03 21:06:09 landry Exp $ ---- browser/app/profile/firefox.js.orig Thu Aug 25 02:36:38 2011 -+++ browser/app/profile/firefox.js Mon Aug 29 14:54:44 2011 -@@ -135,7 +135,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C +--- browser/app/profile/firefox.js.orig Fri Nov 4 21:33:52 2011 ++++ browser/app/profile/firefox.js Thu Nov 10 00:21:24 2011 +@@ -140,7 +140,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C pref("app.update.certs.2.commonName", "aus3.mozilla.org"); // Whether or not app updates are enabled @@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_fire // 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 -@@ -563,7 +563,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); +@@ -567,7 +567,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_fire pref("plugins.hide_infobar_for_outdated_plugin", false); #ifdef XP_MACOSX -@@ -687,10 +687,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH +@@ -691,10 +691,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_fire // 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";); -@@ -752,10 +752,8 @@ pref("browser.EULA.version", 3); +@@ -756,10 +756,8 @@ pref("browser.EULA.version", 3); pref("browser.rights.version", 3); pref("browser.rights.3.shown", false); Index: patches/patch-config_autoconf_mk_in =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-config_autoconf_mk_in,v retrieving revision 1.13 diff -u -p -r1.13 patch-config_autoconf_mk_in --- patches/patch-config_autoconf_mk_in 3 Oct 2011 21:06:09 -0000 1.13 +++ patches/patch-config_autoconf_mk_in 10 Nov 2011 00:22:45 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-config_autoconf_mk_in,v 1.13 2011/10/03 21:06:09 landry Exp $ ---- config/autoconf.mk.in.orig Thu Aug 25 02:36:39 2011 -+++ config/autoconf.mk.in Mon Aug 29 14:54:45 2011 -@@ -302,7 +302,7 @@ OS_LDFLAGS = @LDFLAGS@ +--- config/autoconf.mk.in.orig Fri Nov 4 21:33:54 2011 ++++ config/autoconf.mk.in Thu Nov 10 00:21:24 2011 +@@ -299,7 +299,7 @@ OS_LDFLAGS = @LDFLAGS@ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Index: patches/patch-config_rules_mk =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-config_rules_mk,v retrieving revision 1.12 diff -u -p -r1.12 patch-config_rules_mk --- patches/patch-config_rules_mk 3 Oct 2011 21:06:09 -0000 1.12 +++ patches/patch-config_rules_mk 10 Nov 2011 00:22:48 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-config_rules_mk,v 1.12 2011/10/03 21:06:09 landry Exp $ Add -rpath $(installdir) to be sure libxul/libxpcom can open their depending libs when being dlopen()'ed themselves ---- config/rules.mk.orig Thu Aug 25 02:36:39 2011 -+++ config/rules.mk Mon Aug 29 14:54:46 2011 -@@ -567,6 +567,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +--- config/rules.mk.orig Fri Nov 4 21:33:54 2011 ++++ config/rules.mk Thu Nov 10 00:21:24 2011 +@@ -559,6 +559,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic endif endif Index: patches/patch-content_events_src_nsContentEventHandler_cpp =================================================================== RCS file: patches/patch-content_events_src_nsContentEventHandler_cpp diff -N patches/patch-content_events_src_nsContentEventHandler_cpp --- patches/patch-content_events_src_nsContentEventHandler_cpp 3 Oct 2011 21:06:09 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.5 2011/10/03 21:06:09 landry Exp $ -fix for gcc3 archs ? ---- content/events/src/nsContentEventHandler.cpp.orig Thu Aug 25 02:36:40 2011 -+++ content/events/src/nsContentEventHandler.cpp Mon Aug 29 14:54:46 2011 -@@ -1096,7 +1096,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve - selPrivate->EndBatchChanges(); - NS_ENSURE_SUCCESS(rv, rv); - -- nsCOMPtr<nsISelection2>(do_QueryInterface(mSelection))->ScrollIntoView( -+ nsCOMPtr<nsISelection2> sel2 = do_QueryInterface(mSelection); -+ sel2->ScrollIntoView( - nsISelectionController::SELECTION_FOCUS_REGION, PR_FALSE, -1, -1); - aEvent->mSucceeded = PR_TRUE; - return NS_OK; Index: patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v retrieving revision 1.4 diff -u -p -r1.4 patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp --- patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp 22 Jul 2010 21:42:13 -0000 1.4 +++ patches/patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp 10 Nov 2011 00:22:02 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.4 2010/07/22 21:42:13 landry Exp $ ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Tue Jul 13 21:10:13 2010 -+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Wed Jul 21 09:54:44 2010 +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Fri Nov 4 21:33:58 2011 ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Thu Nov 10 00:21:24 2011 @@ -63,6 +63,7 @@ #include "nsISimpleEnumerator.h" #include "nsIDirectoryEnumerator.h" @@ -9,7 +9,7 @@ $OpenBSD: patch-extensions_spellcheck_hu #include "nsDirectoryServiceUtils.h" #include "nsDirectoryServiceDefs.h" #include "mozISpellI18NManager.h" -@@ -342,6 +343,16 @@ mozHunspell::LoadDictionaryList() +@@ -370,6 +371,16 @@ mozHunspell::LoadDictionaryList() appDir->AppendNative(NS_LITERAL_CSTRING("dictionaries")); LoadDictionariesFromDir(appDir); } Index: patches/patch-gfx_thebes_Makefile_in =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-gfx_thebes_Makefile_in --- patches/patch-gfx_thebes_Makefile_in 3 Oct 2011 21:06:09 -0000 1.3 +++ patches/patch-gfx_thebes_Makefile_in 10 Nov 2011 00:22:54 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-gfx_thebes_Makefile_in,v 1.3 2011/10/03 21:06:09 landry Exp $ ---- gfx/thebes/Makefile.in.orig Thu Aug 25 02:36:49 2011 -+++ gfx/thebes/Makefile.in Mon Aug 29 14:54:47 2011 -@@ -383,6 +383,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +--- gfx/thebes/Makefile.in.orig Fri Nov 4 21:33:59 2011 ++++ gfx/thebes/Makefile.in Thu Nov 10 00:21:24 2011 +@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) CXXFLAGS += $(MOZ_PANGO_CFLAGS) endif Index: patches/patch-js_src_configure_in =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-js_src_configure_in,v retrieving revision 1.7 diff -u -p -r1.7 patch-js_src_configure_in --- patches/patch-js_src_configure_in 3 Oct 2011 21:06:09 -0000 1.7 +++ patches/patch-js_src_configure_in 10 Nov 2011 00:22:21 -0000 @@ -2,10 +2,10 @@ $OpenBSD: patch-js_src_configure_in,v 1. https://bugzilla.mozilla.org/show_bug.cgi?id=648721 https://bugzilla.mozilla.org/show_bug.cgi?id=650742 https://bugzilla.mozilla.org/show_bug.cgi?id=589754 ---- js/src/configure.in.orig Thu Aug 25 02:36:51 2011 -+++ js/src/configure.in Mon Aug 29 14:54:51 2011 -@@ -2424,7 +2424,12 @@ ia64*-hpux*) - ;; +--- js/src/configure.in.orig Fri Nov 4 21:34:01 2011 ++++ js/src/configure.in Thu Nov 10 00:21:25 2011 +@@ -2440,7 +2440,12 @@ ia64*-hpux*) + ;; *-openbsd*) - DLL_SUFFIX=".so.1.0" @@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cg DSO_CFLAGS='' DSO_PIC_CFLAGS='-fPIC' DSO_LDOPTS='-shared -fPIC' -@@ -2759,7 +2764,7 @@ arm*-*) +@@ -2763,7 +2768,7 @@ arm*-*) AC_DEFINE(JS_CPU_ARM) AC_DEFINE(JS_NUNBOX32) ;; @@ -27,7 +27,7 @@ https://bugzilla.mozilla.org/show_bug.cg ENABLE_TRACEJIT=1 NANOJIT_ARCH=Sparc ENABLE_METHODJIT=1 -@@ -2833,6 +2838,10 @@ arm*-*) +@@ -2837,6 +2842,10 @@ arm*-*) sparc-*) AC_DEFINE(AVMPLUS_SPARC) ;; @@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cg esac case "$target" in -@@ -2847,6 +2856,9 @@ case "$target" in +@@ -2851,6 +2860,9 @@ case "$target" in AC_DEFINE(AVMPLUS_UNIX) ;; *-freebsd*|*-kfreebsd*) Index: patches/patch-js_src_ctypes_libffi_configure =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_configure,v retrieving revision 1.1 diff -u -p -r1.1 patch-js_src_ctypes_libffi_configure --- patches/patch-js_src_ctypes_libffi_configure 30 Mar 2011 21:39:14 -0000 1.1 +++ patches/patch-js_src_ctypes_libffi_configure 10 Nov 2011 00:22:19 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.1 2011/03/30 21:39:14 landry Exp $ ---- js/src/ctypes/libffi/configure.orig Wed Aug 18 21:20:57 2010 -+++ js/src/ctypes/libffi/configure Sat Sep 4 11:20:37 2010 +--- js/src/ctypes/libffi/configure.orig Fri Nov 4 21:34:01 2011 ++++ js/src/ctypes/libffi/configure Thu Nov 10 00:21:25 2011 @@ -11212,7 +11212,7 @@ case "$host" in TARGET=FRV; TARGETDIR=frv ;; @@ -19,12 +19,3 @@ $OpenBSD: patch-js_src_ctypes_libffi_con # Support 128-bit long double for NewABI. HAVE_LONG_DOUBLE='defined(__mips64)' TARGET=MIPS; TARGETDIR=mips -@@ -11277,7 +11277,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*) Index: patches/patch-modules_libimg_png_pngerror_c =================================================================== RCS file: patches/patch-modules_libimg_png_pngerror_c diff -N patches/patch-modules_libimg_png_pngerror_c --- patches/patch-modules_libimg_png_pngerror_c 28 Jul 2011 08:12:50 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-modules_libimg_png_pngerror_c,v 1.1 2011/07/28 08:12:50 landry Exp $ -Fix for CVE-2011-2691 backported from png 1.4.8 ---- modules/libimg/png/pngerror.c.orig Sun Jul 24 19:00:17 2011 -+++ modules/libimg/png/pngerror.c Sun Jul 24 19:02:55 2011 -@@ -88,11 +88,11 @@ void PNGAPI - png_err(png_structp png_ptr) - { - if (png_ptr != NULL && png_ptr->error_fn != NULL) -- (*(png_ptr->error_fn))(png_ptr, '\0'); -+ (*(png_ptr->error_fn))(png_ptr, ""); - - /* If the custom handler doesn't exist, or if it returns, - use the default handler, which will not return. */ -- png_default_error(png_ptr, '\0'); -+ png_default_error(png_ptr, ""); - } - #endif /* PNG_ERROR_TEXT_SUPPORTED */ - -@@ -181,8 +181,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffe - { - buffer[iout++] = ':'; - buffer[iout++] = ' '; -- png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT); -- buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0'; -+ -+ iin = 0; -+ while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0') -+ buffer[iout++] = error_message[iin++]; -+ -+ /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */ -+ buffer[iout] = '\0'; - } - } - Index: patches/patch-parser_html_Makefile_in =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-parser_html_Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-parser_html_Makefile_in --- patches/patch-parser_html_Makefile_in 3 Oct 2011 21:06:09 -0000 1.4 +++ patches/patch-parser_html_Makefile_in 10 Nov 2011 00:22:51 -0000 @@ -2,12 +2,13 @@ $OpenBSD: patch-parser_html_Makefile_in, gcc runs out of memory with optimization. ---- parser/html/Makefile.in.orig Thu Aug 25 02:37:16 2011 -+++ parser/html/Makefile.in Mon Aug 29 14:54:55 2011 -@@ -88,3 +88,6 @@ include $(topsrcdir)/config/rules.mk - INCLUDES += \ +--- parser/html/Makefile.in.orig Fri Nov 4 21:34:14 2011 ++++ parser/html/Makefile.in Thu Nov 10 00:21:27 2011 +@@ -113,4 +113,7 @@ INCLUDES += \ -I$(srcdir)/../../content/base/src \ $(NULL) -+ + +nsHtml5NamedCharacters.o: CXXFLAGS := $(filter-out -O%,$(CXXFLAGS)) +nsHtml5ElementName.o: CXXFLAGS := $(CXXFLAGS) -O1 ++ + #DEFINES += -DENABLE_VOID_MENUITEM Index: patches/patch-security_manager_ssl_src_nsNSSComponent_cpp =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp,v retrieving revision 1.11 diff -u -p -r1.11 patch-security_manager_ssl_src_nsNSSComponent_cpp --- patches/patch-security_manager_ssl_src_nsNSSComponent_cpp 3 Oct 2011 21:06:09 -0000 1.11 +++ patches/patch-security_manager_ssl_src_nsNSSComponent_cpp 10 Nov 2011 00:22:14 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.11 2011/10/03 21:06:09 landry Exp $ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Thu Aug 25 02:37:17 2011 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon Aug 29 14:54:56 2011 -@@ -849,11 +849,10 @@ nsNSSComponent::InstallLoadableRoots() +--- security/manager/ssl/src/nsNSSComponent.cpp.orig Fri Nov 4 21:34:15 2011 ++++ security/manager/ssl/src/nsNSSComponent.cpp Thu Nov 10 00:21:27 2011 +@@ -847,11 +847,10 @@ nsNSSComponent::InstallLoadableRoots() return; const char *possible_ckbi_locations[] = { @@ -16,7 +16,7 @@ $OpenBSD: patch-security_manager_ssl_src }; for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { -@@ -862,7 +861,7 @@ nsNSSComponent::InstallLoadableRoots() +@@ -860,7 +859,7 @@ nsNSSComponent::InstallLoadableRoots() if (!possible_ckbi_locations[il]) { Index: patches/patch-storage_src_mozStorageConnection_cpp =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp,v retrieving revision 1.7 diff -u -p -r1.7 patch-storage_src_mozStorageConnection_cpp --- patches/patch-storage_src_mozStorageConnection_cpp 3 Oct 2011 21:06:09 -0000 1.7 +++ patches/patch-storage_src_mozStorageConnection_cpp 10 Nov 2011 00:22:24 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.7 2011/10/03 21:06:09 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 Thu Aug 25 02:37:18 2011 -+++ storage/src/mozStorageConnection.cpp Mon Aug 29 14:54:56 2011 -@@ -595,6 +595,13 @@ Connection::initialize(nsIFile *aDatabaseFile, +--- storage/src/mozStorageConnection.cpp.orig Fri Nov 4 21:34:16 2011 ++++ storage/src/mozStorageConnection.cpp Thu Nov 10 00:21:27 2011 +@@ -591,6 +591,13 @@ Connection::initialize(nsIFile *aDatabaseFile, return convertResultCode(srv); } Index: patches/patch-toolkit_library_Makefile_in =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in,v retrieving revision 1.10 diff -u -p -r1.10 patch-toolkit_library_Makefile_in --- patches/patch-toolkit_library_Makefile_in 3 Oct 2011 21:06:09 -0000 1.10 +++ patches/patch-toolkit_library_Makefile_in 10 Nov 2011 22:21:08 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-toolkit_library_Makefile_in,v 1.10 2011/10/03 21:06:09 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 Thu Aug 25 02:37:24 2011 -+++ toolkit/library/Makefile.in Mon Aug 29 14:54:57 2011 +--- toolkit/library/Makefile.in.orig Fri Nov 4 21:34:18 2011 ++++ toolkit/library/Makefile.in Thu Nov 10 22:20:42 2011 @@ -157,6 +157,12 @@ OS_LIBS += \ $(NULL) endif @@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cg -endif -endif - --ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH))) +-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH))) -ifdef MOZ_SYDNEYAUDIO -EXTRA_DSO_LDOPTS += -lossaudio endif Index: patches/patch-toolkit_library_libxul-config_mk =================================================================== RCS file: patches/patch-toolkit_library_libxul-config_mk diff -N patches/patch-toolkit_library_libxul-config_mk --- patches/patch-toolkit_library_libxul-config_mk 3 Oct 2011 21:06:09 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.4 2011/10/03 21:06:09 landry Exp $ -Ensure systemwide nss is taken -Ensure local libjs is taken (build failure when spidermonkey is installed, -its libjs_static.a is found first in lib search path) -https://bugzilla.mozilla.org/show_bug.cgi?id=646375 ---- toolkit/library/libxul-config.mk.orig Thu Aug 25 02:37:24 2011 -+++ toolkit/library/libxul-config.mk Mon Aug 29 14:54:57 2011 -@@ -336,13 +336,14 @@ EXTRA_DSO_LDOPTS += \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ - $(QCMS_LIBS) \ -- $(MOZ_JS_LIBS) \ -- $(NSS_LIBS) \ -+ ../../dist/lib/libjs_static.a \ - $(MOZ_CAIRO_LIBS) \ - $(MOZ_HARFBUZZ_LIBS) \ - $(MOZ_OTS_LIBS) \ - $(MOZ_APP_EXTRA_LIBS) \ - $(NULL) -+ -+OS_LIBS += $(NSS_LIBS) - - ifdef MOZ_NATIVE_ZLIB - EXTRA_DSO_LDOPTS += $(ZLIB_LIBS) Index: patches/patch-toolkit_mozapps_installer_packager_mk =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk,v retrieving revision 1.5 diff -u -p -r1.5 patch-toolkit_mozapps_installer_packager_mk --- patches/patch-toolkit_mozapps_installer_packager_mk 3 Oct 2011 21:06:09 -0000 1.5 +++ patches/patch-toolkit_mozapps_installer_packager_mk 10 Nov 2011 00:22:29 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.5 2011/10/03 21:06:09 landry Exp $ install headers/idl/sdk libs only if xulrunner ---- toolkit/mozapps/installer/packager.mk.orig Thu Aug 25 02:37:25 2011 -+++ toolkit/mozapps/installer/packager.mk Mon Aug 29 14:54:58 2011 -@@ -730,7 +730,7 @@ endif +--- toolkit/mozapps/installer/packager.mk.orig Fri Nov 4 21:34:19 2011 ++++ toolkit/mozapps/installer/packager.mk Thu Nov 10 00:21:27 2011 +@@ -759,7 +759,7 @@ endif $(NSINSTALL) -D $(DESTDIR)$(bindir) $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) Index: patches/patch-toolkit_xre_nsXREDirProvider_cpp =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp,v retrieving revision 1.8 diff -u -p -r1.8 patch-toolkit_xre_nsXREDirProvider_cpp --- patches/patch-toolkit_xre_nsXREDirProvider_cpp 3 Oct 2011 21:06:09 -0000 1.8 +++ patches/patch-toolkit_xre_nsXREDirProvider_cpp 10 Nov 2011 00:22:32 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.8 2011/10/03 21:06:09 landry Exp $ Look for extensions in LOCALBASE ---- toolkit/xre/nsXREDirProvider.cpp.orig Thu Aug 25 02:37:26 2011 -+++ toolkit/xre/nsXREDirProvider.cpp Mon Aug 29 14:54:59 2011 -@@ -1119,11 +1119,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca +--- toolkit/xre/nsXREDirProvider.cpp.orig Fri Nov 4 21:34:19 2011 ++++ toolkit/xre/nsXREDirProvider.cpp Thu Nov 10 00:21:27 2011 +@@ -1116,11 +1116,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) static const char *const sysSExtDir = Index: patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v retrieving revision 1.14 diff -u -p -r1.14 patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in --- patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in 28 Jun 2011 05:43:57 -0000 1.14 +++ patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in 10 Nov 2011 00:22:26 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.14 2011/06/28 05:43:57 landry Exp $ chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749 ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri May 27 18:13:00 2011 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 31 22:18:41 2011 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri Nov 4 21:34:23 2011 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Nov 10 00:21:27 2011 @@ -219,7 +219,7 @@ endif # # OpenBSD/ARM @@ -11,11 +11,3 @@ chunk 2: https://bugzilla.mozilla.org/sh CPPSRCS := xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp endif -@@ -370,6 +370,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 -+AS := $(CC) -c -x assembler-with-cpp - endif - - # Index: patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s =================================================================== RCS file: patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s diff -N patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s --- patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s 19 Apr 2011 09:16:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,228 +0,0 @@ -$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.3 2011/04/19 09:16:33 landry Exp $ -https://bugzilla.mozilla.org/show_bug.cgi?id=650749 ---- 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 @@ --# -*- Mode: Asm -*- --# --# ***** BEGIN LICENSE BLOCK ***** --# Version: MPL 1.1/GPL 2.0/LGPL 2.1 --# --# The contents of this file are subject to the Mozilla Public License Version --# 1.1 (the "License"); you may not use this file except in compliance with --# the License. You may obtain a copy of the License at --# http:#www.mozilla.org/MPL/ --# --# Software distributed under the License is distributed on an "AS IS" basis, --# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --# for the specific language governing rights and limitations under the --# License. --# --# The Original Code is mozilla.org code. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1999 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# franz.sirl-ker...@lauterbach.com (Franz Sirl) --# be...@netscape.com (Patrick Beard) --# water...@netscape.com (Chris Waterson) --# --# 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 ***** -+// -*- Mode: Asm -*- -+// -+// ***** BEGIN LICENSE BLOCK ***** -+// Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+// -+// The contents of this file are subject to the Mozilla Public License Version -+// 1.1 (the "License"); you may not use this file except in compliance with -+// the License. You may obtain a copy of the License at -+// http://www.mozilla.org/MPL/ -+// -+// Software distributed under the License is distributed on an "AS IS" basis, -+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+// for the specific language governing rights and limitations under the -+// License. -+// -+// The Original Code is mozilla.org code. -+// -+// The Initial Developer of the Original Code is -+// Netscape Communications Corporation. -+// Portions created by the Initial Developer are Copyright (C) 1999 -+// the Initial Developer. All Rights Reserved. -+// -+// Contributor(s): -+// franz.sirl-ker...@lauterbach.com (Franz Sirl) -+// be...@netscape.com (Patrick Beard) -+// water...@netscape.com (Chris Waterson) -+// -+// 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 ***** - - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 -@@ -53,80 +53,80 @@ - .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24 - .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 - .set f30,30; .set f31,31 -- -- .section ".text" -+ -+ .section ".text" - .align 2 - .globl NS_InvokeByIndex_P - .type NS_InvokeByIndex_P,@function - --# --# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, --# PRUint32 paramCount, nsXPTCVariant* params) --# -+// -+// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, -+// PRUint32 paramCount, nsXPTCVariant* params) -+// - - NS_InvokeByIndex_P: -- stwu sp,-32(sp) # setup standard stack frame -- mflr r0 # save LR -- stw r3,8(sp) # r3 <= that -- stw r4,12(sp) # r4 <= methodIndex -- stw r30,16(sp) -- stw r31,20(sp) -+ stwu sp,-32(sp) // setup standard stack frame -+ mflr r0 // save LR -+ stw r3,8(sp) // r3 <= that -+ stw r4,12(sp) // r4 <= methodIndex -+ stw r30,16(sp) -+ stw r31,20(sp) - -- stw r0,36(sp) # store LR backchain -- mr r31,sp -+ stw r0,36(sp) // store LR backchain -+ mr r31,sp - -- rlwinm r10,r5,3,0,27 # r10 = (ParamCount * 2 * 4) & ~0x0f -- addi r0,r10,96 # reserve stack for GPR and FPR register save area r0 = r10 + 96 -- lwz r9,0(sp) # r9 = backchain -- neg r0,r0 -- stwux r9,sp,r0 # reserve stack space and save SP backchain -+ rlwinm r10,r5,3,0,27 // r10 = (ParamCount * 2 * 4) & ~0x0f -+ addi r0,r10,96 // reserve stack for GPR and FPR register save area r0 = r10 + 96 -+ lwz r9,0(sp) // r9 = backchain -+ neg r0,r0 -+ stwux r9,sp,r0 // reserve stack space and save SP backchain - -- addi r3,sp,8 # r3 <= args -- mr r4,r5 # r4 <= paramCount -- mr r5,r6 # r5 <= params -- add r6,r3,r10 # r6 <= gpregs ( == args + r10 ) -- mr r30,r6 # store in r30 for use later... -- addi r7,r6,32 # r7 <= fpregs ( == gpregs + 32 ) -+ addi r3,sp,8 // r3 <= args -+ mr r4,r5 // r4 <= paramCount -+ mr r5,r6 // r5 <= params -+ add r6,r3,r10 // r6 <= gpregs ( == args + r10 ) -+ mr r30,r6 // store in r30 for use later... -+ addi r7,r6,32 // r7 <= fpregs ( == gpregs + 32 ) - -- bl invoke_copy_to_stack@local # (args, paramCount, params, gpregs, fpregs) -+ bl invoke_copy_to_stack@local // (args, paramCount, params, gpregs, fpregs) - -- lfd f1,32(r30) # load FP registers with method parameters -- lfd f2,40(r30) -- lfd f3,48(r30) -- lfd f4,56(r30) -- lfd f5,64(r30) -- lfd f6,72(r30) -- lfd f7,80(r30) -- lfd f8,88(r30) -+ lfd f1,32(r30) // load FP registers with method parameters -+ lfd f2,40(r30) -+ lfd f3,48(r30) -+ lfd f4,56(r30) -+ lfd f5,64(r30) -+ lfd f6,72(r30) -+ lfd f7,80(r30) -+ lfd f8,88(r30) - -- lwz r3,8(r31) # r3 <= that -- lwz r4,12(r31) # r4 <= methodIndex -- lwz r5,0(r3) # r5 <= vtable ( == *that ) --#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) # G++ pre-V3 ABI -- addi r4,r4,2 # skip first two vtable entries -+ lwz r3,8(r31) // r3 <= that -+ lwz r4,12(r31) // r4 <= methodIndex -+ lwz r5,0(r3) // r5 <= vtable ( == *that ) -+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI -+ addi r4,r4,2 // skip first two vtable entries - #endif -- slwi r4,r4,2 # convert to offset ( *= 4 ) -- lwzx r0,r5,r4 # r0 <= methodpointer ( == vtable + offset ) -+ slwi r4,r4,2 // convert to offset ( *= 4 ) -+ lwzx r0,r5,r4 // r0 <= methodpointer ( == vtable + offset ) - -- lwz r4,4(r30) # load GP regs with method parameters -- lwz r5,8(r30) -- lwz r6,12(r30) -- lwz r7,16(r30) -- lwz r8,20(r30) -- lwz r9,24(r30) -- lwz r10,28(r30) -+ lwz r4,4(r30) // load GP regs with method parameters -+ lwz r5,8(r30) -+ lwz r6,12(r30) -+ lwz r7,16(r30) -+ lwz r8,20(r30) -+ lwz r9,24(r30) -+ lwz r10,28(r30) - -- mtlr r0 # copy methodpointer to LR -- blrl # call method -- -- lwz r30,16(r31) # restore r30 & r31 -- lwz r31,20(r31) -- -- lwz r11,0(sp) # clean up the stack -- lwz r0,4(r11) -- mtlr r0 -- mr sp,r11 -+ mtlr r0 // copy methodpointer to LR -+ blrl // call method -+ -+ lwz r30,16(r31) // restore r30 & r31 -+ lwz r31,20(r31) -+ -+ lwz r11,0(sp) // clean up the stack -+ lwz r0,4(r11) -+ mtlr r0 -+ mr sp,r11 - blr - --# Magic indicating no need for an executable stack -+// Magic indicating no need for an executable stack - .section .note.GNU-stack, "", @progbits ; .previous Index: patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s =================================================================== RCS file: patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s diff -N patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s --- patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s 19 Apr 2011 09:16:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,171 +0,0 @@ -$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.3 2011/04/19 09:16:33 landry Exp $ -https://bugzilla.mozilla.org/show_bug.cgi?id=650749 ---- 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 @@ --# -*- Mode: Asm -*- --# --# ***** BEGIN LICENSE BLOCK ***** --# Version: MPL 1.1/GPL 2.0/LGPL 2.1 --# --# The contents of this file are subject to the Mozilla Public License Version --# 1.1 (the "License"); you may not use this file except in compliance with --# the License. You may obtain a copy of the License at --# http:#www.mozilla.org/MPL/ --# --# Software distributed under the License is distributed on an "AS IS" basis, --# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --# for the specific language governing rights and limitations under the --# License. --# --# The Original Code is mozilla.org code. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1999 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# franz.sirl-ker...@lauterbach.com (Franz Sirl) --# be...@netscape.com (Patrick Beard) --# water...@netscape.com (Chris Waterson) --# --# 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 ***** -+// -*- Mode: Asm -*- -+// -+// ***** BEGIN LICENSE BLOCK ***** -+// Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+// -+// The contents of this file are subject to the Mozilla Public License Version -+// 1.1 (the "License"); you may not use this file except in compliance with -+// the License. You may obtain a copy of the License at -+// http://www.mozilla.org/MPL/ -+// -+// Software distributed under the License is distributed on an "AS IS" basis, -+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+// for the specific language governing rights and limitations under the -+// License. -+// -+// The Original Code is mozilla.org code. -+// -+// The Initial Developer of the Original Code is -+// Netscape Communications Corporation. -+// Portions created by the Initial Developer are Copyright (C) 1999 -+// the Initial Developer. All Rights Reserved. -+// -+// Contributor(s): -+// franz.sirl-ker...@lauterbach.com (Franz Sirl) -+// be...@netscape.com (Patrick Beard) -+// water...@netscape.com (Chris Waterson) -+// -+// 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 ***** - - .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4 - .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9 -@@ -54,29 +54,29 @@ - .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 - .set f30,30; .set f31,31 - -- .section ".text" -- .align 2 -+ .section ".text" -+ .align 2 - .globl SharedStub - .type SharedStub,@function - - SharedStub: -- stwu sp,-112(sp) # room for -- # linkage (8), -- # gprData (32), -- # fprData (64), -- # stack alignment(8) -- mflr r0 -- stw r0,116(sp) # save LR backchain -+ stwu sp,-112(sp) // room for -+ // linkage (8), -+ // gprData (32), -+ // fprData (64), -+ // stack alignment(8) -+ mflr r0 -+ stw r0,116(sp) // save LR backchain - -- stw r4,12(sp) # save GP registers -- stw r5,16(sp) # (n.b. that we don't save r3 -- stw r6,20(sp) # because PrepareAndDispatch() is savvy) -+ stw r4,12(sp) // save GP registers -+ stw r5,16(sp) // (n.b. that we don't save r3 -+ stw r6,20(sp) // because PrepareAndDispatch() is savvy) - stw r7,24(sp) - stw r8,28(sp) - stw r9,32(sp) - stw r10,36(sp) - -- stfd f1,40(sp) # save FP registers -+ stfd f1,40(sp) // save FP registers - stfd f2,48(sp) - stfd f3,56(sp) - stfd f4,64(sp) -@@ -85,23 +85,23 @@ SharedStub: - stfd f7,88(sp) - stfd f8,96(sp) - -- # r3 has the 'self' pointer already -- -- mr r4,r11 # r4 <= methodIndex selector, passed -- # via r11 in the nsXPTCStubBase::StubXX() call -- -- addi r5,sp,120 # r5 <= pointer to callers args area, -- # beyond r3-r10/f1-f8 mapped range -- -- addi r6,sp,8 # r6 <= gprData -- addi r7,sp,40 # r7 <= fprData -- -- bl PrepareAndDispatch@local # Go! -- -- lwz r0,116(sp) # restore LR -+ // r3 has the 'self' pointer already -+ -+ mr r4,r11 // r4 <= methodIndex selector, passed -+ // via r11 in the nsXPTCStubBase::StubXX() call -+ -+ addi r5,sp,120 // r5 <= pointer to callers args area, -+ // beyond r3-r10/f1-f8 mapped range -+ -+ addi r6,sp,8 // r6 <= gprData -+ addi r7,sp,40 // r7 <= fprData -+ -+ bl PrepareAndDispatch@local // Go! -+ -+ lwz r0,116(sp) // restore LR - mtlr r0 -- la sp,112(sp) # clean up the stack -+ la sp,112(sp) // clean up the stack - blr - --# Magic indicating no need for an executable stack -+// Magic indicating no need for an executable stack - .section .note.GNU-stack, "", @progbits ; .previous Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/www/mozilla-firefox/pkg/PLIST,v retrieving revision 1.39 diff -u -p -r1.39 PLIST --- pkg/PLIST 3 Oct 2011 21:06:09 -0000 1.39 +++ pkg/PLIST 10 Nov 2011 01:34:11 -0000 @@ -8,7 +8,6 @@ bin/${MOZILLA_PROJECT} bin/mozilla-${MOZILLA_PROJECT} lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/README.txt lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/blocklist.xml lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/ @@ -37,9 +36,42 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION @bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT} @bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}-bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/ +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_af.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_bg.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ca.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_cy.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_da.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-1901.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-1996.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-CH.dic lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_en_US.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_eo.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_es.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_et.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fi.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fr.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_gl.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hr.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hsb.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ia.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_is.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_kmr.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_la.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_lt.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_mn.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nb.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nl.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nn.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_pt.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ru.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sh.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sl.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sv.dic +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_uk.dic 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} @@ -54,6 +86,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/bing.xml lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/eBay.xml lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/google.xml +lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/twitter.xml lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/wikipedia.xml lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/yahoo.xml @man man/man1/${MOZILLA_PROJECT}.1
