From 6d0d26c5fb5f5a07366f3fe0b700ade81dea50f9 Mon Sep 17 00:00:00 2001
From: jbeich <jbeich@FreeBSD.org>
Date: Fri, 13 Nov 2020 11:52:06 +0000
Subject: [PATCH] gecko: bump LLVM_DEFAULT to 11

Detach from tree-wide default as coordinating with other maintainers
is expensive for little gain. User's choice is still respected.

llvm11 has better Tier2 support, more optimizations, reduces package size
and aligns with what contributors dogfood.
---
 Mk/bsd.gecko.mk           | 4 ++++
 mail/thunderbird/Makefile | 1 +
 www/firefox-esr/Makefile  | 1 +
 www/firefox/Makefile      | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 498c9f0bee3f..b58e697c52a9 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -92,6 +92,10 @@ MOZ_OPTIONS+=	--with-libclang-path="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib"
 .if !exists(/usr/bin/llvm-objdump)
 MOZ_EXPORT+=	LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}"
 .endif
+# Ignore Mk/bsd.default-versions.mk but respect make.conf(5)
+.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*}
+LLVM_DEFAULT=	11 # bump if not latest release
+.endif
 # Require newer Clang than what's in base system unless user opted out
 . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 1577b209ac02..2337eb630be7 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	78.4.3
+PORTREVISION=	1
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 849f7f9fd344..af4be2c8af81 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	78.5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 99e9750995f7..0f9f77b4bfd9 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	83.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \