git: f6043a672135 - main - ObsoleteFiles.inc: Remove manpages from OLD_FILES

[Fernando Apesteguía]

On Mon, Jul 19, 2021 at 3:37 PM Wolfram Schneider <wosch at freebsd.org> wrote:
>
> How about apm.8.gz and apmconf.8.gz?
>
> $ git grep -E '(apm|apmconf|nvram|apmd|sconfig)\.8' | grep OLD_FILES
> ObsoleteFiles.inc:OLD_FILES+=usr/share/man/man8/apm.8.gz
> ObsoleteFiles.inc:OLD_FILES+=usr/share/man/man8/apmconf.8.gz
> tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
> tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
>

Is it needed?
Those files were not affected by the original commit and are, at this
point, installed only for amd64, arm64 and i386.
apmd.8.gz and sconfig.8.gz were affected though in 0a0f7486413c and
they needed to be removed from OLD_FILES.

Cheers.

> -Wolfram
>
>
> On Wed, 7 Jul 2021 at 22:12, Fernando Apesteguía <fernape at freebsd.org> wrote:
> >
> > The branch main has been updated by fernape (doc, ports committer):
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=f6043a672135da8ec090d8878cc844b8aace54f9
> >
> > commit f6043a672135da8ec090d8878cc844b8aace54f9
> > Author:     Fernando Apesteguía <fernape at FreeBSD.org>
> > AuthorDate: 2021-07-07 13:15:02 +0000
> > Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
> > CommitDate: 2021-07-07 18:09:02 +0000
> >
> >     ObsoleteFiles.inc: Remove manpages from OLD_FILES
> >
> >     In 0a0f7486413c147d56808b38055c40c64cff61f5 sconfig.8.gz and apmd.8.gz
> >     were moved back to the parent directory share/man/man8.
> >
> >     This conflicts with a previous entry in OLD_FILES so running 'make
> >     delete-old' would delete the new installed files.
> >
> >     Reported by:    marklmi at yahoo.com
> >     Approved by:    emaste@
> >     Fixes:  0a0f7486413c - Build manpages for all architectures
> >     MFH:    4 weeks
> >     Differential Revision:  https://reviews.freebsd.org/D31092
> > ---
> >  ObsoleteFiles.inc | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
> > index 60707faebefc..d72aea5e8efc 100644
> > --- a/ObsoleteFiles.inc
> > +++ b/ObsoleteFiles.inc
> > @@ -14840,11 +14840,9 @@ 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/apmd.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
> > -OLD_FILES+=usr/share/man/man8/sconfig.8.gz
> >  OLD_FILES+=usr/share/man/man8/ssl.8.gz
> >  OLD_FILES+=usr/share/man/man8/wlconfig.8.gz
> >  OLD_FILES+=usr/share/man/man9/CURSIG.9.gz
>
>
>
> --
> Wolfram Schneider <wosch at FreeBSD.org> https://wolfram.schneider.org