Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile	25 Oct 2005 21:08:40 -0000	1.28
+++ Makefile	8 Nov 2005 10:19:38 -0000
@@ -4,10 +4,10 @@ ONLY_FOR_ARCHS=	alpha amd64 i386 powerpc
 
 COMMENT=	"redesign of the integrated Mozilla App-Suite mail component"
 
-VER=		1.0.7
+VER=		1.5rc1
 DISTNAME=	mozilla
 PKGNAME=	mozilla-thunderbird-${VER}
-SO_VERSION=	4.0
+SO_VERSION=	5.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 
@@ -20,8 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xft Xp Xrender Xt c fontconfig freetype \
-			m pthread z atk-1.0.0.0 glib-2.0.0.0 \
+WANTLIB=		X11 Xft Xrender Xt c fontconfig freetype m \
+			pthread z atk-1.0.0.0 glib-2.0.0.0 \
 			gmodule-2.0.0.0 gobject-2.0.0.0 jpeg pango-1.0.0.0 \
 			pangox-1.0.0.0 pangoxft-1.0.0.0 png
 .if empty(MACHINE_ARCH:Malpha)
@@ -66,33 +66,20 @@ CONFIGURE_ARGS=	--with-system-jpeg=${LOC
 		--disable-debug			\
 		--disable-tests			\
 		--disable-pedantic		\
-		--disable-installer
+		--disable-installer		\
+		--disable-gnomeui		\
+		--disable-gnomevfs
 
 #  from mail/config/mozconfig
-CONFIGURE_ARGS+=--enable-crypto			\
-		--disable-mathml		\
-		--disable-activex		\
-		--disable-activex-scripting	\
-		--disable-tests			\
-		--disable-oji			\
-		--disable-plugins		\
-		--disable-necko-disk-cache	\
-		--enable-single-profile		\
-		--disable-profilesharing	\
-		--enable-extensions=wallet,spellcheck,xmlextras,webservices \
-		--enable-necko-protocols=http,file,jar,viewsource,res,data \
-		--enable-image-decoders=default,-xbm
+CONFIGURE_ARGS+=--enable-application=mail
 
-CONFIGURE_ENV=	MOZ_THUNDERBIRD=1 \
-		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
-		BUILD_OFFICIAL=1 \
-		MOZILLA_OFFICIAL=1 \
-		SO_VERSION="${SO_VERSION}"
-MAKE_ENV=	MOZ_THUNDERBIRD=1 \
+MAKE_ENV=	MOZ_CO_PROJECT=mail \
 		LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
 		BUILD_OFFICIAL=1 \
 		MOZILLA_OFFICIAL=1 \
 		SO_VERSION="${SO_VERSION}"
+CONFIGURE_ENV=	${MAKE_ENV} \
+		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \
 
 MOB=		${WRKSRC}/dist/bin
 MOZ=		${PREFIX}/mozilla-thunderbird
@@ -111,7 +98,7 @@ pre-configure:
 		${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
 
 do-install:
-.for dir in chrome components defaults greprefs res
+.for dir in chrome components defaults extensions greprefs res
 	${INSTALL_DATA_DIR} ${MOZ}/${dir}
 	@cd ${MOB} && ${TAR} -chf - ${dir} | \
 		${TAR} -xf - -C ${MOZ}
@@ -125,13 +112,13 @@ do-install:
 	ln -f ${PREFIX}/bin/mozilla-thunderbird ${PREFIX}/bin/thunderbird
 	${INSTALL_SCRIPT} ${MOB}/thunderbird-config ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
-	${INSTALL_PROGRAM} ${MOB}/regchrome ${MOB}/regxpcom ${MOB}/thunderbird-bin ${MOB}/mozilla-xremote-client ${MOZ}
+	${INSTALL_PROGRAM} ${MOB}/regxpcom ${MOB}/thunderbird-bin ${MOB}/mozilla-xremote-client ${MOZ}
 	ln -f ${MOZ}/thunderbird-bin ${MOZ}/mozilla-thunderbird-bin
 
-	${INSTALL_DATA_DIR} ${MOZ}/extensions
-	${INSTALL_DATA} ${FILESDIR}/Extensions.rdf ${MOZ}/extensions/
-	${INSTALL_DATA_DIR} ${MOZ}/extensions/${MAGIC}
-	${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/installed-extensions.txt ${MOZ}/extensions/installed-extensions-processed.txt
-	${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/${MAGIC}/install.rdf ${MOZ}/extensions/${MAGIC}/
+#	${INSTALL_DATA_DIR} ${MOZ}/extensions
+#	${INSTALL_DATA} ${FILESDIR}/Extensions.rdf ${MOZ}/extensions/
+#	${INSTALL_DATA_DIR} ${MOZ}/extensions/${MAGIC}
+#	${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/installed-extensions.txt ${MOZ}/extensions/installed-extensions-processed.txt
+#	${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/${MAGIC}/install.rdf ${MOZ}/extensions/${MAGIC}/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo	25 Oct 2005 21:08:40 -0000	1.8
+++ distinfo	8 Nov 2005 10:20:45 -0000
@@ -1,4 +1,4 @@
-MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d
-RMD160 (thunderbird-1.0.7-source.tar.bz2) = 4f040dfe2468ee33d69ccffe3abc31eccc59899e
-SHA1 (thunderbird-1.0.7-source.tar.bz2) = a51640d4d15611374d08dbe6cbf87b1072c66c29
-SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665
+MD5 (thunderbird-1.5rc1-source.tar.bz2) = 0df70073cc6ac9f6772f82bc9e024543
+RMD160 (thunderbird-1.5rc1-source.tar.bz2) = 19f083e4683192810ac500d38df81ffe8ed45e53
+SHA1 (thunderbird-1.5rc1-source.tar.bz2) = 832fc78dbe2e131ebad30cc9113afd72ea8c8572
+SIZE (thunderbird-1.5rc1-source.tar.bz2) = 35022501
Index: patches/patch-build_autoconf_altoptions_m4
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-build_autoconf_altoptions_m4,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_autoconf_altoptions_m4
--- patches/patch-build_autoconf_altoptions_m4	18 Jan 2004 11:47:42 -0000	1.1.1.1
+++ patches/patch-build_autoconf_altoptions_m4	10 Sep 2005 07:33:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-build_autoconf_altoptions_m4,v 1.1.1.1 2004/01/18 11:47:42 wilfried Exp $
---- build/autoconf/altoptions.m4.orig	2001-10-29 23:59:28.000000000 +0100
-+++ build/autoconf/altoptions.m4	2003-12-12 11:07:27.000000000 +0100
-@@ -127,14 +127,3 @@ echo "
+--- build/autoconf/altoptions.m4.orig	Sun Apr 18 16:17:09 2004
++++ build/autoconf/altoptions.m4	Sat Sep 10 09:08:27 2005
+@@ -143,14 +143,3 @@ echo "
          [$3]
      fi
  ])
Index: patches/patch-config_autoconf_mk_in
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-config_autoconf_mk_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_autoconf_mk_in
--- patches/patch-config_autoconf_mk_in	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-config_autoconf_mk_in	10 Sep 2005 07:33:26 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-config_autoconf_mk_in,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- config/autoconf.mk.in.orig	Sun Oct 31 05:29:54 2004
-+++ config/autoconf.mk.in	Wed Nov 10 21:50:22 2004
-@@ -38,7 +38,7 @@ datadir		= @datadir@
+--- config/autoconf.mk.in.orig	Wed Aug 17 19:17:17 2005
++++ config/autoconf.mk.in	Sat Sep 10 09:08:27 2005
+@@ -60,7 +60,7 @@ datadir		= @datadir@
  mandir		= @mandir@
  idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-config_autoconf_mk_in,v 
  mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
-@@ -195,7 +195,7 @@ OS_LDFLAGS	= @LDFLAGS@
+@@ -240,7 +240,7 @@ OS_LDFLAGS	= @LDFLAGS@
  OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
  OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
  
Index: patches/patch-config_mkdepend_imakemdep_h
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-config_mkdepend_imakemdep_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_mkdepend_imakemdep_h
--- patches/patch-config_mkdepend_imakemdep_h	2 Mar 2004 08:34:11 -0000	1.1
+++ patches/patch-config_mkdepend_imakemdep_h	10 Sep 2005 07:33:26 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-config_mkdepend_imakemdep_h,v 1.1 2004/03/02 08:34:11 pvalchev Exp $
---- config/mkdepend/imakemdep.h.orig	1998-09-04 22:22:25.000000000 -0600
-+++ config/mkdepend/imakemdep.h	2004-03-01 18:06:47.000000000 -0700
-@@ -277,6 +277,9 @@ char *cpp_argv[ARGUMENTS] = {
+--- config/mkdepend/imakemdep.h.orig	Tue Apr 20 23:38:14 2004
++++ config/mkdepend/imakemdep.h	Sat Sep 10 09:08:27 2005
+@@ -440,6 +440,9 @@ char *cpp_argv[ARGUMENTS] = {
  # ifdef __i386__
  	"-D__i386__",
  # endif
Index: patches/patch-config_rules_mk
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-config_rules_mk,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_rules_mk
--- patches/patch-config_rules_mk	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-config_rules_mk	10 Sep 2005 07:33:27 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-config_rules_mk,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- config/rules.mk.orig	Wed Aug 11 21:44:17 2004
-+++ config/rules.mk	Fri Sep 17 19:47:41 2004
-@@ -667,7 +667,7 @@ ifdef SHARED_LIBRARY
+--- config/rules.mk.orig	Thu Aug 11 18:41:53 2005
++++ config/rules.mk	Sat Sep 10 09:13:05 2005
+@@ -665,7 +665,7 @@ ifdef SHARED_LIBRARY
  ifdef IS_COMPONENT
  ifdef GRE_MODULE
  ifndef DISABLE_DIST_GRE
@@ -10,21 +10,16 @@ $OpenBSD: patch-config_rules_mk,v 1.2 20
  	$(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY)
  ifdef BEOS_ADDON_WORKAROUND
  	( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
-@@ -677,11 +677,11 @@ endif # GRE_MODULE
- ifeq ($(OS_ARCH),OS2)
- 	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/components
- else
--	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/components
-+	$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib/components
- 	$(ELF_DYNSTR_GC) $(DIST)/lib/components/$(SHARED_LIBRARY)
+@@ -673,7 +673,7 @@ endif
  endif
+ endif # GRE_MODULE
  ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin/components
-+	$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/bin/components
- 	$(ELF_DYNSTR_GC) $(DIST)/bin/components/$(SHARED_LIBRARY)
+-	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
++	$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
+ 	$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
  ifdef BEOS_ADDON_WORKAROUND
- 	( cd $(DIST)/bin/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
-@@ -690,7 +690,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL
+ 	( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
+@@ -682,7 +682,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL
  else # ! IS_COMPONENT
  ifdef GRE_MODULE
  ifndef DISABLE_DIST_GRE
@@ -33,20 +28,20 @@ $OpenBSD: patch-config_rules_mk,v 1.2 20
  ifdef BEOS_ADDON_WORKAROUND
  	( cd $(GRE_DIST) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
  endif
-@@ -699,10 +699,10 @@ endif # GRE_MODULE
- ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+@@ -692,10 +692,10 @@ endif # GRE_MODULE
+ ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
  	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
  else
 -	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
 +	$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib
  endif
  ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin
-+	$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/bin
+-	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
++	$(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)
  ifdef BEOS_ADDON_WORKAROUND
- 	( cd $(DIST)/bin && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
+ 	( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
  endif
-@@ -766,15 +766,15 @@ ifndef NO_INSTALL
+@@ -763,15 +763,15 @@ ifndef NO_INSTALL
  ifdef SHARED_LIBRARY
  ifdef IS_COMPONENT
  ifdef MRE_DIST
@@ -66,9 +61,9 @@ $OpenBSD: patch-config_rules_mk,v 1.2 20
  endif
  endif
  endif # SHARED_LIBRARY
-@@ -1023,7 +1023,6 @@ endif # NO_LD_ARCHIVE_FLAGS
+@@ -1041,7 +1041,6 @@ endif # NO_LD_ARCHIVE_FLAGS
  else # os2 vacpp
- 	$(MKSHLIB) /O:$@ /DLL /INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
+ 	$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
  endif # !os2 vacpp
 -	chmod +x $@
  ifndef NO_COMPONENT_LINK_MAP
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-configure_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure_in
--- patches/patch-configure_in	25 Oct 2005 21:08:41 -0000	1.6
+++ patches/patch-configure_in	26 Oct 2005 08:47:08 -0000
@@ -10,16 +10,16 @@ $OpenBSD: patch-configure_in,v 1.6 2005/
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -3103,7 +3103,7 @@ _SAVE_LIBS=$LIBS
+@@ -3582,7 +3582,7 @@ _SAVE_LIBS=$LIBS
  CFLAGS="$ZLIB_CFLAGS $CFLAGS"
  LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
- if test -n "${PNG_DIR}"; then
+ if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
 -    CFLAGS="-I${PNG_DIR}/include $CFLAGS"
 +    CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS"
      LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
  fi
  if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
-@@ -3133,7 +3133,7 @@ LDFLAGS=$_SAVE_LDFLAGS
+@@ -3612,7 +3612,7 @@ LDFLAGS=$_SAVE_LDFLAGS
  LIBS=$_SAVE_LIBS
  
  if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
Index: patches/patch-directory_c-sdk_build_mk
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-directory_c-sdk_build_mk,v
retrieving revision 1.1
diff -u -p -r1.1 patch-directory_c-sdk_build_mk
--- patches/patch-directory_c-sdk_build_mk	27 Dec 2004 21:21:39 -0000	1.1
+++ patches/patch-directory_c-sdk_build_mk	10 Sep 2005 07:33:26 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-directory_c-sdk_build_mk,v 1.1 2004/12/27 21:21:39 wilfried Exp $
---- directory/c-sdk/build.mk.orig	Tue Sep 14 22:59:40 2004
-+++ directory/c-sdk/build.mk	Wed Nov 10 21:50:22 2004
-@@ -410,10 +410,10 @@ else
+--- directory/c-sdk/build.mk.orig	Tue Jun 14 23:27:32 2005
++++ directory/c-sdk/build.mk	Sat Sep 10 09:08:27 2005
+@@ -411,10 +411,10 @@ else
  LINK_LIB        = $(RM) $@; $(AR) $(AR_FLAGS) $(OBJS); $(RANLIB) $@
  LINK_LIB2       = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@
  ifdef SONAMEFLAG_PREFIX
Index: patches/patch-directory_c-sdk_configure_in
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-directory_c-sdk_configure_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-directory_c-sdk_configure_in
--- patches/patch-directory_c-sdk_configure_in	10 Apr 2005 08:37:34 -0000	1.4
+++ patches/patch-directory_c-sdk_configure_in	10 Sep 2005 07:33:26 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-directory_c-sdk_configure_in,v 1.4 2005/04/10 08:37:34 wilfried Exp $
---- directory/c-sdk/configure.in.orig	Tue Sep 14 22:59:40 2004
-+++ directory/c-sdk/configure.in	Fri Apr  8 21:26:59 2005
-@@ -1440,19 +1440,16 @@ mips-sony-newsos*)
+--- directory/c-sdk/configure.in.orig	Tue Jun 14 23:27:33 2005
++++ directory/c-sdk/configure.in	Sat Sep 10 09:08:27 2005
+@@ -1455,19 +1455,16 @@ mips-sony-newsos*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(OPENBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
Index: patches/patch-extensions_transformiix_source_base_Double_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-extensions_transformiix_source_base_Double_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-extensions_transformiix_source_base_Double_cpp
--- patches/patch-extensions_transformiix_source_base_Double_cpp	27 Dec 2004 21:21:39 -0000	1.1
+++ patches/patch-extensions_transformiix_source_base_Double_cpp	10 Sep 2005 07:33:26 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.1 2004/12/27 21:21:39 wilfried Exp $
---- extensions/transformiix/source/base/Double.cpp.orig	2004-01-15 22:23:18.000000000 +0100
-+++ extensions/transformiix/source/base/Double.cpp	2004-06-16 09:50:16.000000000 +0200
-@@ -114,17 +114,19 @@ typedef union txdpun {
+--- extensions/transformiix/source/base/Double.cpp.orig	Thu Jun 17 02:12:42 2004
++++ extensions/transformiix/source/base/Double.cpp	Sat Sep 10 09:08:27 2005
+@@ -115,17 +115,19 @@ typedef union txdpun {
  #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
  #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
  
Index: patches/patch-gfx_src_freetype_nsFreeType_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-gfx_src_freetype_nsFreeType_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gfx_src_freetype_nsFreeType_cpp
--- patches/patch-gfx_src_freetype_nsFreeType_cpp	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-gfx_src_freetype_nsFreeType_cpp	10 Sep 2005 07:33:28 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- gfx/src/freetype/nsFreeType.cpp.orig	Sat Feb  7 16:22:30 2004
-+++ gfx/src/freetype/nsFreeType.cpp	Sat Nov  6 02:13:33 2004
+--- gfx/src/freetype/nsFreeType.cpp.orig	Wed Jul 13 20:21:10 2005
++++ gfx/src/freetype/nsFreeType.cpp	Sat Sep 10 09:08:27 2005
 @@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
    {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
    {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
@@ -16,7 +16,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeT
  // #ifdef MOZ_SVG
    {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
    {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
+@@ -288,7 +288,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
  } 
   
  NS_IMETHODIMP
@@ -25,7 +25,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeT
                                FT_UInt glyphID, FT_Glyph *glyph)
  { 
    // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
+@@ -297,11 +297,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
  } 
   
  NS_IMETHODIMP
@@ -40,7 +40,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeT
    return error ? NS_ERROR_FAILURE : NS_OK;
  } 
   
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
+@@ -326,7 +326,7 @@ nsFreeType2::ManagerNew(FT_Library libra
  } 
   
  NS_IMETHODIMP
@@ -49,7 +49,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeT
  { 
    // call the FreeType2 function via the function pointer
    FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
+@@ -395,7 +395,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
  } 
   
  NS_IMETHODIMP
Index: patches/patch-gfx_src_freetype_nsFreeType_h
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-gfx_src_freetype_nsFreeType_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gfx_src_freetype_nsFreeType_h
--- patches/patch-gfx_src_freetype_nsFreeType_h	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-gfx_src_freetype_nsFreeType_h	10 Sep 2005 07:33:28 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- gfx/src/freetype/nsFreeType.h.orig	Fri Apr 16 23:31:42 2004
-+++ gfx/src/freetype/nsFreeType.h	Sat Nov  6 02:11:14 2004
-@@ -104,13 +104,15 @@ typedef FT_Error (*FT_Outline_Decompose_
+--- gfx/src/freetype/nsFreeType.h.orig	Sun May  1 19:36:19 2005
++++ gfx/src/freetype/nsFreeType.h	Sat Sep 10 09:08:27 2005
+@@ -120,13 +120,15 @@ typedef FT_Error (*FT_Outline_Decompose_
  typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
  typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
  typedef FT_Error (*FTC_Image_Cache_Lookup_t)
@@ -19,7 +19,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeT
  // #ifdef MOZ_SVG
  typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
  typedef FT_Error (*FT_Get_Kerning_t)
-@@ -165,7 +167,7 @@ protected:
+@@ -181,7 +183,7 @@ protected:
    FT_Outline_Decompose_t    nsFT_Outline_Decompose;
    FT_Set_Charmap_t          nsFT_Set_Charmap;
    FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
@@ -28,7 +28,7 @@ $OpenBSD: patch-gfx_src_freetype_nsFreeT
    FTC_Manager_Done_t        nsFTC_Manager_Done;
    FTC_Manager_New_t         nsFTC_Manager_New;
    FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -213,7 +215,7 @@ protected:
+@@ -229,7 +231,7 @@ protected:
    PRLibrary      *mSharedLib;
    FT_Library      mFreeTypeLibrary;
    FTC_Manager     mFTCacheManager;
Index: patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp
===================================================================
RCS file: patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp
diff -N patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp
--- patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp	14 Oct 2005 04:00:38 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.2 2005/10/14 04:00:38 kurt Exp $
---- gfx/src/gtk/nsDeviceContextSpecG.cpp.orig	Thu Feb 17 16:24:34 2005
-+++ gfx/src/gtk/nsDeviceContextSpecG.cpp	Mon Oct  3 14:49:14 2005
-@@ -1133,7 +1133,7 @@ nsresult GlobalPrinters::InitializeGloba
-       free(printerList);
-     } else {
-       /* Try to use CUPS */
--      PRLibrary *clib = PR_LoadLibrary("libcups.so.2");
-+      PRLibrary *clib = PR_LoadLibrary("libcups.so");
-       if (clib) {
-         CupsGetDestsType  CupsGetDests;
-         CupsGetDestType   CupsGetDest;
Index: patches/patch-gfx_src_gtk_nsScreenGtk_cpp
===================================================================
RCS file: patches/patch-gfx_src_gtk_nsScreenGtk_cpp
diff -N patches/patch-gfx_src_gtk_nsScreenGtk_cpp
--- patches/patch-gfx_src_gtk_nsScreenGtk_cpp	25 Oct 2005 21:08:41 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gfx_src_gtk_nsScreenGtk_cpp,v 1.2 2005/10/25 21:08:41 wilfried Exp $
---- gfx/src/gtk/nsScreenGtk.cpp.orig	Tue Apr 20 19:35:51 2004
-+++ gfx/src/gtk/nsScreenGtk.cpp	Mon Oct 24 21:46:35 2005
-@@ -143,7 +143,7 @@ nsScreenGtk :: Init ()
-   if (!gdk_property_get(root_window,
-                         gdk_atom_intern ("_NET_WORKAREA", FALSE),
-                         cardinal_atom,
--                        0, G_MAXLONG, FALSE,
-+                        0, G_MAXLONG - 3, FALSE,
-                         &type_returned,
-                         &format_returned,
-                         &length_returned,
Index: patches/patch-gfx_src_ps_nsFontMetricsPS_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gfx_src_ps_nsFontMetricsPS_cpp
--- patches/patch-gfx_src_ps_nsFontMetricsPS_cpp	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-gfx_src_ps_nsFontMetricsPS_cpp	10 Sep 2005 07:33:28 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Feb  5 02:57:05 2004
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Wed Nov 10 21:50:23 2004
-@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	Thu Apr 28 10:04:00 2005
++++ gfx/src/ps/nsFontMetricsPS.cpp	Sat Sep 10 09:08:27 2005
+@@ -1859,10 +1859,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
    
    mPixelSize = NSToIntRound(app2dev * mFont->size);
  
@@ -16,7 +16,7 @@ $OpenBSD: patch-gfx_src_ps_nsFontMetrics
  
    nsresult rv;
    mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1896,7 +1896,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
    if (!face)
      return 0;
  
@@ -25,7 +25,7 @@ $OpenBSD: patch-gfx_src_ps_nsFontMetrics
    nsresult rv = mFt2->GetImageCache(&iCache);
    if (NS_FAILED(rv)) {
      NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1934,8 +1934,8 @@ nsFontPSFreeType::getFTFace()
    
    FTC_Manager cManager;
    mFt2->GetFTCacheManager(&cManager);
@@ -36,7 +36,7 @@ $OpenBSD: patch-gfx_src_ps_nsFontMetrics
    NS_ASSERTION(rv==0, "failed to get face/size");
    if (rv)
      return nsnull;
-@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont
+@@ -2379,16 +2379,16 @@ void nsFT2Type1Generator::GeneratePSFont
    mEntry->GetFamilyName(fontName);
    mEntry->GetStyleName(styleName);
    
Index: patches/patch-gfx_src_ps_nsFontMetricsPS_h
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-gfx_src_ps_nsFontMetricsPS_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gfx_src_ps_nsFontMetricsPS_h
--- patches/patch-gfx_src_ps_nsFontMetricsPS_h	6 Nov 2004 23:05:42 -0000	1.1
+++ patches/patch-gfx_src_ps_nsFontMetricsPS_h	10 Sep 2005 07:39:15 -0000
@@ -1,21 +1,21 @@
 $OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_h,v 1.1 2004/11/06 23:05:42 naddy Exp $
---- gfx/src/ps/nsFontMetricsPS.h.orig	Tue Apr 22 18:25:09 2003
-+++ gfx/src/ps/nsFontMetricsPS.h	Sat Nov  6 22:16:21 2004
-@@ -320,7 +320,7 @@ protected:
+--- gfx/src/ps/nsFontMetricsPS.h.orig	Tue Jun 28 20:29:10 2005
++++ gfx/src/ps/nsFontMetricsPS.h	Sat Sep 10 09:38:59 2005
+@@ -424,7 +424,7 @@ protected:
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
    nsCOMPtr<nsIFreeType2> mFt2;
    PRUint16        mPixelSize;
 -  FTC_Image_Desc  mImageDesc;
 +  FTC_ImageType   mImageDesc;
+   nsCString       mFontNameBase;   // the base name of type 1 (sub) fonts
+   nscoord         mHeight; 
  
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@ public:
+@@ -493,7 +493,7 @@ public:
  protected:
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
    nsCOMPtr<nsIFreeType2> mFt2;
 -  FTC_Image_Desc  mImageDesc;
 +  FTC_ImageType   mImageDesc;
  };
- #endif
- 
+ #endif   // MOZ_ENABLE_FREETYPE2
+ #endif   // MOZ_ENABLE_XFT
Index: patches/patch-gfx_src_psshared_nsCUPSShim_cpp
===================================================================
RCS file: patches/patch-gfx_src_psshared_nsCUPSShim_cpp
diff -N patches/patch-gfx_src_psshared_nsCUPSShim_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-gfx_src_psshared_nsCUPSShim_cpp	10 Sep 2005 07:33:29 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- gfx/src/psshared/nsCUPSShim.cpp.orig	Sun May  8 17:01:20 2005
++++ gfx/src/psshared/nsCUPSShim.cpp	Sat Sep 10 09:18:18 2005
+@@ -41,7 +41,6 @@
+ #include "nsCUPSShim.h"
+ #include "prlink.h"
+ 
+-
+ // List of symbols to find in libcups. Must match symAddr[] defined in Init().
+ // Making this an array of arrays instead of pointers allows storing the
+ // whole thing in read-only memory.
+@@ -59,7 +58,7 @@ static const int gSymNameCt = sizeof(gSy
+ PRBool
+ nsCUPSShim::Init()
+ {
+-    mCupsLib = PR_LoadLibrary("libcups.so.2");
++    mCupsLib = PR_LoadLibrary("libcups.so");
+     if (!mCupsLib)
+         return PR_FALSE;
+ 
Index: patches/patch-htmlparser_public_nsHTMLTagList_h
===================================================================
RCS file: patches/patch-htmlparser_public_nsHTMLTagList_h
diff -N patches/patch-htmlparser_public_nsHTMLTagList_h
--- patches/patch-htmlparser_public_nsHTMLTagList_h	21 Oct 2005 08:47:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-htmlparser_public_nsHTMLTagList_h,v 1.1 2005/10/21 08:47:14 aanriot Exp $
---- htmlparser/public/nsHTMLTagList.h.orig	Fri Jun  4 17:29:24 2004
-+++ htmlparser/public/nsHTMLTagList.h	Wed Oct 19 15:11:46 2005
-@@ -141,7 +141,6 @@ HTML_TAG(optgroup, OptGroup)
- HTML_TAG(option, Option)
- HTML_TAG(p, Paragraph)
- HTML_TAG(param, SharedLeaf)
--HTML_TAG(parsererror, Div)
- HTML_TAG(plaintext, Span)
- HTML_TAG(pre, Pre)
- HTML_TAG(q, Quote)
-@@ -152,7 +151,6 @@ HTML_TAG(select, Select)
- HTML_TAG(server, Span)
- HTML_TAG(small, Span)
- HTML_TAG(sound, Span)
--HTML_TAG(sourcetext, Div)
- HTML_TAG(spacer, SharedLeaf)
- HTML_TAG(span, Span)
- HTML_TAG(strike, Span)
Index: patches/patch-htmlparser_src_COtherElements_h
===================================================================
RCS file: patches/patch-htmlparser_src_COtherElements_h
diff -N patches/patch-htmlparser_src_COtherElements_h
--- patches/patch-htmlparser_src_COtherElements_h	21 Oct 2005 08:47:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-htmlparser_src_COtherElements_h,v 1.1 2005/10/21 08:47:14 aanriot Exp $
---- htmlparser/src/COtherElements.h.orig	Wed Jul  2 00:21:20 2003
-+++ htmlparser/src/COtherElements.h	Wed Oct 19 15:11:46 2005
-@@ -2346,7 +2346,6 @@ void CElementTable::InitializeElements()
-   mDfltElements[eHTMLTag_p].mContainsGroups.mBits.mSelf=0;
- 
-   CElement::InitializeLeaf(         mDfltElements[eHTMLTag_param],      eHTMLTag_param, CElement::GetEmptyGroup(), CLeafElement::GetContainedGroups());
--  CBlockElement::Initialize(        mDfltElements[eHTMLTag_parsererror],eHTMLTag_parsererror);
-   CElement::Initialize(             mDfltElements[eHTMLTag_plaintext],  eHTMLTag_plaintext);
-   CBlockElement::Initialize(        mDfltElements[eHTMLTag_pre],        eHTMLTag_pre);
-   mDfltElements[eHTMLTag_pre].mExcludeKids=kPreExcludeKids;
-@@ -2366,7 +2365,6 @@ void CElementTable::InitializeElements()
- 
-   CElement::Initialize(             mDfltElements[eHTMLTag_server],     eHTMLTag_server);
-   CFontStyleElement::Initialize(    mDfltElements[eHTMLTag_small],      eHTMLTag_small);
--  CElement::Initialize(             mDfltElements[eHTMLTag_sourcetext], eHTMLTag_sourcetext);
-   CElement::Initialize(             mDfltElements[eHTMLTag_spacer],     eHTMLTag_spacer);
-   CSpecialElement::Initialize(      mDfltElements[eHTMLTag_span],       eHTMLTag_span);
-   CFontStyleElement::Initialize(    mDfltElements[eHTMLTag_strike],     eHTMLTag_strike);
Index: patches/patch-htmlparser_src_nsElementTable_cpp
===================================================================
RCS file: patches/patch-htmlparser_src_nsElementTable_cpp
diff -N patches/patch-htmlparser_src_nsElementTable_cpp
--- patches/patch-htmlparser_src_nsElementTable_cpp	21 Oct 2005 08:47:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-htmlparser_src_nsElementTable_cpp,v 1.1 2005/10/21 08:47:14 aanriot Exp $
---- htmlparser/src/nsElementTable.cpp.orig	Sat Apr 10 06:08:26 2004
-+++ htmlparser/src/nsElementTable.cpp	Wed Oct 19 15:11:46 2005
-@@ -934,15 +934,6 @@ void InitializeElementTable(void) {     
-       /*special parents,kids,skip*/       &gParamParents,0,eHTMLTag_unknown);
- 
-     Initialize( 
--      /*tag*/                             eHTMLTag_parsererror,
--      /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
--	    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,	
--      /*autoclose starttags and endtags*/ &gDivAutoClose,0,0,0,
--      /*parent,incl,exclgroups*/          kNone, (kSelf|kFlowEntity), kNone,	
--      /*special props, prop-range*/       0, kNoPropRange,
--      /*special parents,kids,skip*/       0,0,eHTMLTag_unknown);
--
--    Initialize( 
-       /*tag*/                             eHTMLTag_plaintext,
-       /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
- 	    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,	
-@@ -1031,15 +1022,6 @@ void InitializeElementTable(void) {     
-       /*autoclose starttags and endtags*/ 0,0,0,0,
-       /*parent,incl,exclgroups*/          (kFlowEntity|kHeadContent), kNone, kNone,	 // Added kFlowEntity|kHeadContent & kNonContainer in
-       /*special props, prop-range*/       kNonContainer,kDefaultPropRange,           // Ref. to Bug 25749
--      /*special parents,kids,skip*/       0,0,eHTMLTag_unknown);
--
--    Initialize( 
--      /*tag*/                             eHTMLTag_sourcetext,
--      /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
--	    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,	
--      /*autoclose starttags and endtags*/ &gDivAutoClose,0,0,0,
--      /*parent,incl,exclgroups*/          kNone, (kSelf|kFlowEntity), kNone,	
--      /*special props, prop-range*/       0,kDefaultPropRange,
-       /*special parents,kids,skip*/       0,0,eHTMLTag_unknown);
- 
-     Initialize( 
Index: patches/patch-htmlparser_src_nsHTMLTags_cpp
===================================================================
RCS file: patches/patch-htmlparser_src_nsHTMLTags_cpp
diff -N patches/patch-htmlparser_src_nsHTMLTags_cpp
--- patches/patch-htmlparser_src_nsHTMLTags_cpp	21 Oct 2005 08:47:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-htmlparser_src_nsHTMLTags_cpp,v 1.1 2005/10/21 08:47:14 aanriot Exp $
---- htmlparser/src/nsHTMLTags.cpp.orig	Wed Feb 18 01:15:49 2004
-+++ htmlparser/src/nsHTMLTags.cpp	Wed Oct 19 15:11:46 2005
-@@ -200,8 +200,6 @@ static const PRUnichar sHTMLTagUnicodeNa
-   {'p', '\0'};
- static const PRUnichar sHTMLTagUnicodeName_param[] =
-   {'p', 'a', 'r', 'a', 'm', '\0'};
--static const PRUnichar sHTMLTagUnicodeName_parsererror[] =
--  {'p', 'a', 'r', 's', 'e', 'r', 'e', 'r', 'r', 'o', 'r', '\0'};
- static const PRUnichar sHTMLTagUnicodeName_plaintext[] =
-   {'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't', '\0'};
- static const PRUnichar sHTMLTagUnicodeName_pre[] =
-@@ -222,8 +220,6 @@ static const PRUnichar sHTMLTagUnicodeNa
-   {'s', 'm', 'a', 'l', 'l', '\0'};
- static const PRUnichar sHTMLTagUnicodeName_sound[] =
-   {'s', 'o', 'u', 'n', 'd', '\0'};
--static const PRUnichar sHTMLTagUnicodeName_sourcetext[] =
--  {'s', 'o', 'u', 'r', 'c', 'e', 't', 'e', 'x', 't', '\0'};
- static const PRUnichar sHTMLTagUnicodeName_spacer[] =
-   {'s', 'p', 'a', 'c', 'e', 'r', '\0'};
- static const PRUnichar sHTMLTagUnicodeName_span[] =
-@@ -311,7 +307,7 @@ HTMLTagsKeyCompareUCPtr(const void *key1
- 
- 
- static PRUint32 sMaxTagNameLength;
--#define NS_HTMLTAG_NAME_MAX_LENGTH 11
-+#define NS_HTMLTAG_NAME_MAX_LENGTH 10
- 
- // static
- nsresult
Index: patches/patch-htmlparser_tools_gentags_pl
===================================================================
RCS file: patches/patch-htmlparser_tools_gentags_pl
diff -N patches/patch-htmlparser_tools_gentags_pl
--- patches/patch-htmlparser_tools_gentags_pl	21 Oct 2005 08:47:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-htmlparser_tools_gentags_pl,v 1.1 2005/10/21 08:47:14 aanriot Exp $
---- htmlparser/tools/gentags.pl.orig	Tue Oct 23 03:36:53 2001
-+++ htmlparser/tools/gentags.pl	Wed Oct 19 15:11:46 2005
-@@ -104,7 +104,6 @@ $tags[$i++] = "optgroup";
- $tags[$i++] = "option";
- $tags[$i++] = "p";
- $tags[$i++] = "param";
--$tags[$i++] = "parsererror";
- $tags[$i++] = "plaintext";
- $tags[$i++] = "pre";
- $tags[$i++] = "q";
-@@ -115,7 +114,6 @@ $tags[$i++] = "select";
- $tags[$i++] = "server";
- $tags[$i++] = "small";
- $tags[$i++] = "sound";
--$tags[$i++] = "sourcetext";
- $tags[$i++] = "spacer";
- $tags[$i++] = "span";
- $tags[$i++] = "strike";
Index: patches/patch-mail_app_mozilla_in
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-mail_app_mozilla_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-mail_app_mozilla_in
--- patches/patch-mail_app_mozilla_in	25 Oct 2005 21:08:41 -0000	1.5
+++ patches/patch-mail_app_mozilla_in	26 Oct 2005 08:47:57 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-mail_app_mozilla_in,v 1.5 2005/10/25 21:08:41 wilfried Exp $
---- mail/app/mozilla.in.orig	Tue Sep 20 23:10:29 2005
-+++ mail/app/mozilla.in	Mon Oct 24 21:49:38 2005
-@@ -73,6 +73,7 @@ moz_pis_startstop_scripts()
+--- mail/app/mozilla.in.orig	Tue Sep 20 23:13:05 2005
++++ mail/app/mozilla.in	Sat Oct 22 14:26:20 2005
+@@ -93,6 +93,7 @@ moz_pis_startstop_scripts()
  #set -x
  
  moz_libdir=%MOZAPPDIR%
@@ -9,7 +9,7 @@ $OpenBSD: patch-mail_app_mozilla_in,v 1.
  MRE_HOME=%MREDIR%
  
  # Use run-mozilla.sh in the current dir if it exists
-@@ -109,6 +110,7 @@ if [ $found = 0 ]; then
+@@ -129,6 +130,7 @@ if [ $found = 0 ]; then
    # Check default compile-time libdir
    if [ -x "$moz_libdir/run-mozilla.sh" ]; then
      dist_bin="$moz_libdir"
@@ -17,7 +17,7 @@ $OpenBSD: patch-mail_app_mozilla_in,v 1.
    else 
      echo "Cannot find mozilla runtime directory. Exiting."
      exit 1
-@@ -228,7 +230,11 @@ do
+@@ -170,7 +172,11 @@ do
    esac
  done
  
Index: patches/patch-modules_libpref_src_init_all_js
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-modules_libpref_src_init_all_js,v
retrieving revision 1.1
diff -u -p -r1.1 patch-modules_libpref_src_init_all_js
--- patches/patch-modules_libpref_src_init_all_js	9 Apr 2005 08:11:19 -0000	1.1
+++ patches/patch-modules_libpref_src_init_all_js	22 Oct 2005 12:26:46 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-modules_libpref_src_init_all_js,v 1.1 2005/04/09 08:11:19 wilfried Exp $
---- modules/libpref/src/init/all.js.orig	Fri Apr  1 14:46:10 2005
-+++ modules/libpref/src/init/all.js	Fri Apr  1 14:46:45 2005
-@@ -1673,7 +1673,7 @@ pref("font.scale.outline.min",      6);
+--- modules/libpref/src/init/all.js.orig	Sat Oct  1 09:39:48 2005
++++ modules/libpref/src/init/all.js	Sat Oct 22 14:26:01 2005
+@@ -2033,7 +2033,7 @@ pref("font.scale.outline.min",      6);
  
  // TrueType
  pref("font.FreeType2.enable", false);
Index: patches/patch-modules_plugin_base_public_nptypes_h
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-modules_plugin_base_public_nptypes_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-modules_plugin_base_public_nptypes_h
--- patches/patch-modules_plugin_base_public_nptypes_h	27 Dec 2004 21:21:39 -0000	1.1
+++ patches/patch-modules_plugin_base_public_nptypes_h	10 Sep 2005 07:33:26 -0000
@@ -1,13 +1,24 @@
 $OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.1 2004/12/27 21:21:39 wilfried Exp $
---- modules/plugin/base/public/nptypes.h.orig	Wed Sep  1 18:59:55 2004
-+++ modules/plugin/base/public/nptypes.h	Fri Sep 17 19:54:12 2004
-@@ -78,7 +78,9 @@
-     typedef int bool;
-   #endif
-   #else /* OPENBSD is defined, so use its bool */
-+  #if !defined(__cplusplus)
-     #include <stdbool.h>
-+  #endif
+--- modules/plugin/base/public/nptypes.h.orig	Thu May 19 23:49:42 2005
++++ modules/plugin/base/public/nptypes.h	Sat Sep 10 09:27:13 2005
+@@ -67,10 +67,8 @@
+ 
+   /*
+    * BSD/OS ships no header that defines uint32_t, nor bool (for C)
+-   * OpenBSD ships no header that defines uint32_t and using its bool macro is
+-   * unsafe.
+    */
+-  #if defined(bsdi) || defined(OPENBSD)
++  #if defined(bsdi)
+   typedef u_int32_t uint32_t;
+ 
+   #if !defined(__cplusplus)
+@@ -78,7 +76,7 @@
    #endif
    #else
    /*
+-   * FreeBSD defines uint32_t and bool.
++   * FreeBSD, and OpenBSD defines uint32_t and bool.
+    */
+     #include <inttypes.h>
+     #include <stdbool.h>
Index: patches/patch-nsprpub_config_rules_mk
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_config_rules_mk,v
retrieving revision 1.1
diff -u -p -r1.1 patch-nsprpub_config_rules_mk
--- patches/patch-nsprpub_config_rules_mk	15 Feb 2004 19:41:58 -0000	1.1
+++ patches/patch-nsprpub_config_rules_mk	10 Sep 2005 07:33:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_config_rules_mk,v 1.1 2004/02/15 19:41:58 wilfried Exp $
---- nsprpub/config/rules.mk.orig	2004-02-15 11:04:44.000000000 +0100
-+++ nsprpub/config/rules.mk	2004-02-15 11:11:33.000000000 +0100
-@@ -222,7 +222,7 @@ ifdef RELEASE_HEADERS
+--- nsprpub/config/rules.mk.orig	Thu Apr 14 00:57:55 2005
++++ nsprpub/config/rules.mk	Sat Sep 10 09:08:28 2005
+@@ -231,7 +231,7 @@ ifdef RELEASE_HEADERS
  	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
  endif
  ifdef RELEASE_LIBS
Index: patches/patch-nsprpub_configure_in
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_configure_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-nsprpub_configure_in
--- patches/patch-nsprpub_configure_in	9 Apr 2005 08:11:19 -0000	1.4
+++ patches/patch-nsprpub_configure_in	10 Sep 2005 07:33:25 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_configure_in,v 1.4 2005/04/09 08:11:19 wilfried Exp $
---- nsprpub/configure.in.orig	Fri Oct 22 16:48:52 2004
-+++ nsprpub/configure.in	Fri Oct 22 16:47:30 2004
-@@ -1493,9 +1493,11 @@ mips-sony-newsos*)
+--- nsprpub/configure.in.orig	Thu Aug 25 01:19:59 2005
++++ nsprpub/configure.in	Sat Sep 10 09:08:28 2005
+@@ -1620,9 +1620,11 @@ mips-sony-newsos*)
      AC_DEFINE(OPENBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
      AC_DEFINE(HAVE_SOCKLEN_T)
Index: patches/patch-nsprpub_pr_include_md__openbsd_h
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_md__openbsd_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-nsprpub_pr_include_md__openbsd_h
--- patches/patch-nsprpub_pr_include_md__openbsd_h	9 Apr 2005 08:48:11 -0000	1.5
+++ patches/patch-nsprpub_pr_include_md__openbsd_h	10 Sep 2005 17:54:49 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.5 2005/04/09 08:48:11 wilfried Exp $
---- nsprpub/pr/include/md/_openbsd.h.orig	Wed Mar 10 08:51:37 2004
-+++ nsprpub/pr/include/md/_openbsd.h	Wed Apr  6 22:38:21 2005
-@@ -53,7 +53,7 @@
+--- nsprpub/pr/include/md/_openbsd.h.orig	Wed Apr 28 02:33:44 2004
++++ nsprpub/pr/include/md/_openbsd.h	Sat Sep 10 19:48:15 2005
+@@ -56,7 +56,7 @@
  #define _PR_SI_ARCHITECTURE "sparc"
  #endif
  
Index: patches/patch-nsprpub_pr_include_private_primpl_h
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_include_private_primpl_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-nsprpub_pr_include_private_primpl_h
--- patches/patch-nsprpub_pr_include_private_primpl_h	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-nsprpub_pr_include_private_primpl_h	10 Sep 2005 07:33:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- nsprpub/pr/include/private/primpl.h.orig	2004-04-14 22:36:59.000000000 +0200
-+++ nsprpub/pr/include/private/primpl.h	2004-05-05 06:26:46.000000000 +0200
-@@ -1861,6 +1861,7 @@ extern void _PR_DestroyZones(void);
+--- nsprpub/pr/include/private/primpl.h.orig	Thu Aug 18 19:24:29 2005
++++ nsprpub/pr/include/private/primpl.h	Sat Sep 10 09:08:28 2005
+@@ -1867,6 +1867,7 @@ extern void _PR_DestroyZones(void);
          && !defined(DARWIN) \
          && !defined(NEXTSTEP) \
          && !defined(QNX) \
Index: patches/patch-nsprpub_pr_src_io_prprf_c
===================================================================
RCS file: patches/patch-nsprpub_pr_src_io_prprf_c
diff -N patches/patch-nsprpub_pr_src_io_prprf_c
--- patches/patch-nsprpub_pr_src_io_prprf_c	27 Dec 2004 21:21:39 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- nsprpub/pr/src/io/prprf.c.orig	2004-03-09 04:18:19.000000000 +0100
-+++ nsprpub/pr/src/io/prprf.c	2004-05-06 15:35:51.000000000 +0200
-@@ -51,7 +51,9 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__x86_64__))
-+#if defined(va_copy)
-+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar)
-+#elif (defined(LINUX) && defined(__x86_64__))
- #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
- #elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
Index: patches/patch-nsprpub_pr_src_misc_prinit_c
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prinit_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-nsprpub_pr_src_misc_prinit_c
--- patches/patch-nsprpub_pr_src_misc_prinit_c	18 Jan 2004 11:47:42 -0000	1.1.1.1
+++ patches/patch-nsprpub_pr_src_misc_prinit_c	10 Sep 2005 07:33:24 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.1.1.1 2004/01/18 11:47:42 wilfried Exp $
---- nsprpub/pr/src/misc/prinit.c.orig	2003-01-20 21:13:09.000000000 +0100
-+++ nsprpub/pr/src/misc/prinit.c	2003-12-12 11:07:27.000000000 +0100
-@@ -430,6 +430,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+--- nsprpub/pr/src/misc/prinit.c.orig	Wed Apr 28 02:34:07 2004
++++ nsprpub/pr/src/misc/prinit.c	Sat Sep 10 09:08:28 2005
+@@ -433,6 +433,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
  	    _PR_LogCleanup();
  
          /*
@@ -14,7 +14,7 @@ $OpenBSD: patch-nsprpub_pr_src_misc_prin
           * This part should look like the end of _PR_NativeRunThread
           * and _PR_UserRunThread.
           */
-@@ -441,6 +447,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+@@ -444,6 +450,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
              PR_DELETE(me->stack);
              PR_DELETE(me);
          }
@@ -22,7 +22,7 @@ $OpenBSD: patch-nsprpub_pr_src_misc_prin
  
          /*
           * XXX: We are freeing the heap memory here so that Purify won't
-@@ -449,8 +456,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
+@@ -452,8 +459,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
           * Ideally, for each _PR_InitXXX(), there should be a corresponding
           * _PR_XXXCleanup() that we can call here.
           */
Index: patches/patch-nsprpub_pr_src_misc_prnetdb_c
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_misc_prnetdb_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-nsprpub_pr_src_misc_prnetdb_c
--- patches/patch-nsprpub_pr_src_misc_prnetdb_c	13 Jan 2005 15:50:59 -0000	1.4
+++ patches/patch-nsprpub_pr_src_misc_prnetdb_c	10 Sep 2005 07:33:25 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.4 2005/01/13 15:50:59 wilfried Exp $
---- nsprpub/pr/src/misc/prnetdb.c.orig	Thu Sep  2 01:07:28 2004
-+++ nsprpub/pr/src/misc/prnetdb.c	Thu Jan 13 16:46:58 2005
-@@ -2098,7 +2098,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+--- nsprpub/pr/src/misc/prnetdb.c.orig	Thu Aug 18 19:24:38 2005
++++ nsprpub/pr/src/misc/prnetdb.c	Sat Sep 10 09:08:28 2005
+@@ -2110,7 +2110,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
Index: patches/patch-nsprpub_pr_src_pthreads_ptthread_c
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-nsprpub_pr_src_pthreads_ptthread_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-nsprpub_pr_src_pthreads_ptthread_c
--- patches/patch-nsprpub_pr_src_pthreads_ptthread_c	26 Mar 2005 19:04:13 -0000	1.1
+++ patches/patch-nsprpub_pr_src_pthreads_ptthread_c	10 Sep 2005 07:33:25 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.1 2005/03/26 19:04:13 wilfried Exp $
---- nsprpub/pr/src/pthreads/ptthread.c.orig	Wed Aug 28 16:42:52 2002
-+++ nsprpub/pr/src/pthreads/ptthread.c	Sun Mar 20 08:53:15 2005
-@@ -48,6 +48,7 @@
+--- nsprpub/pr/src/pthreads/ptthread.c.orig	Thu Aug 18 19:24:38 2005
++++ nsprpub/pr/src/pthreads/ptthread.c	Sat Sep 10 09:08:28 2005
+@@ -51,6 +51,7 @@
  #include <unistd.h>
  #include <string.h>
  #include <signal.h>
Index: patches/patch-security_coreconf_OpenBSD_mk
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-security_coreconf_OpenBSD_mk,v
retrieving revision 1.4
diff -u -p -r1.4 patch-security_coreconf_OpenBSD_mk
--- patches/patch-security_coreconf_OpenBSD_mk	9 Apr 2005 08:48:11 -0000	1.4
+++ patches/patch-security_coreconf_OpenBSD_mk	10 Sep 2005 07:33:25 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.4 2005/04/09 08:48:11 wilfried Exp $
---- security/coreconf/OpenBSD.mk.orig	2003-09-16 14:50:50.000000000 -0600
-+++ security/coreconf/OpenBSD.mk	2004-03-01 18:07:55.000000000 -0700
-@@ -35,12 +35,12 @@
+--- security/coreconf/OpenBSD.mk.orig	Sun Apr 25 17:02:17 2004
++++ security/coreconf/OpenBSD.mk	Sat Sep 10 09:08:28 2005
+@@ -37,12 +37,12 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-security_coreconf_OpenBS
  ifeq ($(CPU_ARCH),i386)
  OS_REL_CFLAGS		= -Di386
  CPU_ARCH		= x86
-@@ -53,7 +53,7 @@ OS_LIBS			+= -pthread
+@@ -55,7 +55,7 @@ OS_LIBS			+= -pthread
  DSO_LDOPTS		+= -pthread
  endif
  
@@ -27,7 +27,7 @@ $OpenBSD: patch-security_coreconf_OpenBS
  
  OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
  
-@@ -62,7 +62,7 @@ OS_LIBS			= 
+@@ -64,7 +64,7 @@ OS_LIBS			= 
  ARCH			= openbsd
  
  DSO_CFLAGS		= -fPIC -DPIC
Index: patches/patch-security_coreconf_rules_mk
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-security_coreconf_rules_mk,v
retrieving revision 1.1
diff -u -p -r1.1 patch-security_coreconf_rules_mk
--- patches/patch-security_coreconf_rules_mk	15 Feb 2004 19:41:58 -0000	1.1
+++ patches/patch-security_coreconf_rules_mk	10 Sep 2005 07:33:25 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-security_coreconf_rules_mk,v 1.1 2004/02/15 19:41:58 wilfried Exp $
---- security/coreconf/rules.mk.orig	2004-02-15 14:43:58.000000000 +0100
-+++ security/coreconf/rules.mk	2004-02-15 15:23:12.000000000 +0100
-@@ -348,7 +348,6 @@ ifdef XP_OS2_VACPP
+--- security/coreconf/rules.mk.orig	Fri Apr 15 02:36:28 2005
++++ security/coreconf/rules.mk	Sat Sep 10 09:08:28 2005
+@@ -352,7 +352,6 @@ ifdef XP_OS2_VACPP
  else
  	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
  endif
Index: patches/patch-widget_src_gtk2_nsSound_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-widget_src_gtk2_nsSound_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-widget_src_gtk2_nsSound_cpp
--- patches/patch-widget_src_gtk2_nsSound_cpp	4 Jan 2005 21:27:28 -0000	1.1
+++ patches/patch-widget_src_gtk2_nsSound_cpp	10 Sep 2005 07:33:29 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.1 2005/01/04 21:27:28 wilfried Exp $
---- widget/src/gtk2/nsSound.cpp.orig	Sun Mar  7 20:12:21 2004
-+++ widget/src/gtk2/nsSound.cpp	Tue Jan  4 22:07:10 2005
-@@ -91,7 +91,7 @@ nsSound::Init()
+--- widget/src/gtk2/nsSound.cpp.orig	Wed Nov  3 10:13:04 2004
++++ widget/src/gtk2/nsSound.cpp	Sat Sep 10 09:08:28 2005
+@@ -110,7 +110,7 @@ nsSound::Init()
  
      EsdOpenSoundType EsdOpenSound;
  
Index: patches/patch-widget_src_gtk_nsSound_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-widget_src_gtk_nsSound_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-widget_src_gtk_nsSound_cpp
--- patches/patch-widget_src_gtk_nsSound_cpp	4 Jan 2005 21:27:28 -0000	1.1
+++ patches/patch-widget_src_gtk_nsSound_cpp	10 Sep 2005 07:33:29 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-widget_src_gtk_nsSound_cpp,v 1.1 2005/01/04 21:27:28 wilfried Exp $
---- widget/src/gtk/nsSound.cpp.orig	Sun Mar  7 20:12:02 2004
-+++ widget/src/gtk/nsSound.cpp	Tue Jan  4 11:24:01 2005
-@@ -86,7 +86,7 @@ nsSound::Init()
+--- widget/src/gtk/nsSound.cpp.orig	Wed Nov  3 10:13:04 2004
++++ widget/src/gtk/nsSound.cpp	Sat Sep 10 09:08:28 2005
+@@ -106,7 +106,7 @@ nsSound::Init()
  
    EsdOpenSoundType EsdOpenSound;
  
Index: patches/patch-xpcom_components_nsNativeComponentLoader_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-xpcom_components_nsNativeComponentLoader_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-xpcom_components_nsNativeComponentLoader_cpp
--- patches/patch-xpcom_components_nsNativeComponentLoader_cpp	9 Apr 2005 08:48:11 -0000	1.1
+++ patches/patch-xpcom_components_nsNativeComponentLoader_cpp	10 Sep 2005 17:54:51 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.1 2005/04/09 08:48:11 wilfried Exp $
---- xpcom/components/nsNativeComponentLoader.cpp.orig	Mon Jun  7 19:12:08 2004
-+++ xpcom/components/nsNativeComponentLoader.cpp	Wed Apr  6 22:50:29 2005
-@@ -656,7 +656,7 @@ nsNativeComponentLoader::AutoRegisterCom
+--- xpcom/components/nsNativeComponentLoader.cpp.orig	Thu Jul 14 20:42:57 2005
++++ xpcom/components/nsNativeComponentLoader.cpp	Sat Sep 10 19:48:15 2005
+@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterCom
          ".shlb",    /* Mac ? */
          ".dso",     /* Unix ? */
          ".dylib",   /* Unix: Mach */
Index: patches/patch-xpcom_glue_standalone_Makefile_in
===================================================================
RCS file: patches/patch-xpcom_glue_standalone_Makefile_in
diff -N patches/patch-xpcom_glue_standalone_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-xpcom_glue_standalone_Makefile_in	10 Sep 2005 17:19:30 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- xpcom/glue/standalone/Makefile.in.orig	Sat Sep 10 09:48:07 2005
++++ xpcom/glue/standalone/Makefile.in	Sat Sep 10 19:17:25 2005
+@@ -62,6 +62,9 @@ endif
+ ifneq (,$(filter AIX Linux,$(OS_ARCH)))
+ LINKSRC = nsGlueLinkingDlopen.cpp
+ endif
++ifeq (OpenBSD,$(OS_ARCH))
++LINKSRC = nsGlueLinkingDlopen.cpp
++endif
+ ifeq (OS2,$(OS_ARCH))
+ LINKSRC = nsGlueLinkingOS2.cpp
+ endif
Index: patches/patch-xpcom_io_nsNativeCharsetUtils_cpp
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-xpcom_io_nsNativeCharsetUtils_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-xpcom_io_nsNativeCharsetUtils_cpp
--- patches/patch-xpcom_io_nsNativeCharsetUtils_cpp	27 Dec 2004 21:21:39 -0000	1.2
+++ patches/patch-xpcom_io_nsNativeCharsetUtils_cpp	10 Sep 2005 07:33:27 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-xpcom_io_nsNativeCharsetUtils_cpp,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- xpcom/io/nsNativeCharsetUtils.cpp.orig	Tue Nov  9 21:46:03 2004
-+++ xpcom/io/nsNativeCharsetUtils.cpp	Fri Dec  3 11:21:11 2004
-@@ -329,7 +329,11 @@ nsNativeCharsetConverter::LazyInit()
+--- xpcom/io/nsNativeCharsetUtils.cpp.orig	Mon Nov  8 06:20:05 2004
++++ xpcom/io/nsNativeCharsetUtils.cpp	Sat Sep 10 09:08:28 2005
+@@ -330,7 +330,11 @@ nsNativeCharsetConverter::LazyInit()
  {
      const char  *blank_list[] = { "", NULL };
      const char **native_charset_list = blank_list;
Index: patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
--- patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in	27 Dec 2004 21:21:39 -0000	1.3
+++ patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in	10 Sep 2005 07:33:28 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2004/12/27 21:21:39 wilfried Exp $
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Apr 22 22:50:05 2004
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Fri Sep 17 19:43:39 2004
-@@ -51,6 +51,12 @@ CPPSRCS		:= xptcinvoke_unixish_x86.cpp x
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Wed Jun 15 10:32:21 2005
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Sep 10 09:08:28 2005
+@@ -67,6 +67,12 @@ CPPSRCS		:= xptcinvoke_unixish_x86.cpp x
  endif
  endif
  #
@@ -14,7 +14,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_sr
  # New code for Linux, et. al., with gcc
  # Migrate other platforms here after testing
  #
-@@ -111,6 +117,12 @@ CPPSRCS		:= xptcinvoke_osf1_alpha.cpp xp
+@@ -128,6 +134,12 @@ CPPSRCS		:= xptcinvoke_osf1_alpha.cpp xp
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
  #
@@ -27,7 +27,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_sr
  # Linux/Alpha
  #
  ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-@@ -260,6 +272,14 @@ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s 
+@@ -277,6 +289,14 @@ ASFILES		:= xptcinvoke_asm_ppc_netbsd.s 
  endif
  
  #
@@ -42,7 +42,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_sr
  # Darwin/PPC
  #
  ifeq ($(OS_ARCH),Darwin)
-@@ -271,6 +291,20 @@ endif
+@@ -288,6 +308,20 @@ endif
  CPPSRCS		:= xptcinvoke_ppc_rhapsody.cpp xptcstubs_ppc_rhapsody.cpp
  ASFILES		:= xptcinvoke_asm_ppc_rhapsody.s xptcstubs_asm_ppc_darwin.s
  endif
Index: patches/patch-xpcom_sample_Makefile_in
===================================================================
RCS file: patches/patch-xpcom_sample_Makefile_in
diff -N patches/patch-xpcom_sample_Makefile_in
--- patches/patch-xpcom_sample_Makefile_in	27 Dec 2004 21:21:39 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-xpcom_sample_Makefile_in,v 1.2 2004/12/27 21:21:39 wilfried Exp $
---- xpcom/sample/Makefile.in.orig	2004-02-19 03:43:46.000000000 +0100
-+++ xpcom/sample/Makefile.in	2004-05-05 06:26:46.000000000 +0200
-@@ -52,7 +52,7 @@ XPIDLSRCS	= nsISample.idl
- 
- TESTCPPSRCS	= nsTestSample.cpp
- 
--CPPSRCS		+= $(TESTCPPSRCS)
-+#CPPSRCS		+= $(TESTCPPSRCS)
- 
- SIMPLE_PROGRAMS	= $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX))
- 
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PFRAG.shared,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.shared
--- pkg/PFRAG.shared	9 Sep 2005 16:22:28 -0000	1.5
+++ pkg/PFRAG.shared	26 Oct 2005 13:58:47 -0000
@@ -1,8 +1,11 @@
 @comment $OpenBSD: PFRAG.shared,v 1.5 2005/09/09 16:22:28 wilfried Exp $
 @lib mozilla-thunderbird/components/libaccessibility.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libappcomps.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libauth.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libautoconfig.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libcaps.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libchrome.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libcommandlines.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libcomposer.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libdocshell.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libeditor.so.${SO_VERSION}
@@ -10,7 +13,6 @@
 @lib mozilla-thunderbird/components/libfileview.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libgfx_gtk.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libgfxps.so.${SO_VERSION}
-@lib mozilla-thunderbird/components/libgfxxprint.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libgklayout.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libhtmlpars.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libi18n.so.${SO_VERSION}
@@ -33,9 +35,13 @@
 @lib mozilla-thunderbird/components/libpippki.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libpref.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/librdf.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libremoteservice.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libspellchecker.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libsystem-pref.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libtoolkitcomps.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libtxmgr.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libuconv.so.${SO_VERSION}
+@lib mozilla-thunderbird/components/libuniversalchardet.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libwallet.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libwalletviewers.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libwebbrwsr.so.${SO_VERSION}
@@ -45,8 +51,7 @@
 @lib mozilla-thunderbird/components/libxpcom_compat_c.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libxpconnect.so.${SO_VERSION}
 @lib mozilla-thunderbird/components/libxpinstall.so.${SO_VERSION}
-@lib mozilla-thunderbird/components/libxremote_client.so.${SO_VERSION}
-@lib mozilla-thunderbird/components/libxremoteservice.so.${SO_VERSION}
+@lib mozilla-thunderbird/libgfxpsshar.so.${SO_VERSION}
 @lib mozilla-thunderbird/libgkgfx.so.${SO_VERSION}
 @lib mozilla-thunderbird/libgtkembedmoz.so.${SO_VERSION}
 @lib mozilla-thunderbird/libgtkxtbin.so.${SO_VERSION}
@@ -61,7 +66,7 @@
 @lib mozilla-thunderbird/libsmime3.so.${SO_VERSION}
 @lib mozilla-thunderbird/libsoftokn3.so.${SO_VERSION}
 @lib mozilla-thunderbird/libssl3.so.${SO_VERSION}
-@lib mozilla-thunderbird/libxlibrgb.so.${SO_VERSION}
 @lib mozilla-thunderbird/libxpcom.so.${SO_VERSION}
 @lib mozilla-thunderbird/libxpcom_compat.so.${SO_VERSION}
+@lib mozilla-thunderbird/libxpcom_core.so.${SO_VERSION}
 @lib mozilla-thunderbird/libxpistub.so.${SO_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST	9 Sep 2005 16:22:28 -0000	1.8
+++ pkg/PLIST	26 Oct 2005 13:58:50 -0000
@@ -6,159 +6,14 @@ bin/thunderbird-config
 mozilla-thunderbird/
 mozilla-thunderbird/LICENSE
 mozilla-thunderbird/chrome/
+mozilla-thunderbird/chrome/US.jar
 mozilla-thunderbird/chrome/chromelist.txt
-mozilla-thunderbird/chrome/classic/
 mozilla-thunderbird/chrome/classic.jar
-mozilla-thunderbird/chrome/classic/skin/
-mozilla-thunderbird/chrome/classic/skin/classic/

-mozilla-thunderbird/chrome/classic/skin/classic/editor/
-mozilla-thunderbird/chrome/classic/skin/classic/editor/icons/
-mozilla-thunderbird/chrome/classic/skin/classic/global/

-mozilla-thunderbird/chrome/classic/skin/classic/messenger/

-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/downloads/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/extensions/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/pref/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/profile/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/shared/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/update/
-mozilla-thunderbird/chrome/classic/skin/classic/mozapps/xpinstall/
-mozilla-thunderbird/chrome/classic/skin/classic/navigator/
-mozilla-thunderbird/chrome/classic/skin/classic/navigator/btn1/
-mozilla-thunderbird/chrome/classic/skin/classic/navigator/icons/
-mozilla-thunderbird/chrome/comm/
+mozilla-thunderbird/chrome/classic.manifest
 mozilla-thunderbird/chrome/comm.jar
-mozilla-thunderbird/chrome/comm/content/
-mozilla-thunderbird/chrome/comm/content/communicator/
-mozilla-thunderbird/chrome/comm/content/communicator-platform/
-mozilla-thunderbird/chrome/comm/content/communicator-region/
-mozilla-thunderbird/chrome/comm/content/communicator/alerts/
-mozilla-thunderbird/chrome/comm/content/communicator/directory/
-mozilla-thunderbird/chrome/comm/content/communicator/downloadmanager/
-mozilla-thunderbird/chrome/comm/content/communicator/history/
-mozilla-thunderbird/chrome/comm/content/communicator/pref/
-mozilla-thunderbird/chrome/comm/content/communicator/related/
-mozilla-thunderbird/chrome/comm/content/communicator/search/
-mozilla-thunderbird/chrome/comm/content/communicator/sidebar/
-mozilla-thunderbird/chrome/comm/content/communicator/wallet/
-mozilla-thunderbird/chrome/comm/content/editor/
-mozilla-thunderbird/chrome/comm/content/editor-region/
-mozilla-thunderbird/chrome/comm/content/editor/images/
-mozilla-thunderbird/chrome/comm/content/help/
-mozilla-thunderbird/chrome/comm/content/mozldap/
-mozilla-thunderbird/chrome/comm/content/navigator/
-mozilla-thunderbird/chrome/comm/content/navigator-platform/
-mozilla-thunderbird/chrome/comm/content/navigator-platform/mac/
-mozilla-thunderbird/chrome/comm/content/navigator-platform/unix/
-mozilla-thunderbird/chrome/comm/content/navigator-platform/win/
-mozilla-thunderbird/chrome/comm/content/navigator-region/
-mozilla-thunderbird/chrome/comm/content/necko/
-mozilla-thunderbird/chrome/comm/content/wallet/
-mozilla-thunderbird/chrome/comm/content/xbl-marquee/
-mozilla-thunderbird/chrome/embed-sample/
-mozilla-thunderbird/chrome/embed-sample.jar
-mozilla-thunderbird/chrome/embed-sample/content/
-mozilla-thunderbird/chrome/embed-sample/content/embed/
-mozilla-thunderbird/chrome/embed-sample/locale/
-mozilla-thunderbird/chrome/embed-sample/locale/en-US/
-mozilla-thunderbird/chrome/embed-sample/locale/en-US/embed/
-mozilla-thunderbird/chrome/embed-sample/skin/
-mozilla-thunderbird/chrome/embed-sample/skin/classic/
-mozilla-thunderbird/chrome/embed-sample/skin/classic/embed/
-mozilla-thunderbird/chrome/en-US/
+mozilla-thunderbird/chrome/comm.manifest
 mozilla-thunderbird/chrome/en-US.jar
-mozilla-thunderbird/chrome/en-US/locale/
-mozilla-thunderbird/chrome/en-US/locale/communicator/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/mac/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/mac/pref/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/unix/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/unix/pref/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/win/
-mozilla-thunderbird/chrome/en-US/locale/communicator-platform/win/pref/
-mozilla-thunderbird/chrome/en-US/locale/communicator/pref/
-mozilla-thunderbird/chrome/en-US/locale/communicator/wallet/
-mozilla-thunderbird/chrome/en-US/locale/editor/
-mozilla-thunderbird/chrome/en-US/locale/en-US/
-mozilla-thunderbird/chrome/en-US/locale/en-US/messenger-mapi/
-mozilla-thunderbird/chrome/en-US/locale/en-US/messenger-smime/
-mozilla-thunderbird/chrome/en-US/locale/global/
-mozilla-thunderbird/chrome/en-US/locale/global-platform/
-mozilla-thunderbird/chrome/en-US/locale/global-platform/mac/
-mozilla-thunderbird/chrome/en-US/locale/global-platform/unix/
-mozilla-thunderbird/chrome/en-US/locale/global-platform/win/
-mozilla-thunderbird/chrome/en-US/locale/global-region/
-mozilla-thunderbird/chrome/en-US/locale/global/dom/
-mozilla-thunderbird/chrome/en-US/locale/global/history/
-mozilla-thunderbird/chrome/en-US/locale/global/layout/
-mozilla-thunderbird/chrome/en-US/locale/global/security/
-mozilla-thunderbird/chrome/en-US/locale/global/webservices/
-mozilla-thunderbird/chrome/en-US/locale/global/xml/
-mozilla-thunderbird/chrome/en-US/locale/global/xpinstall/
-mozilla-thunderbird/chrome/en-US/locale/messenger/
-mozilla-thunderbird/chrome/en-US/locale/messenger-newsblog/
-mozilla-thunderbird/chrome/en-US/locale/messenger-offline/
-mozilla-thunderbird/chrome/en-US/locale/messenger-region/
-mozilla-thunderbird/chrome/en-US/locale/messenger/addressbook/
-mozilla-thunderbird/chrome/en-US/locale/messenger/messengercompose/
-mozilla-thunderbird/chrome/en-US/locale/messenger/migration/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/downloads/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/extensions/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/plugins/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/profile/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/update/
-mozilla-thunderbird/chrome/en-US/locale/mozapps/xpinstall/
-mozilla-thunderbird/chrome/en-US/locale/mozldap/
-mozilla-thunderbird/chrome/en-US/locale/navigator/
-mozilla-thunderbird/chrome/en-US/locale/navigator-platform/
-mozilla-thunderbird/chrome/en-US/locale/navigator-platform/mac/
-mozilla-thunderbird/chrome/en-US/locale/navigator-platform/unix/
-mozilla-thunderbird/chrome/en-US/locale/navigator-platform/win/
-mozilla-thunderbird/chrome/en-US/locale/necko/
-mozilla-thunderbird/chrome/en-US/locale/passwordmgr/
-mozilla-thunderbird/chrome/en-US/locale/pipnss/
-mozilla-thunderbird/chrome/en-US/locale/pippki/
-mozilla-thunderbird/chrome/help/
-mozilla-thunderbird/chrome/help.jar
-mozilla-thunderbird/chrome/help/skin/
-mozilla-thunderbird/chrome/help/skin/classic/
-mozilla-thunderbird/chrome/help/skin/classic/help/
+mozilla-thunderbird/chrome/en-US.manifest
 mozilla-thunderbird/chrome/icons/
 mozilla-thunderbird/chrome/icons/default/
 mozilla-thunderbird/chrome/icons/default/abcardWindow.xpm
@@ -171,72 +26,42 @@ mozilla-thunderbird/chrome/icons/default
 mozilla-thunderbird/chrome/icons/default/msgcomposeWindow.xpm
 mozilla-thunderbird/chrome/icons/default/msgcomposeWindow16.xpm
 mozilla-thunderbird/chrome/installed-chrome.txt
-mozilla-thunderbird/chrome/messenger/
 mozilla-thunderbird/chrome/messenger.jar
-mozilla-thunderbird/chrome/messenger/content/
-mozilla-thunderbird/chrome/messenger/content/editor/
-mozilla-thunderbird/chrome/messenger/content/editor/images/
-mozilla-thunderbird/chrome/messenger/content/messenger/

-mozilla-thunderbird/chrome/newsblog/
+mozilla-thunderbird/chrome/messenger.manifest
 mozilla-thunderbird/chrome/newsblog.jar
-mozilla-thunderbird/chrome/newsblog/content/
-mozilla-thunderbird/chrome/newsblog/content/messenger-newsblog/
-mozilla-thunderbird/chrome/offline/
+mozilla-thunderbird/chrome/newsblog.manifest
 mozilla-thunderbird/chrome/offline.jar
-mozilla-thunderbird/chrome/offline/content/
-mozilla-thunderbird/chrome/offline/content/messenger-offline/
-mozilla-thunderbird/chrome/pipnss/
-mozilla-thunderbird/chrome/pipnss.jar
-mozilla-thunderbird/chrome/pipnss/content/
-mozilla-thunderbird/chrome/pipnss/content/pipnss/
-mozilla-thunderbird/chrome/pippki/
+mozilla-thunderbird/chrome/offline.manifest
 mozilla-thunderbird/chrome/pippki.jar
-mozilla-thunderbird/chrome/pippki/content/
-mozilla-thunderbird/chrome/pippki/content/pippki/
-mozilla-thunderbird/chrome/toolkit/
+mozilla-thunderbird/chrome/pippki.manifest
 mozilla-thunderbird/chrome/toolkit.jar
-mozilla-thunderbird/chrome/toolkit/content/
-mozilla-thunderbird/chrome/toolkit/content/communicator/
-mozilla-thunderbird/chrome/toolkit/content/global/
-mozilla-thunderbird/chrome/toolkit/content/global-platform/
-mozilla-thunderbird/chrome/toolkit/content/global-region/
-mozilla-thunderbird/chrome/toolkit/content/global/bindings/
-mozilla-thunderbird/chrome/toolkit/content/global/xml/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/downloads/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/extensions/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/plugins/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/profile/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/shared/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/update/
-mozilla-thunderbird/chrome/toolkit/content/mozapps/xpinstall/
+mozilla-thunderbird/chrome/toolkit.manifest
 mozilla-thunderbird/components/
 mozilla-thunderbird/components/accessibility-atk.xpt
 mozilla-thunderbird/components/accessibility.xpt
 mozilla-thunderbird/components/addrbook.xpt
+mozilla-thunderbird/components/alerts.xpt
 mozilla-thunderbird/components/appshell.xpt
+mozilla-thunderbird/components/appstartup.xpt
 mozilla-thunderbird/components/autocomplete.xpt
+mozilla-thunderbird/components/autoconfig.xpt
 mozilla-thunderbird/components/bookmarks.xpt
 mozilla-thunderbird/components/caps.xpt
 mozilla-thunderbird/components/chardet.xpt
+mozilla-thunderbird/components/chrome.xpt
 mozilla-thunderbird/components/commandhandler.xpt
+mozilla-thunderbird/components/commandlines.xpt
 mozilla-thunderbird/components/composer.xpt
 mozilla-thunderbird/components/content_base.xpt
 mozilla-thunderbird/components/content_html.xpt
 mozilla-thunderbird/components/content_htmldoc.xpt
 mozilla-thunderbird/components/content_xmldoc.xpt
 mozilla-thunderbird/components/content_xslt.xpt
+mozilla-thunderbird/components/content_xtf.xpt
 mozilla-thunderbird/components/docshell.xpt
 mozilla-thunderbird/components/dom.xpt
 mozilla-thunderbird/components/dom_base.xpt
+mozilla-thunderbird/components/dom_canvas.xpt
 mozilla-thunderbird/components/dom_core.xpt
 mozilla-thunderbird/components/dom_css.xpt
 mozilla-thunderbird/components/dom_events.xpt
@@ -250,6 +75,7 @@ mozilla-thunderbird/components/dom_xbl.x
 mozilla-thunderbird/components/dom_xpath.xpt
 mozilla-thunderbird/components/dom_xul.xpt
 mozilla-thunderbird/components/downloadmanager.xpt
+mozilla-thunderbird/components/downloads.xpt
 mozilla-thunderbird/components/editor.xpt
 mozilla-thunderbird/components/embed_base.xpt
 mozilla-thunderbird/components/extensions.xpt
@@ -257,7 +83,6 @@ mozilla-thunderbird/components/exthandle
 mozilla-thunderbird/components/filepicker.xpt
 mozilla-thunderbird/components/find.xpt
 mozilla-thunderbird/components/gfx.xpt
-mozilla-thunderbird/components/helperAppDlg.xpt
 mozilla-thunderbird/components/history.xpt
 mozilla-thunderbird/components/htmlparser.xpt
 mozilla-thunderbird/components/imglib2.xpt
@@ -268,8 +93,8 @@ mozilla-thunderbird/components/jar.xpt
 mozilla-thunderbird/components/jsconsole-clhandler.js
 mozilla-thunderbird/components/jsconsole.xpt
 mozilla-thunderbird/components/jsdservice.xpt
-mozilla-thunderbird/components/jsurl.xpt
 mozilla-thunderbird/components/layout_base.xpt
+mozilla-thunderbird/components/layout_printing.xpt
 mozilla-thunderbird/components/layout_xul.xpt
 mozilla-thunderbird/components/layout_xul_tree.xpt
 mozilla-thunderbird/components/locale.xpt
@@ -304,19 +129,22 @@ mozilla-thunderbird/components/necko_dns
 mozilla-thunderbird/components/necko_file.xpt
 mozilla-thunderbird/components/necko_ftp.xpt
 mozilla-thunderbird/components/necko_http.xpt
-mozilla-thunderbird/components/necko_jar.xpt
 mozilla-thunderbird/components/necko_res.xpt
 mozilla-thunderbird/components/necko_socket.xpt
 mozilla-thunderbird/components/necko_strconv.xpt
 mozilla-thunderbird/components/necko_viewsource.xpt
 mozilla-thunderbird/components/newsblog.js
+mozilla-thunderbird/components/nsAbLDAPAttributeMap.js
 mozilla-thunderbird/components/nsCloseAllWindows.js
+mozilla-thunderbird/components/nsComposerCmdLineHandler.js
+mozilla-thunderbird/components/nsDefaultCLH.js
 mozilla-thunderbird/components/nsDownloadProgressListener.js
 mozilla-thunderbird/components/nsExtensionManager.js
 mozilla-thunderbird/components/nsFilePicker.js
 mozilla-thunderbird/components/nsHelperAppDlg.js
 mozilla-thunderbird/components/nsInterfaceInfoToIDL.js
 mozilla-thunderbird/components/nsLDAPPrefsService.js
+mozilla-thunderbird/components/nsMailDefaultHandler.js
 mozilla-thunderbird/components/nsProgressDialog.js
 mozilla-thunderbird/components/nsProxyAutoConfig.js
 mozilla-thunderbird/components/nsUpdateService.js
@@ -336,6 +164,7 @@ mozilla-thunderbird/components/signonvie
 mozilla-thunderbird/components/smime-service.js
 mozilla-thunderbird/components/spellchecker.xpt
 mozilla-thunderbird/components/toolkitprofile.xpt
+mozilla-thunderbird/components/toolkitremote.xpt
 mozilla-thunderbird/components/txmgr.xpt
 mozilla-thunderbird/components/txtsvc.xpt
 mozilla-thunderbird/components/uconv.xpt
@@ -362,10 +191,13 @@ mozilla-thunderbird/components/xpcom_thr
 mozilla-thunderbird/components/xpcom_xpti.xpt
 mozilla-thunderbird/components/xpconnect.xpt
 mozilla-thunderbird/components/xpinstall.xpt
-mozilla-thunderbird/components/xremoteservice.xpt
+mozilla-thunderbird/components/xulapp.xpt
 mozilla-thunderbird/components/xuldoc.xpt
 mozilla-thunderbird/components/xultmpl.xpt
 mozilla-thunderbird/defaults/
+mozilla-thunderbird/defaults/autoconfig/
+mozilla-thunderbird/defaults/autoconfig/platform.js
+mozilla-thunderbird/defaults/autoconfig/prefcalls.js
 mozilla-thunderbird/defaults/isp/
 mozilla-thunderbird/defaults/isp/US/
 mozilla-thunderbird/defaults/isp/US/movemail.rdf
@@ -373,11 +205,15 @@ mozilla-thunderbird/defaults/isp/US/rss.
 mozilla-thunderbird/defaults/isp/movemail.rdf
 mozilla-thunderbird/defaults/isp/rss.rdf
 mozilla-thunderbird/defaults/messenger/
+mozilla-thunderbird/defaults/messenger/SpamAssassin.sfd
+mozilla-thunderbird/defaults/messenger/SpamPal.sfd
 mozilla-thunderbird/defaults/messenger/US/
 mozilla-thunderbird/defaults/messenger/US/mailViews.dat
 mozilla-thunderbird/defaults/messenger/mailViews.dat
 mozilla-thunderbird/defaults/pref/
+mozilla-thunderbird/defaults/pref/all-l10n.js
 mozilla-thunderbird/defaults/pref/all-thunderbird.js
+mozilla-thunderbird/defaults/pref/channel-prefs.js
 mozilla-thunderbird/defaults/pref/composer.js
 mozilla-thunderbird/defaults/pref/mailnews.js
 mozilla-thunderbird/defaults/pref/mdn.js
@@ -386,11 +222,6 @@ mozilla-thunderbird/defaults/profile/
 mozilla-thunderbird/defaults/profile/US/
 mozilla-thunderbird/defaults/profile/US/localstore.rdf
 mozilla-thunderbird/defaults/profile/US/mimeTypes.rdf
-mozilla-thunderbird/defaults/profile/extensions/
-mozilla-thunderbird/defaults/profile/extensions/Extensions.rdf
-mozilla-thunderbird/defaults/profile/extensions/installed-extensions.txt
-mozilla-thunderbird/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
-mozilla-thunderbird/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 mozilla-thunderbird/defaults/profile/localstore.rdf
 mozilla-thunderbird/defaults/profile/mimeTypes.rdf
 mozilla-thunderbird/defaults/profile/prefs.js
@@ -403,8 +234,6 @@ mozilla-thunderbird/defaults/wallet/Sche
 mozilla-thunderbird/defaults/wallet/StateSchema.tbl
 mozilla-thunderbird/defaults/wallet/VcardSchema.tbl
 mozilla-thunderbird/extensions/
-mozilla-thunderbird/extensions/Extensions.rdf
-mozilla-thunderbird/extensions/installed-extensions-processed.txt
 mozilla-thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
 mozilla-thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 mozilla-thunderbird/greprefs/
@@ -415,7 +244,6 @@ mozilla-thunderbird/mozicon16.xpm
 mozilla-thunderbird/mozicon50.xpm
 mozilla-thunderbird/mozilla-thunderbird-bin
 mozilla-thunderbird/mozilla-xremote-client
-mozilla-thunderbird/regchrome
 mozilla-thunderbird/regxpcom
 mozilla-thunderbird/res/
 mozilla-thunderbird/res/EditorOverride.css
@@ -436,6 +264,7 @@ mozilla-thunderbird/res/entityTables/htm
 mozilla-thunderbird/res/entityTables/transliterate.properties
 mozilla-thunderbird/res/fonts/
 mozilla-thunderbird/res/fonts/fontEncoding.properties
+mozilla-thunderbird/res/fonts/pangoFontEncoding.properties
 mozilla-thunderbird/res/forms.css
 mozilla-thunderbird/res/grabber.gif
 mozilla-thunderbird/res/hiddenWindow.html
@@ -454,14 +283,7 @@ mozilla-thunderbird/res/html/gopher-unkn
 mozilla-thunderbird/res/langGroups.properties
 mozilla-thunderbird/res/language.properties
 mozilla-thunderbird/res/loading-image.gif
-mozilla-thunderbird/res/platform-forms.css
 mozilla-thunderbird/res/quirk.css
-mozilla-thunderbird/res/rdf/
-mozilla-thunderbird/res/rdf/dom-test-4.css
-mozilla-thunderbird/res/rdf/folder-closed.gif
-mozilla-thunderbird/res/rdf/folder-open.gif
-mozilla-thunderbird/res/rdf/ignore-test.xul
-mozilla-thunderbird/res/rdf/loading.gif
 mozilla-thunderbird/res/sample.unixpsfonts.properties
 mozilla-thunderbird/res/samples/
 mozilla-thunderbird/res/samples/Anieyes.gif
@@ -592,7 +414,6 @@ mozilla-thunderbird/thunderbird-bin
 @cwd ${LOCALBASE}/mozilla-thunderbird
 @exec rm -rf /tmp/.mozilla
 @exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regxpcom
-@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regchrome
 @exec rm -rf /tmp/.mozilla
 @unexec rm -f %D/components/compreg.dat
 @unexec rm -f %D/components/xpti.dat
