Update to mozilla 0.7

Most major change is SSL daemon(psm) has included.
See release notes for detail.

http://www.mozilla.org/releases/mozilla0.7/

18 files changed, 266 insertions, 312 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 1935f9319d5..5ef789574c3 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.51 2000/12/25 02:16:07 martin Exp $
+# $NetBSD: Makefile,v 1.52 2001/01/16 16:01:21 taya Exp $
 
-DISTNAME=	mozilla-source
-PKGNAME=	mozilla-0.6
+DISTNAME=	mozilla-source-0.7
+PKGNAME=	mozilla-0.7
 WRKSRC=		${WRKDIR}/mozilla
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla0.6/src/
+MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla0.7/src/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
@@ -18,8 +18,6 @@ DEPENDS+=	ORBit>=0.5.1:../../net/ORBit
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png>=1.0.6:../../graphics/png
 
-DIST_SUBDIR=	${PKGNAME}
-
 ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \
 			NetBSD-1.5_ALPHA-i386 NetBSD-1.5_BETA-* \
 			NetBSD-1.[5-9]*-*
@@ -34,7 +32,7 @@ CONFIGURE_ARGS=	--disable-tests \
 		--with-png=${LOCALBASE} \
 		--enable-mathml \
 		--enable-svg \
-		--with-extensions=cookie,irc,wallet,xmlextras,psm-glue,xml-rpc
+		--with-extensions=cookie,irc,wallet,xmlextras,xml-rpc
 
 MOZ_LIBDIR=	${PREFIX}/lib/mozilla
 MAKE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
@@ -71,6 +69,10 @@ post-extract:
 pre-configure:
 	(cd ${WRKSRC} && autoconf)
 
+do-build:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} BUILD_MODULES=psm
+
 post-build:
 	${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
 	${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
diff --git a/www/mozilla/files/md5 b/www/mozilla/files/md5
index dbbd41d6959..565149da031 100644
--- a/www/mozilla/files/md5
+++ b/www/mozilla/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.19 2000/12/15 07:16:22 martin Exp $
+$NetBSD: md5,v 1.20 2001/01/16 16:01:21 taya Exp $
 
-MD5 (mozilla-0.6/mozilla-source.tar.bz2) = d56e61cfeb77f6889e62ab953e8a723d
+MD5 (mozilla-source-0.7.tar.bz2) = 0cb8c0d2623654cc831f503b394fac97
diff --git a/www/mozilla/files/patch-sum b/www/mozilla/files/patch-sum
index b104ea8f151..7c829b27004 100644
--- a/www/mozilla/files/patch-sum
+++ b/www/mozilla/files/patch-sum
@@ -1,14 +1,15 @@
-$NetBSD: patch-sum,v 1.42 2001/01/13 19:52:07 mycroft Exp $
+$NetBSD: patch-sum,v 1.43 2001/01/16 16:01:21 taya Exp $
 
-MD5 (patch-aa) = 2a3d8cae3a7c1c9793d0db7321f801bd
-MD5 (patch-ab) = 04807fe4703cc24b08d25fdbd3db2c4e
+MD5 (patch-aa) = 0fe7add7513f8b9dc51db32332e40997
+MD5 (patch-ab) = efa1943830a07a011187e0de0c7b343f
 MD5 (patch-ac) = 37c5e93a87f43262c38c9fe46a513740
-MD5 (patch-ad) = fc1c16d8b3148f9d6aec5982c1a38400
-MD5 (patch-ae) = 576be09ebce960ac0d970c3a80b8591e
-MD5 (patch-af) = 316103ca86d2a079d940cff8102849f1
-MD5 (patch-ag) = 37e370b4c51c8ffb5fc4c9dd2f1ace98
+MD5 (patch-ad) = 3b1e8f72066f489a56f23bcdc0f3cd8d
+MD5 (patch-af) = c9236a83a307ec1ffa1a440ba4686507
+MD5 (patch-ag) = 05078a1e8064f7b4c05c6b32a81b1eb0
 MD5 (patch-ah) = 8f6975c0fb5454958416f2b87d789c99
-MD5 (patch-ai) = ebd71ac01fc02d0fa639af6348d1926e
-MD5 (patch-aj) = dae5f7b6f80a833fd63721c5c751fe0b
-MD5 (patch-am) = ae0011f145fee15042a104d9a67a7b44
+MD5 (patch-aj) = 355b0025e6cf2273acd1ba56a4f40d5e
+MD5 (patch-ak) = ca73d68752d0b4df37fa09874729765a
 MD5 (patch-an) = d675e27cb5f6cd403aafab081b8e84c7
+MD5 (patch-ao) = 8bd97f325ab2bb49f95ba54dfa949253
+MD5 (patch-ap) = e4a8d17fbadd8f92ae83e9b2d4a09a08
+MD5 (patch-aq) = 734f5fb211b0d290f42c4463f1d7c464
diff --git a/www/mozilla/patches/patch-aa b/www/mozilla/patches/patch-aa
index 7b4589a7300..12302fe1b3f 100644
--- a/www/mozilla/patches/patch-aa
+++ b/www/mozilla/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.16 2001/01/13 19:33:27 mycroft Exp $
+$NetBSD: patch-aa,v 1.17 2001/01/16 16:01:21 taya Exp $
 
---- config/autoconf.mk.in.orig	Fri Sep 15 00:19:30 2000
-+++ config/autoconf.mk.in	Sat Jan 13 19:25:34 2001
-@@ -72,7 +72,6 @@
+diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
+--- ../Orig/mozilla/config/autoconf.mk.in	Wed Dec 27 07:19:14 2000
++++ ./config/autoconf.mk.in	Mon Jan 15 15:36:23 2001
+@@ -75,7 +75,6 @@
  NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
  ENABLE_TESTS	= @ENABLE_TESTS@
  BUILD_IDLC = @BUILD_IDLC@
@@ -10,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2001/01/13 19:33:27 mycroft Exp $
  MOZ_ENDER_LITE = @MOZ_ENDER_LITE@
  MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
  
-@@ -238,8 +237,6 @@
+@@ -243,8 +242,6 @@
  MKSHLIB_UNFORCE_ALL     = @MKSHLIB_UNFORCE_ALL@
  DSO_LDOPTS              = @DSO_LDOPTS@
  DLL_SUFFIX              = @DLL_SUFFIX@
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index fb3e6ea8112..4b3ffa5a2e5 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
+$NetBSD: patch-ab,v 1.18 2001/01/16 16:01:22 taya Exp $
 
---- configure.in.orig	Mon Nov 20 22:51:07 2000
-+++ configure.in	Sat Jan 13 19:25:11 2001
-@@ -358,9 +358,6 @@
+diff -ru ../Orig/mozilla/configure.in ./configure.in
+--- ../Orig/mozilla/configure.in	Wed Dec 27 07:19:13 2000
++++ ./configure.in	Mon Jan 15 15:36:25 2001
+@@ -367,9 +367,6 @@
  LIB_SUFFIX=a
  TARGET_MD_ARCH=unix
  DIRENT_INO=d_ino
@@ -12,7 +13,7 @@ $NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
  
  MOZ_JPEG_CFLAGS=
  MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
-@@ -701,31 +698,18 @@
+@@ -719,31 +716,18 @@
      if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
          DLL_SUFFIX=".so"
          DSO_PIC_CFLAGS='-fPIC -DPIC'
@@ -51,7 +52,7 @@ $NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
      fi
      ;;
  
-@@ -977,11 +961,6 @@
+@@ -1000,11 +984,6 @@
  
  esac
  
@@ -63,7 +64,7 @@ $NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
  dnl Only one oddball right now (QNX), but this gives us flexibility
  dnl if any other platforms need to override this in the future.
  AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
-@@ -1193,12 +1172,6 @@
+@@ -1219,12 +1198,6 @@
      AM_PATH_GTK($GTK_VERSION,,
        AC_MSG_ERROR(Test for GTK failed.))
  
@@ -76,7 +77,7 @@ $NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
  dnl ========================================================
  dnl =							   =
  dnl = --with-java-supplement				   =
-@@ -1685,13 +1658,6 @@
+@@ -1726,13 +1699,6 @@
  AC_SUBST(GLIB_CFLAGS)
  AC_SUBST(GLIB_LIBS)
  
@@ -90,7 +91,7 @@ $NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ========================================================
  AC_C_CONST
-@@ -2003,6 +1969,9 @@
+@@ -2100,6 +2066,9 @@
  				CXXFLAGS="$CXXFLAGS -mt" 
  			fi
  			;;
@@ -98,5 +99,5 @@ $NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
 +		USE_PTHREADS=
 +		_PTHREAD_LDFLAGS=
  	esac
- 	AC_MSG_RESULT($ac_cv_have_dash_pthread)
  fi
+ 
diff --git a/www/mozilla/patches/patch-ad b/www/mozilla/patches/patch-ad
index df6d2bb9441..48ef11fbcd5 100644
--- a/www/mozilla/patches/patch-ad
+++ b/www/mozilla/patches/patch-ad
@@ -1,10 +1,9 @@
-$NetBSD: patch-ad,v 1.17 2000/12/25 02:16:07 martin Exp $
+$NetBSD: patch-ad,v 1.18 2001/01/16 16:01:22 taya Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig	Thu Jul  6 22:46:02 2000
-+++ nsprpub/pr/include/md/_netbsd.h	Sat Dec 23 23:17:43 2000
-@@ -59,52 +59,107 @@
- #define _PR_POLL_AVAILABLE
- #define _PR_USE_POLL
+diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	Mon Dec 11 00:23:12 2000
++++ ./nsprpub/pr/include/md/_netbsd.h	Mon Jan 15 15:37:54 2001
+@@ -62,6 +62,12 @@
  #define _PR_HAVE_SYSV_SEMAPHORES
  #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
  
@@ -17,124 +16,3 @@ $NetBSD: patch-ad,v 1.17 2000/12/25 02:16:07 martin Exp $
  #define USE_SETJMP
  
  #ifndef _PR_PTHREADS
- #include <setjmp.h>
- 
- #define PR_CONTEXT_TYPE	sigjmp_buf
- 
- #define CONTEXT(_th) ((_th)->md.context)
- 
--#if defined(__i386__) || defined(__sparc__) || defined(__m68k__) || defined(__powerpc__)
--#define JB_SP_INDEX 2
--#elif defined(__mips__)
--#define JB_SP_INDEX 4
--#elif defined(__alpha__)
--#define JB_SP_INDEX 34
--#elif defined(__arm32__)
- /*
-- * On the arm32, the jmpbuf regs underwent a name change after NetBSD 1.3.
-- */
--#ifdef JMPBUF_REG_R13
--#define JB_SP_INDEX JMPBUF_REG_R13
--#else
--#define JB_SP_INDEX _JB_REG_R13
-+** Initialize a thread context to run "_main()" when started
-+*/
-+#ifdef __i386__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[2] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[0] = (int) _main;					\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
-+#endif
-+#ifdef __sparc__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[2] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[3] = (int) _main;					\
-+    CONTEXT(_thread)[4] = (int) _main + 4;				\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
-+#endif
-+#ifdef __powerpc__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[3] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[4] = (int) _main;					\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[3]
-+#endif
-+#ifdef __m68k__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[2] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[5] = (int) _main;					\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
- #endif
--#else
--#error "Need to define SP index in jmp_buf here"
-+#ifdef __mips__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[32] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[2] = (int) _main;					\
-+    CONTEXT(_thread)[28] = (int) _main;				\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
-+#endif
-+#ifdef __arm32__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[23] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[24] = (int) _main;					\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[23]
-+#endif
-+#ifdef __alpha__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
-+{									\
-+    sigsetjmp(CONTEXT(_thread), 1);					\
-+    CONTEXT(_thread)[34] = (unsigned char*) ((_sp) - 128);		\
-+    CONTEXT(_thread)[2] = (long) _main;					\
-+    CONTEXT(_thread)[30] = (long) _main;				\
-+    CONTEXT(_thread)[31] = (long) _main;				\
-+    *status = PR_TRUE;							\
-+}
-+#define	_MD_GET_SP(_thread)	CONTEXT(_thread)[34]
-+#endif
-+#ifndef _MD_INIT_CONTEXT
-+#error "Need to define _MD_INIT_CONTEXT for this platform"
- #endif
--#define _MD_GET_SP(_th)    (_th)->md.context[JB_SP_INDEX]
- 
- #define PR_NUM_GCREGS	_JBLEN
--
--/*
--** Initialize a thread context to run "_main()" when started
--*/
--#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
--{  \
--    *status = PR_TRUE;  \
--    if (sigsetjmp(CONTEXT(_thread), 1)) {  \
--        _main();  \
--    }  \
--    _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \
--}
- 
- #define _MD_SWITCH_CONTEXT(_thread)  \
-     if (!sigsetjmp(CONTEXT(_thread), 1)) {  \
-         (_thread)->md.errcode = errno;  \
-         _PR_Schedule();  \
diff --git a/www/mozilla/patches/patch-ae b/www/mozilla/patches/patch-ae
deleted file mode 100644
index ede5743b473..00000000000
--- a/www/mozilla/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2000/10/30 00:59:46 mycroft Exp $
-
---- nsprpub/pr/include/md/_netbsd.cfg.orig	Wed Mar  8 16:26:18 2000
-+++ nsprpub/pr/include/md/_netbsd.cfg	Mon Oct 30 00:57:46 2000
-@@ -29,7 +29,7 @@
- 
- #define PR_AF_INET6 24  /* same as AF_INET6 */
- 
--#if defined(__i386__) || defined(__arm32__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -75,9 +75,9 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__sparc__) || defined(__mips__)
-+#elif defined(__sparc__) || defined(__MIPSEB__)
- 
--#undef IS_LITTLE_ENDIAN 1
-+#undef IS_LITTLE_ENDIAN 
- #define  IS_BIG_ENDIAN 1
- #define HAVE_LONG_LONG
- #define  HAVE_ALIGNED_DOUBLES
diff --git a/www/mozilla/patches/patch-af b/www/mozilla/patches/patch-af
index 8a8c446c058..3514c4e3bd3 100644
--- a/www/mozilla/patches/patch-af
+++ b/www/mozilla/patches/patch-af
@@ -1,7 +1,8 @@
-$NetBSD: patch-af,v 1.11 2000/10/28 18:55:25 mycroft Exp $
+$NetBSD: patch-af,v 1.12 2001/01/16 16:01:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Jul 19 19:53:01 2000
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Oct 26 07:46:49 2000
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Tue Nov 28 14:27:19 2000
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Mon Jan 15 15:38:34 2001
 @@ -105,11 +105,11 @@
  #
  # NetBSD/ARM
@@ -31,17 +32,19 @@ $NetBSD: patch-af,v 1.11 2000/10/28 18:55:25 mycroft Exp $
  ifeq ($(OS_ARCH),Rhapsody)
  CPPSRCS		:= xptcinvoke_ppc_rhapsody.cpp xptcstubs_ppc_rhapsody.cpp
  ASFILES		:= xptcinvoke_asm_ppc_rhapsody.s xptcstubs_asm_ppc_rhapsody.s
-@@ -195,6 +200,13 @@
- ifeq ($(OS_ARCH)$(OS_TEST),Linuxsparc)
+@@ -196,6 +201,15 @@
+ ifneq (,$(findstring sparc,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_sparc_solaris.cpp xptcstubs_sparc_solaris.cpp
  ASFILES		:= xptcinvoke_asm_sparc_linux.s xptcstubs_asm_sparc_solaris.s
 +endif
++endif
 +#
 +# NetBSD/SPARC
 +#
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
++ifeq ($(OS_ARCH),NetBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
 +CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
 +ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
+ endif
  #
- # Solaris/SPARC
diff --git a/www/mozilla/patches/patch-ag b/www/mozilla/patches/patch-ag
index 3fd7b7d8424..e0f788d81ef 100644
--- a/www/mozilla/patches/patch-ag
+++ b/www/mozilla/patches/patch-ag
@@ -1,8 +1,9 @@
-$NetBSD: patch-ag,v 1.8 2000/11/05 02:20:38 mycroft Exp $
+$NetBSD: patch-ag,v 1.9 2001/01/16 16:01:22 taya Exp $
 
---- config/rules.mk.orig	Thu Sep 28 00:02:15 2000
-+++ config/rules.mk	Wed Nov  1 08:59:03 2000
-@@ -354,6 +354,27 @@
+diff -ru ../Orig/mozilla/config/rules.mk ./config/rules.mk
+--- ../Orig/mozilla/config/rules.mk	Wed Dec 13 06:28:24 2000
++++ ./config/rules.mk	Mon Jan 15 15:37:54 2001
+@@ -373,6 +373,27 @@
  endif
  
  #
@@ -30,7 +31,7 @@ $NetBSD: patch-ag,v 1.8 2000/11/05 02:20:38 mycroft Exp $
  # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
  # which uses internal symbols first
  #
-@@ -1393,7 +1414,7 @@
+@@ -1413,7 +1434,7 @@
  	@echo "OS_CFLAGS          = $(OS_CFLAGS)"
  	@echo "COMPILE_CFLAGS     = $(COMPILE_CFLAGS)"
  	@echo "CXXFLAGS           = $(CXXFLAGS)"
diff --git a/www/mozilla/patches/patch-ai b/www/mozilla/patches/patch-ai
deleted file mode 100644
index b7af06f1794..00000000000
--- a/www/mozilla/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2000/10/29 15:07:00 mycroft Exp $
-
---- nsprpub/pr/src/io/prprf.c.orig	Thu Jul 15 17:30:32 1999
-+++ nsprpub/pr/src/io/prprf.c	Sun Oct 29 06:32:41 2000
-@@ -36,7 +36,7 @@
- ** and requires array notation.
- */
- #if (defined(LINUX) && defined(__powerpc__)) || defined(WIN16) || \
--    defined(QNX) || (defined(__NetBSD__) && defined(__powerpc__))
-+    defined(QNX)
- #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
- #else
- #define VARARGS_ASSIGN(foo, bar) (foo) = (bar)
diff --git a/www/mozilla/patches/patch-aj b/www/mozilla/patches/patch-aj
index 6ff83178a8d..ec0ea5debff 100644
--- a/www/mozilla/patches/patch-aj
+++ b/www/mozilla/patches/patch-aj
@@ -1,7 +1,8 @@
-$NetBSD: patch-aj,v 1.6 2000/10/31 18:08:27 mycroft Exp $
+$NetBSD: patch-aj,v 1.7 2001/01/16 16:01:23 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	Sat Nov  6 03:39:07 1999
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	Tue Oct 31 17:33:58 2000
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	Sat Nov  6 12:39:07 1999
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	Mon Jan 15 15:37:55 2001
 @@ -129,6 +129,7 @@
      "jbsr  _invoke_count_words\n\t"     /* count words */
      "addql #8, sp\n\t"
@@ -39,41 +40,3 @@ $NetBSD: patch-aj,v 1.6 2000/10/31 18:08:27 mycroft Exp $
      );
    
    return result;
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	Sat Nov  6 03:39:10 1999
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	Tue Oct 31 17:45:51 2000
-@@ -108,22 +108,19 @@
-     }
- }
- 
--#define STUB_ENTRY(n) \
--nsresult nsXPTCStubBase::Stub##n() \
--{ \
--  register nsresult result; \
--  __asm__ __volatile__( \
--    "lea   a6@(12), a0\n\t"       /* args */ \
--    "movl  a0, sp@-\n\t" \
--    "movl  #"#n", sp@-\n\t"       /* method index */ \
--    "movl  a6@(8), sp@-\n\t"      /* this */ \
--    "jbsr  _PrepareAndDispatch\n\t" \
--    "movl  d0, %0" \
--    : "=d" (result)     /* %0 */ \
--    : \
--    : "a0", "a1", "d0", "d1", "memory" ); \
--    return result; \
--}
-+#define STUB_ENTRY(n)							\
-+__asm__(								\
-+    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
-+"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
-+    "link  a6,#0			\n\t"				\
-+    "lea   a6@(12), a0			\n\t"	/* pointer to args */	\
-+    "movl  a0, sp@-			\n\t"				\
-+    "movl  #"#n", sp@-			\n\t"	/* method index */	\
-+    "movl  a6@(8), sp@-			\n\t"	/* this */		\
-+    "jbsr  _PrepareAndDispatch		\n\t"				\
-+    "unlk  a6				\n\t"				\
-+    "rts				\n\t"				\
-+);
- 
- #define SENTINEL_ENTRY(n) \
- nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/www/mozilla/patches/patch-ak b/www/mozilla/patches/patch-ak
new file mode 100644
index 00000000000..4272de2020b
--- /dev/null
+++ b/www/mozilla/patches/patch-ak
@@ -0,0 +1,41 @@
+$NetBSD: patch-ak,v 1.8 2001/01/16 16:01:23 taya Exp $
+
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	Sat Nov  6 12:39:10 1999
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	Mon Jan 15 19:12:42 2001
+@@ -108,22 +108,19 @@
+     }
+ }
+ 
+-#define STUB_ENTRY(n) \
+-nsresult nsXPTCStubBase::Stub##n() \
+-{ \
+-  register nsresult result; \
+-  __asm__ __volatile__( \
+-    "lea   a6@(12), a0\n\t"       /* args */ \
+-    "movl  a0, sp@-\n\t" \
+-    "movl  #"#n", sp@-\n\t"       /* method index */ \
+-    "movl  a6@(8), sp@-\n\t"      /* this */ \
+-    "jbsr  _PrepareAndDispatch\n\t" \
+-    "movl  d0, %0" \
+-    : "=d" (result)     /* %0 */ \
+-    : \
+-    : "a0", "a1", "d0", "d1", "memory" ); \
+-    return result; \
+-}
++#define STUB_ENTRY(n)							\
++__asm__(								\
++    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
++"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
++    "link  a6,#0			\n\t"				\
++    "lea   a6@(12), a0			\n\t"	/* pointer to args */	\
++    "movl  a0, sp@-			\n\t"				\
++    "movl  #"#n", sp@-			\n\t"	/* method index */	\
++    "movl  a6@(8), sp@-			\n\t"	/* this */		\
++    "jbsr  _PrepareAndDispatch		\n\t"				\
++    "unlk  a6				\n\t"				\
++    "rts				\n\t"				\
++);
+ 
+ #define SENTINEL_ENTRY(n) \
+ nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/www/mozilla/patches/patch-am b/www/mozilla/patches/patch-am
deleted file mode 100644
index ca46233ae1f..00000000000
--- a/www/mozilla/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.4 2000/11/09 07:33:06 mycroft Exp $
-
---- directory/c-sdk/ldap/include/portable.h.orig	Thu Apr 20 16:18:00 2000
-+++ directory/c-sdk/ldap/include/portable.h	Thu Nov  9 06:49:11 2000
-@@ -243,7 +243,7 @@
-     defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \
-     defined(NCR) || defined(OSF1) || defined(NEC) || \
-     ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
--    defined(UnixWare) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+    defined(UnixWare) || defined(LINUX) || (defined(AIX) && !defined(USE_REENTRANT_LIBC)) || defined(NETBSD)
- #define GETHOSTBYNAME( n, r, b, l, e )  gethostbyname( n )
- #elif defined(AIX)
- /* Maybe this is for another version of AIX?
-@@ -273,7 +273,7 @@
- #elif defined(HPUX10) && defined(_REENTRANT) && !defined(HPUX11)
- #define CTIME( c, b, l )		nsldapi_compat_ctime_r( c, b, l )
- #elif defined( IRIX6_2 ) || defined( IRIX6_3 ) || defined(UNIXWARE) \
--	|| defined(OSF1V4) || defined(AIX) || defined(UnixWare) || defined(hpux) || defined(HPUX11)
-+	|| defined(OSF1V4) || defined(AIX) || defined(UnixWare) || defined(hpux) || defined(HPUX11) || defined(NETBSD)
- #define CTIME( c, b, l )                ctime_r( c, b )
- #elif defined( OSF1V3 )
- #define CTIME( c, b, l )		(ctime_r( c, b, l ) ? NULL : b)
diff --git a/www/mozilla/patches/patch-ao b/www/mozilla/patches/patch-ao
new file mode 100644
index 00000000000..59e34e89286
--- /dev/null
+++ b/www/mozilla/patches/patch-ao
@@ -0,0 +1,35 @@
+$NetBSD: patch-ao,v 1.1 2001/01/16 16:01:23 taya Exp $
+
+diff -ru ../Orig/mozilla/security/psm/server/Makefile ./security/psm/server/Makefile
+--- ../Orig/mozilla/security/psm/server/Makefile	Wed Dec 20 10:24:58 2000
++++ ./security/psm/server/Makefile	Mon Jan 15 15:37:55 2001
+@@ -42,9 +42,13 @@
+ CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
+ else
+ # libC, presumably, is what we must link with elsewhere
++ifeq ($(OS_ARCH), NetBSD)
++CPLUSPLUSRUNTIME = -lm
++else
+ CPLUSPLUSRUNTIME = -lC -lm
+ endif
+ endif
++endif
+ 
+ INCLUDES += -I$(CORE_DEPTH)/../dist/public/nlslayer -I$(CORE_DEPTH)/../dist/include
+ 
+@@ -157,9 +161,14 @@
+ NSPR_LINK_LIBS = -L$(DIST)/lib -Bdynamic -lnspr4 -lplc4 -lplds4
+ XPCOM_LINK_LIBS = -lxpcom
+ XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
+-else
++else # SunOS
++ifeq ($(OS_ARCH), NetBSD)
++NSPR_LINK_LIBS = -L$(DIST)/lib -lnspr4 -lplc4 -lplds4
++XPCOM_LINK_LIBS = -lxpcom
++else # NetBSD
+ NSPR_LINK_LIBS = $(NSPR_LIBS)
+ XPCOM_LINK_LIBS	= $(XPCOM_LIBS)
++endif
+ endif
+ 
+ ifndef MOZ_DIST
diff --git a/www/mozilla/patches/patch-ap b/www/mozilla/patches/patch-ap
new file mode 100644
index 00000000000..0652a893138
--- /dev/null
+++ b/www/mozilla/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2001/01/16 16:01:23 taya Exp $
+
+diff -ru ../Orig/mozilla/security/psm/server/servutil.c ./security/psm/server/servutil.c
+--- ../Orig/mozilla/security/psm/server/servutil.c	Thu Nov 16 04:20:28 2000
++++ ./security/psm/server/servutil.c	Mon Jan 15 15:37:55 2001
+@@ -756,6 +756,7 @@
+     /* Bind to PSM port on loopback address: connections from non-localhosts
+      * will be disallowed
+      */
++    memset(&servaddr, 0, sizeof(servaddr));
+     status = PR_InitializeNetAddr(PR_IpAddrLoopback, 0, &servaddr);
+     if (status != PR_SUCCESS)
+         goto loser;
diff --git a/www/mozilla/patches/patch-aq b/www/mozilla/patches/patch-aq
new file mode 100644
index 00000000000..a4453ae1b84
--- /dev/null
+++ b/www/mozilla/patches/patch-aq
@@ -0,0 +1,23 @@
+$NetBSD: patch-aq,v 1.1 2001/01/16 16:01:24 taya Exp $
+
+diff -ru ../Orig/mozilla/security/nss/lib/freebl/Makefile ./security/nss/lib/freebl/Makefile
+--- ../Orig/mozilla/security/nss/lib/freebl/Makefile	Tue Oct  3 07:52:43 2000
++++ ./security/nss/lib/freebl/Makefile	Mon Jan 15 15:37:55 2001
+@@ -200,6 +200,17 @@
+ MPI_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_SRCS:.c=$(OBJ_SUFFIX)))
+ MPI_OBJS += $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_USERS:.c=$(OBJ_SUFFIX)))
+ 
++#
++# for NetBSD pkgsrc system
++#	NetBSD pkgsrc set env. variable 'CFLAGS'.
++#	This cause CFLAG inherit from config/autoconfig.mk 
++#	CFLAG contains -pedantic and fail to compile dh.c
++#	SO filter-out -pedantic from CFLAGS
++#
++ifeq ($(OS_TARGET),NetBSD)
++	CFLAGS := $(filter-out -pedantic,$(CFLAGS))
++endif
++
+ $(MPI_OBJS): $(MPI_HDRS) primes.c
+ 
+ ifeq ($(SYSV_SPARC),1)
diff --git a/www/mozilla/pkg/PLIST-ELF b/www/mozilla/pkg/PLIST-ELF
index f36e918723c..b3d91201836 100644
--- a/www/mozilla/pkg/PLIST-ELF
+++ b/www/mozilla/pkg/PLIST-ELF
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST-ELF,v 1.7 2000/12/15 07:16:23 martin Exp $
+@comment $NetBSD: PLIST-ELF,v 1.8 2001/01/16 16:01:24 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
 lib/mozilla/nsTestSample
 lib/mozilla/nsinstall
+lib/mozilla/psm
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
@@ -12,9 +13,11 @@ lib/mozilla/vreg
 lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
+lib/mozilla/xpcshell
 @comment end PROGRAMS
 @comment begin SCRIPTS
 lib/mozilla/mozilla-config
+lib/mozilla/start-psm
 @comment end SCRIPTS
 @comment begin DSO
 lib/mozilla/components/libabsyncsvc.so
@@ -93,6 +96,7 @@ lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
+lib/mozilla/components/libxremote_client.so
 lib/mozilla/libcmt.so
 lib/mozilla/libgkgfx.so
 lib/mozilla/libgtkembedmoz.so
@@ -103,6 +107,7 @@ lib/mozilla/libjsj.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
+lib/mozilla/libnssckbi.so
 lib/mozilla/libnullplugin.so
 lib/mozilla/libplc4.so
 lib/mozilla/libplds4.so
@@ -129,6 +134,7 @@ lib/mozilla/components/appshell.xpt
 lib/mozilla/components/autocomplete.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/cookieviewer.xpt
@@ -240,14 +246,35 @@ lib/mozilla/defaults/profile/panels.rdf
 lib/mozilla/defaults/profile/search.rdf
 lib/mozilla/defaults/wallet/DistinguishedSchema.tbl
 lib/mozilla/defaults/wallet/FieldSchema.tbl
+lib/mozilla/defaults/wallet/PositionalSchema.tbl
 lib/mozilla/defaults/wallet/SchemaConcat.tbl
-lib/mozilla/defaults/wallet/URLFieldSchema.tbl
+lib/mozilla/defaults/wallet/SchemaStrings.tbl
+lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/dtd/mathml.dtd
 lib/mozilla/gtkEmbed
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
+lib/mozilla/psmdata/doc/04digsgn.gif
+lib/mozilla/psmdata/doc/06pcrypt.gif
+lib/mozilla/psmdata/doc/bannerrn.gif
+lib/mozilla/psmdata/doc/cartbanner.gif
+lib/mozilla/psmdata/doc/cmcjavascriptapi.html
+lib/mozilla/psmdata/doc/contents.htm
+lib/mozilla/psmdata/doc/glossary.htm
+lib/mozilla/psmdata/doc/help.htm
+lib/mozilla/psmdata/doc/next.gif
+lib/mozilla/psmdata/doc/prev.gif
+lib/mozilla/psmdata/doc/psmtest.html
+lib/mozilla/psmdata/doc/release_notes.html
+lib/mozilla/psmdata/ui/psm_bin.properties
+lib/mozilla/psmdata/ui/psm_doc.properties
+lib/mozilla/psmdata/ui/psm_text.properties
+lib/mozilla/psmdata/ui/psm_ui.properties
 lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/builtin/htmlBindings.xml
+lib/mozilla/res/builtin/platformHTMLBindings.xml
+lib/mozilla/res/builtin/xbl-forms.css
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/entityTables/html40Latin1.properties
@@ -255,6 +282,9 @@ lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
 lib/mozilla/res/entityTables/transliterate.properties
+lib/mozilla/res/forms.css
+lib/mozilla/res/gfx/icon_0.gif
+lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
 lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
@@ -303,28 +333,19 @@ lib/mozilla/res/samples/xpconnect-sample.html
 lib/mozilla/res/samples/xpmenu.xul
 lib/mozilla/res/ua.css
 lib/mozilla/res/unixcharset.properties
-lib/mozilla/searchplugins/AOLSearch.gif
-lib/mozilla/searchplugins/AOLSearch.src
-lib/mozilla/searchplugins/ClassifiedPlus.gif
-lib/mozilla/searchplugins/ClassifiedPlus.src
-lib/mozilla/searchplugins/CompuServe.jpg
-lib/mozilla/searchplugins/CompuServe.src
-lib/mozilla/searchplugins/ICQ.gif
-lib/mozilla/searchplugins/ICQ.src
-lib/mozilla/searchplugins/Music_Artist.gif
-lib/mozilla/searchplugins/Music_Artist.src
 lib/mozilla/searchplugins/NetscapeSearch.gif
 lib/mozilla/searchplugins/NetscapeSearch.src
-lib/mozilla/searchplugins/Shareware.gif
-lib/mozilla/searchplugins/Shareware.src
-lib/mozilla/searchplugins/ShopNetscape.gif
-lib/mozilla/searchplugins/ShopNetscape.src
-lib/mozilla/searchplugins/Tech_News.gif
-lib/mozilla/searchplugins/Tech_News.src
+lib/mozilla/searchplugins/bugzilla.gif
+lib/mozilla/searchplugins/bugzilla.src
+lib/mozilla/searchplugins/dmoz.gif
+lib/mozilla/searchplugins/dmoz.src
 lib/mozilla/searchplugins/google.gif
 lib/mozilla/searchplugins/google.src
+lib/mozilla/searchplugins/lxrmozilla.gif
+lib/mozilla/searchplugins/lxrmozilla.src
+lib/mozilla/searchplugins/mozilla.gif
+lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
-lib/mozilla/xpcshell
 @comment end DATA
 @exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
@@ -355,8 +376,13 @@ lib/mozilla/xpcshell
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
 @dirrm lib/mozilla/res/html
+@dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/builtin
 @dirrm lib/mozilla/res
+@dirrm lib/mozilla/psmdata/ui
+@dirrm lib/mozilla/psmdata/doc
+@dirrm lib/mozilla/psmdata
 @dirrm lib/mozilla/plugins
 @dirrm lib/mozilla/icons
 @dirrm lib/mozilla/dtd
diff --git a/www/mozilla/pkg/PLIST-a.out b/www/mozilla/pkg/PLIST-a.out
index 396eec76fde..54e905b64bb 100644
--- a/www/mozilla/pkg/PLIST-a.out
+++ b/www/mozilla/pkg/PLIST-a.out
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST-a.out,v 1.7 2000/12/15 07:16:23 martin Exp $
+@comment $NetBSD: PLIST-a.out,v 1.8 2001/01/16 16:01:24 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
 lib/mozilla/nsTestSample
 lib/mozilla/nsinstall
+lib/mozilla/psm
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
@@ -12,9 +13,11 @@ lib/mozilla/vreg
 lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
+lib/mozilla/xpcshell
 @comment end PROGRAMS
 @comment begin SCRIPTS
 lib/mozilla/mozilla-config
+lib/mozilla/start-psm
 @comment end SCRIPTS
 @comment begin DSO
 lib/mozilla/components/libabsyncsvc.so.1.0
@@ -93,6 +96,7 @@ lib/mozilla/components/libwidget_gtk.so.1.0
 lib/mozilla/components/libxmlextras.so.1.0
 lib/mozilla/components/libxpconnect.so.1.0
 lib/mozilla/components/libxpinstall.so.1.0
+lib/mozilla/components/libxremote_client.so.1.0
 lib/mozilla/libcmt.so.1.0
 lib/mozilla/libgkgfx.so.1.0
 lib/mozilla/libgtkembedmoz.so.1.0
@@ -103,6 +107,7 @@ lib/mozilla/libjsj.so.1.0
 lib/mozilla/libmozjs.so.1.0
 lib/mozilla/libmsgbaseutil.so.1.0
 lib/mozilla/libnspr4.so.1.0
+lib/mozilla/libnssckbi.so.1.0
 lib/mozilla/libnullplugin.so.1.0
 lib/mozilla/libplc4.so.1.0
 lib/mozilla/libplds4.so.1.0
@@ -129,6 +134,7 @@ lib/mozilla/components/appshell.xpt
 lib/mozilla/components/autocomplete.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/cookieviewer.xpt
@@ -240,14 +246,35 @@ lib/mozilla/defaults/profile/panels.rdf
 lib/mozilla/defaults/profile/search.rdf
 lib/mozilla/defaults/wallet/DistinguishedSchema.tbl
 lib/mozilla/defaults/wallet/FieldSchema.tbl
+lib/mozilla/defaults/wallet/PositionalSchema.tbl
 lib/mozilla/defaults/wallet/SchemaConcat.tbl
-lib/mozilla/defaults/wallet/URLFieldSchema.tbl
+lib/mozilla/defaults/wallet/SchemaStrings.tbl
+lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/dtd/mathml.dtd
 lib/mozilla/gtkEmbed
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
+lib/mozilla/psmdata/doc/04digsgn.gif
+lib/mozilla/psmdata/doc/06pcrypt.gif
+lib/mozilla/psmdata/doc/bannerrn.gif
+lib/mozilla/psmdata/doc/cartbanner.gif
+lib/mozilla/psmdata/doc/cmcjavascriptapi.html
+lib/mozilla/psmdata/doc/contents.htm
+lib/mozilla/psmdata/doc/glossary.htm
+lib/mozilla/psmdata/doc/help.htm
+lib/mozilla/psmdata/doc/next.gif
+lib/mozilla/psmdata/doc/prev.gif
+lib/mozilla/psmdata/doc/psmtest.html
+lib/mozilla/psmdata/doc/release_notes.html
+lib/mozilla/psmdata/ui/psm_bin.properties
+lib/mozilla/psmdata/ui/psm_doc.properties
+lib/mozilla/psmdata/ui/psm_text.properties
+lib/mozilla/psmdata/ui/psm_ui.properties
 lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/builtin/htmlBindings.xml
+lib/mozilla/res/builtin/platformHTMLBindings.xml
+lib/mozilla/res/builtin/xbl-forms.css
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/entityTables/html40Latin1.properties
@@ -255,6 +282,9 @@ lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
 lib/mozilla/res/entityTables/transliterate.properties
+lib/mozilla/res/forms.css
+lib/mozilla/res/gfx/icon_0.gif
+lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
 lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
@@ -303,28 +333,19 @@ lib/mozilla/res/samples/xpconnect-sample.html
 lib/mozilla/res/samples/xpmenu.xul
 lib/mozilla/res/ua.css
 lib/mozilla/res/unixcharset.properties
-lib/mozilla/searchplugins/AOLSearch.gif
-lib/mozilla/searchplugins/AOLSearch.src
-lib/mozilla/searchplugins/ClassifiedPlus.gif
-lib/mozilla/searchplugins/ClassifiedPlus.src
-lib/mozilla/searchplugins/CompuServe.jpg
-lib/mozilla/searchplugins/CompuServe.src
-lib/mozilla/searchplugins/ICQ.gif
-lib/mozilla/searchplugins/ICQ.src
-lib/mozilla/searchplugins/Music_Artist.gif
-lib/mozilla/searchplugins/Music_Artist.src
 lib/mozilla/searchplugins/NetscapeSearch.gif
 lib/mozilla/searchplugins/NetscapeSearch.src
-lib/mozilla/searchplugins/Shareware.gif
-lib/mozilla/searchplugins/Shareware.src
-lib/mozilla/searchplugins/ShopNetscape.gif
-lib/mozilla/searchplugins/ShopNetscape.src
-lib/mozilla/searchplugins/Tech_News.gif
-lib/mozilla/searchplugins/Tech_News.src
+lib/mozilla/searchplugins/bugzilla.gif
+lib/mozilla/searchplugins/bugzilla.src
+lib/mozilla/searchplugins/dmoz.gif
+lib/mozilla/searchplugins/dmoz.src
 lib/mozilla/searchplugins/google.gif
 lib/mozilla/searchplugins/google.src
+lib/mozilla/searchplugins/lxrmozilla.gif
+lib/mozilla/searchplugins/lxrmozilla.src
+lib/mozilla/searchplugins/mozilla.gif
+lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
-lib/mozilla/xpcshell
 @comment end DATA
 @exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
@@ -355,8 +376,13 @@ lib/mozilla/xpcshell
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
 @dirrm lib/mozilla/res/html
+@dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/entityTables
+@dirrm lib/mozilla/res/builtin
 @dirrm lib/mozilla/res
+@dirrm lib/mozilla/psmdata/ui
+@dirrm lib/mozilla/psmdata/doc
+@dirrm lib/mozilla/psmdata
 @dirrm lib/mozilla/plugins
 @dirrm lib/mozilla/icons
 @dirrm lib/mozilla/dtd