summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/Makefile1
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/bogofilter-bdb/Makefile102
-rw-r--r--mail/bogofilter-kc/Makefile5
-rw-r--r--mail/bogofilter-sqlite/Makefile5
-rw-r--r--mail/bogofilter/Makefile101
-rw-r--r--mail/bogofilter/distinfo (renamed from mail/bogofilter-bdb/distinfo)0
-rw-r--r--mail/bogofilter/files/patch-contrib__trainbogo.sh (renamed from mail/bogofilter-bdb/files/patch-contrib__trainbogo.sh)0
-rw-r--r--mail/bogofilter/pkg-descr (renamed from mail/bogofilter-bdb/pkg-descr)8
-rw-r--r--mail/bogofilter/pkg-install (renamed from mail/bogofilter-bdb/pkg-install)0
-rw-r--r--mail/bogofilter/pkg-plist (renamed from mail/bogofilter-bdb/pkg-plist)0
-rw-r--r--mail/cone/Makefile1
-rw-r--r--mail/cyrus-imapd310/Makefile4
-rw-r--r--mail/cyrus-imapd312/Makefile4
-rw-r--r--mail/cyrus-imapd32/Makefile4
-rw-r--r--mail/cyrus-imapd34/Makefile4
-rw-r--r--mail/cyrus-imapd36/Makefile4
-rw-r--r--mail/cyrus-imapd38/Makefile4
-rw-r--r--mail/evolution-ews/Makefile1
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/geary/Makefile2
-rw-r--r--mail/gnubiff/Makefile2
-rw-r--r--mail/libpst/Makefile2
-rw-r--r--mail/rubygem-net-imap/Makefile2
-rw-r--r--mail/rubygem-net-imap/distinfo6
-rw-r--r--mail/thunderbird-esr/Makefile2
-rw-r--r--mail/thunderbird-esr/distinfo6
27 files changed, 126 insertions, 148 deletions
diff --git a/mail/Makefile b/mail/Makefile
index 6f131336d2d5..ca02b3d15a74 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -29,7 +29,6 @@
SUBDIR += bincimap
SUBDIR += bmf
SUBDIR += bogofilter
- SUBDIR += bogofilter-bdb
SUBDIR += bogofilter-kc
SUBDIR += bogofilter-sqlite
SUBDIR += bsd-vacation
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 3090f06ad55e..432069901240 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,6 +1,6 @@
PORTNAME= balsa
PORTVERSION= 2.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail gnome
DIST_SUBDIR= gnome
diff --git a/mail/bogofilter-bdb/Makefile b/mail/bogofilter-bdb/Makefile
deleted file mode 100644
index 154b5bb2dc6e..000000000000
--- a/mail/bogofilter-bdb/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-PORTNAME= bogofilter
-DISTVERSION= 1.3.0.rc1
-PORTREVISION?= 0
-CATEGORIES?= mail
-MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-1.3.0.beta/ \
- https://gitlab.com/-/project/12408342/uploads/647db3bd2f28a1f91bdd3bb1945d91fe/
-PKGNAMESUFFIX?= -bdb
-
-MAINTAINER?= mandree@FreeBSD.org
-COMMENT= Fast, teachable, learning spam detector
-WWW= https://bogofilter.sourceforge.io/
-
-LICENSE= GPLv2
-
-.if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
-# building master port
-USES+= bdb:5+
-DEPRECATED= The Berkeley DB database interface is obsolescent.
-EXPIRATION_DATE=2025-06-30
-.endif
-
-OPTIONS_DEFINE= GSL UNICODE DOCS
-OPTIONS_DEFAULT= GSL UNICODE
-GSL_DESC= Link with system-wide GSL dynamically (recommended)
-UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended)
-
-CONFLICTS_INSTALL?= bogofilter-sqlite bogofilter bogofilter-kc
-
-USES+= cpe perl5 shebangfix tar:xz
-SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \
- src/tests/unsort.pl contrib/*.pl
-USE_PERL5= run
-GNU_CONFIGURE= yes
-
-CPE_VENDOR= bogofilter_project
-
-UNICODE_USES= iconv
-UNICODE_CONFIGURE_ENABLE= unicode
-GSL_LIB_DEPENDS= libgsl.so:math/gsl
-GSL_CONFIGURE_OFF= --with-included-gsl
-
-PORTDOCS= *
-
-TEST_TARGET= check
-
-.include <bsd.port.pre.mk>
-
-BF_LIBS?= -l${BDB_LIB_NAME}
-BF_CPPFLAGS?= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
-.if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
-CONFIGURE_ARGS+= --with-database=db
-.endif
-.if ${PORT_OPTIONS:MUNICODE}
-BF_LIBS+= ${ICONV_LIB}
-.endif
-CPPFLAGS+= ${BF_CPPFLAGS}
-LIBS+= -L${LOCALBASE}/lib ${BF_LIBS}
-CONFIGURE_ENV+= PERL="${PERL}"
-INSTALL_TARGET= install-strip prefix=${PREFIX} mandir=${PREFIX}/share/man
-
-post-patch:
- ${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
- -e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
- ${WRKSRC}/src/tests/Makefile.in
-
-post-build:
- cd ${WRKSRC}/src && ${SETENVI} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \
- || { r=$$? ; head -n30000 ${WRKSRC}/src/tests/test-suite.log ; exit $$r ; }
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
-.for i in html programmer xml
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
-.endfor
-.for i in AUTHORS COPYING INSTALL NEWS README README.git \
- doc/README.validation TODO GETTING.STARTED \
- RELEASE.NOTES doc/README.db doc/README.sqlite \
- doc/integrating-with-postfix doc/integrating-with-qmail \
- doc/bogofilter-tuning.HOWTO.html doc/bogofilter-SA-* \
- doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
- ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for i in README.randomtrain README.contrib
- ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html
- ${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${STAGEDIR}${DOCSDIR}/xml
- ${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${STAGEDIR}${DOCSDIR}/programmer
- ${INSTALL_PROGRAM} ${WRKSRC}/bogogrep ${STAGEDIR}${PREFIX}/bin/
-.for i in bfproxy.pl bogofilter-milter.pl bogo.R bogofilter-qfe.sh \
- mime.get.rfc822.pl parmtest.sh printmaildir.pl \
- bogominitrain.pl \
- randomtrain.sh scramble.sh spamitarium.pl stripsearch.pl trainbogo.sh
- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
-.endfor
-.for i in dot-qmail-bogofilter-default \
- mailfilter.example vm-bogofilter.el
- ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile
index e434c2b59f3a..5c4ca40aee65 100644
--- a/mail/bogofilter-kc/Makefile
+++ b/mail/bogofilter-kc/Makefile
@@ -4,16 +4,17 @@ CATEGORIES= mail
PKGNAMESUFFIX= -kc
MAINTAINER= mandree@FreeBSD.org
+COMMENT= Fast, teachable, learning spam detector (KyotoCabinet database)
LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet
-CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-sqlite
+CONFLICTS_INSTALL= bogofilter bogofilter-bdb bogofilter-sqlite # bogofilter-bdb is historic, but let's keep this for a while
CONFIGURE_ARGS= --with-database=kyotocabinet
BF_CPPFLAGS= -I${LOCALBASE}/include
BF_LIBS=
DESCR= ${PKGDIR}/pkg-descr
-MASTERDIR= ${.CURDIR}/../bogofilter-bdb
+MASTERDIR= ${.CURDIR}/../bogofilter
.include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index e855c9d8d26c..11e109b94c9d 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -4,15 +4,16 @@ CATEGORIES= mail
PKGNAMESUFFIX= -sqlite
MAINTAINER= mandree@FreeBSD.org
+COMMENT?= Fast, teachable, learning spam detector (SQLite3 database)
USES= sqlite
-CONFLICTS_INSTALL= bogofilter bogofilter-lmdb bogofilter-kc
+CONFLICTS_INSTALL= bogofilter bogofilter-bdb bogofilter-kc # bogofilter-bdb is historic, but let's keep this for a while
CONFIGURE_ARGS= --with-database=sqlite
BF_CPPFLAGS= -I${LOCALBASE}/include
BF_LIBS=
DESCR= ${PKGDIR}/pkg-descr
-MASTERDIR= ${.CURDIR}/../bogofilter-bdb
+MASTERDIR= ${.CURDIR}/../bogofilter
.include "${MASTERDIR}/Makefile"
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 6d2eadbb372f..71840682b8f6 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,19 +1,96 @@
PORTNAME= bogofilter
-PORTREVISION= 0
-CATEGORIES= mail
-PKGNAMESUFFIX= # blank, to override bogofilter-bdb's
+DISTVERSION= 1.3.0.rc1
+PORTREVISION?= 0
+CATEGORIES?= mail
+MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-1.3.0.beta/ \
+ https://gitlab.com/-/project/12408342/uploads/647db3bd2f28a1f91bdd3bb1945d91fe/
+PKGNAMESUFFIX?= # blank by default, and ?= so slave ports can override
-MAINTAINER= mandree@FreeBSD.org
+MAINTAINER?= mandree@FreeBSD.org
+COMMENT?= Fast, teachable, learning spam detector (LMDB database)
+WWW= https://bogofilter.sourceforge.io/
-LIB_DEPENDS= liblmdb.so:databases/lmdb
+LICENSE= GPLv2
-CONFLICTS_INSTALL= bogofilter-bdb bogofilter-kc bogofilter-sqlite
+OPTIONS_DEFINE= GSL UNICODE DOCS
+OPTIONS_DEFAULT= GSL UNICODE
+GSL_DESC= Link with system-wide GSL dynamically (recommended)
+UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended)
-CONFIGURE_ARGS= --with-database=lmdb
-BF_CPPFLAGS= -I${LOCALBASE}/include
-BF_LIBS=
-DESCR= ${PKGDIR}/pkg-descr
+CONFLICTS_INSTALL?= bogofilter-bdb bogofilter-kc bogofilter-lmdb bogofilter-sqlite # bogofilter-bdb and -lmdb are historic, but let's keep them for a while
-MASTERDIR= ${.CURDIR}/../bogofilter-bdb
+USES+= cpe perl5 shebangfix tar:xz
+SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \
+ src/tests/unsort.pl contrib/*.pl
+USE_PERL5= run
+GNU_CONFIGURE= yes
-.include "${MASTERDIR}/Makefile"
+CPE_VENDOR= bogofilter_project
+
+UNICODE_USES= iconv
+UNICODE_CONFIGURE_ENABLE= unicode
+GSL_LIB_DEPENDS= libgsl.so:math/gsl
+GSL_CONFIGURE_OFF= --with-included-gsl
+
+PORTDOCS= *
+
+TEST_TARGET= check
+
+.include <bsd.port.pre.mk>
+
+BF_CPPFLAGS?= -I${LOCALBASE}/include
+BF_LIBS?= # empty, can be passed in by slave ports
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
+.if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
+CONFIGURE_ARGS+= --with-database=lmdb
+LIB_DEPENDS= liblmdb.so:databases/lmdb
+.endif
+.if ${PORT_OPTIONS:MUNICODE}
+BF_LIBS+= ${ICONV_LIB}
+.endif
+CPPFLAGS+= ${BF_CPPFLAGS}
+LIBS+= -L${LOCALBASE}/lib ${BF_LIBS}
+CONFIGURE_ENV+= PERL="${PERL}"
+INSTALL_TARGET= install-strip prefix=${PREFIX} mandir=${PREFIX}/share/man
+
+post-patch:
+ ${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
+ -e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
+ ${WRKSRC}/src/tests/Makefile.in
+
+post-build:
+ cd ${WRKSRC}/src && ${SETENVI} SHELL=${SH} ${MAKE_CMD} ${TEST_TARGET} ${_MAKE_JOBS} SHELL=${SH} \
+ || { r=$$? ; head -n30000 ${WRKSRC}/src/tests/test-suite.log ; exit $$r ; }
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
+.for i in html programmer xml
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
+.endfor
+.for i in AUTHORS COPYING INSTALL NEWS README README.git \
+ doc/README.validation TODO GETTING.STARTED \
+ RELEASE.NOTES doc/README.db doc/README.sqlite \
+ doc/integrating-with-postfix doc/integrating-with-qmail \
+ doc/bogofilter-tuning.HOWTO.html doc/bogofilter-SA-* \
+ doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
+.for i in README.randomtrain README.contrib
+ ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${STAGEDIR}${DOCSDIR}/xml
+ ${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${STAGEDIR}${DOCSDIR}/programmer
+ ${INSTALL_PROGRAM} ${WRKSRC}/bogogrep ${STAGEDIR}${PREFIX}/bin/
+.for i in bfproxy.pl bogofilter-milter.pl bogo.R bogofilter-qfe.sh \
+ mime.get.rfc822.pl parmtest.sh printmaildir.pl \
+ bogominitrain.pl \
+ randomtrain.sh scramble.sh spamitarium.pl stripsearch.pl trainbogo.sh
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
+.endfor
+.for i in dot-qmail-bogofilter-default \
+ mailfilter.example vm-bogofilter.el
+ ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i}
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/mail/bogofilter-bdb/distinfo b/mail/bogofilter/distinfo
index eacda71cdf59..eacda71cdf59 100644
--- a/mail/bogofilter-bdb/distinfo
+++ b/mail/bogofilter/distinfo
diff --git a/mail/bogofilter-bdb/files/patch-contrib__trainbogo.sh b/mail/bogofilter/files/patch-contrib__trainbogo.sh
index 0d7cd5742567..0d7cd5742567 100644
--- a/mail/bogofilter-bdb/files/patch-contrib__trainbogo.sh
+++ b/mail/bogofilter/files/patch-contrib__trainbogo.sh
diff --git a/mail/bogofilter-bdb/pkg-descr b/mail/bogofilter/pkg-descr
index 57fdfdc865d7..4d0c194c5159 100644
--- a/mail/bogofilter-bdb/pkg-descr
+++ b/mail/bogofilter/pkg-descr
@@ -6,7 +6,7 @@ words, and returns a status code indicating whether or not the message is spam.
Bogofilter decodes base64 or quoted-printable encoded texts and ignores non-text
attachments and HTML comments.
-The supported database backends are LMDB, Kyoto Cabinet and SQLite3, and
-for a while still Berkeley DB. The upstream version would theoretically
-also support QDBM and Tokyo Cabinet, but these are not currently available
-as FreeBSD ports.
+The supported database backends are LMDB, Kyoto Cabinet and SQLite3.
+The upstream version would theoretically also support QDBM and
+Tokyo Cabinet, but these are not currently available as FreeBSD ports.
+Berkeley DB support is being phased out.
diff --git a/mail/bogofilter-bdb/pkg-install b/mail/bogofilter/pkg-install
index 8da3d8915d7e..8da3d8915d7e 100644
--- a/mail/bogofilter-bdb/pkg-install
+++ b/mail/bogofilter/pkg-install
diff --git a/mail/bogofilter-bdb/pkg-plist b/mail/bogofilter/pkg-plist
index 19bc4ad38576..19bc4ad38576 100644
--- a/mail/bogofilter-bdb/pkg-plist
+++ b/mail/bogofilter/pkg-plist
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 1cc741260c8d..fa4eaa2fe81f 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cone
DISTVERSION= 1.15
+PORTREVISION= 1
CATEGORIES= mail
# This is for beta versions, leave it in please:
#MASTER_SITES= http://www.courier-mta.org/beta/${PORTNAME}/ \
diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile
index 887bd2125f5b..772adce58b89 100644
--- a/mail/cyrus-imapd310/Makefile
+++ b/mail/cyrus-imapd310/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
DISTVERSION= 3.10.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 310
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
diff --git a/mail/cyrus-imapd312/Makefile b/mail/cyrus-imapd312/Makefile
index 4fec5caa6822..cd12ebbffaae 100644
--- a/mail/cyrus-imapd312/Makefile
+++ b/mail/cyrus-imapd312/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
DISTVERSION= 3.12.1
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 312
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index f5589ebab3f5..db836fe7dc3e 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.2.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 32
@@ -17,7 +17,7 @@ BROKEN_riscv64= fails to build: lib/chartable.c: Error 1
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[013-] cyrus-imapd3[013-]-http
diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index f061e0ac1ca6..5d1d7454870d 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.4.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 34
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid
+ libuuid.so:misc/libuuid
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-35-] cyrus-imapd3[0-35-]-http
diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 9ce077fa3a9d..a0f6f0fd62e6 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.6.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 36
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile
index 83a1fb18cbc9..79bae82629d3 100644
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.8.6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
PKGNAMESUFFIX= ${CYRUS_IMAPD_VER}
@@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 38
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
- libuuid.so:misc/e2fsprogs-libuuid \
+ libuuid.so:misc/libuuid \
libical.so:devel/libical
CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-57-] cyrus-imapd3[0-57-]-http
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index cac0c2407eda..f17c2de1af96 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -1,5 +1,6 @@
PORTNAME= evolution-ews
DISTVERSION= 3.56.2
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 01008b998afc..4ee55cd1543a 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,6 @@
PORTNAME= evolution
DISTVERSION= 3.56.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 95728995f663..239bec48c5fb 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -1,6 +1,6 @@
PORTNAME= geary
PORTVERSION= 46.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index f0e44cae5eca..006c635efcad 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gnubiff
PORTVERSION= 2.2.13
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index 1b3d57787616..a0a740ce3b70 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libpst
PORTVERSION= 0.6.76
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail converters
MASTER_SITES= https://www.five-ten-sg.com/libpst/packages/ \
https://fossies.org/unix/privat/ \
diff --git a/mail/rubygem-net-imap/Makefile b/mail/rubygem-net-imap/Makefile
index 9759aa2e043a..036de746674b 100644
--- a/mail/rubygem-net-imap/Makefile
+++ b/mail/rubygem-net-imap/Makefile
@@ -1,5 +1,5 @@
PORTNAME= net-imap
-PORTVERSION= 0.5.8
+PORTVERSION= 0.5.9
CATEGORIES= mail rubygems
MASTER_SITES= RG
diff --git a/mail/rubygem-net-imap/distinfo b/mail/rubygem-net-imap/distinfo
index 23b29cc22639..d63a66d56f60 100644
--- a/mail/rubygem-net-imap/distinfo
+++ b/mail/rubygem-net-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747547476
-SHA256 (rubygem/net-imap-0.5.8.gem) = 52aa5fdfc1a8a3df1f793b20a327e95b5a9dfe1d733e1f0d53075d2dbcfcf593
-SIZE (rubygem/net-imap-0.5.8.gem) = 177152
+TIMESTAMP = 1750954416
+SHA256 (rubygem/net-imap-0.5.9.gem) = d95905321e1bd9f294ffc7ff8697be218eee1ec96c8504c0960964d0a0be33fc
+SIZE (rubygem/net-imap-0.5.9.gem) = 178688
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 3fc14ef4ccc7..666874977709 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -1,5 +1,5 @@
PORTNAME= thunderbird
-DISTVERSION= 128.11.1
+DISTVERSION= 128.12.0
CATEGORIES= mail news net-im wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index 6e3224ec8b7b..0f67551ee33d 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749476863
-SHA256 (thunderbird-128.11.1esr.source.tar.xz) = 0d3cdfcf7c2f7d262e6abb2d39e43f183fa6cc07c7cb0b4c2ebef349f2f4d946
-SIZE (thunderbird-128.11.1esr.source.tar.xz) = 676156916
+TIMESTAMP = 1751155267
+SHA256 (thunderbird-128.12.0esr.source.tar.xz) = f4232c8b4285d932d779fec90169b2a7008070a214571cf0fce0a68315ae7423
+SIZE (thunderbird-128.12.0esr.source.tar.xz) = 681085772