Changeset c561eaa for BOOK/final-system

Timestamp:

Dec 28, 2015, 6:43:01 PM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

sysvinit

Children:

8633cac

Parents:

a55f9e7

git-author:

William Harrington <kb0iic@…> (12/28/15 18:42:49)

git-committer:

William Harrington <kb0iic@…> (12/28/15 18:43:01)

Message:

Upgrade Ncurses from 5.9 to 6.0

Location:

BOOK/final-system

Files:

• common/ncurses.xml (modified) (5 diffs)
• multilib/ncurses-64bit.xml (modified) (5 diffs)
• multilib/ncurses-n32.xml (modified) (5 diffs)
• multilib/ncurses.xml (modified) (5 diffs)

BOOK/final-system/common/ncurses.xml

@@ -26 +26 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <para os="p1">The following patch contains updates from the &ncurses-version; branch
     by the Ncurses developers:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&ncurses-branch_update-patch;</userinput></screen>
+-->
 
     <para os="a">Prepare Ncurses for compilation:</para>
@@ -39 +41 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <variablelist os="b1">
@@ -99 +99 @@
 ln -sfv libncursesw.a /usr/lib/libcursesw.a
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
+ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
 
   </sect2>
@@ -113 +113 @@
       <seglistitem>
         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
+        ncursesw6-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
         <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
@@ -166 +166 @@
       </varlistentry>
 
-      <varlistentry id="ncursesw5-config">
-        <term><command>ncursesw5-config</command></term>
+      <varlistentry id="ncursesw6-config">
+        <term><command>ncursesw6-config</command></term>
         <listitem>
           <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncursesw5-config">
-            <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
+          <indexterm zone="ch-system-ncurses ncursesw6-config">
+            <primary sortas="b-ncursesw6-config">ncursesw6-config</primary>
           </indexterm>
         </listitem>

BOOK/final-system/multilib/ncurses-64bit.xml

@@ -22 +22 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
@@ -29 +30 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41 +43 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -65 +65 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper and then wrap it:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-64}
-ln -svf multiarch_wrapper /usr/bin/ncursesw5-config</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-64}
+ln -svf multiarch_wrapper /usr/bin/ncursesw6-config</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98 +98 @@
 ln -sfv libncurses.a /usr/lib64/libcurses.a
 ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
-ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
-ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
+ln -sfv ncursesw6-config-64 /usr/bin/ncurses6-config-64
+ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/ncurses-n32.xml

@@ -23 +23 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
@@ -30 +31 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42 +44 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -66 +66 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-n32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-n32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98 +98 @@
 ln -sfv libncurses.a /usr/lib32/libcurses.a
 ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
-ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/ncurses.xml

@@ -23 +23 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
@@ -30 +31 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42 +44 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -70 +70 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -104 +104 @@
 ln -sfv libncurses.a /usr/lib/libcurses.a
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
 
   </sect2>