aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/mozilla-devel/Makefile9
-rw-r--r--www/mozilla-devel/distinfo4
-rw-r--r--www/mozilla-devel/files/patch-ak18
-rw-r--r--www/mozilla-devel/files/patch-embedding::config::basebrowser-unix10
-rw-r--r--www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp26
-rw-r--r--www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties14
-rw-r--r--www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.cpp329
-rw-r--r--www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.h57
-rw-r--r--www/mozilla-devel/files/patch-nsprpub::configure50
-rw-r--r--www/mozilla-devel/files/patch-qt23
-rw-r--r--www/mozilla-devel/files/patch-security::coreconf::FreeBSD.mk47
-rw-r--r--www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp11
-rw-r--r--www/mozilla-devel/pkg-plist26
-rw-r--r--www/mozilla-embedded-devel/pkg-plist13
-rw-r--r--www/mozilla-embedded-vendor/pkg-plist13
-rw-r--r--www/mozilla-embedded/pkg-plist13
-rw-r--r--www/mozilla-headers-devel/pkg-plist85
-rw-r--r--www/mozilla-headers-vendor/pkg-plist85
-rw-r--r--www/mozilla-headers/pkg-plist85
-rw-r--r--www/mozilla-vendor/Makefile9
-rw-r--r--www/mozilla-vendor/distinfo4
-rw-r--r--www/mozilla-vendor/files/patch-ak18
-rw-r--r--www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix10
-rw-r--r--www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp26
-rw-r--r--www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties14
-rw-r--r--www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.cpp329
-rw-r--r--www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.h57
-rw-r--r--www/mozilla-vendor/files/patch-nsprpub::configure50
-rw-r--r--www/mozilla-vendor/files/patch-qt23
-rw-r--r--www/mozilla-vendor/files/patch-security::coreconf::FreeBSD.mk47
-rw-r--r--www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp11
-rw-r--r--www/mozilla-vendor/pkg-plist26
-rw-r--r--www/mozilla/Makefile9
-rw-r--r--www/mozilla/distinfo4
-rw-r--r--www/mozilla/files/patch-ak18
-rw-r--r--www/mozilla/files/patch-embedding::config::basebrowser-unix10
-rw-r--r--www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp26
-rw-r--r--www/mozilla/files/patch-intl::uconv::src::unixcharset.properties14
-rw-r--r--www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.cpp329
-rw-r--r--www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.h57
-rw-r--r--www/mozilla/files/patch-nsprpub::configure50
-rw-r--r--www/mozilla/files/patch-qt23
-rw-r--r--www/mozilla/files/patch-security::coreconf::FreeBSD.mk47
-rw-r--r--www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp11
-rw-r--r--www/mozilla/pkg-plist26
-rw-r--r--www/seamonkey/Makefile9
-rw-r--r--www/seamonkey/distinfo4
-rw-r--r--www/seamonkey/files/patch-ak18
-rw-r--r--www/seamonkey/files/patch-embedding::config::basebrowser-unix10
-rw-r--r--www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp26
-rw-r--r--www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties14
-rw-r--r--www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.cpp329
-rw-r--r--www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.h57
-rw-r--r--www/seamonkey/files/patch-nsprpub::configure50
-rw-r--r--www/seamonkey/files/patch-qt23
-rw-r--r--www/seamonkey/files/patch-security::coreconf::FreeBSD.mk47
-rw-r--r--www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp11
-rw-r--r--www/seamonkey/pkg-plist26
-rw-r--r--www/seamonkey2/Makefile9
-rw-r--r--www/seamonkey2/distinfo4
-rw-r--r--www/seamonkey2/files/patch-ak18
-rw-r--r--www/seamonkey2/files/patch-embedding::config::basebrowser-unix10
-rw-r--r--www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp26
-rw-r--r--www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties14
-rw-r--r--www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.cpp329
-rw-r--r--www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.h57
-rw-r--r--www/seamonkey2/files/patch-nsprpub::configure50
-rw-r--r--www/seamonkey2/files/patch-qt23
-rw-r--r--www/seamonkey2/files/patch-security::coreconf::FreeBSD.mk47
-rw-r--r--www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp11
-rw-r--r--www/seamonkey2/pkg-plist26
71 files changed, 501 insertions, 2913 deletions
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index d5a3d29ac1bd..828d49469eba 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mozilla
-PORTVERSION= 0.9.8
-PORTREVISION= 2
+PORTVERSION= 0.9.9
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -19,12 +18,14 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+ freetype.9:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 9139a7878c5f..c91e16ad7551 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-0.9.8.tar.bz2) = 17026a0dee5dd55932316dc93faa3fbb
-MD5 (libart_lgpl-0.9.8.tar.bz2) = dc954f8243a10cb68cf0e0bf598bf3ca
+MD5 (mozilla-source-0.9.9.tar.bz2) = ea8ec8580d8d71ad9ec33979550f01af
+MD5 (libart_lgpl-0.9.9.tar.bz2) = 7570ce10e9a78284d1653e54557edbd5
diff --git a/www/mozilla-devel/files/patch-ak b/www/mozilla-devel/files/patch-ak
deleted file mode 100644
index 5323d970afec..000000000000
--- a/www/mozilla-devel/files/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Jan 5 03:43:00 2002
-+++ nsprpub/pr/include/md/_freebsd.h Tue Feb 5 11:14:27 2002
-@@ -87,6 +88,12 @@
-
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-+
-+#if __FreeBSD_version >= 400014
-+#define _PR_INET6
-+#define _PR_HAVE_GETHOSTBYNAME2
-+#define _PR_INET6_PROBE
-+#endif
-
- #define USE_SETJMP
-
diff --git a/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
index bd9b0b8bc67c..5eae8879b0ca 100644
--- a/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
+++ b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
@@ -1,17 +1,17 @@
$FreeBSD$
---- embedding/config/basebrowser-unix.orig Wed Nov 21 00:21:59 2001
-+++ embedding/config/basebrowser-unix Tue Jan 15 15:26:55 2002
+--- embedding/config/basebrowser-unix.orig Thu Feb 7 23:50:19 2002
++++ embedding/config/basebrowser-unix Tue Mar 12 17:06:08 2002
@@ -119,6 +119,7 @@
; layout
components/libgkcontent.so
-+libmoz_art_lgpl.so
++libmoz_art_lgpl.so
+ res/dtd/*
components/libgklayout.so
components/libhtmlpars.so
- components/libgkview.so
-@@ -196,12 +197,12 @@
+@@ -203,12 +204,12 @@
components/unicharutil.xpt
components/libchardet.so
; optional - on english only systems
diff --git a/www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp b/www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp
deleted file mode 100644
index 24608f0b4c99..000000000000
--- a/www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- extensions/transformiix/source/base/Double.cpp.orig Sat Nov 24 00:36:13 2001
-+++ extensions/transformiix/source/base/Double.cpp Tue Dec 25 15:19:42 2001
-@@ -41,7 +41,7 @@
- #endif
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
- #ifndef TX_EXE
- #include "prdtoa.h"
-@@ -56,7 +56,11 @@
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
-+#ifdef __alpha__
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-+#else
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties b/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties
deleted file mode 100644
index 6cd5dcdeed9e..000000000000
--- a/www/mozilla-devel/files/patch-intl::uconv::src::unixcharset.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- intl/uconv/src/unixcharset.properties.orig Wed Jan 9 04:13:10 2002
-+++ intl/uconv/src/unixcharset.properties Tue Feb 5 11:19:41 2002
-@@ -235,6 +235,8 @@
- locale.all.ru_SU.ISO_8859-5=ISO-8859-5
- # FreeBSD Russian
- locale.all.ru_SU.KOI8-R=KOI8-R
-+# FreeBSD Ukrainian
-+locale.all.uk_UA.KOI8-U=KOI8-U
- # Solaris
- locale.all.en_US.UTF-8=UTF-8
- # Solaris
diff --git a/www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.cpp b/www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.cpp
deleted file mode 100644
index c9adc8584c7d..000000000000
--- a/www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
---- netwerk/base/src/nsSocketTransport.cpp.orig Fri Feb 8 11:20:08 2002
-+++ netwerk/base/src/nsSocketTransport.cpp Fri Feb 8 11:20:16 2002
-@@ -143,6 +143,7 @@
- mHostName(nsnull),
- mPort(-1),
- mMonitor(nsnull),
-+ mNetAddress(nsnull),
- mOperation(eSocketOperation_None),
- mProxyPort(-1),
- mProxyHost(nsnull),
-@@ -183,12 +184,6 @@
- SetWriteType(eSocketWrite_None);
-
- //
-- // Set up Internet defaults...
-- //
-- memset(&mNetAddress, 0, sizeof(mNetAddress));
-- PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
--
-- //
- // Initialize the global connect timeout value if necessary...
- //
- if (PR_INTERVAL_NO_WAIT == gConnectTimeout)
-@@ -415,6 +410,14 @@
-
- while (!done) {
- //
-+ // Check for failure on any socket requests
-+ //
-+ if (mReadRequest && mReadRequest->HasFailed())
-+ mReadRequest->GetStatus(&mStatus);
-+ else if (mWriteRequest && mWriteRequest->HasFailed())
-+ mWriteRequest->GetStatus(&mStatus);
-+
-+ //
- // If an error has occurred then move into the error state...
- //
- if (NS_FAILED(mStatus) && (NS_BASE_STREAM_WOULD_BLOCK != mStatus))
-@@ -495,17 +498,40 @@
- // Send status message
- // only send a status if doResolveHost is going to do some
- // resolution
-- if (mStatus != NS_OK)
-+ if (mStatus == NS_BASE_STREAM_WOULD_BLOCK)
- OnStatus_Locked(NS_NET_STATUS_RESOLVING_HOST);
- break;
-
- case eSocketState_WaitConnect:
- LOG(("nsSocketTransport: Transport [host=%s:%d this=%x] is in WaitConnect state.\n",
- mHostName, mPort, this));
-- mStatus = doConnection(aSelectFlags);
-
- // Send status message
- OnStatus_Locked(NS_NET_STATUS_CONNECTING_TO);
-+
-+ mStatus = doConnection(aSelectFlags);
-+
-+ // 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);
-+ done = PR_TRUE;
-+ continue;
-+ }
-+ }
- break;
-
- case eSocketState_WaitReadWrite:
-@@ -633,21 +659,19 @@
-
- NS_ASSERTION(eSocketState_WaitDNS == mCurrentState, "Wrong state.");
-
-- LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d this=%x].\n",
-+ LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d %x].\n",
- mHostName, mPort, this));
-
-+ //
-+ // The hostname is being resolved...
-+ //
-+ if (mDNSRequest)
-+ return NS_BASE_STREAM_WOULD_BLOCK;
-+
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-- //
-- // Initialize the port used for the connection...
-- //
-- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
-- // mozilla/network/main/mkconect.c
-- //
-- mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
--
-+ if (mNetAddress == nsnull) {
- PR_ExitMonitor(mMonitor);
-
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
-@@ -659,9 +683,7 @@
- // Give up the SocketTransport lock. This allows the DNS thread to call the
- // nsIDNSListener notifications without blocking...
- //
-- rv = pDNSService->Lookup((mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName,
-- this,
-- nsnull,
-+ rv = pDNSService->Lookup(GetSocketHost(), this, nsnull,
- getter_AddRefs(mDNSRequest));
- //
- // Aquire the SocketTransport lock again...
-@@ -672,7 +694,7 @@
- //
- // The DNS lookup has finished... It has either failed or succeeded.
- //
-- if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (NS_FAILED(mStatus) || mNetAddress) {
- mDNSRequest = 0;
- rv = mStatus;
- }
-@@ -687,10 +709,8 @@
- }
- }
-
-- LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x].\t"
-- "rv = %x.\n\n",
-+ LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x] rv = %x\n",
- mHostName, mPort, this, rv));
--
- return rv;
- }
-
-@@ -832,7 +852,7 @@
- // This is only done the first time doConnection(...) is called.
- //
- if (NS_SUCCEEDED(rv)) {
-- status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
-+ status = PR_Connect(mSocketFD, mNetAddress, gConnectTimeout);
- if (PR_SUCCESS != status) {
- PRErrorCode code = PR_GetError();
- //
-@@ -932,14 +952,17 @@
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddress == nsnull) {
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
- if (!pDNSService) {
- return NS_ERROR_UNEXPECTED;
- }
-
- nsXPIDLCString result;
-- const char *host = (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName;
-+ const char *host = GetSocketHost();
-+
-+ // XXX DNS service does not provide a synchronous resolver that returns
-+ // the entire nsHostEnt struct.
- rv = pDNSService->Resolve(host, getter_Copies(result));
- if (NS_FAILED(rv)) return rv;
-
-@@ -953,16 +976,18 @@
- return NS_ERROR_FAILURE;
- }
-
-+ mNetAddrList.Init(1);
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), mNetAddress);
-+
- if (addr.raw.family == PR_AF_INET)
-- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress->ipv6.ip);
- else
-- memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
--
-- mNetAddress.ipv6.port
-- = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+ memcpy(&mNetAddress->ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress->ipv6.ip));
-
- LOG(("address { family=%hu, port=%hu }\n",
-- mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+ mNetAddress->ipv6.family, PR_ntohs(mNetAddress->ipv6.port)));
- }
-
- //
-@@ -1036,7 +1061,6 @@
- if (mReadRequest) {
- if (mReadRequest->IsCanceled() || (mBytesExpected == 0)) {
- LOG(("nsSocketTransport: [this=%x] completing read request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_READ;
- mReadRequest->GetStatus(&readStatus);
- CompleteAsyncRead();
- if (NS_FAILED(readStatus))
-@@ -1078,7 +1102,6 @@
- if (mWriteRequest) {
- if (mWriteRequest->IsCanceled()) {
- LOG(("nsSocketTransport: [this=%x] completing write request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_WRITE;
- mWriteRequest->GetStatus(&writeStatus);
- CompleteAsyncWrite();
- if (NS_FAILED(writeStatus))
-@@ -1485,23 +1508,44 @@
- nsAutoMonitor mon(mMonitor);
- nsresult rv = NS_OK;
-
-- if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
-- if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-- memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
-- else
-- PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
-+ char **addrList = aHostEnt->hostEnt.h_addr_list;
-+
-+ if (addrList && addrList[0]) {
-+ PRUint32 len = 0;
-+
-+ LOG(("nsSocketTransport::OnFound [%s:%d %x] lookup succeeded [FQDN=%s]\n",
-+ mHostName, mPort, this, aHostEnt->hostEnt.h_name));
-+
-+ // determine the number of address in the list
-+ for (; *addrList; ++addrList)
-+ ++len;
-+ addrList -= len;
-+
-+ // allocate space for the addresses
-+ mNetAddrList.Init(len);
-+
-+ // populate the address list
-+ PRNetAddr *addr = nsnull;
-+ while ((addr = mNetAddrList.GetNext(addr)) != nsnull) {
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), addr);
-+ if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-+ memcpy(&addr->ipv6.ip, *addrList, sizeof(addr->ipv6.ip));
-+ else
-+ PR_ConvertIPv4AddrToIPv6(*(PRUint32 *)(*addrList), &addr->ipv6.ip);
-+ ++addrList;
- #if defined(PR_LOGGING)
-- char addrbuf[50];
-- PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
-- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-- " DNS lookup succeeded => %s (%s)\n",
-- mHostName, mPort, this,
-- aHostEnt->hostEnt.h_name,
-- addrbuf));
-+ char buf[50];
-+ PR_NetAddrToString(addr, buf, sizeof(buf));
-+ LOG((" => %s\n", buf));
- #endif
-- } else {
-- // XXX: What should happen here? The GetHostByName(...) succeeded but
-- // there are *no* A records...
-+ }
-+
-+ // start with first address in list
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+ }
-+ else {
-+ // XXX: What should happen here? The DNS lookup succeeded, but there
-+ // are no address records...
- rv = NS_ERROR_FAILURE;
-
- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-@@ -1531,7 +1575,7 @@
- // If the lookup failed, set the status...
- if (NS_FAILED(aStatus))
- mStatus = aStatus;
-- else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+ else if (mNetAddress == nsnull)
- mStatus = NS_ERROR_ABORT;
-
- // Start processing the transport again - if necessary...
-@@ -1852,7 +1896,7 @@
- *_retval = (char*)nsMemory::Alloc(aLen);
- if (!*_retval) return NS_ERROR_FAILURE;
-
-- PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+ PRStatus status = PR_NetAddrToString(mNetAddress, *_retval, aLen);
-
- if (PR_FAILURE == status) {
- nsMemory::Free(*_retval);
-@@ -1968,6 +2012,37 @@
-
- if (--mSocketRef == 0)
- CloseConnection();
-+}
-+
-+//
-+//----------------------------------------------------------------------------
-+// nsSocketTransport::nsNetAddrList
-+//----------------------------------------------------------------------------
-+//
-+
-+nsresult nsSocketTransport::
-+nsNetAddrList::Init(PRUint32 len)
-+{
-+ NS_ASSERTION(!mList, "already initialized");
-+ mList = new PRNetAddr[len];
-+ if (!mList)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+ mLen = len;
-+ return NS_OK;
-+}
-+
-+PRNetAddr *nsSocketTransport::
-+nsNetAddrList::GetNext(PRNetAddr *addr)
-+{
-+ if (!addr)
-+ return mList;
-+
-+ PRUint32 offset = addr - mList;
-+ NS_ASSERTION(offset < mLen, "invalid address");
-+ if (offset + 1 < mLen)
-+ return addr + 1;
-+
-+ return nsnull;
- }
-
- //
diff --git a/www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.h b/www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.h
deleted file mode 100644
index ed73e127f901..000000000000
--- a/www/mozilla-devel/files/patch-netwerk::base::src::nsSocketTransport.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- netwerk/base/src/nsSocketTransport.h.orig Fri Feb 8 11:20:24 2002
-+++ netwerk/base/src/nsSocketTransport.h Fri Feb 8 11:20:29 2002
-@@ -176,7 +176,7 @@
- PRFileDesc* GetSocket(void) { return mSocketFD; }
- PRInt16 GetSelectFlags(void) { return mSelectFlags; }
- PRCList* GetListNode(void) { return &mListLink; }
--
-+
- static nsSocketTransport* GetInstance(PRCList* qp) { return (nsSocketTransport*)((char*)qp - offsetof(nsSocketTransport, mListLink)); }
-
- PRBool CanBeReused() { return
-@@ -237,8 +237,27 @@
- inline void ClearFlag(nsSocketReadWriteInfo aFlag) {
- mReadWriteState &= ~aFlag;
- }
-+
-+ PRInt32 GetSocketPort(void) { return (mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort; }
-+ const char *GetSocketHost(void) { return (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName; }
-
- protected:
-+ class nsNetAddrList {
-+ public:
-+ nsNetAddrList() : mList(nsnull), mLen(0) {}
-+ ~nsNetAddrList() { delete[] mList; }
-+
-+ // allocate space for the address list
-+ nsresult Init(PRUint32 len);
-+
-+ // given a net addr in the list, return the next addr.
-+ // if given NULL, then return the first addr in the list.
-+ // returns NULL if given addr is the last addr.
-+ PRNetAddr *GetNext(PRNetAddr *currentAddr);
-+ private:
-+ PRNetAddr *mList;
-+ PRUint32 mLen;
-+ };
-
- nsSocketState mCurrentState;
- nsCOMPtr<nsIRequest> mDNSRequest;
-@@ -249,7 +268,8 @@
- PRIntervalTime mLastActiveTime;
- PRCList mListLink;
- PRMonitor* mMonitor;
-- PRNetAddr mNetAddress;
-+ nsNetAddrList mNetAddrList;
-+ PRNetAddr *mNetAddress;
- nsSocketOperation mOperation;
- nsCOMPtr<nsISupports> mSecurityInfo;
-
-@@ -415,6 +435,7 @@
- PRBool IsInitialized() { return mStartFired; }
- PRBool IsSuspended() { return mSuspendCount > 0; }
- PRBool IsCanceled() { return mCanceled; }
-+ PRBool HasFailed() { return NS_FAILED(mStatus); }
-
- void SetTransport(nsSocketTransport *);
- void SetObserver(nsIRequestObserver *obs) { mObserver = obs; }
diff --git a/www/mozilla-devel/files/patch-nsprpub::configure b/www/mozilla-devel/files/patch-nsprpub::configure
deleted file mode 100644
index b008097bf949..000000000000
--- a/www/mozilla-devel/files/patch-nsprpub::configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- nsprpub/configure.orig Tue Jan 22 23:57:37 2002
-+++ nsprpub/configure Thu Feb 14 01:13:13 2002
-@@ -3288,8 +3288,9 @@
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- MDCPUCFG_H=_freebsd.cfg
- PR_MD_CSRCS=freebsd.c
- ;;
-@@ -5091,8 +5092,15 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -5123,11 +5131,17 @@
- ;;
- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
- cat >> confdefs.h <<\EOF
-+#define _REENTRANT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
- EOF
-
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-- _PTHREAD_LDFLAGS=
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
- *-linux*)
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index 05596784fcfe..660fc6e5b88a 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,11 +1,11 @@
$FreeBSD$
---- configure.orig Wed Dec 12 10:12:41 2001
-+++ configure Tue Dec 25 15:21:43 2001
-@@ -6186,6 +6186,9 @@
- os2*)
- LIBS=
+--- configure.orig Thu Mar 7 07:56:55 2002
++++ configure Tue Mar 12 17:15:06 2002
+@@ -6279,6 +6279,9 @@
+ # for stuff like -lXshm
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
@@ -13,16 +13,7 @@ $FreeBSD$
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
-@@ -7357,8 +7360,6 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
- fi
- fi
- rm -f conftest*
-@@ -7392,7 +7393,7 @@
+@@ -7512,7 +7515,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,7 +22,7 @@ $FreeBSD$
else
_PTHREAD_LDFLAGS="-lc_r"
fi
-@@ -9839,7 +9840,7 @@
+@@ -9954,7 +9957,7 @@
fi
MOC=$HOST_MOC
diff --git a/www/mozilla-devel/files/patch-security::coreconf::FreeBSD.mk b/www/mozilla-devel/files/patch-security::coreconf::FreeBSD.mk
index 1f33ac826a02..783d452b2896 100644
--- a/www/mozilla-devel/files/patch-security::coreconf::FreeBSD.mk
+++ b/www/mozilla-devel/files/patch-security::coreconf::FreeBSD.mk
@@ -1,6 +1,9 @@
---- security/coreconf/FreeBSD.mk.orig Tue Sep 19 05:53:08 2000
-+++ security/coreconf/FreeBSD.mk Thu Feb 14 14:19:02 2002
-@@ -35,27 +35,27 @@
+
+$FreeBSD$
+
+--- security/coreconf/FreeBSD.mk.orig Sat Mar 9 00:17:36 2002
++++ security/coreconf/FreeBSD.mk Tue Mar 12 17:19:15 2002
+@@ -35,9 +35,7 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -11,40 +14,12 @@
RANLIB = ranlib
ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
--OS_REL_CFLAGS = -Di386
- CPU_ARCH = x86
- endif
-
--OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-
- #
- # The default implementation strategy for FreeBSD is pthreads.
- #
- ifndef CLASSIC_NSPR
- USE_PTHREADS = 1
--DEFINES += -D_THREAD_SAFE
--THREAD_FLAG = -pthread
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+DSO_LDOPTS += -pthread
- endif
-
- ARCH = freebsd
-@@ -68,11 +68,7 @@
+@@ -70,7 +68,7 @@
DLL_SUFFIX = so.1.0
endif
--DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -Bshareable
--DSO_LDFLAGS =
--
--MKSHLIB = $(LD) $(DSO_LDOPTS)
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -o $@
-
- G++INCLUDES = -I/usr/include/g++
-
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp
deleted file mode 100644
index d1fec376adcf..000000000000
--- a/www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpfe/bootstrap/nsAppRunner.cpp.orig Mon Nov 26 16:53:29 2001
-+++ xpfe/bootstrap/nsAppRunner.cpp Mon Nov 26 16:54:12 2001
-@@ -1060,7 +1060,7 @@
-
- #if defined(FREEBSD)
- // pick up fpsetmask prototype.
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
-
- // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index 5a123b61a08d..c19f4c4cbf18 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -5,7 +5,6 @@ lib/mozilla/TestGtkEmbedNotebook
lib/mozilla/TestGtkEmbedSocket
lib/mozilla/bloaturls.txt
lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
lib/mozilla/chrome/chrome.rdf
lib/mozilla/chrome/chromelist.txt
lib/mozilla/chrome/classic.jar
@@ -41,10 +40,12 @@ lib/mozilla/components/autoconfig.xpt
lib/mozilla/components/bookmarks.xpt
lib/mozilla/components/caps.xpt
lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
lib/mozilla/components/chrome.xpt
+lib/mozilla/components/commandhandler.xpt
+lib/mozilla/components/composer.xpt
lib/mozilla/components/content.xpt
lib/mozilla/components/content_base.xpt
+lib/mozilla/components/content_html.xpt
lib/mozilla/components/content_xsl.xpt
lib/mozilla/components/cookie.xpt
lib/mozilla/components/directory.xpt
@@ -196,8 +197,10 @@ lib/mozilla/components/msgsmime.xpt
lib/mozilla/components/necko.xpt
lib/mozilla/components/necko_about.xpt
lib/mozilla/components/necko_cache.xpt
+lib/mozilla/components/necko_cookie.xpt
lib/mozilla/components/necko_data.xpt
lib/mozilla/components/necko_dns.xpt
+lib/mozilla/components/necko_file.xpt
lib/mozilla/components/necko_ftp.xpt
lib/mozilla/components/necko_http.xpt
lib/mozilla/components/necko_jar.xpt
@@ -209,8 +212,10 @@ lib/mozilla/components/nsDictionary.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/nsSidebar.js
+lib/mozilla/components/nsUpdateNotifier.js
lib/mozilla/components/nsXmlRpcClient.js
lib/mozilla/components/oji.xpt
lib/mozilla/components/pipboot.xpt
@@ -220,6 +225,7 @@ lib/mozilla/components/plugin.xpt
lib/mozilla/components/pref.xpt
lib/mozilla/components/prefmigr.xpt
lib/mozilla/components/profile.xpt
+lib/mozilla/components/progressDlg.xpt
lib/mozilla/components/proxyObjInst.xpt
lib/mozilla/components/rdf.xpt
lib/mozilla/components/regviewer.xpt
@@ -229,6 +235,7 @@ lib/mozilla/components/shistory.xpt
lib/mozilla/components/sidebar.xpt
lib/mozilla/components/signonviewer.xpt
lib/mozilla/components/smime-service.js
+lib/mozilla/components/timebomb.xpt
lib/mozilla/components/transformiix.xpt
lib/mozilla/components/txmgr.xpt
lib/mozilla/components/txtsvc.xpt
@@ -248,6 +255,8 @@ lib/mozilla/components/widget.xpt
lib/mozilla/components/windowwatcher.xpt
lib/mozilla/components/xml-rpc.xpt
lib/mozilla/components/xmlextras.xpt
+lib/mozilla/components/xmlschema.xpt
+lib/mozilla/components/xmlsoap.xpt
lib/mozilla/components/xpcom_base.xpt
lib/mozilla/components/xpcom_components.xpt
lib/mozilla/components/xpcom_ds.xpt
@@ -293,8 +302,6 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
lib/mozilla/defaults/wallet/StateSchema.tbl
lib/mozilla/defaults/wallet/VcardSchema.tbl
lib/mozilla/dirver
-lib/mozilla/dtd/mathml.dtd
-lib/mozilla/dtd/svg.dtd
lib/mozilla/icons/mozicon16.xpm
lib/mozilla/icons/mozicon50.xpm
lib/mozilla/libgkgfx.so
@@ -308,10 +315,14 @@ lib/mozilla/libmoz_art_lgpl.so
lib/mozilla/libmozjs.so
lib/mozilla/libmsgbaseutil.so
lib/mozilla/libnspr4.so
+lib/mozilla/libnss3.so
lib/mozilla/libnssckbi.so
lib/mozilla/libnullplugin.so
lib/mozilla/libplc4.so
lib/mozilla/libplds4.so
+lib/mozilla/libsmime3.so
+lib/mozilla/libsoftokn3.so
+lib/mozilla/libssl3.so
lib/mozilla/libxlibrgb.so
lib/mozilla/libxpcom.so
lib/mozilla/libxpistub.so
@@ -333,6 +344,9 @@ lib/mozilla/res/builtin/xbl-forms.css
lib/mozilla/res/charsetData.properties
lib/mozilla/res/charsetalias.properties
lib/mozilla/res/cmessage.txt
+lib/mozilla/res/dtd/mathml.dtd
+lib/mozilla/res/dtd/svg.dtd
+lib/mozilla/res/dtd/xhtml11.dtd
lib/mozilla/res/entityTables/html40Latin1.properties
lib/mozilla/res/entityTables/html40Special.properties
lib/mozilla/res/entityTables/html40Symbols.properties
@@ -357,6 +371,7 @@ lib/mozilla/res/html/gopher-find.gif
lib/mozilla/res/html/gopher-image.gif
lib/mozilla/res/html/gopher-menu.gif
lib/mozilla/res/html/gopher-movie.gif
+lib/mozilla/res/html/gopher-sound.gif
lib/mozilla/res/html/gopher-telnet.gif
lib/mozilla/res/html/gopher-text.gif
lib/mozilla/res/html/gopher-unknown.gif
@@ -500,6 +515,7 @@ lib/mozilla/searchplugins/lxrmozilla.gif
lib/mozilla/searchplugins/lxrmozilla.src
lib/mozilla/searchplugins/mozilla.gif
lib/mozilla/searchplugins/mozilla.src
+lib/mozilla/timebombgen
lib/mozilla/xpcshell
lib/mozilla/xpicleanup
lib/mozilla/xpidl
@@ -518,11 +534,11 @@ lib/mozilla/xpt_link
@dirrm lib/mozilla/res/gfx
@dirrm lib/mozilla/res/fonts
@dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/dtd
@dirrm lib/mozilla/res/builtin
@dirrm lib/mozilla/res
@dirrm lib/mozilla/plugins
@dirrm lib/mozilla/icons
-@dirrm lib/mozilla/dtd
@dirrm lib/mozilla/defaults/wallet
@dirrm lib/mozilla/defaults/profile/chrome
@dirrm lib/mozilla/defaults/profile/US/chrome
diff --git a/www/mozilla-embedded-devel/pkg-plist b/www/mozilla-embedded-devel/pkg-plist
index f4507fc2fab7..852f0b40a3f4 100644
--- a/www/mozilla-embedded-devel/pkg-plist
+++ b/www/mozilla-embedded-devel/pkg-plist
@@ -7,7 +7,6 @@ lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
lib/mozilla-embedded/chrome/pipnss.jar
lib/mozilla-embedded/chrome/pippki.jar
lib/mozilla-embedded/component.reg
-@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
lib/mozilla-embedded/components/appshell.xpt
lib/mozilla-embedded/components/caps.xpt
lib/mozilla-embedded/components/chrome.xpt
@@ -117,7 +116,6 @@ lib/mozilla-embedded/components/xpcom_threads.xpt
lib/mozilla-embedded/components/xpcom_xpti.xpt
lib/mozilla-embedded/components/xpconnect.xpt
lib/mozilla-embedded/components/xpti.dat
-@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
lib/mozilla-embedded/defaults/pref/all.js
lib/mozilla-embedded/defaults/pref/initpref.js
lib/mozilla-embedded/defaults/pref/security-prefs.js
@@ -128,9 +126,14 @@ lib/mozilla-embedded/libgtksuperwin.so
lib/mozilla-embedded/libmoz_art_lgpl.so
lib/mozilla-embedded/libmozjs.so
lib/mozilla-embedded/libnspr4.so
+lib/mozilla-embedded/libnss3.so
lib/mozilla-embedded/libplc4.so
lib/mozilla-embedded/libplds4.so
+lib/mozilla-embedded/libsmime3.so
+lib/mozilla-embedded/libsoftokn3.so
+lib/mozilla-embedded/libssl3.so
lib/mozilla-embedded/libxpcom.so
+lib/mozilla-embedded/readme.html
lib/mozilla-embedded/res/arrow.gif
lib/mozilla-embedded/res/broken-image.gif
lib/mozilla-embedded/res/builtin/htmlBindings.xml
@@ -138,6 +141,9 @@ lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
lib/mozilla-embedded/res/builtin/xbl-forms.css
lib/mozilla-embedded/res/charsetData.properties
lib/mozilla-embedded/res/charsetalias.properties
+lib/mozilla-embedded/res/dtd/mathml.dtd
+lib/mozilla-embedded/res/dtd/svg.dtd
+lib/mozilla-embedded/res/dtd/xhtml11.dtd
lib/mozilla-embedded/res/entityTables/html40Latin1.properties
lib/mozilla-embedded/res/entityTables/html40Special.properties
lib/mozilla-embedded/res/entityTables/html40Symbols.properties
@@ -153,7 +159,10 @@ lib/mozilla-embedded/res/ua.css
lib/mozilla-embedded/res/unixcharset.properties
lib/mozilla-embedded/res/viewsource.css
lib/mozilla-embedded/run-mozilla.sh
+@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
+@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
@dirrm lib/mozilla-embedded/res/entityTables
+@dirrm lib/mozilla-embedded/res/dtd
@dirrm lib/mozilla-embedded/res/builtin
@dirrm lib/mozilla-embedded/res
@dirrm lib/mozilla-embedded/defaults/pref
diff --git a/www/mozilla-embedded-vendor/pkg-plist b/www/mozilla-embedded-vendor/pkg-plist
index f4507fc2fab7..852f0b40a3f4 100644
--- a/www/mozilla-embedded-vendor/pkg-plist
+++ b/www/mozilla-embedded-vendor/pkg-plist
@@ -7,7 +7,6 @@ lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
lib/mozilla-embedded/chrome/pipnss.jar
lib/mozilla-embedded/chrome/pippki.jar
lib/mozilla-embedded/component.reg
-@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
lib/mozilla-embedded/components/appshell.xpt
lib/mozilla-embedded/components/caps.xpt
lib/mozilla-embedded/components/chrome.xpt
@@ -117,7 +116,6 @@ lib/mozilla-embedded/components/xpcom_threads.xpt
lib/mozilla-embedded/components/xpcom_xpti.xpt
lib/mozilla-embedded/components/xpconnect.xpt
lib/mozilla-embedded/components/xpti.dat
-@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
lib/mozilla-embedded/defaults/pref/all.js
lib/mozilla-embedded/defaults/pref/initpref.js
lib/mozilla-embedded/defaults/pref/security-prefs.js
@@ -128,9 +126,14 @@ lib/mozilla-embedded/libgtksuperwin.so
lib/mozilla-embedded/libmoz_art_lgpl.so
lib/mozilla-embedded/libmozjs.so
lib/mozilla-embedded/libnspr4.so
+lib/mozilla-embedded/libnss3.so
lib/mozilla-embedded/libplc4.so
lib/mozilla-embedded/libplds4.so
+lib/mozilla-embedded/libsmime3.so
+lib/mozilla-embedded/libsoftokn3.so
+lib/mozilla-embedded/libssl3.so
lib/mozilla-embedded/libxpcom.so
+lib/mozilla-embedded/readme.html
lib/mozilla-embedded/res/arrow.gif
lib/mozilla-embedded/res/broken-image.gif
lib/mozilla-embedded/res/builtin/htmlBindings.xml
@@ -138,6 +141,9 @@ lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
lib/mozilla-embedded/res/builtin/xbl-forms.css
lib/mozilla-embedded/res/charsetData.properties
lib/mozilla-embedded/res/charsetalias.properties
+lib/mozilla-embedded/res/dtd/mathml.dtd
+lib/mozilla-embedded/res/dtd/svg.dtd
+lib/mozilla-embedded/res/dtd/xhtml11.dtd
lib/mozilla-embedded/res/entityTables/html40Latin1.properties
lib/mozilla-embedded/res/entityTables/html40Special.properties
lib/mozilla-embedded/res/entityTables/html40Symbols.properties
@@ -153,7 +159,10 @@ lib/mozilla-embedded/res/ua.css
lib/mozilla-embedded/res/unixcharset.properties
lib/mozilla-embedded/res/viewsource.css
lib/mozilla-embedded/run-mozilla.sh
+@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
+@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
@dirrm lib/mozilla-embedded/res/entityTables
+@dirrm lib/mozilla-embedded/res/dtd
@dirrm lib/mozilla-embedded/res/builtin
@dirrm lib/mozilla-embedded/res
@dirrm lib/mozilla-embedded/defaults/pref
diff --git a/www/mozilla-embedded/pkg-plist b/www/mozilla-embedded/pkg-plist
index f4507fc2fab7..852f0b40a3f4 100644
--- a/www/mozilla-embedded/pkg-plist
+++ b/www/mozilla-embedded/pkg-plist
@@ -7,7 +7,6 @@ lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
lib/mozilla-embedded/chrome/pipnss.jar
lib/mozilla-embedded/chrome/pippki.jar
lib/mozilla-embedded/component.reg
-@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
lib/mozilla-embedded/components/appshell.xpt
lib/mozilla-embedded/components/caps.xpt
lib/mozilla-embedded/components/chrome.xpt
@@ -117,7 +116,6 @@ lib/mozilla-embedded/components/xpcom_threads.xpt
lib/mozilla-embedded/components/xpcom_xpti.xpt
lib/mozilla-embedded/components/xpconnect.xpt
lib/mozilla-embedded/components/xpti.dat
-@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
lib/mozilla-embedded/defaults/pref/all.js
lib/mozilla-embedded/defaults/pref/initpref.js
lib/mozilla-embedded/defaults/pref/security-prefs.js
@@ -128,9 +126,14 @@ lib/mozilla-embedded/libgtksuperwin.so
lib/mozilla-embedded/libmoz_art_lgpl.so
lib/mozilla-embedded/libmozjs.so
lib/mozilla-embedded/libnspr4.so
+lib/mozilla-embedded/libnss3.so
lib/mozilla-embedded/libplc4.so
lib/mozilla-embedded/libplds4.so
+lib/mozilla-embedded/libsmime3.so
+lib/mozilla-embedded/libsoftokn3.so
+lib/mozilla-embedded/libssl3.so
lib/mozilla-embedded/libxpcom.so
+lib/mozilla-embedded/readme.html
lib/mozilla-embedded/res/arrow.gif
lib/mozilla-embedded/res/broken-image.gif
lib/mozilla-embedded/res/builtin/htmlBindings.xml
@@ -138,6 +141,9 @@ lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
lib/mozilla-embedded/res/builtin/xbl-forms.css
lib/mozilla-embedded/res/charsetData.properties
lib/mozilla-embedded/res/charsetalias.properties
+lib/mozilla-embedded/res/dtd/mathml.dtd
+lib/mozilla-embedded/res/dtd/svg.dtd
+lib/mozilla-embedded/res/dtd/xhtml11.dtd
lib/mozilla-embedded/res/entityTables/html40Latin1.properties
lib/mozilla-embedded/res/entityTables/html40Special.properties
lib/mozilla-embedded/res/entityTables/html40Symbols.properties
@@ -153,7 +159,10 @@ lib/mozilla-embedded/res/ua.css
lib/mozilla-embedded/res/unixcharset.properties
lib/mozilla-embedded/res/viewsource.css
lib/mozilla-embedded/run-mozilla.sh
+@unexec rm -f %D/lib/mozilla-embedded/component.reg || true
+@unexec rm -f %D/lib/mozilla-embedded/components/xpti.dat || true
@dirrm lib/mozilla-embedded/res/entityTables
+@dirrm lib/mozilla-embedded/res/dtd
@dirrm lib/mozilla-embedded/res/builtin
@dirrm lib/mozilla-embedded/res
@dirrm lib/mozilla-embedded/defaults/pref
diff --git a/www/mozilla-headers-devel/pkg-plist b/www/mozilla-headers-devel/pkg-plist
index 1381b0ccd068..e04197eb318a 100644
--- a/www/mozilla-headers-devel/pkg-plist
+++ b/www/mozilla-headers-devel/pkg-plist
@@ -89,7 +89,9 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
include/mozilla/appcomps/nsIRelatedLinksHandler.h
include/mozilla/appcomps/nsISearchContext.h
include/mozilla/appcomps/nsISearchService.h
+include/mozilla/appcomps/nsITimeBomb.h
include/mozilla/appcomps/nsIUrlbarHistory.h
+include/mozilla/appcomps/nsTimeBomb.h
include/mozilla/appshell/nsAppShellCIDs.h
include/mozilla/appshell/nsIAppShellService.h
include/mozilla/appshell/nsICmdLineHandler.h
@@ -135,6 +137,13 @@ include/mozilla/chardet/nsIXMLEncodingService.h
include/mozilla/chardet/nsMetaCharsetCID.h
include/mozilla/chardet/nsXMLEncodingCID.h
include/mozilla/chrome/nsIChromeRegistry.h
+include/mozilla/commandhandler/nsICommandManager.h
+include/mozilla/commandhandler/nsICommandParams.h
+include/mozilla/commandhandler/nsIControllerCommand.h
+include/mozilla/commandhandler/nsIControllerCommandManager.h
+include/mozilla/commandhandler/nsPICommandUpdater.h
+include/mozilla/composer/nsIEditingSession.h
+include/mozilla/content/nsBidiUtils.h
include/mozilla/content/nsCSSAtomList.h
include/mozilla/content/nsCSSAtoms.h
include/mozilla/content/nsCSSDeclaration.h
@@ -174,17 +183,19 @@ include/mozilla/content/nsIContentIterator.h
include/mozilla/content/nsIContentList.h
include/mozilla/content/nsIContentPolicy.h
include/mozilla/content/nsIContentSerializer.h
-include/mozilla/content/nsIDiskDocument.h
include/mozilla/content/nsIDocument.h
include/mozilla/content/nsIDocumentContainer.h
include/mozilla/content/nsIDocumentEncoder.h
include/mozilla/content/nsIDocumentObserver.h
include/mozilla/content/nsIDocumentViewer.h
+include/mozilla/content/nsIDragDropHandler.h
+include/mozilla/content/nsIDragDropOverride.h
include/mozilla/content/nsIElementFactory.h
include/mozilla/content/nsIEventListenerManager.h
include/mozilla/content/nsIEventStateManager.h
include/mozilla/content/nsIForm.h
include/mozilla/content/nsIFormControl.h
+include/mozilla/content/nsIFormSubmission.h
include/mozilla/content/nsIHTMLAttributes.h
include/mozilla/content/nsIHTMLCSSStyleSheet.h
include/mozilla/content/nsIHTMLContentContainer.h
@@ -192,6 +203,7 @@ include/mozilla/content/nsIHTMLDocument.h
include/mozilla/content/nsIHTMLTableCellElement.h
include/mozilla/content/nsIHTMLTableColElement.h
include/mozilla/content/nsIHTMLToTextSink.h
+include/mozilla/content/nsIInspectorCSSUtils.h
include/mozilla/content/nsILink.h
include/mozilla/content/nsIMediaList.h
include/mozilla/content/nsINameSpace.h
@@ -227,6 +239,7 @@ include/mozilla/content/nsIStyleSheetLinkingElement.h
include/mozilla/content/nsIStyledContent.h
include/mozilla/content/nsITextContent.h
include/mozilla/content/nsITextControlElement.h
+include/mozilla/content/nsIWyciwygChannel.h
include/mozilla/content/nsIXBLBinding.h
include/mozilla/content/nsIXBLBindingAttachedHandler.h
include/mozilla/content/nsIXBLDocumentInfo.h
@@ -257,8 +270,8 @@ include/mozilla/content_xsl/nsIDocumentTransformer.h
include/mozilla/content_xsl/nsITransformMediator.h
include/mozilla/cookie/nsCookieHTTPNotify.h
include/mozilla/cookie/nsICookie.h
+include/mozilla/cookie/nsICookieConsent.h
include/mozilla/cookie/nsICookieManager.h
-include/mozilla/cookie/nsICookieService.h
include/mozilla/cookie/nsIImgManager.h
include/mozilla/cookie/nsIPermission.h
include/mozilla/cookie/nsIPermissionManager.h
@@ -271,12 +284,14 @@ include/mozilla/docshell/nsCDefaultURIFixup.h
include/mozilla/docshell/nsCDocShell.h
include/mozilla/docshell/nsIContentViewer.h
include/mozilla/docshell/nsIContentViewerEdit.h
+include/mozilla/docshell/nsIContentViewerFile.h
include/mozilla/docshell/nsIDocShell.h
include/mozilla/docshell/nsIDocShellHistory.h
include/mozilla/docshell/nsIDocShellLoadInfo.h
include/mozilla/docshell/nsIDocShellTreeItem.h
include/mozilla/docshell/nsIDocShellTreeNode.h
include/mozilla/docshell/nsIDocShellTreeOwner.h
+include/mozilla/docshell/nsIEditorDocShell.h
include/mozilla/docshell/nsIMarkupDocumentViewer.h
include/mozilla/docshell/nsIScrollable.h
include/mozilla/docshell/nsITextScroll.h
@@ -306,6 +321,7 @@ include/mozilla/dom/nsIDOMCSSStyleSheet.h
include/mozilla/dom/nsIDOMCSSUnknownRule.h
include/mozilla/dom/nsIDOMCSSValue.h
include/mozilla/dom/nsIDOMCharacterData.h
+include/mozilla/dom/nsIDOMChromeWindow.h
include/mozilla/dom/nsIDOMClassInfo.h
include/mozilla/dom/nsIDOMComment.h
include/mozilla/dom/nsIDOMCompositionListener.h
@@ -597,6 +613,7 @@ include/mozilla/gfx/nsIScreenManager.h
include/mozilla/gfx/nsIScriptableRegion.h
include/mozilla/gfx/nsITheme.h
include/mozilla/gfx/nsMargin.h
+include/mozilla/gfx/nsNameValuePairDB.h
include/mozilla/gfx/nsPoint.h
include/mozilla/gfx/nsPostScriptObj.h
include/mozilla/gfx/nsRect.h
@@ -605,6 +622,7 @@ include/mozilla/gfx/nsRepeater.h
include/mozilla/gfx/nsSize.h
include/mozilla/gfx/nsThemeConstants.h
include/mozilla/gfx/nsTransform2D.h
+include/mozilla/gfx/xprintutil.h
include/mozilla/gfx2/gfx2types.h
include/mozilla/gfx2/gfxIFormats.h
include/mozilla/gfx2/gfxIImageFrame.h
@@ -743,6 +761,7 @@ include/mozilla/jsdebug/jsdIDebuggerService.h
include/mozilla/jsdebug/jsdebug.h
include/mozilla/jsurl/nsIEvaluateStringProxy.h
include/mozilla/jsurl/nsJSProtocolHandler.h
+include/mozilla/layout/nsBidi.h
include/mozilla/layout/nsBidiFrames.h
include/mozilla/layout/nsBidiPresUtils.h
include/mozilla/layout/nsFrameList.h
@@ -950,12 +969,14 @@ include/mozilla/mimeemitter/nsMimeEmitterCID.h
include/mozilla/mimeemitter/nsMimeHtmlEmitter.h
include/mozilla/mimeemitter/nsMimeRawEmitter.h
include/mozilla/mimeemitter/nsMimeRebuffer.h
-include/mozilla/mimeemitter/nsMimeXULEmitter.h
include/mozilla/mimeemitter/nsMimeXmlEmitter.h
include/mozilla/mimetype/nsIMIMEDataSource.h
include/mozilla/mimetype/nsIMIMEInfo.h
include/mozilla/mimetype/nsIMIMEService.h
include/mozilla/mimetype/nsMimeTypes.h
+include/mozilla/mng/libmng.h
+include/mozilla/mng/libmng_conf.h
+include/mozilla/mng/libmng_types.h
include/mozilla/mork/mdb.h
include/mozilla/mork/nsIMdbFactoryFactory.h
include/mozilla/mork/nsMorkCID.h
@@ -1242,15 +1263,19 @@ include/mozilla/necko/nsIAuthenticator.h
include/mozilla/necko/nsIByteRangeRequest.h
include/mozilla/necko/nsICachingChannel.h
include/mozilla/necko/nsIChannel.h
+include/mozilla/necko/nsICookieService.h
include/mozilla/necko/nsIDNSListener.h
include/mozilla/necko/nsIDNSService.h
include/mozilla/necko/nsIDataChannel.h
include/mozilla/necko/nsIDirIndex.h
include/mozilla/necko/nsIDirIndexListener.h
+include/mozilla/necko/nsIDirectoryListing.h
include/mozilla/necko/nsIDownloader.h
include/mozilla/necko/nsIFileChannel.h
+include/mozilla/necko/nsIFileProtocolHandler.h
include/mozilla/necko/nsIFileStreams.h
include/mozilla/necko/nsIFileTransportService.h
+include/mozilla/necko/nsIFileURL.h
include/mozilla/necko/nsIHttpAuthenticator.h
include/mozilla/necko/nsIHttpChannel.h
include/mozilla/necko/nsIHttpEventSink.h
@@ -1262,6 +1287,7 @@ include/mozilla/necko/nsIJARChannel.h
include/mozilla/necko/nsIJARProtocolHandler.h
include/mozilla/necko/nsIJARURI.h
include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMIMEInputStream.h
include/mozilla/necko/nsIMultiPartChannel.h
include/mozilla/necko/nsINetModRegEntry.h
include/mozilla/necko/nsINetModuleMgr.h
@@ -1280,6 +1306,8 @@ include/mozilla/necko/nsIRequest.h
include/mozilla/necko/nsIRequestObserver.h
include/mozilla/necko/nsIRequestObserverProxy.h
include/mozilla/necko/nsIResProtocolHandler.h
+include/mozilla/necko/nsIResumableChannel.h
+include/mozilla/necko/nsIResumableEntityID.h
include/mozilla/necko/nsISOCKS4SocketInfo.h
include/mozilla/necko/nsISOCKS4SocketProvider.h
include/mozilla/necko/nsISOCKSSocketInfo.h
@@ -1294,6 +1322,7 @@ include/mozilla/necko/nsISocketProvider.h
include/mozilla/necko/nsISocketProviderService.h
include/mozilla/necko/nsISocketTransport.h
include/mozilla/necko/nsISocketTransportService.h
+include/mozilla/necko/nsIStandardURL.h
include/mozilla/necko/nsIStreamConverter.h
include/mozilla/necko/nsIStreamConverterService.h
include/mozilla/necko/nsIStreamIO.h
@@ -1324,8 +1353,6 @@ include/mozilla/nkcache/nsICacheListener.h
include/mozilla/nkcache/nsICacheService.h
include/mozilla/nkcache/nsICacheSession.h
include/mozilla/nkcache/nsICacheVisitor.h
-include/mozilla/npapi.h
-include/mozilla/npupp.h
include/mozilla/nsBuildID.h
include/mozilla/nspr/md/_aix.h
include/mozilla/nspr/md/_aix32.cfg
@@ -1494,6 +1521,8 @@ include/mozilla/pipnss/nsIX509CertDB.h
include/mozilla/pippki/nsIASN1Outliner.h
include/mozilla/pippki/nsIPKIParamBlock.h
include/mozilla/platform.h
+include/mozilla/plugin/npapi.h
+include/mozilla/plugin/npupp.h
include/mozilla/plugin/nsICookieStorage.h
include/mozilla/plugin/nsIEventHandler.h
include/mozilla/plugin/nsIFileUtilities.h
@@ -1526,6 +1555,7 @@ include/mozilla/plugin/nsIScriptablePlugin.h
include/mozilla/plugin/nsISeekablePluginStreamPeer.h
include/mozilla/plugin/nsIWindowlessPlugInstPeer.h
include/mozilla/plugin/nsPIPluginHost.h
+include/mozilla/plugin/nsPluginError.h
include/mozilla/plugin/nsPluginLogging.h
include/mozilla/plugin/nsPluginsCID.h
include/mozilla/plugin/nsplugin.h
@@ -1545,6 +1575,7 @@ include/mozilla/profile/nsIProfile.h
include/mozilla/profile/nsIProfileChangeStatus.h
include/mozilla/profile/nsIProfileInternal.h
include/mozilla/profile/nsIProfileStartupListener.h
+include/mozilla/progressDlg/nsIProgressDialog.h
include/mozilla/rdf/nsILocalStore.h
include/mozilla/rdf/nsIRDFCompositeDataSource.h
include/mozilla/rdf/nsIRDFContainer.h
@@ -1600,6 +1631,7 @@ include/mozilla/string/nsSharableString.h
include/mozilla/string/nsSharedBufferList.h
include/mozilla/string/nsSlidingString.h
include/mozilla/string/nsStr.h
+include/mozilla/string/nsStrShared.h
include/mozilla/string/nsString.h
include/mozilla/string/nsString2.h
include/mozilla/string/nsStringDefines.h
@@ -1647,13 +1679,11 @@ include/mozilla/ucvtw/nsUCvTWCID.h
include/mozilla/ucvtw2/nsUCvTW2CID.h
include/mozilla/unicharutil/nsArabicBasicLToPFormBVCID.h
include/mozilla/unicharutil/nsHankakuToZenkakuCID.h
-include/mozilla/unicharutil/nsIBidi.h
include/mozilla/unicharutil/nsICaseConversion.h
include/mozilla/unicharutil/nsIEntityConverter.h
include/mozilla/unicharutil/nsIOrderIdFormater.h
include/mozilla/unicharutil/nsISaveAsCharset.h
include/mozilla/unicharutil/nsITextTransform.h
-include/mozilla/unicharutil/nsIUBidiUtils.h
include/mozilla/unicharutil/nsIUGenCategory.h
include/mozilla/unicharutil/nsIUGenDetailCategory.h
include/mozilla/unicharutil/nsUnicharUtilCIID.h
@@ -1703,7 +1733,6 @@ include/mozilla/webbrwsr/nsIWebBrowserPrint.h
include/mozilla/webbrwsr/nsIWebBrowserSetup.h
include/mozilla/webshell/nsIClipboardCommands.h
include/mozilla/webshell/nsIContentViewerContainer.h
-include/mozilla/webshell/nsIContentViewerFile.h
include/mozilla/webshell/nsIDocStreamLoaderFactory.h
include/mozilla/webshell/nsIDocumentLoaderFactory.h
include/mozilla/webshell/nsILinkHandler.h
@@ -1732,6 +1761,7 @@ include/mozilla/widget/nsIDragTracker.h
include/mozilla/widget/nsIEventListener.h
include/mozilla/widget/nsIFilePicker.h
include/mozilla/widget/nsIFormatConverter.h
+include/mozilla/widget/nsIFullScreen.h
include/mozilla/widget/nsIKBStateControl.h
include/mozilla/widget/nsILabel.h
include/mozilla/widget/nsILookAndFeel.h
@@ -1755,6 +1785,7 @@ include/mozilla/widget/nsStringUtil.h
include/mozilla/widget/nsWidgetSupport.h
include/mozilla/widget/nsWidgetsCID.h
include/mozilla/widget/nsXRemoteClientCID.h
+include/mozilla/windowwatcher/nsIAuthPromptWrapper.h
include/mozilla/windowwatcher/nsIDialogParamBlock.h
include/mozilla/windowwatcher/nsIPromptService.h
include/mozilla/windowwatcher/nsIWindowWatcher.h
@@ -1766,9 +1797,28 @@ 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/nsISOAPAttachments.h
+include/mozilla/xmlextras/nsISOAPBlock.h
+include/mozilla/xmlextras/nsISOAPCall.h
+include/mozilla/xmlextras/nsISOAPCallCompletion.h
+include/mozilla/xmlextras/nsISOAPDecoder.h
+include/mozilla/xmlextras/nsISOAPEncoder.h
+include/mozilla/xmlextras/nsISOAPEncoding.h
+include/mozilla/xmlextras/nsISOAPFault.h
+include/mozilla/xmlextras/nsISOAPHeaderBlock.h
+include/mozilla/xmlextras/nsISOAPMessage.h
+include/mozilla/xmlextras/nsISOAPParameter.h
+include/mozilla/xmlextras/nsISOAPPropertyBagMutator.h
+include/mozilla/xmlextras/nsISOAPResponse.h
+include/mozilla/xmlextras/nsISOAPResponseListener.h
+include/mozilla/xmlextras/nsISOAPService.h
+include/mozilla/xmlextras/nsISOAPServiceRegistry.h
+include/mozilla/xmlextras/nsISOAPTransport.h
+include/mozilla/xmlextras/nsISOAPTransportListener.h
+include/mozilla/xmlextras/nsISchema.h
+include/mozilla/xmlextras/nsISchemaLoader.h
include/mozilla/xmlextras/nsIXMLHttpRequest.h
include/mozilla/xp_core.h
-include/mozilla/xp_file.h
include/mozilla/xp_mem.h
include/mozilla/xp_path.h
include/mozilla/xp_str.h
@@ -1789,13 +1839,13 @@ include/mozilla/xpcom/nsDebug.h
include/mozilla/xpcom/nsDeque.h
include/mozilla/xpcom/nsDirectoryService.h
include/mozilla/xpcom/nsDirectoryServiceDefs.h
+include/mozilla/xpcom/nsDoubleHashtable.h
include/mozilla/xpcom/nsEnumeratorUtils.h
include/mozilla/xpcom/nsError.h
include/mozilla/xpcom/nsEscape.h
include/mozilla/xpcom/nsFastLoadPtr.h
include/mozilla/xpcom/nsFastLoadService.h
include/mozilla/xpcom/nsFileSpec.h
-include/mozilla/xpcom/nsFileSpecStreaming.h
include/mozilla/xpcom/nsFileStream.h
include/mozilla/xpcom/nsFixedSizeAllocator.h
include/mozilla/xpcom/nsHashtable.h
@@ -1815,6 +1865,7 @@ include/mozilla/xpcom/nsICollection.h
include/mozilla/xpcom/nsIComponentLoader.h
include/mozilla/xpcom/nsIComponentManager.h
include/mozilla/xpcom/nsIComponentManagerObsolete.h
+include/mozilla/xpcom/nsIComponentRegistrar.h
include/mozilla/xpcom/nsIConsoleListener.h
include/mozilla/xpcom/nsIConsoleMessage.h
include/mozilla/xpcom/nsIConsoleService.h
@@ -1844,6 +1895,7 @@ include/mozilla/xpcom/nsILineInputStream.h
include/mozilla/xpcom/nsILocalFile.h
include/mozilla/xpcom/nsIMemory.h
include/mozilla/xpcom/nsIModule.h
+include/mozilla/xpcom/nsIMultiplexInputStream.h
include/mozilla/xpcom/nsIObjectInputStream.h
include/mozilla/xpcom/nsIObjectOutputStream.h
include/mozilla/xpcom/nsIObserver.h
@@ -1857,11 +1909,11 @@ include/mozilla/xpcom/nsIProperties.h
include/mozilla/xpcom/nsIPropertyBag.h
include/mozilla/xpcom/nsIProxyCreateInstance.h
include/mozilla/xpcom/nsIProxyObjectManager.h
-include/mozilla/xpcom/nsIPtr.h
include/mozilla/xpcom/nsIRegistry.h
include/mozilla/xpcom/nsIRegistryUtils.h
include/mozilla/xpcom/nsIRunnable.h
include/mozilla/xpcom/nsIScriptableInputStream.h
+include/mozilla/xpcom/nsIScriptableTimer.h
include/mozilla/xpcom/nsISeekableStream.h
include/mozilla/xpcom/nsISerializable.h
include/mozilla/xpcom/nsIServiceManager.h
@@ -1895,12 +1947,14 @@ include/mozilla/xpcom/nsLinebreakConverter.h
include/mozilla/xpcom/nsLocalFile.h
include/mozilla/xpcom/nsLocalFileUnix.h
include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsNativeComponentLoader.h
include/mozilla/xpcom/nsObserverService.h
include/mozilla/xpcom/nsObsoleteModuleLoading.h
include/mozilla/xpcom/nsProcess.h
include/mozilla/xpcom/nsProxiedService.h
include/mozilla/xpcom/nsProxyEvent.h
include/mozilla/xpcom/nsQuickSort.h
+include/mozilla/xpcom/nsRecyclingAllocator.h
include/mozilla/xpcom/nsScriptableInputStream.h
include/mozilla/xpcom/nsSpecialSystemDirectory.h
include/mozilla/xpcom/nsStaticComponent.h
@@ -1918,7 +1972,6 @@ include/mozilla/xpcom/nsValueArray.h
include/mozilla/xpcom/nsVariant.h
include/mozilla/xpcom/nsVector.h
include/mozilla/xpcom/nsVoidArray.h
-include/mozilla/xpcom/nsVoidBTree.h
include/mozilla/xpcom/nsWeakPtr.h
include/mozilla/xpcom/nsWeakReference.h
include/mozilla/xpcom/nsXPCOM.h
@@ -1928,6 +1981,7 @@ include/mozilla/xpcom/nsrootidl.h
include/mozilla/xpcom/pldhash.h
include/mozilla/xpcom/plevent.h
include/mozilla/xpcom/plvector.h
+include/mozilla/xpcom/xcDll.h
include/mozilla/xpcom/xpt_arena.h
include/mozilla/xpcom/xpt_struct.h
include/mozilla/xpcom/xpt_xdr.h
@@ -1939,6 +1993,7 @@ include/mozilla/xpconnect/mozIJSSubScriptLoader.h
include/mozilla/xpconnect/nsIJSContextStack.h
include/mozilla/xpconnect/nsIJSRuntimeService.h
include/mozilla/xpconnect/nsIScriptError.h
+include/mozilla/xpconnect/nsIScriptableInterfaces.h
include/mozilla/xpconnect/nsIXPCScriptNotify.h
include/mozilla/xpconnect/nsIXPCScriptable.h
include/mozilla/xpconnect/nsIXPCSecurityManager.h
@@ -1962,13 +2017,11 @@ include/mozilla/xremoteservice/nsIXRemoteService.h
include/mozilla/xul/nsIXULContent.h
include/mozilla/xul/nsIXULPopupListener.h
include/mozilla/xuldoc/nsIController.h
-include/mozilla/xuldoc/nsIControllerCommand.h
include/mozilla/xuldoc/nsIControllers.h
include/mozilla/xuldoc/nsIXULContentSink.h
include/mozilla/xuldoc/nsIXULDocument.h
include/mozilla/xuldoc/nsIXULPrototypeCache.h
include/mozilla/xuldoc/nsIXULPrototypeDocument.h
-include/mozilla/xultmpl/nsIRDFContentModelBuilder.h
include/mozilla/xultmpl/nsIXULSortService.h
include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/xultmpl
@@ -2010,6 +2063,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/regviewer
@dirrm include/mozilla/rdfutil
@dirrm include/mozilla/rdf
+@dirrm include/mozilla/progressDlg
@dirrm include/mozilla/profile
@dirrm include/mozilla/prefmigr
@dirrm include/mozilla/pref
@@ -2037,6 +2091,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/mozxfer
@dirrm include/mozilla/mozldap
@dirrm include/mozilla/mork
+@dirrm include/mozilla/mng
@dirrm include/mozilla/mimetype
@dirrm include/mozilla/mimeemitter
@dirrm include/mozilla/mime
@@ -2076,6 +2131,8 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/cookie
@dirrm include/mozilla/content_xsl
@dirrm include/mozilla/content
+@dirrm include/mozilla/composer
+@dirrm include/mozilla/commandhandler
@dirrm include/mozilla/chrome
@dirrm include/mozilla/chardet
@dirrm include/mozilla/caps
diff --git a/www/mozilla-headers-vendor/pkg-plist b/www/mozilla-headers-vendor/pkg-plist
index 1381b0ccd068..e04197eb318a 100644
--- a/www/mozilla-headers-vendor/pkg-plist
+++ b/www/mozilla-headers-vendor/pkg-plist
@@ -89,7 +89,9 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
include/mozilla/appcomps/nsIRelatedLinksHandler.h
include/mozilla/appcomps/nsISearchContext.h
include/mozilla/appcomps/nsISearchService.h
+include/mozilla/appcomps/nsITimeBomb.h
include/mozilla/appcomps/nsIUrlbarHistory.h
+include/mozilla/appcomps/nsTimeBomb.h
include/mozilla/appshell/nsAppShellCIDs.h
include/mozilla/appshell/nsIAppShellService.h
include/mozilla/appshell/nsICmdLineHandler.h
@@ -135,6 +137,13 @@ include/mozilla/chardet/nsIXMLEncodingService.h
include/mozilla/chardet/nsMetaCharsetCID.h
include/mozilla/chardet/nsXMLEncodingCID.h
include/mozilla/chrome/nsIChromeRegistry.h
+include/mozilla/commandhandler/nsICommandManager.h
+include/mozilla/commandhandler/nsICommandParams.h
+include/mozilla/commandhandler/nsIControllerCommand.h
+include/mozilla/commandhandler/nsIControllerCommandManager.h
+include/mozilla/commandhandler/nsPICommandUpdater.h
+include/mozilla/composer/nsIEditingSession.h
+include/mozilla/content/nsBidiUtils.h
include/mozilla/content/nsCSSAtomList.h
include/mozilla/content/nsCSSAtoms.h
include/mozilla/content/nsCSSDeclaration.h
@@ -174,17 +183,19 @@ include/mozilla/content/nsIContentIterator.h
include/mozilla/content/nsIContentList.h
include/mozilla/content/nsIContentPolicy.h
include/mozilla/content/nsIContentSerializer.h
-include/mozilla/content/nsIDiskDocument.h
include/mozilla/content/nsIDocument.h
include/mozilla/content/nsIDocumentContainer.h
include/mozilla/content/nsIDocumentEncoder.h
include/mozilla/content/nsIDocumentObserver.h
include/mozilla/content/nsIDocumentViewer.h
+include/mozilla/content/nsIDragDropHandler.h
+include/mozilla/content/nsIDragDropOverride.h
include/mozilla/content/nsIElementFactory.h
include/mozilla/content/nsIEventListenerManager.h
include/mozilla/content/nsIEventStateManager.h
include/mozilla/content/nsIForm.h
include/mozilla/content/nsIFormControl.h
+include/mozilla/content/nsIFormSubmission.h
include/mozilla/content/nsIHTMLAttributes.h
include/mozilla/content/nsIHTMLCSSStyleSheet.h
include/mozilla/content/nsIHTMLContentContainer.h
@@ -192,6 +203,7 @@ include/mozilla/content/nsIHTMLDocument.h
include/mozilla/content/nsIHTMLTableCellElement.h
include/mozilla/content/nsIHTMLTableColElement.h
include/mozilla/content/nsIHTMLToTextSink.h
+include/mozilla/content/nsIInspectorCSSUtils.h
include/mozilla/content/nsILink.h
include/mozilla/content/nsIMediaList.h
include/mozilla/content/nsINameSpace.h
@@ -227,6 +239,7 @@ include/mozilla/content/nsIStyleSheetLinkingElement.h
include/mozilla/content/nsIStyledContent.h
include/mozilla/content/nsITextContent.h
include/mozilla/content/nsITextControlElement.h
+include/mozilla/content/nsIWyciwygChannel.h
include/mozilla/content/nsIXBLBinding.h
include/mozilla/content/nsIXBLBindingAttachedHandler.h
include/mozilla/content/nsIXBLDocumentInfo.h
@@ -257,8 +270,8 @@ include/mozilla/content_xsl/nsIDocumentTransformer.h
include/mozilla/content_xsl/nsITransformMediator.h
include/mozilla/cookie/nsCookieHTTPNotify.h
include/mozilla/cookie/nsICookie.h
+include/mozilla/cookie/nsICookieConsent.h
include/mozilla/cookie/nsICookieManager.h
-include/mozilla/cookie/nsICookieService.h
include/mozilla/cookie/nsIImgManager.h
include/mozilla/cookie/nsIPermission.h
include/mozilla/cookie/nsIPermissionManager.h
@@ -271,12 +284,14 @@ include/mozilla/docshell/nsCDefaultURIFixup.h
include/mozilla/docshell/nsCDocShell.h
include/mozilla/docshell/nsIContentViewer.h
include/mozilla/docshell/nsIContentViewerEdit.h
+include/mozilla/docshell/nsIContentViewerFile.h
include/mozilla/docshell/nsIDocShell.h
include/mozilla/docshell/nsIDocShellHistory.h
include/mozilla/docshell/nsIDocShellLoadInfo.h
include/mozilla/docshell/nsIDocShellTreeItem.h
include/mozilla/docshell/nsIDocShellTreeNode.h
include/mozilla/docshell/nsIDocShellTreeOwner.h
+include/mozilla/docshell/nsIEditorDocShell.h
include/mozilla/docshell/nsIMarkupDocumentViewer.h
include/mozilla/docshell/nsIScrollable.h
include/mozilla/docshell/nsITextScroll.h
@@ -306,6 +321,7 @@ include/mozilla/dom/nsIDOMCSSStyleSheet.h
include/mozilla/dom/nsIDOMCSSUnknownRule.h
include/mozilla/dom/nsIDOMCSSValue.h
include/mozilla/dom/nsIDOMCharacterData.h
+include/mozilla/dom/nsIDOMChromeWindow.h
include/mozilla/dom/nsIDOMClassInfo.h
include/mozilla/dom/nsIDOMComment.h
include/mozilla/dom/nsIDOMCompositionListener.h
@@ -597,6 +613,7 @@ include/mozilla/gfx/nsIScreenManager.h
include/mozilla/gfx/nsIScriptableRegion.h
include/mozilla/gfx/nsITheme.h
include/mozilla/gfx/nsMargin.h
+include/mozilla/gfx/nsNameValuePairDB.h
include/mozilla/gfx/nsPoint.h
include/mozilla/gfx/nsPostScriptObj.h
include/mozilla/gfx/nsRect.h
@@ -605,6 +622,7 @@ include/mozilla/gfx/nsRepeater.h
include/mozilla/gfx/nsSize.h
include/mozilla/gfx/nsThemeConstants.h
include/mozilla/gfx/nsTransform2D.h
+include/mozilla/gfx/xprintutil.h
include/mozilla/gfx2/gfx2types.h
include/mozilla/gfx2/gfxIFormats.h
include/mozilla/gfx2/gfxIImageFrame.h
@@ -743,6 +761,7 @@ include/mozilla/jsdebug/jsdIDebuggerService.h
include/mozilla/jsdebug/jsdebug.h
include/mozilla/jsurl/nsIEvaluateStringProxy.h
include/mozilla/jsurl/nsJSProtocolHandler.h
+include/mozilla/layout/nsBidi.h
include/mozilla/layout/nsBidiFrames.h
include/mozilla/layout/nsBidiPresUtils.h
include/mozilla/layout/nsFrameList.h
@@ -950,12 +969,14 @@ include/mozilla/mimeemitter/nsMimeEmitterCID.h
include/mozilla/mimeemitter/nsMimeHtmlEmitter.h
include/mozilla/mimeemitter/nsMimeRawEmitter.h
include/mozilla/mimeemitter/nsMimeRebuffer.h
-include/mozilla/mimeemitter/nsMimeXULEmitter.h
include/mozilla/mimeemitter/nsMimeXmlEmitter.h
include/mozilla/mimetype/nsIMIMEDataSource.h
include/mozilla/mimetype/nsIMIMEInfo.h
include/mozilla/mimetype/nsIMIMEService.h
include/mozilla/mimetype/nsMimeTypes.h
+include/mozilla/mng/libmng.h
+include/mozilla/mng/libmng_conf.h
+include/mozilla/mng/libmng_types.h
include/mozilla/mork/mdb.h
include/mozilla/mork/nsIMdbFactoryFactory.h
include/mozilla/mork/nsMorkCID.h
@@ -1242,15 +1263,19 @@ include/mozilla/necko/nsIAuthenticator.h
include/mozilla/necko/nsIByteRangeRequest.h
include/mozilla/necko/nsICachingChannel.h
include/mozilla/necko/nsIChannel.h
+include/mozilla/necko/nsICookieService.h
include/mozilla/necko/nsIDNSListener.h
include/mozilla/necko/nsIDNSService.h
include/mozilla/necko/nsIDataChannel.h
include/mozilla/necko/nsIDirIndex.h
include/mozilla/necko/nsIDirIndexListener.h
+include/mozilla/necko/nsIDirectoryListing.h
include/mozilla/necko/nsIDownloader.h
include/mozilla/necko/nsIFileChannel.h
+include/mozilla/necko/nsIFileProtocolHandler.h
include/mozilla/necko/nsIFileStreams.h
include/mozilla/necko/nsIFileTransportService.h
+include/mozilla/necko/nsIFileURL.h
include/mozilla/necko/nsIHttpAuthenticator.h
include/mozilla/necko/nsIHttpChannel.h
include/mozilla/necko/nsIHttpEventSink.h
@@ -1262,6 +1287,7 @@ include/mozilla/necko/nsIJARChannel.h
include/mozilla/necko/nsIJARProtocolHandler.h
include/mozilla/necko/nsIJARURI.h
include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMIMEInputStream.h
include/mozilla/necko/nsIMultiPartChannel.h
include/mozilla/necko/nsINetModRegEntry.h
include/mozilla/necko/nsINetModuleMgr.h
@@ -1280,6 +1306,8 @@ include/mozilla/necko/nsIRequest.h
include/mozilla/necko/nsIRequestObserver.h
include/mozilla/necko/nsIRequestObserverProxy.h
include/mozilla/necko/nsIResProtocolHandler.h
+include/mozilla/necko/nsIResumableChannel.h
+include/mozilla/necko/nsIResumableEntityID.h
include/mozilla/necko/nsISOCKS4SocketInfo.h
include/mozilla/necko/nsISOCKS4SocketProvider.h
include/mozilla/necko/nsISOCKSSocketInfo.h
@@ -1294,6 +1322,7 @@ include/mozilla/necko/nsISocketProvider.h
include/mozilla/necko/nsISocketProviderService.h
include/mozilla/necko/nsISocketTransport.h
include/mozilla/necko/nsISocketTransportService.h
+include/mozilla/necko/nsIStandardURL.h
include/mozilla/necko/nsIStreamConverter.h
include/mozilla/necko/nsIStreamConverterService.h
include/mozilla/necko/nsIStreamIO.h
@@ -1324,8 +1353,6 @@ include/mozilla/nkcache/nsICacheListener.h
include/mozilla/nkcache/nsICacheService.h
include/mozilla/nkcache/nsICacheSession.h
include/mozilla/nkcache/nsICacheVisitor.h
-include/mozilla/npapi.h
-include/mozilla/npupp.h
include/mozilla/nsBuildID.h
include/mozilla/nspr/md/_aix.h
include/mozilla/nspr/md/_aix32.cfg
@@ -1494,6 +1521,8 @@ include/mozilla/pipnss/nsIX509CertDB.h
include/mozilla/pippki/nsIASN1Outliner.h
include/mozilla/pippki/nsIPKIParamBlock.h
include/mozilla/platform.h
+include/mozilla/plugin/npapi.h
+include/mozilla/plugin/npupp.h
include/mozilla/plugin/nsICookieStorage.h
include/mozilla/plugin/nsIEventHandler.h
include/mozilla/plugin/nsIFileUtilities.h
@@ -1526,6 +1555,7 @@ include/mozilla/plugin/nsIScriptablePlugin.h
include/mozilla/plugin/nsISeekablePluginStreamPeer.h
include/mozilla/plugin/nsIWindowlessPlugInstPeer.h
include/mozilla/plugin/nsPIPluginHost.h
+include/mozilla/plugin/nsPluginError.h
include/mozilla/plugin/nsPluginLogging.h
include/mozilla/plugin/nsPluginsCID.h
include/mozilla/plugin/nsplugin.h
@@ -1545,6 +1575,7 @@ include/mozilla/profile/nsIProfile.h
include/mozilla/profile/nsIProfileChangeStatus.h
include/mozilla/profile/nsIProfileInternal.h
include/mozilla/profile/nsIProfileStartupListener.h
+include/mozilla/progressDlg/nsIProgressDialog.h
include/mozilla/rdf/nsILocalStore.h
include/mozilla/rdf/nsIRDFCompositeDataSource.h
include/mozilla/rdf/nsIRDFContainer.h
@@ -1600,6 +1631,7 @@ include/mozilla/string/nsSharableString.h
include/mozilla/string/nsSharedBufferList.h
include/mozilla/string/nsSlidingString.h
include/mozilla/string/nsStr.h
+include/mozilla/string/nsStrShared.h
include/mozilla/string/nsString.h
include/mozilla/string/nsString2.h
include/mozilla/string/nsStringDefines.h
@@ -1647,13 +1679,11 @@ include/mozilla/ucvtw/nsUCvTWCID.h
include/mozilla/ucvtw2/nsUCvTW2CID.h
include/mozilla/unicharutil/nsArabicBasicLToPFormBVCID.h
include/mozilla/unicharutil/nsHankakuToZenkakuCID.h
-include/mozilla/unicharutil/nsIBidi.h
include/mozilla/unicharutil/nsICaseConversion.h
include/mozilla/unicharutil/nsIEntityConverter.h
include/mozilla/unicharutil/nsIOrderIdFormater.h
include/mozilla/unicharutil/nsISaveAsCharset.h
include/mozilla/unicharutil/nsITextTransform.h
-include/mozilla/unicharutil/nsIUBidiUtils.h
include/mozilla/unicharutil/nsIUGenCategory.h
include/mozilla/unicharutil/nsIUGenDetailCategory.h
include/mozilla/unicharutil/nsUnicharUtilCIID.h
@@ -1703,7 +1733,6 @@ include/mozilla/webbrwsr/nsIWebBrowserPrint.h
include/mozilla/webbrwsr/nsIWebBrowserSetup.h
include/mozilla/webshell/nsIClipboardCommands.h
include/mozilla/webshell/nsIContentViewerContainer.h
-include/mozilla/webshell/nsIContentViewerFile.h
include/mozilla/webshell/nsIDocStreamLoaderFactory.h
include/mozilla/webshell/nsIDocumentLoaderFactory.h
include/mozilla/webshell/nsILinkHandler.h
@@ -1732,6 +1761,7 @@ include/mozilla/widget/nsIDragTracker.h
include/mozilla/widget/nsIEventListener.h
include/mozilla/widget/nsIFilePicker.h
include/mozilla/widget/nsIFormatConverter.h
+include/mozilla/widget/nsIFullScreen.h
include/mozilla/widget/nsIKBStateControl.h
include/mozilla/widget/nsILabel.h
include/mozilla/widget/nsILookAndFeel.h
@@ -1755,6 +1785,7 @@ include/mozilla/widget/nsStringUtil.h
include/mozilla/widget/nsWidgetSupport.h
include/mozilla/widget/nsWidgetsCID.h
include/mozilla/widget/nsXRemoteClientCID.h
+include/mozilla/windowwatcher/nsIAuthPromptWrapper.h
include/mozilla/windowwatcher/nsIDialogParamBlock.h
include/mozilla/windowwatcher/nsIPromptService.h
include/mozilla/windowwatcher/nsIWindowWatcher.h
@@ -1766,9 +1797,28 @@ 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/nsISOAPAttachments.h
+include/mozilla/xmlextras/nsISOAPBlock.h
+include/mozilla/xmlextras/nsISOAPCall.h
+include/mozilla/xmlextras/nsISOAPCallCompletion.h
+include/mozilla/xmlextras/nsISOAPDecoder.h
+include/mozilla/xmlextras/nsISOAPEncoder.h
+include/mozilla/xmlextras/nsISOAPEncoding.h
+include/mozilla/xmlextras/nsISOAPFault.h
+include/mozilla/xmlextras/nsISOAPHeaderBlock.h
+include/mozilla/xmlextras/nsISOAPMessage.h
+include/mozilla/xmlextras/nsISOAPParameter.h
+include/mozilla/xmlextras/nsISOAPPropertyBagMutator.h
+include/mozilla/xmlextras/nsISOAPResponse.h
+include/mozilla/xmlextras/nsISOAPResponseListener.h
+include/mozilla/xmlextras/nsISOAPService.h
+include/mozilla/xmlextras/nsISOAPServiceRegistry.h
+include/mozilla/xmlextras/nsISOAPTransport.h
+include/mozilla/xmlextras/nsISOAPTransportListener.h
+include/mozilla/xmlextras/nsISchema.h
+include/mozilla/xmlextras/nsISchemaLoader.h
include/mozilla/xmlextras/nsIXMLHttpRequest.h
include/mozilla/xp_core.h
-include/mozilla/xp_file.h
include/mozilla/xp_mem.h
include/mozilla/xp_path.h
include/mozilla/xp_str.h
@@ -1789,13 +1839,13 @@ include/mozilla/xpcom/nsDebug.h
include/mozilla/xpcom/nsDeque.h
include/mozilla/xpcom/nsDirectoryService.h
include/mozilla/xpcom/nsDirectoryServiceDefs.h
+include/mozilla/xpcom/nsDoubleHashtable.h
include/mozilla/xpcom/nsEnumeratorUtils.h
include/mozilla/xpcom/nsError.h
include/mozilla/xpcom/nsEscape.h
include/mozilla/xpcom/nsFastLoadPtr.h
include/mozilla/xpcom/nsFastLoadService.h
include/mozilla/xpcom/nsFileSpec.h
-include/mozilla/xpcom/nsFileSpecStreaming.h
include/mozilla/xpcom/nsFileStream.h
include/mozilla/xpcom/nsFixedSizeAllocator.h
include/mozilla/xpcom/nsHashtable.h
@@ -1815,6 +1865,7 @@ include/mozilla/xpcom/nsICollection.h
include/mozilla/xpcom/nsIComponentLoader.h
include/mozilla/xpcom/nsIComponentManager.h
include/mozilla/xpcom/nsIComponentManagerObsolete.h
+include/mozilla/xpcom/nsIComponentRegistrar.h
include/mozilla/xpcom/nsIConsoleListener.h
include/mozilla/xpcom/nsIConsoleMessage.h
include/mozilla/xpcom/nsIConsoleService.h
@@ -1844,6 +1895,7 @@ include/mozilla/xpcom/nsILineInputStream.h
include/mozilla/xpcom/nsILocalFile.h
include/mozilla/xpcom/nsIMemory.h
include/mozilla/xpcom/nsIModule.h
+include/mozilla/xpcom/nsIMultiplexInputStream.h
include/mozilla/xpcom/nsIObjectInputStream.h
include/mozilla/xpcom/nsIObjectOutputStream.h
include/mozilla/xpcom/nsIObserver.h
@@ -1857,11 +1909,11 @@ include/mozilla/xpcom/nsIProperties.h
include/mozilla/xpcom/nsIPropertyBag.h
include/mozilla/xpcom/nsIProxyCreateInstance.h
include/mozilla/xpcom/nsIProxyObjectManager.h
-include/mozilla/xpcom/nsIPtr.h
include/mozilla/xpcom/nsIRegistry.h
include/mozilla/xpcom/nsIRegistryUtils.h
include/mozilla/xpcom/nsIRunnable.h
include/mozilla/xpcom/nsIScriptableInputStream.h
+include/mozilla/xpcom/nsIScriptableTimer.h
include/mozilla/xpcom/nsISeekableStream.h
include/mozilla/xpcom/nsISerializable.h
include/mozilla/xpcom/nsIServiceManager.h
@@ -1895,12 +1947,14 @@ include/mozilla/xpcom/nsLinebreakConverter.h
include/mozilla/xpcom/nsLocalFile.h
include/mozilla/xpcom/nsLocalFileUnix.h
include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsNativeComponentLoader.h
include/mozilla/xpcom/nsObserverService.h
include/mozilla/xpcom/nsObsoleteModuleLoading.h
include/mozilla/xpcom/nsProcess.h
include/mozilla/xpcom/nsProxiedService.h
include/mozilla/xpcom/nsProxyEvent.h
include/mozilla/xpcom/nsQuickSort.h
+include/mozilla/xpcom/nsRecyclingAllocator.h
include/mozilla/xpcom/nsScriptableInputStream.h
include/mozilla/xpcom/nsSpecialSystemDirectory.h
include/mozilla/xpcom/nsStaticComponent.h
@@ -1918,7 +1972,6 @@ include/mozilla/xpcom/nsValueArray.h
include/mozilla/xpcom/nsVariant.h
include/mozilla/xpcom/nsVector.h
include/mozilla/xpcom/nsVoidArray.h
-include/mozilla/xpcom/nsVoidBTree.h
include/mozilla/xpcom/nsWeakPtr.h
include/mozilla/xpcom/nsWeakReference.h
include/mozilla/xpcom/nsXPCOM.h
@@ -1928,6 +1981,7 @@ include/mozilla/xpcom/nsrootidl.h
include/mozilla/xpcom/pldhash.h
include/mozilla/xpcom/plevent.h
include/mozilla/xpcom/plvector.h
+include/mozilla/xpcom/xcDll.h
include/mozilla/xpcom/xpt_arena.h
include/mozilla/xpcom/xpt_struct.h
include/mozilla/xpcom/xpt_xdr.h
@@ -1939,6 +1993,7 @@ include/mozilla/xpconnect/mozIJSSubScriptLoader.h
include/mozilla/xpconnect/nsIJSContextStack.h
include/mozilla/xpconnect/nsIJSRuntimeService.h
include/mozilla/xpconnect/nsIScriptError.h
+include/mozilla/xpconnect/nsIScriptableInterfaces.h
include/mozilla/xpconnect/nsIXPCScriptNotify.h
include/mozilla/xpconnect/nsIXPCScriptable.h
include/mozilla/xpconnect/nsIXPCSecurityManager.h
@@ -1962,13 +2017,11 @@ include/mozilla/xremoteservice/nsIXRemoteService.h
include/mozilla/xul/nsIXULContent.h
include/mozilla/xul/nsIXULPopupListener.h
include/mozilla/xuldoc/nsIController.h
-include/mozilla/xuldoc/nsIControllerCommand.h
include/mozilla/xuldoc/nsIControllers.h
include/mozilla/xuldoc/nsIXULContentSink.h
include/mozilla/xuldoc/nsIXULDocument.h
include/mozilla/xuldoc/nsIXULPrototypeCache.h
include/mozilla/xuldoc/nsIXULPrototypeDocument.h
-include/mozilla/xultmpl/nsIRDFContentModelBuilder.h
include/mozilla/xultmpl/nsIXULSortService.h
include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/xultmpl
@@ -2010,6 +2063,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/regviewer
@dirrm include/mozilla/rdfutil
@dirrm include/mozilla/rdf
+@dirrm include/mozilla/progressDlg
@dirrm include/mozilla/profile
@dirrm include/mozilla/prefmigr
@dirrm include/mozilla/pref
@@ -2037,6 +2091,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/mozxfer
@dirrm include/mozilla/mozldap
@dirrm include/mozilla/mork
+@dirrm include/mozilla/mng
@dirrm include/mozilla/mimetype
@dirrm include/mozilla/mimeemitter
@dirrm include/mozilla/mime
@@ -2076,6 +2131,8 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/cookie
@dirrm include/mozilla/content_xsl
@dirrm include/mozilla/content
+@dirrm include/mozilla/composer
+@dirrm include/mozilla/commandhandler
@dirrm include/mozilla/chrome
@dirrm include/mozilla/chardet
@dirrm include/mozilla/caps
diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index 1381b0ccd068..e04197eb318a 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -89,7 +89,9 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
include/mozilla/appcomps/nsIRelatedLinksHandler.h
include/mozilla/appcomps/nsISearchContext.h
include/mozilla/appcomps/nsISearchService.h
+include/mozilla/appcomps/nsITimeBomb.h
include/mozilla/appcomps/nsIUrlbarHistory.h
+include/mozilla/appcomps/nsTimeBomb.h
include/mozilla/appshell/nsAppShellCIDs.h
include/mozilla/appshell/nsIAppShellService.h
include/mozilla/appshell/nsICmdLineHandler.h
@@ -135,6 +137,13 @@ include/mozilla/chardet/nsIXMLEncodingService.h
include/mozilla/chardet/nsMetaCharsetCID.h
include/mozilla/chardet/nsXMLEncodingCID.h
include/mozilla/chrome/nsIChromeRegistry.h
+include/mozilla/commandhandler/nsICommandManager.h
+include/mozilla/commandhandler/nsICommandParams.h
+include/mozilla/commandhandler/nsIControllerCommand.h
+include/mozilla/commandhandler/nsIControllerCommandManager.h
+include/mozilla/commandhandler/nsPICommandUpdater.h
+include/mozilla/composer/nsIEditingSession.h
+include/mozilla/content/nsBidiUtils.h
include/mozilla/content/nsCSSAtomList.h
include/mozilla/content/nsCSSAtoms.h
include/mozilla/content/nsCSSDeclaration.h
@@ -174,17 +183,19 @@ include/mozilla/content/nsIContentIterator.h
include/mozilla/content/nsIContentList.h
include/mozilla/content/nsIContentPolicy.h
include/mozilla/content/nsIContentSerializer.h
-include/mozilla/content/nsIDiskDocument.h
include/mozilla/content/nsIDocument.h
include/mozilla/content/nsIDocumentContainer.h
include/mozilla/content/nsIDocumentEncoder.h
include/mozilla/content/nsIDocumentObserver.h
include/mozilla/content/nsIDocumentViewer.h
+include/mozilla/content/nsIDragDropHandler.h
+include/mozilla/content/nsIDragDropOverride.h
include/mozilla/content/nsIElementFactory.h
include/mozilla/content/nsIEventListenerManager.h
include/mozilla/content/nsIEventStateManager.h
include/mozilla/content/nsIForm.h
include/mozilla/content/nsIFormControl.h
+include/mozilla/content/nsIFormSubmission.h
include/mozilla/content/nsIHTMLAttributes.h
include/mozilla/content/nsIHTMLCSSStyleSheet.h
include/mozilla/content/nsIHTMLContentContainer.h
@@ -192,6 +203,7 @@ include/mozilla/content/nsIHTMLDocument.h
include/mozilla/content/nsIHTMLTableCellElement.h
include/mozilla/content/nsIHTMLTableColElement.h
include/mozilla/content/nsIHTMLToTextSink.h
+include/mozilla/content/nsIInspectorCSSUtils.h
include/mozilla/content/nsILink.h
include/mozilla/content/nsIMediaList.h
include/mozilla/content/nsINameSpace.h
@@ -227,6 +239,7 @@ include/mozilla/content/nsIStyleSheetLinkingElement.h
include/mozilla/content/nsIStyledContent.h
include/mozilla/content/nsITextContent.h
include/mozilla/content/nsITextControlElement.h
+include/mozilla/content/nsIWyciwygChannel.h
include/mozilla/content/nsIXBLBinding.h
include/mozilla/content/nsIXBLBindingAttachedHandler.h
include/mozilla/content/nsIXBLDocumentInfo.h
@@ -257,8 +270,8 @@ include/mozilla/content_xsl/nsIDocumentTransformer.h
include/mozilla/content_xsl/nsITransformMediator.h
include/mozilla/cookie/nsCookieHTTPNotify.h
include/mozilla/cookie/nsICookie.h
+include/mozilla/cookie/nsICookieConsent.h
include/mozilla/cookie/nsICookieManager.h
-include/mozilla/cookie/nsICookieService.h
include/mozilla/cookie/nsIImgManager.h
include/mozilla/cookie/nsIPermission.h
include/mozilla/cookie/nsIPermissionManager.h
@@ -271,12 +284,14 @@ include/mozilla/docshell/nsCDefaultURIFixup.h
include/mozilla/docshell/nsCDocShell.h
include/mozilla/docshell/nsIContentViewer.h
include/mozilla/docshell/nsIContentViewerEdit.h
+include/mozilla/docshell/nsIContentViewerFile.h
include/mozilla/docshell/nsIDocShell.h
include/mozilla/docshell/nsIDocShellHistory.h
include/mozilla/docshell/nsIDocShellLoadInfo.h
include/mozilla/docshell/nsIDocShellTreeItem.h
include/mozilla/docshell/nsIDocShellTreeNode.h
include/mozilla/docshell/nsIDocShellTreeOwner.h
+include/mozilla/docshell/nsIEditorDocShell.h
include/mozilla/docshell/nsIMarkupDocumentViewer.h
include/mozilla/docshell/nsIScrollable.h
include/mozilla/docshell/nsITextScroll.h
@@ -306,6 +321,7 @@ include/mozilla/dom/nsIDOMCSSStyleSheet.h
include/mozilla/dom/nsIDOMCSSUnknownRule.h
include/mozilla/dom/nsIDOMCSSValue.h
include/mozilla/dom/nsIDOMCharacterData.h
+include/mozilla/dom/nsIDOMChromeWindow.h
include/mozilla/dom/nsIDOMClassInfo.h
include/mozilla/dom/nsIDOMComment.h
include/mozilla/dom/nsIDOMCompositionListener.h
@@ -597,6 +613,7 @@ include/mozilla/gfx/nsIScreenManager.h
include/mozilla/gfx/nsIScriptableRegion.h
include/mozilla/gfx/nsITheme.h
include/mozilla/gfx/nsMargin.h
+include/mozilla/gfx/nsNameValuePairDB.h
include/mozilla/gfx/nsPoint.h
include/mozilla/gfx/nsPostScriptObj.h
include/mozilla/gfx/nsRect.h
@@ -605,6 +622,7 @@ include/mozilla/gfx/nsRepeater.h
include/mozilla/gfx/nsSize.h
include/mozilla/gfx/nsThemeConstants.h
include/mozilla/gfx/nsTransform2D.h
+include/mozilla/gfx/xprintutil.h
include/mozilla/gfx2/gfx2types.h
include/mozilla/gfx2/gfxIFormats.h
include/mozilla/gfx2/gfxIImageFrame.h
@@ -743,6 +761,7 @@ include/mozilla/jsdebug/jsdIDebuggerService.h
include/mozilla/jsdebug/jsdebug.h
include/mozilla/jsurl/nsIEvaluateStringProxy.h
include/mozilla/jsurl/nsJSProtocolHandler.h
+include/mozilla/layout/nsBidi.h
include/mozilla/layout/nsBidiFrames.h
include/mozilla/layout/nsBidiPresUtils.h
include/mozilla/layout/nsFrameList.h
@@ -950,12 +969,14 @@ include/mozilla/mimeemitter/nsMimeEmitterCID.h
include/mozilla/mimeemitter/nsMimeHtmlEmitter.h
include/mozilla/mimeemitter/nsMimeRawEmitter.h
include/mozilla/mimeemitter/nsMimeRebuffer.h
-include/mozilla/mimeemitter/nsMimeXULEmitter.h
include/mozilla/mimeemitter/nsMimeXmlEmitter.h
include/mozilla/mimetype/nsIMIMEDataSource.h
include/mozilla/mimetype/nsIMIMEInfo.h
include/mozilla/mimetype/nsIMIMEService.h
include/mozilla/mimetype/nsMimeTypes.h
+include/mozilla/mng/libmng.h
+include/mozilla/mng/libmng_conf.h
+include/mozilla/mng/libmng_types.h
include/mozilla/mork/mdb.h
include/mozilla/mork/nsIMdbFactoryFactory.h
include/mozilla/mork/nsMorkCID.h
@@ -1242,15 +1263,19 @@ include/mozilla/necko/nsIAuthenticator.h
include/mozilla/necko/nsIByteRangeRequest.h
include/mozilla/necko/nsICachingChannel.h
include/mozilla/necko/nsIChannel.h
+include/mozilla/necko/nsICookieService.h
include/mozilla/necko/nsIDNSListener.h
include/mozilla/necko/nsIDNSService.h
include/mozilla/necko/nsIDataChannel.h
include/mozilla/necko/nsIDirIndex.h
include/mozilla/necko/nsIDirIndexListener.h
+include/mozilla/necko/nsIDirectoryListing.h
include/mozilla/necko/nsIDownloader.h
include/mozilla/necko/nsIFileChannel.h
+include/mozilla/necko/nsIFileProtocolHandler.h
include/mozilla/necko/nsIFileStreams.h
include/mozilla/necko/nsIFileTransportService.h
+include/mozilla/necko/nsIFileURL.h
include/mozilla/necko/nsIHttpAuthenticator.h
include/mozilla/necko/nsIHttpChannel.h
include/mozilla/necko/nsIHttpEventSink.h
@@ -1262,6 +1287,7 @@ include/mozilla/necko/nsIJARChannel.h
include/mozilla/necko/nsIJARProtocolHandler.h
include/mozilla/necko/nsIJARURI.h
include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMIMEInputStream.h
include/mozilla/necko/nsIMultiPartChannel.h
include/mozilla/necko/nsINetModRegEntry.h
include/mozilla/necko/nsINetModuleMgr.h
@@ -1280,6 +1306,8 @@ include/mozilla/necko/nsIRequest.h
include/mozilla/necko/nsIRequestObserver.h
include/mozilla/necko/nsIRequestObserverProxy.h
include/mozilla/necko/nsIResProtocolHandler.h
+include/mozilla/necko/nsIResumableChannel.h
+include/mozilla/necko/nsIResumableEntityID.h
include/mozilla/necko/nsISOCKS4SocketInfo.h
include/mozilla/necko/nsISOCKS4SocketProvider.h
include/mozilla/necko/nsISOCKSSocketInfo.h
@@ -1294,6 +1322,7 @@ include/mozilla/necko/nsISocketProvider.h
include/mozilla/necko/nsISocketProviderService.h
include/mozilla/necko/nsISocketTransport.h
include/mozilla/necko/nsISocketTransportService.h
+include/mozilla/necko/nsIStandardURL.h
include/mozilla/necko/nsIStreamConverter.h
include/mozilla/necko/nsIStreamConverterService.h
include/mozilla/necko/nsIStreamIO.h
@@ -1324,8 +1353,6 @@ include/mozilla/nkcache/nsICacheListener.h
include/mozilla/nkcache/nsICacheService.h
include/mozilla/nkcache/nsICacheSession.h
include/mozilla/nkcache/nsICacheVisitor.h
-include/mozilla/npapi.h
-include/mozilla/npupp.h
include/mozilla/nsBuildID.h
include/mozilla/nspr/md/_aix.h
include/mozilla/nspr/md/_aix32.cfg
@@ -1494,6 +1521,8 @@ include/mozilla/pipnss/nsIX509CertDB.h
include/mozilla/pippki/nsIASN1Outliner.h
include/mozilla/pippki/nsIPKIParamBlock.h
include/mozilla/platform.h
+include/mozilla/plugin/npapi.h
+include/mozilla/plugin/npupp.h
include/mozilla/plugin/nsICookieStorage.h
include/mozilla/plugin/nsIEventHandler.h
include/mozilla/plugin/nsIFileUtilities.h
@@ -1526,6 +1555,7 @@ include/mozilla/plugin/nsIScriptablePlugin.h
include/mozilla/plugin/nsISeekablePluginStreamPeer.h
include/mozilla/plugin/nsIWindowlessPlugInstPeer.h
include/mozilla/plugin/nsPIPluginHost.h
+include/mozilla/plugin/nsPluginError.h
include/mozilla/plugin/nsPluginLogging.h
include/mozilla/plugin/nsPluginsCID.h
include/mozilla/plugin/nsplugin.h
@@ -1545,6 +1575,7 @@ include/mozilla/profile/nsIProfile.h
include/mozilla/profile/nsIProfileChangeStatus.h
include/mozilla/profile/nsIProfileInternal.h
include/mozilla/profile/nsIProfileStartupListener.h
+include/mozilla/progressDlg/nsIProgressDialog.h
include/mozilla/rdf/nsILocalStore.h
include/mozilla/rdf/nsIRDFCompositeDataSource.h
include/mozilla/rdf/nsIRDFContainer.h
@@ -1600,6 +1631,7 @@ include/mozilla/string/nsSharableString.h
include/mozilla/string/nsSharedBufferList.h
include/mozilla/string/nsSlidingString.h
include/mozilla/string/nsStr.h
+include/mozilla/string/nsStrShared.h
include/mozilla/string/nsString.h
include/mozilla/string/nsString2.h
include/mozilla/string/nsStringDefines.h
@@ -1647,13 +1679,11 @@ include/mozilla/ucvtw/nsUCvTWCID.h
include/mozilla/ucvtw2/nsUCvTW2CID.h
include/mozilla/unicharutil/nsArabicBasicLToPFormBVCID.h
include/mozilla/unicharutil/nsHankakuToZenkakuCID.h
-include/mozilla/unicharutil/nsIBidi.h
include/mozilla/unicharutil/nsICaseConversion.h
include/mozilla/unicharutil/nsIEntityConverter.h
include/mozilla/unicharutil/nsIOrderIdFormater.h
include/mozilla/unicharutil/nsISaveAsCharset.h
include/mozilla/unicharutil/nsITextTransform.h
-include/mozilla/unicharutil/nsIUBidiUtils.h
include/mozilla/unicharutil/nsIUGenCategory.h
include/mozilla/unicharutil/nsIUGenDetailCategory.h
include/mozilla/unicharutil/nsUnicharUtilCIID.h
@@ -1703,7 +1733,6 @@ include/mozilla/webbrwsr/nsIWebBrowserPrint.h
include/mozilla/webbrwsr/nsIWebBrowserSetup.h
include/mozilla/webshell/nsIClipboardCommands.h
include/mozilla/webshell/nsIContentViewerContainer.h
-include/mozilla/webshell/nsIContentViewerFile.h
include/mozilla/webshell/nsIDocStreamLoaderFactory.h
include/mozilla/webshell/nsIDocumentLoaderFactory.h
include/mozilla/webshell/nsILinkHandler.h
@@ -1732,6 +1761,7 @@ include/mozilla/widget/nsIDragTracker.h
include/mozilla/widget/nsIEventListener.h
include/mozilla/widget/nsIFilePicker.h
include/mozilla/widget/nsIFormatConverter.h
+include/mozilla/widget/nsIFullScreen.h
include/mozilla/widget/nsIKBStateControl.h
include/mozilla/widget/nsILabel.h
include/mozilla/widget/nsILookAndFeel.h
@@ -1755,6 +1785,7 @@ include/mozilla/widget/nsStringUtil.h
include/mozilla/widget/nsWidgetSupport.h
include/mozilla/widget/nsWidgetsCID.h
include/mozilla/widget/nsXRemoteClientCID.h
+include/mozilla/windowwatcher/nsIAuthPromptWrapper.h
include/mozilla/windowwatcher/nsIDialogParamBlock.h
include/mozilla/windowwatcher/nsIPromptService.h
include/mozilla/windowwatcher/nsIWindowWatcher.h
@@ -1766,9 +1797,28 @@ 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/nsISOAPAttachments.h
+include/mozilla/xmlextras/nsISOAPBlock.h
+include/mozilla/xmlextras/nsISOAPCall.h
+include/mozilla/xmlextras/nsISOAPCallCompletion.h
+include/mozilla/xmlextras/nsISOAPDecoder.h
+include/mozilla/xmlextras/nsISOAPEncoder.h
+include/mozilla/xmlextras/nsISOAPEncoding.h
+include/mozilla/xmlextras/nsISOAPFault.h
+include/mozilla/xmlextras/nsISOAPHeaderBlock.h
+include/mozilla/xmlextras/nsISOAPMessage.h
+include/mozilla/xmlextras/nsISOAPParameter.h
+include/mozilla/xmlextras/nsISOAPPropertyBagMutator.h
+include/mozilla/xmlextras/nsISOAPResponse.h
+include/mozilla/xmlextras/nsISOAPResponseListener.h
+include/mozilla/xmlextras/nsISOAPService.h
+include/mozilla/xmlextras/nsISOAPServiceRegistry.h
+include/mozilla/xmlextras/nsISOAPTransport.h
+include/mozilla/xmlextras/nsISOAPTransportListener.h
+include/mozilla/xmlextras/nsISchema.h
+include/mozilla/xmlextras/nsISchemaLoader.h
include/mozilla/xmlextras/nsIXMLHttpRequest.h
include/mozilla/xp_core.h
-include/mozilla/xp_file.h
include/mozilla/xp_mem.h
include/mozilla/xp_path.h
include/mozilla/xp_str.h
@@ -1789,13 +1839,13 @@ include/mozilla/xpcom/nsDebug.h
include/mozilla/xpcom/nsDeque.h
include/mozilla/xpcom/nsDirectoryService.h
include/mozilla/xpcom/nsDirectoryServiceDefs.h
+include/mozilla/xpcom/nsDoubleHashtable.h
include/mozilla/xpcom/nsEnumeratorUtils.h
include/mozilla/xpcom/nsError.h
include/mozilla/xpcom/nsEscape.h
include/mozilla/xpcom/nsFastLoadPtr.h
include/mozilla/xpcom/nsFastLoadService.h
include/mozilla/xpcom/nsFileSpec.h
-include/mozilla/xpcom/nsFileSpecStreaming.h
include/mozilla/xpcom/nsFileStream.h
include/mozilla/xpcom/nsFixedSizeAllocator.h
include/mozilla/xpcom/nsHashtable.h
@@ -1815,6 +1865,7 @@ include/mozilla/xpcom/nsICollection.h
include/mozilla/xpcom/nsIComponentLoader.h
include/mozilla/xpcom/nsIComponentManager.h
include/mozilla/xpcom/nsIComponentManagerObsolete.h
+include/mozilla/xpcom/nsIComponentRegistrar.h
include/mozilla/xpcom/nsIConsoleListener.h
include/mozilla/xpcom/nsIConsoleMessage.h
include/mozilla/xpcom/nsIConsoleService.h
@@ -1844,6 +1895,7 @@ include/mozilla/xpcom/nsILineInputStream.h
include/mozilla/xpcom/nsILocalFile.h
include/mozilla/xpcom/nsIMemory.h
include/mozilla/xpcom/nsIModule.h
+include/mozilla/xpcom/nsIMultiplexInputStream.h
include/mozilla/xpcom/nsIObjectInputStream.h
include/mozilla/xpcom/nsIObjectOutputStream.h
include/mozilla/xpcom/nsIObserver.h
@@ -1857,11 +1909,11 @@ include/mozilla/xpcom/nsIProperties.h
include/mozilla/xpcom/nsIPropertyBag.h
include/mozilla/xpcom/nsIProxyCreateInstance.h
include/mozilla/xpcom/nsIProxyObjectManager.h
-include/mozilla/xpcom/nsIPtr.h
include/mozilla/xpcom/nsIRegistry.h
include/mozilla/xpcom/nsIRegistryUtils.h
include/mozilla/xpcom/nsIRunnable.h
include/mozilla/xpcom/nsIScriptableInputStream.h
+include/mozilla/xpcom/nsIScriptableTimer.h
include/mozilla/xpcom/nsISeekableStream.h
include/mozilla/xpcom/nsISerializable.h
include/mozilla/xpcom/nsIServiceManager.h
@@ -1895,12 +1947,14 @@ include/mozilla/xpcom/nsLinebreakConverter.h
include/mozilla/xpcom/nsLocalFile.h
include/mozilla/xpcom/nsLocalFileUnix.h
include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsNativeComponentLoader.h
include/mozilla/xpcom/nsObserverService.h
include/mozilla/xpcom/nsObsoleteModuleLoading.h
include/mozilla/xpcom/nsProcess.h
include/mozilla/xpcom/nsProxiedService.h
include/mozilla/xpcom/nsProxyEvent.h
include/mozilla/xpcom/nsQuickSort.h
+include/mozilla/xpcom/nsRecyclingAllocator.h
include/mozilla/xpcom/nsScriptableInputStream.h
include/mozilla/xpcom/nsSpecialSystemDirectory.h
include/mozilla/xpcom/nsStaticComponent.h
@@ -1918,7 +1972,6 @@ include/mozilla/xpcom/nsValueArray.h
include/mozilla/xpcom/nsVariant.h
include/mozilla/xpcom/nsVector.h
include/mozilla/xpcom/nsVoidArray.h
-include/mozilla/xpcom/nsVoidBTree.h
include/mozilla/xpcom/nsWeakPtr.h
include/mozilla/xpcom/nsWeakReference.h
include/mozilla/xpcom/nsXPCOM.h
@@ -1928,6 +1981,7 @@ include/mozilla/xpcom/nsrootidl.h
include/mozilla/xpcom/pldhash.h
include/mozilla/xpcom/plevent.h
include/mozilla/xpcom/plvector.h
+include/mozilla/xpcom/xcDll.h
include/mozilla/xpcom/xpt_arena.h
include/mozilla/xpcom/xpt_struct.h
include/mozilla/xpcom/xpt_xdr.h
@@ -1939,6 +1993,7 @@ include/mozilla/xpconnect/mozIJSSubScriptLoader.h
include/mozilla/xpconnect/nsIJSContextStack.h
include/mozilla/xpconnect/nsIJSRuntimeService.h
include/mozilla/xpconnect/nsIScriptError.h
+include/mozilla/xpconnect/nsIScriptableInterfaces.h
include/mozilla/xpconnect/nsIXPCScriptNotify.h
include/mozilla/xpconnect/nsIXPCScriptable.h
include/mozilla/xpconnect/nsIXPCSecurityManager.h
@@ -1962,13 +2017,11 @@ include/mozilla/xremoteservice/nsIXRemoteService.h
include/mozilla/xul/nsIXULContent.h
include/mozilla/xul/nsIXULPopupListener.h
include/mozilla/xuldoc/nsIController.h
-include/mozilla/xuldoc/nsIControllerCommand.h
include/mozilla/xuldoc/nsIControllers.h
include/mozilla/xuldoc/nsIXULContentSink.h
include/mozilla/xuldoc/nsIXULDocument.h
include/mozilla/xuldoc/nsIXULPrototypeCache.h
include/mozilla/xuldoc/nsIXULPrototypeDocument.h
-include/mozilla/xultmpl/nsIRDFContentModelBuilder.h
include/mozilla/xultmpl/nsIXULSortService.h
include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/xultmpl
@@ -2010,6 +2063,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/regviewer
@dirrm include/mozilla/rdfutil
@dirrm include/mozilla/rdf
+@dirrm include/mozilla/progressDlg
@dirrm include/mozilla/profile
@dirrm include/mozilla/prefmigr
@dirrm include/mozilla/pref
@@ -2037,6 +2091,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/mozxfer
@dirrm include/mozilla/mozldap
@dirrm include/mozilla/mork
+@dirrm include/mozilla/mng
@dirrm include/mozilla/mimetype
@dirrm include/mozilla/mimeemitter
@dirrm include/mozilla/mime
@@ -2076,6 +2131,8 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
@dirrm include/mozilla/cookie
@dirrm include/mozilla/content_xsl
@dirrm include/mozilla/content
+@dirrm include/mozilla/composer
+@dirrm include/mozilla/commandhandler
@dirrm include/mozilla/chrome
@dirrm include/mozilla/chardet
@dirrm include/mozilla/caps
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index d5a3d29ac1bd..828d49469eba 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mozilla
-PORTVERSION= 0.9.8
-PORTREVISION= 2
+PORTVERSION= 0.9.9
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -19,12 +18,14 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+ freetype.9:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/mozilla-vendor/distinfo b/www/mozilla-vendor/distinfo
index 9139a7878c5f..c91e16ad7551 100644
--- a/www/mozilla-vendor/distinfo
+++ b/www/mozilla-vendor/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-0.9.8.tar.bz2) = 17026a0dee5dd55932316dc93faa3fbb
-MD5 (libart_lgpl-0.9.8.tar.bz2) = dc954f8243a10cb68cf0e0bf598bf3ca
+MD5 (mozilla-source-0.9.9.tar.bz2) = ea8ec8580d8d71ad9ec33979550f01af
+MD5 (libart_lgpl-0.9.9.tar.bz2) = 7570ce10e9a78284d1653e54557edbd5
diff --git a/www/mozilla-vendor/files/patch-ak b/www/mozilla-vendor/files/patch-ak
deleted file mode 100644
index 5323d970afec..000000000000
--- a/www/mozilla-vendor/files/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Jan 5 03:43:00 2002
-+++ nsprpub/pr/include/md/_freebsd.h Tue Feb 5 11:14:27 2002
-@@ -87,6 +88,12 @@
-
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-+
-+#if __FreeBSD_version >= 400014
-+#define _PR_INET6
-+#define _PR_HAVE_GETHOSTBYNAME2
-+#define _PR_INET6_PROBE
-+#endif
-
- #define USE_SETJMP
-
diff --git a/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix b/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
index bd9b0b8bc67c..5eae8879b0ca 100644
--- a/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
+++ b/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
@@ -1,17 +1,17 @@
$FreeBSD$
---- embedding/config/basebrowser-unix.orig Wed Nov 21 00:21:59 2001
-+++ embedding/config/basebrowser-unix Tue Jan 15 15:26:55 2002
+--- embedding/config/basebrowser-unix.orig Thu Feb 7 23:50:19 2002
++++ embedding/config/basebrowser-unix Tue Mar 12 17:06:08 2002
@@ -119,6 +119,7 @@
; layout
components/libgkcontent.so
-+libmoz_art_lgpl.so
++libmoz_art_lgpl.so
+ res/dtd/*
components/libgklayout.so
components/libhtmlpars.so
- components/libgkview.so
-@@ -196,12 +197,12 @@
+@@ -203,12 +204,12 @@
components/unicharutil.xpt
components/libchardet.so
; optional - on english only systems
diff --git a/www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp b/www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp
deleted file mode 100644
index 24608f0b4c99..000000000000
--- a/www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- extensions/transformiix/source/base/Double.cpp.orig Sat Nov 24 00:36:13 2001
-+++ extensions/transformiix/source/base/Double.cpp Tue Dec 25 15:19:42 2001
-@@ -41,7 +41,7 @@
- #endif
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
- #ifndef TX_EXE
- #include "prdtoa.h"
-@@ -56,7 +56,11 @@
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
-+#ifdef __alpha__
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-+#else
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties b/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties
deleted file mode 100644
index 6cd5dcdeed9e..000000000000
--- a/www/mozilla-vendor/files/patch-intl::uconv::src::unixcharset.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- intl/uconv/src/unixcharset.properties.orig Wed Jan 9 04:13:10 2002
-+++ intl/uconv/src/unixcharset.properties Tue Feb 5 11:19:41 2002
-@@ -235,6 +235,8 @@
- locale.all.ru_SU.ISO_8859-5=ISO-8859-5
- # FreeBSD Russian
- locale.all.ru_SU.KOI8-R=KOI8-R
-+# FreeBSD Ukrainian
-+locale.all.uk_UA.KOI8-U=KOI8-U
- # Solaris
- locale.all.en_US.UTF-8=UTF-8
- # Solaris
diff --git a/www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.cpp b/www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.cpp
deleted file mode 100644
index c9adc8584c7d..000000000000
--- a/www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
---- netwerk/base/src/nsSocketTransport.cpp.orig Fri Feb 8 11:20:08 2002
-+++ netwerk/base/src/nsSocketTransport.cpp Fri Feb 8 11:20:16 2002
-@@ -143,6 +143,7 @@
- mHostName(nsnull),
- mPort(-1),
- mMonitor(nsnull),
-+ mNetAddress(nsnull),
- mOperation(eSocketOperation_None),
- mProxyPort(-1),
- mProxyHost(nsnull),
-@@ -183,12 +184,6 @@
- SetWriteType(eSocketWrite_None);
-
- //
-- // Set up Internet defaults...
-- //
-- memset(&mNetAddress, 0, sizeof(mNetAddress));
-- PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
--
-- //
- // Initialize the global connect timeout value if necessary...
- //
- if (PR_INTERVAL_NO_WAIT == gConnectTimeout)
-@@ -415,6 +410,14 @@
-
- while (!done) {
- //
-+ // Check for failure on any socket requests
-+ //
-+ if (mReadRequest && mReadRequest->HasFailed())
-+ mReadRequest->GetStatus(&mStatus);
-+ else if (mWriteRequest && mWriteRequest->HasFailed())
-+ mWriteRequest->GetStatus(&mStatus);
-+
-+ //
- // If an error has occurred then move into the error state...
- //
- if (NS_FAILED(mStatus) && (NS_BASE_STREAM_WOULD_BLOCK != mStatus))
-@@ -495,17 +498,40 @@
- // Send status message
- // only send a status if doResolveHost is going to do some
- // resolution
-- if (mStatus != NS_OK)
-+ if (mStatus == NS_BASE_STREAM_WOULD_BLOCK)
- OnStatus_Locked(NS_NET_STATUS_RESOLVING_HOST);
- break;
-
- case eSocketState_WaitConnect:
- LOG(("nsSocketTransport: Transport [host=%s:%d this=%x] is in WaitConnect state.\n",
- mHostName, mPort, this));
-- mStatus = doConnection(aSelectFlags);
-
- // Send status message
- OnStatus_Locked(NS_NET_STATUS_CONNECTING_TO);
-+
-+ mStatus = doConnection(aSelectFlags);
-+
-+ // 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);
-+ done = PR_TRUE;
-+ continue;
-+ }
-+ }
- break;
-
- case eSocketState_WaitReadWrite:
-@@ -633,21 +659,19 @@
-
- NS_ASSERTION(eSocketState_WaitDNS == mCurrentState, "Wrong state.");
-
-- LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d this=%x].\n",
-+ LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d %x].\n",
- mHostName, mPort, this));
-
-+ //
-+ // The hostname is being resolved...
-+ //
-+ if (mDNSRequest)
-+ return NS_BASE_STREAM_WOULD_BLOCK;
-+
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-- //
-- // Initialize the port used for the connection...
-- //
-- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
-- // mozilla/network/main/mkconect.c
-- //
-- mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
--
-+ if (mNetAddress == nsnull) {
- PR_ExitMonitor(mMonitor);
-
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
-@@ -659,9 +683,7 @@
- // Give up the SocketTransport lock. This allows the DNS thread to call the
- // nsIDNSListener notifications without blocking...
- //
-- rv = pDNSService->Lookup((mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName,
-- this,
-- nsnull,
-+ rv = pDNSService->Lookup(GetSocketHost(), this, nsnull,
- getter_AddRefs(mDNSRequest));
- //
- // Aquire the SocketTransport lock again...
-@@ -672,7 +694,7 @@
- //
- // The DNS lookup has finished... It has either failed or succeeded.
- //
-- if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (NS_FAILED(mStatus) || mNetAddress) {
- mDNSRequest = 0;
- rv = mStatus;
- }
-@@ -687,10 +709,8 @@
- }
- }
-
-- LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x].\t"
-- "rv = %x.\n\n",
-+ LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x] rv = %x\n",
- mHostName, mPort, this, rv));
--
- return rv;
- }
-
-@@ -832,7 +852,7 @@
- // This is only done the first time doConnection(...) is called.
- //
- if (NS_SUCCEEDED(rv)) {
-- status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
-+ status = PR_Connect(mSocketFD, mNetAddress, gConnectTimeout);
- if (PR_SUCCESS != status) {
- PRErrorCode code = PR_GetError();
- //
-@@ -932,14 +952,17 @@
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddress == nsnull) {
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
- if (!pDNSService) {
- return NS_ERROR_UNEXPECTED;
- }
-
- nsXPIDLCString result;
-- const char *host = (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName;
-+ const char *host = GetSocketHost();
-+
-+ // XXX DNS service does not provide a synchronous resolver that returns
-+ // the entire nsHostEnt struct.
- rv = pDNSService->Resolve(host, getter_Copies(result));
- if (NS_FAILED(rv)) return rv;
-
-@@ -953,16 +976,18 @@
- return NS_ERROR_FAILURE;
- }
-
-+ mNetAddrList.Init(1);
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), mNetAddress);
-+
- if (addr.raw.family == PR_AF_INET)
-- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress->ipv6.ip);
- else
-- memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
--
-- mNetAddress.ipv6.port
-- = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+ memcpy(&mNetAddress->ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress->ipv6.ip));
-
- LOG(("address { family=%hu, port=%hu }\n",
-- mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+ mNetAddress->ipv6.family, PR_ntohs(mNetAddress->ipv6.port)));
- }
-
- //
-@@ -1036,7 +1061,6 @@
- if (mReadRequest) {
- if (mReadRequest->IsCanceled() || (mBytesExpected == 0)) {
- LOG(("nsSocketTransport: [this=%x] completing read request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_READ;
- mReadRequest->GetStatus(&readStatus);
- CompleteAsyncRead();
- if (NS_FAILED(readStatus))
-@@ -1078,7 +1102,6 @@
- if (mWriteRequest) {
- if (mWriteRequest->IsCanceled()) {
- LOG(("nsSocketTransport: [this=%x] completing write request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_WRITE;
- mWriteRequest->GetStatus(&writeStatus);
- CompleteAsyncWrite();
- if (NS_FAILED(writeStatus))
-@@ -1485,23 +1508,44 @@
- nsAutoMonitor mon(mMonitor);
- nsresult rv = NS_OK;
-
-- if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
-- if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-- memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
-- else
-- PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
-+ char **addrList = aHostEnt->hostEnt.h_addr_list;
-+
-+ if (addrList && addrList[0]) {
-+ PRUint32 len = 0;
-+
-+ LOG(("nsSocketTransport::OnFound [%s:%d %x] lookup succeeded [FQDN=%s]\n",
-+ mHostName, mPort, this, aHostEnt->hostEnt.h_name));
-+
-+ // determine the number of address in the list
-+ for (; *addrList; ++addrList)
-+ ++len;
-+ addrList -= len;
-+
-+ // allocate space for the addresses
-+ mNetAddrList.Init(len);
-+
-+ // populate the address list
-+ PRNetAddr *addr = nsnull;
-+ while ((addr = mNetAddrList.GetNext(addr)) != nsnull) {
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), addr);
-+ if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-+ memcpy(&addr->ipv6.ip, *addrList, sizeof(addr->ipv6.ip));
-+ else
-+ PR_ConvertIPv4AddrToIPv6(*(PRUint32 *)(*addrList), &addr->ipv6.ip);
-+ ++addrList;
- #if defined(PR_LOGGING)
-- char addrbuf[50];
-- PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
-- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-- " DNS lookup succeeded => %s (%s)\n",
-- mHostName, mPort, this,
-- aHostEnt->hostEnt.h_name,
-- addrbuf));
-+ char buf[50];
-+ PR_NetAddrToString(addr, buf, sizeof(buf));
-+ LOG((" => %s\n", buf));
- #endif
-- } else {
-- // XXX: What should happen here? The GetHostByName(...) succeeded but
-- // there are *no* A records...
-+ }
-+
-+ // start with first address in list
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+ }
-+ else {
-+ // XXX: What should happen here? The DNS lookup succeeded, but there
-+ // are no address records...
- rv = NS_ERROR_FAILURE;
-
- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-@@ -1531,7 +1575,7 @@
- // If the lookup failed, set the status...
- if (NS_FAILED(aStatus))
- mStatus = aStatus;
-- else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+ else if (mNetAddress == nsnull)
- mStatus = NS_ERROR_ABORT;
-
- // Start processing the transport again - if necessary...
-@@ -1852,7 +1896,7 @@
- *_retval = (char*)nsMemory::Alloc(aLen);
- if (!*_retval) return NS_ERROR_FAILURE;
-
-- PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+ PRStatus status = PR_NetAddrToString(mNetAddress, *_retval, aLen);
-
- if (PR_FAILURE == status) {
- nsMemory::Free(*_retval);
-@@ -1968,6 +2012,37 @@
-
- if (--mSocketRef == 0)
- CloseConnection();
-+}
-+
-+//
-+//----------------------------------------------------------------------------
-+// nsSocketTransport::nsNetAddrList
-+//----------------------------------------------------------------------------
-+//
-+
-+nsresult nsSocketTransport::
-+nsNetAddrList::Init(PRUint32 len)
-+{
-+ NS_ASSERTION(!mList, "already initialized");
-+ mList = new PRNetAddr[len];
-+ if (!mList)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+ mLen = len;
-+ return NS_OK;
-+}
-+
-+PRNetAddr *nsSocketTransport::
-+nsNetAddrList::GetNext(PRNetAddr *addr)
-+{
-+ if (!addr)
-+ return mList;
-+
-+ PRUint32 offset = addr - mList;
-+ NS_ASSERTION(offset < mLen, "invalid address");
-+ if (offset + 1 < mLen)
-+ return addr + 1;
-+
-+ return nsnull;
- }
-
- //
diff --git a/www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.h b/www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.h
deleted file mode 100644
index ed73e127f901..000000000000
--- a/www/mozilla-vendor/files/patch-netwerk::base::src::nsSocketTransport.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- netwerk/base/src/nsSocketTransport.h.orig Fri Feb 8 11:20:24 2002
-+++ netwerk/base/src/nsSocketTransport.h Fri Feb 8 11:20:29 2002
-@@ -176,7 +176,7 @@
- PRFileDesc* GetSocket(void) { return mSocketFD; }
- PRInt16 GetSelectFlags(void) { return mSelectFlags; }
- PRCList* GetListNode(void) { return &mListLink; }
--
-+
- static nsSocketTransport* GetInstance(PRCList* qp) { return (nsSocketTransport*)((char*)qp - offsetof(nsSocketTransport, mListLink)); }
-
- PRBool CanBeReused() { return
-@@ -237,8 +237,27 @@
- inline void ClearFlag(nsSocketReadWriteInfo aFlag) {
- mReadWriteState &= ~aFlag;
- }
-+
-+ PRInt32 GetSocketPort(void) { return (mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort; }
-+ const char *GetSocketHost(void) { return (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName; }
-
- protected:
-+ class nsNetAddrList {
-+ public:
-+ nsNetAddrList() : mList(nsnull), mLen(0) {}
-+ ~nsNetAddrList() { delete[] mList; }
-+
-+ // allocate space for the address list
-+ nsresult Init(PRUint32 len);
-+
-+ // given a net addr in the list, return the next addr.
-+ // if given NULL, then return the first addr in the list.
-+ // returns NULL if given addr is the last addr.
-+ PRNetAddr *GetNext(PRNetAddr *currentAddr);
-+ private:
-+ PRNetAddr *mList;
-+ PRUint32 mLen;
-+ };
-
- nsSocketState mCurrentState;
- nsCOMPtr<nsIRequest> mDNSRequest;
-@@ -249,7 +268,8 @@
- PRIntervalTime mLastActiveTime;
- PRCList mListLink;
- PRMonitor* mMonitor;
-- PRNetAddr mNetAddress;
-+ nsNetAddrList mNetAddrList;
-+ PRNetAddr *mNetAddress;
- nsSocketOperation mOperation;
- nsCOMPtr<nsISupports> mSecurityInfo;
-
-@@ -415,6 +435,7 @@
- PRBool IsInitialized() { return mStartFired; }
- PRBool IsSuspended() { return mSuspendCount > 0; }
- PRBool IsCanceled() { return mCanceled; }
-+ PRBool HasFailed() { return NS_FAILED(mStatus); }
-
- void SetTransport(nsSocketTransport *);
- void SetObserver(nsIRequestObserver *obs) { mObserver = obs; }
diff --git a/www/mozilla-vendor/files/patch-nsprpub::configure b/www/mozilla-vendor/files/patch-nsprpub::configure
deleted file mode 100644
index b008097bf949..000000000000
--- a/www/mozilla-vendor/files/patch-nsprpub::configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- nsprpub/configure.orig Tue Jan 22 23:57:37 2002
-+++ nsprpub/configure Thu Feb 14 01:13:13 2002
-@@ -3288,8 +3288,9 @@
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- MDCPUCFG_H=_freebsd.cfg
- PR_MD_CSRCS=freebsd.c
- ;;
-@@ -5091,8 +5092,15 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -5123,11 +5131,17 @@
- ;;
- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
- cat >> confdefs.h <<\EOF
-+#define _REENTRANT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
- EOF
-
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-- _PTHREAD_LDFLAGS=
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
- *-linux*)
diff --git a/www/mozilla-vendor/files/patch-qt b/www/mozilla-vendor/files/patch-qt
index 05596784fcfe..660fc6e5b88a 100644
--- a/www/mozilla-vendor/files/patch-qt
+++ b/www/mozilla-vendor/files/patch-qt
@@ -1,11 +1,11 @@
$FreeBSD$
---- configure.orig Wed Dec 12 10:12:41 2001
-+++ configure Tue Dec 25 15:21:43 2001
-@@ -6186,6 +6186,9 @@
- os2*)
- LIBS=
+--- configure.orig Thu Mar 7 07:56:55 2002
++++ configure Tue Mar 12 17:15:06 2002
+@@ -6279,6 +6279,9 @@
+ # for stuff like -lXshm
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
@@ -13,16 +13,7 @@ $FreeBSD$
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
-@@ -7357,8 +7360,6 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
- fi
- fi
- rm -f conftest*
-@@ -7392,7 +7393,7 @@
+@@ -7512,7 +7515,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,7 +22,7 @@ $FreeBSD$
else
_PTHREAD_LDFLAGS="-lc_r"
fi
-@@ -9839,7 +9840,7 @@
+@@ -9954,7 +9957,7 @@
fi
MOC=$HOST_MOC
diff --git a/www/mozilla-vendor/files/patch-security::coreconf::FreeBSD.mk b/www/mozilla-vendor/files/patch-security::coreconf::FreeBSD.mk
index 1f33ac826a02..783d452b2896 100644
--- a/www/mozilla-vendor/files/patch-security::coreconf::FreeBSD.mk
+++ b/www/mozilla-vendor/files/patch-security::coreconf::FreeBSD.mk
@@ -1,6 +1,9 @@
---- security/coreconf/FreeBSD.mk.orig Tue Sep 19 05:53:08 2000
-+++ security/coreconf/FreeBSD.mk Thu Feb 14 14:19:02 2002
-@@ -35,27 +35,27 @@
+
+$FreeBSD$
+
+--- security/coreconf/FreeBSD.mk.orig Sat Mar 9 00:17:36 2002
++++ security/coreconf/FreeBSD.mk Tue Mar 12 17:19:15 2002
+@@ -35,9 +35,7 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -11,40 +14,12 @@
RANLIB = ranlib
ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
--OS_REL_CFLAGS = -Di386
- CPU_ARCH = x86
- endif
-
--OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-
- #
- # The default implementation strategy for FreeBSD is pthreads.
- #
- ifndef CLASSIC_NSPR
- USE_PTHREADS = 1
--DEFINES += -D_THREAD_SAFE
--THREAD_FLAG = -pthread
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+DSO_LDOPTS += -pthread
- endif
-
- ARCH = freebsd
-@@ -68,11 +68,7 @@
+@@ -70,7 +68,7 @@
DLL_SUFFIX = so.1.0
endif
--DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -Bshareable
--DSO_LDFLAGS =
--
--MKSHLIB = $(LD) $(DSO_LDOPTS)
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -o $@
-
- G++INCLUDES = -I/usr/include/g++
-
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp
deleted file mode 100644
index d1fec376adcf..000000000000
--- a/www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpfe/bootstrap/nsAppRunner.cpp.orig Mon Nov 26 16:53:29 2001
-+++ xpfe/bootstrap/nsAppRunner.cpp Mon Nov 26 16:54:12 2001
-@@ -1060,7 +1060,7 @@
-
- #if defined(FREEBSD)
- // pick up fpsetmask prototype.
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
-
- // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index 5a123b61a08d..c19f4c4cbf18 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -5,7 +5,6 @@ lib/mozilla/TestGtkEmbedNotebook
lib/mozilla/TestGtkEmbedSocket
lib/mozilla/bloaturls.txt
lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
lib/mozilla/chrome/chrome.rdf
lib/mozilla/chrome/chromelist.txt
lib/mozilla/chrome/classic.jar
@@ -41,10 +40,12 @@ lib/mozilla/components/autoconfig.xpt
lib/mozilla/components/bookmarks.xpt
lib/mozilla/components/caps.xpt
lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
lib/mozilla/components/chrome.xpt
+lib/mozilla/components/commandhandler.xpt
+lib/mozilla/components/composer.xpt
lib/mozilla/components/content.xpt
lib/mozilla/components/content_base.xpt
+lib/mozilla/components/content_html.xpt
lib/mozilla/components/content_xsl.xpt
lib/mozilla/components/cookie.xpt
lib/mozilla/components/directory.xpt
@@ -196,8 +197,10 @@ lib/mozilla/components/msgsmime.xpt
lib/mozilla/components/necko.xpt
lib/mozilla/components/necko_about.xpt
lib/mozilla/components/necko_cache.xpt
+lib/mozilla/components/necko_cookie.xpt
lib/mozilla/components/necko_data.xpt
lib/mozilla/components/necko_dns.xpt
+lib/mozilla/components/necko_file.xpt
lib/mozilla/components/necko_ftp.xpt
lib/mozilla/components/necko_http.xpt
lib/mozilla/components/necko_jar.xpt
@@ -209,8 +212,10 @@ lib/mozilla/components/nsDictionary.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/nsSidebar.js
+lib/mozilla/components/nsUpdateNotifier.js
lib/mozilla/components/nsXmlRpcClient.js
lib/mozilla/components/oji.xpt
lib/mozilla/components/pipboot.xpt
@@ -220,6 +225,7 @@ lib/mozilla/components/plugin.xpt
lib/mozilla/components/pref.xpt
lib/mozilla/components/prefmigr.xpt
lib/mozilla/components/profile.xpt
+lib/mozilla/components/progressDlg.xpt
lib/mozilla/components/proxyObjInst.xpt
lib/mozilla/components/rdf.xpt
lib/mozilla/components/regviewer.xpt
@@ -229,6 +235,7 @@ lib/mozilla/components/shistory.xpt
lib/mozilla/components/sidebar.xpt
lib/mozilla/components/signonviewer.xpt
lib/mozilla/components/smime-service.js
+lib/mozilla/components/timebomb.xpt
lib/mozilla/components/transformiix.xpt
lib/mozilla/components/txmgr.xpt
lib/mozilla/components/txtsvc.xpt
@@ -248,6 +255,8 @@ lib/mozilla/components/widget.xpt
lib/mozilla/components/windowwatcher.xpt
lib/mozilla/components/xml-rpc.xpt
lib/mozilla/components/xmlextras.xpt
+lib/mozilla/components/xmlschema.xpt
+lib/mozilla/components/xmlsoap.xpt
lib/mozilla/components/xpcom_base.xpt
lib/mozilla/components/xpcom_components.xpt
lib/mozilla/components/xpcom_ds.xpt
@@ -293,8 +302,6 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
lib/mozilla/defaults/wallet/StateSchema.tbl
lib/mozilla/defaults/wallet/VcardSchema.tbl
lib/mozilla/dirver
-lib/mozilla/dtd/mathml.dtd
-lib/mozilla/dtd/svg.dtd
lib/mozilla/icons/mozicon16.xpm
lib/mozilla/icons/mozicon50.xpm
lib/mozilla/libgkgfx.so
@@ -308,10 +315,14 @@ lib/mozilla/libmoz_art_lgpl.so
lib/mozilla/libmozjs.so
lib/mozilla/libmsgbaseutil.so
lib/mozilla/libnspr4.so
+lib/mozilla/libnss3.so
lib/mozilla/libnssckbi.so
lib/mozilla/libnullplugin.so
lib/mozilla/libplc4.so
lib/mozilla/libplds4.so
+lib/mozilla/libsmime3.so
+lib/mozilla/libsoftokn3.so
+lib/mozilla/libssl3.so
lib/mozilla/libxlibrgb.so
lib/mozilla/libxpcom.so
lib/mozilla/libxpistub.so
@@ -333,6 +344,9 @@ lib/mozilla/res/builtin/xbl-forms.css
lib/mozilla/res/charsetData.properties
lib/mozilla/res/charsetalias.properties
lib/mozilla/res/cmessage.txt
+lib/mozilla/res/dtd/mathml.dtd
+lib/mozilla/res/dtd/svg.dtd
+lib/mozilla/res/dtd/xhtml11.dtd
lib/mozilla/res/entityTables/html40Latin1.properties
lib/mozilla/res/entityTables/html40Special.properties
lib/mozilla/res/entityTables/html40Symbols.properties
@@ -357,6 +371,7 @@ lib/mozilla/res/html/gopher-find.gif
lib/mozilla/res/html/gopher-image.gif
lib/mozilla/res/html/gopher-menu.gif
lib/mozilla/res/html/gopher-movie.gif
+lib/mozilla/res/html/gopher-sound.gif
lib/mozilla/res/html/gopher-telnet.gif
lib/mozilla/res/html/gopher-text.gif
lib/mozilla/res/html/gopher-unknown.gif
@@ -500,6 +515,7 @@ lib/mozilla/searchplugins/lxrmozilla.gif
lib/mozilla/searchplugins/lxrmozilla.src
lib/mozilla/searchplugins/mozilla.gif
lib/mozilla/searchplugins/mozilla.src
+lib/mozilla/timebombgen
lib/mozilla/xpcshell
lib/mozilla/xpicleanup
lib/mozilla/xpidl
@@ -518,11 +534,11 @@ lib/mozilla/xpt_link
@dirrm lib/mozilla/res/gfx
@dirrm lib/mozilla/res/fonts
@dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/dtd
@dirrm lib/mozilla/res/builtin
@dirrm lib/mozilla/res
@dirrm lib/mozilla/plugins
@dirrm lib/mozilla/icons
-@dirrm lib/mozilla/dtd
@dirrm lib/mozilla/defaults/wallet
@dirrm lib/mozilla/defaults/profile/chrome
@dirrm lib/mozilla/defaults/profile/US/chrome
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index d5a3d29ac1bd..828d49469eba 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mozilla
-PORTVERSION= 0.9.8
-PORTREVISION= 2
+PORTVERSION= 0.9.9
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -19,12 +18,14 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+ freetype.9:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 9139a7878c5f..c91e16ad7551 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-0.9.8.tar.bz2) = 17026a0dee5dd55932316dc93faa3fbb
-MD5 (libart_lgpl-0.9.8.tar.bz2) = dc954f8243a10cb68cf0e0bf598bf3ca
+MD5 (mozilla-source-0.9.9.tar.bz2) = ea8ec8580d8d71ad9ec33979550f01af
+MD5 (libart_lgpl-0.9.9.tar.bz2) = 7570ce10e9a78284d1653e54557edbd5
diff --git a/www/mozilla/files/patch-ak b/www/mozilla/files/patch-ak
deleted file mode 100644
index 5323d970afec..000000000000
--- a/www/mozilla/files/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Jan 5 03:43:00 2002
-+++ nsprpub/pr/include/md/_freebsd.h Tue Feb 5 11:14:27 2002
-@@ -87,6 +88,12 @@
-
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-+
-+#if __FreeBSD_version >= 400014
-+#define _PR_INET6
-+#define _PR_HAVE_GETHOSTBYNAME2
-+#define _PR_INET6_PROBE
-+#endif
-
- #define USE_SETJMP
-
diff --git a/www/mozilla/files/patch-embedding::config::basebrowser-unix b/www/mozilla/files/patch-embedding::config::basebrowser-unix
index bd9b0b8bc67c..5eae8879b0ca 100644
--- a/www/mozilla/files/patch-embedding::config::basebrowser-unix
+++ b/www/mozilla/files/patch-embedding::config::basebrowser-unix
@@ -1,17 +1,17 @@
$FreeBSD$
---- embedding/config/basebrowser-unix.orig Wed Nov 21 00:21:59 2001
-+++ embedding/config/basebrowser-unix Tue Jan 15 15:26:55 2002
+--- embedding/config/basebrowser-unix.orig Thu Feb 7 23:50:19 2002
++++ embedding/config/basebrowser-unix Tue Mar 12 17:06:08 2002
@@ -119,6 +119,7 @@
; layout
components/libgkcontent.so
-+libmoz_art_lgpl.so
++libmoz_art_lgpl.so
+ res/dtd/*
components/libgklayout.so
components/libhtmlpars.so
- components/libgkview.so
-@@ -196,12 +197,12 @@
+@@ -203,12 +204,12 @@
components/unicharutil.xpt
components/libchardet.so
; optional - on english only systems
diff --git a/www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp b/www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp
deleted file mode 100644
index 24608f0b4c99..000000000000
--- a/www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- extensions/transformiix/source/base/Double.cpp.orig Sat Nov 24 00:36:13 2001
-+++ extensions/transformiix/source/base/Double.cpp Tue Dec 25 15:19:42 2001
-@@ -41,7 +41,7 @@
- #endif
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
- #ifndef TX_EXE
- #include "prdtoa.h"
-@@ -56,7 +56,11 @@
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
-+#ifdef __alpha__
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-+#else
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties b/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties
deleted file mode 100644
index 6cd5dcdeed9e..000000000000
--- a/www/mozilla/files/patch-intl::uconv::src::unixcharset.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- intl/uconv/src/unixcharset.properties.orig Wed Jan 9 04:13:10 2002
-+++ intl/uconv/src/unixcharset.properties Tue Feb 5 11:19:41 2002
-@@ -235,6 +235,8 @@
- locale.all.ru_SU.ISO_8859-5=ISO-8859-5
- # FreeBSD Russian
- locale.all.ru_SU.KOI8-R=KOI8-R
-+# FreeBSD Ukrainian
-+locale.all.uk_UA.KOI8-U=KOI8-U
- # Solaris
- locale.all.en_US.UTF-8=UTF-8
- # Solaris
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 c9adc8584c7d..000000000000
--- a/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
---- netwerk/base/src/nsSocketTransport.cpp.orig Fri Feb 8 11:20:08 2002
-+++ netwerk/base/src/nsSocketTransport.cpp Fri Feb 8 11:20:16 2002
-@@ -143,6 +143,7 @@
- mHostName(nsnull),
- mPort(-1),
- mMonitor(nsnull),
-+ mNetAddress(nsnull),
- mOperation(eSocketOperation_None),
- mProxyPort(-1),
- mProxyHost(nsnull),
-@@ -183,12 +184,6 @@
- SetWriteType(eSocketWrite_None);
-
- //
-- // Set up Internet defaults...
-- //
-- memset(&mNetAddress, 0, sizeof(mNetAddress));
-- PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
--
-- //
- // Initialize the global connect timeout value if necessary...
- //
- if (PR_INTERVAL_NO_WAIT == gConnectTimeout)
-@@ -415,6 +410,14 @@
-
- while (!done) {
- //
-+ // Check for failure on any socket requests
-+ //
-+ if (mReadRequest && mReadRequest->HasFailed())
-+ mReadRequest->GetStatus(&mStatus);
-+ else if (mWriteRequest && mWriteRequest->HasFailed())
-+ mWriteRequest->GetStatus(&mStatus);
-+
-+ //
- // If an error has occurred then move into the error state...
- //
- if (NS_FAILED(mStatus) && (NS_BASE_STREAM_WOULD_BLOCK != mStatus))
-@@ -495,17 +498,40 @@
- // Send status message
- // only send a status if doResolveHost is going to do some
- // resolution
-- if (mStatus != NS_OK)
-+ if (mStatus == NS_BASE_STREAM_WOULD_BLOCK)
- OnStatus_Locked(NS_NET_STATUS_RESOLVING_HOST);
- break;
-
- case eSocketState_WaitConnect:
- LOG(("nsSocketTransport: Transport [host=%s:%d this=%x] is in WaitConnect state.\n",
- mHostName, mPort, this));
-- mStatus = doConnection(aSelectFlags);
-
- // Send status message
- OnStatus_Locked(NS_NET_STATUS_CONNECTING_TO);
-+
-+ mStatus = doConnection(aSelectFlags);
-+
-+ // 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);
-+ done = PR_TRUE;
-+ continue;
-+ }
-+ }
- break;
-
- case eSocketState_WaitReadWrite:
-@@ -633,21 +659,19 @@
-
- NS_ASSERTION(eSocketState_WaitDNS == mCurrentState, "Wrong state.");
-
-- LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d this=%x].\n",
-+ LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d %x].\n",
- mHostName, mPort, this));
-
-+ //
-+ // The hostname is being resolved...
-+ //
-+ if (mDNSRequest)
-+ return NS_BASE_STREAM_WOULD_BLOCK;
-+
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-- //
-- // Initialize the port used for the connection...
-- //
-- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
-- // mozilla/network/main/mkconect.c
-- //
-- mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
--
-+ if (mNetAddress == nsnull) {
- PR_ExitMonitor(mMonitor);
-
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
-@@ -659,9 +683,7 @@
- // Give up the SocketTransport lock. This allows the DNS thread to call the
- // nsIDNSListener notifications without blocking...
- //
-- rv = pDNSService->Lookup((mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName,
-- this,
-- nsnull,
-+ rv = pDNSService->Lookup(GetSocketHost(), this, nsnull,
- getter_AddRefs(mDNSRequest));
- //
- // Aquire the SocketTransport lock again...
-@@ -672,7 +694,7 @@
- //
- // The DNS lookup has finished... It has either failed or succeeded.
- //
-- if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (NS_FAILED(mStatus) || mNetAddress) {
- mDNSRequest = 0;
- rv = mStatus;
- }
-@@ -687,10 +709,8 @@
- }
- }
-
-- LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x].\t"
-- "rv = %x.\n\n",
-+ LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x] rv = %x\n",
- mHostName, mPort, this, rv));
--
- return rv;
- }
-
-@@ -832,7 +852,7 @@
- // This is only done the first time doConnection(...) is called.
- //
- if (NS_SUCCEEDED(rv)) {
-- status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
-+ status = PR_Connect(mSocketFD, mNetAddress, gConnectTimeout);
- if (PR_SUCCESS != status) {
- PRErrorCode code = PR_GetError();
- //
-@@ -932,14 +952,17 @@
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddress == nsnull) {
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
- if (!pDNSService) {
- return NS_ERROR_UNEXPECTED;
- }
-
- nsXPIDLCString result;
-- const char *host = (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName;
-+ const char *host = GetSocketHost();
-+
-+ // XXX DNS service does not provide a synchronous resolver that returns
-+ // the entire nsHostEnt struct.
- rv = pDNSService->Resolve(host, getter_Copies(result));
- if (NS_FAILED(rv)) return rv;
-
-@@ -953,16 +976,18 @@
- return NS_ERROR_FAILURE;
- }
-
-+ mNetAddrList.Init(1);
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), mNetAddress);
-+
- if (addr.raw.family == PR_AF_INET)
-- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress->ipv6.ip);
- else
-- memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
--
-- mNetAddress.ipv6.port
-- = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+ memcpy(&mNetAddress->ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress->ipv6.ip));
-
- LOG(("address { family=%hu, port=%hu }\n",
-- mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+ mNetAddress->ipv6.family, PR_ntohs(mNetAddress->ipv6.port)));
- }
-
- //
-@@ -1036,7 +1061,6 @@
- if (mReadRequest) {
- if (mReadRequest->IsCanceled() || (mBytesExpected == 0)) {
- LOG(("nsSocketTransport: [this=%x] completing read request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_READ;
- mReadRequest->GetStatus(&readStatus);
- CompleteAsyncRead();
- if (NS_FAILED(readStatus))
-@@ -1078,7 +1102,6 @@
- if (mWriteRequest) {
- if (mWriteRequest->IsCanceled()) {
- LOG(("nsSocketTransport: [this=%x] completing write request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_WRITE;
- mWriteRequest->GetStatus(&writeStatus);
- CompleteAsyncWrite();
- if (NS_FAILED(writeStatus))
-@@ -1485,23 +1508,44 @@
- nsAutoMonitor mon(mMonitor);
- nsresult rv = NS_OK;
-
-- if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
-- if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-- memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
-- else
-- PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
-+ char **addrList = aHostEnt->hostEnt.h_addr_list;
-+
-+ if (addrList && addrList[0]) {
-+ PRUint32 len = 0;
-+
-+ LOG(("nsSocketTransport::OnFound [%s:%d %x] lookup succeeded [FQDN=%s]\n",
-+ mHostName, mPort, this, aHostEnt->hostEnt.h_name));
-+
-+ // determine the number of address in the list
-+ for (; *addrList; ++addrList)
-+ ++len;
-+ addrList -= len;
-+
-+ // allocate space for the addresses
-+ mNetAddrList.Init(len);
-+
-+ // populate the address list
-+ PRNetAddr *addr = nsnull;
-+ while ((addr = mNetAddrList.GetNext(addr)) != nsnull) {
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), addr);
-+ if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-+ memcpy(&addr->ipv6.ip, *addrList, sizeof(addr->ipv6.ip));
-+ else
-+ PR_ConvertIPv4AddrToIPv6(*(PRUint32 *)(*addrList), &addr->ipv6.ip);
-+ ++addrList;
- #if defined(PR_LOGGING)
-- char addrbuf[50];
-- PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
-- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-- " DNS lookup succeeded => %s (%s)\n",
-- mHostName, mPort, this,
-- aHostEnt->hostEnt.h_name,
-- addrbuf));
-+ char buf[50];
-+ PR_NetAddrToString(addr, buf, sizeof(buf));
-+ LOG((" => %s\n", buf));
- #endif
-- } else {
-- // XXX: What should happen here? The GetHostByName(...) succeeded but
-- // there are *no* A records...
-+ }
-+
-+ // start with first address in list
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+ }
-+ else {
-+ // XXX: What should happen here? The DNS lookup succeeded, but there
-+ // are no address records...
- rv = NS_ERROR_FAILURE;
-
- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-@@ -1531,7 +1575,7 @@
- // If the lookup failed, set the status...
- if (NS_FAILED(aStatus))
- mStatus = aStatus;
-- else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+ else if (mNetAddress == nsnull)
- mStatus = NS_ERROR_ABORT;
-
- // Start processing the transport again - if necessary...
-@@ -1852,7 +1896,7 @@
- *_retval = (char*)nsMemory::Alloc(aLen);
- if (!*_retval) return NS_ERROR_FAILURE;
-
-- PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+ PRStatus status = PR_NetAddrToString(mNetAddress, *_retval, aLen);
-
- if (PR_FAILURE == status) {
- nsMemory::Free(*_retval);
-@@ -1968,6 +2012,37 @@
-
- if (--mSocketRef == 0)
- CloseConnection();
-+}
-+
-+//
-+//----------------------------------------------------------------------------
-+// nsSocketTransport::nsNetAddrList
-+//----------------------------------------------------------------------------
-+//
-+
-+nsresult nsSocketTransport::
-+nsNetAddrList::Init(PRUint32 len)
-+{
-+ NS_ASSERTION(!mList, "already initialized");
-+ mList = new PRNetAddr[len];
-+ if (!mList)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+ mLen = len;
-+ return NS_OK;
-+}
-+
-+PRNetAddr *nsSocketTransport::
-+nsNetAddrList::GetNext(PRNetAddr *addr)
-+{
-+ if (!addr)
-+ return mList;
-+
-+ PRUint32 offset = addr - mList;
-+ NS_ASSERTION(offset < mLen, "invalid address");
-+ if (offset + 1 < mLen)
-+ return addr + 1;
-+
-+ return nsnull;
- }
-
- //
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 ed73e127f901..000000000000
--- a/www/mozilla/files/patch-netwerk::base::src::nsSocketTransport.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- netwerk/base/src/nsSocketTransport.h.orig Fri Feb 8 11:20:24 2002
-+++ netwerk/base/src/nsSocketTransport.h Fri Feb 8 11:20:29 2002
-@@ -176,7 +176,7 @@
- PRFileDesc* GetSocket(void) { return mSocketFD; }
- PRInt16 GetSelectFlags(void) { return mSelectFlags; }
- PRCList* GetListNode(void) { return &mListLink; }
--
-+
- static nsSocketTransport* GetInstance(PRCList* qp) { return (nsSocketTransport*)((char*)qp - offsetof(nsSocketTransport, mListLink)); }
-
- PRBool CanBeReused() { return
-@@ -237,8 +237,27 @@
- inline void ClearFlag(nsSocketReadWriteInfo aFlag) {
- mReadWriteState &= ~aFlag;
- }
-+
-+ PRInt32 GetSocketPort(void) { return (mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort; }
-+ const char *GetSocketHost(void) { return (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName; }
-
- protected:
-+ class nsNetAddrList {
-+ public:
-+ nsNetAddrList() : mList(nsnull), mLen(0) {}
-+ ~nsNetAddrList() { delete[] mList; }
-+
-+ // allocate space for the address list
-+ nsresult Init(PRUint32 len);
-+
-+ // given a net addr in the list, return the next addr.
-+ // if given NULL, then return the first addr in the list.
-+ // returns NULL if given addr is the last addr.
-+ PRNetAddr *GetNext(PRNetAddr *currentAddr);
-+ private:
-+ PRNetAddr *mList;
-+ PRUint32 mLen;
-+ };
-
- nsSocketState mCurrentState;
- nsCOMPtr<nsIRequest> mDNSRequest;
-@@ -249,7 +268,8 @@
- PRIntervalTime mLastActiveTime;
- PRCList mListLink;
- PRMonitor* mMonitor;
-- PRNetAddr mNetAddress;
-+ nsNetAddrList mNetAddrList;
-+ PRNetAddr *mNetAddress;
- nsSocketOperation mOperation;
- nsCOMPtr<nsISupports> mSecurityInfo;
-
-@@ -415,6 +435,7 @@
- PRBool IsInitialized() { return mStartFired; }
- PRBool IsSuspended() { return mSuspendCount > 0; }
- PRBool IsCanceled() { return mCanceled; }
-+ PRBool HasFailed() { return NS_FAILED(mStatus); }
-
- void SetTransport(nsSocketTransport *);
- void SetObserver(nsIRequestObserver *obs) { mObserver = obs; }
diff --git a/www/mozilla/files/patch-nsprpub::configure b/www/mozilla/files/patch-nsprpub::configure
deleted file mode 100644
index b008097bf949..000000000000
--- a/www/mozilla/files/patch-nsprpub::configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- nsprpub/configure.orig Tue Jan 22 23:57:37 2002
-+++ nsprpub/configure Thu Feb 14 01:13:13 2002
-@@ -3288,8 +3288,9 @@
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- MDCPUCFG_H=_freebsd.cfg
- PR_MD_CSRCS=freebsd.c
- ;;
-@@ -5091,8 +5092,15 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -5123,11 +5131,17 @@
- ;;
- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
- cat >> confdefs.h <<\EOF
-+#define _REENTRANT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
- EOF
-
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-- _PTHREAD_LDFLAGS=
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
- *-linux*)
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index 05596784fcfe..660fc6e5b88a 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,11 +1,11 @@
$FreeBSD$
---- configure.orig Wed Dec 12 10:12:41 2001
-+++ configure Tue Dec 25 15:21:43 2001
-@@ -6186,6 +6186,9 @@
- os2*)
- LIBS=
+--- configure.orig Thu Mar 7 07:56:55 2002
++++ configure Tue Mar 12 17:15:06 2002
+@@ -6279,6 +6279,9 @@
+ # for stuff like -lXshm
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
@@ -13,16 +13,7 @@ $FreeBSD$
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
-@@ -7357,8 +7360,6 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
- fi
- fi
- rm -f conftest*
-@@ -7392,7 +7393,7 @@
+@@ -7512,7 +7515,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,7 +22,7 @@ $FreeBSD$
else
_PTHREAD_LDFLAGS="-lc_r"
fi
-@@ -9839,7 +9840,7 @@
+@@ -9954,7 +9957,7 @@
fi
MOC=$HOST_MOC
diff --git a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk b/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
index 1f33ac826a02..783d452b2896 100644
--- a/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
+++ b/www/mozilla/files/patch-security::coreconf::FreeBSD.mk
@@ -1,6 +1,9 @@
---- security/coreconf/FreeBSD.mk.orig Tue Sep 19 05:53:08 2000
-+++ security/coreconf/FreeBSD.mk Thu Feb 14 14:19:02 2002
-@@ -35,27 +35,27 @@
+
+$FreeBSD$
+
+--- security/coreconf/FreeBSD.mk.orig Sat Mar 9 00:17:36 2002
++++ security/coreconf/FreeBSD.mk Tue Mar 12 17:19:15 2002
+@@ -35,9 +35,7 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -11,40 +14,12 @@
RANLIB = ranlib
ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
--OS_REL_CFLAGS = -Di386
- CPU_ARCH = x86
- endif
-
--OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-
- #
- # The default implementation strategy for FreeBSD is pthreads.
- #
- ifndef CLASSIC_NSPR
- USE_PTHREADS = 1
--DEFINES += -D_THREAD_SAFE
--THREAD_FLAG = -pthread
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+DSO_LDOPTS += -pthread
- endif
-
- ARCH = freebsd
-@@ -68,11 +68,7 @@
+@@ -70,7 +68,7 @@
DLL_SUFFIX = so.1.0
endif
--DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -Bshareable
--DSO_LDFLAGS =
--
--MKSHLIB = $(LD) $(DSO_LDOPTS)
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -o $@
-
- G++INCLUDES = -I/usr/include/g++
-
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp
deleted file mode 100644
index d1fec376adcf..000000000000
--- a/www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpfe/bootstrap/nsAppRunner.cpp.orig Mon Nov 26 16:53:29 2001
-+++ xpfe/bootstrap/nsAppRunner.cpp Mon Nov 26 16:54:12 2001
-@@ -1060,7 +1060,7 @@
-
- #if defined(FREEBSD)
- // pick up fpsetmask prototype.
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
-
- // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 5a123b61a08d..c19f4c4cbf18 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -5,7 +5,6 @@ lib/mozilla/TestGtkEmbedNotebook
lib/mozilla/TestGtkEmbedSocket
lib/mozilla/bloaturls.txt
lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
lib/mozilla/chrome/chrome.rdf
lib/mozilla/chrome/chromelist.txt
lib/mozilla/chrome/classic.jar
@@ -41,10 +40,12 @@ lib/mozilla/components/autoconfig.xpt
lib/mozilla/components/bookmarks.xpt
lib/mozilla/components/caps.xpt
lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
lib/mozilla/components/chrome.xpt
+lib/mozilla/components/commandhandler.xpt
+lib/mozilla/components/composer.xpt
lib/mozilla/components/content.xpt
lib/mozilla/components/content_base.xpt
+lib/mozilla/components/content_html.xpt
lib/mozilla/components/content_xsl.xpt
lib/mozilla/components/cookie.xpt
lib/mozilla/components/directory.xpt
@@ -196,8 +197,10 @@ lib/mozilla/components/msgsmime.xpt
lib/mozilla/components/necko.xpt
lib/mozilla/components/necko_about.xpt
lib/mozilla/components/necko_cache.xpt
+lib/mozilla/components/necko_cookie.xpt
lib/mozilla/components/necko_data.xpt
lib/mozilla/components/necko_dns.xpt
+lib/mozilla/components/necko_file.xpt
lib/mozilla/components/necko_ftp.xpt
lib/mozilla/components/necko_http.xpt
lib/mozilla/components/necko_jar.xpt
@@ -209,8 +212,10 @@ lib/mozilla/components/nsDictionary.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/nsSidebar.js
+lib/mozilla/components/nsUpdateNotifier.js
lib/mozilla/components/nsXmlRpcClient.js
lib/mozilla/components/oji.xpt
lib/mozilla/components/pipboot.xpt
@@ -220,6 +225,7 @@ lib/mozilla/components/plugin.xpt
lib/mozilla/components/pref.xpt
lib/mozilla/components/prefmigr.xpt
lib/mozilla/components/profile.xpt
+lib/mozilla/components/progressDlg.xpt
lib/mozilla/components/proxyObjInst.xpt
lib/mozilla/components/rdf.xpt
lib/mozilla/components/regviewer.xpt
@@ -229,6 +235,7 @@ lib/mozilla/components/shistory.xpt
lib/mozilla/components/sidebar.xpt
lib/mozilla/components/signonviewer.xpt
lib/mozilla/components/smime-service.js
+lib/mozilla/components/timebomb.xpt
lib/mozilla/components/transformiix.xpt
lib/mozilla/components/txmgr.xpt
lib/mozilla/components/txtsvc.xpt
@@ -248,6 +255,8 @@ lib/mozilla/components/widget.xpt
lib/mozilla/components/windowwatcher.xpt
lib/mozilla/components/xml-rpc.xpt
lib/mozilla/components/xmlextras.xpt
+lib/mozilla/components/xmlschema.xpt
+lib/mozilla/components/xmlsoap.xpt
lib/mozilla/components/xpcom_base.xpt
lib/mozilla/components/xpcom_components.xpt
lib/mozilla/components/xpcom_ds.xpt
@@ -293,8 +302,6 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
lib/mozilla/defaults/wallet/StateSchema.tbl
lib/mozilla/defaults/wallet/VcardSchema.tbl
lib/mozilla/dirver
-lib/mozilla/dtd/mathml.dtd
-lib/mozilla/dtd/svg.dtd
lib/mozilla/icons/mozicon16.xpm
lib/mozilla/icons/mozicon50.xpm
lib/mozilla/libgkgfx.so
@@ -308,10 +315,14 @@ lib/mozilla/libmoz_art_lgpl.so
lib/mozilla/libmozjs.so
lib/mozilla/libmsgbaseutil.so
lib/mozilla/libnspr4.so
+lib/mozilla/libnss3.so
lib/mozilla/libnssckbi.so
lib/mozilla/libnullplugin.so
lib/mozilla/libplc4.so
lib/mozilla/libplds4.so
+lib/mozilla/libsmime3.so
+lib/mozilla/libsoftokn3.so
+lib/mozilla/libssl3.so
lib/mozilla/libxlibrgb.so
lib/mozilla/libxpcom.so
lib/mozilla/libxpistub.so
@@ -333,6 +344,9 @@ lib/mozilla/res/builtin/xbl-forms.css
lib/mozilla/res/charsetData.properties
lib/mozilla/res/charsetalias.properties
lib/mozilla/res/cmessage.txt
+lib/mozilla/res/dtd/mathml.dtd
+lib/mozilla/res/dtd/svg.dtd
+lib/mozilla/res/dtd/xhtml11.dtd
lib/mozilla/res/entityTables/html40Latin1.properties
lib/mozilla/res/entityTables/html40Special.properties
lib/mozilla/res/entityTables/html40Symbols.properties
@@ -357,6 +371,7 @@ lib/mozilla/res/html/gopher-find.gif
lib/mozilla/res/html/gopher-image.gif
lib/mozilla/res/html/gopher-menu.gif
lib/mozilla/res/html/gopher-movie.gif
+lib/mozilla/res/html/gopher-sound.gif
lib/mozilla/res/html/gopher-telnet.gif
lib/mozilla/res/html/gopher-text.gif
lib/mozilla/res/html/gopher-unknown.gif
@@ -500,6 +515,7 @@ lib/mozilla/searchplugins/lxrmozilla.gif
lib/mozilla/searchplugins/lxrmozilla.src
lib/mozilla/searchplugins/mozilla.gif
lib/mozilla/searchplugins/mozilla.src
+lib/mozilla/timebombgen
lib/mozilla/xpcshell
lib/mozilla/xpicleanup
lib/mozilla/xpidl
@@ -518,11 +534,11 @@ lib/mozilla/xpt_link
@dirrm lib/mozilla/res/gfx
@dirrm lib/mozilla/res/fonts
@dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/dtd
@dirrm lib/mozilla/res/builtin
@dirrm lib/mozilla/res
@dirrm lib/mozilla/plugins
@dirrm lib/mozilla/icons
-@dirrm lib/mozilla/dtd
@dirrm lib/mozilla/defaults/wallet
@dirrm lib/mozilla/defaults/profile/chrome
@dirrm lib/mozilla/defaults/profile/US/chrome
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index d5a3d29ac1bd..828d49469eba 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mozilla
-PORTVERSION= 0.9.8
-PORTREVISION= 2
+PORTVERSION= 0.9.9
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -19,12 +18,14 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+ freetype.9:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 9139a7878c5f..c91e16ad7551 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-0.9.8.tar.bz2) = 17026a0dee5dd55932316dc93faa3fbb
-MD5 (libart_lgpl-0.9.8.tar.bz2) = dc954f8243a10cb68cf0e0bf598bf3ca
+MD5 (mozilla-source-0.9.9.tar.bz2) = ea8ec8580d8d71ad9ec33979550f01af
+MD5 (libart_lgpl-0.9.9.tar.bz2) = 7570ce10e9a78284d1653e54557edbd5
diff --git a/www/seamonkey/files/patch-ak b/www/seamonkey/files/patch-ak
deleted file mode 100644
index 5323d970afec..000000000000
--- a/www/seamonkey/files/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Jan 5 03:43:00 2002
-+++ nsprpub/pr/include/md/_freebsd.h Tue Feb 5 11:14:27 2002
-@@ -87,6 +88,12 @@
-
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-+
-+#if __FreeBSD_version >= 400014
-+#define _PR_INET6
-+#define _PR_HAVE_GETHOSTBYNAME2
-+#define _PR_INET6_PROBE
-+#endif
-
- #define USE_SETJMP
-
diff --git a/www/seamonkey/files/patch-embedding::config::basebrowser-unix b/www/seamonkey/files/patch-embedding::config::basebrowser-unix
index bd9b0b8bc67c..5eae8879b0ca 100644
--- a/www/seamonkey/files/patch-embedding::config::basebrowser-unix
+++ b/www/seamonkey/files/patch-embedding::config::basebrowser-unix
@@ -1,17 +1,17 @@
$FreeBSD$
---- embedding/config/basebrowser-unix.orig Wed Nov 21 00:21:59 2001
-+++ embedding/config/basebrowser-unix Tue Jan 15 15:26:55 2002
+--- embedding/config/basebrowser-unix.orig Thu Feb 7 23:50:19 2002
++++ embedding/config/basebrowser-unix Tue Mar 12 17:06:08 2002
@@ -119,6 +119,7 @@
; layout
components/libgkcontent.so
-+libmoz_art_lgpl.so
++libmoz_art_lgpl.so
+ res/dtd/*
components/libgklayout.so
components/libhtmlpars.so
- components/libgkview.so
-@@ -196,12 +197,12 @@
+@@ -203,12 +204,12 @@
components/unicharutil.xpt
components/libchardet.so
; optional - on english only systems
diff --git a/www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp b/www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp
deleted file mode 100644
index 24608f0b4c99..000000000000
--- a/www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- extensions/transformiix/source/base/Double.cpp.orig Sat Nov 24 00:36:13 2001
-+++ extensions/transformiix/source/base/Double.cpp Tue Dec 25 15:19:42 2001
-@@ -41,7 +41,7 @@
- #endif
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
- #ifndef TX_EXE
- #include "prdtoa.h"
-@@ -56,7 +56,11 @@
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
-+#ifdef __alpha__
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-+#else
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties b/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties
deleted file mode 100644
index 6cd5dcdeed9e..000000000000
--- a/www/seamonkey/files/patch-intl::uconv::src::unixcharset.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- intl/uconv/src/unixcharset.properties.orig Wed Jan 9 04:13:10 2002
-+++ intl/uconv/src/unixcharset.properties Tue Feb 5 11:19:41 2002
-@@ -235,6 +235,8 @@
- locale.all.ru_SU.ISO_8859-5=ISO-8859-5
- # FreeBSD Russian
- locale.all.ru_SU.KOI8-R=KOI8-R
-+# FreeBSD Ukrainian
-+locale.all.uk_UA.KOI8-U=KOI8-U
- # Solaris
- locale.all.en_US.UTF-8=UTF-8
- # Solaris
diff --git a/www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.cpp b/www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.cpp
deleted file mode 100644
index c9adc8584c7d..000000000000
--- a/www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
---- netwerk/base/src/nsSocketTransport.cpp.orig Fri Feb 8 11:20:08 2002
-+++ netwerk/base/src/nsSocketTransport.cpp Fri Feb 8 11:20:16 2002
-@@ -143,6 +143,7 @@
- mHostName(nsnull),
- mPort(-1),
- mMonitor(nsnull),
-+ mNetAddress(nsnull),
- mOperation(eSocketOperation_None),
- mProxyPort(-1),
- mProxyHost(nsnull),
-@@ -183,12 +184,6 @@
- SetWriteType(eSocketWrite_None);
-
- //
-- // Set up Internet defaults...
-- //
-- memset(&mNetAddress, 0, sizeof(mNetAddress));
-- PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
--
-- //
- // Initialize the global connect timeout value if necessary...
- //
- if (PR_INTERVAL_NO_WAIT == gConnectTimeout)
-@@ -415,6 +410,14 @@
-
- while (!done) {
- //
-+ // Check for failure on any socket requests
-+ //
-+ if (mReadRequest && mReadRequest->HasFailed())
-+ mReadRequest->GetStatus(&mStatus);
-+ else if (mWriteRequest && mWriteRequest->HasFailed())
-+ mWriteRequest->GetStatus(&mStatus);
-+
-+ //
- // If an error has occurred then move into the error state...
- //
- if (NS_FAILED(mStatus) && (NS_BASE_STREAM_WOULD_BLOCK != mStatus))
-@@ -495,17 +498,40 @@
- // Send status message
- // only send a status if doResolveHost is going to do some
- // resolution
-- if (mStatus != NS_OK)
-+ if (mStatus == NS_BASE_STREAM_WOULD_BLOCK)
- OnStatus_Locked(NS_NET_STATUS_RESOLVING_HOST);
- break;
-
- case eSocketState_WaitConnect:
- LOG(("nsSocketTransport: Transport [host=%s:%d this=%x] is in WaitConnect state.\n",
- mHostName, mPort, this));
-- mStatus = doConnection(aSelectFlags);
-
- // Send status message
- OnStatus_Locked(NS_NET_STATUS_CONNECTING_TO);
-+
-+ mStatus = doConnection(aSelectFlags);
-+
-+ // 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);
-+ done = PR_TRUE;
-+ continue;
-+ }
-+ }
- break;
-
- case eSocketState_WaitReadWrite:
-@@ -633,21 +659,19 @@
-
- NS_ASSERTION(eSocketState_WaitDNS == mCurrentState, "Wrong state.");
-
-- LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d this=%x].\n",
-+ LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d %x].\n",
- mHostName, mPort, this));
-
-+ //
-+ // The hostname is being resolved...
-+ //
-+ if (mDNSRequest)
-+ return NS_BASE_STREAM_WOULD_BLOCK;
-+
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-- //
-- // Initialize the port used for the connection...
-- //
-- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
-- // mozilla/network/main/mkconect.c
-- //
-- mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
--
-+ if (mNetAddress == nsnull) {
- PR_ExitMonitor(mMonitor);
-
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
-@@ -659,9 +683,7 @@
- // Give up the SocketTransport lock. This allows the DNS thread to call the
- // nsIDNSListener notifications without blocking...
- //
-- rv = pDNSService->Lookup((mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName,
-- this,
-- nsnull,
-+ rv = pDNSService->Lookup(GetSocketHost(), this, nsnull,
- getter_AddRefs(mDNSRequest));
- //
- // Aquire the SocketTransport lock again...
-@@ -672,7 +694,7 @@
- //
- // The DNS lookup has finished... It has either failed or succeeded.
- //
-- if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (NS_FAILED(mStatus) || mNetAddress) {
- mDNSRequest = 0;
- rv = mStatus;
- }
-@@ -687,10 +709,8 @@
- }
- }
-
-- LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x].\t"
-- "rv = %x.\n\n",
-+ LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x] rv = %x\n",
- mHostName, mPort, this, rv));
--
- return rv;
- }
-
-@@ -832,7 +852,7 @@
- // This is only done the first time doConnection(...) is called.
- //
- if (NS_SUCCEEDED(rv)) {
-- status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
-+ status = PR_Connect(mSocketFD, mNetAddress, gConnectTimeout);
- if (PR_SUCCESS != status) {
- PRErrorCode code = PR_GetError();
- //
-@@ -932,14 +952,17 @@
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddress == nsnull) {
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
- if (!pDNSService) {
- return NS_ERROR_UNEXPECTED;
- }
-
- nsXPIDLCString result;
-- const char *host = (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName;
-+ const char *host = GetSocketHost();
-+
-+ // XXX DNS service does not provide a synchronous resolver that returns
-+ // the entire nsHostEnt struct.
- rv = pDNSService->Resolve(host, getter_Copies(result));
- if (NS_FAILED(rv)) return rv;
-
-@@ -953,16 +976,18 @@
- return NS_ERROR_FAILURE;
- }
-
-+ mNetAddrList.Init(1);
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), mNetAddress);
-+
- if (addr.raw.family == PR_AF_INET)
-- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress->ipv6.ip);
- else
-- memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
--
-- mNetAddress.ipv6.port
-- = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+ memcpy(&mNetAddress->ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress->ipv6.ip));
-
- LOG(("address { family=%hu, port=%hu }\n",
-- mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+ mNetAddress->ipv6.family, PR_ntohs(mNetAddress->ipv6.port)));
- }
-
- //
-@@ -1036,7 +1061,6 @@
- if (mReadRequest) {
- if (mReadRequest->IsCanceled() || (mBytesExpected == 0)) {
- LOG(("nsSocketTransport: [this=%x] completing read request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_READ;
- mReadRequest->GetStatus(&readStatus);
- CompleteAsyncRead();
- if (NS_FAILED(readStatus))
-@@ -1078,7 +1102,6 @@
- if (mWriteRequest) {
- if (mWriteRequest->IsCanceled()) {
- LOG(("nsSocketTransport: [this=%x] completing write request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_WRITE;
- mWriteRequest->GetStatus(&writeStatus);
- CompleteAsyncWrite();
- if (NS_FAILED(writeStatus))
-@@ -1485,23 +1508,44 @@
- nsAutoMonitor mon(mMonitor);
- nsresult rv = NS_OK;
-
-- if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
-- if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-- memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
-- else
-- PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
-+ char **addrList = aHostEnt->hostEnt.h_addr_list;
-+
-+ if (addrList && addrList[0]) {
-+ PRUint32 len = 0;
-+
-+ LOG(("nsSocketTransport::OnFound [%s:%d %x] lookup succeeded [FQDN=%s]\n",
-+ mHostName, mPort, this, aHostEnt->hostEnt.h_name));
-+
-+ // determine the number of address in the list
-+ for (; *addrList; ++addrList)
-+ ++len;
-+ addrList -= len;
-+
-+ // allocate space for the addresses
-+ mNetAddrList.Init(len);
-+
-+ // populate the address list
-+ PRNetAddr *addr = nsnull;
-+ while ((addr = mNetAddrList.GetNext(addr)) != nsnull) {
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), addr);
-+ if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-+ memcpy(&addr->ipv6.ip, *addrList, sizeof(addr->ipv6.ip));
-+ else
-+ PR_ConvertIPv4AddrToIPv6(*(PRUint32 *)(*addrList), &addr->ipv6.ip);
-+ ++addrList;
- #if defined(PR_LOGGING)
-- char addrbuf[50];
-- PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
-- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-- " DNS lookup succeeded => %s (%s)\n",
-- mHostName, mPort, this,
-- aHostEnt->hostEnt.h_name,
-- addrbuf));
-+ char buf[50];
-+ PR_NetAddrToString(addr, buf, sizeof(buf));
-+ LOG((" => %s\n", buf));
- #endif
-- } else {
-- // XXX: What should happen here? The GetHostByName(...) succeeded but
-- // there are *no* A records...
-+ }
-+
-+ // start with first address in list
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+ }
-+ else {
-+ // XXX: What should happen here? The DNS lookup succeeded, but there
-+ // are no address records...
- rv = NS_ERROR_FAILURE;
-
- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-@@ -1531,7 +1575,7 @@
- // If the lookup failed, set the status...
- if (NS_FAILED(aStatus))
- mStatus = aStatus;
-- else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+ else if (mNetAddress == nsnull)
- mStatus = NS_ERROR_ABORT;
-
- // Start processing the transport again - if necessary...
-@@ -1852,7 +1896,7 @@
- *_retval = (char*)nsMemory::Alloc(aLen);
- if (!*_retval) return NS_ERROR_FAILURE;
-
-- PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+ PRStatus status = PR_NetAddrToString(mNetAddress, *_retval, aLen);
-
- if (PR_FAILURE == status) {
- nsMemory::Free(*_retval);
-@@ -1968,6 +2012,37 @@
-
- if (--mSocketRef == 0)
- CloseConnection();
-+}
-+
-+//
-+//----------------------------------------------------------------------------
-+// nsSocketTransport::nsNetAddrList
-+//----------------------------------------------------------------------------
-+//
-+
-+nsresult nsSocketTransport::
-+nsNetAddrList::Init(PRUint32 len)
-+{
-+ NS_ASSERTION(!mList, "already initialized");
-+ mList = new PRNetAddr[len];
-+ if (!mList)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+ mLen = len;
-+ return NS_OK;
-+}
-+
-+PRNetAddr *nsSocketTransport::
-+nsNetAddrList::GetNext(PRNetAddr *addr)
-+{
-+ if (!addr)
-+ return mList;
-+
-+ PRUint32 offset = addr - mList;
-+ NS_ASSERTION(offset < mLen, "invalid address");
-+ if (offset + 1 < mLen)
-+ return addr + 1;
-+
-+ return nsnull;
- }
-
- //
diff --git a/www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.h b/www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.h
deleted file mode 100644
index ed73e127f901..000000000000
--- a/www/seamonkey/files/patch-netwerk::base::src::nsSocketTransport.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- netwerk/base/src/nsSocketTransport.h.orig Fri Feb 8 11:20:24 2002
-+++ netwerk/base/src/nsSocketTransport.h Fri Feb 8 11:20:29 2002
-@@ -176,7 +176,7 @@
- PRFileDesc* GetSocket(void) { return mSocketFD; }
- PRInt16 GetSelectFlags(void) { return mSelectFlags; }
- PRCList* GetListNode(void) { return &mListLink; }
--
-+
- static nsSocketTransport* GetInstance(PRCList* qp) { return (nsSocketTransport*)((char*)qp - offsetof(nsSocketTransport, mListLink)); }
-
- PRBool CanBeReused() { return
-@@ -237,8 +237,27 @@
- inline void ClearFlag(nsSocketReadWriteInfo aFlag) {
- mReadWriteState &= ~aFlag;
- }
-+
-+ PRInt32 GetSocketPort(void) { return (mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort; }
-+ const char *GetSocketHost(void) { return (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName; }
-
- protected:
-+ class nsNetAddrList {
-+ public:
-+ nsNetAddrList() : mList(nsnull), mLen(0) {}
-+ ~nsNetAddrList() { delete[] mList; }
-+
-+ // allocate space for the address list
-+ nsresult Init(PRUint32 len);
-+
-+ // given a net addr in the list, return the next addr.
-+ // if given NULL, then return the first addr in the list.
-+ // returns NULL if given addr is the last addr.
-+ PRNetAddr *GetNext(PRNetAddr *currentAddr);
-+ private:
-+ PRNetAddr *mList;
-+ PRUint32 mLen;
-+ };
-
- nsSocketState mCurrentState;
- nsCOMPtr<nsIRequest> mDNSRequest;
-@@ -249,7 +268,8 @@
- PRIntervalTime mLastActiveTime;
- PRCList mListLink;
- PRMonitor* mMonitor;
-- PRNetAddr mNetAddress;
-+ nsNetAddrList mNetAddrList;
-+ PRNetAddr *mNetAddress;
- nsSocketOperation mOperation;
- nsCOMPtr<nsISupports> mSecurityInfo;
-
-@@ -415,6 +435,7 @@
- PRBool IsInitialized() { return mStartFired; }
- PRBool IsSuspended() { return mSuspendCount > 0; }
- PRBool IsCanceled() { return mCanceled; }
-+ PRBool HasFailed() { return NS_FAILED(mStatus); }
-
- void SetTransport(nsSocketTransport *);
- void SetObserver(nsIRequestObserver *obs) { mObserver = obs; }
diff --git a/www/seamonkey/files/patch-nsprpub::configure b/www/seamonkey/files/patch-nsprpub::configure
deleted file mode 100644
index b008097bf949..000000000000
--- a/www/seamonkey/files/patch-nsprpub::configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- nsprpub/configure.orig Tue Jan 22 23:57:37 2002
-+++ nsprpub/configure Thu Feb 14 01:13:13 2002
-@@ -3288,8 +3288,9 @@
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- MDCPUCFG_H=_freebsd.cfg
- PR_MD_CSRCS=freebsd.c
- ;;
-@@ -5091,8 +5092,15 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -5123,11 +5131,17 @@
- ;;
- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
- cat >> confdefs.h <<\EOF
-+#define _REENTRANT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
- EOF
-
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-- _PTHREAD_LDFLAGS=
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
- *-linux*)
diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt
index 05596784fcfe..660fc6e5b88a 100644
--- a/www/seamonkey/files/patch-qt
+++ b/www/seamonkey/files/patch-qt
@@ -1,11 +1,11 @@
$FreeBSD$
---- configure.orig Wed Dec 12 10:12:41 2001
-+++ configure Tue Dec 25 15:21:43 2001
-@@ -6186,6 +6186,9 @@
- os2*)
- LIBS=
+--- configure.orig Thu Mar 7 07:56:55 2002
++++ configure Tue Mar 12 17:15:06 2002
+@@ -6279,6 +6279,9 @@
+ # for stuff like -lXshm
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
@@ -13,16 +13,7 @@ $FreeBSD$
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
-@@ -7357,8 +7360,6 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
- fi
- fi
- rm -f conftest*
-@@ -7392,7 +7393,7 @@
+@@ -7512,7 +7515,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,7 +22,7 @@ $FreeBSD$
else
_PTHREAD_LDFLAGS="-lc_r"
fi
-@@ -9839,7 +9840,7 @@
+@@ -9954,7 +9957,7 @@
fi
MOC=$HOST_MOC
diff --git a/www/seamonkey/files/patch-security::coreconf::FreeBSD.mk b/www/seamonkey/files/patch-security::coreconf::FreeBSD.mk
index 1f33ac826a02..783d452b2896 100644
--- a/www/seamonkey/files/patch-security::coreconf::FreeBSD.mk
+++ b/www/seamonkey/files/patch-security::coreconf::FreeBSD.mk
@@ -1,6 +1,9 @@
---- security/coreconf/FreeBSD.mk.orig Tue Sep 19 05:53:08 2000
-+++ security/coreconf/FreeBSD.mk Thu Feb 14 14:19:02 2002
-@@ -35,27 +35,27 @@
+
+$FreeBSD$
+
+--- security/coreconf/FreeBSD.mk.orig Sat Mar 9 00:17:36 2002
++++ security/coreconf/FreeBSD.mk Tue Mar 12 17:19:15 2002
+@@ -35,9 +35,7 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -11,40 +14,12 @@
RANLIB = ranlib
ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
--OS_REL_CFLAGS = -Di386
- CPU_ARCH = x86
- endif
-
--OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-
- #
- # The default implementation strategy for FreeBSD is pthreads.
- #
- ifndef CLASSIC_NSPR
- USE_PTHREADS = 1
--DEFINES += -D_THREAD_SAFE
--THREAD_FLAG = -pthread
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+DSO_LDOPTS += -pthread
- endif
-
- ARCH = freebsd
-@@ -68,11 +68,7 @@
+@@ -70,7 +68,7 @@
DLL_SUFFIX = so.1.0
endif
--DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -Bshareable
--DSO_LDFLAGS =
--
--MKSHLIB = $(LD) $(DSO_LDOPTS)
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -o $@
-
- G++INCLUDES = -I/usr/include/g++
-
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp
deleted file mode 100644
index d1fec376adcf..000000000000
--- a/www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpfe/bootstrap/nsAppRunner.cpp.orig Mon Nov 26 16:53:29 2001
-+++ xpfe/bootstrap/nsAppRunner.cpp Mon Nov 26 16:54:12 2001
-@@ -1060,7 +1060,7 @@
-
- #if defined(FREEBSD)
- // pick up fpsetmask prototype.
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
-
- // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/seamonkey/pkg-plist b/www/seamonkey/pkg-plist
index 5a123b61a08d..c19f4c4cbf18 100644
--- a/www/seamonkey/pkg-plist
+++ b/www/seamonkey/pkg-plist
@@ -5,7 +5,6 @@ lib/mozilla/TestGtkEmbedNotebook
lib/mozilla/TestGtkEmbedSocket
lib/mozilla/bloaturls.txt
lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
lib/mozilla/chrome/chrome.rdf
lib/mozilla/chrome/chromelist.txt
lib/mozilla/chrome/classic.jar
@@ -41,10 +40,12 @@ lib/mozilla/components/autoconfig.xpt
lib/mozilla/components/bookmarks.xpt
lib/mozilla/components/caps.xpt
lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
lib/mozilla/components/chrome.xpt
+lib/mozilla/components/commandhandler.xpt
+lib/mozilla/components/composer.xpt
lib/mozilla/components/content.xpt
lib/mozilla/components/content_base.xpt
+lib/mozilla/components/content_html.xpt
lib/mozilla/components/content_xsl.xpt
lib/mozilla/components/cookie.xpt
lib/mozilla/components/directory.xpt
@@ -196,8 +197,10 @@ lib/mozilla/components/msgsmime.xpt
lib/mozilla/components/necko.xpt
lib/mozilla/components/necko_about.xpt
lib/mozilla/components/necko_cache.xpt
+lib/mozilla/components/necko_cookie.xpt
lib/mozilla/components/necko_data.xpt
lib/mozilla/components/necko_dns.xpt
+lib/mozilla/components/necko_file.xpt
lib/mozilla/components/necko_ftp.xpt
lib/mozilla/components/necko_http.xpt
lib/mozilla/components/necko_jar.xpt
@@ -209,8 +212,10 @@ lib/mozilla/components/nsDictionary.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/nsSidebar.js
+lib/mozilla/components/nsUpdateNotifier.js
lib/mozilla/components/nsXmlRpcClient.js
lib/mozilla/components/oji.xpt
lib/mozilla/components/pipboot.xpt
@@ -220,6 +225,7 @@ lib/mozilla/components/plugin.xpt
lib/mozilla/components/pref.xpt
lib/mozilla/components/prefmigr.xpt
lib/mozilla/components/profile.xpt
+lib/mozilla/components/progressDlg.xpt
lib/mozilla/components/proxyObjInst.xpt
lib/mozilla/components/rdf.xpt
lib/mozilla/components/regviewer.xpt
@@ -229,6 +235,7 @@ lib/mozilla/components/shistory.xpt
lib/mozilla/components/sidebar.xpt
lib/mozilla/components/signonviewer.xpt
lib/mozilla/components/smime-service.js
+lib/mozilla/components/timebomb.xpt
lib/mozilla/components/transformiix.xpt
lib/mozilla/components/txmgr.xpt
lib/mozilla/components/txtsvc.xpt
@@ -248,6 +255,8 @@ lib/mozilla/components/widget.xpt
lib/mozilla/components/windowwatcher.xpt
lib/mozilla/components/xml-rpc.xpt
lib/mozilla/components/xmlextras.xpt
+lib/mozilla/components/xmlschema.xpt
+lib/mozilla/components/xmlsoap.xpt
lib/mozilla/components/xpcom_base.xpt
lib/mozilla/components/xpcom_components.xpt
lib/mozilla/components/xpcom_ds.xpt
@@ -293,8 +302,6 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
lib/mozilla/defaults/wallet/StateSchema.tbl
lib/mozilla/defaults/wallet/VcardSchema.tbl
lib/mozilla/dirver
-lib/mozilla/dtd/mathml.dtd
-lib/mozilla/dtd/svg.dtd
lib/mozilla/icons/mozicon16.xpm
lib/mozilla/icons/mozicon50.xpm
lib/mozilla/libgkgfx.so
@@ -308,10 +315,14 @@ lib/mozilla/libmoz_art_lgpl.so
lib/mozilla/libmozjs.so
lib/mozilla/libmsgbaseutil.so
lib/mozilla/libnspr4.so
+lib/mozilla/libnss3.so
lib/mozilla/libnssckbi.so
lib/mozilla/libnullplugin.so
lib/mozilla/libplc4.so
lib/mozilla/libplds4.so
+lib/mozilla/libsmime3.so
+lib/mozilla/libsoftokn3.so
+lib/mozilla/libssl3.so
lib/mozilla/libxlibrgb.so
lib/mozilla/libxpcom.so
lib/mozilla/libxpistub.so
@@ -333,6 +344,9 @@ lib/mozilla/res/builtin/xbl-forms.css
lib/mozilla/res/charsetData.properties
lib/mozilla/res/charsetalias.properties
lib/mozilla/res/cmessage.txt
+lib/mozilla/res/dtd/mathml.dtd
+lib/mozilla/res/dtd/svg.dtd
+lib/mozilla/res/dtd/xhtml11.dtd
lib/mozilla/res/entityTables/html40Latin1.properties
lib/mozilla/res/entityTables/html40Special.properties
lib/mozilla/res/entityTables/html40Symbols.properties
@@ -357,6 +371,7 @@ lib/mozilla/res/html/gopher-find.gif
lib/mozilla/res/html/gopher-image.gif
lib/mozilla/res/html/gopher-menu.gif
lib/mozilla/res/html/gopher-movie.gif
+lib/mozilla/res/html/gopher-sound.gif
lib/mozilla/res/html/gopher-telnet.gif
lib/mozilla/res/html/gopher-text.gif
lib/mozilla/res/html/gopher-unknown.gif
@@ -500,6 +515,7 @@ lib/mozilla/searchplugins/lxrmozilla.gif
lib/mozilla/searchplugins/lxrmozilla.src
lib/mozilla/searchplugins/mozilla.gif
lib/mozilla/searchplugins/mozilla.src
+lib/mozilla/timebombgen
lib/mozilla/xpcshell
lib/mozilla/xpicleanup
lib/mozilla/xpidl
@@ -518,11 +534,11 @@ lib/mozilla/xpt_link
@dirrm lib/mozilla/res/gfx
@dirrm lib/mozilla/res/fonts
@dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/dtd
@dirrm lib/mozilla/res/builtin
@dirrm lib/mozilla/res
@dirrm lib/mozilla/plugins
@dirrm lib/mozilla/icons
-@dirrm lib/mozilla/dtd
@dirrm lib/mozilla/defaults/wallet
@dirrm lib/mozilla/defaults/profile/chrome
@dirrm lib/mozilla/defaults/profile/US/chrome
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index d5a3d29ac1bd..828d49469eba 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= mozilla
-PORTVERSION= 0.9.8
-PORTREVISION= 2
+PORTVERSION= 0.9.9
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
@@ -19,12 +18,14 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
+ freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
mng.1:${PORTSDIR}/graphics/libmng \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+ freetype.9:${PORTSDIR}/print/freetype2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 9139a7878c5f..c91e16ad7551 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-0.9.8.tar.bz2) = 17026a0dee5dd55932316dc93faa3fbb
-MD5 (libart_lgpl-0.9.8.tar.bz2) = dc954f8243a10cb68cf0e0bf598bf3ca
+MD5 (mozilla-source-0.9.9.tar.bz2) = ea8ec8580d8d71ad9ec33979550f01af
+MD5 (libart_lgpl-0.9.9.tar.bz2) = 7570ce10e9a78284d1653e54557edbd5
diff --git a/www/seamonkey2/files/patch-ak b/www/seamonkey2/files/patch-ak
deleted file mode 100644
index 5323d970afec..000000000000
--- a/www/seamonkey2/files/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- nsprpub/pr/include/md/_freebsd.h.orig Sat Jan 5 03:43:00 2002
-+++ nsprpub/pr/include/md/_freebsd.h Tue Feb 5 11:14:27 2002
-@@ -87,6 +88,12 @@
-
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
-+
-+#if __FreeBSD_version >= 400014
-+#define _PR_INET6
-+#define _PR_HAVE_GETHOSTBYNAME2
-+#define _PR_INET6_PROBE
-+#endif
-
- #define USE_SETJMP
-
diff --git a/www/seamonkey2/files/patch-embedding::config::basebrowser-unix b/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
index bd9b0b8bc67c..5eae8879b0ca 100644
--- a/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
+++ b/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
@@ -1,17 +1,17 @@
$FreeBSD$
---- embedding/config/basebrowser-unix.orig Wed Nov 21 00:21:59 2001
-+++ embedding/config/basebrowser-unix Tue Jan 15 15:26:55 2002
+--- embedding/config/basebrowser-unix.orig Thu Feb 7 23:50:19 2002
++++ embedding/config/basebrowser-unix Tue Mar 12 17:06:08 2002
@@ -119,6 +119,7 @@
; layout
components/libgkcontent.so
-+libmoz_art_lgpl.so
++libmoz_art_lgpl.so
+ res/dtd/*
components/libgklayout.so
components/libhtmlpars.so
- components/libgkview.so
-@@ -196,12 +197,12 @@
+@@ -203,12 +204,12 @@
components/unicharutil.xpt
components/libchardet.so
; optional - on english only systems
diff --git a/www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp b/www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp
deleted file mode 100644
index 24608f0b4c99..000000000000
--- a/www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- extensions/transformiix/source/base/Double.cpp.orig Sat Nov 24 00:36:13 2001
-+++ extensions/transformiix/source/base/Double.cpp Tue Dec 25 15:19:42 2001
-@@ -41,7 +41,7 @@
- #endif
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
- #ifndef TX_EXE
- #include "prdtoa.h"
-@@ -56,7 +56,11 @@
-
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
-+#ifdef __alpha__
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-+#else
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties b/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties
deleted file mode 100644
index 6cd5dcdeed9e..000000000000
--- a/www/seamonkey2/files/patch-intl::uconv::src::unixcharset.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- intl/uconv/src/unixcharset.properties.orig Wed Jan 9 04:13:10 2002
-+++ intl/uconv/src/unixcharset.properties Tue Feb 5 11:19:41 2002
-@@ -235,6 +235,8 @@
- locale.all.ru_SU.ISO_8859-5=ISO-8859-5
- # FreeBSD Russian
- locale.all.ru_SU.KOI8-R=KOI8-R
-+# FreeBSD Ukrainian
-+locale.all.uk_UA.KOI8-U=KOI8-U
- # Solaris
- locale.all.en_US.UTF-8=UTF-8
- # Solaris
diff --git a/www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.cpp b/www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.cpp
deleted file mode 100644
index c9adc8584c7d..000000000000
--- a/www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
---- netwerk/base/src/nsSocketTransport.cpp.orig Fri Feb 8 11:20:08 2002
-+++ netwerk/base/src/nsSocketTransport.cpp Fri Feb 8 11:20:16 2002
-@@ -143,6 +143,7 @@
- mHostName(nsnull),
- mPort(-1),
- mMonitor(nsnull),
-+ mNetAddress(nsnull),
- mOperation(eSocketOperation_None),
- mProxyPort(-1),
- mProxyHost(nsnull),
-@@ -183,12 +184,6 @@
- SetWriteType(eSocketWrite_None);
-
- //
-- // Set up Internet defaults...
-- //
-- memset(&mNetAddress, 0, sizeof(mNetAddress));
-- PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
--
-- //
- // Initialize the global connect timeout value if necessary...
- //
- if (PR_INTERVAL_NO_WAIT == gConnectTimeout)
-@@ -415,6 +410,14 @@
-
- while (!done) {
- //
-+ // Check for failure on any socket requests
-+ //
-+ if (mReadRequest && mReadRequest->HasFailed())
-+ mReadRequest->GetStatus(&mStatus);
-+ else if (mWriteRequest && mWriteRequest->HasFailed())
-+ mWriteRequest->GetStatus(&mStatus);
-+
-+ //
- // If an error has occurred then move into the error state...
- //
- if (NS_FAILED(mStatus) && (NS_BASE_STREAM_WOULD_BLOCK != mStatus))
-@@ -495,17 +498,40 @@
- // Send status message
- // only send a status if doResolveHost is going to do some
- // resolution
-- if (mStatus != NS_OK)
-+ if (mStatus == NS_BASE_STREAM_WOULD_BLOCK)
- OnStatus_Locked(NS_NET_STATUS_RESOLVING_HOST);
- break;
-
- case eSocketState_WaitConnect:
- LOG(("nsSocketTransport: Transport [host=%s:%d this=%x] is in WaitConnect state.\n",
- mHostName, mPort, this));
-- mStatus = doConnection(aSelectFlags);
-
- // Send status message
- OnStatus_Locked(NS_NET_STATUS_CONNECTING_TO);
-+
-+ mStatus = doConnection(aSelectFlags);
-+
-+ // 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);
-+ done = PR_TRUE;
-+ continue;
-+ }
-+ }
- break;
-
- case eSocketState_WaitReadWrite:
-@@ -633,21 +659,19 @@
-
- NS_ASSERTION(eSocketState_WaitDNS == mCurrentState, "Wrong state.");
-
-- LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d this=%x].\n",
-+ LOG(("nsSocketTransport: Entering doResolveHost() [host=%s:%d %x].\n",
- mHostName, mPort, this));
-
-+ //
-+ // The hostname is being resolved...
-+ //
-+ if (mDNSRequest)
-+ return NS_BASE_STREAM_WOULD_BLOCK;
-+
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-- //
-- // Initialize the port used for the connection...
-- //
-- // XXX: The list of ports must be restricted - see net_bad_ports_table[] in
-- // mozilla/network/main/mkconect.c
-- //
-- mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
--
-+ if (mNetAddress == nsnull) {
- PR_ExitMonitor(mMonitor);
-
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
-@@ -659,9 +683,7 @@
- // Give up the SocketTransport lock. This allows the DNS thread to call the
- // nsIDNSListener notifications without blocking...
- //
-- rv = pDNSService->Lookup((mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName,
-- this,
-- nsnull,
-+ rv = pDNSService->Lookup(GetSocketHost(), this, nsnull,
- getter_AddRefs(mDNSRequest));
- //
- // Aquire the SocketTransport lock again...
-@@ -672,7 +694,7 @@
- //
- // The DNS lookup has finished... It has either failed or succeeded.
- //
-- if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (NS_FAILED(mStatus) || mNetAddress) {
- mDNSRequest = 0;
- rv = mStatus;
- }
-@@ -687,10 +709,8 @@
- }
- }
-
-- LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x].\t"
-- "rv = %x.\n\n",
-+ LOG(("nsSocketTransport: Leaving doResolveHost() [%s:%d %x] rv = %x\n",
- mHostName, mPort, this, rv));
--
- return rv;
- }
-
-@@ -832,7 +852,7 @@
- // This is only done the first time doConnection(...) is called.
- //
- if (NS_SUCCEEDED(rv)) {
-- status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
-+ status = PR_Connect(mSocketFD, mNetAddress, gConnectTimeout);
- if (PR_SUCCESS != status) {
- PRErrorCode code = PR_GetError();
- //
-@@ -932,14 +952,17 @@
- //
- // The hostname has not been resolved yet...
- //
-- if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+ if (mNetAddress == nsnull) {
- nsIDNSService* pDNSService = mService->GetCachedDNSService();
- if (!pDNSService) {
- return NS_ERROR_UNEXPECTED;
- }
-
- nsXPIDLCString result;
-- const char *host = (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName;
-+ const char *host = GetSocketHost();
-+
-+ // XXX DNS service does not provide a synchronous resolver that returns
-+ // the entire nsHostEnt struct.
- rv = pDNSService->Resolve(host, getter_Copies(result));
- if (NS_FAILED(rv)) return rv;
-
-@@ -953,16 +976,18 @@
- return NS_ERROR_FAILURE;
- }
-
-+ mNetAddrList.Init(1);
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), mNetAddress);
-+
- if (addr.raw.family == PR_AF_INET)
-- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress->ipv6.ip);
- else
-- memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
--
-- mNetAddress.ipv6.port
-- = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+ memcpy(&mNetAddress->ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress->ipv6.ip));
-
- LOG(("address { family=%hu, port=%hu }\n",
-- mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+ mNetAddress->ipv6.family, PR_ntohs(mNetAddress->ipv6.port)));
- }
-
- //
-@@ -1036,7 +1061,6 @@
- if (mReadRequest) {
- if (mReadRequest->IsCanceled() || (mBytesExpected == 0)) {
- LOG(("nsSocketTransport: [this=%x] completing read request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_READ;
- mReadRequest->GetStatus(&readStatus);
- CompleteAsyncRead();
- if (NS_FAILED(readStatus))
-@@ -1078,7 +1102,6 @@
- if (mWriteRequest) {
- if (mWriteRequest->IsCanceled()) {
- LOG(("nsSocketTransport: [this=%x] completing write request due to cancelation\n", this));
-- mSelectFlags &= ~PR_POLL_WRITE;
- mWriteRequest->GetStatus(&writeStatus);
- CompleteAsyncWrite();
- if (NS_FAILED(writeStatus))
-@@ -1485,23 +1508,44 @@
- nsAutoMonitor mon(mMonitor);
- nsresult rv = NS_OK;
-
-- if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
-- if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-- memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
-- else
-- PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
-+ char **addrList = aHostEnt->hostEnt.h_addr_list;
-+
-+ if (addrList && addrList[0]) {
-+ PRUint32 len = 0;
-+
-+ LOG(("nsSocketTransport::OnFound [%s:%d %x] lookup succeeded [FQDN=%s]\n",
-+ mHostName, mPort, this, aHostEnt->hostEnt.h_name));
-+
-+ // determine the number of address in the list
-+ for (; *addrList; ++addrList)
-+ ++len;
-+ addrList -= len;
-+
-+ // allocate space for the addresses
-+ mNetAddrList.Init(len);
-+
-+ // populate the address list
-+ PRNetAddr *addr = nsnull;
-+ while ((addr = mNetAddrList.GetNext(addr)) != nsnull) {
-+ PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, GetSocketPort(), addr);
-+ if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
-+ memcpy(&addr->ipv6.ip, *addrList, sizeof(addr->ipv6.ip));
-+ else
-+ PR_ConvertIPv4AddrToIPv6(*(PRUint32 *)(*addrList), &addr->ipv6.ip);
-+ ++addrList;
- #if defined(PR_LOGGING)
-- char addrbuf[50];
-- PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
-- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-- " DNS lookup succeeded => %s (%s)\n",
-- mHostName, mPort, this,
-- aHostEnt->hostEnt.h_name,
-- addrbuf));
-+ char buf[50];
-+ PR_NetAddrToString(addr, buf, sizeof(buf));
-+ LOG((" => %s\n", buf));
- #endif
-- } else {
-- // XXX: What should happen here? The GetHostByName(...) succeeded but
-- // there are *no* A records...
-+ }
-+
-+ // start with first address in list
-+ mNetAddress = mNetAddrList.GetNext(nsnull);
-+ }
-+ else {
-+ // XXX: What should happen here? The DNS lookup succeeded, but there
-+ // are no address records...
- rv = NS_ERROR_FAILURE;
-
- LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-@@ -1531,7 +1575,7 @@
- // If the lookup failed, set the status...
- if (NS_FAILED(aStatus))
- mStatus = aStatus;
-- else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+ else if (mNetAddress == nsnull)
- mStatus = NS_ERROR_ABORT;
-
- // Start processing the transport again - if necessary...
-@@ -1852,7 +1896,7 @@
- *_retval = (char*)nsMemory::Alloc(aLen);
- if (!*_retval) return NS_ERROR_FAILURE;
-
-- PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+ PRStatus status = PR_NetAddrToString(mNetAddress, *_retval, aLen);
-
- if (PR_FAILURE == status) {
- nsMemory::Free(*_retval);
-@@ -1968,6 +2012,37 @@
-
- if (--mSocketRef == 0)
- CloseConnection();
-+}
-+
-+//
-+//----------------------------------------------------------------------------
-+// nsSocketTransport::nsNetAddrList
-+//----------------------------------------------------------------------------
-+//
-+
-+nsresult nsSocketTransport::
-+nsNetAddrList::Init(PRUint32 len)
-+{
-+ NS_ASSERTION(!mList, "already initialized");
-+ mList = new PRNetAddr[len];
-+ if (!mList)
-+ return NS_ERROR_OUT_OF_MEMORY;
-+ mLen = len;
-+ return NS_OK;
-+}
-+
-+PRNetAddr *nsSocketTransport::
-+nsNetAddrList::GetNext(PRNetAddr *addr)
-+{
-+ if (!addr)
-+ return mList;
-+
-+ PRUint32 offset = addr - mList;
-+ NS_ASSERTION(offset < mLen, "invalid address");
-+ if (offset + 1 < mLen)
-+ return addr + 1;
-+
-+ return nsnull;
- }
-
- //
diff --git a/www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.h b/www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.h
deleted file mode 100644
index ed73e127f901..000000000000
--- a/www/seamonkey2/files/patch-netwerk::base::src::nsSocketTransport.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- netwerk/base/src/nsSocketTransport.h.orig Fri Feb 8 11:20:24 2002
-+++ netwerk/base/src/nsSocketTransport.h Fri Feb 8 11:20:29 2002
-@@ -176,7 +176,7 @@
- PRFileDesc* GetSocket(void) { return mSocketFD; }
- PRInt16 GetSelectFlags(void) { return mSelectFlags; }
- PRCList* GetListNode(void) { return &mListLink; }
--
-+
- static nsSocketTransport* GetInstance(PRCList* qp) { return (nsSocketTransport*)((char*)qp - offsetof(nsSocketTransport, mListLink)); }
-
- PRBool CanBeReused() { return
-@@ -237,8 +237,27 @@
- inline void ClearFlag(nsSocketReadWriteInfo aFlag) {
- mReadWriteState &= ~aFlag;
- }
-+
-+ PRInt32 GetSocketPort(void) { return (mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort; }
-+ const char *GetSocketHost(void) { return (mProxyHost && !mProxyTransparent) ? mProxyHost : mHostName; }
-
- protected:
-+ class nsNetAddrList {
-+ public:
-+ nsNetAddrList() : mList(nsnull), mLen(0) {}
-+ ~nsNetAddrList() { delete[] mList; }
-+
-+ // allocate space for the address list
-+ nsresult Init(PRUint32 len);
-+
-+ // given a net addr in the list, return the next addr.
-+ // if given NULL, then return the first addr in the list.
-+ // returns NULL if given addr is the last addr.
-+ PRNetAddr *GetNext(PRNetAddr *currentAddr);
-+ private:
-+ PRNetAddr *mList;
-+ PRUint32 mLen;
-+ };
-
- nsSocketState mCurrentState;
- nsCOMPtr<nsIRequest> mDNSRequest;
-@@ -249,7 +268,8 @@
- PRIntervalTime mLastActiveTime;
- PRCList mListLink;
- PRMonitor* mMonitor;
-- PRNetAddr mNetAddress;
-+ nsNetAddrList mNetAddrList;
-+ PRNetAddr *mNetAddress;
- nsSocketOperation mOperation;
- nsCOMPtr<nsISupports> mSecurityInfo;
-
-@@ -415,6 +435,7 @@
- PRBool IsInitialized() { return mStartFired; }
- PRBool IsSuspended() { return mSuspendCount > 0; }
- PRBool IsCanceled() { return mCanceled; }
-+ PRBool HasFailed() { return NS_FAILED(mStatus); }
-
- void SetTransport(nsSocketTransport *);
- void SetObserver(nsIRequestObserver *obs) { mObserver = obs; }
diff --git a/www/seamonkey2/files/patch-nsprpub::configure b/www/seamonkey2/files/patch-nsprpub::configure
deleted file mode 100644
index b008097bf949..000000000000
--- a/www/seamonkey2/files/patch-nsprpub::configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- nsprpub/configure.orig Tue Jan 22 23:57:37 2002
-+++ nsprpub/configure Thu Feb 14 01:13:13 2002
-@@ -3288,8 +3288,9 @@
- else
- DLL_SUFFIX=so.1.0
- fi
-+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS=-Bshareable
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- MDCPUCFG_H=_freebsd.cfg
- PR_MD_CSRCS=freebsd.c
- ;;
-@@ -5091,8 +5092,15 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
-+ case "$target_os" in
-+ freebsd*)
-+# Freebsd doesn't use -pthread for compiles, it uses them for linking
-+ ;;
-+ *)
-+ CFLAGS="$CFLAGS -pthread"
-+ CXXFLAGS="$CXXFLAGS -pthread"
-+ ;;
-+ esac
- fi
- fi
- rm -f conftest*
-@@ -5123,11 +5131,17 @@
- ;;
- *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
- cat >> confdefs.h <<\EOF
-+#define _REENTRANT 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
- #define _THREAD_SAFE 1
- EOF
-
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-- _PTHREAD_LDFLAGS=
-+ _PTHREAD_LDFLAGS="-pthread"
-+ else
-+ _PTHREAD_LDFLAGS="-lc_r"
- fi
- ;;
- *-linux*)
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index 05596784fcfe..660fc6e5b88a 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,11 +1,11 @@
$FreeBSD$
---- configure.orig Wed Dec 12 10:12:41 2001
-+++ configure Tue Dec 25 15:21:43 2001
-@@ -6186,6 +6186,9 @@
- os2*)
- LIBS=
+--- configure.orig Thu Mar 7 07:56:55 2002
++++ configure Tue Mar 12 17:15:06 2002
+@@ -6279,6 +6279,9 @@
+ # for stuff like -lXshm
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
@@ -13,16 +13,7 @@ $FreeBSD$
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
-@@ -7357,8 +7360,6 @@
- if test $? -eq 0; then
- if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- ac_cv_have_dash_pthread=yes
-- CFLAGS="$CFLAGS -pthread"
-- CXXFLAGS="$CXXFLAGS -pthread"
- fi
- fi
- rm -f conftest*
-@@ -7392,7 +7393,7 @@
+@@ -7512,7 +7515,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,7 +22,7 @@ $FreeBSD$
else
_PTHREAD_LDFLAGS="-lc_r"
fi
-@@ -9839,7 +9840,7 @@
+@@ -9954,7 +9957,7 @@
fi
MOC=$HOST_MOC
diff --git a/www/seamonkey2/files/patch-security::coreconf::FreeBSD.mk b/www/seamonkey2/files/patch-security::coreconf::FreeBSD.mk
index 1f33ac826a02..783d452b2896 100644
--- a/www/seamonkey2/files/patch-security::coreconf::FreeBSD.mk
+++ b/www/seamonkey2/files/patch-security::coreconf::FreeBSD.mk
@@ -1,6 +1,9 @@
---- security/coreconf/FreeBSD.mk.orig Tue Sep 19 05:53:08 2000
-+++ security/coreconf/FreeBSD.mk Thu Feb 14 14:19:02 2002
-@@ -35,27 +35,27 @@
+
+$FreeBSD$
+
+--- security/coreconf/FreeBSD.mk.orig Sat Mar 9 00:17:36 2002
++++ security/coreconf/FreeBSD.mk Tue Mar 12 17:19:15 2002
+@@ -35,9 +35,7 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -11,40 +14,12 @@
RANLIB = ranlib
ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
--OS_REL_CFLAGS = -Di386
- CPU_ARCH = x86
- endif
-
--OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS = -fPIC
-+DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
-
- #
- # The default implementation strategy for FreeBSD is pthreads.
- #
- ifndef CLASSIC_NSPR
- USE_PTHREADS = 1
--DEFINES += -D_THREAD_SAFE
--THREAD_FLAG = -pthread
-+DEFINES += -D_THREAD_SAFE -D_REENTRANT
-+DSO_LDOPTS += -pthread
- endif
-
- ARCH = freebsd
-@@ -68,11 +68,7 @@
+@@ -70,7 +68,7 @@
DLL_SUFFIX = so.1.0
endif
--DSO_CFLAGS = -fPIC
--DSO_LDOPTS = -Bshareable
--DSO_LDFLAGS =
--
--MKSHLIB = $(LD) $(DSO_LDOPTS)
+-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) $(DSO_LDOPTS) -o $@
-
- G++INCLUDES = -I/usr/include/g++
-
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp
deleted file mode 100644
index d1fec376adcf..000000000000
--- a/www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpfe/bootstrap/nsAppRunner.cpp.orig Mon Nov 26 16:53:29 2001
-+++ xpfe/bootstrap/nsAppRunner.cpp Mon Nov 26 16:54:12 2001
-@@ -1060,7 +1060,7 @@
-
- #if defined(FREEBSD)
- // pick up fpsetmask prototype.
--#include <floatingpoint.h>
-+#include <ieeefp.h>
- #endif
-
- // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/seamonkey2/pkg-plist b/www/seamonkey2/pkg-plist
index 5a123b61a08d..c19f4c4cbf18 100644
--- a/www/seamonkey2/pkg-plist
+++ b/www/seamonkey2/pkg-plist
@@ -5,7 +5,6 @@ lib/mozilla/TestGtkEmbedNotebook
lib/mozilla/TestGtkEmbedSocket
lib/mozilla/bloaturls.txt
lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
lib/mozilla/chrome/chrome.rdf
lib/mozilla/chrome/chromelist.txt
lib/mozilla/chrome/classic.jar
@@ -41,10 +40,12 @@ lib/mozilla/components/autoconfig.xpt
lib/mozilla/components/bookmarks.xpt
lib/mozilla/components/caps.xpt
lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
lib/mozilla/components/chrome.xpt
+lib/mozilla/components/commandhandler.xpt
+lib/mozilla/components/composer.xpt
lib/mozilla/components/content.xpt
lib/mozilla/components/content_base.xpt
+lib/mozilla/components/content_html.xpt
lib/mozilla/components/content_xsl.xpt
lib/mozilla/components/cookie.xpt
lib/mozilla/components/directory.xpt
@@ -196,8 +197,10 @@ lib/mozilla/components/msgsmime.xpt
lib/mozilla/components/necko.xpt
lib/mozilla/components/necko_about.xpt
lib/mozilla/components/necko_cache.xpt
+lib/mozilla/components/necko_cookie.xpt
lib/mozilla/components/necko_data.xpt
lib/mozilla/components/necko_dns.xpt
+lib/mozilla/components/necko_file.xpt
lib/mozilla/components/necko_ftp.xpt
lib/mozilla/components/necko_http.xpt
lib/mozilla/components/necko_jar.xpt
@@ -209,8 +212,10 @@ lib/mozilla/components/nsDictionary.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/nsSidebar.js
+lib/mozilla/components/nsUpdateNotifier.js
lib/mozilla/components/nsXmlRpcClient.js
lib/mozilla/components/oji.xpt
lib/mozilla/components/pipboot.xpt
@@ -220,6 +225,7 @@ lib/mozilla/components/plugin.xpt
lib/mozilla/components/pref.xpt
lib/mozilla/components/prefmigr.xpt
lib/mozilla/components/profile.xpt
+lib/mozilla/components/progressDlg.xpt
lib/mozilla/components/proxyObjInst.xpt
lib/mozilla/components/rdf.xpt
lib/mozilla/components/regviewer.xpt
@@ -229,6 +235,7 @@ lib/mozilla/components/shistory.xpt
lib/mozilla/components/sidebar.xpt
lib/mozilla/components/signonviewer.xpt
lib/mozilla/components/smime-service.js
+lib/mozilla/components/timebomb.xpt
lib/mozilla/components/transformiix.xpt
lib/mozilla/components/txmgr.xpt
lib/mozilla/components/txtsvc.xpt
@@ -248,6 +255,8 @@ lib/mozilla/components/widget.xpt
lib/mozilla/components/windowwatcher.xpt
lib/mozilla/components/xml-rpc.xpt
lib/mozilla/components/xmlextras.xpt
+lib/mozilla/components/xmlschema.xpt
+lib/mozilla/components/xmlsoap.xpt
lib/mozilla/components/xpcom_base.xpt
lib/mozilla/components/xpcom_components.xpt
lib/mozilla/components/xpcom_ds.xpt
@@ -293,8 +302,6 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
lib/mozilla/defaults/wallet/StateSchema.tbl
lib/mozilla/defaults/wallet/VcardSchema.tbl
lib/mozilla/dirver
-lib/mozilla/dtd/mathml.dtd
-lib/mozilla/dtd/svg.dtd
lib/mozilla/icons/mozicon16.xpm
lib/mozilla/icons/mozicon50.xpm
lib/mozilla/libgkgfx.so
@@ -308,10 +315,14 @@ lib/mozilla/libmoz_art_lgpl.so
lib/mozilla/libmozjs.so
lib/mozilla/libmsgbaseutil.so
lib/mozilla/libnspr4.so
+lib/mozilla/libnss3.so
lib/mozilla/libnssckbi.so
lib/mozilla/libnullplugin.so
lib/mozilla/libplc4.so
lib/mozilla/libplds4.so
+lib/mozilla/libsmime3.so
+lib/mozilla/libsoftokn3.so
+lib/mozilla/libssl3.so
lib/mozilla/libxlibrgb.so
lib/mozilla/libxpcom.so
lib/mozilla/libxpistub.so
@@ -333,6 +344,9 @@ lib/mozilla/res/builtin/xbl-forms.css
lib/mozilla/res/charsetData.properties
lib/mozilla/res/charsetalias.properties
lib/mozilla/res/cmessage.txt
+lib/mozilla/res/dtd/mathml.dtd
+lib/mozilla/res/dtd/svg.dtd
+lib/mozilla/res/dtd/xhtml11.dtd
lib/mozilla/res/entityTables/html40Latin1.properties
lib/mozilla/res/entityTables/html40Special.properties
lib/mozilla/res/entityTables/html40Symbols.properties
@@ -357,6 +371,7 @@ lib/mozilla/res/html/gopher-find.gif
lib/mozilla/res/html/gopher-image.gif
lib/mozilla/res/html/gopher-menu.gif
lib/mozilla/res/html/gopher-movie.gif
+lib/mozilla/res/html/gopher-sound.gif
lib/mozilla/res/html/gopher-telnet.gif
lib/mozilla/res/html/gopher-text.gif
lib/mozilla/res/html/gopher-unknown.gif
@@ -500,6 +515,7 @@ lib/mozilla/searchplugins/lxrmozilla.gif
lib/mozilla/searchplugins/lxrmozilla.src
lib/mozilla/searchplugins/mozilla.gif
lib/mozilla/searchplugins/mozilla.src
+lib/mozilla/timebombgen
lib/mozilla/xpcshell
lib/mozilla/xpicleanup
lib/mozilla/xpidl
@@ -518,11 +534,11 @@ lib/mozilla/xpt_link
@dirrm lib/mozilla/res/gfx
@dirrm lib/mozilla/res/fonts
@dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/dtd
@dirrm lib/mozilla/res/builtin
@dirrm lib/mozilla/res
@dirrm lib/mozilla/plugins
@dirrm lib/mozilla/icons
-@dirrm lib/mozilla/dtd
@dirrm lib/mozilla/defaults/wallet
@dirrm lib/mozilla/defaults/profile/chrome
@dirrm lib/mozilla/defaults/profile/US/chrome