Update to seamonkey-2.5b4.

No major changes to seamonkey itself, the major change is that this
is based on the same mozilla branch as firefox-8.0.

11 files changed, 171 insertions, 91 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index ae10d9f29d5..fdf57996f6b 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2011/11/01 06:11:58 sbd Exp $
+# $NetBSD: Makefile,v 1.55 2011/11/12 16:41:43 tnn Exp $
 #
 
 DISTNAME=	seamonkey-${SM_VER}.source
 PKGNAME=	seamonkey-${SM_VER}
-SM_VER=		2.3.2
-PKGREVISION=	1
+SM_VER=		2.5b4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +12,7 @@ MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.seamonkey-project.org/
 COMMENT=	Full-featured gecko-based browser
 
-WRKSRC=		${WRKDIR}/comm-release
+WRKSRC=		${WRKDIR}/comm-beta
 MOZILLA_DIR=	mozilla/
 
 CONFIG_GUESS_OVERRIDE+=	ldap/sdks/c-sdk/config/autoconf/config.guess
@@ -23,6 +22,9 @@ CONFIGURE_ARGS+=	--enable-application=suite
 
 ALL_ENV+=		MOZILLA_PKG_NAME=seamonkey
 
+# XXX tnn
+MAKE_JOBS_SAFE=		no
+
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
 	cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index de7ed7bc995..5803a961435 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2011/08/19 10:10:01 tnn Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/11/12 16:41:43 tnn Exp $
 bin/seamonkey
 lib/seamonkey/README
 lib/seamonkey/application.ini
@@ -226,13 +226,25 @@ lib/seamonkey/chrome/classic/skin/classic/messenger/icons/junkBar.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/junkcol.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/local-mailhost.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-del.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-fwd-offl.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-fwd-reply.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-fwd.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-offl-reply.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-offl.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach-reply.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-attach.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-delete-offl.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-fwd-offl-reply.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-fwd-offl.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-fwd-reply.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-fwd.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-imapdelete.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-new-offl.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-new.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-offl-reply.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-offl.png
+lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail-reply.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-mail.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-news-attach-kill-offl.png
 lib/seamonkey/chrome/classic/skin/classic/messenger/icons/message-news-attach-kill.png
@@ -430,10 +442,8 @@ lib/seamonkey/chrome/comm/content/communicator/openLocation.xul
 lib/seamonkey/chrome/comm/content/communicator/passwordManager.xul
 lib/seamonkey/chrome/comm/content/communicator/permissions/cookieViewer.js
 lib/seamonkey/chrome/comm/content/communicator/permissions/cookieViewer.xul
-lib/seamonkey/chrome/comm/content/communicator/permissions/imageContextOverlay.xul
 lib/seamonkey/chrome/comm/content/communicator/permissions/permissionsManager.js
 lib/seamonkey/chrome/comm/content/communicator/permissions/permissionsManager.xul
-lib/seamonkey/chrome/comm/content/communicator/permissions/permissionsNavigatorOverlay.xul
 lib/seamonkey/chrome/comm/content/communicator/permissions/treeUtils.js
 lib/seamonkey/chrome/comm/content/communicator/places/browserPlacesViews.js
 lib/seamonkey/chrome/comm/content/communicator/places/controller.js
@@ -443,7 +453,6 @@ lib/seamonkey/chrome/comm/content/communicator/places/sidebarUtils.js
 lib/seamonkey/chrome/comm/content/communicator/places/tree.xml
 lib/seamonkey/chrome/comm/content/communicator/places/treeView.js
 lib/seamonkey/chrome/comm/content/communicator/platformCommunicatorOverlay.xul
-lib/seamonkey/chrome/comm/content/communicator/pref/overrideHandler.js
 lib/seamonkey/chrome/comm/content/communicator/pref/pref-advanced.js
 lib/seamonkey/chrome/comm/content/communicator/pref/pref-advanced.xul
 lib/seamonkey/chrome/comm/content/communicator/pref/pref-appearance.js
@@ -911,7 +920,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/communicator/permissions/cookieViewer.dt
 lib/seamonkey/chrome/en-US/locale/en-US/communicator/permissions/cookieViewer.properties
 lib/seamonkey/chrome/en-US/locale/en-US/communicator/permissions/permissionsManager.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/communicator/permissions/permissionsManager.properties
-lib/seamonkey/chrome/en-US/locale/en-US/communicator/permissions/permissionsNavigatorOverlay.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/communicator/places/places.properties
 lib/seamonkey/chrome/en-US/locale/en-US/communicator/pref/pref-advanced.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/communicator/pref/pref-appearance.dtd
@@ -1103,7 +1111,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/global/printjoboptions.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/global/regionNames.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global/search/search.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global/security/caps.properties
-lib/seamonkey/chrome/en-US/locale/en-US/global/storage.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global/svg/svg.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global/textcontext.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/global/tree.dtd
@@ -1201,7 +1208,6 @@ lib/seamonkey/chrome/en-US/locale/en-US/messenger/mailviews.properties
 lib/seamonkey/chrome/en-US/locale/en-US/messenger/markByDate.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/messenger/messenger.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/messenger/messenger.properties
-lib/seamonkey/chrome/en-US/locale/en-US/messenger/messengercompose/MsgAttachPage.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/messenger/messengercompose/addressingWidgetOverlay.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/messenger/messengercompose/askSendFormat.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/messenger/messengercompose/askSendFormat.properties
@@ -1263,6 +1269,10 @@ lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/about.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/blocklist.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/extensions.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/extensions.properties
+lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.dtd
+lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/newaddon.properties
+lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/selectAddons.dtd
+lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/selectAddons.properties
 lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/update.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/mozapps/extensions/update.properties
 lib/seamonkey/chrome/en-US/locale/en-US/mozapps/handling/handling.dtd
@@ -1292,6 +1302,7 @@ lib/seamonkey/chrome/en-US/locale/en-US/navigator/metadata.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/navigator/metadata.properties
 lib/seamonkey/chrome/en-US/locale/en-US/navigator/navigator.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/navigator/navigator.properties
+lib/seamonkey/chrome/en-US/locale/en-US/navigator/navigatorOverlay.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/navigator/pageInfo.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/navigator/pageInfo.properties
 lib/seamonkey/chrome/en-US/locale/en-US/navigator/tabbrowser.dtd
@@ -1521,8 +1532,6 @@ lib/seamonkey/chrome/messenger/content/messenger/messageWindow.js
 lib/seamonkey/chrome/messenger/content/messenger/messageWindow.xul
 lib/seamonkey/chrome/messenger/content/messenger/messenger.css
 lib/seamonkey/chrome/messenger/content/messenger/messenger.xul
-lib/seamonkey/chrome/messenger/content/messenger/messengercompose/MsgAttachPage.js
-lib/seamonkey/chrome/messenger/content/messenger/messengercompose/MsgAttachPage.xul
 lib/seamonkey/chrome/messenger/content/messenger/messengercompose/MsgComposeCommands.js
 lib/seamonkey/chrome/messenger/content/messenger/messengercompose/addressingWidgetOverlay.js
 lib/seamonkey/chrome/messenger/content/messenger/messengercompose/addressingWidgetOverlay.xul
@@ -1843,6 +1852,13 @@ lib/seamonkey/chrome/toolkit/content/mozapps/extensions/extensions.xml
 lib/seamonkey/chrome/toolkit/content/mozapps/extensions/extensions.xul
 lib/seamonkey/chrome/toolkit/content/mozapps/extensions/list.js
 lib/seamonkey/chrome/toolkit/content/mozapps/extensions/list.xul
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/newaddon.js
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/newaddon.xul
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/selectAddons.css
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/selectAddons.js
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/selectAddons.xml
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/selectAddons.xul
+lib/seamonkey/chrome/toolkit/content/mozapps/extensions/setting.xml
 lib/seamonkey/chrome/toolkit/content/mozapps/extensions/update.js
 lib/seamonkey/chrome/toolkit/content/mozapps/extensions/update.xul
 lib/seamonkey/chrome/toolkit/content/mozapps/extensions/updateinfo.xsl
@@ -2016,6 +2032,8 @@ lib/seamonkey/chrome/toolkit/skin/classic/global/icons/warning-large.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/icons/webconsole.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/icons/windowControls.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/icons/wrap.png
+lib/seamonkey/chrome/toolkit/skin/classic/global/inContentUI.css
+lib/seamonkey/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/linkTree.css
 lib/seamonkey/chrome/toolkit/skin/classic/global/listbox.css
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/error.png
@@ -2024,6 +2042,7 @@ lib/seamonkey/chrome/toolkit/skin/classic/global/media/pauseButton.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/playButton.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/scrubberThumb.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/scrubberThumbWide.png
+lib/seamonkey/chrome/toolkit/skin/classic/global/media/stalled.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/throbber.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/unmuteButton.png
 lib/seamonkey/chrome/toolkit/skin/classic/global/media/videocontrols.css
@@ -2092,7 +2111,6 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-error.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-negative.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-info-positive.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-warning.png
-lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/background-texture.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/blocklist.css
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
@@ -2113,8 +2131,10 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/extensions.svg
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/heart.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/navigation.png
+lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/newaddon.css
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
+lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/selectAddons.css
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/stripes-error.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-positive.png
@@ -2421,6 +2441,27 @@ lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/fr/inspec
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/fr/inspector/viewers/styleRules.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/fr/inspector/viewers/stylesheets.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/fr/inspector/viewers/xblBindings.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/editing.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/inspector.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/inspector.properties
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/prefs.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/tasksOverlay.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleEvent.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleEvents.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleEvents.properties
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleProps.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleProps.properties
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleRelations.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleTree.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/accessibleTreeEvalJSDialog.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/boxModel.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/computedStyle.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/dom.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/domNode.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/jsObject.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/styleRules.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/stylesheets.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/pl/inspector/viewers/xblBindings.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/ru/inspector/editing.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/ru/inspector/inspector.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/ru/inspector/inspector.properties
@@ -2950,13 +2991,25 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mes
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/mast-mail.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-junk-other.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-del.gif
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-fwd-offl-reply.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-fwd-offl.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-fwd-reply.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-fwd.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-offl-reply.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-offl.gif
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach-reply.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-attach.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-delete-offl.gif
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-fwd-offl-reply.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-fwd-offl.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-fwd-reply.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-fwd.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-imapdelete.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-new-offl.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-new.gif
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-offl-reply.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-offl.gif
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail-reply.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-mail.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-news-attach-kill-offl.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/message-news-attach-kill.png
@@ -3397,6 +3450,38 @@ lib/seamonkey/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman/s
 lib/seamonkey/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/venkman-service.js
 lib/seamonkey/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/install.rdf
 lib/seamonkey/greprefs.js
+lib/seamonkey/hyphenation/hyph_af.dic
+lib/seamonkey/hyphenation/hyph_bg.dic
+lib/seamonkey/hyphenation/hyph_ca.dic
+lib/seamonkey/hyphenation/hyph_cy.dic
+lib/seamonkey/hyphenation/hyph_da.dic
+lib/seamonkey/hyphenation/hyph_de-1901.dic
+lib/seamonkey/hyphenation/hyph_de-1996.dic
+lib/seamonkey/hyphenation/hyph_de-CH.dic
+lib/seamonkey/hyphenation/hyph_en_US.dic
+lib/seamonkey/hyphenation/hyph_eo.dic
+lib/seamonkey/hyphenation/hyph_es.dic
+lib/seamonkey/hyphenation/hyph_et.dic
+lib/seamonkey/hyphenation/hyph_fi.dic
+lib/seamonkey/hyphenation/hyph_fr.dic
+lib/seamonkey/hyphenation/hyph_gl.dic
+lib/seamonkey/hyphenation/hyph_hr.dic
+lib/seamonkey/hyphenation/hyph_hsb.dic
+lib/seamonkey/hyphenation/hyph_ia.dic
+lib/seamonkey/hyphenation/hyph_is.dic
+lib/seamonkey/hyphenation/hyph_kmr.dic
+lib/seamonkey/hyphenation/hyph_la.dic
+lib/seamonkey/hyphenation/hyph_lt.dic
+lib/seamonkey/hyphenation/hyph_mn.dic
+lib/seamonkey/hyphenation/hyph_nb.dic
+lib/seamonkey/hyphenation/hyph_nl.dic
+lib/seamonkey/hyphenation/hyph_nn.dic
+lib/seamonkey/hyphenation/hyph_pt.dic
+lib/seamonkey/hyphenation/hyph_ru.dic
+lib/seamonkey/hyphenation/hyph_sh.dic
+lib/seamonkey/hyphenation/hyph_sl.dic
+lib/seamonkey/hyphenation/hyph_sv.dic
+lib/seamonkey/hyphenation/hyph_uk.dic
 lib/seamonkey/icons/updater.png
 lib/seamonkey/isp/SpamAssassin.sfd
 lib/seamonkey/isp/SpamPal.sfd
@@ -3445,6 +3530,7 @@ lib/seamonkey/modules/LightweightThemeManager.jsm
 lib/seamonkey/modules/MailUtils.js
 lib/seamonkey/modules/Microformats.js
 lib/seamonkey/modules/NetUtil.jsm
+lib/seamonkey/modules/PageMenu.jsm
 lib/seamonkey/modules/PerfMeasurement.jsm
 lib/seamonkey/modules/PlacesDBUtils.jsm
 lib/seamonkey/modules/PlacesUIUtils.jsm
@@ -3454,14 +3540,12 @@ lib/seamonkey/modules/PluralForm.jsm
 lib/seamonkey/modules/PopupNotifications.jsm
 lib/seamonkey/modules/Sanitizer.jsm
 lib/seamonkey/modules/Services.jsm
-lib/seamonkey/modules/SpatialNavigation.js
 lib/seamonkey/modules/StringBundle.js
 lib/seamonkey/modules/WindowDraggingUtils.jsm
 lib/seamonkey/modules/XPCOMUtils.jsm
 lib/seamonkey/modules/XPIProvider.jsm
 lib/seamonkey/modules/ctypes.jsm
 lib/seamonkey/modules/debug.js
-lib/seamonkey/modules/dictUtils.js
 lib/seamonkey/modules/errUtils.js
 lib/seamonkey/modules/folderUtils.jsm
 lib/seamonkey/modules/gloda/collection.js
@@ -3494,7 +3578,9 @@ lib/seamonkey/modules/jsTreeSelection.js
 lib/seamonkey/modules/mailServices.js
 lib/seamonkey/modules/mailnewsMigrator.js
 lib/seamonkey/modules/nsFormAutoCompleteResult.jsm
+lib/seamonkey/modules/reflect.jsm
 lib/seamonkey/modules/services-crypto/WeaveCrypto.js
+lib/seamonkey/modules/services-sync/async.js
 lib/seamonkey/modules/services-sync/constants.js
 lib/seamonkey/modules/services-sync/engines.js
 lib/seamonkey/modules/services-sync/engines/bookmarks.js
@@ -3512,8 +3598,10 @@ lib/seamonkey/modules/services-sync/jpakeclient.js
 lib/seamonkey/modules/services-sync/log4moz.js
 lib/seamonkey/modules/services-sync/main.js
 lib/seamonkey/modules/services-sync/notifications.js
+lib/seamonkey/modules/services-sync/policies.js
 lib/seamonkey/modules/services-sync/record.js
 lib/seamonkey/modules/services-sync/resource.js
+lib/seamonkey/modules/services-sync/rest.js
 lib/seamonkey/modules/services-sync/service.js
 lib/seamonkey/modules/services-sync/status.js
 lib/seamonkey/modules/services-sync/util.js
@@ -3536,6 +3624,7 @@ lib/seamonkey/res/entityTables/htmlEntityVersions.properties
 lib/seamonkey/res/entityTables/mathml20.properties
 lib/seamonkey/res/entityTables/transliterate.properties
 lib/seamonkey/res/fonts/mathfont.properties
+lib/seamonkey/res/fonts/mathfontAsanaMath.properties
 lib/seamonkey/res/fonts/mathfontSTIXNonUnicode.properties
 lib/seamonkey/res/fonts/mathfontSTIXSize1.properties
 lib/seamonkey/res/fonts/mathfontSTIXSizeOneSym.properties
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 758b3288f08..a665ab59327 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,31 +1,31 @@
-$NetBSD: distinfo,v 1.68 2011/09/05 05:31:43 tnn Exp $
+$NetBSD: distinfo,v 1.69 2011/11/12 16:41:43 tnn Exp $
 
-SHA1 (seamonkey-2.3.2.source.tar.bz2) = e6fd38163098ed321ad0225c6f7d5c88f0cf3206
-RMD160 (seamonkey-2.3.2.source.tar.bz2) = 0af1fd205552cf886f16e6685a14fa0a3b397ac2
-Size (seamonkey-2.3.2.source.tar.bz2) = 87006544 bytes
-SHA1 (patch-aa) = 3ba0d3d84d88131c6d79718b6fa88639e6e43b49
-SHA1 (patch-aa-toplevel) = 098a2bc08351230e178091a96d863bd5661ce4b8
+SHA1 (seamonkey-2.5b4.source.tar.bz2) = 74b8b9a415b97e4e3242db516fa57ed8b9f43dfe
+RMD160 (seamonkey-2.5b4.source.tar.bz2) = 1ed9a59457b7bafe2aed2071908822b98225dddc
+Size (seamonkey-2.5b4.source.tar.bz2) = 89481907 bytes
+SHA1 (patch-aa) = 19166ee99b804e5b05d6936a2a09315eb29f9ca2
+SHA1 (patch-aa-toplevel) = b5278820a02405f03e328ba4dd217ef16ae52bcb
 SHA1 (patch-ab) = c2bffac6626ce22d15855a80d84ffac6cbd52fe2
 SHA1 (patch-ac) = cbbc17c71dd96969079fc7268b15f822a29d01aa
 SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
-SHA1 (patch-ae) = 12003b21c7ab1d7f0587cba3c93d8eca85f23383
+SHA1 (patch-ae) = 7cb8cbf920fe5fae7bfe7ace98e93fcf2c506789
 SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7
 SHA1 (patch-ag) = 22cca24b67c85fbf9bafb35441dfcb460ecde6bf
 SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235
 SHA1 (patch-ai) = 4d701ece9a2aaa0b640c189745fa7e731617fb7c
 SHA1 (patch-aj) = c6d14934700c2f9fc12c00474ef321f8265f4527
-SHA1 (patch-ak) = 0f379cc1e9d972dbb3e18a04605e4c19b3dc54ee
+SHA1 (patch-ak) = bf763083d8a2986d82e8613c40ed7c99722c82c4
 SHA1 (patch-al) = 616f500ba2af8f522454858ed0d845a127f41a96
 SHA1 (patch-am) = 81bcda476a7b54050ed1ae87bd47cf9de8f19919
 SHA1 (patch-an) = e30362e1a07c6c8e96dc81d134517685c3f19ca9
 SHA1 (patch-ao) = 42c268711a8bb24c3bde3c5bf74bb5a9f73ff21a
-SHA1 (patch-as) = 183d36e92ea6fd3142344b057a7335044ef5c1c3
+SHA1 (patch-as) = 0724caef986c0288b24bedb7b3acd384536d376f
 SHA1 (patch-at) = 32fcebfa1f3778a1fa1e020002060db433e8491b
 SHA1 (patch-au) = 1bf6913c702c7d586d73603597efae0e39f2b49f
 SHA1 (patch-av) = 2cb2e3d5b94f7b83117eb752d4410638daa6ae73
 SHA1 (patch-aw) = 55d2769dfb6d0c65bd2072c1a7c82cfef0fd5404
 SHA1 (patch-ax) = 4d0b83ab7592ee8c674a176e64dbc3ddb5b9d3b5
-SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
+SHA1 (patch-ay) = 83d023cd43beb08b17f1161fe025959ca441e1ce
 SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
 SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
 SHA1 (patch-bd) = c2296fe47f6f9e38d424ef27ca367a257188e2d1
@@ -48,7 +48,7 @@ SHA1 (patch-ma-toplevel) = 67ea79e29f6e9737ce76b8541ab8b3860eb02561
 SHA1 (patch-mb) = 8481afe61902cb16dfe35a5ee015cb4d43a54236
 SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
 SHA1 (patch-me) = 66c15af6d7b07a4fec7ecd06cb9c9278b35a123e
-SHA1 (patch-mf) = 93a578c9592bcb17661c3884d28af29be62a8135
+SHA1 (patch-mf) = 14674ed31c912ef647a913cb93762dc963b96177
 SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a
 SHA1 (patch-mh) = 36a434488f3389407c6ebce610c176464bc03c45
 SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
@@ -79,5 +79,5 @@ SHA1 (patch-xl) = 1425f9e5fd0dc49f3204730d1d88b9600d6475e4
 SHA1 (patch-xm) = 270e762936fe686cc55b820d52e15421b27c7c2c
 SHA1 (patch-xn) = edd741e4e71ecb44fc58750727aac473ff2e628e
 SHA1 (patch-xo) = 02c913b01bba8afd70ea28c0dd752ebf4b696e0c
-SHA1 (patch-za) = eee779ff27775c4336732359208efdba8524bf64
+SHA1 (patch-za) = b3759589bfe9833dd0220e63aa65ee496f94cbb8
 SHA1 (patch-zc) = 2f73cb72bd6c10830e7a2b8ad3b1f769c6afdb3c
diff --git a/www/seamonkey/patches/patch-aa b/www/seamonkey/patches/patch-aa
index 96d12ed060d..110cfb0d2a3 100644
--- a/www/seamonkey/patches/patch-aa
+++ b/www/seamonkey/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2011/08/19 10:10:01 tnn Exp $
+$NetBSD: patch-aa,v 1.6 2011/11/12 16:41:43 tnn Exp $
 
---- mozilla/configure.in.orig	2011-08-11 21:40:51.000000000 +0000
+--- mozilla/configure.in.orig	2011-11-07 21:07:43.000000000 +0000
 +++ mozilla/configure.in
-@@ -2063,7 +2063,7 @@ case "$target" in
+@@ -2137,7 +2137,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2011/08/19 10:10:01 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2071,6 +2071,9 @@ case "$target" in
+@@ -2145,6 +2145,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.5 2011/08/19 10:10:01 tnn Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3277,6 +3280,9 @@ dnl ====================================
+@@ -3312,6 +3315,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.5 2011/08/19 10:10:01 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4593,6 +4599,14 @@ if test -n "$YASM"; then
+@@ -4520,6 +4526,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,17 +46,16 @@ $NetBSD: patch-aa,v 1.5 2011/08/19 10:10:01 tnn Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -9200,7 +9214,8 @@ rm -f confdefs.h.save
- mv confdefs.h confdefs.h.save
- egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
- AC_OUTPUT_MAKE_DEFS()
--MOZ_DEFINES=$DEFS
-+# nbsed broken. PR bin/42261
-+MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`"
- AC_SUBST(MOZ_DEFINES)
- rm -f confdefs.h
- mv confdefs.h.save confdefs.h
-@@ -9307,6 +9322,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -7439,7 +7453,7 @@ else
+   *-mingw*)
+     AC_DEFINE(MOZ_MEMORY_WINDOWS)
+     AC_MSG_CHECKING([for VC2005/2008++ CRT source])
+-    if test "$CC_VERSION" == "14.00.50727.762" -o "$CC_VERSION" == "15.00.30729.01"; then
++    if test "$CC_VERSION" = "14.00.50727.762" -o "$CC_VERSION" = "15.00.30729.01"; then
+       if test -z "$WIN32_CRT_SRC_DIR" -a -n "$VCINSTALLDIR"; then
+         WIN32_CRT_SRC_DIR="$VCINSTALLDIR\crt\src"
+       fi
+@@ -9516,6 +9530,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
diff --git a/www/seamonkey/patches/patch-aa-toplevel b/www/seamonkey/patches/patch-aa-toplevel
index f076310d097..31e8e182fb9 100644
--- a/www/seamonkey/patches/patch-aa-toplevel
+++ b/www/seamonkey/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 10:10:01 tnn Exp $
+$NetBSD: patch-aa-toplevel,v 1.4 2011/11/12 16:41:43 tnn Exp $
 
---- configure.in.orig	2011-08-14 01:09:28.000000000 +0000
+--- configure.in.orig	2011-11-07 20:53:31.000000000 +0000
 +++ configure.in
-@@ -1974,7 +1974,7 @@ ld.])
+@@ -1950,7 +1950,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 10:10:01 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1982,6 +1982,9 @@ ld.])
+@@ -1958,6 +1958,9 @@ ld.])
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 10:10:01 tnn Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3222,6 +3225,9 @@ dnl ====================================
+@@ -3198,6 +3201,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,13 +31,3 @@ $NetBSD: patch-aa-toplevel,v 1.3 2011/08/19 10:10:01 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -7304,7 +7310,8 @@ rm -f confdefs.h.save
- mv confdefs.h confdefs.h.save
- egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
- AC_OUTPUT_MAKE_DEFS()
--MOZ_DEFINES=$DEFS
-+# nbsed broken. PR bin/42261
-+MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`"
- AC_SUBST(MOZ_DEFINES)
- rm -f confdefs.h
- mv confdefs.h.save confdefs.h
diff --git a/www/seamonkey/patches/patch-ae b/www/seamonkey/patches/patch-ae
index c2b3dc3df38..d5955362860 100644
--- a/www/seamonkey/patches/patch-ae
+++ b/www/seamonkey/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2011/08/19 10:10:01 tnn Exp $
+$NetBSD: patch-ae,v 1.6 2011/11/12 16:41:43 tnn Exp $
 
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2011-08-11 21:41:20.000000000 +0000
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2011-09-22 20:20:37.000000000 +0000
 +++ mozilla/nsprpub/pr/src/misc/prnetdb.c
 @@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL;
          || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
@@ -43,7 +43,7 @@ $NetBSD: patch-ae,v 1.5 2011/08/19 10:10:01 tnn Exp $
 +
          rv = GETADDRINFO(hostname, NULL, &hints, &res);
  #ifdef AI_ADDRCONFIG
-         if (rv == EAI_BADFLAGS) {
+         if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
 @@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
              rv = GETADDRINFO(hostname, NULL, &hints, &res);
          }
diff --git a/www/seamonkey/patches/patch-ak b/www/seamonkey/patches/patch-ak
index f8f5bdd7a8e..3925cf331de 100644
--- a/www/seamonkey/patches/patch-ak
+++ b/www/seamonkey/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.4 2011/07/11 20:46:36 tnn Exp $
+$NetBSD: patch-ak,v 1.5 2011/11/12 16:41:43 tnn Exp $
 
---- mozilla/js/src/ctypes/libffi/configure.orig	2010-03-16 01:02:50.000000000 +0000
+--- mozilla/js/src/ctypes/libffi/configure.orig	2011-11-04 21:34:01.000000000 +0000
 +++ mozilla/js/src/ctypes/libffi/configure
-@@ -12232,7 +12232,7 @@ case "$host" in
+@@ -11277,7 +11277,7 @@ case "$host" in
    powerpc-*-aix* | rs6000-*-aix*)
  	TARGET=POWERPC_AIX; TARGETDIR=powerpc
  	;;
--  powerpc-*-freebsd*)
-+  powerpc-*-freebsd* | powerpc-*-netbsd*)
+-  powerpc-*-freebsd* | powerpc-*-openbsd*)
++  powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*)
  	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
  	;;
    powerpc*-*-rtems*)
diff --git a/www/seamonkey/patches/patch-as b/www/seamonkey/patches/patch-as
index 3bcbe23d4c1..f1171313c0a 100644
--- a/www/seamonkey/patches/patch-as
+++ b/www/seamonkey/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.3 2011/08/19 10:10:01 tnn Exp $
+$NetBSD: patch-as,v 1.4 2011/11/12 16:41:43 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/configure.in.orig	2011-08-11 21:41:02.000000000 +0000
+--- mozilla/js/src/configure.in.orig	2011-09-22 20:20:26.000000000 +0000
 +++ mozilla/js/src/configure.in
-@@ -748,7 +748,7 @@ EOF
+@@ -784,7 +784,7 @@ EOF
                  AC_LANG_RESTORE
              ])
  
@@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD.
              AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
                             ac_cv_have_dllimport_exception_bug,
                  [
-@@ -1977,7 +1977,7 @@ case "$target" in
+@@ -1999,7 +1999,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -22,7 +22,7 @@ Treat DragonFly like FreeBSD.
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2821,7 +2821,7 @@ case "$target" in
+@@ -2846,7 +2846,7 @@ case "$target" in
  *-solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
@@ -31,7 +31,7 @@ Treat DragonFly like FreeBSD.
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
  *-openbsd*)
-@@ -4730,7 +4730,7 @@ if test "$MOZ_MEMORY"; then
+@@ -4846,7 +4846,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
@@ -39,4 +39,4 @@ Treat DragonFly like FreeBSD.
 +  *-*freebsd*|*-*dragonfly*)
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
-   *-*linux*)
+   *-android*|*-linuxandroid*)
diff --git a/www/seamonkey/patches/patch-ay b/www/seamonkey/patches/patch-ay
index b6dd5340890..2a456b531bc 100644
--- a/www/seamonkey/patches/patch-ay
+++ b/www/seamonkey/patches/patch-ay
@@ -1,11 +1,11 @@
-$NetBSD: patch-ay,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ay,v 1.2 2011/11/12 16:41:43 tnn Exp $
 
---- mozilla/browser/app/nsBrowserApp.cpp.orig	2009-06-29 18:14:40.000000000 +0200
+--- mozilla/browser/app/nsBrowserApp.cpp.orig	2011-09-22 20:20:17.000000000 +0000
 +++ mozilla/browser/app/nsBrowserApp.cpp
-@@ -44,6 +44,27 @@
- 
+@@ -49,6 +49,27 @@
  #include <stdio.h>
  #include <stdarg.h>
+ #include <string.h>
 +#include <sys/resource.h>
 +/*
 + * On netbsd-4, ulimit -n is 64 by default; too few for us.
@@ -30,11 +30,11 @@ $NetBSD: patch-ay,v 1.1 2010/03/16 10:59:10 tnn Exp $
  
  #include "plstr.h"
  #include "prprf.h"
-@@ -106,6 +127,7 @@ public:
- 
+@@ -203,6 +224,7 @@ static int do_main(const char *exePath, 
  int main(int argc, char* argv[])
  {
+   char exePath[MAXPATHLEN];
 +  netbsd_fixrlimit();
-   ScopedLogging log;
  
-   nsCOMPtr<nsILocalFile> appini;
+   nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
+   if (NS_FAILED(rv)) {
diff --git a/www/seamonkey/patches/patch-mf b/www/seamonkey/patches/patch-mf
index 92839a5f53f..a3ba56ec41b 100644
--- a/www/seamonkey/patches/patch-mf
+++ b/www/seamonkey/patches/patch-mf
@@ -1,16 +1,16 @@
-$NetBSD: patch-mf,v 1.2 2011/08/19 11:59:41 tnn Exp $
+$NetBSD: patch-mf,v 1.3 2011/11/12 16:41:43 tnn Exp $
 
 Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
---- mozilla/security/coreconf/config.mk.orig	2011-08-14 01:20:32.000000000 +0000
+--- mozilla/security/coreconf/config.mk.orig	2011-11-04 21:34:14.000000000 +0000
 +++ mozilla/security/coreconf/config.mk
 @@ -63,7 +63,7 @@ endif
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              AIX RISCOS WINNT WIN95 WINCE
-+              AIX RISCOS WINNT WIN95 WINCE DragonFly
+-              AIX RISCOS WINNT WIN95 WINCE Linux
++              AIX RISCOS WINNT WIN95 WINCE Linux DragonFly
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/www/seamonkey/patches/patch-za b/www/seamonkey/patches/patch-za
index de8227bc229..bd753e8d54e 100644
--- a/www/seamonkey/patches/patch-za
+++ b/www/seamonkey/patches/patch-za
@@ -1,9 +1,9 @@
-$NetBSD: patch-za,v 1.2 2011/08/19 10:10:01 tnn Exp $
+$NetBSD: patch-za,v 1.3 2011/11/12 16:41:43 tnn Exp $
 
---- suite/app/Makefile.in.orig	2011-08-14 01:09:42.000000000 +0000
+--- suite/app/Makefile.in.orig	2011-09-28 23:11:01.000000000 +0000
 +++ suite/app/Makefile.in
-@@ -103,6 +103,10 @@ TK_LIBS := -framework SystemConfiguratio
- endif
+@@ -91,6 +91,10 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ TK_LIBS := -framework Cocoa $(TK_LIBS)
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)