git: 0ddc223c6d52 - main - OptionalObsoleteFiles.inc: add some now-optional rc.d scripts

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=0ddc223c6d526d19c338ed2af0820a998cbcb93e

commit 0ddc223c6d526d19c338ed2af0820a998cbcb93e
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-06-04 05:45:10 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-06-04 05:45:10 +0000

    OptionalObsoleteFiles.inc: add some now-optional rc.d scripts
    
    After f91d251b399a, some rc.d scripts are gated behind the src.conf knob
    for the services they start.  Add them to OptionalObsoleteFiles.inc so
    they are properly removed when the knob is disabled.
    
    Fixes: f91d251b399a ("rc.d: move some rc scripts to their packages")
    Reviewed by:    kevans, jhb
    Approved by:    kevans (mentor)
    Differential Revision:  https://reviews.freebsd.org/D50560
---
 tools/build/mk/OptionalObsoleteFiles.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 5c598306e152..91f7154d892f 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2662,6 +2662,7 @@ OLD_FILES+=usr/share/man/man8/ippool.8.gz
 
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/rc.d/ipfw
+OLD_FILES+=etc/rc.d/natd
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
 OLD_FILES+=sbin/ipfw
@@ -5575,6 +5576,7 @@ OLD_FILES+=usr/share/man/man1/genl.1.gz
 .endif
 
 .if ${MK_NIS} == no
+OLD_FILES+=etc/rc.d/nisdomain
 OLD_FILES+=etc/rc.d/ypbind
 OLD_FILES+=etc/rc.d/ypldap
 OLD_FILES+=etc/rc.d/yppasswdd
@@ -6654,6 +6656,9 @@ OLD_FILES+=etc/newsyslog.conf.d/pf.conf
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
+OLD_FILES+=etc/rc.d/pf
+OLD_FILES+=etc/rc.d/pflog
+OLD_FILES+=etc/rc.d/pfsync
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/include/netpfil/pf/pf.h
@@ -6843,6 +6848,7 @@ OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz
 .if ${MK_PPP} == no
 OLD_FILES+=etc/newsyslog.conf.d/ppp.conf
 OLD_FILES+=etc/ppp/ppp.conf
+OLD_FILES+=etc/rc.d/ppp
 OLD_FILES+=etc/syslog.d/ppp.conf
 OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
@@ -8997,6 +9003,9 @@ OLD_FILES+=etc/rc.d/zfs
 OLD_FILES+=etc/rc.d/zfsbe
 OLD_FILES+=etc/rc.d/zfsd
 OLD_FILES+=etc/rc.d/zfskeys
+OLD_FILES+=etc/rc.d/zpool
+OLD_FILES+=etc/rc.d/zpoolreguid
+OLD_FILES+=etc/rc.d/zpoolupgrade
 OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs