git: aa9d3c12fb77 - 2025Q2 - mail/thunderbird: fix branding display

The branch 2025Q2 has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa9d3c12fb77a656d5229bc70a8da7185ece39c5

commit aa9d3c12fb77a656d5229bc70a8da7185ece39c5
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2025-06-19 19:28:22 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2025-06-19 19:29:49 +0000

    mail/thunderbird: fix branding display
    
    (it still showed beta)
    
    (cherry picked from commit aba64b6cbdc70d38e8477904cc3f0575c384150a)
---
 mail/thunderbird/Makefile               |  1 +
 mail/thunderbird/files/patch-bug1973073 | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 10263c2ec597..96a7d8074294 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	thunderbird
 DISTVERSION=	140.0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-candidates/build1/source
diff --git a/mail/thunderbird/files/patch-bug1973073 b/mail/thunderbird/files/patch-bug1973073
new file mode 100644
index 000000000000..af0d682e8d03
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1973073
@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User Daniel Darnell <daniel@thunderbird.net>
+# Date 1750358329 25200
+# Node ID 68f59e2fec41c8c2e6b89de9a119a862a8358add
+# Parent  275763c890c435d54bfc540dbd26bed5e170cd4a
+Bug 1973073 - Temporarily hard-code MOZ_OFFICIAL_BRANDING_DIRECTORY into confvars.sh (for comm-release). rs=bustage-fix a=dandarnell
+
+diff --git comm/mail/confvars.sh comm/mail/confvars.sh
+--- comm/mail/confvars.sh
++++ comm/mail/confvars.sh
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ MOZ_BRANDING_DIRECTORY=comm/mail/branding/nightly
+ 
+ # This is a temporary hard-coded measure to accomodate MSIX repackaging
+-MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/mail/branding/tb_beta
++MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/mail/branding/thunderbird
+