Update to 1.0.rc1

Reviewed by:	sobomax
Approved by:	sobomax

6 files changed, 18 insertions, 136 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 3adb055a2613..90e14f7edd06 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.9
-PORTREVISION=	3
+PORTVERSION=	1.0.rc1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S,$,:local,}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src \
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
 			sobomax/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
-		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
+		libart_lgpl-0.9.9${EXTRACT_SUFX}:local
 
 MAINTAINER=	gnome@FreeBSD.org
 
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index c91e16ad7551..e3ed376e770d 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-0.9.9.tar.bz2) = ea8ec8580d8d71ad9ec33979550f01af
+MD5 (mozilla-source-1.0.rc1.tar.bz2) = 04d3126991bf273ef8e818feea7afaaa
 MD5 (libart_lgpl-0.9.9.tar.bz2) = 7570ce10e9a78284d1653e54557edbd5
diff --git a/www/mozilla/files/patch-gfx::src::x11shared::nsFreeType.cpp b/www/mozilla/files/patch-gfx::src::x11shared::nsFreeType.cpp
deleted file mode 100644
index 6a3b2827c5f3..000000000000
--- a/www/mozilla/files/patch-gfx::src::x11shared::nsFreeType.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- gfx/src/x11shared/nsFreeType.cpp.orig	Fri Mar  1 00:37:13 2002
-+++ gfx/src/x11shared/nsFreeType.cpp	Mon Mar 18 21:11:36 2002
-@@ -1340,12 +1340,20 @@
- nsFreeTypeFace *
- nsFreeTypeGetFaceID(nsFontCatalogEntry *aFce)
- {
--  // in this hash each ttc face has a unique key
--  nsCStringKey key(nsFT2FontCatalog::GetFamilyName(aFce));
-+  // We need to have separate keys for the different faces in a ttc file.
-+  // We append a slash and the face index to the file name to give us a 
-+  // unique key for each ttc face.
-+  nsCAutoString key_str(nsFT2FontCatalog::GetFileName(aFce));
-+  char buf[20];
-+  sprintf(buf, "/%d", nsFT2FontCatalog::GetFaceIndex(aFce));
-+  key_str.Append(buf);
-+  nsCStringKey key(key_str);
-   nsFreeTypeFace *face = (nsFreeTypeFace *)gFreeTypeFaces->Get(&key);
-   if (!face) {
-     face = new nsFreeTypeFace(aFce);
-     NS_ASSERTION(face, "memory error while creating nsFreeTypeFace");
-+    if (!face)
-+      return nsnull;
-     gFreeTypeFaces->Put(&key, face);
-   }
-   return face;
diff --git a/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.cpp b/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.cpp
deleted file mode 100644
index cb0b3638555f..000000000000
--- a/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
---- netwerk/base/src/nsSocketTransport.cpp.orig	Thu Feb  7 11:26:46 2002
-+++ netwerk/base/src/nsSocketTransport.cpp	Thu Mar 21 12:24:23 2002
-@@ -513,21 +513,8 @@
- 
-             // on connection failure, reuse next address if one exists
-             if (mStatus == NS_ERROR_CONNECTION_REFUSED) {
--                mNetAddress = mNetAddrList.GetNext(mNetAddress);
--                if (mNetAddress) {
--#if defined(PR_LOGGING)
--                    char buf[50];
--                    PR_NetAddrToString(mNetAddress, buf, sizeof(buf));
--                    LOG(("connection failed... trying %s\n", buf));
--#endif
--                    PR_Close(mSocketFD);
--                    mSocketFD = nsnull;
--
--                    // mask error status so we'll return to this state
--                    mStatus = NS_OK;
--
--                    // need to re-enter Process() asynchronously
--                    mService->AddToWorkQ(this);
-+                LOG(("connection failed [this=%x error=%x]\n", this, mStatus));
-+                if (TryNextAddress()) {
-                     done = PR_TRUE;
-                     continue;
-                 }
-@@ -545,6 +532,23 @@
-             LOG(("nsSocketTransport: Transport [host=%s:%d this=%x] is in Timeout state.\n",
-                 mHostName, mPort, this));
-             mStatus = NS_ERROR_NET_TIMEOUT;
-+
-+            // on timeout, reuse next address if one exists ... do this only
-+            // if we haven't already fired OnStartRequest.
-+            if (mReadRequest || mWriteRequest) {
-+                PRBool firedOnStart = PR_TRUE; // initial value doesn't matter
-+                if (mReadRequest)
-+                    firedOnStart = mReadRequest->IsInitialized();
-+                if (!firedOnStart && mWriteRequest)
-+                    firedOnStart = mWriteRequest->IsInitialized();
-+                if (!firedOnStart && TryNextAddress()) {
-+                    // a little bit of hackery here so we'll end up in the
-+                    // WaitConnect state...
-+                    mCurrentState = eSocketState_WaitConnect;
-+                    done = PR_TRUE;
-+                    continue;
-+                }
-+            }
-             break;
- 
-         default:
-@@ -591,6 +595,29 @@
-     if (mWriteRequest)
-         mWriteRequest->Cancel(status);
-     return NS_OK;
-+}
-+
-+PRBool
-+nsSocketTransport::TryNextAddress()
-+{
-+    mNetAddress = mNetAddrList.GetNext(mNetAddress);
-+    if (mNetAddress) {
-+#if defined(PR_LOGGING)
-+        char buf[64];
-+        PR_NetAddrToString(mNetAddress, buf, sizeof(buf));
-+        LOG(("  ...trying next address: %s\n", buf));
-+#endif
-+        PR_Close(mSocketFD);
-+        mSocketFD = nsnull;
-+
-+        // mask error status so we'll return to this state
-+        mStatus = NS_OK;
-+
-+        // need to re-enter Process() asynchronously
-+        mService->AddToWorkQ(this);
-+        return PR_TRUE;
-+    }
-+    return PR_FALSE;
- }
- 
- void
diff --git a/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.h b/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.h
deleted file mode 100644
index d86e5ebc814a..000000000000
--- a/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- netwerk/base/src/nsSocketTransport.h.orig	Sat Feb  2 11:45:25 2002
-+++ netwerk/base/src/nsSocketTransport.h	Thu Mar 21 12:24:26 2002
-@@ -208,6 +208,8 @@
-     nsresult doReadWrite(PRInt16 aSelectFlags);
-     nsresult doResolveHost();
- 
-+    PRBool TryNextAddress();
-+
-     void CompleteAsyncRead();
-     void CompleteAsyncWrite();
- 
-@@ -378,7 +380,7 @@
- 
-     void        SetSocket(PRFileDesc *aSock) { mSock = aSock; }
-     PRUint32    GetOffset() { return mOffset; }
--    void        SetOffset(PRUint32 o) { mOffset = o; }
-+    void        SetOffset(PRUint32 offset) { mOffset = offset; }
-     PRBool      GotWouldBlock() { return mError == PR_WOULD_BLOCK_ERROR; }
-     PRBool      GotError() { return mError != 0; }
-     PRErrorCode GetError() { return mError; }
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 7389061de9af..6986ca30fee5 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -68,7 +68,9 @@ lib/mozilla/components/dom_svg.xpt
 lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
+lib/mozilla/components/dom_xpath.xpt
 lib/mozilla/components/dom_xul.xpt
+lib/mozilla/components/downloadmanager.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
@@ -80,6 +82,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/htmlparser.xpt
 lib/mozilla/components/imglib2.xpt
+lib/mozilla/components/impComm4xMail.xpt
 lib/mozilla/components/import.xpt
 lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
@@ -90,7 +93,7 @@ lib/mozilla/components/jsdservice.xpt
 lib/mozilla/components/jsurl.xpt
 lib/mozilla/components/layout_base.xpt
 lib/mozilla/components/layout_xul.xpt
-lib/mozilla/components/layout_xul_outliner.xpt
+lib/mozilla/components/layout_xul_tree.xpt
 lib/mozilla/components/libabsyncsvc.so
 lib/mozilla/components/libaccessibility.so
 lib/mozilla/components/libaddrbook.so
@@ -121,6 +124,7 @@ lib/mozilla/components/libimglib2.so
 lib/mozilla/components/libimgmng.so
 lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
+lib/mozilla/components/libimpComm4xMail.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
 lib/mozilla/components/libinspector.so
@@ -142,6 +146,7 @@ lib/mozilla/components/libmozxfer.so
 lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
+lib/mozilla/components/libmsgmdn.so
 lib/mozilla/components/libmsgnews.so
 lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
@@ -187,6 +192,7 @@ lib/mozilla/components/libxremote_client.so
 lib/mozilla/components/libxremoteservice.so
 lib/mozilla/components/locale.xpt
 lib/mozilla/components/mailnews.xpt
+lib/mozilla/components/mdn-service.js
 lib/mozilla/components/mime.xpt
 lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
@@ -216,11 +222,13 @@ lib/mozilla/components/necko_socket.xpt
 lib/mozilla/components/necko_strconv.xpt
 lib/mozilla/components/necko_viewsource.xpt
 lib/mozilla/components/nsDictionary.js
+lib/mozilla/components/nsDownloadProgressListener.js
 lib/mozilla/components/nsFilePicker.js
 lib/mozilla/components/nsHelperAppDlg.js
 lib/mozilla/components/nsLDAPPrefsService.js
 lib/mozilla/components/nsProgressDialog.js
 lib/mozilla/components/nsProxyAutoConfig.js
+lib/mozilla/components/nsResetPref.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsUpdateNotifier.js
 lib/mozilla/components/nsXmlRpcClient.js
@@ -285,6 +293,7 @@ lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
 lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
+lib/mozilla/defaults/pref/mdn.js
 lib/mozilla/defaults/pref/security-prefs.js
 lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
@@ -319,10 +328,10 @@ lib/mozilla/libgtkembedmoz.so
 lib/mozilla/libgtksuperwin.so
 lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsj.so
-lib/mozilla/liblber40.so
-lib/mozilla/libldap40.so
+lib/mozilla/libldap50.so
 lib/mozilla/libmoz_art_lgpl.so
 lib/mozilla/libmozjs.so
+lib/mozilla/libmozz.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
 lib/mozilla/libnss3.so
@@ -330,6 +339,7 @@ lib/mozilla/libnssckbi.so
 lib/mozilla/libnullplugin.so
 lib/mozilla/libplc4.so
 lib/mozilla/libplds4.so
+lib/mozilla/libprldap50.so
 lib/mozilla/libsmime3.so
 lib/mozilla/libsoftokn3.so
 lib/mozilla/libssl3.so
@@ -347,6 +357,7 @@ lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/arrowd.gif
 lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml