summaryrefslogtreecommitdiff
path: root/etc/Makefile
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-06-02 02:38:54 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-06-02 02:38:54 +0000
commitcb99e93575e8f5df7345a0bdb7104ff46fdeec5c (patch)
tree3c24cad17aeac5bfa7bc3ad4b5fa227bba46ba88 /etc/Makefile
parentef1eabca5d6b0b998490d328b2e99f8f19a7569d (diff)
downloadsrc-test-cb99e93575e8f5df7345a0bdb7104ff46fdeec5c.tar.gz
src-test-cb99e93575e8f5df7345a0bdb7104ff46fdeec5c.zip
pkgbase: resolve mailer.conf conflict WITHOUT_SENDMAIL
When WITHOUT_SENDMAIL is set, we end up with two different mailer.conf that conflict, and hilarity ensues. There's currently three different places that we might install mailer.conf: - ^/etc/Makefile (package=runtime, contingent on MK_MAIL != no) - ^/libexec/dma/dmagent/Makefile (package=dma, contingent on MK_SENDMAIL != no) - ^/usr.sbin/mailwrapper/Makefile (package=utilities, contingent on not-installed) The mailwrapper installation will effectively never happen because the ^/etc one will first. This patch simplifies the whole situation; remove the ^/etc/Makefile version and install it primarily in mailwrapper if MK_MAILWRAPPER != "no". The scenarios covered in mailwrapper are: - sendmail(8) is installed, dma(8) may or may not be installed - neither sendmail(8) nor dma(8) is installed In the first scenario, sendmail(8) is dominant so we can go ahead and install the version in ^/etc/mail. In the unlisted scenario, sendmail(8) is not installed but dma(8) is, we'll let ^/libexec/dma/dmagent do the installation. In the second listed scenario, we still want to install an example mailer.conf so just install the base sendmail(8) version. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D24924
Notes
Notes: svn path=/head/; revision=361720
Diffstat (limited to 'etc/Makefile')
-rw-r--r--etc/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 78a60b6fcb306..8ca259b10a17c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -17,11 +17,10 @@ SUBDIR+=sendmail
# 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