<pre style='margin:0'>
Lawrence Velázquez (larryv) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/472092cd4b3ee980100eea1a77a9a549bdff31de">https://github.com/macports/macports-ports/commit/472092cd4b3ee980100eea1a77a9a549bdff31de</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 472092cd4b3 zsh: Update to 5.9
</span>472092cd4b3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 472092cd4b3ee980100eea1a77a9a549bdff31de
</span>Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Tue May 17 01:53:20 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> zsh: Update to 5.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.zsh.org/mla/announce/msg00134.html
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Additionally, rework the way we prevent the build from unnecessarily
</span><span style='display:block; white-space:pre;color:#404040;'> regenerating documentation. There wasn't really anything wrong before,
</span><span style='display:block; white-space:pre;color:#404040;'> but I wanted to make the patch smaller and more precise.
</span>---
shells/zsh/Portfile | 23 ++++++++++------
shells/zsh/files/prevent-doc-regeneration.patch | 35 ------------------------
shells/zsh/files/prevent-info-regeneration.patch | 19 +++++++++++++
3 files changed, 33 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/zsh/Portfile b/shells/zsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63aee869a32..544cfbc5e7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/zsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/zsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name zsh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.8.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.9
</span> categories shells
platforms darwin
license Permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,15 +39,20 @@ distfiles ${distname}${extract.suffix}:src \
</span> ${distname}-doc${extract.suffix}:doc
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 483cb97daca4ba737a50a03be8170ccbe63a8d09 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3200540 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4f49ce980f92ec119978763f65c04d9670da7d51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3332400 \
</span> ${distname}-doc${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9f08dd3c26656a96e75e16d9046ea282d433fee4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8b9cb53d6432f13e9767a8680b642e8e8a52c7f1b8decd211756ca20c667f917 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3088728
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles prevent-doc-regeneration.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8f546b5cc34ac22bff72bbe914604746bb44a49e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6f7c091249575e68c177c5e8d5c3e9705660d0d3ca1647aea365fd00a0bd3e8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3130444
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles prevent-info-regeneration.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The texi2html configuration is not shipped with the pregenerated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # HTML docs, but without it the build tries to regenerate them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ touch -r ${worksrcpath}/Doc/zsh_toc.html ${worksrcpath}/Doc/texi2html.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/zsh/files/prevent-doc-regeneration.patch b/shells/zsh/files/prevent-doc-regeneration.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 010eaf544e0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/zsh/files/prevent-doc-regeneration.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We already download documentation, so stop the build from regenerating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-parts of it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Doc/Makefile.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,7 +172,7 @@ zsh_a4.ps: zsh.dvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- html: zsh_toc.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+zsh_toc.html: $(sdir)/zsh.texi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(TEXI2HTML) --output . --ifinfo --split=chapter --node-files \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --init-file texi2html.conf $(sdir)/zsh.texi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -352,16 +352,13 @@ install.info: texi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf infodir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir infodir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed '/^@setfilename/s|zsh|$(tzsh)|' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- < $(sdir)/zsh.texi > infodir/tzsh.texi && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd infodir && $(MAKEINFO) tzsh.texi) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for file in infodir/$(tzsh).info*; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for file in zsh.info*; do \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ); then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install-info --info-dir=$(DESTDIR)$(infodir) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DESTDIR)$(infodir)/$(tzsh).info; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DESTDIR)$(infodir)/zsh.info; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else true; fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf infodir; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 0; \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/zsh/files/prevent-info-regeneration.patch b/shells/zsh/files/prevent-info-regeneration.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9bc40529092
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/zsh/files/prevent-info-regeneration.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+If we haven't transformed the program name, use the info files we've
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+already downloaded instead of letting the build regenerate them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: Doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Doc/Makefile.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Doc/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,7 +355,11 @@ install.info: texi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed '/^@setfilename/s|zsh|$(tzsh)|' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ < $(sdir)/zsh.texi > infodir/tzsh.texi && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if cmp -s $(sdir)/zsh.texi infodir/tzsh.texi; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mv $(sdir)/$(tzsh).info* infodir; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd infodir && $(MAKEINFO) tzsh.texi) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :; fi && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for file in infodir/$(tzsh).info*; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done \
</span></pre><pre style='margin:0'>
</pre>