4 files changed, 4 insertions, 90 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 82a0a1bc1653..313f838429e2 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	60.7.2
-PORTREVISION=	1
+DISTVERSION=	60.8.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 3570f97a578e..cb1565f0f34f 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561056349
-SHA256 (thunderbird-60.7.2.source.tar.xz) = fc89a5f66b17d554fc0b9c153483edcc74b1bacc916dfd6dccead8478060af31
-SIZE (thunderbird-60.7.2.source.tar.xz) = 283874432
+TIMESTAMP = 1562167567
+SHA256 (thunderbird-60.8.0.source.tar.xz) = 1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1
+SIZE (thunderbird-60.8.0.source.tar.xz) = 285643576
diff --git a/mail/thunderbird/files/patch-a-bug1502799 b/mail/thunderbird/files/patch-a-bug1502799
deleted file mode 100644
index 105da6a3e21c..000000000000
--- a/mail/thunderbird/files/patch-a-bug1502799
+++ /dev/null
@@ -1,50 +0,0 @@
-commit f57498276d74
-Author: Andrea Marchesini <amarchesini@mozilla.com>
-Date:   Wed May 15 22:00:00 2019 -0700
-
-    Bug 1502799 - Reintroduce serialize_function, disabled by mistake by previous patches, r=emilio
----
- servo/components/style/gecko_string_cache/namespace.rs | 1 -
- servo/components/style_traits/values.rs                | 3 ---
- 2 files changed, 4 deletions(-)
-
-diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs
-index 71d2fce8ff6b..92288574e145 100644
---- servo/components/style/gecko_string_cache/namespace.rs
-+++ servo/components/style/gecko_string_cache/namespace.rs
-@@ -11,7 +11,6 @@ use std::fmt;
- use std::ops::Deref;
- use string_cache::{Atom, WeakAtom};
- 
--/// aaa
- #[macro_export]
- macro_rules! ns {
-     () => { $crate::string_cache::Namespace(atom!("")) };
-diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs
-index 40209772a790..d6bd05b7b40e 100644
---- servo/components/style_traits/values.rs
-+++ servo/components/style_traits/values.rs
-@@ -135,7 +135,6 @@ where
-     }
- }
- 
--/*
- #[macro_export]
- macro_rules! serialize_function {
-     ($dest: expr, $name: ident($( $arg: expr, )+)) => {
-@@ -153,7 +152,6 @@ macro_rules! serialize_function {
-         }
-     }
- }
--*/
- 
- /// Convenience wrapper to serialise CSS values separated by a given string.
- pub struct SequenceWriter<'a, 'b: 'a, W: 'b> {
-@@ -406,7 +404,6 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA);
- impl_to_css_for_predefined_type!(::cssparser::Color);
- impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
- 
--/// Define an enum type with unit variants that each correspond to a CSS keyword.
- #[macro_export]
- macro_rules! define_css_keyword_enum {
-     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
diff --git a/mail/thunderbird/files/patch-bug1519629 b/mail/thunderbird/files/patch-bug1519629
deleted file mode 100644
index f0ceec943602..000000000000
--- a/mail/thunderbird/files/patch-bug1519629
+++ /dev/null
@@ -1,35 +0,0 @@
-commit f8f381bf03b5
-Author: Emilio Cobos Álvarez <emilio@crisal.io>
-Date:   Sun Jan 13 21:42:38 2019 +0100
-
-    Bug 1519629 - Document a few more macros.
----
- servo/components/style/gecko/regen_atoms.py            | 1 +
- servo/components/style/gecko_string_cache/namespace.rs | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py
-index dfc2252aa899..b6f68fceb7d5 100755
---- servo/components/style/gecko/regen_atoms.py
-+++ servo/components/style/gecko/regen_atoms.py
-@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n  '
- 
- MACRO = '''
- #[macro_export]
-+/// Returns a static atom by passing the literal string it represents.
- macro_rules! atom {{
- {}
- }}
-diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs
-index 4aa4accaf1d4..725e1da21692 100644
---- servo/components/style/gecko_string_cache/namespace.rs
-+++ servo/components/style/gecko_string_cache/namespace.rs
-@@ -11,6 +11,8 @@ use std::borrow::Borrow;
- use std::fmt;
- use std::ops::Deref;
- 
-+/// In Gecko namespaces are just regular atoms, so this is a simple macro to
-+/// forward one macro to the other.
- #[macro_export]
- macro_rules! ns {
-     () => {