aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDmitry Chagin <dchagin@FreeBSD.org>2022-07-21 22:20:25 +0000
committerDmitry Chagin <dchagin@FreeBSD.org>2022-10-04 15:48:27 +0000
commit6d2cfa2d34e3ade155f65066f25716dc734ac302 (patch)
treee77253932a9a6c327e6c3cd3195891e80af045c1 /tools
parenta03b09579cdb8989a6caa058e0b1b90b4f943bcc (diff)
check/delete-old: Fix /bin/rmail removal condition
When WITHOUT_SENDMAIL is enabled and WITHOUT_MAILWRAPPER is disabled we install /bin/rmail as a link to the /usr/sbin/mailwrapper. Ensure make delete-old does not unlink /bin/rmail in that case. PR: 266604 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D35874 MFC after: 2 weeks (cherry picked from commit 55736146389f997fe3e2453f1d48d96ff1ad5b7a)
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 697c7570b9a1..7000eff5ed87 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7681,7 +7681,9 @@ OLD_FILES+=etc/periodic/daily/440.status-mailq
OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
OLD_FILES+=etc/periodic/daily/500.queuerun
OLD_FILES+=etc/rc.d/sendmail
+.if ${MK_MAILWRAPPER} == no
OLD_FILES+=bin/rmail
+.endif
OLD_FILES+=usr/bin/vacation
OLD_FILES+=usr/include/libmilter/mfapi.h
OLD_FILES+=usr/include/libmilter/mfdef.h