Date: Fri, 12 Apr 2024 16:47:34 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Gleb Popov <arrowd@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 9fd7ee1cdf6c - main - Framework: Finalize switch to share/man for manpages Message-ID: <CAFDf7U%2BaZ%2B-vRgjagQA7yDGbummK_kgDeW3sK7YfvfvpJkum0w@mail.gmail.com> In-Reply-To: <202404111854.43BIsf1X005969@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Hello Gleb, Check Q/A complains about not finding old man location: --- ====> Running Q/A tests (stage-qa) find: /wrkdirs/usr/ports/cad/gtkwave/work/stage/usr/local/man: No such file or directory ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist ===> Checking for items in pkg-plist which are not in STAGEDIR ===> No pkg-plist issues found (check-plist) =>> Checking for staging violations... done --- Thanks Gleb Popov <arrowd@freebsd.org> escreveu (quinta, 11/04/2024 à(s) 19:54): > The branch main has been updated by arrowd: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9 > > commit 9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9 > Author: Muhammad Moinur Rahman <bofh@freebsd.org> > AuthorDate: 2024-04-11 12:32:07 +0000 > Commit: Gleb Popov <arrowd@FreeBSD.org> > CommitDate: 2024-04-11 18:51:09 +0000 > > Framework: Finalize switch to share/man for manpages > > PR: 277603 > Approved by: portmgr > --- > Mk/bsd.port.mk | 6 +- > Templates/BSD.local.dist | 226 > +---------------------------------------------- > 2 files changed, 4 insertions(+), 228 deletions(-) > > diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk > index e120b2cd1632..1176da04e80e 100644 > --- a/Mk/bsd.port.mk > +++ b/Mk/bsd.port.mk > @@ -751,7 +751,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org > # - Pass these args to configure if > ${HAS_CONFIGURE} is set. > # Default: > "--prefix=${GNU_CONFIGURE_PREFIX} > # --infodir=${PREFIX}/${INFO_PATH} > --localstatedir=/var > -# --mandir=${PREFIX}/man > --build=${CONFIGURE_TARGET}" if > +# --mandir=${PREFIX}/share/man > --build=${CONFIGURE_TARGET}" if > # GNU_CONFIGURE is set, "CC=${CC} > CFLAGS=${CFLAGS} > # PREFIX=${PREFIX} > INSTALLPRIVLIB=${PREFIX}/lib > # INSTALLARCHLIB=${PREFIX}/lib" if > USES=perl5 and > @@ -2730,7 +2730,7 @@ CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax > . endif > _EXPORTED_VARS+= CONFIGURE_MAX_CMD_LEN > GNU_CONFIGURE_PREFIX?= ${PREFIX} > -GNU_CONFIGURE_MANPREFIX?= ${PREFIX} > +GNU_CONFIGURE_MANPREFIX?= ${PREFIX}/share > CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} > $${_LATE_CONFIGURE_ARGS} > . if defined(CROSS_TOOLCHAIN) > CROSS_HOST= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL} > @@ -2775,8 +2775,6 @@ SCRIPTS_ENV+= BATCH=yes > . endif > > MANDIRS+= ${PREFIX}/share/man > - > -MANDIRS+= ${PREFIX}/man > INFO_PATH?= share/info > > . if defined(INFO) > diff --git a/Templates/BSD.local.dist b/Templates/BSD.local.dist > index cdb864c54f8e..e40c6ae581e8 100644 > --- a/Templates/BSD.local.dist > +++ b/Templates/BSD.local.dist > @@ -43,226 +43,6 @@ > .. > libexec > .. > - man > -/set uname=man > - cat1 > - .. > - cat2 > - .. > - cat3 > - .. > - cat4 > - .. > - cat5 > - .. > - cat6 > - .. > - cat7 > - .. > - cat8 > - .. > - cat9 > - .. > - catl > - .. > - catn > - .. > - de.ISO8859-1 uname=root > - cat1 > - .. > - cat2 > - .. > - cat3 > - .. > - cat4 > - .. > - cat5 > - .. > - cat6 > - .. > - cat7 > - .. > - cat8 > - .. > - cat9 > - .. > - catl > - .. > - catn > - .. > -/set uname=root > - man1 > - .. > - man2 > - .. > - man3 > - .. > - man4 > - .. > - man5 > - .. > - man6 > - .. > - man7 > - .. > - man8 > - .. > - man9 > - .. > - manl > - .. > - mann > - .. > - .. > - en.ISO8859-1 > -/set uname=man > - cat1 > - .. > - cat1aout > - .. > - cat2 > - .. > - cat3 > - .. > - cat4 > - i386 > - .. > - .. > - cat5 > - .. > - cat6 > - .. > - cat7 > - .. > - cat8 > - i386 > - .. > - .. > - cat9 > - i386 > - .. > - .. > - catn > - .. > - .. > - ja uname=root > - cat1 > - .. > - cat2 > - .. > - cat3 > - .. > - cat4 > - .. > - cat5 > - .. > - cat6 > - .. > - cat7 > - .. > - cat8 > - .. > - cat9 > - .. > - catl > - .. > - catn > - .. > -/set uname=root > - man1 > - .. > - man2 > - .. > - man3 > - .. > - man4 > - .. > - man5 > - .. > - man6 > - .. > - man7 > - .. > - man8 > - .. > - man9 > - .. > - manl > - .. > - mann > - .. > - .. > - man1 > - .. > - man2 > - .. > - man3 > - .. > - man4 > - .. > - man5 > - .. > - man6 > - .. > - man7 > - .. > - man8 > - .. > - man9 > - .. > - manl > - .. > - mann > - .. > - ru.KOI8-R > -/set uname=man > - cat1 > - .. > - cat2 > - .. > - cat3 > - .. > - cat4 > - .. > - cat5 > - .. > - cat6 > - .. > - cat7 > - .. > - cat8 > - .. > - cat9 > - .. > - catl > - .. > - catn > - .. > -/set uname=root > - man1 > - .. > - man2 > - .. > - man3 > - .. > - man4 > - .. > - man5 > - .. > - man6 > - .. > - man7 > - .. > - man8 > - .. > - man9 > - .. > - manl > - .. > - mann > - .. > - .. > - .. > sbin > .. > share > @@ -671,8 +451,7 @@ > .. > cat9 > .. > - es uname=root > -/set uname=root > + es > man7 > .. > man8 > @@ -688,8 +467,7 @@ > man8 > .. > .. > - ja uname=root > -/set uname=root > + ja > man1 > .. > man7 > -- Nuno Teixeira FreeBSD Committer (ports) [-- Attachment #2 --] <div dir="ltr"><div>Hello Gleb,</div><div><br></div><div>Check Q/A complains about not finding old man location:</div><div>---</div><div>====> Running Q/A tests (stage-qa)<br>find: /wrkdirs/usr/ports/cad/gtkwave/work/stage/usr/local/man: No such file or directory<br>====> Checking for pkg-plist issues (check-plist)<br>===> Parsing plist<br>===> Checking for items in STAGEDIR missing from pkg-plist<br>===> Checking for items in pkg-plist which are not in STAGEDIR<br>===> No pkg-plist issues found (check-plist)<br>=>> Checking for staging violations... done</div><div>---</div><div><br></div><div>Thanks<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Gleb Popov <<a href="mailto:arrowd@freebsd.org">arrowd@freebsd.org</a>> escreveu (quinta, 11/04/2024 à(s) 19:54):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by arrowd:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9</a><br>; <br> commit 9fd7ee1cdf6cbd5528159b58a966e1a40e2909a9<br> Author: Muhammad Moinur Rahman <<a href="mailto:bofh@freebsd.org" target="_blank">bofh@freebsd.org</a>><br> AuthorDate: 2024-04-11 12:32:07 +0000<br> Commit: Gleb Popov <arrowd@FreeBSD.org><br> CommitDate: 2024-04-11 18:51:09 +0000<br> <br> Framework: Finalize switch to share/man for manpages<br> <br> PR: 277603<br> Approved by: portmgr<br> ---<br> Mk/<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a> | 6 +-<br> Templates/BSD.local.dist | 226 +----------------------------------------------<br> 2 files changed, 4 insertions(+), 228 deletions(-)<br> <br> diff --git a/Mk/<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a> b/Mk/<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a><br> index e120b2cd1632..1176da04e80e 100644<br> --- a/Mk/<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a><br> +++ b/Mk/<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a><br> @@ -751,7 +751,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org<br> # - Pass these args to configure if ${HAS_CONFIGURE} is set.<br> # Default: "--prefix=${GNU_CONFIGURE_PREFIX}<br> # --infodir=${PREFIX}/${INFO_PATH} --localstatedir=/var<br> -# --mandir=${PREFIX}/man --build=${CONFIGURE_TARGET}" if<br> +# --mandir=${PREFIX}/share/man --build=${CONFIGURE_TARGET}" if<br> # GNU_CONFIGURE is set, "CC=${CC} CFLAGS=${CFLAGS}<br> # PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib<br> # INSTALLARCHLIB=${PREFIX}/lib" if USES=perl5 and<br> @@ -2730,7 +2730,7 @@ CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax<br> . endif<br> _EXPORTED_VARS+= CONFIGURE_MAX_CMD_LEN<br> GNU_CONFIGURE_PREFIX?= ${PREFIX}<br> -GNU_CONFIGURE_MANPREFIX?= ${PREFIX}<br> +GNU_CONFIGURE_MANPREFIX?= ${PREFIX}/share<br> CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}<br> . if defined(CROSS_TOOLCHAIN)<br> CROSS_HOST= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}<br> @@ -2775,8 +2775,6 @@ SCRIPTS_ENV+= BATCH=yes<br> . endif<br> <br> MANDIRS+= ${PREFIX}/share/man<br> -<br> -MANDIRS+= ${PREFIX}/man<br> INFO_PATH?= share/info<br> <br> . if defined(INFO)<br> diff --git a/Templates/BSD.local.dist b/Templates/BSD.local.dist<br> index cdb864c54f8e..e40c6ae581e8 100644<br> --- a/Templates/BSD.local.dist<br> +++ b/Templates/BSD.local.dist<br> @@ -43,226 +43,6 @@<br> ..<br> libexec<br> ..<br> - man<br> -/set uname=man<br> - cat1<br> - ..<br> - cat2<br> - ..<br> - cat3<br> - ..<br> - cat4<br> - ..<br> - cat5<br> - ..<br> - cat6<br> - ..<br> - cat7<br> - ..<br> - cat8<br> - ..<br> - cat9<br> - ..<br> - catl<br> - ..<br> - catn<br> - ..<br> - de.ISO8859-1 uname=root<br> - cat1<br> - ..<br> - cat2<br> - ..<br> - cat3<br> - ..<br> - cat4<br> - ..<br> - cat5<br> - ..<br> - cat6<br> - ..<br> - cat7<br> - ..<br> - cat8<br> - ..<br> - cat9<br> - ..<br> - catl<br> - ..<br> - catn<br> - ..<br> -/set uname=root<br> - man1<br> - ..<br> - man2<br> - ..<br> - man3<br> - ..<br> - man4<br> - ..<br> - man5<br> - ..<br> - man6<br> - ..<br> - man7<br> - ..<br> - man8<br> - ..<br> - man9<br> - ..<br> - manl<br> - ..<br> - mann<br> - ..<br> - ..<br> - en.ISO8859-1<br> -/set uname=man<br> - cat1<br> - ..<br> - cat1aout<br> - ..<br> - cat2<br> - ..<br> - cat3<br> - ..<br> - cat4<br> - i386<br> - ..<br> - ..<br> - cat5<br> - ..<br> - cat6<br> - ..<br> - cat7<br> - ..<br> - cat8<br> - i386<br> - ..<br> - ..<br> - cat9<br> - i386<br> - ..<br> - ..<br> - catn<br> - ..<br> - ..<br> - ja uname=root<br> - cat1<br> - ..<br> - cat2<br> - ..<br> - cat3<br> - ..<br> - cat4<br> - ..<br> - cat5<br> - ..<br> - cat6<br> - ..<br> - cat7<br> - ..<br> - cat8<br> - ..<br> - cat9<br> - ..<br> - catl<br> - ..<br> - catn<br> - ..<br> -/set uname=root<br> - man1<br> - ..<br> - man2<br> - ..<br> - man3<br> - ..<br> - man4<br> - ..<br> - man5<br> - ..<br> - man6<br> - ..<br> - man7<br> - ..<br> - man8<br> - ..<br> - man9<br> - ..<br> - manl<br> - ..<br> - mann<br> - ..<br> - ..<br> - man1<br> - ..<br> - man2<br> - ..<br> - man3<br> - ..<br> - man4<br> - ..<br> - man5<br> - ..<br> - man6<br> - ..<br> - man7<br> - ..<br> - man8<br> - ..<br> - man9<br> - ..<br> - manl<br> - ..<br> - mann<br> - ..<br> - ru.KOI8-R<br> -/set uname=man<br> - cat1<br> - ..<br> - cat2<br> - ..<br> - cat3<br> - ..<br> - cat4<br> - ..<br> - cat5<br> - ..<br> - cat6<br> - ..<br> - cat7<br> - ..<br> - cat8<br> - ..<br> - cat9<br> - ..<br> - catl<br> - ..<br> - catn<br> - ..<br> -/set uname=root<br> - man1<br> - ..<br> - man2<br> - ..<br> - man3<br> - ..<br> - man4<br> - ..<br> - man5<br> - ..<br> - man6<br> - ..<br> - man7<br> - ..<br> - man8<br> - ..<br> - man9<br> - ..<br> - manl<br> - ..<br> - mann<br> - ..<br> - ..<br> - ..<br> sbin<br> ..<br> share<br> @@ -671,8 +451,7 @@<br> ..<br> cat9<br> ..<br> - es uname=root<br> -/set uname=root<br> + es<br> man7<br> ..<br> man8<br> @@ -688,8 +467,7 @@<br> man8<br> ..<br> ..<br> - ja uname=root<br> -/set uname=root<br> + ja<br> man1<br> ..<br> man7<br> </blockquote></div><br clear="all"><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><span style="color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committer (ports)</span></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7U%2BaZ%2B-vRgjagQA7yDGbummK_kgDeW3sK7YfvfvpJkum0w>