git: 4a7d051fd0a7 - main - mail/mpop: Update to 1.4.22

The branch main has been updated by mce:

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

commit 4a7d051fd0a7f2b8df97e1003396534a3b5d7989
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-06-28 03:28:34 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-06-29 16:49:12 +0000

    mail/mpop: Update to 1.4.22
    
    Make TLS mandatory.
    
    https://marlam.de/mpop/news/mpop-1-4-22/
    
    PR:             296335
    Approved by:    osa (mentor)
---
 mail/mpop/Makefile                 |  9 +++++----
 mail/mpop/distinfo                 |  6 +++---
 mail/mpop/files/patch-src_base64.h | 10 ++++++++++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index cbee610fbbe0..8415f98927a4 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mpop
-DISTVERSION=	1.4.21
+DISTVERSION=	1.4.22
 CATEGORIES=	mail
 MASTER_SITES=	https://marlam.de/mpop/releases/
 
@@ -13,13 +13,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		cpe gmake makeinfo pkgconfig tar:xz
 CPE_VENDOR=	martin_lambers
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tls=no
 INFO=		mpop
 
 OPTIONS_DEFINE=		GSASL IDN LIBSECRET MPOPD NLS
 OPTIONS_DEFAULT=	GNUTLS IDN MPOPD
-OPTIONS_RADIO=		TLS
-OPTIONS_RADIO_TLS=	GNUTLS LIBTLS OPENSSL
+OPTIONS_SINGLE=		TLS
+OPTIONS_SINGLE_TLS=	GNUTLS LIBTLS OPENSSL
 OPTIONS_SUB=		yes
 
 GSASL_DESC=		${SASL_DESC} via GNU SASL
@@ -34,6 +33,8 @@ GSASL_CONFIGURE_WITH=		libgsasl
 IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
 IDN_CONFIGURE_WITH=		libidn
 LIBSECRET_LIB_DEPENDS=		libsecret-1.so:security/libsecret
+LIBSECRET_USES=			gnome
+LIBSECRET_USE=			GNOME=glib20
 LIBSECRET_CONFIGURE_WITH=	libsecret
 LIBTLS_LIB_DEPENDS=		libtls.so:security/${"${SSL_DEFAULT:Mlibressl*}":?libressl:libretls}
 LIBTLS_CONFIGURE_ON=		--with-tls=libtls
diff --git a/mail/mpop/distinfo b/mail/mpop/distinfo
index 4af2a3e0e856..d68c8eee066f 100644
--- a/mail/mpop/distinfo
+++ b/mail/mpop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736825014
-SHA256 (mpop-1.4.21.tar.xz) = 4ca0d1e0d01366fe3e0cf490d88d154df511278fb595638713be3ca675665855
-SIZE (mpop-1.4.21.tar.xz) = 405468
+TIMESTAMP = 1782559056
+SHA256 (mpop-1.4.22.tar.xz) = 2cd64a9c29a5ade3429230c70610ca4b6ea305fbc264f6961b5d85a7a8cecd4b
+SIZE (mpop-1.4.22.tar.xz) = 408348
diff --git a/mail/mpop/files/patch-src_base64.h b/mail/mpop/files/patch-src_base64.h
new file mode 100644
index 000000000000..b0f955d3c3eb
--- /dev/null
+++ b/mail/mpop/files/patch-src_base64.h
@@ -0,0 +1,10 @@
+--- src/base64.h.orig	2026-06-27 11:26:35 UTC
++++ src/base64.h
+@@ -19,6 +19,7 @@
+ #define BASE64_H
+ 
+ #include <stddef.h>
++#include <stdbool.h>
+ typedef size_t idx_t;
+ 
+ #ifdef __cplusplus