Correct Vim's installation of man pages to work well with Man-DB.

Patch from Alexander Patrakov and Ag Hatzim.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7630 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 36 insertions, 3 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 043a556cc..2a88e5800 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 -->
 
     <listitem>
+      <para>May 27, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Correct Vim's installation of man pages to work
+          well with Man-DB. Patch from Alexander Patrakov and Ag Hatzim.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 26, 2006</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 7edce3ec0..d878db0a3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -255,6 +255,9 @@
     <listitem>
       <para>&vim-fixes-patch;</para>
     </listitem>
+    <listitem>
+      <para>&vim-mandir-patch;</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f4da82764..ec6ee71aa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -275,6 +275,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Vim Man Directories Patch - <token>&vim-mandir-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&vim-mandir-patch;"/></para>
+        <para>MD5 sum: <literal>&vim-mandir-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index f10bbd9ab..8df377976 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -51,7 +51,15 @@
 
 <screen><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
 
-    <para>Next, change the default location of the
+    <para>This version of Vim installs translated man pages and places
+    them into directories that will not be searched by Man-DB. Patch Vim
+    so that it installs its man pages into searchable directories and
+    ultimately allows Man-DB to transcode the page into the desired format
+    at run-time:</para>
+
+<screen><userinput>patch -Np1 -i ../&vim-mandir-patch;</userinput></screen>
+
+    <para>Finally, change the default location of the
     <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
 
diff --git a/general.ent b/general.ent
index 371cc9261..76a65b658 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060526">
-<!ENTITY releasedate "May 26, 2006">
+<!ENTITY version "SVN-20060527">
+<!ENTITY releasedate "May 27, 2006">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
diff --git a/patches.ent b/patches.ent
index 06aab1c34..5596504a7 100644
--- a/patches.ent
+++ b/patches.ent
@@ -150,3 +150,7 @@
 <!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-3.patch">
 <!ENTITY vim-fixes-patch-md5 "ed158ebfb653b797b642fbff175addea">
 <!ENTITY vim-fixes-patch-size "18 KB">
+
+<!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
+<!ENTITY vim-mandir-patch-md5 "40bcd2845c9cee95ff965a0e1fafad79">
+<!ENTITY vim-mandir-patch-size "4.2 KB">