8 files changed, 38 insertions, 32 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/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/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