Date: Thu, 25 Jul 2024 12:29:38 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Daniel Engberg <daniel.engberg.lists@pyret.net> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: cc960c2ff3d7 - main - textproc/asciidoc: Clean up Makefile Message-ID: <CAMHz58RvzsGYgRiN3-skMNjNNstvoJOkhrRegQYGPUT75K=2rQ@mail.gmail.com> In-Reply-To: <3487b11b50034f4a8cb2ff206097ca37@mail.infomaniak.com> References: <202407242118.46OLIIPb064735@gitrepo.freebsd.org> <3487b11b50034f4a8cb2ff206097ca37@mail.infomaniak.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, Jul 25, 2024 at 9:23 AM Daniel Engberg < daniel.engberg.lists@pyret.net> wrote: > On 2024-07-24T23:18:18.000+02:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org> > wrote: > > > The branch main has been updated by sunpoet: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac > > commit cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac > Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > AuthorDate: 2024-07-24 21:16:02 +0000 > Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > CommitDate: 2024-07-24 21:16:02 +0000 > > textproc/asciidoc: Clean up Makefile > > a2x.1.txt and asciidoc.1.txt are added to sdist. > > Reference: https://github.com/asciidoc-py/asciidoc-py/commit/400cbe7fc90227a5dcce759d8c22d3bbe31a60eb > --- > textproc/asciidoc/Makefile | 16 ++++------------ > textproc/asciidoc/distinfo | 6 +----- > 2 files changed, 5 insertions(+), 17 deletions(-) > > diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile > index 038369d41f98..71644710f751 100644 > --- a/textproc/asciidoc/Makefile > +++ b/textproc/asciidoc/Makefile > @@ -1,12 +1,7 @@ > PORTNAME= asciidoc > PORTVERSION= 10.2.1 > CATEGORIES= textproc > -MASTER_SITES= PYPI \ > - https://github.com/asciidoc-py/asciidoc-py/raw/${PORTVERSION}/doc/:manpage > -DISTFILES= asciidoc-${PORTVERSION}${EXTRACT_SUFX} \ > - a2x.1.txt:manpage \ > - asciidoc.1.txt:manpage > -EXTRACT_ONLY= asciidoc-${PORTVERSION}${EXTRACT_SUFX} > +MASTER_SITES= PYPI > > MAINTAINER= sunpoet@FreeBSD.org > COMMENT= Text document format for writing short documents and man pages > @@ -32,15 +27,12 @@ PLIST_FILES= share/man/man1/a2x.1.gz \ > SHEBANG_FILES= asciidoc/resources/filters/*.py \ > asciidoc/resources/filters/*/*.py > > -post-patch: > - @${CP} ${DISTDIR}/a2x.1.txt ${WRKSRC}/a2x.1.txt > - @${CP} ${DISTDIR}/asciidoc.1.txt ${WRKSRC}/asciidoc.1.txt > > post-build: > - @cd ${WRKSRC} && ${PYTHON_CMD} -m asciidoc.a2x -f manpage a2x.1.txt > - @cd ${WRKSRC} && ${PYTHON_CMD} -m asciidoc.a2x -f manpage asciidoc.1.txt > + @cd ${WRKSRC}/doc && ${PYTHON_CMD} -m asciidoc.a2x -f manpage a2x.1.txt > + @cd ${WRKSRC}/doc && ${PYTHON_CMD} -m asciidoc.a2x -f manpage asciidoc.1.txt > > post-install: > - ${INSTALL_MAN} ${WRKSRC}/a2x.1 ${WRKSRC}/asciidoc.1 ${STAGEDIR}${PREFIX}/share/man/man1/ > + ${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 ${STAGEDIR}${PREFIX}/share/man/man1/ > > .include <bsd.port.mk>; > diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo > index 42024668e257..cce866ab8ecc 100644 > --- a/textproc/asciidoc/distinfo > +++ b/textproc/asciidoc/distinfo > @@ -1,7 +1,3 @@ > -TIMESTAMP = 1721280202 > +TIMESTAMP = 1721823004 > SHA256 (asciidoc-10.2.1.tar.gz) = d9f13c285981b3c7eb660d02ca0a2779981e88d48105de81bb40445e60dddb83 > SIZE (asciidoc-10.2.1.tar.gz) = 230179 > -SHA256 (a2x.1.txt) = 51b05d6be98531ec6c7ff0459dc82fdd103bc43ae682b954c98943ead4d03de7 > -SIZE (a2x.1.txt) = 13050 > -SHA256 (asciidoc.1.txt) = 3e412b938b51d88948e7713b5026425b15babcb8e3899ec0e2c769e10baf8d31 > -SIZE (asciidoc.1.txt) = 7485 > > Current version in tree fails to build > > > https://pdr2.bofh.network/data/140-diizzy/2024-07-24_20h21m30s/logs/errors/asciidoc-10.2.1.log > > Best regards, > Daniel > Fixed in 9dabf20d779bf9db7075aa3f206d26bca82b9070. Thanks. [-- Attachment #2 --] <div dir="ltr"><div dir="ltr">On Thu, Jul 25, 2024 at 9:23 AM Daniel Engberg <<a href="mailto:daniel.engberg.lists@pyret.net">daniel.engberg.lists@pyret.net</a>> wrote:<br></div><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"><div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">On 2024-07-24T23:18:18.000+02:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org> wrote:<br></div><div><div><br></div></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px"><br></div><div><blockquote><pre style="white-space:normal"><div>The branch main has been updated by sunpoet:<br></div><div><br></div><div>URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac" rel="noopener noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac</a><br></div><div><br></div><div>commit cc960c2ff3d7081ae07f0f9cc63087fc6a5341ac<br></div><div>Author: Po-Chuan Hsieh <<a href="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-07-24 21:16:02 +0000<br></div><div>Commit: Po-Chuan Hsieh <<a href="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@FreeBSD.org</a>><br></div><div>CommitDate: 2024-07-24 21:16:02 +0000<br></div><div><br></div><div> textproc/asciidoc: Clean up Makefile<br></div><div> <br></div><div> a2x.1.txt and asciidoc.1.txt are added to sdist.<br></div><div> <br></div><div> Reference: <a href="https://github.com/asciidoc-py/asciidoc-py/commit/400cbe7fc90227a5dcce759d8c22d3bbe31a60eb" rel="noopener noreferrer" target="_blank">https://github.com/asciidoc-py/asciidoc-py/commit/400cbe7fc90227a5dcce759d8c22d3bbe31a60eb</a><br></div><div>---<br></div><div>; textproc/asciidoc/Makefile | 16 ++++------------<br></div><div> textproc/asciidoc/distinfo | 6 +-----<br></div><div> 2 files changed, 5 insertions(+), 17 deletions(-)<br></div><div><br></div><div>diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile<br></div><div>index 038369d41f98..71644710f751 100644<br></div><div>--- a/textproc/asciidoc/Makefile<br></div><div>+++ b/textproc/asciidoc/Makefile<br></div><div>@@ -1,12 +1,7 @@<br></div><div> PORTNAME= asciidoc<br></div><div> PORTVERSION= 10.2.1<br></div><div> CATEGORIES= textproc<br></div><div>-MASTER_SITES= PYPI \<br></div><div>- <a href="https://github.com/asciidoc-py/asciidoc-py/raw/" rel="noopener noreferrer" target="_blank">https://github.com/asciidoc-py/asciidoc-py/raw/</a>${PORTVERSION}/doc/:manpage<br></div><div>-DISTFILES= asciidoc-${PORTVERSION}${EXTRACT_SUFX} \<br></div><div>- a2x.1.txt:manpage \<br></div><div>- asciidoc.1.txt:manpage<br></div><div>-EXTRACT_ONLY= asciidoc-${PORTVERSION}${EXTRACT_SUFX}<br></div><div>+MASTER_SITES= PYPI<br></div><div> <br></div><div> MAINTAINER= <a href="mailto:sunpoet@FreeBSD.org" target="_blank">sunpoet@FreeBSD.org</a><br></div><div> COMMENT= Text document format for writing short documents and man pages<br></div><div>@@ -32,15 +27,12 @@ PLIST_FILES= share/man/man1/a2x.1.gz \<br></div><div> SHEBANG_FILES= asciidoc/resources/filters/*.py \<br></div><div> asciidoc/resources/filters/*/*.py<br></div><div> <br></div><div>-post-patch:<br></div><div>- @${CP} ${DISTDIR}/a2x.1.txt ${WRKSRC}/a2x.1.txt<br></div><div>- @${CP} ${DISTDIR}/asciidoc.1.txt ${WRKSRC}/asciidoc.1.txt<br></div><div> <br></div><div> post-build:<br></div><div>- @cd ${WRKSRC} && ${PYTHON_CMD} -m asciidoc.a2x -f manpage a2x.1.txt<br></div><div>- @cd ${WRKSRC} && ${PYTHON_CMD} -m asciidoc.a2x -f manpage asciidoc.1.txt<br></div><div>+ @cd ${WRKSRC}/doc && ${PYTHON_CMD} -m asciidoc.a2x -f manpage a2x.1.txt<br></div><div>+ @cd ${WRKSRC}/doc && ${PYTHON_CMD} -m asciidoc.a2x -f manpage asciidoc.1.txt<br></div><div> <br></div><div> post-install:<br></div><div>- ${INSTALL_MAN} ${WRKSRC}/a2x.1 ${WRKSRC}/asciidoc.1 ${STAGEDIR}${PREFIX}/share/man/man1/<br></div><div>+ ${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 ${STAGEDIR}${PREFIX}/share/man/man1/<br></div><div> <br></div><div> .include <<a rel="noopener noreferrer">bsd.port.mk></a>;<br></div><div>diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo<br></div><div>index 42024668e257..cce866ab8ecc 100644<br></div><div>--- a/textproc/asciidoc/distinfo<br></div><div>+++ b/textproc/asciidoc/distinfo<br></div><div>@@ -1,7 +1,3 @@<br></div><div>-TIMESTAMP = 1721280202<br></div><div>+TIMESTAMP = 1721823004<br></div><div> SHA256 (asciidoc-10.2.1.tar.gz) = d9f13c285981b3c7eb660d02ca0a2779981e88d48105de81bb40445e60dddb83<br></div><div> SIZE (asciidoc-10.2.1.tar.gz) = 230179<br></div><div>-SHA256 (a2x.1.txt) = 51b05d6be98531ec6c7ff0459dc82fdd103bc43ae682b954c98943ead4d03de7<br></div><div>-SIZE (a2x.1.txt) = 13050<br></div><div>-SHA256 (asciidoc.1.txt) = 3e412b938b51d88948e7713b5026425b15babcb8e3899ec0e2c769e10baf8d31<br></div><div>-SIZE (asciidoc.1.txt) = 7485<br></div></pre></blockquote></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">Current version in tree fails to build<br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px"><br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px"><a href="https://pdr2.bofh.network/data/140-diizzy/2024-07-24_20h21m30s/logs/errors/asciidoc-10.2.1.log" rel="noopener noreferrer" target="_blank">https://pdr2.bofh.network/data/140-diizzy/2024-07-24_20h21m30s/logs/errors/asciidoc-10.2.1.log</a><br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px"><br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">Best regards,<br></div><div style="font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px">Daniel<br></div></div></blockquote><div><br></div><div>Fixed in 9dabf20d779bf9db7075aa3f206d26bca82b9070.</div><div>Thanks. </div></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58RvzsGYgRiN3-skMNjNNstvoJOkhrRegQYGPUT75K=2rQ>