svn commit: r343109 - head/tools/build/mk

[Oleksandr Tymoshenko]

Author: gonzo
Date: Thu Jan 17 06:22:14 2019
New Revision: 343109
URL: https://svnweb.freebsd.org/changeset/base/343109

Log:
  Add optional obsolete files for the installworld without sendmail
  
  Add two more entries for WITHOUT_SENDMAIL install. The /var/spool/clientmqueue
  entry would be deleted only if there are no files/dirs in it, so the
  content generated during previous lifecycle of the system is safe
  
  PR:		228484
  Submitted by:	Dmitry Wagin <dmitry.wagin at ya.ru>
  MFC after:	1 week

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jan 17 05:15:25 2019	(r343108)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Jan 17 06:22:14 2019	(r343109)
@@ -7354,6 +7354,7 @@ OLD_FILES+=usr/share/man/man8/rtquery.8.gz
 .endif
 
 .if ${MK_SENDMAIL} == no
+OLD_FILES+=etc/mtree/BSD.sendmail.dist
 OLD_FILES+=etc/newsyslog.conf.d/sendmail.conf
 OLD_FILES+=etc/periodic/daily/150.clean-hoststat
 OLD_FILES+=etc/periodic/daily/440.status-mailq
@@ -7592,6 +7593,7 @@ OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbva
 OLD_DIRS+=usr/share/sendmail/cf/siteconfig
 OLD_DIRS+=usr/share/sendmail/cf
 OLD_DIRS+=usr/share/sendmail
+OLD_DIRS+=var/spool/clientmqueue
 .endif
 
 .if ${MK_SERVICESDB} == no