Date: Fri, 17 Jan 2025 19:11:18 +0100 From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= <fernape@freebsd.org> To: Moin Rahman <bofh@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: a8d366898894 - main - textproc/docproj: remove gnuplot-lite dependency Message-ID: <CAGwOe2Yy77o3kLtChNoAMszKzh2ecUDJHbs4k9mizhGOuv_a2A@mail.gmail.com> In-Reply-To: <26434658-5E5B-4197-890A-2B926AA2A487@freebsd.org> References: <CAGwOe2bTFU5Z68BuZ_zy9oYfLt2UWaTLco%2B8e4q_QNuxizxojA@mail.gmail.com> <26434658-5E5B-4197-890A-2B926AA2A487@freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, Jan 16, 2025 at 1:21 PM Moin Rahman <bofh@freebsd.org> wrote: > > > On 16 Jan 2025, at 13:02, Fernando Apesteguía <fernape@freebsd.org> wrote: > > > > > On Thu, Jan 16, 2025 at 8:56 AM Moin Rahman <bofh@freebsd.org> wrote: > >> >> >> > On Jan 16, 2025, at 08:41, Fernando Apesteguía <fernape@FreeBSD.org> >> wrote: >> > >> > The branch main has been updated by fernape: >> > >> > URL: >> https://cgit.FreeBSD.org/ports/commit/?id=a8d3668988945bf23844a1733da214113e08d6ec >> > >> > commit a8d3668988945bf23844a1733da214113e08d6ec >> > Author: Fernando Apesteguía <fernape@FreeBSD.org> >> > AuthorDate: 2025-01-14 17:26:26 +0000 >> > Commit: Fernando Apesteguía <fernape@FreeBSD.org> >> > CommitDate: 2025-01-16 07:41:00 +0000 >> > >> > textproc/docproj: remove gnuplot-lite dependency >> > >> > It was a leftover from the previous docproj. >> > --- >> > textproc/docproj/Makefile | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile >> > index 6d362be1878a..a0b3c298573c 100644 >> > --- a/textproc/docproj/Makefile >> > +++ b/textproc/docproj/Makefile >> > @@ -1,5 +1,6 @@ >> > PORTNAME= docproj >> > PORTVERSION= 4.1.9 >> > +PORTREVISION= 1 >> > CATEGORIES= textproc >> > >> > MAINTAINER= doceng@FreeBSD.org >> > @@ -7,7 +8,6 @@ COMMENT= Meta-port for the FreeBSD Documentation Project >> > WWW= https://www.freebsd.org/docproj >> > >> > RUN_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \ >> > - gnuplot-lite>0:math/gnuplot-lite \ >> > gohugo>=0.133.1,1:www/gohugo \ >> > rougify:textproc/rubygem-rouge \ >> > rubygem-asciidoctor-diagram>0:textproc/rubygem-asciidoctor-diagram >> >> I don't think this is correct. gnuplot was used to generate the graph >> of number of ports here: >> >> https://docs.freebsd.org/en/books/dev-model/#sub-project-ports > > > Interesting. I don't see any invocations to gnuplot in any of the > Makefiles. > Also, I don't have any gnuplot* packages in my system and I regularly > build the documentation just fine: > > $ DOC_LANG=en make > --------------------------------------------------------------- > Building the documentation > included languages: en > excluded languages: bn-bd da de el es fr hu id it ja ko mn nl pl pt-br ru > tr zh-cn zh-tw > --------------------------------------------------------------- > /usr/local/bin/ruby ./tools/global-pgpkeys-creator.rb > HUGO_DISABLELANGUAGES=" bn-bd da de el es fr hu id it ja ko mn nl pl pt-br > ru tr zh-cn zh-tw" /usr/local/bin/hugo --minify > Start building sites … > hugo v0.140.2+extended freebsd/amd64 BuildDate=2024-12-30T17:44:54Z+0000 > VendorInfo=freebsd > > > | EN > -------------------+------- > Pages | 1187 > Paginator pages | 0 > Non-page files | 0 > Static files | 856 > Processed images | 0 > Aliases | 1 > Cleaned | 0 > > Total in 200805 ms > > Where is that file generated? > > It’s not in a Makefile. Eventually rubygem-asciidoctor-diagram calls it to > generate the diagram. Search for a file where asciidoctor-diagram is > defined as a plugin. I am travelling today and will share the details at > night. > The reason the image was not properly loaded is because the syntax was wrong in d7957d161fd when this change was introduced. I just fixed it in 6abcb860ac: -.Number of ports added between 1995 and 2022 [[fig-ports]] -image::portsstatus.svg +.Number of ports added between 1995 and 2022 +[[fig-ports]] +image::portsstatus.svg[Refer to paragraphs below for a screen-reader friendly version.] I don't have any gnuplot packages in my system: $ pkg info -x '.*plot.*' pkg: No package(s) matching .*plot.* and yet with that change "make run" now shows the picture in the documentation. The CI for the documentation tree needs fixing ( https://github.com/freebsd/freebsd-ci/pull/178) so the image might not show yet in docs.freebsd.org. The image in question is generated by https://people.freebsd.org/~bofh/dropzone/dev-model.sh, which reads at the beginning: # This script will inform the total number of committers per repo at # the end of the run. This information should be manually updated in # the file documentation/content/en/books/dev-model/_index.adoc According to git log, the generated image was last updated in 2022, and I can tell you I've built the whole tree a number of times since 2022 :-) Are you sure you uploaded it to the repo and hook it to the build? Cheers. > >> >> There is an SVG file that was supposed to be generated and it has >> nothing to do with the previous docproj. >> >> >> Kind regards, >> Moin >> > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jan 16, 2025 at 1:21 PM Moin Rahman <<a href="mailto:bofh@freebsd.org" target="_blank">bofh@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="auto"><div dir="ltr"><br></div><div dir="ltr"><br><blockquote type="cite">On 16 Jan 2025, at 13:02, Fernando Apesteguía <<a href="mailto:fernape@freebsd.org" target="_blank">fernape@freebsd.org</a>> wrote:<br><br></blockquote></div><blockquote type="cite"><div dir="ltr"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jan 16, 2025 at 8:56 AM Moin Rahman <<a href="mailto:bofh@freebsd.org" target="_blank">bofh@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br> <br> > On Jan 16, 2025, at 08:41, Fernando Apesteguía <fernape@FreeBSD.org> wrote:<br> > <br> > The branch main has been updated by fernape:<br> > <br> > URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=a8d3668988945bf23844a1733da214113e08d6ec" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=a8d3668988945bf23844a1733da214113e08d6ec</a><br>; > <br> > commit a8d3668988945bf23844a1733da214113e08d6ec<br> > Author: Fernando Apesteguía <fernape@FreeBSD.org><br> > AuthorDate: 2025-01-14 17:26:26 +0000<br> > Commit: Fernando Apesteguía <fernape@FreeBSD.org><br> > CommitDate: 2025-01-16 07:41:00 +0000<br> > <br> > textproc/docproj: remove gnuplot-lite dependency<br> > <br> > It was a leftover from the previous docproj.<br> > ---<br> > textproc/docproj/Makefile | 2 +-<br> > 1 file changed, 1 insertion(+), 1 deletion(-)<br> > <br> > diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile<br> > index 6d362be1878a..a0b3c298573c 100644<br> > --- a/textproc/docproj/Makefile<br> > +++ b/textproc/docproj/Makefile<br> > @@ -1,5 +1,6 @@<br> > PORTNAME= docproj<br> > PORTVERSION= 4.1.9<br> > +PORTREVISION= 1<br> > CATEGORIES= textproc<br> > <br> > MAINTAINER= doceng@FreeBSD.org<br> > @@ -7,7 +8,6 @@ COMMENT= Meta-port for the FreeBSD Documentation Project<br> > WWW= <a href="https://www.freebsd.org/docproj" rel="noreferrer" target="_blank">https://www.freebsd.org/docproj</a><br>; > <br> > RUN_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \<br> > - gnuplot-lite>0:math/gnuplot-lite \<br> > gohugo>=0.133.1,1:www/gohugo \<br> > rougify:textproc/rubygem-rouge \<br> > rubygem-asciidoctor-diagram>0:textproc/rubygem-asciidoctor-diagram<br> <br> I don't think this is correct. gnuplot was used to generate the graph<br> of number of ports here:<br> <br> <a href="https://docs.freebsd.org/en/books/dev-model/#sub-project-ports" rel="noreferrer" target="_blank">https://docs.freebsd.org/en/books/dev-model/#sub-project-ports</a></blockquote><div><br></div><div>Interesting. I don't see any invocations to gnuplot in any of the Makefiles.</div><div>Also, I don't have any gnuplot* packages in my system and I regularly build the documentation just fine:</div><div><br></div><div>$ DOC_LANG=en make<br>---------------------------------------------------------------<br>Building the documentation<br>included languages: en<br>excluded languages: bn-bd da de el es fr hu id it ja ko mn nl pl pt-br ru tr zh-cn zh-tw<br>---------------------------------------------------------------<br>/usr/local/bin/ruby ./tools/global-pgpkeys-creator.rb<br>HUGO_DISABLELANGUAGES=" bn-bd da de el es fr hu id it ja ko mn nl pl pt-br ru tr zh-cn zh-tw" /usr/local/bin/hugo --minify<br>Start building sites … <br>hugo v0.140.2+extended freebsd/amd64 BuildDate=2024-12-30T17:44:54Z+0000 VendorInfo=freebsd<br><br><br> | EN <br>-------------------+-------<br> Pages | 1187 <br> Paginator pages | 0 <br> Non-page files | 0 <br> Static files | 856 <br> Processed images | 0 <br> Aliases | 1 <br> Cleaned | 0 <br><br>Total in 200805 ms<br></div><div> </div><div>Where is that file generated?</div></div></div></div></blockquote>It’s not in a Makefile. Eventually rubygem-asciidoctor-diagram calls it to generate the diagram. Search for a file where asciidoctor-diagram is defined as a plugin. I am travelling today and will share the details at night.</div></blockquote><div><br></div><br><div>The reason the image was not properly loaded is because the syntax was wrong in d7957d161fd when this change was introduced.</div><div>I just fixed it in 6abcb860ac:</div><div><br></div><div>-.Number of ports added between 1995 and 2022 [[fig-ports]]<br>-image::portsstatus.svg<br>+.Number of ports added between 1995 and 2022<br>+[[fig-ports]]<br>+image::portsstatus.svg[Refer to paragraphs below for a screen-reader friendly version.]<br></div><div><br></div><div>I don't have any gnuplot packages in my system:</div><div><br></div><div>$ pkg info -x '.*plot.*'<br>pkg: No package(s) matching .*plot.*</div><div><br></div><div>and yet with that change "make run" now shows the picture in the documentation.</div><div>The CI for the documentation tree needs fixing (<a href="https://github.com/freebsd/freebsd-ci/pull/178">https://github.com/freebsd/freebsd-ci/pull/178</a>) so the image might not show yet in <a href="http://docs.freebsd.org">docs.freebsd.org</a>.<br></div><div><br></div><div><div>The image in question is generated by <a href="https://people.freebsd.org/~bofh/dropzone/dev-model.sh" target="_blank">https://people.freebsd.org/~bofh/dropzone/dev-model.sh</a>, which reads at the beginning:</div><div></div><div><pre># This script will inform the total number of committers per repo at # the end of the run. This information should be manually updated in # the file documentation/content/en/books/dev-model/_index.adoc</pre></div><div>According to git log, the generated image was last updated in 2022, and I can tell you I've built the whole tree a number of times since 2022 :-)<br></div><div>Are you sure you uploaded it to the repo and hook it to the build?<br></div><div><br></div><div>Cheers.<br></div></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="auto"><div><br><blockquote type="cite"><div dir="ltr"><div dir="ltr"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br> <br> There is an SVG file that was supposed to be generated and it has<br> nothing to do with the previous docproj.<br> <br> <br> Kind regards,<br> Moin<br> </blockquote></div></div> </div></blockquote></div></div></blockquote></div></div> </div> </div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGwOe2Yy77o3kLtChNoAMszKzh2ecUDJHbs4k9mizhGOuv_a2A>