git: 726505d2f930 - main - mail/nmh*: Change default mail transport method

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 07 Feb 2022 04:56:09 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=726505d2f93013424c5b852471ac9a3c046b48e3

commit 726505d2f93013424c5b852471ac9a3c046b48e3
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-02-07 00:46:15 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-02-07 04:55:24 +0000

    mail/nmh*: Change default mail transport method
    
    nmh supports three mail transport methods: smtp, which submits email to
    the submission port (587), sendmail/smtp, submitting SMTP to the MTA
    through a pipe, and sendmail/pipe, submitting raw email to the MTA where
    the MTA extracts the from and to headers from the email itself, using
    sendmail -t.
    
    The reason for this change is to support the upcoming 14-CURRENT
    switchover from sendmail to dma (DragonflyBSD Mail Agent). The dma agent
    only supports SMTP over port 25 and works well using sendmail -t while
    all other transport methods do not work.
    
    This change only affects new installs of nmh and nmh-devel.  Users of
    existing nmh installations who wish to use the new dma agent will need
    to alter ${LOCALBASE}/etc/nmh/mts.conf by hand by changing the mts
    statement to mts: sendmail/pipe. The existing file is not altered when
    pkg upgrade is invoked. However users of sendmail in base, sendmail
    port, postfix, exim, and qmail are not affected by this and may use
    their existing mts.conf.
    
    The dma agent is not currently installed by default but users may install
    it by enabling MK_DMAGENT in src.conf and building/installing 14-CURRENT
    world. This patch allows nmh to work with dma agent when it is installed
    and made to be the default MTA in /etc/mail/mailer.conf.
---
 mail/nmh-devel/Makefile | 4 ++--
 mail/nmh/Makefile       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail/nmh-devel/Makefile b/mail/nmh-devel/Makefile
index f73e23615a4a..1e9f9ab1b093 100644
--- a/mail/nmh-devel/Makefile
+++ b/mail/nmh-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nmh
 PORTVERSION=	${NMH_COMMIT_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -83,7 +83,7 @@ W3M_DESC=	Install dependencies for www/w3m
 W3M_BUILD_DEPENDS=	w3m>=0:www/w3m
 W3M_RUN_DEPENDS=	w3m>=0:www/w3m
 
-OPTIONS_DEFAULT=	SMTP FLOCK W3M
+OPTIONS_DEFAULT=	SENDMAIL_PIPE FLOCK W3M
 
 .include <bsd.port.options.mk>
 
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index a08fe7d75585..6b4b79b075a1 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nmh
 PORTVERSION=	1.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SAVANNAH
 
@@ -77,7 +77,7 @@ W3M_DESC=	Install dependencies for www/w3m
 W3M_BUILD_DEPENDS=	w3m>=0:www/w3m
 W3M_RUN_DEPENDS=	w3m>=0:www/w3m
 
-OPTIONS_DEFAULT=	SMTP FLOCK W3M
+OPTIONS_DEFAULT=	SENDMAIL_PIPE FLOCK W3M
 
 .include <bsd.port.options.mk>