aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorKoop Mast <koop@beyonit.nl>2019-09-25 01:10:20 +0800
committerKoop Mast <koop@beyonit.nl>2019-09-25 01:10:20 +0800
commitc5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6 (patch)
tree4b5a3cd1d243ff0c74465ea743ec310199c5edb5 /mail
parentfe87ebd172e9d689d85015844fb5a85fb32b3e50 (diff)
parent54294ad9726b349cbad4ebbbe9711550f8b1e53d (diff)
downloadfreebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.tar.gz
freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.tar.zst
freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mail')
-rw-r--r--mail/Makefile1
-rw-r--r--mail/altermime/Makefile2
-rw-r--r--mail/autosig/Makefile2
-rw-r--r--mail/bogofilter-kc/Makefile2
-rw-r--r--mail/bogofilter-lmdb/Makefile2
-rw-r--r--mail/bogofilter-sqlite/Makefile1
-rw-r--r--mail/bogofilter-tc/Makefile1
-rw-r--r--mail/bogofilter/Makefile4
-rw-r--r--mail/bogofilter/files/patch-configure17
-rw-r--r--mail/cyrus-imapd30/Makefile6
-rw-r--r--mail/dovecot-fts-xapian/Makefile2
-rw-r--r--mail/dovecot/Makefile1
-rw-r--r--mail/dovecot/files/patch-src_master_main.c11
-rw-r--r--mail/gkrellmmailwatch2/Makefile2
-rw-r--r--mail/imapfilter/Makefile4
-rw-r--r--mail/imapfilter/distinfo6
-rw-r--r--mail/libspf2/pkg-descr2
-rw-r--r--mail/mboxcheck-applet/Makefile2
-rw-r--r--mail/mutt/Makefile6
-rw-r--r--mail/mutt/distinfo10
-rw-r--r--mail/mutt/files/extra-patch-ifdef10
-rw-r--r--mail/mutt/files/extra-patch-reverse_reply14
-rw-r--r--mail/nextcloud-mail/Makefile1
-rw-r--r--mail/nmzmail/Makefile2
-rw-r--r--mail/opendmarc/Makefile2
-rw-r--r--mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c10
-rw-r--r--mail/opendmarc/files/patch-opendmarc_opendmarc.c11
-rw-r--r--mail/pear-Horde_Imap_Client/Makefile2
-rw-r--r--mail/pear-Horde_Imap_Client/distinfo6
-rw-r--r--mail/pecl-mailparse/Makefile1
-rw-r--r--mail/php74-imap/Makefile11
-rw-r--r--mail/php74-imap/files/patch-config.m447
-rw-r--r--mail/poppy/Makefile2
-rw-r--r--mail/prom-wl/Makefile2
-rw-r--r--mail/py-aiosmtpd/Makefile1
-rw-r--r--mail/py-aiosmtpd/pkg-descr6
-rw-r--r--mail/py-apolicy/Makefile2
-rw-r--r--mail/py-fuglu/pkg-descr6
-rw-r--r--mail/sid-milter/Makefile4
-rw-r--r--mail/spamdb-curses/Makefile2
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile7
-rw-r--r--mail/xlbiff/Makefile2
43 files changed, 174 insertions, 63 deletions
diff --git a/mail/Makefile b/mail/Makefile
index 4ee03707d9ed..a4d35b449a42 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -483,6 +483,7 @@
SUBDIR += php71-imap
SUBDIR += php72-imap
SUBDIR += php73-imap
+ SUBDIR += php74-imap
SUBDIR += phplist
SUBDIR += phpmailer
SUBDIR += phpmailer6
diff --git a/mail/altermime/Makefile b/mail/altermime/Makefile
index ec366fc09514..0d517425167c 100644
--- a/mail/altermime/Makefile
+++ b/mail/altermime/Makefile
@@ -10,6 +10,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Small C program which is used to alter your mime-encoded mailpacks
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
PLIST_FILES= bin/altermime
PORTDOCS= CHANGELOG LICENCE README
diff --git a/mail/autosig/Makefile b/mail/autosig/Makefile
index 61836121de42..39a54e88cd83 100644
--- a/mail/autosig/Makefile
+++ b/mail/autosig/Makefile
@@ -10,6 +10,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Random .signature generator with header file included
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
MAKEFILE= makefile
PLIST_FILES= bin/autosig
diff --git a/mail/bogofilter-kc/Makefile b/mail/bogofilter-kc/Makefile
index d6c1a0235557..ccb996740319 100644
--- a/mail/bogofilter-kc/Makefile
+++ b/mail/bogofilter-kc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bogofilter
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -kc
diff --git a/mail/bogofilter-lmdb/Makefile b/mail/bogofilter-lmdb/Makefile
index 1c0068bd3670..82105fd495b8 100644
--- a/mail/bogofilter-lmdb/Makefile
+++ b/mail/bogofilter-lmdb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bogofilter
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -lmdb
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index 07f2a58c2b1f..b2b9b64873cc 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= bogofilter
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -sqlite
diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile
index 9e03b3e6eb9b..6780f0c5f907 100644
--- a/mail/bogofilter-tc/Makefile
+++ b/mail/bogofilter-tc/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= bogofilter
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -tc
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index a07141515ce1..77d913c9079b 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bogofilter
DISTVERSION= 1.2.5.rc1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= mail
MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-1.2.5/
@@ -39,7 +39,7 @@ CPE_VENDOR= bogofilter_project
UNICODE_USES= iconv
UNICODE_CONFIGURE_ENABLE= unicode
GSL_LIB_DEPENDS= libgsl.so:math/gsl
-GSL_CONFIGURE_ARGS_OFF= --with-included-gsl
+GSL_CONFIGURE_OFF= --with-included-gsl
PORTDOCS= *
diff --git a/mail/bogofilter/files/patch-configure b/mail/bogofilter/files/patch-configure
new file mode 100644
index 000000000000..544c40f04d41
--- /dev/null
+++ b/mail/bogofilter/files/patch-configure
@@ -0,0 +1,17 @@
+Clang 9 no longer pretends to be GCC
+https://reviews.llvm.org/rL356931
+https://reviews.llvm.org/rL366091
+
+--- configure.orig 2019-09-08 15:43:06 UTC
++++ configure
+@@ -6464,8 +6464,8 @@ if test "$GCC" = yes && test "$ICC" = no ; then
+ ""|2.*|3.*) ;;
+ 4.*) gcc4=yes ;;
+ esac
+- case "$CC" in
+- *clang) gcc4=yes ;;
++ case `$CC --version 2>/dev/null` in
++ *clang*) gcc4=yes ;;
+ esac
+ fi
+ if test $gcc4 = yes; then
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index bdf6ffdb194e..afad9ba830a1 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -13,10 +13,6 @@ COMMENT= Cyrus mail server, supporting POP3 and IMAP4 protocols
LICENSE= BSD4CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_armv6= fails to compile: gmake[1]: *** [Makefile:6747: lib/imapopts.c] Error 1
-BROKEN_armv7= fails to compile: gmake[1]: *** [Makefile:6718: lib/imapopts.c] Error 1
-BROKEN_powerpc64= fails to compile: mailbox.h: redefinition of typedef 'message_t'
-
LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
libicuuc.so:devel/icu \
libjansson.so:devel/jansson \
@@ -24,7 +20,7 @@ LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \
CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2*
-USES= cpe gmake libtool perl5 pkgconfig ssl
+USES= compiler:c11 cpe gmake libtool perl5 pkgconfig ssl
USE_RC_SUBR= imapd
GNU_CONFIGURE= yes
CYRUS_PREFIX= ${PREFIX}/cyrus
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index cc44a72adca8..4f70acbbe8e2 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libxapian.so:databases/xapian-core \
BUILD_DEPENDS= dovecot>=2.3.7:mail/dovecot
RUN_DEPENDS= dovecot>=2.3.7:mail/dovecot
-USES= autoreconf libtool pkgconfig
+USES= autoreconf compiler:c++11-lang libtool pkgconfig
USE_LDCONFIG= yes
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 0e5702287b7e..3aad1b97a312 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -8,6 +8,7 @@
PORTNAME= dovecot
PORTVERSION= 2.3.7.2
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= https://dovecot.org/releases/2.3/
diff --git a/mail/dovecot/files/patch-src_master_main.c b/mail/dovecot/files/patch-src_master_main.c
deleted file mode 100644
index 8173c702f91a..000000000000
--- a/mail/dovecot/files/patch-src_master_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/master/main.c.orig 2018-11-23 11:06:45 UTC
-+++ src/master/main.c
-@@ -862,6 +862,8 @@ int main(int argc, char *argv[])
- i_fatal("dup2(dev_null_fd) failed: %m");
- if (!foreground && dup2(dev_null_fd, STDOUT_FILENO) < 0)
- i_fatal("dup2(dev_null_fd) failed: %m");
-+ if (!foreground && dup2(dev_null_fd, STDERR_FILENO) < 0)
-+ i_fatal("dup2(dev_null_fd) failed: %m");
-
- pidfile_path =
- i_strconcat(set->base_dir, "/"MASTER_PID_FILE_NAME, NULL);
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index d9d544122c88..491c5a049c1a 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -15,6 +15,8 @@ COMMENT= GKrellM mailwatch plugin
LICENSE= GPLv2+
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
RUN_DEPENDS= gkrellm:sysutils/gkrellm2
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 293ad973112b..a2ad755f5952 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= imapfilter
-PORTVERSION= 2.6.12
+PORTVERSION= 2.6.13
DISTVERSIONPREFIX= v
CATEGORIES= mail
@@ -11,6 +11,8 @@ COMMENT= IMAP mail filtering utility
LICENSE= MIT
+BROKEN_FreeBSD_11=Requires openssl111 to build
+
LIB_DEPENDS= libpcre.so:devel/pcre
USES= lua ssl
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index b47d20cecec8..e2a39a896129 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546438422
-SHA256 (lefcha-imapfilter-v2.6.12_GH0.tar.gz) = 764a68c737e555d7b164644a4c491fd66cffb93d6077d58f502b94e1a022a884
-SIZE (lefcha-imapfilter-v2.6.12_GH0.tar.gz) = 59249
+TIMESTAMP = 1568743727
+SHA256 (lefcha-imapfilter-v2.6.13_GH0.tar.gz) = 8ad94b94ddd47bd051ec875a3ba347bf3427f98ca4b63d60f38ea3a704c8afb2
+SIZE (lefcha-imapfilter-v2.6.13_GH0.tar.gz) = 59467
diff --git a/mail/libspf2/pkg-descr b/mail/libspf2/pkg-descr
index 3f064e62c2fd..7707d7d9a2dd 100644
--- a/mail/libspf2/pkg-descr
+++ b/mail/libspf2/pkg-descr
@@ -5,4 +5,4 @@ and make sure that the email is authorized by the domain name that it
is coming from. This prevents email forgery, commonly used by spammers,
scammers and email viruses/worms.
-WWW: http://www.libspf2.org/
+WWW: https://www.libspf2.org/
diff --git a/mail/mboxcheck-applet/Makefile b/mail/mboxcheck-applet/Makefile
index df9a0e4eaf1f..91de2d3de85b 100644
--- a/mail/mboxcheck-applet/Makefile
+++ b/mail/mboxcheck-applet/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Mailbox checking applet for GNOME 2
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= python:2.7
USE_GNOME= pygnome2:run
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 199b80e5a6c7..eb3bb356d90e 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mutt
-DISTVERSION= 1.12.1
+DISTVERSION= 1.12.2
CATEGORIES+= mail ipv6
MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -182,8 +182,8 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
.include <bsd.port.options.mk>
# un/comment as each VERSION is created for PORTVERSION
-#VVV_PATCH_VERSION= 1.12.1
-GREETING_PATCH_VERSION= 1.12.0
+VVV_PATCH_VERSION= 1.12.1
+GREETING_PATCH_VERSION= 1.12.1
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION= ${PORTVERSION}
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index ab10e93129f2..f9b3bf79d29b 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1565808330
-SHA256 (mutt/mutt-1.12.1.tar.gz) = 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
-SIZE (mutt/mutt-1.12.1.tar.gz) = 4675166
-SHA256 (mutt/mutt-1.12.0.vc.greeting) = 7596d930447e9834567c0cfddf9ac023ecbb99add64bee4131d87e0260eec591
-SIZE (mutt/mutt-1.12.0.vc.greeting) = 4559
+TIMESTAMP = 1569099378
+SHA256 (mutt/mutt-1.12.2.tar.gz) = bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
+SIZE (mutt/mutt-1.12.2.tar.gz) = 4675774
+SHA256 (mutt/mutt-1.12.1.vc.greeting) = 54d1267c1ac496662b47131f9761b5ab53f44c93498938dc93d0156c6578e378
+SIZE (mutt/mutt-1.12.1.vc.greeting) = 4559
SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
index 42ec9158a532..f8734bf046df 100644
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@@ -1,8 +1,8 @@
---- PATCHES.orig 2019-06-15 21:17:01 UTC
+--- PATCHES.orig 2017-12-03 03:10:17 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
---- init.c.orig 2019-05-25 16:22:39 UTC
+--- init.c.orig 2019-09-21 19:18:34 UTC
+++ init.c
@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
return t;
@@ -57,9 +57,9 @@
static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
{
do
---- init.h.orig 2019-06-15 15:57:01 UTC
+--- init.h.orig 2019-09-21 19:18:34 UTC
+++ init.h
-@@ -4330,6 +4330,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
+@@ -4343,6 +4343,7 @@ static int parse_lists (BUFFER *, BUFFER *, unsigned l
static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -67,7 +67,7 @@
static int parse_echo (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -4394,6 +4395,7 @@ const struct command_t Commands[] = {
+@@ -4407,6 +4407,7 @@ const struct command_t Commands[] = {
{ "hdr_order", parse_list, UL &HeaderOrderList },
#ifdef HAVE_ICONV
{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },
diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
index 78fb8038646a..d1cf589f7f00 100644
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@@ -1,8 +1,8 @@
---- PATCHES.orig 2019-06-15 21:17:02 UTC
+--- PATCHES.orig 2017-12-03 03:10:17 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
---- init.h.orig 2019-06-15 21:17:01 UTC
+--- init.h.orig 2019-09-21 19:18:34 UTC
+++ init.h
@@ -2966,6 +2966,13 @@ struct option_t MuttVars[] = {
** In either case, a missing real name will be filled in afterwards
@@ -18,7 +18,7 @@
{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
/*
** .pp
---- mutt.h.orig 2019-06-15 21:17:01 UTC
+--- mutt.h.orig 2019-09-21 19:18:34 UTC
+++ mutt.h
@@ -491,6 +491,7 @@ enum
OPTREVALIAS,
@@ -28,7 +28,7 @@
OPTRFC2047PARAMS,
OPTSAVEADDRESS,
OPTSAVEEMPTY,
---- protos.h.orig 2019-05-25 16:22:39 UTC
+--- protos.h.orig 2019-09-21 19:18:34 UTC
+++ protos.h
@@ -85,6 +85,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
ADDRESS *mutt_lookup_alias (const char *s);
@@ -38,7 +38,7 @@
ADDRESS *mutt_expand_aliases (ADDRESS *);
ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
---- send.c.orig 2019-06-14 15:57:33 UTC
+--- send.c.orig 2019-09-21 19:18:34 UTC
+++ send.c
@@ -717,6 +717,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
/* the CC field can get cluttered, especially with lists */
@@ -51,9 +51,9 @@
env->cc = mutt_remove_xrefs (env->to, env->cc);
if (env->cc && !env->to)
---- sendlib.c.orig 2019-06-14 15:57:30 UTC
+--- sendlib.c.orig 2019-09-21 19:18:34 UTC
+++ sendlib.c
-@@ -2764,6 +2764,35 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -2765,6 +2765,35 @@ static void set_noconv_flags (BODY *b, short flag)
}
}
diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index 84b4c4c21ae5..9f7ac94b256b 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=16:www/nextcloud@${PHP_FLAVOR}
USES= gettext php:flavors
USE_PHP= imap
+IGNORE_WITH_PHP= 74
NO_BUILD= yes
NO_ARCH= yes
diff --git a/mail/nmzmail/Makefile b/mail/nmzmail/Makefile
index 011bec9588eb..4f217a3c2578 100644
--- a/mail/nmzmail/Makefile
+++ b/mail/nmzmail/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Fast mail searching for mutt
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
RUN_DEPENDS= namazu:databases/namazu2
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 2a6f92f252fb..883a1f6b1198 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opendmarc
PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/Previous%20Releases
diff --git a/mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c b/mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c
new file mode 100644
index 000000000000..8765c76e029b
--- /dev/null
+++ b/mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c
@@ -0,0 +1,10 @@
+--- libopendmarc/tests/test_finddomain.c.orig 2012-10-25 15:38:55 UTC
++++ libopendmarc/tests/test_finddomain.c
+@@ -23,6 +23,7 @@ main(int argc, char **argv)
+ /* 11 */ {"(,) joe@joe.com", "joe.com"},
+ /* 12 */ {"\"( bob@bob.com)\" joe@joe.com", "joe.com"},
+ /* 12 */ {"From: Davide D'Marco <user@blah.com>", "blah.com"},
++ /* 13 */ {"blah.com>", "blah.com"},
+ {NULL, NULL},
+ };
+ u_char dbuf[256];
diff --git a/mail/opendmarc/files/patch-opendmarc_opendmarc.c b/mail/opendmarc/files/patch-opendmarc_opendmarc.c
new file mode 100644
index 000000000000..818f761b8529
--- /dev/null
+++ b/mail/opendmarc/files/patch-opendmarc_opendmarc.c
@@ -0,0 +1,11 @@
+--- opendmarc/opendmarc.c.orig 2017-03-04 13:28:39 UTC
++++ opendmarc/opendmarc.c
+@@ -2193,7 +2193,7 @@ mlfi_eom(SMFICTX *ctx)
+ strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
+
+ ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
+- from->hdr_value);
++ dfc->mctx_fromdomain);
+ if (ostatus != DMARC_PARSE_OKAY)
+ {
+ if (conf->conf_dolog)
diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile
index 455872e246b5..864aa0a09960 100644
--- a/mail/pear-Horde_Imap_Client/Makefile
+++ b/mail/pear-Horde_Imap_Client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Horde_Imap_Client
-PORTVERSION= 2.29.17
+PORTVERSION= 2.29.18
CATEGORIES= mail www pear
PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}
diff --git a/mail/pear-Horde_Imap_Client/distinfo b/mail/pear-Horde_Imap_Client/distinfo
index e74bc1512e0a..06e7f78326f0 100644
--- a/mail/pear-Horde_Imap_Client/distinfo
+++ b/mail/pear-Horde_Imap_Client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551768478
-SHA256 (Horde/Horde_Imap_Client-2.29.17.tgz) = b67fdc5ac2f51fb0ff5cd88ea28d696e5ad383305aa9bf7e61b1b62e9bf358be
-SIZE (Horde/Horde_Imap_Client-2.29.17.tgz) = 262881
+TIMESTAMP = 1568717209
+SHA256 (Horde/Horde_Imap_Client-2.29.18.tgz) = c0f04d8d6762e79b48dbe0aef7531b7aaad0c6f73cd8874e1e09151c7f6ba94f
+SIZE (Horde/Horde_Imap_Client-2.29.18.tgz) = 262847
diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile
index 4f094627ab8d..ddf76d99e3fe 100644
--- a/mail/pecl-mailparse/Makefile
+++ b/mail/pecl-mailparse/Makefile
@@ -13,5 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= php:pecl
USE_PHP= mbstring:build
+IGNORE_WITH_PHP= 74
.include <bsd.port.mk>
diff --git a/mail/php74-imap/Makefile b/mail/php74-imap/Makefile
new file mode 100644
index 000000000000..8beb5d7a669a
--- /dev/null
+++ b/mail/php74-imap/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES= mail
+
+MASTERDIR= ${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX= -imap
+
+TEST_TARGET= test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/php74-imap/files/patch-config.m4 b/mail/php74-imap/files/patch-config.m4
new file mode 100644
index 000000000000..b2a153543fe3
--- /dev/null
+++ b/mail/php74-imap/files/patch-config.m4
@@ -0,0 +1,47 @@
+--- config.m4.orig 2019-08-20 14:09:27 UTC
++++ config.m4
+@@ -105,6 +105,13 @@ PHP_ARG_WITH([imap-ssl],
+ [no],
+ [no])
+
++PHP_ARG_WITH([pcre-dir],
++ [pcre install prefix],
++ [AS_HELP_STRING([[--with-pcre-dir]],
++ [IMAP: pcre install prefix])],
++ [no],
++ [no])
++
+ if test "$PHP_IMAP" != "no"; then
+ PHP_SUBST(IMAP_SHARED_LIBADD)
+ PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+@@ -120,6 +127,30 @@ if test "$PHP_IMAP" != "no"; then
+ fi
+ done
+
++ dnl This is PECL build, check if bundled PCRE library is used
++ old_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS=$INCLUDES
++ AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++ ],[
++ PHP_PCRE_REGEX=yes
++ ],[
++ AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++ ],[
++ PHP_PCRE_REGEX=pecl
++ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
++ ],[
++ PHP_PCRE_REGEX=no
++ ])
++ ])
++
+ dnl Check for c-client version 2004
+ AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
+ AC_DEFINE(HAVE_IMAP2004,1,[ ])
diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile
index 814215407274..1897536f8527 100644
--- a/mail/poppy/Makefile
+++ b/mail/poppy/Makefile
@@ -10,6 +10,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Client to perform simple tasks with a POP3/IMAP server
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= shebangfix
NO_BUILD= yes
diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile
index 49cb2e9c2db2..a84e4d0024f4 100644
--- a/mail/prom-wl/Makefile
+++ b/mail/prom-wl/Makefile
@@ -13,6 +13,8 @@ COMMENT= Procmail reader for Wanderlust on GNU Emacs
LICENSE= GPLv2+
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
# This port requires Wanderlust. But we can't decide which Wanderlust to
# depends, there is NO RUN_DEPENDS mail/wanderlust-*.
diff --git a/mail/py-aiosmtpd/Makefile b/mail/py-aiosmtpd/Makefile
index 1db09dd9f74b..f9b7fce884af 100644
--- a/mail/py-aiosmtpd/Makefile
+++ b/mail/py-aiosmtpd/Makefile
@@ -16,5 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${PY_FLAVOR}
USES= python:3.5+
USE_PYTHON= autoplist distutils
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/mail/py-aiosmtpd/pkg-descr b/mail/py-aiosmtpd/pkg-descr
index faf36308c034..f0a54e94ae5d 100644
--- a/mail/py-aiosmtpd/pkg-descr
+++ b/mail/py-aiosmtpd/pkg-descr
@@ -1,5 +1,5 @@
-This is a server for SMTP and related protocols, similar in utility to the
-standard library's smtpd.py module, but rewritten to be based on asyncio for
+This is a server for SMTP and related protocols, similar in utility to the
+standard library's smtpd.py module, but rewritten to be based on asyncio for
Python 3.
-WWW: http://aiosmtpd.readthedocs.io
+WWW: https://aiosmtpd.readthedocs.io/
diff --git a/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index ec96917e9aa2..3036b72834ba 100644
--- a/mail/py-apolicy/Makefile
+++ b/mail/py-apolicy/Makefile
@@ -16,6 +16,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${PY_FLAVOR} \
diff --git a/mail/py-fuglu/pkg-descr b/mail/py-fuglu/pkg-descr
index 3e87bcba75f5..9b6ac1f4f258 100644
--- a/mail/py-fuglu/pkg-descr
+++ b/mail/py-fuglu/pkg-descr
@@ -1,5 +1,5 @@
-A mail scanning daemon for Postfix written in Python. It acts as the
-glue application between the MTA and spam checkers and antivirus
+A mail scanning daemon for Postfix written in Python. It acts as the
+glue application between the MTA and spam checkers and antivirus
software and focuses on being solid, easy to manage, debug and monitor.
-WWW: http://fuglu.org/
+WWW: https://fuglu.org/
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 2967e6f146ac..5a6086a0e462 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sid-milter
PORTVERSION= 1.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION}
@@ -53,7 +53,7 @@ pre-configure:
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
${SITE} > ${WCONF}/site.config.m4
-pre-configure-NH_MFROM_on:
+pre-configure-NH_MFROM-on:
${ECHO_CMD} \
'APPENDDEF(`confENVDEF'\'', `-D_FFR_NH_MFROM'\'')' \
>> ${WCONF}/site.config.m4
diff --git a/mail/spamdb-curses/Makefile b/mail/spamdb-curses/Makefile
index 94ab43af3f3b..3b67664eed16 100644
--- a/mail/spamdb-curses/Makefile
+++ b/mail/spamdb-curses/Makefile
@@ -12,6 +12,8 @@ COMMENT= Curses interface for OpenBSD spamd spam database (spamdb)
LICENSE= MIT
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
RUN_DEPENDS= ${LOCALBASE}/sbin/spamdb:mail/spamd
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 01ed1701cde5..60516207305e 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 68.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 398b33a0ae03..582343685f65 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.2.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -20,8 +20,9 @@ LIB_DEPENDS= libgnutls.so:security/gnutls \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 xfce
-USE_GNOME= cairo glib20 gtk20 intlhack intltool
+USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+ xfce:gtk2 xorg
+USE_GNOME= cairo glib20 gtk20 intltool
USE_XFCE= panel
USE_XORG= x11
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index ad88653b7e65..2b93128deeb9 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The X Literate Biff - displays the from and subject from incoming mails
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= imake tar:Z
USE_XORG= ice sm x11 xaw xext xmu xpm xt