Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177657435
D24924.1794963974.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D24924.1794963974.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
Details
Attached
Mime Type
text/plain
Expires
Wed, Nov 18, 1:06 AM (19 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41812005
Default Alt Text
D24924.1794963974.diff (1 KB)
Attached To
Mode
D24924: pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL
Attached
Detach File
Event Timeline