git: 8539518055d0 - main - Remove manpages from OLD_FILES

[Fernando Apesteguía]

The branch main has been updated by fernape (doc, ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=8539518055d01ad786ac925a22452c98017c75fd

commit 8539518055d01ad786ac925a22452c98017c75fd
Author:     Fernando Apesteguía <fernape at FreeBSD.org>
AuthorDate: 2021-07-21 09:21:14 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-07-22 06:09:45 +0000

    Remove manpages from OLD_FILES
    
    Remove apm.8 and apmconf.8 from OLD_FILES in the relevant Makefiles.
    
    These pages are now installed unconditionally as per 0a0f7486413c
    
    PR:     257228
    Reported by:    yasu at utahime.org, wosch@
    Approved by:    imp@, wosch@
    Fixes:  0a0f7486413c - Build manpages for all architectures
    MFH:    4 weeks
    Differential Revision:  https://reviews.freebsd.org/D31256
---
 ObsoleteFiles.inc                        | 2 --
 tools/build/mk/OptionalObsoleteFiles.inc | 2 --
 2 files changed, 4 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index d72aea5e8efc..d23562072214 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14838,8 +14838,6 @@ OLD_FILES+=usr/share/man/man5/utf2.5.gz
 OLD_FILES+=usr/share/man/man7/groff_mwww.7.gz
 OLD_FILES+=usr/share/man/man7/mmroff.7.gz
 OLD_FILES+=usr/share/man/man7/mwww.7.gz
-OLD_FILES+=usr/share/man/man8/apm.8.gz
-OLD_FILES+=usr/share/man/man8/apmconf.8.gz
 OLD_FILES+=usr/share/man/man8/dm.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ftp.8.gz
 OLD_FILES+=usr/share/man/man8/pam_wheel.8.gz
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 89e09dac2255..f1febd18dd4c 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -64,8 +64,6 @@ OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
-OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
-OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 .endif
 
 .if ${MK_AT} == no