Page MenuHomeFreeBSD
Files F169811034

D24924.id.diff
No OneTemporary
Actions

D24924.id.diff
View Options

Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -17,11 +17,10 @@
# NB: keep these sorted by MK_* knobs
-.if ${MK_SENDMAIL} == "no"
-ETCMAIL=mailer.conf aliases
-.else
-ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
- mailertable.sample aliases
+ETCMAIL=aliases
+.if ${MK_SENDMAIL} != "no"
+ETCMAIL+=Makefile README access.sample virtusertable.sample \
+ mailertable.sample
.endif
# Special top level files for FreeBSD
Index: head/etc/mail/mailer.conf
===================================================================
--- head/etc/mail/mailer.conf
+++ head/etc/mail/mailer.conf
@@ -2,6 +2,9 @@
#
# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
#
+# If dma(8) is installed, an example mailer.conf that uses dma(8) instead can
+# can be found in /usr/share/examples/dma.
+#
sendmail /usr/libexec/sendmail/sendmail
mailq /usr/libexec/sendmail/sendmail
newaliases /usr/libexec/sendmail/sendmail
Index: head/usr.sbin/mailwrapper/Makefile
===================================================================
--- head/usr.sbin/mailwrapper/Makefile
+++ head/usr.sbin/mailwrapper/Makefile
@@ -26,7 +26,11 @@
.endif
.if ${MK_MAILWRAPPER} != "no"
-.if !exists(${DESTDIR}/etc/mail/mailer.conf)
+# We install here if either sendmail(8) is enabled, or dma(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"
FILES= ${SRCTOP}/etc/mail/mailer.conf
FILESDIR= /etc/mail
FILESMODE= 644

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 3, 3:34 PM (7 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37768777
Default Alt Text
D24924.id.diff (1 KB)

Event Timeline