Date: Sat, 24 Jan 2026 04:40:04 +0000 From: Siva Mahadevan <siva@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 61d57c2657e1 - main - mail/msmtp: remove ca_root_nss dep Message-ID: <69744d24.3bca6.654257f4@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/ports/commit/?id=61d57c2657e1178dd763c8dd63503a9338525f47 commit 61d57c2657e1178dd763c8dd63503a9338525f47 Author: Siva Mahadevan <siva@FreeBSD.org> AuthorDate: 2025-06-14 18:50:20 +0000 Commit: Siva Mahadevan <siva@FreeBSD.org> CommitDate: 2026-01-24 04:07:01 +0000 mail/msmtp: remove ca_root_nss dep msmtp 1.8.2[0] onwards selects the system trust store by default when TLS is enabled, so ca_root_nss is no longer necessary. Other minor changes: * PORTVERSION -> DISTVERSION * enable test suite * simplify Makefile style [0] https://marlam.de/msmtp/news/msmtp-1-8-2/ Reviewed by: novel Approved by: lwhsu (mentor) Signed-off-by: Siva Mahadevan <siva@FreeBSD.org> Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54720 --- mail/msmtp/Makefile | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index f88ef950d2eb..317bd8e7e221 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -1,5 +1,6 @@ PORTNAME= msmtp -PORTVERSION= 1.8.32 +DISTVERSION= 1.8.32 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://marlam.de/msmtp/releases/ @@ -13,11 +14,12 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -USES= cpe gmake makeinfo pkgconfig tar:xz +USES= cpe gmake makeinfo pkgconfig shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO= msmtp CPE_VENDOR= marlam +SHEBANG_FILES= tests/*.sh OPTIONS_DEFINE= DOCS GSASL NLS IDN LIBSECRET MSMTPD MSMTPQ OPTIONS_RADIO= TLS @@ -42,32 +44,26 @@ MSMTPQ_RUN_DEPENDS= bash:shells/bash NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -GNUTLS_CONFIGURE_ON= --with-tls=gnutls +GNUTLS_CONFIGURE_WITH= tls=gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl -OPENSSL_CONFIGURE_ON= --with-tls=openssl +OPENSSL_CONFIGURE_WITH= tls=openssl OPENSSL_CONFIGURE_ENV= libssl_CFLAGS="-I${OPENSSLINC}" \ libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" -CERTSFILE= ${LOCALBASE}/share/certs/ca-root-nss.crt + +TEST_DEPENDS= bash:shells/bash +TEST_TARGET= check .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} -RUN_DEPENDS+= ${CERTSFILE}:security/ca_root_nss -.else +.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+= --with-tls=no .endif -post-extract: - @${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${CERTSFILE}|' \ - ${WRKSRC}/doc/msmtp.1 - -.if ${PORT_OPTIONS:MMSMTPQ} -post-install: +post-install-MSMTPQ-on: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69744d24.3bca6.654257f4>