Date: Mon, 09 Mar 2026 18:59:13 +0000 From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a433ad5adcb8 - main - mail/courier-imap: Clean up a and modernize Makefile Message-ID: <69af1881.21fdd.3170f52b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=a433ad5adcb83367d4065d7a9a816195fcb72cfb commit a433ad5adcb83367d4065d7a9a816195fcb72cfb Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2026-03-09 18:58:01 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> 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 <bsd.port.pre.mk> +.include <bsd.port.options.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} +# +# 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 <bsd.port.post.mk> +.include <bsd.port.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69af1881.21fdd.3170f52b>