Index: head/mail/courier-imap/Makefile
===================================================================
--- head/mail/courier-imap/Makefile	(revision 568976)
+++ head/mail/courier-imap/Makefile	(revision 568977)
@@ -1,132 +1,138 @@
 # Created by: Neil Blakey-Milner
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	5.0.14
-PORTREVISION=	1
+PORTVERSION=	5.1.1
 PORTEPOCH=	2
 CATEGORIES=	mail
 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
 
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
 		libcourierauth.so:security/courier-authlib-base \
 		libidn.so:dns/libidn
 
 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}
 ALL_TARGET=	all makeimapaccess makedat
 
 SUB_FILES=	pkg-message
 SUB_LIST=	CONFDIR=${CONFDIR}
 
 #
 # options available:
 #
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
-OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6 GNUTLS
-FAM_DESC=	Fam support for IDLE command
-TRASHQUOTA_DESC=	Include deleted mails in the quota
+OPTIONS_DEFINE= GDBM GNUTLS INOTIFY TRASHQUOTA IPV6
+
 GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
-FAM_USES=	fam
+INOTIFY_DESC=	Inotify support for IDLE command
+TRASHQUOTA_DESC=	Include deleted mails in the quota
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
 .endif
 
 CONFDIR?=	${PREFIX}/etc/${PORTNAME}
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--localstatedir="${PREFIX}/var" \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--enable-workarounds-for-imap-client-bugs \
 		--enable-unicode \
 		--disable-root-check \
 		--with-locking-method=fcntl \
 		--with-notice=unicode
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_USES=		pkgconfig
 
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
+
 IPV6_CONFIGURE_OFF=	--without-ipv6
 
 TRASHQUOTA_CONFIGURE_ON=--with-trashquota
 
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG_FACILITY}
 CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
 .endif
 
 EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		libs/imap/ChangeLog \
 		libs/imap/README \
 		libs/imap/README.proxy \
 		libs/maildir/README.imapkeywords.html \
 		libs/maildir/README.maildirfilter.html \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt \
 		libs/tcpd/README.couriertls \
 
-post-patch-FAM-off:
-	@${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \
-		${WRKSRC}/libs/maildir/configure
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/libs/liblock/configure
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \
 		${WRKSRC}/libs/imap/pop3d-ssl.dist.in \
 		${WRKSRC}/libs/imap/imapd-ssl.dist.in
+
+post-patch-INOTIFY-on:
+	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& ${LOCALBASE}/lib/libinotify.a /usr/lib/libpthread.a|' \
+		${WRKSRC}/libs/maildir/Makefile.in \
+		${WRKSRC}/libs/imap/Makefile.in
+
+post-configure-INOTIFY-on:
+	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
+	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/mail/courier-imap/distinfo
===================================================================
--- head/mail/courier-imap/distinfo	(revision 568976)
+++ head/mail/courier-imap/distinfo	(revision 568977)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614676769
-SHA256 (courier-imap-5.0.14.tar.bz2) = 671a6a64c2d46e515097979b4488b8284d0260eabdff56ff81ef66cf1f6169c3
-SIZE (courier-imap-5.0.14.tar.bz2) = 3359363
+TIMESTAMP = 1616283048
+SHA256 (courier-imap-5.1.1.tar.bz2) = 758503c34edc9cb0796503fd2cfd343aecc090c953819af3b7691364baa72d91
+SIZE (courier-imap-5.1.1.tar.bz2) = 3361333
Index: head/mail/courier-imap/files/patch-libs_maildir_configure
===================================================================
--- head/mail/courier-imap/files/patch-libs_maildir_configure	(nonexistent)
+++ head/mail/courier-imap/files/patch-libs_maildir_configure	(revision 568977)
@@ -0,0 +1,22 @@
+--- libs/maildir/configure.orig	2021-03-14 17:58:25 UTC
++++ libs/maildir/configure
+@@ -17924,19 +17924,6 @@ fi
+ done
+ 
+ 
+-for ac_func in inotify_init inotify_init1
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname prototype" >&5
+ $as_echo_n "checking for missing gethostname prototype... " >&6; }
+ if ${maildir_cv_SYS_GETHOSTNAME+:} false; then :

Property changes on: head/mail/courier-imap/files/patch-libs_maildir_configure
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property