update to 2.0.0.9

Approved by:	portmgr (marcus)

12 files changed, 12 insertions, 114 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 9e145f8a3e71..8912a3c77ad0 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	2.0.0.6
-PORTREVISION=	1
+DISTVERSION=	2.0.0.9
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index 95ef702b2ff0..9ca2ab962a11 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,3 +1,3 @@
-MD5 (thunderbird-2.0.0.6-source.tar.bz2) = 1a002dfc74cfb7f0b36a448ea3cd14b9
-SHA256 (thunderbird-2.0.0.6-source.tar.bz2) = 73011090bc8af7137083f30e693289d6500154e2a785c55b7b28abcd1aac9e9b
-SIZE (thunderbird-2.0.0.6-source.tar.bz2) = 37461752
+MD5 (thunderbird-2.0.0.9-source.tar.bz2) = a6dd74f87dafc7516e7970ecefee046b
+SHA256 (thunderbird-2.0.0.9-source.tar.bz2) = bff4078379abd8616811e06f848aaaebd2cf39b7ae70c1434377c2aaaa6fec80
+SIZE (thunderbird-2.0.0.9-source.tar.bz2) = 37562994
diff --git a/mail/thunderbird-esr/files/patch-gfx_src_gtk_gtk2drawing.c b/mail/thunderbird-esr/files/patch-gfx_src_gtk_gtk2drawing.c
deleted file mode 100644
index 8af8a079e896..000000000000
--- a/mail/thunderbird-esr/files/patch-gfx_src_gtk_gtk2drawing.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
-+++ gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
-@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
-     else
-         *indicator_spacing = default_indicator_spacing;
- 
--    g_free(tmp_indicator_size);
--    g_free(tmp_indicator_spacing);
-+    gtk_requisition_free(tmp_indicator_size);
-+    gtk_border_free(tmp_indicator_spacing);
-  
-     return MOZ_GTK_SUCCESS;
- }
diff --git a/mail/thunderbird-esr/files/patch-nopangoxft b/mail/thunderbird-esr/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c4864e..000000000000
--- a/mail/thunderbird-esr/files/patch-nopangoxft
+++ /dev/null
@@ -1,20 +0,0 @@
---- gfx/src/gtk/mozilla-decoder.cpp.orig	2005-08-18 22:41:26.000000000 -0400
-+++ gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 9e145f8a3e71..8912a3c77ad0 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	2.0.0.6
-PORTREVISION=	1
+DISTVERSION=	2.0.0.9
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 95ef702b2ff0..9ca2ab962a11 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (thunderbird-2.0.0.6-source.tar.bz2) = 1a002dfc74cfb7f0b36a448ea3cd14b9
-SHA256 (thunderbird-2.0.0.6-source.tar.bz2) = 73011090bc8af7137083f30e693289d6500154e2a785c55b7b28abcd1aac9e9b
-SIZE (thunderbird-2.0.0.6-source.tar.bz2) = 37461752
+MD5 (thunderbird-2.0.0.9-source.tar.bz2) = a6dd74f87dafc7516e7970ecefee046b
+SHA256 (thunderbird-2.0.0.9-source.tar.bz2) = bff4078379abd8616811e06f848aaaebd2cf39b7ae70c1434377c2aaaa6fec80
+SIZE (thunderbird-2.0.0.9-source.tar.bz2) = 37562994
diff --git a/mail/thunderbird/files/patch-gfx_src_gtk_gtk2drawing.c b/mail/thunderbird/files/patch-gfx_src_gtk_gtk2drawing.c
deleted file mode 100644
index 8af8a079e896..000000000000
--- a/mail/thunderbird/files/patch-gfx_src_gtk_gtk2drawing.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
-+++ gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
-@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
-     else
-         *indicator_spacing = default_indicator_spacing;
- 
--    g_free(tmp_indicator_size);
--    g_free(tmp_indicator_spacing);
-+    gtk_requisition_free(tmp_indicator_size);
-+    gtk_border_free(tmp_indicator_spacing);
-  
-     return MOZ_GTK_SUCCESS;
- }
diff --git a/mail/thunderbird/files/patch-nopangoxft b/mail/thunderbird/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c4864e..000000000000
--- a/mail/thunderbird/files/patch-nopangoxft
+++ /dev/null
@@ -1,20 +0,0 @@
---- gfx/src/gtk/mozilla-decoder.cpp.orig	2005-08-18 22:41:26.000000000 -0400
-+++ gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 9e145f8a3e71..8912a3c77ad0 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	2.0.0.6
-PORTREVISION=	1
+DISTVERSION=	2.0.0.9
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo
index 95ef702b2ff0..9ca2ab962a11 100644
--- a/mail/thunderbird3/distinfo
+++ b/mail/thunderbird3/distinfo
@@ -1,3 +1,3 @@
-MD5 (thunderbird-2.0.0.6-source.tar.bz2) = 1a002dfc74cfb7f0b36a448ea3cd14b9
-SHA256 (thunderbird-2.0.0.6-source.tar.bz2) = 73011090bc8af7137083f30e693289d6500154e2a785c55b7b28abcd1aac9e9b
-SIZE (thunderbird-2.0.0.6-source.tar.bz2) = 37461752
+MD5 (thunderbird-2.0.0.9-source.tar.bz2) = a6dd74f87dafc7516e7970ecefee046b
+SHA256 (thunderbird-2.0.0.9-source.tar.bz2) = bff4078379abd8616811e06f848aaaebd2cf39b7ae70c1434377c2aaaa6fec80
+SIZE (thunderbird-2.0.0.9-source.tar.bz2) = 37562994
diff --git a/mail/thunderbird3/files/patch-gfx_src_gtk_gtk2drawing.c b/mail/thunderbird3/files/patch-gfx_src_gtk_gtk2drawing.c
deleted file mode 100644
index 8af8a079e896..000000000000
--- a/mail/thunderbird3/files/patch-gfx_src_gtk_gtk2drawing.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gfx/src/gtk/gtk2drawing.c.fixgtk212	2005-09-13 05:30:53.000000000 +0200
-+++ gfx/src/gtk/gtk2drawing.c	2007-09-06 09:42:34.000000000 +0200
-@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
-     else
-         *indicator_spacing = default_indicator_spacing;
- 
--    g_free(tmp_indicator_size);
--    g_free(tmp_indicator_spacing);
-+    gtk_requisition_free(tmp_indicator_size);
-+    gtk_border_free(tmp_indicator_spacing);
-  
-     return MOZ_GTK_SUCCESS;
- }
diff --git a/mail/thunderbird3/files/patch-nopangoxft b/mail/thunderbird3/files/patch-nopangoxft
deleted file mode 100644
index 5a11c8c4864e..000000000000
--- a/mail/thunderbird3/files/patch-nopangoxft
+++ /dev/null
@@ -1,20 +0,0 @@
---- gfx/src/gtk/mozilla-decoder.cpp.orig	2005-08-18 22:41:26.000000000 -0400
-+++ gfx/src/gtk/mozilla-decoder.cpp	2005-08-18 22:38:01.000000000 -0400
-@@ -40,7 +40,7 @@
- #define PANGO_ENABLE_ENGINE
- 
- #include "mozilla-decoder.h"
--#include <pango/pangoxft.h>
-+#include <pango/pangocairo.h>
- #include <pango/pangofc-fontmap.h>
- #include <pango/pangofc-font.h>
- #include <gdk/gdkx.h>
-@@ -208,7 +208,7 @@
-         }
-     }
- 
--    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
-                                             mozilla_find_decoder,
-                                             NULL,
-                                             NULL);