From nobody Mon Mar 9 18:59:13 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV5sF3SrRz6TkkG for ; Mon, 09 Mar 2026 18:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV5sF2szHz3mw4 for ; Mon, 09 Mar 2026 18:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773082753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJ/okyKMMyQNORe4mlCx4Bql8xGhb/SV4DjDIWZ4wS0=; b=xUNyXNg2/OBGsYXaH2KQYtLsFBQnOFTpUD0TeOfrfgPXpcJ5rlQQ4YqXDxszzMmbU6Az6U McpKjxuqHXMOCw237vlIk6S5ZFiJnwCZhp4U2V7rNfJP05CvQSAsab8+mbt8R4rBwEhagB AUQOhACInTSsEaML5ROO88OXYaL7IaQ7gLSdLPx37Kjei3U3pQ8zhLrAEelkaNbwL5TcFR bn5bsgUxLr5rULxdWLtOlQCrGyWKf4fhu2U0+aHZczvcKL7ReOC5p7ybJsHbGqX9sqd+6E PxZ27nEl6Mqyuf1FKpWFwJUj256gi/PuwRcJcAlXQGlby9PuvlkmuAi+z4VA1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773082753; a=rsa-sha256; cv=none; b=d/AlbaRkO+/WjoVNbhcmVdko7HLGnfnVDC/TpNoUIBS/XDdbHWhnY2/SzngbFjdjBlm9s0 2K2+1DGs7kFJRGn3VonWfJLDIJc1fagNI1mJKuz4ASlXxvK9gIi4HxaM26z5y4qRKKY2Ze skY/rit/56KWSOq8hLUXwPEBq8tPhAIleSRF/2lIoM7dfJpbLGlNuioyLSTHIS46zvO+bI na7M6WPPXD5ikj8/2HSOdo9fned4YwQ9alHHXtQbBH1K427A4TAG0yGpRaE3MtTi7NxTxp mzVkAvm2EZNN1zdbRnAodf8EvsZHIrPfFmJWzmcEPq29Xyy1492xdlHmHRKQiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773082753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sJ/okyKMMyQNORe4mlCx4Bql8xGhb/SV4DjDIWZ4wS0=; b=cIoXQN1JUf/M7DddMmEY8iG0ryD4gtCl66pGkgK6b7MtJqTWvUNsdkBfDbPqA4HtTLYUsY 1zOJsBEHJG6+mEZDE9e9cR2h1yotNFMNdxdyBZI9KE/Eaf/phRtz6lKfMkjvPupwCuZwbc G7Un8eGkOcxcz6H4GuUuoWwYUr/Rcf8AqPLEyppCI8NZHZk1qcdwJ8yNB50wxC0hoT66qu d0+LXb5j1kILNDfu3BgSkhrmjJlk0X09vhkg2Mik0xFQD1BK0/yjM4ToAUYycZFkipeC78 t/4wrFy2yru7htIAaN7k3j532U6oKzqNyVzATe4Cu0tIC2QlDQyPudl9SuWmKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV5sF2Qnfzf6q for ; Mon, 09 Mar 2026 18:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21fdd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 18:59:13 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: a433ad5adcb8 - main - mail/courier-imap: Clean up a and modernize Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a433ad5adcb83367d4065d7a9a816195fcb72cfb Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 18:59:13 +0000 Message-Id: <69af1881.21fdd.3170f52b@gitrepo.freebsd.org> The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a433ad5adcb83367d4065d7a9a816195fcb72cfb commit a433ad5adcb83367d4065d7a9a816195fcb72cfb Author: Guido Falsi AuthorDate: 2026-03-09 18:58:01 +0000 Commit: Guido Falsi CommitDate: 2026-03-09 18:58:01 +0000 mail/courier-imap: Clean up a and modernize Makefile - Use bsd.port.options.mk instead of pre/post mk - Apply portlint and portclippy suggestions PR: 293399 --- mail/courier-imap/Makefile | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 2af2f0f36421..477e618265d8 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -12,39 +12,45 @@ WWW= https://www.courier-mta.org/imap/ 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 \ libidn2.so:dns/libidn2 \ libpcre2-8.so:devel/pcre2 +RUN_DEPENDS= ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool 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 imap-uw panda-imap - GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +CONFIGURE_ARGS= --datadir=${DATADIR} \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --libexecdir=${LIBEXECDIR} \ + --localstatedir="${PREFIX}/var" \ + --sysconfdir=${CONFDIR} \ + --with-locking-method=fcntl \ + --with-notice=unicode CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat +CONFLICTS= courier imap-uw panda-imap + SUB_FILES= pkg-message SUB_LIST= CONFDIR=${CONFDIR} -# -# options available: -# -# WITH_SYSLOG_FACILITY: The syslogfacility to use -# +PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ + LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} OPTIONS_DEFINE= GDBM GNUTLS INOTIFY IPV6 TRASHQUOTA -GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) -INOTIFY_DESC= Inotify support for IDLE command +GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) +INOTIFY_DESC= Inotify support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) @@ -54,44 +60,47 @@ TRASHQUOTA_DESC= Include deleted mails in the quota 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_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls -GNUTLS_USES= pkgconfig IPV6_CONFIGURE_OFF= --without-ipv6 -TRASHQUOTA_CONFIGURE_ON=--with-trashquota +TRASHQUOTA_CONFIGURE_ON= --with-trashquota + +EXTRA_DOCS= AUTHORS INSTALL NEWS \ + libs/imap/ChangeLog \ + 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 -.include +.include .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} +# +# Variable avilable for further customization: +# +# WITH_SYSLOG_FACILITY: The syslogfacility to use +# +.ifdef WITH_SYSLOG_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 +CONFIGURE_ARGS+= --with-db=gdbm \ + --with-userdb=${USERDB} +LIB_DEPENDS+= libgdbm.so:databases/gdbm .else -CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} +CONFIGURE_ARGS+= --with-db=db \ + --with-userdb=${USERDB} .endif .endif @@ -99,15 +108,6 @@ CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} LIB_DEPENDS+= libinotify.so:devel/libinotify .endif -EXTRA_DOCS= AUTHORS INSTALL NEWS \ - libs/imap/ChangeLog \ - 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: @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ ${WRKSRC}/libs/liblock/configure @@ -137,4 +137,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include