Changeset 2808033 for postlfs/shells

Timestamp:

07/14/2013 04:22:11 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

75aa5438

Parents:

591858f

Message:

Merge trunk and systemd branch, part 4.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11409 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

postlfs/shells

Files:

• dash.xml (modified) (1 diff)
• tcsh.xml (modified) (1 diff)
• zsh.xml (modified) (5 diffs)

postlfs/shells/dash.xml

@@ -38 +38 @@
     a script is completely compatible with POSIX syntax.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

postlfs/shells/tcsh.xml

@@ -37 +37 @@
     installation tasks.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

postlfs/shells/zsh.xml

@@ -7 +7 @@
   <!ENTITY zsh-download-http "&sourceforge-repo;/zsh/zsh-&zsh-version;.tar.bz2">
   <!ENTITY zsh-download-ftp  " ">
-  <!ENTITY zsh-md5sum        "e8484468925cec8d9a84b8b04797e764">
+  <!ENTITY zsh-md5sum        "b8f2ad691acf58b3252225746480dcad">
   <!ENTITY zsh-size          "2.9 MB">
-  <!ENTITY zsh-buildsize     "61 MB (includes installing all documentation)">
-  <!ENTITY zsh-time          "0.7 SBU">
-
-  <!ENTITY zsh-doc-md5sum    "b3a026cf02471b66454a2b241a4d92a4">
+  <!ENTITY zsh-buildsize     "65 MB (includes installing documentation)">
+  <!ENTITY zsh-time          "1.1 SBU">
+
+  <!ENTITY zsh-doc-md5sum    "b6818cbbea635b2f70883bb913d0a04a">
 ]>
 
@@ -38 +38 @@
     <application>ksh</application> but includes many enhancements.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -65 +65 @@
     <itemizedlist spacing="compact">
       <listitem>
+         <para>Required patch: <ulink 
+         url="&patch-root;/zsh-&zsh-version;-makeinfo-1.patch"/></para>
+      </listitem>
+      <listitem>
         <para>Optional Documentation: <ulink
         url="&sourceforge-repo;/zsh/zsh-&zsh-version;-doc.tar.bz2"/></para>
       </listitem>
       <listitem>
-        <para>MD5 sum: &zsh-doc-md5sum;</para>
+        <para>Documentation MD5 sum: &zsh-doc-md5sum;</para>
       </listitem>
     </itemizedlist>
@@ -76 +80 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pcre"/>
+    <para role="optional">
+      <xref linkend="pcre"/>
     </para>
 
@@ -95 +100 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --bindir=/bin \
+<screen><userinput>patch -Np1 -i ../zsh-&zsh-version;-makeinfo-1.patch &amp;&amp;
+
+./configure --prefix=/usr         \
+            --bindir=/bin         \
             --sysconfdir=/etc/zsh \
-            --enable-etcdir=/etc/zsh &amp;&amp;
-make &amp;&amp;
-
-makeinfo  Doc/zsh.texi --html      -o Doc/html             &amp;&amp;
-makeinfo  Doc/zsh.texi --html --no-split --no-headers      \
-                                   -o Doc/zsh.html &amp;&amp;
+            --enable-etcdir=/etc/zsh                  &amp;&amp;
+make                                                  &amp;&amp;
+
+makeinfo  Doc/zsh.texi --html      -o Doc/html        &amp;&amp;
+makeinfo  Doc/zsh.texi --html --no-split --no-headers \
+                                   -o Doc/zsh.html    &amp;&amp;
 makeinfo  Doc/zsh.texi --plaintext -o Doc/zsh.txt</userinput></screen>