git: 821ff2c93f0a - main - mail/thunderbird: switch to bundled botan2

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Sun, 29 Dec 2024 22:54:37 UTC
The branch main has been updated by cmt:

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

commit 821ff2c93f0a41a5ec3c4182b1d47d2649b44087
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2024-12-29 22:50:37 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2024-12-29 22:50:37 +0000

    mail/thunderbird: switch to bundled botan2
    
    Our botan2 port is going to expire soon (2025-01-31, see eb1217e8e9).
    Switching to botan3 is not a trivial change (e.g. botan3 requires C++20),
    so I'll rather wait for upstream to make this change first (see
    https://bugzilla.mozilla.org/show_bug.cgi?id=1848104). To avoid
    breakages and holdups, just switch to the bundled botan2.
---
 mail/thunderbird/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d8bbaba83e38..37705eaa9069 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	thunderbird
 DISTVERSION=	128.6.0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
@@ -23,8 +24,7 @@ BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
-LIB_DEPENDS=	libjson-c.so:devel/json-c \
-		libbotan-2.so:security/botan2
+LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 USE_GECKO=	gecko
 # cannot use system icu: calendar is completely broken by
@@ -35,7 +35,7 @@ CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 USES=		tar:xz
 
 MOZ_OPTIONS=	--enable-application=comm/mail --enable-official-branding
-MOZ_OPTIONS+=	--with-system-bz2 --with-system-jsonc --with-system-botan
+MOZ_OPTIONS+=	--with-system-bz2 --with-system-jsonc
 MOZ_MK_OPTIONS=	MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1