From 8539518055d01ad786ac925a22452c98017c75fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= Date: Wed, 21 Jul 2021 11:21:14 +0200 Subject: [PATCH] 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@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 d72aea5e8ef..d2356207221 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 89e09dac225..f1febd18dd4 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