Date: Fri, 12 Apr 2024 18:05:20 +0200 From: Moin Rahman <bofh@freebsd.org> To: Nuno Teixeira <eduardo@freebsd.org> Cc: Gleb Popov <arrowd@freebsd.org>, ports-committers <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: <E5326E51-1B23-4255-BD44-3FCE2CFB7733@freebsd.org> In-Reply-To: <CAFDf7U%2BaZ%2B-vRgjagQA7yDGbummK_kgDeW3sK7YfvfvpJkum0w@mail.gmail.com> References: <202404111854.43BIsf1X005969@gitrepo.freebsd.org> <CAFDf7U%2BaZ%2B-vRgjagQA7yDGbummK_kgDeW3sK7YfvfvpJkum0w@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] > On Apr 12, 2024, at 5:47 PM, Nuno Teixeira <eduardo@freebsd.org> wrote: > > 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) It's my fault. I was supposed to change it during last fix but somehow I missed to update the patch. For now it should be good. Thanks for the report. Kind regards, Moin [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEETfdREoUGjQZKBS+fvbm1phfAvJEFAmYZW8BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDRE Rjc1MTEyODUwNjhEMDY0QTA1MkY5RkJEQjlCNUE2MTdDMEJDOTEACgkQvbm1phfA vJFLIg/8CCuh1N/aGQjnyUaCOJqHRTspo2bHAPLzhVcRlI8i4jR3UdPIVWwqLiOg iuZTuIBkUOVfPZlEES5gMF5WawT3W1NREGHBuBv0P1VYitkloO2pVPv7yNCwt0sj O+sen0Ggu1Y0uTShv8iNJ2HKGHogB4B6lgjpSqhMa9lbEYr7FPyeDgUQXo0rk72n vCm63bx+SDhQJlght6NxgXQQJGjV5CKH7tYIIQuesiyjRi3pYk2rbLK/VdbDITF2 hXhR0qDspCRs9ZmljPKMh59kqNBrhCxz6zi6NOCNZmBBxOYLPbGrOWIDqAvErkr3 kpClAp1iLK3fc0yB1RX8PXPpxFTLZIz5T+328OZrtpWcwMcGDl/f3SpsOFv/9yHK kr/ofaFIV+0QtAvqQr/XtVJwFR3YMxGTt8AjHAfIaGG8NLmjaX2L6hEGVpttbPiv AdddOcAINOD5ZxDWCV5ikP85b2GN4dC0EDJAAqb956+Tt/WS9Ovn/8YyqU7uQ2P5 Y307hYwaDHUG8zi892q1zZHCJPL865nXxw7BaeZKg8wg0Pfo/Hp7LqQHpFlc1IVz BCoOe354wunGF4VEPC3tNtdj+Z+C0W6dDrRdmqeDJ5kNN/eSA9XOGss8HmLUlyUO m3bNM+A9ZKDobp8RdjDxZcFhyUmLB9vFh6RKk0KzGzx0WdquLXg= =CLML -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E5326E51-1B23-4255-BD44-3FCE2CFB7733>