<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150774] trunk/dports/shells/zsh</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/150774">150774</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-07-28 00:05:54 -0700 (Thu, 28 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsshellszshPortfile">trunk/dports/shells/zsh/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/shells/zsh/files/</li>
<li><a href="#trunkdportsshellszshfilespreventdocregenerationpatch">trunk/dports/shells/zsh/files/prevent-doc-regeneration.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsshellszshPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/shells/zsh/Portfile (150773 => 150774)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name zsh
</span><del>-version 5.1.1
</del><ins>+version 5.2
</ins><span class="cx"> categories shells
</span><span class="cx"> platforms darwin
</span><span class="cx"> license Permissive
</span><span class="lines">@@ -18,9 +18,6 @@
</span><span class="cx"> many original features were added.}
</span><span class="cx"> homepage http://www.zsh.org
</span><span class="cx">
</span><del>-depends_build bin:makeinfo:texinfo
-depends_skip_archcheck-append texinfo
-
</del><span class="cx"> depends_lib port:gdbm \
</span><span class="cx"> port:libiconv \
</span><span class="cx"> port:ncurses \
</span><span class="lines">@@ -42,12 +39,14 @@
</span><span class="cx"> ${distname}-doc${extract.suffix}:doc
</span><span class="cx">
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- rmd160 28baa80559d3bad4a38859c2c5b5ac65d508f518 \
- sha256 74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec \
</del><ins>+ rmd160 97aa895e0a1b8ba94852b57daadab261ed60c4c3 \
+ sha256 f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d \
</ins><span class="cx"> ${distname}-doc${extract.suffix} \
</span><del>- rmd160 5d246233189a5906eb05391abc0998fbf6479f82 \
- sha256 f5944f29ec77100afdc3634f0bb8ffc4328a2d03147f23d1aa6280b6aa7d622f
</del><ins>+ rmd160 dba15e5560ddf6d61e748765b59acd34a8a1f561 \
+ sha256 328352cf3d5d0ec4b6e31dcefd25ff5b4c0e6b8077d1fe84448ebb50d6ada52a
</ins><span class="cx">
</span><ins>+patchfiles prevent-doc-regeneration.patch
+
</ins><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx">
</span><span class="cx"> configure.args --enable-cap \
</span><span class="lines">@@ -71,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> # Install neglected documentation.
</span><span class="cx"> xinstall -m 0644 -W ${worksrcpath} \
</span><del>- ChangeLog FEATURES LICENCE META-FAQ NEWS README ${destroot}${docdir}
</del><ins>+ FEATURES LICENCE META-FAQ NEWS README ${destroot}${docdir}
</ins><span class="cx"> xinstall -d ${destroot}${docdir}/pdf
</span><span class="cx"> xinstall -m 0644 -W ${worksrcpath}/Doc \
</span><span class="cx"> intro.a4.pdf intro.us.pdf zsh.pdf ${destroot}${docdir}/pdf
</span></span></pre></div>
<a id="trunkdportsshellszshfilespreventdocregenerationpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/shells/zsh/files/prevent-doc-regeneration.patch (0 => 150774)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+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; \
</ins></span></pre>
</div>
</div>
</body>
</html>