Date: Thu, 20 May 2021 10:45:52 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Emmanuel Vadot <manu@bidouilliste.com> Cc: Mathieu Arnold <mat@freebsd.org>, Emmanuel Vadot <manu@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 54afe88f6ef7 - main - xen-tools: Handle DOCS correctly Message-ID: <20210520084552.kbejghwebiegj3pc@aching.in.mat.cc> In-Reply-To: <20210520091201.1f41d346fcaea6e6cb9f5e02@bidouilliste.com> References: <202105180915.14I9Fp92012122@gitrepo.freebsd.org> <20210520063652.5n3qnznat5gjsxpl@aching.in.mat.cc> <20210520091201.1f41d346fcaea6e6cb9f5e02@bidouilliste.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--l2ncojcdtlyatjqv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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@freebsd.org> wrote: >=20 > > On Tue, May 18, 2021 at 09:15:51AM +0000, Emmanuel Vadot wrote: > > > The branch main has been updated by manu: > > >=20 > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D54afe88f6ef7137bad10= f27035fa775d6a949245 > > >=20 > > > commit 54afe88f6ef7137bad10f27035fa775d6a949245 > > > Author: Emmanuel Vadot <manu@FreeBSD.org> > > > AuthorDate: 2021-05-18 09:15:36 +0000 > > > Commit: Emmanuel Vadot <manu@FreeBSD.org> > > > CommitDate: 2021-05-18 09:15:36 +0000 > > >=20 > > > xen-tools: Handle DOCS correctly > >=20 > > 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. >=20 > 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+=3D MANPAGES=3D"@comment"=20 >=20 > ? 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(-) > > >=20 > > > diff --git a/sysutils/xen-tools/pkg-plist b/sysutils/xen-tools/pkg-pl= ist > > > 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 > > >=20 > >=20 > > --=20 > > Mathieu Arnold >=20 >=20 > --=20 > Emmanuel Vadot <manu@bidouilliste.com> <manu@FreeBSD.org> >=20 --=20 Mathieu Arnold --l2ncojcdtlyatjqv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmCmIbxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgLWuA//SQng4cBXTR6umwx3t9MVNtDqm/vSC6VvdzMUQ27tJyF8u2NxxJDhE8qW +0BGwlBNmSk8peCRvPYje9WSFcBfbFgMq05JqnfMMf1/Mi+4T/yKvdvsKM+iZUbn Li40VN5QdrfWooyFF+UTwphiYJYqnU7YdheXshvsApO63KQ3NLXFsr7vVrhbLsmo k+y0f5YJsSLxImxQH70XopELEbZ/etjB1Xc3MgwiLD9/8TsYuPaRPunXmXki+fVF AeF/TLgEpLx1BhlUdG6r1rKwd8zilaIvvZCldZIJ4XG4a5XQlGMKF2liBTuGSrtX gfeoisemSKdLytTbxI7Mx8Y4FhX48pVl9Z2cemtLkQmcJmVTRXG3nlXmfX4m89NG D7/ov7jC5P4s50PidGItazS14+7xnSxQ1lBRXDnaWMWM47eVNZv68/lRuTPTlPRg yqtSEHBi6BYbyXcUIXo7QnpQU5dxSjKKmT/xAnp5iUNvAeD8fQbW10b4a32nSNXl /29LVcO9XJQSWuWwzWOKAa2WxuHHjdNs1dKTh7FMcTnGY3Qj5B8wdYkbsiKydXlz Z0sUk3TXsqbFG8x79nmhDYFanDGGLlKohXAznduxnOhjS7lacKWZCSjKAbtp2IPD zpiPuPtDw+QKeAHdS4Ou8uync/X+UXGbEaqKIMuIHzquAtEclQw= =YrcI -----END PGP SIGNATURE----- --l2ncojcdtlyatjqv--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210520084552.kbejghwebiegj3pc>