[150774] trunk/dports/shells/zsh
larryv at macports.org
larryv at macports.org
Thu Jul 28 00:05:55 PDT 2016
Revision: 150774
https://trac.macports.org/changeset/150774
Author: larryv at macports.org
Date: 2016-07-28 00:05:54 -0700 (Thu, 28 Jul 2016)
Log Message:
-----------
zsh: Update to 5.2 (#51806)
Also:
- Patch the documentation build so it doesn't regenerate anything
(#45318) and drop the dependency on makeinfo. I want to use the
prebuilt docs straight from the tarball.
- Don't install the changelog anymore-it's dev minutiæ that's not
relevant for users. The good stuff is in NEWS.
Modified Paths:
--------------
trunk/dports/shells/zsh/Portfile
Added Paths:
-----------
trunk/dports/shells/zsh/files/
trunk/dports/shells/zsh/files/prevent-doc-regeneration.patch
Modified: trunk/dports/shells/zsh/Portfile
===================================================================
--- trunk/dports/shells/zsh/Portfile 2016-07-28 07:05:47 UTC (rev 150773)
+++ trunk/dports/shells/zsh/Portfile 2016-07-28 07:05:54 UTC (rev 150774)
@@ -4,7 +4,7 @@
PortSystem 1.0
name zsh
-version 5.1.1
+version 5.2
categories shells
platforms darwin
license Permissive
@@ -18,9 +18,6 @@
many original features were added.}
homepage http://www.zsh.org
-depends_build bin:makeinfo:texinfo
-depends_skip_archcheck-append texinfo
-
depends_lib port:gdbm \
port:libiconv \
port:ncurses \
@@ -42,12 +39,14 @@
${distname}-doc${extract.suffix}:doc
checksums ${distname}${extract.suffix} \
- rmd160 28baa80559d3bad4a38859c2c5b5ac65d508f518 \
- sha256 74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec \
+ rmd160 97aa895e0a1b8ba94852b57daadab261ed60c4c3 \
+ sha256 f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d \
${distname}-doc${extract.suffix} \
- rmd160 5d246233189a5906eb05391abc0998fbf6479f82 \
- sha256 f5944f29ec77100afdc3634f0bb8ffc4328a2d03147f23d1aa6280b6aa7d622f
+ rmd160 dba15e5560ddf6d61e748765b59acd34a8a1f561 \
+ sha256 328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a
+patchfiles prevent-doc-regeneration.patch
+
set docdir ${prefix}/share/doc/${name}
configure.args --enable-cap \
@@ -71,7 +70,7 @@
# Install neglected documentation.
xinstall -m 0644 -W ${worksrcpath} \
- ChangeLog FEATURES LICENCE META-FAQ NEWS README ${destroot}${docdir}
+ FEATURES LICENCE META-FAQ NEWS README ${destroot}${docdir}
xinstall -d ${destroot}${docdir}/pdf
xinstall -m 0644 -W ${worksrcpath}/Doc \
intro.a4.pdf intro.us.pdf zsh.pdf ${destroot}${docdir}/pdf
Added: trunk/dports/shells/zsh/files/prevent-doc-regeneration.patch
===================================================================
--- trunk/dports/shells/zsh/files/prevent-doc-regeneration.patch (rev 0)
+++ trunk/dports/shells/zsh/files/prevent-doc-regeneration.patch 2016-07-28 07:05:54 UTC (rev 150774)
@@ -0,0 +1,35 @@
+We already download documentation, so stop the build from regenerating
+parts of it.
+
+Index: Doc/Makefile.in
+===================================================================
+--- Doc/Makefile.in.orig
++++ Doc/Makefile.in
+@@ -161,7 +161,7 @@ zsh_a4.ps: zsh.dvi
+ html: zsh_toc.html
+ .PHONY: html
+
+-zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
++zsh_toc.html: $(sdir)/zsh.texi
+ $(TEXI2HTML) --output . --ifinfo --split=chapter --node-files \
+ --init-file texi2html.conf $(sdir)/zsh.texi
+
+@@ -342,16 +342,13 @@ install.info: texi
+ rm -rf infodir
+ mkdir infodir
+ if ( \
+- sed '/^@setfilename/s|zsh|$(tzsh)|' \
+- < $(sdir)/zsh.texi > infodir/tzsh.texi && \
+- (cd infodir && $(MAKEINFO) tzsh.texi) && \
+- for file in infodir/$(tzsh).info*; do \
++ for file in zsh.info*; do \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir) || exit 1; \
+ done \
+ ); then \
+ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+ install-info --info-dir=$(DESTDIR)$(infodir) \
+- $(DESTDIR)$(infodir)/$(tzsh).info; \
++ $(DESTDIR)$(infodir)/zsh.info; \
+ else true; fi; \
+ rm -rf infodir; \
+ exit 0; \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160728/ac78d1bb/attachment.html>
More information about the macports-changes
mailing list