git: 54afe88f6ef7 - main - xen-tools: Handle DOCS correctly

[Mathieu Arnold]

On Thu, May 20, 2021 at 09:12:01AM +0200, Emmanuel Vadot wrote:
> On Thu, 20 May 2021 08:36:52 +0200
> Mathieu Arnold <mat at freebsd.org> wrote:
> 
> > On Tue, May 18, 2021 at 09:15:51AM +0000, Emmanuel Vadot wrote:
> > > The branch main has been updated by manu:
> > > 
> > > URL: https://cgit.FreeBSD.org/ports/commit/?id=54afe88f6ef7137bad10f27035fa775d6a949245
> > > 
> > > commit 54afe88f6ef7137bad10f27035fa775d6a949245
> > > Author:     Emmanuel Vadot <manu at FreeBSD.org>
> > > AuthorDate: 2021-05-18 09:15:36 +0000
> > > Commit:     Emmanuel Vadot <manu at FreeBSD.org>
> > > CommitDate: 2021-05-18 09:15:36 +0000
> > > 
> > >     xen-tools: Handle DOCS correctly
> > 
> > Man pages must not depend on the DOCS option, they must either always be
> > installed, or if they require a lot of dependencies, be guarded behind a
> > MANPAGES option that is enabled by default.
> 
>  Right I didn't do a good jog here.
>  So the problem here is that manpages are generated with the docs
> targets.
>  So what's the best way to handle this ?
>  Have them prefixed with %%MANPAGES%% in pkg-plist and do something like
>  if ${PORT_OPTIONS:MDOCS}
>  PLIST_SUB+= MANPAGES="@comment" 
> 
>  ?

Well, no, this would still be the wrong way around. There should
probably be a MANPAGES option that enable building of the docs, and then
the docs would only be packaged if the DOCS option is enabled.

> > >     Reviewed by:    royger
> > >     Differential Revision:  https://reviews.freebsd.org/D30306
> > > ---
> > >  sysutils/xen-tools/pkg-plist | 44 ++++++++++++++++++++++----------------------
> > >  1 file changed, 22 insertions(+), 22 deletions(-)
> > > 
> > > diff --git a/sysutils/xen-tools/pkg-plist b/sysutils/xen-tools/pkg-plist
> > > index 17c3e224a931..b932ed40679e 100644
> > > --- a/sysutils/xen-tools/pkg-plist
> > > +++ b/sysutils/xen-tools/pkg-plist
> > > @@ -277,28 +277,28 @@ libdata/pkgconfig/xenstore.pc
> > >  libdata/pkgconfig/xentoolcore.pc
> > >  libdata/pkgconfig/xentoollog.pc
> > >  libdata/pkgconfig/xlutil.pc
> > > -man/man1/xenhypfs.1.gz
> > > -man/man1/xenstore-chmod.1.gz
> > > -man/man1/xenstore-ls.1.gz
> > > -man/man1/xenstore-read.1.gz
> > > -man/man1/xenstore-write.1.gz
> > > -man/man1/xenstore.1.gz
> > > -man/man1/xentop.1.gz
> > > -man/man1/xentrace_format.1.gz
> > > -man/man1/xl.1.gz
> > > -man/man5/xl-disk-configuration.5.gz
> > > -man/man5/xl-network-configuration.5.gz
> > > -man/man5/xl-pci-configuration.5.gz
> > > -man/man5/xl.cfg.5.gz
> > > -man/man5/xl.conf.5.gz
> > > -man/man5/xlcpupool.cfg.5.gz
> > > -man/man7/xen-pci-device-reservations.7.gz
> > > -man/man7/xen-pv-channel.7.gz
> > > -man/man7/xen-tscmode.7.gz
> > > -man/man7/xen-vtpm.7.gz
> > > -man/man7/xen-vtpmmgr.7.gz
> > > -man/man7/xl-numa-placement.7.gz
> > > -man/man8/xentrace.8.gz
> > > +%%DOCS%%man/man1/xenhypfs.1.gz
> > > +%%DOCS%%man/man1/xenstore-chmod.1.gz
> > > +%%DOCS%%man/man1/xenstore-ls.1.gz
> > > +%%DOCS%%man/man1/xenstore-read.1.gz
> > > +%%DOCS%%man/man1/xenstore-write.1.gz
> > > +%%DOCS%%man/man1/xenstore.1.gz
> > > +%%DOCS%%man/man1/xentop.1.gz
> > > +%%DOCS%%man/man1/xentrace_format.1.gz
> > > +%%DOCS%%man/man1/xl.1.gz
> > > +%%DOCS%%man/man5/xl-disk-configuration.5.gz
> > > +%%DOCS%%man/man5/xl-network-configuration.5.gz
> > > +%%DOCS%%man/man5/xl-pci-configuration.5.gz
> > > +%%DOCS%%man/man5/xl.cfg.5.gz
> > > +%%DOCS%%man/man5/xl.conf.5.gz
> > > +%%DOCS%%man/man5/xlcpupool.cfg.5.gz
> > > +%%DOCS%%man/man7/xen-pci-device-reservations.7.gz
> > > +%%DOCS%%man/man7/xen-pv-channel.7.gz
> > > +%%DOCS%%man/man7/xen-tscmode.7.gz
> > > +%%DOCS%%man/man7/xen-vtpm.7.gz
> > > +%%DOCS%%man/man7/xen-vtpmmgr.7.gz
> > > +%%DOCS%%man/man7/xl-numa-placement.7.gz
> > > +%%DOCS%%man/man8/xentrace.8.gz
> > >  sbin/flask-get-bool
> > >  sbin/flask-getenforce
> > >  sbin/flask-label-pci
> > > 
> > 
> > -- 
> > Mathieu Arnold
> 
> 
> -- 
> Emmanuel Vadot <manu at bidouilliste.com> <manu at FreeBSD.org>
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/dev-commits-ports-main/attachments/20210520/e930a59f/attachment.sig>