From 9a483b223178eed4461c6d590869217930f2b9c2 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 16 Aug 2010 16:30:48 +0000
Subject: [PATCH] Updated to vim-7.3

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9362 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter03/packages.xml  |  9 ---------
 chapter06/vim.xml       | 19 ++++---------------
 packages.ent            | 15 +++++----------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9a7d81baa..b30beab93 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
 
+    <listitem>
+      <para>2010-08-16</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Updated to vim-7.3. Fixes
+           <ulink url="&lfs-ticket-root;2721">#2721</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-08-15</para>
       <itemizedlist>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 715e39f50..e4a752f04 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -592,15 +592,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Vim (&vim-lang-version;) language files (optional) - <token>&vim-lang-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&vim-lang-home;"/></para>
-        <para>Download: <ulink url="&vim-lang-url;"/></para>
-        <para>MD5 sum: <literal>&vim-lang-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
       <listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 84c5f60f1..e3b52d299 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -8,12 +8,6 @@
 <sect1 id="ch-system-vim" role="wrap">
   <?dbhtml filename="vim.html"?>
 
-  <sect1info condition="script">
-    <productname>vim</productname>
-    <productnumber>&vim-version;</productnumber>
-    <address>&vim-url;<otheraddr>&vim-lang-url;</otheraddr></address>
-  </sect1info>
-
   <title>Vim-&vim-version;</title>
 
   <indexterm zone="ch-system-vim">
@@ -49,12 +43,7 @@
   <sect2 role="installation">
     <title>Installation of Vim</title>
 
-    <para>First, unpack both
-    <filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
-    <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
-    same directory.</para>
-
-    <para>Change the default location of the
+    <para>First, change the default location of the
     <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
 
@@ -200,9 +189,9 @@ set spell</literal></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>ex (link to vim), rview (link to vim), rvim (link to vim), 
-        vi (link to vim), view (link to vim), vim, 
-        vimdiff (link to vim), vimtutor, and xxd</seg>
+       <seg> ex (link to vim), rview (link to vim), rvim (link to vim), vi
+       (link to vim), view (link to vim), vim, vimdiff (link to vim), vimtutor,
+       and xxd</seg>
         <seg>/usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>
diff --git a/packages.ent b/packages.ent
index 1b64aba6f..79b875155 100644
--- a/packages.ent
+++ b/packages.ent
@@ -543,19 +543,14 @@
 <!ENTITY util-linux-ng-ch6-du "49 MB">
 <!ENTITY util-linux-ng-ch6-sbu "0.6 SBU">
 
-<!ENTITY vim-version "7.2">
-<!ENTITY vim-docdir "vim/vim72">
-<!ENTITY vim-size "7,035 KB">
+<!ENTITY vim-version "7.3">
+<!ENTITY vim-docdir "vim/vim73">
+<!ENTITY vim-size "8,675 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "f0901284b338e448bfd79ccca0041254">
+<!ENTITY vim-md5 "5b9510a17074e2b37d8bb38ae09edbf2">
 <!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-ch6-du "79 MB">
+<!ENTITY vim-ch6-du "87 MB">
 <!ENTITY vim-ch6-sbu "1.0 SBU">
-<!ENTITY vim-lang-version "&vim-version;">
-<!ENTITY vim-lang-size "1,365 KB">
-<!ENTITY vim-lang-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-lang-version;-lang.tar.gz">
-<!ENTITY vim-lang-md5 "d8884786979e0e520c112faf2e176f05">
-<!ENTITY vim-lang-home "http://www.vim.org">
 
 <!ENTITY zlib-version "1.2.5">
 <!ENTITY zlib-size "532 KB">