[pkgsrc/trunk]: pkgsrc/www/seamonkey Resolve conflicts. I should have cvs ad...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/seamonkey Resolve conflicts. I should have cvs ad...
From: ghen <ghen%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:15:43 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e284ad76a8d
branches:  trunk
changeset: 521803:7e284ad76a8d
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Nov 22 12:48:29 2006 +0000

description:
Resolve conflicts.  I should have cvs add'ed this instead of cvs import'ing, as
wip/seamonkey has already existed in pkgsrc-wip.

diffstat:

 www/seamonkey/DESCR                     |    5 +
 www/seamonkey/Makefile                  |    4 +-
 www/seamonkey/Makefile-seamonkey.common |   13 +-
 www/seamonkey/PLIST                     |  150 ++++++++++++++++----------------
 www/seamonkey/distinfo                  |   15 +-
 www/seamonkey/patches/patch-ab          |   34 ++-----
 www/seamonkey/patches/patch-ap          |    8 +-
 www/seamonkey/patches/patch-at          |   36 -------
 www/seamonkey/patches/patch-ax          |    8 +-
 9 files changed, 113 insertions(+), 160 deletions(-)

diffs (truncated from 834 to 300 lines):

diff -r 316c8d64589a -r 7e284ad76a8d www/seamonkey/DESCR
--- a/www/seamonkey/DESCR       Wed Nov 22 11:56:14 2006 +0000
+++ b/www/seamonkey/DESCR       Wed Nov 22 12:48:29 2006 +0000
@@ -5,3 +5,8 @@
 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 -r 316c8d64589a -r 7e284ad76a8d www/seamonkey/Makefile
--- a/www/seamonkey/Makefile    Wed Nov 22 11:56:14 2006 +0000
+++ b/www/seamonkey/Makefile    Wed Nov 22 12:48:29 2006 +0000
@@ -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 @@
 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 -r 316c8d64589a -r 7e284ad76a8d www/seamonkey/Makefile-seamonkey.common
--- a/www/seamonkey/Makefile-seamonkey.common   Wed Nov 22 11:56:14 2006 +0000
+++ b/www/seamonkey/Makefile-seamonkey.common   Wed Nov 22 12:48:29 2006 +0000
@@ -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 @@
 CATEGORIES=            www
 
 MAINTAINER=            ghen%NetBSD.org@localhost
-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 -r 316c8d64589a -r 7e284ad76a8d www/seamonkey/PLIST
--- a/www/seamonkey/PLIST       Wed Nov 22 11:56:14 2006 +0000
+++ b/www/seamonkey/PLIST       Wed Nov 22 12:48:29 2006 +0000
@@ -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/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/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/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/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}/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/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/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_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/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/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/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/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/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-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/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/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/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/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}/docshell/nsCDefaultURIFixup.h
 include/${MOZILLA}/docshell/nsCDocShell.h
 include/${MOZILLA}/docshell/nsDocShellCID.h
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated chat/bsflite to 0.82.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated editors/vim-share to 7.0.162nb1.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated chat/bsflite to 0.82.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated editors/vim-share to 7.0.162nb1.
Indexes:
Home | Main Index | Thread Index | Old Index