Merge branch 'master' into gnome-3.28

25 files changed, 100 insertions, 57 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 66ecb405735a..6c5813f76352 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cone
-PORTVERSION=	0.96.2
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
@@ -18,14 +17,16 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
+		libidn.so:dns/libidn \
 		libcourier-unicode.so:devel/courier-unicode
 BUILD_DEPENDS=	gpgv:security/gnupg1
 RUN_DEPENDS=	gpgv:security/gnupg1
 
 USES=		compiler:c++11-lang fam gettext gmake iconv localbase:ldflags \
-		ncurses perl5 shebangfix ssl tar:bzip2
+		ncurses perl5 pkgconfig shebangfix ssl tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
+CONFIGURE_ARGS=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX} \
+		--with-notice=unicode
 SHEBANG_FILES=	sysconftool
 USE_GNOME=	libxml2
 INSTALL_TARGET=	install-strip
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index 560d8ac9a1bf..893fb0778deb 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512738199
-SHA256 (cone-0.96.2.tar.bz2) = c183dbd6e50922dd71f7cbbe2a39ea584e4b0d0d214d21c3667c84bff54392a5
-SIZE (cone-0.96.2.tar.bz2) = 3849926
+TIMESTAMP = 1537265861
+SHA256 (cone-1.0.tar.bz2) = cffb5ae0292bd461d3a8cdddd09dccf43855f752ea4f4ae8c2aeacf67b69f9e9
+SIZE (cone-1.0.tar.bz2) = 3793288
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f66b954e7e5e..9663e85b593c 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.18.2
-PORTREVISION=	1
+PORTVERSION=	5.0.0
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -11,18 +10,23 @@ MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
-LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode
-
-CONFLICTS=	courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]*
+LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
+		libidn.so:dns/libidn
 
-USES=		compiler:c++11-lang gmake localbase:ldflags perl5 ssl tar:bzip2
-GNU_CONFIGURE=	yes
+USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
+		tar:bzip2
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
+CONFLICTS=	courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]*
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
@@ -61,6 +65,7 @@ CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--enable-unicode \
 		--disable-root-check \
 		--with-locking-method=fcntl \
+		--with-notice=unicode \
 		COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index a20b2d0fe420..bc61cc8ea0cc 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507193939
-SHA256 (courier-imap-4.18.2.tar.bz2) = f66ceda3e5aa853e13f417302dfb83b312709e95f1bbcdafcd6214d76a94e79a
-SIZE (courier-imap-4.18.2.tar.bz2) = 3205230
+TIMESTAMP = 1537255135
+SHA256 (courier-imap-5.0.0.tar.bz2) = 25fb45ca2a8d27bedb1c4b3f5809ed528fa0e40b70242f74bda9d2d56a58f8ff
+SIZE (courier-imap-5.0.0.tar.bz2) = 3281138
diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 68838fad94b1..14df4450abfc 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fdm
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/mail/fdm/files/patch-configure.ac b/mail/fdm/files/patch-configure.ac
new file mode 100644
index 000000000000..88aae8012f63
--- /dev/null
+++ b/mail/fdm/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2018-10-09 21:50:40 UTC
++++ configure.ac
+@@ -83,7 +83,7 @@ if test "x$found_libcrypto" = xno; then
+ 	AC_MSG_ERROR("libcrypto not found")
+ fi
+ AC_SEARCH_LIBS(
+-	SSL_library_init,
++	SSL_CTX_new,
+ 	[ssl],
+ 	found_libssl=yes,
+ 	found_libssl=no
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 906e1907d745..6ba54b56869f 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -16,8 +16,7 @@
 # MAILDROP_MBOX_DIR=<dir>	Specify DEFAULT mailbox location
 
 PORTNAME=	maildrop
-PORTVERSION=	2.9.3
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -27,9 +26,11 @@ COMMENT=	Mail delivery agent (MDA) with filtering abilities
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libcourier-unicode.so:devel/courier-unicode
+		libcourier-unicode.so:devel/courier-unicode \
+		libidn.so:dns/libidn
 
-USES=		compiler:c++11-lang iconv localbase:ldflags perl5 tar:bzip2
+USES=		compiler:c++11-lang iconv localbase:ldflags perl5 pkgconfig \
+		tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog=1 \
@@ -63,7 +64,7 @@ OPTIONS_MULTI=		AUTHLIB
 AUTHLIB_DESC=		Courier Auth Library support
 .endif
 
-OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM IDN MAILWRAPPER DOCS
+OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM MAILWRAPPER DOCS
 
 DOVECOTAUTH_DESC=	Dovecot Authentication support
 MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
@@ -72,8 +73,6 @@ OPTIONS_SUB=		yes
 GDBM_CONFIGURE_ON=	--with-db=gdbm
 GDBM_CONFIGURE_OFF=	--with-db=db
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
-IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 MAILWRAPPER_CONFIGURE_OFF=	--enable-sendmail=/usr/sbin/sendmail
 DOVECOTAUTH_CONFIGURE_ENABLE=	dovecotauth
 
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 6b5caad5bc29..367136b792b8 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512335312
-SHA256 (maildrop-2.9.3.tar.bz2) = fceae3b85dd9caf4d769d76e5d1179c4065b7f3af88623008ad44f9e08299794
-SIZE (maildrop-2.9.3.tar.bz2) = 2079784
+TIMESTAMP = 1537255240
+SHA256 (maildrop-3.0.0.tar.bz2) = 48e91a4a101e276a131fbd3afb94e98401a0cece751961c6d9c2e422d661413c
+SIZE (maildrop-3.0.0.tar.bz2) = 2091018
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index e68c9077995d..69eb7e9d47fb 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Email-Send
-PORTVERSION=	2.199
-PORTREVISION=	1
+PORTVERSION=	2.201
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,14 +10,22 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Email::Send - Simply Sending Email
 
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+RUN_DEPENDS=	p5-Email-Abstract>=0:mail/p5-Email-Abstract \
 		p5-Email-Address>=1.800:mail/p5-Email-Address \
 		p5-Email-Simple>=1.92:mail/p5-Email-Simple \
-		p5-Return-Value>=1.28:devel/p5-Return-Value \
-		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
+		p5-Module-Pluggable>=2.97:devel/p5-Module-Pluggable \
+		p5-Return-Value>=0:devel/p5-Return-Value
+TEST_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/mail/p5-Email-Send/distinfo b/mail/p5-Email-Send/distinfo
index cdf2a715a910..0063875a5fbd 100644
--- a/mail/p5-Email-Send/distinfo
+++ b/mail/p5-Email-Send/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Email-Send-2.199.tar.gz) = 8b13ed3463a5113b3b805e9b0be4fdc2c4a16d19b99257e51752884fc08dc5c6
-SIZE (Email-Send-2.199.tar.gz) = 28756
+TIMESTAMP = 1536950583
+SHA256 (Email-Send-2.201.tar.gz) = 4bbec933558d7cc9b8152bad86dd313de277a21a89b4ea83d84e61587e95dbc6
+SIZE (Email-Send-2.201.tar.gz) = 30041
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index cd39c2500c6b..2cda29e54609 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKOV
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	perl@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl module implementing a modern mail folder management
 
 COMMON_DEPENDS=	\
diff --git a/mail/p5-Mail-Sender/Makefile b/mail/p5-Mail-Sender/Makefile
index 9121ade65648..e0a40582e28c 100644
--- a/mail/p5-Mail-Sender/Makefile
+++ b/mail/p5-Mail-Sender/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mail-Sender
-PORTVERSION=	0.8.23
+PORTVERSION=	0.903
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -10,9 +10,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for sending mails with attachments through an SMTP server
 
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 post-patch:
 .if defined(BATCH)
 	@${REINPLACE_CMD}  -e 's/res = <STDIN>;/res = "N";/' ${WRKSRC}/Config.PL
diff --git a/mail/p5-Mail-Sender/distinfo b/mail/p5-Mail-Sender/distinfo
index 78c1b20d9bdf..66d5172c82f4 100644
--- a/mail/p5-Mail-Sender/distinfo
+++ b/mail/p5-Mail-Sender/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Mail-Sender-0.8.23.tar.gz) = 32f0c3ac96957a6df5301727804bcefb42f2d78a24b7dcb15e526f77d22d30c2
-SIZE (Mail-Sender-0.8.23.tar.gz) = 38361
+TIMESTAMP = 1536950634
+SHA256 (Mail-Sender-0.903.tar.gz) = 4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf
+SIZE (Mail-Sender-0.903.tar.gz) = 60499
diff --git a/mail/p5-Mail-Sender/pkg-plist b/mail/p5-Mail-Sender/pkg-plist
index 03cc6c9cce55..12847265c760 100644
--- a/mail/p5-Mail-Sender/pkg-plist
+++ b/mail/p5-Mail-Sender/pkg-plist
@@ -2,3 +2,5 @@
 %%SITE_PERL%%/Mail/Sender/CType/Ext.pm
 %%SITE_PERL%%/Mail/Sender/CType/Win32.pm
 %%PERL5_MAN3%%/Mail::Sender.3.gz
+%%PERL5_MAN3%%/Mail::Sender::CType::Ext.3.gz
+%%PERL5_MAN3%%/Mail::Sender::CType::Win32.3.gz
diff --git a/mail/p5-Net-Server-Mail/Makefile b/mail/p5-Net-Server-Mail/Makefile
index 23b71a74f192..8e898452b2c0 100644
--- a/mail/p5-Net-Server-Mail/Makefile
+++ b/mail/p5-Net-Server-Mail/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Net-Server-Mail
-PORTVERSION=	0.18
-PORTREVISION=	1
+PORTVERSION=	0.26
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GUIMARD
@@ -12,6 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Implementation of SMTP, ESMTP, and LMTP protocols
 
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most
+
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/mail/p5-Net-Server-Mail/distinfo b/mail/p5-Net-Server-Mail/distinfo
index 6c2969796683..a57825df2359 100644
--- a/mail/p5-Net-Server-Mail/distinfo
+++ b/mail/p5-Net-Server-Mail/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Net-Server-Mail-0.18.tar.gz) = 089a4d07b86a32480ed36bfa2f40dd1e4ca81dbe5473d95237edf137b4badbea
-SIZE (Net-Server-Mail-0.18.tar.gz) = 16280
+TIMESTAMP = 1539042616
+SHA256 (Net-Server-Mail-0.26.tar.gz) = cf8b11f3482e0a648c049db5a93e8768b7b488a5bf0d34a806654e16696a3baf
+SIZE (Net-Server-Mail-0.26.tar.gz) = 31622
diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist
index 88b7d7a92c08..9da36d66ade2 100644
--- a/mail/p5-Net-Server-Mail/pkg-plist
+++ b/mail/p5-Net-Server-Mail/pkg-plist
@@ -3,12 +3,14 @@
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/Extension.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/PIPELINING.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/8BITMIME.pm
+%%SITE_PERL%%/Net/Server/Mail/ESMTP/STARTTLS.pm
 %%SITE_PERL%%/Net/Server/Mail/ESMTP/XFORWARD.pm
 %%SITE_PERL%%/Net/Server/Mail/LMTP.pm
 %%SITE_PERL%%/Net/Server/Mail/SMTP.pm
 %%PERL5_MAN3%%/Net::Server::Mail.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::ESMTP.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::ESMTP::Extension.3.gz
+%%PERL5_MAN3%%/Net::Server::Mail::ESMTP::STARTTLS.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::ESMTP::XFORWARD.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::LMTP.3.gz
 %%PERL5_MAN3%%/Net::Server::Mail::SMTP.3.gz
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 9d51df160803..b7735ae40ef4 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmailadmin
 PORTVERSION=	1.2.15
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	2
 CATEGORIES=	mail www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+=	--enable-spam-command="${SPAM_COMMAND}"
 .if ${PORT_OPTIONS:MCRACKLIB}
 EXTRA_PATCHES+=		${FILESDIR}/cracklib.patch
 BUILD_DEPENDS+=		${LOCALBASE}/include/crack.h:security/cracklib
-CONFIGURE_ARGS+=	--enable-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict
+CONFIGURE_ARGS+=	--enable-cracklib=${LOCALBASE}/libdata/cracklib/cracklib-words
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lcrack
 .endif
diff --git a/mail/qmailadmin/files/cracklib.patch b/mail/qmailadmin/files/cracklib.patch
index 81fe28a1fbe4..e9ebef107ebe 100644
--- a/mail/qmailadmin/files/cracklib.patch
+++ b/mail/qmailadmin/files/cracklib.patch
@@ -24,7 +24,7 @@
 +
 +if test "$cracklib" = "yes"
 +then
-+	cracklib="/usr/local/libdata/cracklib/pw_dict"
++	cracklib="/usr/local/libdata/cracklib/cracklib-words"
 +fi
 +
 +case $cracklib in
diff --git a/mail/roundcube-thunderbird_labels/Makefile b/mail/roundcube-thunderbird_labels/Makefile
index 080d7b59d6d0..dc06875cd84d 100644
--- a/mail/roundcube-thunderbird_labels/Makefile
+++ b/mail/roundcube-thunderbird_labels/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird_labels
-PORTVERSION=	1.1.4
+PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
@@ -42,6 +42,8 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PLUGINDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PLUGINDIR}
 	cd ${STAGEDIR}${PLUGINDIR} && \
-		${MV} config.inc.php config.inc.php.sample
+		${MV} config.inc.php config.inc.php.sample && \
+		${RM} coffee2js.sh docs/_config.yml && \
+		${RM} -r coffeescripts
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-thunderbird_labels/distinfo b/mail/roundcube-thunderbird_labels/distinfo
index ad4de3bd0f88..051f0f04ef12 100644
--- a/mail/roundcube-thunderbird_labels/distinfo
+++ b/mail/roundcube-thunderbird_labels/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525673693
-SHA256 (mike-kfed-roundcube-thunderbird_labels-v1.1.4_GH0.tar.gz) = 1e4bd87af37b4db97466340c1fe0353816365e0ca36a3bad42574295787c857d
-SIZE (mike-kfed-roundcube-thunderbird_labels-v1.1.4_GH0.tar.gz) = 184886
+TIMESTAMP = 1536993054
+SHA256 (mike-kfed-roundcube-thunderbird_labels-v1.3.0_GH0.tar.gz) = f2a1257c527a476a4c0fde9bf312c97924d267704a23a62a0b73f749b217a999
+SIZE (mike-kfed-roundcube-thunderbird_labels-v1.3.0_GH0.tar.gz) = 193503
diff --git a/mail/roundcube-thunderbird_labels/pkg-descr b/mail/roundcube-thunderbird_labels/pkg-descr
index 7e76c2ef2e50..640bd7e421ac 100644
--- a/mail/roundcube-thunderbird_labels/pkg-descr
+++ b/mail/roundcube-thunderbird_labels/pkg-descr
@@ -2,4 +2,4 @@ Thunderbird Labels plugin for RoundCube webmail.
 Displays the message rows using the same colors as Thunderbird does.
 Label of a message can be changed/set exactly like in Thunderbird.
 
-WWW: https://github.com/mike-kfed/rcmail-thunderbird-labels
+WWW: https://github.com/mike-kfed/roundcube-thunderbird_labels
diff --git a/mail/roundcube-thunderbird_labels/pkg-plist b/mail/roundcube-thunderbird_labels/pkg-plist
index 2a9b47825a10..66ceba882ca7 100644
--- a/mail/roundcube-thunderbird_labels/pkg-plist
+++ b/mail/roundcube-thunderbird_labels/pkg-plist
@@ -22,6 +22,8 @@
 %%PLUGINDIR_REL%%/localization/ru_RU.inc
 %%PLUGINDIR_REL%%/localization/sk_SK.inc
 %%PLUGINDIR_REL%%/localization/uk_UA.inc
+%%PLUGINDIR_REL%%/node_modules/roundcube/index.js
+%%PLUGINDIR_REL%%/node_modules/roundcube/package.json
 %%PLUGINDIR_REL%%/skins/classic/tb_label.css
 %%PLUGINDIR_REL%%/skins/classic/thunderbird_32.png
 %%PLUGINDIR_REL%%/skins/default/tb_label.css
@@ -30,4 +32,5 @@
 %%PLUGINDIR_REL%%/skins/larry/thunderbird_24.png
 %%PLUGINDIR_REL%%/skins/larry/thunderbird_32.png
 %%PLUGINDIR_REL%%/tb_label.js
+%%PLUGINDIR_REL%%/tb_label_contextmenu.js
 %%PLUGINDIR_REL%%/thunderbird_labels.php
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 1fd24e9ef374..0bea100b7a17 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqwebmail
-PORTVERSION=	5.9.3
+PORTVERSION=	6.0.0
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
@@ -71,7 +71,8 @@ CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 		${ICONV_CONFIGURE_ARG} \
 		--cache-file=${WRKDIR}/sqwebmail.cache \
 		--with-mailuser=${MAILOWN} \
-		--with-mailgroup=${MAILGRP}
+		--with-mailgroup=${MAILGRP} \
+		--with-notice=unicode
 
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
 		CGIBINSUBDIR=${CGIBINSUBDIR} \
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index f640eb4905be..6ff7baf69528 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535224670
-SHA256 (sqwebmail-5.9.3.tar.bz2) = 2cb9a61e5436d31174ecf5072fe6a7c3654dbb5dd4ec8621600e65a2459252de
-SIZE (sqwebmail-5.9.3.tar.bz2) = 3603260
+TIMESTAMP = 1537265399
+SHA256 (sqwebmail-6.0.0.tar.bz2) = 137745444cd9223ec8837db57324f3304086a511aed678da600d61d0d1b4cf7e
+SIZE (sqwebmail-6.0.0.tar.bz2) = 3613704