Update thunderbird to 0.6

What's new from release notes:
* Improved Junk Mail Controls
The algorithm for the adaptive junk mail controls has been heavily
redesigned to learn faster and catch more spam.

* New Brand Identity
To be consistent with the Mozilla Foundation's goal of brand identity,
Thunderbird has a new logo and supporting artwork thanks to the fine
work of the Mozilla Visual Identity team.

* Other New Features...
- IMAP users can now benefit from support for the IMAP IDLE command
which allows the mail server to push notifications such as new mail
arriving as soon as it arrives.

- Thunderbird supports server-wide news filters that apply to all
newsgroups on a server.

- Thunderbird includes Secure Password Authentication using a new
cross-platform NTLM authentication mechanism for IMAP, POP3 and SMTP.

- Mail filters can now mark messages as junk.

- Tools > Options > Compose > HTML Options allows you to set up
default HTML compose options such as font, size and color.

- Attachments can be opened directly from the compose window to verify
their contents before sending.

- Thunderbird now supports the notion of multiple identities per mail
account. This makes it easy to have several e-mail addresses which end
up going into the same account. Read More about how to set this up.

* Recently Fixed Bugs
- In the case of a failure when copying a message to an online Sent
folder, Thunderbird will now ask if you would like it to try again.

- Pasting data from an OpenOffice.org spreadsheet no longer pastes
random HTML garbage before the actual spreadsheet data into HTML
compose.

- Fixed several situations where LDAP connections were left open when
using LDAP auto complete or performing searches on LDAP directories.

- Improved view source behavior.

- Mail notification for POP3 messages that are marked deleted or
marked read by mail filters no longer occurs.

- The "Mark All Read" keyboard shortcut now works for Linux GTK2.

26 files changed, 407 insertions, 118 deletions

diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 88e799e8bcf..ad733d97994 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,21 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/08 04:35:37 taya Exp $
 
---- config/autoconf.mk.in.orig	2003-10-30 22:11:05.000000000 +0100
-+++ config/autoconf.mk.in
-@@ -29,13 +29,13 @@ MOZILLA_VERSION = @MOZILLA_VERSION@
+diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
+--- ../Orig/mozilla/config/autoconf.mk.in	2004-03-21 11:31:17.000000000 +0900
++++ ./config/autoconf.mk.in	2004-05-05 23:08:22.000000000 +0900
+@@ -31,13 +31,13 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
--includedir	= @includedir@/mozilla-$(MOZILLA_VERSION)
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +includedir	= @includedir@/$(MOZILLA_PKG_NAME)
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
--idldir		= @datadir@/idl/mozilla-$(MOZILLA_VERSION)
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
  
--mozappdir	= $(libdir)/mozilla-$(MOZILLA_VERSION)
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 +mozappdir	= $(libdir)/$(MOZILLA_PKG_NAME)
- mredir		= $(libdir)/mre/mre-$(MOZILLA_VERSION)
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
  mrelibdir	= $(mredir)/lib
  
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index 7f9a46ff5d6..33fdcea6a21 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ab,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2003-12-12 08:30:36.000000000 +0900
-+++ ./configure.in	2004-01-16 23:17:19.000000000 +0900
-@@ -959,6 +959,9 @@
+--- ../Orig/mozilla/configure.in	2004-04-21 10:39:17.000000000 +0900
++++ ./configure.in	2004-05-05 23:08:54.000000000 +0900
+@@ -1017,6 +1017,9 @@
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -13,7 +13,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1248,6 +1251,13 @@
+@@ -1308,6 +1311,13 @@
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -27,13 +27,12 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -2192,9 +2202,6 @@
- 				CXXFLAGS="$CXXFLAGS -mt" 
- 			fi
- 			;;
--	*-*-netbsd*)
--		USE_PTHREADS=
--		_PTHREAD_LDFLAGS=
- 	esac
- fi
- 
+@@ -1531,7 +1541,7 @@
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -z muldefs -h $@'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 57eceb46372..365a28a2e53 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ac,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 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	2003-08-15 13:00:23.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	2004-01-16 23:17:21.000000000 +0900
-@@ -135,7 +135,7 @@
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2004-04-23 05:50:05.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	2004-05-05 23:09:39.000000000 +0900
+@@ -140,7 +140,7 @@
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -12,7 +12,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -169,7 +169,7 @@
+@@ -174,7 +174,7 @@
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -21,7 +21,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/r
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -295,6 +295,13 @@
+@@ -305,6 +305,13 @@
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
index d0dd9f64f91..a279449fb7d 100644
--- a/mail/thunderbird/patches/patch-ad
+++ b/mail/thunderbird/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ad,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 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	2001-09-29 05:12:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2004-01-16 23:17:22.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2004-05-05 23:09:42.000000000 +0900
 @@ -132,6 +132,15 @@
      }
  }
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index c5fc12b258e..3e81b3efc2d 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/08 04:35:38 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	2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2004-01-16 23:17:24.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2004-05-05 23:09:44.000000000 +0900
 @@ -123,17 +123,27 @@
      }
  }
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
index 7b415895080..2dc92c9d667 100644
--- a/mail/thunderbird/patches/patch-af
+++ b/mail/thunderbird/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-af,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c
 --- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c	2003-05-31 08:31:19.000000000 +0900
-+++ ./security/nss/lib/freebl/unix_rand.c	2004-01-16 23:17:26.000000000 +0900
++++ ./security/nss/lib/freebl/unix_rand.c	2004-05-05 23:09:46.000000000 +0900
 @@ -32,6 +32,7 @@
   */
  
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index 14ab1d2bde5..9450af5478f 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ag,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
 --- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h	2003-01-17 21:39:36.000000000 +0900
-+++ ./extensions/transformiix/source/base/ErrorObserver.h	2004-01-16 23:17:34.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h	2004-05-05 23:09:56.000000000 +0900
 @@ -28,7 +28,8 @@
  
  #include "baseutils.h"
diff --git a/mail/thunderbird/patches/patch-ah b/mail/thunderbird/patches/patch-ah
new file mode 100644
index 00000000000..94be2602af7
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ah
@@ -0,0 +1,49 @@
+$NetBSD: patch-ah,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 10:09:33.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl	2004-05-05 23:15:51.000000000 +0900
+@@ -76,10 +76,11 @@
+ native FT_Sfnt_Tag(FT_Sfnt_Tag);
+ native FT_Size(FT_Size);
+ 
+-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
++[ptr] native FTC_ImageType_p(FTC_ImageType);
+ native FTC_Face_Requester(FTC_Face_Requester);
+ native FTC_Font(FTC_Font);
+-native FTC_Image_Cache(FTC_Image_Cache);
++native FTC_FaceID(FTC_FaceID);
++native FTC_ImageCache(FTC_ImageCache);
+ native FTC_Manager(FTC_Manager);
+ 
+ // #ifdef MOZ_SVG
+@@ -99,7 +100,7 @@
+ 
+     readonly attribute FT_Library library;
+     readonly attribute FTC_Manager FTCacheManager;
+-    readonly attribute FTC_Image_Cache ImageCache;
++    readonly attribute FTC_ImageCache ImageCache;
+ 
+     void    doneFace(in FT_Face face);
+     void    doneFreeType(in FT_Library lib);
+@@ -115,16 +116,16 @@
+     void    outlineDecompose(in FT_Outline_p outline,
+                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
+     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
+-    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
++    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
+                              in FT_UInt gindex, out FT_Glyph glyph);
+-    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
+-                              out FT_Face face, out FT_Size size);
++    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
++                              out FT_Face face);
+     void    managerDone(in FTC_Manager manager);
+     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
+                        in FT_UInt max_sizes, in FT_ULong max_bytes,
+                        in FTC_Face_Requester requester, in FT_Pointer req_data,
+                        out FTC_Manager manager);
+-    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
++    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
new file mode 100644
index 00000000000..b99c77433e9
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ai
@@ -0,0 +1,63 @@
+$NetBSD: patch-ai,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2004-02-05 10:57:05.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp	2004-05-05 23:17:00.000000000 +0900
+@@ -1141,10 +1141,10 @@
+   
+   mPixelSize = NSToIntRound(app2dev * mFont->size);
+ 
+-  mImageDesc.font.face_id    = (void*)mEntry;
+-  mImageDesc.font.pix_width  = mPixelSize;
+-  mImageDesc.font.pix_height = mPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
++  mImageDesc->width  = mPixelSize;
++  mImageDesc->height = mPixelSize;
++  mImageDesc->flags = 0;
+ 
+   nsresult rv;
+   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
+@@ -1190,7 +1190,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache iCache;
++  FTC_ImageCache iCache;
+   nsresult rv = mFt2->GetImageCache(&iCache);
+   if (NS_FAILED(rv)) {
+     NS_ERROR("Failed to get Image Cache");
+@@ -1228,8 +1228,8 @@
+   
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   NS_ASSERTION(rv==0, "failed to get face/size");
+   if (rv)
+     return nsnull;
+@@ -1622,16 +1622,16 @@
+   mEntry->GetFamilyName(fontName);
+   mEntry->GetStyleName(styleName);
+   
+-  mImageDesc.font.face_id    = (void*)mEntry;
++  mImageDesc->face_id = (FTC_FaceID)&mEntry;
+   // TT glyph has no relation to size
+-  mImageDesc.font.pix_width  = 16;
+-  mImageDesc.font.pix_height = 16;
+-  mImageDesc.image_type = 0;
++  mImageDesc->width  = 16;
++  mImageDesc->height = 16;
++  mImageDesc->flags = 0;
+   FT_Face face = nsnull;
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
++                                        &face);
+   if (NS_FAILED(rv))
+     return;
+  
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
new file mode 100644
index 00000000000..e334b6c261a
--- /dev/null
+++ b/mail/thunderbird/patches/patch-aj
@@ -0,0 +1,41 @@
+$NetBSD: patch-aj,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h	2004-04-17 06:31:42.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h	2004-05-05 23:20:07.000000000 +0900
+@@ -104,13 +104,13 @@
+ 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)
+-                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
+-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
+-                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
++                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
++typedef FT_Error (*FTC_Manager_LookupFace_t)
++                      (FTC_Manager, FTC_FaceID, FT_Face*);
+ typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
+ typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
+                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
+-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
++typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
+ // #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 +165,7 @@
+   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
+   FT_Set_Charmap_t          nsFT_Set_Charmap;
+   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
+-  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
++  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
+   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 +213,7 @@
+   PRLibrary      *mSharedLib;
+   FT_Library      mFreeTypeLibrary;
+   FTC_Manager     mFTCacheManager;
+-  FTC_Image_Cache mImageCache;
++  FTC_ImageCache  mImageCache;
+ 
+   static nsHashtable   *sFontFamilies;
+   static nsHashtable   *sRange1CharSetNames;
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
new file mode 100644
index 00000000000..259fac5cfc9
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ak
@@ -0,0 +1,62 @@
+$NetBSD: patch-ak,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp	2004-02-08 00:22:30.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp	2004-05-06 08:26:21.000000000 +0900
+@@ -110,11 +110,11 @@
+   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
+   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
+   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
+-  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
+-  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
++  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
++  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE},
+   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
+   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
+-  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
++  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
+ // #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 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
+                               FT_UInt glyphID, FT_Glyph *glyph)
+ { 
+   // call the FreeType2 function via the function pointer
+@@ -291,11 +291,11 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
+-                               FT_Face *face, FT_Size *size)
++nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
++                               FT_Face *face)
+ { 
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
++  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ } 
+  
+@@ -320,7 +320,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
+ { 
+   // call the FreeType2 function via the function pointer
+   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
+@@ -389,7 +389,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
++nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
+ {
+   *aCache = mImageCache;
+   return NS_OK;
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
new file mode 100644
index 00000000000..fd9de33f0c1
--- /dev/null
+++ b/mail/thunderbird/patches/patch-al
@@ -0,0 +1,23 @@
+$NetBSD: patch-al,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h	2003-04-23 01:25:09.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h	2004-05-05 23:22:27.000000000 +0900
+@@ -320,7 +320,7 @@
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
+   nsCOMPtr<nsIFreeType2> mFt2;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ 
+ 
+   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
+@@ -363,7 +363,7 @@
+ protected:
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
+   nsCOMPtr<nsIFreeType2> mFt2;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+ };
+ #endif
+ 
diff --git a/mail/thunderbird/patches/patch-am b/mail/thunderbird/patches/patch-am
deleted file mode 100644
index 12dba027d3d..00000000000
--- a/mail/thunderbird/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
-
-diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c ./nsprpub/pr/src/pthreads/ptio.c
---- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptio.c	2003-11-27 10:30:44.000000000 +0900
-+++ ./nsprpub/pr/src/pthreads/ptio.c	2004-01-16 23:17:38.000000000 +0900
-@@ -205,7 +205,7 @@
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \
-     || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \
-     || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \
--    || defined(UNIXWARE)
-+    || defined(UNIXWARE) || defined(NETBSD)
- #define _PRSockOptVal_t void *
- #else
- #error "Cannot determine architecture"
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
new file mode 100644
index 00000000000..ea0c00585e0
--- /dev/null
+++ b/mail/thunderbird/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h	2003-04-23 01:25:13.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h	2004-05-05 23:22:39.000000000 +0900
+@@ -110,7 +110,7 @@
+   XImage *GetXImage(PRUint32 width, PRUint32 height);
+   nsITrueTypeFontCatalogEntry *mFaceID;
+   PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ImageType   mImageDesc;
+   nsCOMPtr<nsIFreeType2> mFt2;
+ };
+ 
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
new file mode 100644
index 00000000000..bcc7eea153a
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ao
@@ -0,0 +1,76 @@
+$NetBSD: patch-ao,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2003-12-25 17:24:52.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp	2004-05-05 23:22:43.000000000 +0900
+@@ -177,7 +177,7 @@
+   FTC_Manager mgr;
+   nsresult rv;
+   mFt2->GetFTCacheManager(&mgr);
+-  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
++  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
+   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
+   if (NS_FAILED(rv))
+     return nsnull;
+@@ -191,22 +191,15 @@
+   PRBool embedded_bimap = PR_FALSE;
+   mFaceID = aFaceID;
+   mPixelSize = aPixelSize;
+-  mImageDesc.font.face_id    = (void*)mFaceID;
+-  mImageDesc.font.pix_width  = aPixelSize;
+-  mImageDesc.font.pix_height = aPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
++  mImageDesc->width  = aPixelSize;
++  mImageDesc->height = aPixelSize;
++  mImageDesc->flags = 0;
+ 
+   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
+-    mImageDesc.image_type |= ftc_image_mono;
+     anti_alias = PR_FALSE;
+   }
+ 
+-  if (nsFreeType2::gFreeType2Autohinted)
+-    mImageDesc.image_type |= ftc_image_flag_autohinted;
+-
+-  if (nsFreeType2::gFreeType2Unhinted)
+-    mImageDesc.image_type |= ftc_image_flag_unhinted;
+-
+   PRUint32  num_embedded_bitmaps, i;
+   PRInt32*  embedded_bitmapheights;
+   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
+@@ -218,7 +211,6 @@
+         if (embedded_bitmapheights[i] == aPixelSize) {
+           embedded_bimap = PR_TRUE;
+           // unhinted must be set for embedded bitmaps to be used
+-          mImageDesc.image_type |= ftc_image_flag_unhinted;
+           break;
+         }
+       }
+@@ -312,7 +304,7 @@
+   if (!face)
+     return NS_ERROR_FAILURE;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return NS_ERROR_FAILURE;
+@@ -401,7 +393,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+@@ -723,7 +715,7 @@
+     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
+ #endif
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index a75074eb46a..74b1d67db9d 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-aw,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	2003-04-19 05:14:09.000000000 +0900
-+++ ./widget/src/gtksuperwin/Makefile.in	2004-01-16 23:17:41.000000000 +0900
+--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	2004-01-07 22:36:54.000000000 +0900
++++ ./widget/src/gtksuperwin/Makefile.in	2004-05-05 23:22:48.000000000 +0900
 @@ -25,6 +25,7 @@
  MODULE		= widget
  LIBRARY_NAME	= gtksuperwin
  EXPORT_LIBRARY = 1
 +MKSHLIB		= $(MKCSHLIB)
  
+ PACKAGE_FILE = gtksuperwin.pkg
  
- CSRCS           = \
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
new file mode 100644
index 00000000000..c4e442c253d
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ax
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1 2004/05/08 04:35:38 taya Exp $
+
+diff -ru ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk
+--- ../Orig/mozilla/security/coreconf/SunOS5.mk	2003-05-16 04:12:10.000000000 +0900
++++ ./security/coreconf/SunOS5.mk	2004-05-05 23:22:51.000000000 +0900
+@@ -165,6 +165,10 @@
+ 	DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+ 
++ifdef LIBRUNPATH
++DSO_LDOPTS += -R$(LIBRUNPATH)
++endif
++
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)
+ ifdef NS_USE_GCC
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index 3c73f5a878a..daea145d6f2 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-ba,v 1.2 2004/05/08 04:35:38 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	2000-12-02 06:29:17.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg	2004-01-16 23:17:44.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg	2004-05-05 23:23:03.000000000 +0900
 @@ -45,7 +45,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb
index 3bd87285967..e5c8128c2a3 100644
--- a/mail/thunderbird/patches/patch-bb
+++ b/mail/thunderbird/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bb,v 1.2 2004/05/08 04:35:39 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
 --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	2003-09-12 02:24:53.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h	2004-02-21 16:47:07.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.h	2004-05-05 23:23:04.000000000 +0900
 @@ -48,12 +48,20 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
diff --git a/mail/thunderbird/patches/patch-bm b/mail/thunderbird/patches/patch-bm
index b59abb44b99..11ba7ca1760 100644
--- a/mail/thunderbird/patches/patch-bm
+++ b/mail/thunderbird/patches/patch-bm
@@ -1,8 +1,8 @@
-$NetBSD: patch-bm,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bm,v 1.2 2004/05/08 04:35:39 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2004-01-16 23:17:51.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2004-05-05 23:23:13.000000000 +0900
 @@ -118,18 +118,23 @@
   * so they are contiguous with values passed on the stack, and then calls
   * PrepareAndDispatch() to do the dirty work.
diff --git a/mail/thunderbird/patches/patch-bn b/mail/thunderbird/patches/patch-bn
index 0b9cebbbad6..fd17b9e3b3c 100644
--- a/mail/thunderbird/patches/patch-bn
+++ b/mail/thunderbird/patches/patch-bn
@@ -1,9 +1,9 @@
-$NetBSD: patch-bn,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bn,v 1.2 2004/05/08 04:35:39 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp
---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	2004-01-08 10:25:56.000000000 +0900
-+++ ./xpcom/io/nsNativeCharsetUtils.cpp	2004-01-16 23:17:54.000000000 +0900
-@@ -294,7 +294,12 @@
+--- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	2004-03-26 14:29:18.000000000 +0900
++++ ./xpcom/io/nsNativeCharsetUtils.cpp	2004-05-05 23:23:15.000000000 +0900
+@@ -295,7 +295,12 @@
  {
      const char  *blank_list[] = { "", NULL };
      const char **native_charset_list = blank_list;
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
index ee9bfdfd8df..e6621de427b 100644
--- a/mail/thunderbird/patches/patch-bo
+++ b/mail/thunderbird/patches/patch-bo
@@ -1,9 +1,9 @@
-$NetBSD: patch-bo,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bo,v 1.2 2004/05/08 04:35:39 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in	2003-12-16 04:58:56.000000000 +0900
-+++ ./nsprpub/configure.in	2004-01-31 21:30:19.000000000 +0900
-@@ -930,6 +930,9 @@
+--- ../Orig/mozilla/nsprpub/configure.in	2004-04-17 07:28:02.000000000 +0900
++++ ./nsprpub/configure.in	2004-05-05 23:23:18.000000000 +0900
+@@ -933,6 +933,9 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -13,17 +13,3 @@ diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
      ;;
  
  *-hpux*)
-@@ -2182,7 +2185,12 @@
- 	        _PTHREAD_LDFLAGS="-lc_r"
- 	    fi
- 	    ;;
--    *-openbsd*|*-bsdi*|*-netbsd*)
-+    *-netbsd*)
-+	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-+	        _PTHREAD_LDFLAGS="-pthread"
-+	    fi
-+	    ;;
-+    *-openbsd*|*-bsdi*)
- 	    AC_DEFINE(_THREAD_SAFE)
- 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
- 	    if test "$ac_cv_have_dash_pthread" = "yes"; then
diff --git a/mail/thunderbird/patches/patch-bp b/mail/thunderbird/patches/patch-bp
deleted file mode 100644
index 2a12c14c9ed..00000000000
--- a/mail/thunderbird/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
-
-diff -ru ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in ./other-licenses/libical/src/libical/Makefile.in
---- ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in	2003-01-08 13:59:28.000000000 +0900
-+++ ./other-licenses/libical/src/libical/Makefile.in	2004-01-16 23:18:03.000000000 +0900
-@@ -179,7 +179,7 @@
- 	$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl  -i $(srcdir)/icalrestriction.c.in \
-                 $(DESIGNDATA)/restrictions.csv > icalrestriction.c
- 
--ifneq (,$(filter BeOS Darwin OpenVMS,$(OS_ARCH)))
-+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
- DEFINES	+= -D__USE_BSD=1
- endif
- 
diff --git a/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq
index 2764d16688d..6f8f4d85455 100644
--- a/mail/thunderbird/patches/patch-bq
+++ b/mail/thunderbird/patches/patch-bq
@@ -1,8 +1,8 @@
-$NetBSD: patch-bq,v 1.2 2004/04/26 13:56:09 taya Exp $
+$NetBSD: patch-bq,v 1.3 2004/05/08 04:35:39 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h
---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h	2003-07-19 07:14:16.000000000 +0900
-+++ ./xpcom/io/nsLocalFileUnix.h	2004-04-23 15:01:23.000000000 +0900
+--- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h	2004-01-15 15:14:13.000000000 +0900
++++ ./xpcom/io/nsLocalFileUnix.h	2004-05-05 23:24:31.000000000 +0900
 @@ -57,7 +57,7 @@
  #endif
  
diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br
index d5a6b21f384..7ddd32c3a74 100644
--- a/mail/thunderbird/patches/patch-br
+++ b/mail/thunderbird/patches/patch-br
@@ -1,7 +1,8 @@
-$NetBSD: patch-br,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-br,v 1.2 2004/05/08 04:35:39 taya Exp $
 
---- nsprpub/pr/src/misc/prnetdb.c.orig	2004-02-19 21:45:15.000000000 +0900
-+++ nsprpub/pr/src/misc/prnetdb.c	2004-02-19 21:50:57.000000000 +0900
+diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
+--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c	2004-01-23 07:22:37.000000000 +0900
++++ ./nsprpub/pr/src/misc/prnetdb.c	2004-05-05 23:24:35.000000000 +0900
 @@ -2094,7 +2094,12 @@
           */
          hints.ai_socktype = SOCK_STREAM;
@@ -14,4 +15,4 @@ $NetBSD: patch-br,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
 +
          if (rv == 0)
              return (PRAddrInfo *) res;
-
+ 
diff --git a/mail/thunderbird/patches/patch-bs b/mail/thunderbird/patches/patch-bs
deleted file mode 100644
index 207ea50a407..00000000000
--- a/mail/thunderbird/patches/patch-bs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bs,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
-
-diff -ru ../Orig/mozilla/toolkit/mozapps/downloads/src/Makefile.in ./toolkit/mozapps/downloads/src/Makefile.in
---- ../Orig/mozilla/toolkit/mozapps/downloads/src/Makefile.in	2003-12-11 06:59:41.000000000 +0900
-+++ ./toolkit/mozapps/downloads/src/Makefile.in	2004-04-19 18:42:20.000000000 +0900
-@@ -31,7 +31,7 @@
- libs:: nsHelperAppDlg.js
- 
- nsHelperAppDlg.js: nsHelperAppDlg.js.in
--	$(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
-+	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
- 	$(NSINSTALL) $@ $(DIST)/bin/components/
- 
- include $(topsrcdir)/config/rules.mk