Merge remote-tracking branch 'upstream/master'

31 files changed, 453 insertions, 143 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 8baa4f9a3511..866dd04e2f37 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -129,6 +129,7 @@
     SUBDIR += fastforward
     SUBDIR += fdm
     SUBDIR += fetchmail
+    SUBDIR += fetchmail64
     SUBDIR += fetchmailconf
     SUBDIR += filtermail
     SUBDIR += findmaildirs
diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile
index a34640f83d49..525d49c0c809 100644
--- a/mail/astroid/Makefile
+++ b/mail/astroid/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	astroid
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	mylan.connolly@gmail.com
diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index 98eaf7b3d4e3..c57756183c0c 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	dma
-PORTVERSION=	0.11
+PORTVERSION=	0.12
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 
@@ -31,7 +30,6 @@ MAKE_ENV=	__MAKE_CONF=/dev/null SRCCONF=/dev/null NO_WERROR=defined \
 
 USE_RC_SUBR=	dma_flushq
 SUB_FILES=	pkg-message
-EXTRA_PATCHES=	${FILESDIR}/fix-security-hole.patch:-p1
 
 # Allow subports to extend.
 CONFFILES+=	dma.conf auth.conf
diff --git a/mail/dma/distinfo b/mail/dma/distinfo
index 64ec5df33fa9..a8ebafdfb698 100644
--- a/mail/dma/distinfo
+++ b/mail/dma/distinfo
@@ -1,2 +1,3 @@
-SHA256 (corecode-dma-v0.11_GH0.tar.gz) = 288bd57f17aba696b6423b1fa0cd0f7d9b7228d32811f1cd7b821d5f020051b8
-SIZE (corecode-dma-v0.11_GH0.tar.gz) = 34529
+TIMESTAMP = 1566415052
+SHA256 (corecode-dma-v0.12_GH0.tar.gz) = 054a40203d43bc1182dcadf2375ccf01944329dce472444acb42d56cf01de367
+SIZE (corecode-dma-v0.12_GH0.tar.gz) = 35603
diff --git a/mail/dma/files/fix-security-hole.patch b/mail/dma/files/fix-security-hole.patch
deleted file mode 100644
index 9efd7bd76985..000000000000
--- a/mail/dma/files/fix-security-hole.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f249aa412dd4a09881cb450390d1003815bd0013 Mon Sep 17 00:00:00 2001
-From: Zach Crownover <zachary.crownover@gmail.com>
-Date: Fri, 5 Aug 2016 15:24:27 -0700
-Subject: [PATCH] dma - Fix security hole (#46)
-
-Affecting DragonFly 4.6 and earlier, Matt Dillon fixed this in base after
-finding out from BSDNow Episode 152. Comments following were from his commit
-which explains better than I. Just taking his change and putting it here as well.
-
-* dma makes an age-old mistake of not properly checking whether a file
-  owned by a user is a symlink or not, a bug which the original mail.local
-  also had.
-
-* Add O_NOFOLLOW to disallow symlinks.
-
-Thanks-to: BSDNow Episode 152, made me dive dma to check when they talked
-           about the mail.local bug.
----
- dma-mbox-create.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dma-mbox-create.c b/dma-mbox-create.c
-index 532a7af..45a4792 100644
---- a/dma-mbox-create.c
-+++ b/dma-mbox-create.c
-@@ -142,7 +142,7 @@ main(int argc, char **argv)
- 		logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user);
- 	}
- 
--	f = open(fn, O_RDONLY|O_CREAT, 0600);
-+	f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600);
- 	if (f < 0)
- 		logfail(EX_NOINPUT, "cannt open mbox `%s'", fn);
- 
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 36fdf7194c0e..aecfba1a0f59 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -20,14 +20,16 @@ LICENSE_COMB=	dual
 .if empty(MASTERDIR)
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
+USES=		cpe gmake tar:xz ssl
+
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-USES=		cpe gmake tar:xz ssl
-
 USE_RC_SUBR=	fetchmail
 SUB_FILES=	pkg-message
 
+CONFLICTS_INSTALL=	fetchmail-6.4*
+
 GNU_CONFIGURE=	yes
 
 # the added PYTHON=: suppresses python builds,
diff --git a/mail/fetchmail64/Makefile b/mail/fetchmail64/Makefile
new file mode 100644
index 000000000000..27e8db513455
--- /dev/null
+++ b/mail/fetchmail64/Makefile
@@ -0,0 +1,87 @@
+# Created by: Ville Eerola <ve@sci.fi>
+# $FreeBSD$
+
+PORTNAME?=	fetchmail
+DISTVERSION=	6.4.0.rc2
+CATEGORIES=	mail ipv6
+MASTER_SITES=	SF/${PORTNAME}/branch_6.4/
+PKGNAMESUFFIX=	64
+
+# chalpin@cs.wisc.edu has full permissions to this port except overriding MAINTAINER line.
+MAINTAINER=	mandree@FreeBSD.org
+COMMENT?=	Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR - release candidate
+
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	dual
+
+.if empty(MASTERDIR)
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+
+USES=		cpe gmake tar:xz ssl
+
+USERS=		${PORTNAME}
+GROUPS=		${USERS}
+
+USE_RC_SUBR=	fetchmail
+SUB_FILES=	pkg-message
+
+CONFLICTS_INSTALL=	fetchmail-6.3*
+
+GNU_CONFIGURE=	yes
+
+# the added PYTHON=: suppresses python builds,
+# see ../../mail/fetchmailconf/ for the configuration tool
+CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
+		--without-hesiod --enable-fallback=no \
+		--with-ssl=${OPENSSLBASE} PYTHON=:
+
+# -Wl,--as-needed suppresses unneeded library references,
+# for instance, libcom_err.so on GSSAPI_NONE builds:
+LDFLAGS+=	-L${LOCALBASE}/lib -Wl,--as-needed
+
+OPTIONS_DEFINE=	NLS DOCS
+OPTIONS_SINGLE=	GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_DEFAULT=	GSSAPI_BASE
+OPTIONS_SUB=	yes
+
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	--with-kerberos5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+PORTDOCS=	FAQ FEATURES NEWS NOTES OLDNEWS \
+		README README.SSL README.SSL-SERVER \
+		design-notes.html fetchmail-FAQ.html fetchmail-features.html \
+		esrs-design-notes.html todo.html
+
+post-patch:
+.if !exists(/usr/lib/libcom_err.so)
+	@${REINPLACE_CMD} -e "s,-lcom_err,,g" ${WRKSRC}/configure
+.endif
+
+.endif
+
+.if empty(MASTERDIR)
+post-build:
+	${MAKE_CMD} -C ${WRKSRC} check
+
+post-install:
+	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
+	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
+		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
+	${RM} ${STAGEDIR}${PREFIX}/bin/fetchmailconf
+	${RM} ${STAGEDIR}${PREFIX}/man/man1/fetchmailconf.1*
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.endif
+.include <bsd.port.mk>
diff --git a/mail/fetchmail64/distinfo b/mail/fetchmail64/distinfo
new file mode 100644
index 000000000000..3e5780d4a338
--- /dev/null
+++ b/mail/fetchmail64/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1566247219
+SHA256 (fetchmail-6.4.0.rc2.tar.xz) = b90d2874d9710d2e2118e9210c55b4b094dcb872c6baedc97cea7a9bc411b988
+SIZE (fetchmail-6.4.0.rc2.tar.xz) = 1241744
diff --git a/mail/fetchmail64/files/fetchmail.in b/mail/fetchmail64/files/fetchmail.in
new file mode 100644
index 000000000000..e1c66d40fbdf
--- /dev/null
+++ b/mail/fetchmail64/files/fetchmail.in
@@ -0,0 +1,150 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: fetchmail
+# REQUIRE: LOGIN mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to fetchmail in daemon
+# mode.
+#
+# fetchmail_enable="YES"
+#
+# There are two variants:
+#
+#  * Single system-wide fetchmail daemon:
+#    - It is run as user `fetchmail_user' (default: fetchmail)
+#      Note: The directory /var/run/fetchmail must be writable for
+#            'fetchmail_user'.
+#    - All configuration is contained in one global file
+#      'fetchmail_config' (default: %%PREFIX%%/etc/fetchmailrc)
+#      that must be owned by 'fetchmail_user' (mode 700)
+#    - The fetchmail daemon awakes to fetch mail every 
+#      'fetchmail_polling_interval' seconds (default: 900).
+#
+#  * Per-user daemon
+#    - Users for which a fetchmail daemon is to be started must be
+#      listed in 'fetchmail_users', e.g. fetchmail_users="user1 user2"
+#      The 'fetchmail_user' (sic!) variable is ignored in this
+#      configuration variant.
+#    - The config files for the individual users must be located at
+#      ${fetchmail_home_prefix}/${user}/${fetchmail_config_name}. The
+#      default for 'fetchmail_home_prefix' is "/home", and that for
+#      'fetchmail_config_name' is ".fetchmailrc".
+#    - Note that "${fetchmail_home_prefix}/${user}" must be writable
+#      for ${user} since it is used to store the per-user PID files!
+#    - There are user-specific versions of 'fetchmail_config' and
+#      'fetchmail_polling_interval' that can be used to override the
+#      defaults, i.e. for the user 'user1' there are variables
+#      'fetchmail_user1_config' and 'fetchmail_user1_polling_interval'
+#    - All commands (e.g. start, stop, awaken (see below)) can be either
+#      passed to all instances of the daemon (if %%PREFIX%%/etc/rc.d/fetchmail)
+#      is run as root), or just to the instance belonging to the respective
+#      user.
+#
+# Extra commands:
+#
+#  * 'awaken': Sends a signal to the daemon(s) to check for new mail
+#     immediately
+#
+# Fetchmail configuration:
+#
+# In any case, you will need a working fetchmailrc file. Please consult
+# the man page fetchmail(1), the documentation in %%PREFIX%%/share/doc/fetchmail/
+# and/or the material found at <http://www.fetchmail.info/>.
+
+. /etc/rc.subr
+
+name=fetchmail
+rcvar=fetchmail_enable
+
+command=%%PREFIX%%/bin/${name}
+pidfile=/var/run/fetchmail/${name}.pid
+extra_commands="awaken"
+awaken_cmd="fetchmail_awaken"
+
+fetchmail_script=%%PREFIX%%/etc/rc.d/$name
+
+# read settings, set default values
+load_rc_config "$name"
+: ${fetchmail_enable="NO"}
+: ${fetchmail_user="fetchmail"}
+: ${fetchmail_config="%%PREFIX%%/etc/fetchmailrc"}
+: ${fetchmail_polling_interval="900"}
+: ${fetchmail_logging_facility="--syslog"}
+: ${fetchmail_home_prefix="/home"}
+: ${fetchmail_config_name=".fetchmailrc"}
+
+# send signal to fetchmail process(es) to check for new mail immediately
+fetchmail_awaken()
+{
+	if [ $rc_pid ]; then
+		echo "Forcing fetchmail to check mailbox(es)..."
+		kill -USR1 $rc_pid
+	else
+		echo "$name not running? (check $pidfile)"
+	fi
+
+	return
+}
+
+if [ -n "$2" ]; then
+	# perform action for an instance of fetchmail daemon
+        user="$2"
+        if [ "x${fetchmail_users}" != "x" -o "x$3" = "xGLOBALCONFIG"  ]; then
+		if [ "x${fetchmail_users}" != "x" ]; then
+			# multiuser setup:  determine user specific config and pid file
+			eval fetchmail_config="\${fetchmail_${user}_config:-${fetchmail_home_prefix}/${user}}/${fetchmail_config_name}"
+			eval pidfile="${fetchmail_home_prefix}/${user}/.fetchmail.pid"
+			eval fetchmail_user=$user
+		else
+			eval pidfile=/var/run/fetchmail/fetchmail.pid
+		fi
+		required_files=${fetchmail_config}
+		eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}"
+		fetchmail_flags="-f ${fetchmail_config} \
+				--pidfile ${pidfile} \
+				-d ${fetchmail_polling_interval} \
+				${fetchmail_logging_facility}"
+        else
+                echo "$0: extra argument ignored"
+        fi
+else
+	uid=`id -u`
+        if [ "x${fetchmail_users}" != "x" -a "x$1" != "x" -a "$uid" = "0" ]; then
+		# root mode: multiple user profiles are handled by recursive
+		# calls of this script
+		for user in ${fetchmail_users}; do
+			echo "===> fetchmail user: ${user}"
+			$fetchmail_script $1 ${user}
+			retcode="$?"
+			if [ "0${retcode}" -ne 0 ]; then
+				failed="${user} (${retcode}) ${failed:-}"
+			else
+				success="${user} ${success:-}"
+			fi
+		done
+		exit 0
+	else
+		if [ "x${fetchmail_users}" = "x" ]; then
+			# There is only one global configuration file
+			globalconfig=GLOBALCONFIG
+		fi
+		$fetchmail_script $1 `id -u -n` $globalconfig
+		retcode="$?"
+		if [ "0${retcode}" -ne 0 ]; then
+			failed="${user} (${retcode}) ${failed:-}"
+			exit 1
+		else
+			success="${user} ${success:-}"
+		fi
+		exit 0
+        fi
+fi
+
+# actually execute the fetchmail program
+export FETCHMAILUSER=$fetchmail_user
+run_rc_command "$1"
diff --git a/mail/fetchmail64/files/fetchmailrc.sample b/mail/fetchmail64/files/fetchmailrc.sample
new file mode 100644
index 000000000000..9bbfe5876013
--- /dev/null
+++ b/mail/fetchmail64/files/fetchmailrc.sample
@@ -0,0 +1,3 @@
+# Your fetchmail configuration goes here.
+#
+# See fetchmail(1).
diff --git a/mail/fetchmail64/files/patch-configure b/mail/fetchmail64/files/patch-configure
new file mode 100644
index 000000000000..91d1f3f6f716
--- /dev/null
+++ b/mail/fetchmail64/files/patch-configure
@@ -0,0 +1,30 @@
+--- configure.orig	2013-04-23 21:36:55 UTC
++++ configure
+@@ -9552,11 +9552,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char krb5_des_string_to_key ();
++char krb5int_des_string_to_key ();
+ int
+ main ()
+ {
+-return krb5_des_string_to_key ();
++return krb5int_des_string_to_key ();
+   ;
+   return 0;
+ }
+@@ -9591,11 +9591,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char krb5_des_string_to_key ();
++char krb5int_des_string_to_key ();
+ int
+ main ()
+ {
+-return krb5_des_string_to_key ();
++return krb5int_des_string_to_key ();
+   ;
+   return 0;
+ }
diff --git a/mail/fetchmail64/files/pkg-message.in b/mail/fetchmail64/files/pkg-message.in
new file mode 100644
index 000000000000..0c84eb7ca4a0
--- /dev/null
+++ b/mail/fetchmail64/files/pkg-message.in
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+For pointers how to configure fetchmail in daemon mode
+please consult %%PREFIX%%/etc/rc.d/fetchmail.
+EOM
+}
+]
diff --git a/mail/fetchmail64/pkg-descr b/mail/fetchmail64/pkg-descr
new file mode 100644
index 000000000000..970903ce3ffc
--- /dev/null
+++ b/mail/fetchmail64/pkg-descr
@@ -0,0 +1,14 @@
+Fetchmail is a full-featured IMAP/POP2/POP3/APOP/KPOP/ETRN/ODMR client with
+easy configuration, daemon mode, forwarding via SMTP or local MDA, and
+superior reply handling.  It is used to handle intermittent email connections
+by acting as a coupling that seamlessly batch forwards fetched mail from your
+mail server to your local delivery system, allowing you to read it with your
+favourite mail user agent.  Fetchmail also includes useful spam filtering and
+multi-user functions.
+
+A typical use of fetchmail is to connect to your ISP's POP3 server,
+downloading your mail into the INBOX on your local computer.  You may then
+read the mail, offline if you want, using pine, mutt, or any standard mail
+user agent.
+
+WWW: http://www.fetchmail.info/
diff --git a/mail/fetchmail64/pkg-plist b/mail/fetchmail64/pkg-plist
new file mode 100644
index 000000000000..0925691d0bad
--- /dev/null
+++ b/mail/fetchmail64/pkg-plist
@@ -0,0 +1,28 @@
+bin/fetchmail
+man/man1/fetchmail.1.gz
+%%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/de/LC_MESSAGES/fetchmail.mo
+@comment %%NLS%%share/locale/el/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/es/LC_MESSAGES/fetchmail.mo
+@comment %%NLS%%share/locale/fi/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/fetchmail.mo
+@comment %%NLS%%share/locale/gl/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/id/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/it/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/fetchmail.mo
+@comment %%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/fetchmail.mo
+@comment %%NLS%%share/locale/sk/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/fetchmail.mo
+@comment %%NLS%%share/locale/tr/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/fetchmail.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/fetchmail.mo
+@sample(fetchmail,fetchmail,600) etc/fetchmailrc.sample
+@dir(fetchmail,fetchmail,755) /var/run/fetchmail
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index ef2e52c287de..d51fbc264e79 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	getmail
-DISTVERSION=	5.13
+DISTVERSION=	5.14
 CATEGORIES=	mail python
 MASTER_SITES=	http://pyropus.ca/software/getmail/old-versions/
 
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
index fe6da083a016..bdc498b76efe 100644
--- a/mail/getmail/distinfo
+++ b/mail/getmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550933815
-SHA256 (getmail-5.13.tar.gz) = 04d52f6475f09e9f99b4e3d2f1d2eb967a68b67f09af2a6a5151857f060b0a9d
-SIZE (getmail-5.13.tar.gz) = 199073
+TIMESTAMP = 1566305477
+SHA256 (getmail-5.14.tar.gz) = f3a99fe74564237d12ca8d4582e113c067c9205b5ab640f72b4e8447606a99c1
+SIZE (getmail-5.14.tar.gz) = 199501
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index f2215acc68f1..e75ec9de11aa 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	meta1
-PORTVERSION=	1.1.0a.12.0
+PORTVERSION=	1.1.0a.13.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.MeTA1.org/download/.alpha/edns0/
+MASTER_SITES=	http://www.MeTA1.org/download/.alpha/bdblck/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}-1.1.Alpha12.0
+DISTNAME=	${PORTNAME}-1.1.Alpha13.0
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Secure and efficient mail gateway
diff --git a/mail/meta1/distinfo b/mail/meta1/distinfo
index e7305c26accb..97f1bc75b734 100644
--- a/mail/meta1/distinfo
+++ b/mail/meta1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549294706
-SHA256 (meta1-1.1.Alpha12.0.tar.gz) = 11321e236023b4002d8461f9f11fe6aad258ff0672715c58ce6818f2d5441bb8
-SIZE (meta1-1.1.Alpha12.0.tar.gz) = 5226255
+TIMESTAMP = 1565088131
+SHA256 (meta1-1.1.Alpha13.0.tar.gz) = 140b5e7ca124c71bfacf1577ed91c7c5defbac42d86e61a02f4cdc0a1a74e942
+SIZE (meta1-1.1.Alpha13.0.tar.gz) = 5195500
diff --git a/mail/meta1/pkg-message b/mail/meta1/pkg-message
index a006ea235248..29c37d397948 100644
--- a/mail/meta1/pkg-message
+++ b/mail/meta1/pkg-message
@@ -1,15 +1,13 @@
-[
-{ type: install
-  message: <<EOM
+---------------------------------------------------
 on first installation please run:
 
 /usr/local/sbin/sm.setup.sh
 
+---------------------------------------------------
 to clean after permanent removal please run:
 
 rm -rf /usr/local/etc/meta1 /var/spool/meta1
 pw userdel meta1s meta1q meta1c meta1m meta1
 pw groupdel meta1s meta1q
-EOM
-}
-]
+
+---------------------------------------------------
diff --git a/mail/nextcloud-mail/Makefile b/mail/nextcloud-mail/Makefile
index 8bf4c8e01735..3d9c7d2973bc 100644
--- a/mail/nextcloud-mail/Makefile
+++ b/mail/nextcloud-mail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mail
-PORTVERSION=	0.15.1
+PORTVERSION=	0.15.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/${PKGNAMEPREFIX:S/-//}/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${PORTVERSION}/
diff --git a/mail/nextcloud-mail/distinfo b/mail/nextcloud-mail/distinfo
index 7f85ac3664e3..1ce8e36f4bea 100644
--- a/mail/nextcloud-mail/distinfo
+++ b/mail/nextcloud-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562411254
-SHA256 (nextcloud/mail-v0.15.1/mail.tar.gz) = 6fa8e498ec06ecff66ab53af271c60c68c114fd850c217bffaec4f4431ab76bb
-SIZE (nextcloud/mail-v0.15.1/mail.tar.gz) = 3337484
+TIMESTAMP = 1566047213
+SHA256 (nextcloud/mail-v0.15.2/mail.tar.gz) = 09ecbfaf64384118a720511252d41ce95baa785230a3356219e7fef694abff7a
+SIZE (nextcloud/mail-v0.15.2/mail.tar.gz) = 3460871
diff --git a/mail/nextcloud-mail/pkg-plist b/mail/nextcloud-mail/pkg-plist
index 5fc3e02015a9..7de0c2e44b0b 100644
--- a/mail/nextcloud-mail/pkg-plist
+++ b/mail/nextcloud-mail/pkg-plist
@@ -41,24 +41,22 @@
 %%WWWDIR%%/img/star.svg
 %%WWWDIR%%/img/trash.png
 %%WWWDIR%%/img/trash.svg
-%%WWWDIR%%/js/mail.0.ec9ed56f4b49acd08381.js
-%%WWWDIR%%/js/mail.0.ec9ed56f4b49acd08381.js.map
-%%WWWDIR%%/js/mail.1.5b1a01708d0952c96a9d.js
-%%WWWDIR%%/js/mail.1.5b1a01708d0952c96a9d.js.map
-%%WWWDIR%%/js/mail.2.b0f836e1c36928aa0d7b.js
-%%WWWDIR%%/js/mail.2.b0f836e1c36928aa0d7b.js.map
-%%WWWDIR%%/js/mail.3.49d8ce2c011407d32488.js
-%%WWWDIR%%/js/mail.3.49d8ce2c011407d32488.js.map
-%%WWWDIR%%/js/mail.5.f379e732a0acda0aad0f.js
-%%WWWDIR%%/js/mail.5.f379e732a0acda0aad0f.js.map
-%%WWWDIR%%/js/mail.6.5a95cd0084d20237539d.js
-%%WWWDIR%%/js/mail.6.5a95cd0084d20237539d.js.map
-%%WWWDIR%%/js/mail.7.dbb0589ebd8de1afdf5d.js
-%%WWWDIR%%/js/mail.7.dbb0589ebd8de1afdf5d.js.map
-%%WWWDIR%%/js/mail.8.5d519b2d1fd8be86e18e.js
-%%WWWDIR%%/js/mail.8.5d519b2d1fd8be86e18e.js.map
-%%WWWDIR%%/js/mail.9.1139c8f9166a7337b1aa.js
-%%WWWDIR%%/js/mail.9.1139c8f9166a7337b1aa.js.map
+%%WWWDIR%%/js/mail.0.067c6d4f48f7d486726a.js
+%%WWWDIR%%/js/mail.0.067c6d4f48f7d486726a.js.map
+%%WWWDIR%%/js/mail.1.984ebc028a4f1ea3e4d6.js
+%%WWWDIR%%/js/mail.1.984ebc028a4f1ea3e4d6.js.map
+%%WWWDIR%%/js/mail.2.840b865233a694f7ec29.js
+%%WWWDIR%%/js/mail.2.840b865233a694f7ec29.js.map
+%%WWWDIR%%/js/mail.4.05a601f5b59abc01a3f1.js
+%%WWWDIR%%/js/mail.4.05a601f5b59abc01a3f1.js.map
+%%WWWDIR%%/js/mail.5.8f0880d7660da63e794a.js
+%%WWWDIR%%/js/mail.5.8f0880d7660da63e794a.js.map
+%%WWWDIR%%/js/mail.6.64f8b7e5688b94920885.js
+%%WWWDIR%%/js/mail.6.64f8b7e5688b94920885.js.map
+%%WWWDIR%%/js/mail.7.11494a6971afa5a25279.js
+%%WWWDIR%%/js/mail.7.11494a6971afa5a25279.js.map
+%%WWWDIR%%/js/mail.8.3e7bce050efbd35fb9d4.js
+%%WWWDIR%%/js/mail.8.3e7bce050efbd35fb9d4.js.map
 %%WWWDIR%%/js/mail.js
 %%WWWDIR%%/js/mail.js.map
 %%WWWDIR%%/l10n/.gitkeep
@@ -68,12 +66,18 @@
 %%WWWDIR%%/l10n/ar.json
 %%WWWDIR%%/l10n/ast.js
 %%WWWDIR%%/l10n/ast.json
+%%WWWDIR%%/l10n/az.js
+%%WWWDIR%%/l10n/az.json
 %%WWWDIR%%/l10n/bg.js
 %%WWWDIR%%/l10n/bg.json
+%%WWWDIR%%/l10n/bn_BD.js
+%%WWWDIR%%/l10n/bn_BD.json
 %%WWWDIR%%/l10n/ca.js
 %%WWWDIR%%/l10n/ca.json
 %%WWWDIR%%/l10n/cs.js
 %%WWWDIR%%/l10n/cs.json
+%%WWWDIR%%/l10n/cy_GB.js
+%%WWWDIR%%/l10n/cy_GB.json
 %%WWWDIR%%/l10n/da.js
 %%WWWDIR%%/l10n/da.json
 %%WWWDIR%%/l10n/de.js
@@ -126,6 +130,8 @@
 %%WWWDIR%%/l10n/et_EE.json
 %%WWWDIR%%/l10n/eu.js
 %%WWWDIR%%/l10n/eu.json
+%%WWWDIR%%/l10n/fa.js
+%%WWWDIR%%/l10n/fa.json
 %%WWWDIR%%/l10n/fi.js
 %%WWWDIR%%/l10n/fi.json
 %%WWWDIR%%/l10n/fr.js
@@ -138,6 +144,10 @@
 %%WWWDIR%%/l10n/hr.json
 %%WWWDIR%%/l10n/hu.js
 %%WWWDIR%%/l10n/hu.json
+%%WWWDIR%%/l10n/ia.js
+%%WWWDIR%%/l10n/ia.json
+%%WWWDIR%%/l10n/id.js
+%%WWWDIR%%/l10n/id.json
 %%WWWDIR%%/l10n/is.js
 %%WWWDIR%%/l10n/is.json
 %%WWWDIR%%/l10n/it.js
@@ -146,23 +156,35 @@
 %%WWWDIR%%/l10n/ja.json
 %%WWWDIR%%/l10n/ka_GE.js
 %%WWWDIR%%/l10n/ka_GE.json
+%%WWWDIR%%/l10n/km.js
+%%WWWDIR%%/l10n/km.json
 %%WWWDIR%%/l10n/ko.js
 %%WWWDIR%%/l10n/ko.json
 %%WWWDIR%%/l10n/lt_LT.js
 %%WWWDIR%%/l10n/lt_LT.json
 %%WWWDIR%%/l10n/lv.js
 %%WWWDIR%%/l10n/lv.json
+%%WWWDIR%%/l10n/mk.js
+%%WWWDIR%%/l10n/mk.json
 %%WWWDIR%%/l10n/mn.js
 %%WWWDIR%%/l10n/mn.json
 %%WWWDIR%%/l10n/nb.js
 %%WWWDIR%%/l10n/nb.json
 %%WWWDIR%%/l10n/nl.js
 %%WWWDIR%%/l10n/nl.json
+%%WWWDIR%%/l10n/nn_NO.js
+%%WWWDIR%%/l10n/nn_NO.json
+%%WWWDIR%%/l10n/oc.js
+%%WWWDIR%%/l10n/oc.json
 %%WWWDIR%%/l10n/pl.js
 %%WWWDIR%%/l10n/pl.json
 %%WWWDIR%%/l10n/preproc.sh
 %%WWWDIR%%/l10n/pt_BR.js
 %%WWWDIR%%/l10n/pt_BR.json
+%%WWWDIR%%/l10n/pt_PT.js
+%%WWWDIR%%/l10n/pt_PT.json
+%%WWWDIR%%/l10n/ro.js
+%%WWWDIR%%/l10n/ro.json
 %%WWWDIR%%/l10n/ru.js
 %%WWWDIR%%/l10n/ru.json
 %%WWWDIR%%/l10n/sk.js
@@ -175,10 +197,18 @@
 %%WWWDIR%%/l10n/sr.json
 %%WWWDIR%%/l10n/sv.js
 %%WWWDIR%%/l10n/sv.json
+%%WWWDIR%%/l10n/th.js
+%%WWWDIR%%/l10n/th.json
 %%WWWDIR%%/l10n/tr.js
 %%WWWDIR%%/l10n/tr.json
+%%WWWDIR%%/l10n/uk.js
+%%WWWDIR%%/l10n/uk.json
+%%WWWDIR%%/l10n/vi.js
+%%WWWDIR%%/l10n/vi.json
 %%WWWDIR%%/l10n/zh_CN.js
 %%WWWDIR%%/l10n/zh_CN.json
+%%WWWDIR%%/l10n/zh_HK.js
+%%WWWDIR%%/l10n/zh_HK.json
 %%WWWDIR%%/l10n/zh_TW.js
 %%WWWDIR%%/l10n/zh_TW.json
 %%WWWDIR%%/lib/Account.php
@@ -340,8 +370,8 @@
 %%WWWDIR%%/vendor/cerdic/css-tidy/Docs/media/empty.png
 %%WWWDIR%%/vendor/cerdic/css-tidy/Docs/media/style.css
 %%WWWDIR%%/vendor/cerdic/css-tidy/Docs/todolist.html
-%%WWWDIR%%/vendor/cerdic/css-tidy/NEWS
 %%WWWDIR%%/vendor/cerdic/css-tidy/README.md
+%%WWWDIR%%/vendor/cerdic/css-tidy/bin/pcsstidy
 %%WWWDIR%%/vendor/cerdic/css-tidy/class.csstidy.php
 %%WWWDIR%%/vendor/cerdic/css-tidy/class.csstidy_optimise.php
 %%WWWDIR%%/vendor/cerdic/css-tidy/class.csstidy_print.php
@@ -365,6 +395,7 @@
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/README
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/atmedia-indent-high.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/atmedia-indent-low.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/atmedia-nested-low.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/atmedia-proportion.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/atvalues.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/font-face-atmedia-2.csst
@@ -378,6 +409,7 @@
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/simple-high.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/simple-highest.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/simple-low.csst
+%%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/print-plain/support-atmedia-nested-low.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css1-rtl.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css1.csst
 %%WWWDIR%%/vendor/cerdic/css-tidy/testing/unit-tests/csst/properties/css2-rtl.csst
@@ -666,6 +698,7 @@
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyRemoveScript.txt
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowHostnameUnderscore.txt
+%%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AllowParseManyTags.txt
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
@@ -903,7 +936,7 @@
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/config-scanner.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php
-%%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/flush.php
+%%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/flush.sh
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/generate-includes.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/generate-ph5p-patch.php
@@ -916,7 +949,6 @@
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/remove-trailing-whitespace.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/rename-config.php
-%%WWWDIR%%/vendor/ezyang/htmlpurifier/maintenance/update-config.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/package.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/phpdoc.ini
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/plugins/modx.txt
@@ -936,11 +968,10 @@
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs-form.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/plugins/phorum/settings/migrate-sigs.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/plugins/phorum/settings/save.php
-%%WWWDIR%%/vendor/ezyang/htmlpurifier/release1-update.php
-%%WWWDIR%%/vendor/ezyang/htmlpurifier/release2-tag.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/test-settings.sample.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/test-settings.travis.php
 %%WWWDIR%%/vendor/ezyang/htmlpurifier/tests/path2class.func.php
+%%WWWDIR%%/vendor/ezyang/htmlpurifier/update-for-release
 %%WWWDIR%%/vendor/gravatarphp/gravatar/CHANGELOG.md
 %%WWWDIR%%/vendor/gravatarphp/gravatar/LICENSE
 %%WWWDIR%%/vendor/gravatarphp/gravatar/README.md
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index f04c9e20c0a8..2b96577ec96c 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mail-DKIM
-PORTVERSION=	0.55
+PORTVERSION=	0.56
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN \
 		http://jason.long.name/dkimproxy/
diff --git a/mail/p5-Mail-DKIM/distinfo b/mail/p5-Mail-DKIM/distinfo
index 35fd7f6c48a6..2aa01d2aba66 100644
--- a/mail/p5-Mail-DKIM/distinfo
+++ b/mail/p5-Mail-DKIM/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555111285
-SHA256 (Mail-DKIM-0.55.tar.gz) = df29ddf187025b6a8dfc1387209b7fef35557fed51f8313bd1763ae35c80daa2
-SIZE (Mail-DKIM-0.55.tar.gz) = 160741
+TIMESTAMP = 1566487059
+SHA256 (Mail-DKIM-0.56.tar.gz) = e0c7052e8dacf53fafcc893378afb082b6f643ad5e6ffa82593e85f1179b6bb3
+SIZE (Mail-DKIM-0.56.tar.gz) = 165948
diff --git a/mail/rainloop-community/distinfo b/mail/rainloop-community/distinfo
index ed9001a4c48b..003dce5d85d3 100644
--- a/mail/rainloop-community/distinfo
+++ b/mail/rainloop-community/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532993795
-SHA256 (rainloop-community-1.12.1.zip) = 5d7f99d0e145d22617de8c17e43f34842245d5570662f97f4352487671df811b
-SIZE (rainloop-community-1.12.1.zip) = 5701850
+TIMESTAMP = 1565216921
+SHA256 (rainloop-community-1.13.0.zip) = 80f4ab4982311154781d31060d3a591600ef5040eb9c8c5c1724a06497c17cea
+SIZE (rainloop-community-1.13.0.zip) = 6929420
diff --git a/mail/rainloop-community/pkg-plist b/mail/rainloop-community/pkg-plist
index aff932da947b..1c269a563480 100644
--- a/mail/rainloop-community/pkg-plist
+++ b/mail/rainloop-community/pkg-plist
@@ -891,30 +891,6 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/pclzip/gnu-lgpl.txt
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/pclzip/pclzip.lib.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/pclzip/readme.txt
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/AES.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Base.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Blowfish.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/DES.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Hash.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/RC2.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/RC4.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/RSA.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Random.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Rijndael.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/TripleDES.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Twofish.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/File/ANSI.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/File/ASN1.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/File/X509.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Math/BigInteger.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SCP.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SFTP.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SFTP/Stream.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SSH1.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SSH2.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/System/SSH/Agent.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/System/SSH_Agent.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/openssl.cnf
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/spyc/COPYING
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/spyc/README.md
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/spyc/Spyc.php
@@ -936,6 +912,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/fi_FI.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/fr_FR.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/hu_HU.yml
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/id_ID.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/it_IT.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/ja_JP.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/lt_LT.yml
@@ -975,6 +952,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/de.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/dv.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/el.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-SG.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-au.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-ca.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-gb.js
@@ -994,6 +972,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/fr-ch.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/fr.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/fy.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ga.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/gd.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/gl.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/gom-latn.js
@@ -1005,6 +984,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/hy-am.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/id.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/is.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/it-ch.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/it.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ja.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/jv.js
@@ -1013,6 +993,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/km.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/kn.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ko.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ku.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ky.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/lb.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/lo.js
@@ -1430,6 +1411,8 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/libs.min.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/openpgp.min.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/openpgp.worker.min.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/polyfills.min.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/js/polyfills.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/manifest.json
 %%WWWDIR%%/rainloop/v/%%VER%%/static/sounds/new-mail.mp3
 %%WWWDIR%%/rainloop/v/%%VER%%/static/sounds/new-mail.ogg
diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile
index fea86644895e..48f37aa99d98 100644
--- a/mail/rainloop/Makefile
+++ b/mail/rainloop/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rainloop
-PORTVERSION=	1.12.1
+PORTVERSION=	1.13.0
 CATEGORIES=	mail www
 MASTER_SITES=	https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/
 
diff --git a/mail/rainloop/distinfo b/mail/rainloop/distinfo
index 7107b5bba908..e23d31d72310 100644
--- a/mail/rainloop/distinfo
+++ b/mail/rainloop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532992860
-SHA256 (rainloop-1.12.1.zip) = 80334d21ef5483d3901ebb1208c903a4f6f4b06266f41d86fd753941cfbc76b9
-SIZE (rainloop-1.12.1.zip) = 5707771
+TIMESTAMP = 1565216329
+SHA256 (rainloop-1.13.0.zip) = e3ec8209cb3b9f092938a89094e645ef27659763432bedbe7fad4fa650554222
+SIZE (rainloop-1.13.0.zip) = 6940879
diff --git a/mail/rainloop/pkg-plist b/mail/rainloop/pkg-plist
index ecdf3f076284..ed01a27358e5 100644
--- a/mail/rainloop/pkg-plist
+++ b/mail/rainloop/pkg-plist
@@ -892,30 +892,6 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/pclzip/gnu-lgpl.txt
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/pclzip/pclzip.lib.php
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/pclzip/readme.txt
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/AES.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Base.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Blowfish.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/DES.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Hash.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/RC2.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/RC4.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/RSA.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Random.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Rijndael.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/TripleDES.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Crypt/Twofish.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/File/ANSI.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/File/ASN1.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/File/X509.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Math/BigInteger.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SCP.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SFTP.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SFTP/Stream.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SSH1.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/Net/SSH2.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/System/SSH/Agent.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/System/SSH_Agent.php
-%%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/phpseclib/openssl.cnf
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/spyc/COPYING
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/spyc/README.md
 %%WWWDIR%%/rainloop/v/%%VER%%/app/libraries/spyc/Spyc.php
@@ -937,6 +913,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/fi_FI.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/fr_FR.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/hu_HU.yml
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/id_ID.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/it_IT.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/ja_JP.yml
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/admin/lt_LT.yml
@@ -976,6 +953,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/de.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/dv.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/el.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-SG.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-au.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-ca.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/en-gb.js
@@ -995,6 +973,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/fr-ch.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/fr.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/fy.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ga.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/gd.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/gl.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/gom-latn.js
@@ -1006,6 +985,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/hy-am.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/id.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/is.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/it-ch.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/it.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ja.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/jv.js
@@ -1014,6 +994,7 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/km.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/kn.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ko.js
+%%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ku.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/ky.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/lb.js
 %%WWWDIR%%/rainloop/v/%%VER%%/app/localization/moment/lo.js
@@ -1431,6 +1412,8 @@
 %%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/libs.min.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/openpgp.min.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/openpgp.worker.min.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/js/min/polyfills.min.js
+%%WWWDIR%%/rainloop/v/%%VER%%/static/js/polyfills.js
 %%WWWDIR%%/rainloop/v/%%VER%%/static/manifest.json
 %%WWWDIR%%/rainloop/v/%%VER%%/static/sounds/new-mail.mp3
 %%WWWDIR%%/rainloop/v/%%VER%%/static/sounds/new-mail.ogg
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 0dd927df587c..4b2875647349 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	68.0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
diff --git a/mail/thunderbird/files/patch-bug1575876 b/mail/thunderbird/files/patch-bug1575876
new file mode 100644
index 000000000000..f16560ac241e
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1575876
@@ -0,0 +1,22 @@
+commit b588aee56dcb
+Author: Tijl Coosemans <tijl@FreeBSD.org>
+Date:   Wed Aug 21 23:46:52 2019 +0200
+
+    Bug 1575876 - Drop header unused on FreeBSD that breaks with new libc++.
+---
+ media/mtransport/third_party/nICEr/src/stun/stun.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h
+index 0d55b63a94c1a..a32751d7950f6 100644
+--- media/mtransport/third_party/nICEr/src/stun/stun.h
++++ media/mtransport/third_party/nICEr/src/stun/stun.h
+@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <sys/socket.h>
+ #ifndef LINUX
+ #include <net/if.h>
+-#if !defined(__OpenBSD__) && !defined(__NetBSD__)
++#ifdef DARWIN
+ #include <net/if_var.h>
+ #endif
+ #include <net/if_dl.h>