diff options
author | Koop Mast <kwm@rainbow-runner.nl> | 2019-09-07 04:56:57 +0800 |
---|---|---|
committer | Koop Mast <kwm@rainbow-runner.nl> | 2019-09-07 04:56:57 +0800 |
commit | f44e2881c913e6863249652cf73fca4a93296a47 (patch) | |
tree | d3daee8b4a2fbf1025d4c02c3aebedd4d67df52e /mail/thunderbird | |
parent | 9fcef473288365748d276dbf967c46d8c3698aaf (diff) | |
parent | 8a91d63da840b97569719c1cff6c0a39401c9c04 (diff) | |
download | freebsd-ports-gnome-f44e2881c913e6863249652cf73fca4a93296a47.tar.gz freebsd-ports-gnome-f44e2881c913e6863249652cf73fca4a93296a47.tar.zst freebsd-ports-gnome-f44e2881c913e6863249652cf73fca4a93296a47.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mail/thunderbird')
-rw-r--r-- | mail/thunderbird/Makefile | 7 | ||||
-rw-r--r-- | mail/thunderbird/distinfo | 6 | ||||
-rw-r--r-- | mail/thunderbird/files/patch-bug1575876 | 22 |
3 files changed, 6 insertions, 29 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 4b2875647349..0bd2f861213d 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 68.0 -PORTREVISION= 1 +DISTVERSION= 68.1.0 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org @@ -44,7 +44,6 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING -OPTIONS_EXCLUDE=WAYLAND .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index f07155982a7e..84baffda75f9 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565715552 -SHA256 (thunderbird-68.0.source.tar.xz) = 9c8d5c59b25282f38024014850297725db3e99a106bb3f0751de9756c66c84bb -SIZE (thunderbird-68.0.source.tar.xz) = 330493784 +TIMESTAMP = 1567687294 +SHA256 (thunderbird-68.1.0.source.tar.xz) = a7880622859a8560b65c725f8f0e8c99424cc9efdd2dffeb606b29decda7fd40 +SIZE (thunderbird-68.1.0.source.tar.xz) = 333358404 diff --git a/mail/thunderbird/files/patch-bug1575876 b/mail/thunderbird/files/patch-bug1575876 deleted file mode 100644 index f16560ac241e..000000000000 --- a/mail/thunderbird/files/patch-bug1575876 +++ /dev/null @@ -1,22 +0,0 @@ -commit b588aee56dcb -Author: Tijl Coosemans <tijl@FreeBSD.org> -Date: Wed Aug 21 23:46:52 2019 +0200 - - Bug 1575876 - Drop header unused on FreeBSD that breaks with new libc++. ---- - media/mtransport/third_party/nICEr/src/stun/stun.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h -index 0d55b63a94c1a..a32751d7950f6 100644 ---- media/mtransport/third_party/nICEr/src/stun/stun.h -+++ media/mtransport/third_party/nICEr/src/stun/stun.h -@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include <sys/socket.h> - #ifndef LINUX - #include <net/if.h> --#if !defined(__OpenBSD__) && !defined(__NetBSD__) -+#ifdef DARWIN - #include <net/if_var.h> - #endif - #include <net/if_dl.h> |