Thanks to Ruslan's src/etc/sendmail/Makefile patch, it is now safe

(though probably not a good idea in general) to set the various
SENDMAIL_*_MC variables to /etc/mail/sendmail.mc or /etc/mail/submit.mc.

MFC after:	5 days

2 files changed, 0 insertions, 30 deletions

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 8a26d2b..f4805ed 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -248,9 +248,6 @@
 # install time.  Use with caution as a make install will overwrite
 # any existing /etc/mail/sendmail.cf.  Note that SENDMAIL_CF is now
 # deprecated.  The value should be a fully qualified path name.
-# Avoid using a value of /etc/mail/sendmail.mc as a buildworld will
-# create /etc/mail/sendmail.cf before installworld installs an
-# updated sendmail binary.
 #
 #SENDMAIL_MC=/etc/mail/myconfig.mc
 #
@@ -258,17 +255,11 @@
 # submission to use at install time.  Use with caution as a make
 # install will overwrite any existing /etc/mail/submit.cf.  The
 # value should be a fully qualified path name.
-# Avoid using a value of /etc/mail/submit.mc as a buildworld will
-# create /etc/mail/submit.cf before installworld installs an
-# updated sendmail binary.
 #
 #SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
 #
 # If you need to build additional .cf files during a make buildworld,
 # include the full paths to the .mc files in SENDMAIL_ADDITIONAL_MC.
-# Avoid using a value of /etc/mail/sendmail.mc as a buildworld will
-# create /etc/mail/sendmail.cf before installworld installs an
-# updated sendmail binary.
 #
 #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc
 #
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 7a01efa..ebac979 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -572,13 +572,6 @@ Use with caution as a make install will overwrite any existing
 Note that
 .Va SENDMAIL_CF
 is now deprecated.
-Avoid using a value of
-.Pa /etc/mail/sendmail.mc ,
-as a buildworld will create
-.Pa /etc/mail/sendmail.cf
-before installworld installs an updated
-.Xr sendmail 8
-binary.
 .It Va SENDMAIL_SUBMIT_MC
 .Pq Vt str
 The default m4 configuration file for mail submission
@@ -589,13 +582,6 @@ file, e.g.,
 .Pa /etc/mail/mysubmit.mc .
 Use with caution as a make install will overwrite any existing
 .Pa /etc/mail/submit.cf .
-Avoid using a value of
-.Pa /etc/mail/submit.mc ,
-as a buildworld will create
-.Pa /etc/mail/submit.cf
-before installworld installs an updated
-.Xr sendmail 8
-binary.
 .It Va SENDMAIL_ADDITIONAL_MC
 .Pq Vt str
 Additional
@@ -608,13 +594,6 @@ The value should include the full path to the
 file(s), e.g.,
 .Pa /etc/mail/foo.mc
 .Pa /etc/mail/bar.mc .
-Avoid using a value of
-.Pa /etc/mail/sendmail.mc ,
-as a buildworld will create
-.Pa /etc/mail/sendmail.cf
-before installworld installs an updated
-.Xr sendmail 8
-binary.
 .It Va SENDMAIL_M4_FLAGS
 .Pq Vt str
 Flags passed to m4 when building a