diffを取ってみると
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 28e0c3c1ce6d..237be9d6e1b6 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
@@ -9,14 +8,16 @@ MAN= mailwrapper.8
LIBADD= util
.endif
-.if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no"
+.if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no" || ${MK_DMAGENT} != "no"
SYMLINKS= ../sbin/mailwrapper /usr/bin/mailq \
../sbin/mailwrapper /usr/bin/newaliases \
mailwrapper /usr/sbin/hoststat \
mailwrapper /usr/sbin/purgestat \
mailwrapper /usr/sbin/sendmail
-.if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no"
+.if ${MK_MAILWRAPPER} == "no" && ${MK_DMAGENT} != "no"
+SYMLINKS+= ../libexec/dma ${BINDIR}/mailwrapper
+.elif ${MK_MAILWRAPPER} == "no" && ${MK_DMAGENT} == "no" && ${MK_SENDMAIL} != "no"
SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper
.endif
.endif
@@ -25,16 +26,24 @@ SYMLINKS+= ../libexec/sendmail/sendmail ${BINDIR}/mailwrapper
SYMLINKS+= ..${BINDIR}/mailwrapper /bin/rmail
.endif
+.if ${MK_SENDMAIL} != "no"
+FILES= ${SRCTOP}/etc/mail/mailer.conf
+FILESDIR= ${SHAREDIR}/examples/sendmail
+FILESPACKAGE= sendmail
+.endif
+
.if ${MK_MAILWRAPPER} != "no"
-# We install here if either sendmail(8) is enabled, or dma(8) isn't. In the
+# We install here if either dma(8) is enabled, or sendmail(8) isn't. In the
# latter scenario, we take care of the possibility that neither sendmail(8) nor
# dma(8) are installed and simply provide a default that can be changed for an
# alternative in ports.
-.if ${MK_SENDMAIL} != "no" || ${MK_DMAGENT} == "no"
+.if ${MK_DMAGENT} != "no" || ${MK_SENDMAIL} == "no"
+CONFS= ${SRCTOP}/libexec/dma/dmagent/mailer.conf
+.else
CONFS= ${SRCTOP}/etc/mail/mailer.conf
+.endif
CONFSDIR= /etc/mail
CONFSMODE= 644
.endif
-.endif
.include <bsd.prog.mk>
diff --git a/usr.sbin/mailwrapper/Makefile.depend b/usr.sbin/mailwrapper/Makefile.depend
index 991757ecadc0..678747db6f2c 100644
--- a/usr.sbin/mailwrapper/Makefile.depend
+++ b/usr.sbin/mailwrapper/Makefile.depend
@@ -1,8 +1,6 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 2da92494b662..8480c939904c 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -1,6 +1,5 @@
.\" $OpenBSD: mailwrapper.8,v 1.12 2014/03/27 22:34:42 jmc Exp $
.\" $NetBSD: mailwrapper.8,v 1.16 2014/09/19 16:05:55 wiz Exp $
-.\" $FreeBSD$
.\"
.\" Copyright (c) 1998
.\" Perry E. Metzger. All rights reserved.
diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c
index ef9c3b4d55c2..af732674a527 100644
--- a/usr.sbin/mailwrapper/mailwrapper.c
+++ b/usr.sbin/mailwrapper/mailwrapper.c
@@ -35,8 +35,6 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <err.h>
diff --git a/usr.sbin/mailwrapper/pathnames.h b/usr.sbin/mailwrapper/pathnames.h
index 5511d1eccff9..442503af8dd4 100644
--- a/usr.sbin/mailwrapper/pathnames.h
+++ b/usr.sbin/mailwrapper/pathnames.h
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -34,4 +33,4 @@
*/
#define _PATH_MAILERCONF "/etc/mail/mailer.conf"
-#define _PATH_DEFAULTMTA "/usr/libexec/sendmail/sendmail"
+#define _PATH_DEFAULTMTA "/usr/libexec/dma"
どうもデフォルト MTA が dma(1) に変更されたようだ．
/etc/mail/mailer.confを見ると
% cat /etc/mail/mailer.conf # $FreeBSD$ # # mailer.conf for use with dma(8) # # If sendmail is configured, an example of mailer.conf that uses sendmail # instead can be found in /usr/share/examples/sendmail. sendmail /usr/libexec/dma mailq /usr/libexec/dma newaliases /usr/libexec/dma %
で，「sendmail を使いたい人は /usr/share/examples/sendmail/mailer.conf を使え」と書いてあった．
最初に /etc/mailer.conf を見れば良かった ;-)
ということでsendmail用のmailer.confにして起動
root@smtp:/etc/mail # cp mailer.conf mailer.conf.org root@smtp:/etc/mail # cp /usr/share/examples/sendmail/mailer.conf . root@smtp:/etc/mail # service sendmail stop Stopping sendmail. Waiting for PIDS: 72158. Stopping sendmail_msp_queue. Waiting for PIDS: 72162. root@smtp:/etc/mail # ps -ax | grep sendmail 72504 8 S+J 0:00.00 grep sendmail root@smtp:/etc/mail # service sendmail start Starting sendmail. Starting sendmail_msp_queue. root@smtp:/etc/mail # ps -ax | grep sendmail 72512 - SsJ 0:00.01 sendmail: accepting connections (sendmail) 72516 - SsJ 0:00.00 sendmail: Queue runner@00:30:00 for /var/spool/clientmqueue (sendmail) 72519 8 S+J 0:00.00 grep sendmail root@smtp:/etc/mail #
無事 sendmail が立ち上がってメデタシメデタシ :-)