Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 19 Jan 2026 20:41:13 +0000
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 515830696a5f - 2026Q1 - mail/courier-imap: Fix inotify support on FreeBSD 15 and up
Message-ID:  <696e96e9.25ef7.1a296c95@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch 2026Q1 has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=515830696a5fbc8bf699f98758b1304f8fa8533f

commit 515830696a5fbc8bf699f98758b1304f8fa8533f
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2026-01-19 20:31:14 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2026-01-19 20:40:37 +0000

    mail/courier-imap: Fix inotify support on FreeBSD 15 and up
    
    FreeBSD 15 introduced a native inotify implementation in libc; avoid
    depending and linking libinotify on these relases, since it interferes
    with the libc implementation.
    
    MFH:            2026Q1
    (cherry picked from commit c6a80d646d95392f13da873351a68c79d1c2efec)
---
 mail/courier-imap/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 5d085458ae4d..e65fcacbdbfa 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	courier-imap
 PORTVERSION=	5.3.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -71,8 +72,6 @@ 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
@@ -96,6 +95,10 @@ CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
 .endif
 
+.if ${PORT_OPTIONS:MINOTIFY} && ${OSVERSION} < 1500500
+LIB_DEPENDS+=	libinotify.so:devel/libinotify
+.endif
+
 EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		libs/imap/ChangeLog \
 		libs/imap/README.proxy \
@@ -113,9 +116,11 @@ post-patch:
 		${WRKSRC}/Makefile.in
 
 post-patch-INOTIFY-on:
+.if ${OSVERSION} < 1500500
 	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& -L${LOCALBASE}/lib -linotify -lpthread|' \
 		${WRKSRC}/libs/maildir/Makefile.in \
 		${WRKSRC}/libs/imap/Makefile.in
+.endif
 
 post-configure-INOTIFY-on:
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696e96e9.25ef7.1a296c95>