Resolve conflicts. I should have cvs add'ed this instead of cvs import'ing, as

wip/seamonkey has already existed in pkgsrc-wip.

9 files changed, 113 insertions, 160 deletions

diff --git a/www/seamonkey/DESCR b/www/seamonkey/DESCR
index a62c37e6773..0ce0b40e1c4 100644
--- a/www/seamonkey/DESCR
+++ b/www/seamonkey/DESCR
@@ -5,3 +5,8 @@ Mozilla Firefox and Mozilla Thunderbird, our group of dedicated volunteers
 works to ensure that you can have "everything but the kitchen sink" (a web
 browser, mail client, HTML composer, address book, IRC client and calendar),
 and have it stable enough for corporate use.
+
+This package is a preview of the upcoming stable version, showing off new but
+potentially not finalized features. It is intended for developers and testers
+only -- not for end users.  To get the latest version intended for end users,
+use the www/seamonkey* packages.
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 7732797f433..51b502b12c3 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/11/08 14:39:16 ghen Exp $
+# $NetBSD: Makefile,v 1.14 2006/11/22 12:48:29 ghen Exp $
 
 MOZILLA=		seamonkey
 
@@ -7,5 +7,5 @@ COMMENT=		Full featured gecko-based browser
 MOZILLA_USE_GTK2=	# yes
 MOZILLA_USE_XFT=	YES
 
-.include "../../www/seamonkey/Makefile-seamonkey.common"
+.include "../../wip/seamonkey/Makefile-seamonkey.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index 48ac1a8f8ee..f2f997dc3a1 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.2 2006/11/08 14:39:16 ghen Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.3 2006/11/22 12:48:29 ghen Exp $
 
 MOZILLA_BIN=		seamonkey-bin
-MOZ_VER=		1.0.6
+MOZ_VER=		1.1beta
+MOZ_DIST_VER=		1.1b
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		seamonkey-${MOZ_DIST_VER}.source
 
@@ -9,16 +10,14 @@ MASTER_SITES=		${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
 CATEGORIES=		www
 
 MAINTAINER=		ghen@NetBSD.org
-HOMEPAGE=		http://www.mozilla.org/projects/seamonkey
+HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/releases/${MOZ_DIST_VER}.html
 
-
-DISTINFO_FILE=		${.CURDIR}/../../www/seamonkey/distinfo
-PATCHDIR=		${.CURDIR}/../../www/seamonkey/patches
+DISTINFO_FILE=		${.CURDIR}/../../wip/seamonkey/distinfo
+PATCHDIR=		${.CURDIR}/../../wip/seamonkey/patches
 
 CONFIGURE_ARGS+=	--enable-application=suite
 
 BUILD_SVG=		# yes
-BUILD_CALENDAR=		# yes
 BUILD_MATHML=		# yes
 
 .include "../../www/seamonkey/Makefile.common"
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index c4d9da47709..1fb05940772 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/09/24 16:21:33 salo Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/11/22 12:48:29 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -25,7 +25,6 @@ lib/${MOZILLA}/components/libappcomps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libauth.${SO_SUFFIX}
 lib/${MOZILLA}/components/libautoconfig.${SO_SUFFIX}
 lib/${MOZILLA}/components/libbayesflt.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcalbasecomps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libcaps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libchrome.${SO_SUFFIX}
 lib/${MOZILLA}/components/libcomposer.${SO_SUFFIX}
@@ -44,7 +43,6 @@ lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimpComm4xMail.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimpText.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimport.${SO_SUFFIX}
-lib/${MOZILLA}/components/libinspector.${SO_SUFFIX}
 lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
 lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
 lib/${MOZILLA}/components/liblocalmail.${SO_SUFFIX}
@@ -91,7 +89,6 @@ lib/${MOZILLA}/components/libvcard.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebdav.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebsrvcs.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwidget_gtk2.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
@@ -99,6 +96,7 @@ lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxremoteservice.${SO_SUFFIX}
+lib/${MOZILLA}/libfreebl3.${SO_SUFFIX}
 lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -138,7 +136,6 @@ lib/${MOZILLA}/LICENSE
 lib/${MOZILLA}/README
 lib/${MOZILLA}/bloaturls.txt
 lib/${MOZILLA}/chrome/US.jar
-lib/${MOZILLA}/chrome/calendar.jar
 lib/${MOZILLA}/chrome/chatzilla.jar
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
@@ -158,8 +155,6 @@ lib/${MOZILLA}/chrome/icons/default/bmPropsWindow.xpm
 lib/${MOZILLA}/chrome/icons/default/bmPropsWindow16.xpm
 lib/${MOZILLA}/chrome/icons/default/bookmark-window.xpm
 lib/${MOZILLA}/chrome/icons/default/bookmark-window16.xpm
-lib/${MOZILLA}/chrome/icons/default/calendar-window.xpm
-lib/${MOZILLA}/chrome/icons/default/calendar-window16.xpm
 lib/${MOZILLA}/chrome/icons/default/chatzilla-window.xpm
 lib/${MOZILLA}/chrome/icons/default/chatzilla-window16.xpm
 lib/${MOZILLA}/chrome/icons/default/default.xpm
@@ -208,28 +203,6 @@ lib/${MOZILLA}/components/appstartup.xpt
 lib/${MOZILLA}/components/autocomplete.xpt
 lib/${MOZILLA}/components/autoconfig.xpt
 lib/${MOZILLA}/components/bookmarks.xpt
-lib/${MOZILLA}/components/calAlarmMonitor.js
-lib/${MOZILLA}/components/calAlarmService.js
-lib/${MOZILLA}/components/calAttachment.js
-lib/${MOZILLA}/components/calAttendee.js
-lib/${MOZILLA}/components/calCalendarManager.js
-lib/${MOZILLA}/components/calCompositeCalendar.js
-lib/${MOZILLA}/components/calDavCalendar.js
-lib/${MOZILLA}/components/calEvent.js
-lib/${MOZILLA}/components/calHtmlExport.js
-lib/${MOZILLA}/components/calICSCalendar.js
-lib/${MOZILLA}/components/calIcsImportExport.js
-lib/${MOZILLA}/components/calImportExportModule.js
-lib/${MOZILLA}/components/calItemBase.js
-lib/${MOZILLA}/components/calItemModule.js
-lib/${MOZILLA}/components/calMemoryCalendar.js
-lib/${MOZILLA}/components/calOutlookCSVImportExport.js
-lib/${MOZILLA}/components/calRecurrenceInfo.js
-lib/${MOZILLA}/components/calStorageCalendar.js
-lib/${MOZILLA}/components/calTodo.js
-lib/${MOZILLA}/components/calbase.xpt
-lib/${MOZILLA}/components/calbaseinternal.xpt
-lib/${MOZILLA}/components/calendarService.js
 lib/${MOZILLA}/components/caps.xpt
 lib/${MOZILLA}/components/chardet.xpt
 lib/${MOZILLA}/components/chatzilla-service.js
@@ -254,6 +227,8 @@ lib/${MOZILLA}/components/dom_events.xpt
 lib/${MOZILLA}/components/dom_html.xpt
 lib/${MOZILLA}/components/dom_loadsave.xpt
 lib/${MOZILLA}/components/dom_range.xpt
+lib/${MOZILLA}/components/dom_sidebar.xpt
+lib/${MOZILLA}/components/dom_storage.xpt
 lib/${MOZILLA}/components/dom_stylesheets.xpt
 lib/${MOZILLA}/components/dom_svg.xpt
 lib/${MOZILLA}/components/dom_traversal.xpt
@@ -304,8 +279,6 @@ lib/${MOZILLA}/components/msglocal.xpt
 lib/${MOZILLA}/components/msgnews.xpt
 lib/${MOZILLA}/components/msgsearch.xpt
 lib/${MOZILLA}/components/msgsmime.xpt
-lib/${MOZILLA}/components/myspell/en-US.aff
-lib/${MOZILLA}/components/myspell/en-US.dic
 lib/${MOZILLA}/components/necko.xpt
 lib/${MOZILLA}/components/necko_about.xpt
 lib/${MOZILLA}/components/necko_cache.xpt
@@ -350,9 +323,9 @@ lib/${MOZILLA}/components/progressDlg.xpt
 lib/${MOZILLA}/components/proxyObjInst.xpt
 lib/${MOZILLA}/components/rdf.xpt
 lib/${MOZILLA}/components/related.xpt
+lib/${MOZILLA}/components/saxparser.xpt
 lib/${MOZILLA}/components/search.xpt
 lib/${MOZILLA}/components/shistory.xpt
-lib/${MOZILLA}/components/sidebar.xpt
 lib/${MOZILLA}/components/signonviewer.xpt
 lib/${MOZILLA}/components/smime-service.js
 lib/${MOZILLA}/components/spellchecker.xpt
@@ -370,14 +343,13 @@ lib/${MOZILLA}/components/walleteditor.xpt
 lib/${MOZILLA}/components/walletpreview.xpt
 lib/${MOZILLA}/components/webBrowser_core.xpt
 lib/${MOZILLA}/components/webbrowserpersist.xpt
-lib/${MOZILLA}/components/webdav.xpt
 lib/${MOZILLA}/components/webshell_idls.xpt
 lib/${MOZILLA}/components/websrvcs.xpt
 lib/${MOZILLA}/components/widget.xpt
 lib/${MOZILLA}/components/windowds.xpt
 lib/${MOZILLA}/components/windowwatcher.xpt
 lib/${MOZILLA}/components/xml-rpc.xpt
-lib/${MOZILLA}/components/xmlextras.xpt
+lib/${MOZILLA}/components/xpautocomplete.xpt
 lib/${MOZILLA}/components/xpcom_base.xpt
 lib/${MOZILLA}/components/xpcom_components.xpt
 lib/${MOZILLA}/components/xpcom_ds.xpt
@@ -429,12 +401,14 @@ lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
 lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
 lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
 lib/${MOZILLA}/dependentlibs.list
+lib/${MOZILLA}/dictionaries/en-US.aff
+lib/${MOZILLA}/dictionaries/en-US.dic
 lib/${MOZILLA}/greprefs/all.js
 lib/${MOZILLA}/greprefs/security-prefs.js
 lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/init.d/README
-lib/${MOZILLA}/init.d/S80calendar_fix_permissions_bug_230617
 lib/${MOZILLA}/install.rdf
+lib/${MOZILLA}/libfreebl3.chk
 lib/${MOZILLA}/libsoftokn3.chk
 lib/${MOZILLA}/res/EditorOverride.css
 lib/${MOZILLA}/res/arrow.gif
@@ -713,6 +687,13 @@ include/${MOZILLA}/appshell/nsIWindowMediator.h
 include/${MOZILLA}/appshell/nsIWindowMediatorListener.h
 include/${MOZILLA}/appshell/nsIXULBrowserWindow.h
 include/${MOZILLA}/appshell/nsIXULWindow.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteController.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteInput.h
+include/${MOZILLA}/autocomplete/nsIAutoCompletePopup.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteResult.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteResultTypes.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteSearch.h
+include/${MOZILLA}/autocomplete/nsIAutoCompleteSimpleResult.h
 include/${MOZILLA}/autoconfig/nsIAutoConfig.h
 include/${MOZILLA}/autoconfig/nsILDAPSyncQuery.h
 include/${MOZILLA}/autoconfig/nsIReadConfig.h
@@ -724,29 +705,6 @@ include/${MOZILLA}/cairo/cairo-ft.h
 include/${MOZILLA}/cairo/cairo-xlib-xrender.h
 include/${MOZILLA}/cairo/cairo-xlib.h
 include/${MOZILLA}/cairo/cairo.h
-include/${MOZILLA}/calbase/calBaseCID.h
-include/${MOZILLA}/calbase/calIAlarmService.h
-include/${MOZILLA}/calbase/calIAttachment.h
-include/${MOZILLA}/calbase/calIAttendee.h
-include/${MOZILLA}/calbase/calICalendar.h
-include/${MOZILLA}/calbase/calICalendarManager.h
-include/${MOZILLA}/calbase/calICalendarProvider.h
-include/${MOZILLA}/calbase/calICalendarView.h
-include/${MOZILLA}/calbase/calICalendarViewController.h
-include/${MOZILLA}/calbase/calIDateTime.h
-include/${MOZILLA}/calbase/calIDuration.h
-include/${MOZILLA}/calbase/calIErrors.h
-include/${MOZILLA}/calbase/calIEvent.h
-include/${MOZILLA}/calbase/calIICSService.h
-include/${MOZILLA}/calbase/calIImportExport.h
-include/${MOZILLA}/calbase/calIItemBase.h
-include/${MOZILLA}/calbase/calIRecurrenceDate.h
-include/${MOZILLA}/calbase/calIRecurrenceDateSet.h
-include/${MOZILLA}/calbase/calIRecurrenceInfo.h
-include/${MOZILLA}/calbase/calIRecurrenceItem.h
-include/${MOZILLA}/calbase/calIRecurrenceRule.h
-include/${MOZILLA}/calbase/calITodo.h
-include/${MOZILLA}/calbase/calInternalInterfaces.h
 include/${MOZILLA}/caps/nsICryptoHash.h
 include/${MOZILLA}/caps/nsIPrincipal.h
 include/${MOZILLA}/caps/nsIScriptSecurityManager.h
@@ -796,8 +754,11 @@ include/${MOZILLA}/content/nsIContent.h
 include/${MOZILLA}/content/nsIContentIterator.h
 include/${MOZILLA}/content/nsIContentPolicy.h
 include/${MOZILLA}/content/nsIContentSerializer.h
+include/${MOZILLA}/content/nsIDOMGCParticipant.h
+include/${MOZILLA}/content/nsIDOMParser.h
 include/${MOZILLA}/content/nsIDOMSVGListener.h
 include/${MOZILLA}/content/nsIDOMSVGZoomListener.h
+include/${MOZILLA}/content/nsIDOMSerializer.h
 include/${MOZILLA}/content/nsIDocument.h
 include/${MOZILLA}/content/nsIDocumentEncoder.h
 include/${MOZILLA}/content/nsIDocumentObserver.h
@@ -834,6 +795,7 @@ include/${MOZILLA}/content/nsIRadioControlElement.h
 include/${MOZILLA}/content/nsIRadioGroupContainer.h
 include/${MOZILLA}/content/nsIRadioVisitor.h
 include/${MOZILLA}/content/nsIRangeUtils.h
+include/${MOZILLA}/content/nsISVGPathFlatten.h
 include/${MOZILLA}/content/nsISVGTextContentMetrics.h
 include/${MOZILLA}/content/nsISVGValue.h
 include/${MOZILLA}/content/nsISVGValueObserver.h
@@ -845,6 +807,7 @@ include/${MOZILLA}/content/nsIScriptLoader.h
 include/${MOZILLA}/content/nsIScriptLoaderObserver.h
 include/${MOZILLA}/content/nsISelectElement.h
 include/${MOZILLA}/content/nsISelection.h
+include/${MOZILLA}/content/nsISelection2.h
 include/${MOZILLA}/content/nsISelectionController.h
 include/${MOZILLA}/content/nsISelectionDisplay.h
 include/${MOZILLA}/content/nsISelectionListener.h
@@ -860,11 +823,13 @@ include/${MOZILLA}/content/nsIXBLService.h
 include/${MOZILLA}/content/nsIXMLContent.h
 include/${MOZILLA}/content/nsIXMLContentBuilder.h
 include/${MOZILLA}/content/nsIXMLContentSink.h
+include/${MOZILLA}/content/nsIXMLHttpRequest.h
 include/${MOZILLA}/content/nsIXPathEvaluatorInternal.h
 include/${MOZILLA}/content/nsIXPointer.h
 include/${MOZILLA}/content/nsIXSLTException.h
 include/${MOZILLA}/content/nsIXSLTProcessor.h
 include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
+include/${MOZILLA}/content/nsIXSLTProcessorPrivate.h
 include/${MOZILLA}/content/nsIXTFAttributeHandler.h
 include/${MOZILLA}/content/nsIXTFBindableElement.h
 include/${MOZILLA}/content/nsIXTFBindableElementWrapper.h
@@ -915,6 +880,7 @@ include/${MOZILLA}/dbm/winfile.h
 include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
 include/${MOZILLA}/docshell/nsCDocShell.h
 include/${MOZILLA}/docshell/nsDocShellCID.h
+include/${MOZILLA}/docshell/nsDocShellLoadTypes.h
 include/${MOZILLA}/docshell/nsIContentViewer.h
 include/${MOZILLA}/docshell/nsIContentViewerEdit.h
 include/${MOZILLA}/docshell/nsIContentViewerFile.h
@@ -927,6 +893,7 @@ include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
 include/${MOZILLA}/docshell/nsIEditorDocShell.h
 include/${MOZILLA}/docshell/nsIGlobalHistory.h
 include/${MOZILLA}/docshell/nsIGlobalHistory2.h
+include/${MOZILLA}/docshell/nsIGlobalHistory3.h
 include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
 include/${MOZILLA}/docshell/nsIScrollable.h
 include/${MOZILLA}/docshell/nsITextScroll.h
@@ -970,6 +937,7 @@ include/${MOZILLA}/dom/nsIDOMCanvasRenderingContext2D.h
 include/${MOZILLA}/dom/nsIDOMCharacterData.h
 include/${MOZILLA}/dom/nsIDOMChromeWindow.h
 include/${MOZILLA}/dom/nsIDOMClassInfo.h
+include/${MOZILLA}/dom/nsIDOMClientInformation.h
 include/${MOZILLA}/dom/nsIDOMComment.h
 include/${MOZILLA}/dom/nsIDOMCompositionListener.h
 include/${MOZILLA}/dom/nsIDOMConstructor.h
@@ -1190,6 +1158,7 @@ include/${MOZILLA}/dom/nsIDOMSVGSymbolElement.h
 include/${MOZILLA}/dom/nsIDOMSVGTSpanElement.h
 include/${MOZILLA}/dom/nsIDOMSVGTextContentElement.h
 include/${MOZILLA}/dom/nsIDOMSVGTextElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTextPathElement.h
 include/${MOZILLA}/dom/nsIDOMSVGTextPositionElem.h
 include/${MOZILLA}/dom/nsIDOMSVGTitleElement.h
 include/${MOZILLA}/dom/nsIDOMSVGTransform.h
@@ -1197,16 +1166,23 @@ include/${MOZILLA}/dom/nsIDOMSVGTransformList.h
 include/${MOZILLA}/dom/nsIDOMSVGTransformable.h
 include/${MOZILLA}/dom/nsIDOMSVGURIReference.h
 include/${MOZILLA}/dom/nsIDOMSVGUseElement.h
+include/${MOZILLA}/dom/nsIDOMSVGViewSpec.h
 include/${MOZILLA}/dom/nsIDOMSVGZoomAndPan.h
 include/${MOZILLA}/dom/nsIDOMSVGZoomEvent.h
 include/${MOZILLA}/dom/nsIDOMScreen.h
 include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
 include/${MOZILLA}/dom/nsIDOMScrollListener.h
 include/${MOZILLA}/dom/nsIDOMSmartCardEvent.h
+include/${MOZILLA}/dom/nsIDOMStorage.h
+include/${MOZILLA}/dom/nsIDOMStorageEvent.h
+include/${MOZILLA}/dom/nsIDOMStorageItem.h
+include/${MOZILLA}/dom/nsIDOMStorageList.h
+include/${MOZILLA}/dom/nsIDOMStorageWindow.h
 include/${MOZILLA}/dom/nsIDOMStyleSheet.h
 include/${MOZILLA}/dom/nsIDOMStyleSheetList.h
 include/${MOZILLA}/dom/nsIDOMText.h
 include/${MOZILLA}/dom/nsIDOMTextListener.h
+include/${MOZILLA}/dom/nsIDOMToString.h
 include/${MOZILLA}/dom/nsIDOMTreeWalker.h
 include/${MOZILLA}/dom/nsIDOMUIEvent.h
 include/${MOZILLA}/dom/nsIDOMUIListener.h
@@ -1227,6 +1203,7 @@ include/${MOZILLA}/dom/nsIDOMXPathResult.h
 include/${MOZILLA}/dom/nsIDOMXULButtonElement.h
 include/${MOZILLA}/dom/nsIDOMXULCheckboxElement.h
 include/${MOZILLA}/dom/nsIDOMXULCommandDispatcher.h
+include/${MOZILLA}/dom/nsIDOMXULCommandEvent.h
 include/${MOZILLA}/dom/nsIDOMXULControlElement.h
 include/${MOZILLA}/dom/nsIDOMXULDescriptionElement.h
 include/${MOZILLA}/dom/nsIDOMXULDocument.h
@@ -1254,6 +1231,9 @@ include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
 include/${MOZILLA}/dom/nsIScriptNameSpaceManager.h
 include/${MOZILLA}/dom/nsIScriptObjectOwner.h
 include/${MOZILLA}/dom/nsIScriptObjectPrincipal.h
+include/${MOZILLA}/dom/nsISidebar.h
+include/${MOZILLA}/dom/nsIWebContentHandlerRegistrar.h
+include/${MOZILLA}/dom/nsPIDOMStorage.h
 include/${MOZILLA}/dom/nsPIDOMWindow.h
 include/${MOZILLA}/dom/nsPIWindowRoot.h
 include/${MOZILLA}/downloadmanager/nsIDownloadManager.h
@@ -1283,6 +1263,7 @@ include/${MOZILLA}/embed_base/nsEmbedAPI.h
 include/${MOZILLA}/embed_base/nsEmbedCID.h
 include/${MOZILLA}/embed_base/nsIWindowCreator.h
 include/${MOZILLA}/embed_base/nsIWindowCreator2.h
+include/${MOZILLA}/embed_base/nsIWindowProvider.h
 include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.h
 include/${MOZILLA}/expat/expat.h
 include/${MOZILLA}/expat/expat_config.h
@@ -1353,6 +1334,7 @@ include/${MOZILLA}/htmlparser/nsIContentSink.h
 include/${MOZILLA}/htmlparser/nsIDTD.h
 include/${MOZILLA}/htmlparser/nsIElementObserver.h
 include/${MOZILLA}/htmlparser/nsIExpatSink.h
+include/${MOZILLA}/htmlparser/nsIExtendedExpatSink.h
 include/${MOZILLA}/htmlparser/nsIFragmentContentSink.h
 include/${MOZILLA}/htmlparser/nsIHTMLContentSink.h
 include/${MOZILLA}/htmlparser/nsIParser.h
@@ -1364,7 +1346,6 @@ include/${MOZILLA}/htmlparser/nsParserCIID.h
 include/${MOZILLA}/htmlparser/nsParserDataListener.h
 include/${MOZILLA}/htmlparser/nsScannerString.h
 include/${MOZILLA}/htmlparser/nsToken.h
-include/${MOZILLA}/ical/ical.h
 include/${MOZILLA}/imglib2/ImageErrors.h
 include/${MOZILLA}/imglib2/ImageLogging.h
 include/${MOZILLA}/imglib2/imgICache.h
@@ -1432,6 +1413,7 @@ include/${MOZILLA}/js/jsarena.h
 include/${MOZILLA}/js/jsarray.h
 include/${MOZILLA}/js/jsatom.h
 include/${MOZILLA}/js/jsautocfg.h
+include/${MOZILLA}/js/jsautokw.h
 include/${MOZILLA}/js/jsbit.h
 include/${MOZILLA}/js/jsbool.h
 include/${MOZILLA}/js/jsclist.h
@@ -1446,6 +1428,7 @@ include/${MOZILLA}/js/jsfun.h
 include/${MOZILLA}/js/jsgc.h
 include/${MOZILLA}/js/jshash.h
 include/${MOZILLA}/js/jsinterp.h
+include/${MOZILLA}/js/jsiter.h
 include/${MOZILLA}/js/jslock.h
 include/${MOZILLA}/js/jslong.h
 include/${MOZILLA}/js/jsmath.h
@@ -1457,6 +1440,7 @@ include/${MOZILLA}/js/jsosdep.h
 include/${MOZILLA}/js/jsotypes.h
 include/${MOZILLA}/js/jsparse.h
 include/${MOZILLA}/js/jsprf.h
+include/${MOZILLA}/js/jsproto.tbl
 include/${MOZILLA}/js/jsprvtd.h
 include/${MOZILLA}/js/jspubtd.h
 include/${MOZILLA}/js/jsregexp.h
@@ -1607,6 +1591,7 @@ include/${MOZILLA}/layout/nsLayoutAtomList.h
 include/${MOZILLA}/layout/nsLayoutAtoms.h
 include/${MOZILLA}/layout/nsLayoutCID.h
 include/${MOZILLA}/layout/nsLayoutErrors.h
+include/${MOZILLA}/layout/nsLayoutStatics.h
 include/${MOZILLA}/layout/nsLayoutStylesheetCache.h
 include/${MOZILLA}/layout/nsLayoutUtils.h
 include/${MOZILLA}/layout/nsPIBoxObject.h
@@ -1744,6 +1729,7 @@ include/${MOZILLA}/msgbase/nsIMsgAccountManager.h
 include/${MOZILLA}/msgbase/nsIMsgBiffManager.h
 include/${MOZILLA}/msgbase/nsIMsgCopyService.h
 include/${MOZILLA}/msgbase/nsIMsgCopyServiceListener.h
+include/${MOZILLA}/msgbase/nsIMsgCustomColumnHandler.h
 include/${MOZILLA}/msgbase/nsIMsgDBView.h
 include/${MOZILLA}/msgbase/nsIMsgFilter.h
 include/${MOZILLA}/msgbase/nsIMsgFilterHitNotify.h
@@ -1780,9 +1766,11 @@ include/${MOZILLA}/msgbase/nsIMsgSearchValue.h
 include/${MOZILLA}/msgbase/nsIMsgSignature.h
 include/${MOZILLA}/msgbase/nsIMsgStatusFeedback.h
 include/${MOZILLA}/msgbase/nsIMsgStringService.h
+include/${MOZILLA}/msgbase/nsIMsgTagService.h
 include/${MOZILLA}/msgbase/nsIMsgThread.h
 include/${MOZILLA}/msgbase/nsIMsgWindow.h
 include/${MOZILLA}/msgbase/nsISpamSettings.h
+include/${MOZILLA}/msgbase/nsIStatusBarBiffManager.h
 include/${MOZILLA}/msgbase/nsISubscribableServer.h
 include/${MOZILLA}/msgbase/nsIUrlListener.h
 include/${MOZILLA}/msgbase/nsIUrlListenerManager.h
@@ -1796,6 +1784,7 @@ include/${MOZILLA}/msgbase/nsMsgAccountManagerDS.h
 include/${MOZILLA}/msgbase/nsMsgBaseCID.h
 include/${MOZILLA}/msgbase/nsMsgBiffManager.h
 include/${MOZILLA}/msgbase/nsMsgBodyHandler.h
+include/${MOZILLA}/msgbase/nsMsgContentPolicy.h
 include/${MOZILLA}/msgbase/nsMsgCopyService.h
 include/${MOZILLA}/msgbase/nsMsgFilterCore.h
 include/${MOZILLA}/msgbase/nsMsgFilterDataSource.h
@@ -2050,6 +2039,7 @@ include/${MOZILLA}/necko/nsIFileChannel.h
 include/${MOZILLA}/necko/nsIFileProtocolHandler.h
 include/${MOZILLA}/necko/nsIFileStreams.h
 include/${MOZILLA}/necko/nsIFileURL.h
+include/${MOZILLA}/necko/nsIHttpActivityObserver.h
 include/${MOZILLA}/necko/nsIHttpAuthManager.h
 include/${MOZILLA}/necko/nsIHttpAuthenticator.h
 include/${MOZILLA}/necko/nsIHttpChannel.h
@@ -2059,6 +2049,7 @@ include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
 include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
 include/${MOZILLA}/necko/nsIIDNService.h
 include/${MOZILLA}/necko/nsIIOService.h
+include/${MOZILLA}/necko/nsIIOService2.h
 include/${MOZILLA}/necko/nsIIncrementalDownload.h
 include/${MOZILLA}/necko/nsIInputStreamChannel.h
 include/${MOZILLA}/necko/nsIInputStreamPump.h
@@ -2066,6 +2057,7 @@ include/${MOZILLA}/necko/nsILoadGroup.h
 include/${MOZILLA}/necko/nsIMIMEInputStream.h
 include/${MOZILLA}/necko/nsIMultiPartChannel.h
 include/${MOZILLA}/necko/nsINetUtil.h
+include/${MOZILLA}/necko/nsINetworkLinkService.h
 include/${MOZILLA}/necko/nsIPasswordManager.h
 include/${MOZILLA}/necko/nsIPasswordManagerInternal.h
 include/${MOZILLA}/necko/nsIPermissionManager.h
@@ -2297,6 +2289,7 @@ include/${MOZILLA}/pipnss/nsIBadCertListener.h
 include/${MOZILLA}/pipnss/nsICMSDecoder.h
 include/${MOZILLA}/pipnss/nsICMSEncoder.h
 include/${MOZILLA}/pipnss/nsICMSMessage.h
+include/${MOZILLA}/pipnss/nsICMSMessage2.h
 include/${MOZILLA}/pipnss/nsICMSMessageErrors.h
 include/${MOZILLA}/pipnss/nsICMSSecureMessage.h
 include/${MOZILLA}/pipnss/nsICRLInfo.h
@@ -2310,6 +2303,7 @@ include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
 include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
 include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
 include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
+include/${MOZILLA}/pipnss/nsIKeyModule.h
 include/${MOZILLA}/pipnss/nsIKeygenThread.h
 include/${MOZILLA}/pipnss/nsINSSCertCache.h
 include/${MOZILLA}/pipnss/nsIOCSPResponder.h
@@ -2320,10 +2314,12 @@ include/${MOZILLA}/pipnss/nsIPKCS11ModuleDB.h
 include/${MOZILLA}/pipnss/nsIPKCS11Slot.h
 include/${MOZILLA}/pipnss/nsISMimeCert.h
 include/${MOZILLA}/pipnss/nsISSLStatus.h
+include/${MOZILLA}/pipnss/nsIStreamCipher.h
 include/${MOZILLA}/pipnss/nsITokenDialogs.h
 include/${MOZILLA}/pipnss/nsITokenPasswordDialogs.h
 include/${MOZILLA}/pipnss/nsIUserCertPicker.h
 include/${MOZILLA}/pipnss/nsIX509Cert.h
+include/${MOZILLA}/pipnss/nsIX509Cert3.h
 include/${MOZILLA}/pipnss/nsIX509CertDB.h
 include/${MOZILLA}/pipnss/nsIX509CertDB2.h
 include/${MOZILLA}/pipnss/nsIX509CertValidity.h
@@ -2426,12 +2422,12 @@ include/${MOZILLA}/shistory/nsISHTransaction.h
 include/${MOZILLA}/shistory/nsISHistory.h
 include/${MOZILLA}/shistory/nsISHistoryInternal.h
 include/${MOZILLA}/shistory/nsISHistoryListener.h
-include/${MOZILLA}/sidebar/nsISidebar.h
 include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
 include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
 include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
 include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
 include/${MOZILLA}/sqlite3/sqlite3.h
+include/${MOZILLA}/sqlite3/sqlite3file.h
 include/${MOZILLA}/storage/mozIStorageConnection.h
 include/${MOZILLA}/storage/mozIStorageDataSet.h
 include/${MOZILLA}/storage/mozIStorageFunction.h
@@ -2440,6 +2436,7 @@ include/${MOZILLA}/storage/mozIStorageStatement.h
 include/${MOZILLA}/storage/mozIStorageStatementWrapper.h
 include/${MOZILLA}/storage/mozIStorageValueArray.h
 include/${MOZILLA}/storage/mozStorageCID.h
+include/${MOZILLA}/storage/mozStorageHelper.h
 include/${MOZILLA}/string/nsAString.h
 include/${MOZILLA}/string/nsAlgorithm.h
 include/${MOZILLA}/string/nsCharTraits.h
@@ -2572,10 +2569,6 @@ include/${MOZILLA}/webbrwsr/nsIWebBrowserFocus.h
 include/${MOZILLA}/webbrwsr/nsIWebBrowserPrint.h
 include/${MOZILLA}/webbrwsr/nsIWebBrowserSetup.h
 include/${MOZILLA}/webbrwsr/nsIWebBrowserStream.h
-include/${MOZILLA}/webdav/nsIWebDAVListener.h
-include/${MOZILLA}/webdav/nsIWebDAVResource.h
-include/${MOZILLA}/webdav/nsIWebDAVService.h
-include/${MOZILLA}/webdav/nsWebDAVServiceCID.h
 include/${MOZILLA}/webshell/nsIClipboardCommands.h
 include/${MOZILLA}/webshell/nsIContentViewerContainer.h
 include/${MOZILLA}/webshell/nsIDocumentLoaderFactory.h
@@ -2670,9 +2663,18 @@ include/${MOZILLA}/windowwatcher/nsPIWindowWatcher.h
 include/${MOZILLA}/xml-rpc/nsIDictionary.h
 include/${MOZILLA}/xml-rpc/nsIXmlRpcClient.h
 include/${MOZILLA}/xml-rpc/nsIXmlRpcClientListener.h
-include/${MOZILLA}/xmlextras/nsIDOMParser.h
-include/${MOZILLA}/xmlextras/nsIDOMSerializer.h
-include/${MOZILLA}/xmlextras/nsIXMLHttpRequest.h
+include/${MOZILLA}/xml/nsISAXAttributes.h
+include/${MOZILLA}/xml/nsISAXContentHandler.h
+include/${MOZILLA}/xml/nsISAXDTDHandler.h
+include/${MOZILLA}/xml/nsISAXErrorHandler.h
+include/${MOZILLA}/xml/nsISAXLexicalHandler.h
+include/${MOZILLA}/xml/nsISAXLocator.h
+include/${MOZILLA}/xml/nsISAXMutableAttributes.h
+include/${MOZILLA}/xml/nsISAXXMLFilter.h
+include/${MOZILLA}/xml/nsISAXXMLReader.h
+include/${MOZILLA}/xml/nsSAXAttributes.h
+include/${MOZILLA}/xml/nsSAXLocator.h
+include/${MOZILLA}/xml/nsSAXXMLReader.h
 include/${MOZILLA}/xpcom/nsAgg.h
 include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
 include/${MOZILLA}/xpcom/nsArray.h
@@ -2685,6 +2687,7 @@ include/${MOZILLA}/xpcom/nsBaseHashtable.h
 include/${MOZILLA}/xpcom/nsCOMArray.h
 include/${MOZILLA}/xpcom/nsCOMPtr.h
 include/${MOZILLA}/xpcom/nsCRT.h
+include/${MOZILLA}/xpcom/nsCategoryCache.h
 include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
 include/${MOZILLA}/xpcom/nsCheapSets.h
 include/${MOZILLA}/xpcom/nsClassHashtable.h
@@ -2807,6 +2810,7 @@ include/${MOZILLA}/xpcom/nsITimer.h
 include/${MOZILLA}/xpcom/nsITimerInternal.h
 include/${MOZILLA}/xpcom/nsITimerManager.h
 include/${MOZILLA}/xpcom/nsITraceRefcnt.h
+include/${MOZILLA}/xpcom/nsIUUIDGenerator.h
 include/${MOZILLA}/xpcom/nsIUnicharBuffer.h
 include/${MOZILLA}/xpcom/nsIUnicharInputStream.h
 include/${MOZILLA}/xpcom/nsIUnicharLineInputStream.h
@@ -2849,6 +2853,7 @@ include/${MOZILLA}/xpcom/nsStringIO.h
 include/${MOZILLA}/xpcom/nsStringStream.h
 include/${MOZILLA}/xpcom/nsSupportsArray.h
 include/${MOZILLA}/xpcom/nsSupportsPrimitives.h
+include/${MOZILLA}/xpcom/nsTArray.h
 include/${MOZILLA}/xpcom/nsTHashtable.h
 include/${MOZILLA}/xpcom/nsTextFormatter.h
 include/${MOZILLA}/xpcom/nsTime.h
@@ -3037,8 +3042,6 @@ include/${MOZILLA}/nss/ssl.h
 include/${MOZILLA}/nss/sslerr.h
 include/${MOZILLA}/nss/sslproto.h
 include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/swfort.h
-include/${MOZILLA}/nss/swfortt.h
 include/${MOZILLA}/nss/watcomfx.h
 @comment end INCLUDE-PUBLIC
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
@@ -3061,6 +3064,7 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/greprefs
+@dirrm lib/${MOZILLA}/dictionaries
 @dirrm lib/${MOZILLA}/defaults/wallet
 @dirrm lib/${MOZILLA}/defaults/profile/chrome
 @dirrm lib/${MOZILLA}/defaults/profile/US/chrome
@@ -3073,7 +3077,6 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm lib/${MOZILLA}/defaults/isp
 @dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
-@dirrm lib/${MOZILLA}/components/myspell
 @dirrm lib/${MOZILLA}/components
 @dirrm lib/${MOZILLA}/chrome/icons/default
 @dirrm lib/${MOZILLA}/chrome/icons
@@ -3088,13 +3091,12 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm include/${MOZILLA}/xpconnect
 @dirrm include/${MOZILLA}/xpcom_obsolete
 @dirrm include/${MOZILLA}/xpcom
-@dirrm include/${MOZILLA}/xmlextras
 @dirrm include/${MOZILLA}/xml-rpc
+@dirrm include/${MOZILLA}/xml
 @dirrm include/${MOZILLA}/windowwatcher
 @dirrm include/${MOZILLA}/widget
 @dirrm include/${MOZILLA}/websrvcs
 @dirrm include/${MOZILLA}/webshell
-@dirrm include/${MOZILLA}/webdav
 @dirrm include/${MOZILLA}/webbrwsr
 @dirrm include/${MOZILLA}/webbrowserpersist
 @dirrm include/${MOZILLA}/walletviewers
@@ -3122,7 +3124,6 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm include/${MOZILLA}/storage
 @dirrm include/${MOZILLA}/sqlite3
 @dirrm include/${MOZILLA}/spellchecker
-@dirrm include/${MOZILLA}/sidebar
 @dirrm include/${MOZILLA}/shistory
 @dirrm include/${MOZILLA}/rdfutil
 @dirrm include/${MOZILLA}/rdf
@@ -3181,7 +3182,6 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm include/${MOZILLA}/import
 @dirrm include/${MOZILLA}/impComm4xMail
 @dirrm include/${MOZILLA}/imglib2
-@dirrm include/${MOZILLA}/ical
 @dirrm include/${MOZILLA}/htmlparser
 @dirrm include/${MOZILLA}/history
 @dirrm include/${MOZILLA}/gtkxtbin
@@ -3206,11 +3206,11 @@ include/${MOZILLA}/nss/watcomfx.h
 @dirrm include/${MOZILLA}/chrome
 @dirrm include/${MOZILLA}/chardet
 @dirrm include/${MOZILLA}/caps
-@dirrm include/${MOZILLA}/calbase
 @dirrm include/${MOZILLA}/cairo
 @dirrm include/${MOZILLA}/browser
 @dirrm include/${MOZILLA}/bayesflt
 @dirrm include/${MOZILLA}/autoconfig
+@dirrm include/${MOZILLA}/autocomplete
 @dirrm include/${MOZILLA}/appshell
 @dirrm include/${MOZILLA}/appcomps
 @dirrm include/${MOZILLA}/addrbook
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index bda8190cb2d..8f044102253 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2006/11/08 14:39:16 ghen Exp $
+$NetBSD: distinfo,v 1.15 2006/11/22 12:48:29 ghen Exp $
 
-SHA1 (seamonkey-1.0.6.source.tar.bz2) = 01c8de239518bfe778978062efd85b050380b5e3
-RMD160 (seamonkey-1.0.6.source.tar.bz2) = 61ba4a30c28d857f6f64649879ba12d64001c7a6
-Size (seamonkey-1.0.6.source.tar.bz2) = 35900661 bytes
+SHA1 (seamonkey-1.1b.source.tar.bz2) = 6f31030b7be8b9a9540f45aba34800ea3391edeb
+RMD160 (seamonkey-1.1b.source.tar.bz2) = 50c1dde177b02ac69549d19872ca520fd7c91554
+Size (seamonkey-1.1b.source.tar.bz2) = 34935770 bytes
 SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a
-SHA1 (patch-ab) = 4bcabb447ca151c5e87e8799398ee239e69f3f90
+SHA1 (patch-ab) = 28422e59d1d492880558544b7c82b26084d3ff9c
 SHA1 (patch-ac) = b05971f672c83c80a29edc69c2055fd6ca855fa1
 SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
@@ -17,11 +17,10 @@ SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32
 SHA1 (patch-al) = d916f38de2fa0ca1993ec75c457fccc60ee6d612
 SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
 SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
-SHA1 (patch-ap) = 856f74f774b4db7df9b4453aea4d849893ee6bf1
+SHA1 (patch-ap) = 0b676aa7e233d8d8aae117af031fa98cb33352ec
 SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43
-SHA1 (patch-at) = 1b541df50b9ed94613524d1d48ff98970d8f21dd
 SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e
-SHA1 (patch-ax) = b32483c5259cbe95202944683889bf20a7c1650e
+SHA1 (patch-ax) = ca016379ff2a5aeeaea03f1504e3ae2b96107aff
 SHA1 (patch-ba) = add9ecd6cff002525b2bc63aad7eb142e610b190
 SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6
 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab
index 7fa720dddd9..4992bfefd55 100644
--- a/www/seamonkey/patches/patch-ab
+++ b/www/seamonkey/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2006/11/22 12:48:29 ghen Exp $
 
---- configure.in.orig	2006-04-14 22:00:40.000000000 +0200
+--- configure.in.orig	2006-10-30 14:43:55.000000000 +0100
 +++ configure.in
-@@ -1399,7 +1399,6 @@ case "$target" in
+@@ -1433,7 +1433,6 @@ case "$target" in
      DSO_LDOPTS=''
      STRIP="$STRIP -x -S"
      _PLATFORM_DEFAULT_TOOLKIT='mac'
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
      TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      # set MACOSX to generate lib/mac/MoreFiles/Makefile
      MACOSX=1
-@@ -1418,7 +1418,7 @@ case "$target" in
+@@ -1452,7 +1451,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1432,6 +1431,9 @@ case "$target" in
+@@ -1466,6 +1465,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -29,30 +29,16 @@ $NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
      ;; 
  
  *-hpux*)
-@@ -1826,6 +1828,13 @@ case "$target" in
-     if test "$LIBRUNPATH"; then
- 	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-     fi
-+
-+    case "${target_cpu}" in
-+    alpha*)
-+    	CFLAGS="$CFLAGS -mieee"
-+    	CXXFLAGS="$CXXFLAGS -mieee"
-+    ;;
-+    esac
-     ;;
- 
- *-nto*) 
-@@ -2051,7 +2060,7 @@ dnl the qsort routine under solaris is f
-        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
+@@ -2136,7 +2138,7 @@ dnl the qsort routine under solaris is f
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
--       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
-+       DSO_LDOPTS='-G -z muldefs -h $@'
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs'
++       DSO_LDOPTS='-G -z muldefs'
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -5279,7 +5288,7 @@ dnl ====================================
+@@ -5637,7 +5639,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff --git a/www/seamonkey/patches/patch-ap b/www/seamonkey/patches/patch-ap
index 6b533f0d324..792776febeb 100644
--- a/www/seamonkey/patches/patch-ap
+++ b/www/seamonkey/patches/patch-ap
@@ -1,11 +1,11 @@
-$NetBSD: patch-ap,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
+$NetBSD: patch-ap,v 1.2 2006/11/22 12:48:29 ghen Exp $
 
---- security/coreconf/command.mk.orig	2004-04-25 17:02:17.000000000 +0200
+--- security/coreconf/command.mk.orig	2006-02-03 23:26:36.000000000 +0100
 +++ security/coreconf/command.mk
-@@ -46,7 +46,7 @@ CCF           = $(CC) $(CFLAGS)
+@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
+ CCF           = $(CC) $(CFLAGS)
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
- NFSPWD        = $(NSINSTALL_DIR)/nfspwd
 -CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 +CFLAGS       += $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
  		$(XCFLAGS)
diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at
deleted file mode 100644
index 864d6b219dd..00000000000
--- a/www/seamonkey/patches/patch-at
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/10/23 10:49:34 markd Exp $
-
---- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig	2006-05-25 11:38:04.000000000 +1200
-+++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c
-@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s
-      * Set up address and open a TCP socket:
-      */
-     if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */
--		PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) { 
-+		PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) { 
- 	return( -1 );
-     }
- 
-     if (( prsockp->prsock_prfd = PR_OpenTCPSocket(
--		PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) {
-+		PR_NetAddrFamily( addrp ))) == NULL ) {
- 	return( -1 );
-     }
- 
-@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in
- 
- 	if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) {
- 		
--		if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
-+		/*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
- 				PR_AF_INET == PR_NetAddrFamily( &addr )) {
- 			PRUint32	ipv4ip = addr.inet.ip;
- 			memset( &addr, 0, sizeof(addr));
- 			PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip );
- 			addr.ipv6.family = PR_AF_INET6;
- 			
--		}
-+		}*/
- 	    rc = prldap_try_one_address( prsockp, &addr, port,
- 			timeout, options );
- 	} else {
diff --git a/www/seamonkey/patches/patch-ax b/www/seamonkey/patches/patch-ax
index 654ab7920f4..f27619cd4ec 100644
--- a/www/seamonkey/patches/patch-ax
+++ b/www/seamonkey/patches/patch-ax
@@ -1,10 +1,10 @@
-$NetBSD: patch-ax,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
+$NetBSD: patch-ax,v 1.2 2006/11/22 12:48:30 ghen Exp $
 
---- security/coreconf/SunOS5.mk.orig	2004-10-11 04:15:42.000000000 +0200
+--- security/coreconf/SunOS5.mk.orig	2006-02-03 23:26:36.000000000 +0100
 +++ security/coreconf/SunOS5.mk
-@@ -182,6 +182,10 @@ endif
- 	DSO_LDOPTS += -G -h $(notdir $@)
+@@ -176,6 +176,10 @@ endif
  endif
+ DSO_LDOPTS += -z combreloc -z defs -z ignore
  
 +ifdef LIBRUNPATH
 +DSO_LDOPTS += -R$(LIBRUNPATH)