From ba1e45b300838576798192c69552c56c4545ff9d Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Mon, 22 Mar 2021 17:23:29 +0000
Subject: - Update courier-imap to 5.1.1 - Remove FAM option due tro upstream
 dropping support - Add new INOTIFY option (off by default) to enable using
 new inotify API provided by upstreeam, adds an optional dependency on
 devel/libinotify - While here sort options list and helpers

---
 mail/courier-imap/Makefile                         | 26 +++++++++++++---------
 mail/courier-imap/distinfo                         |  6 ++---
 .../files/patch-libs_maildir_configure             | 22 ++++++++++++++++++
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 mail/courier-imap/files/patch-libs_maildir_configure

(limited to 'mail')

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 8f466756ee11..052c800ee871 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	5.0.14
-PORTREVISION=	1
+PORTVERSION=	5.1.1
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -41,11 +40,11 @@ SUB_LIST=	CONFDIR=${CONFDIR}
 # 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"
@@ -72,6 +71,8 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_USES=		pkgconfig
 
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
+
 IPV6_CONFIGURE_OFF=	--without-ipv6
 
 TRASHQUOTA_CONFIGURE_ON=--with-trashquota
@@ -105,10 +106,6 @@ EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		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
@@ -118,6 +115,15 @@ post-patch:
 		${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/
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index a8a42a369fd5..ad745e711112 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -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
diff --git a/mail/courier-imap/files/patch-libs_maildir_configure b/mail/courier-imap/files/patch-libs_maildir_configure
new file mode 100644
index 000000000000..f9e076a9e356
--- /dev/null
+++ b/mail/courier-imap/files/patch-libs_maildir_configure
@@ -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 :
-- 
cgit v1.2.3