From 53c5151d7cc321774ea083dc0679e6fe232aceb2 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 13 May 2007 15:56:33 +0000
Subject: Upgrade to Vim-7.1.  Fixes #2001.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8135 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/whatsnew.xml |  7 ++-----
 chapter03/patches.xml  |  8 --------
 chapter06/vim.xml      |  5 +----
 packages.ent           | 10 +++++-----
 patches.ent            |  6 +-----
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 174b2d038..c2902ea4c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -181,9 +181,9 @@
     <!--<listitem>
       <para>Util-Linux &util-linux-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Vim &vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Zlib &zlib-version;</para>
     </listitem>-->
@@ -225,9 +225,6 @@
     <listitem>
       <para>&util-linux-lseek-patch;</para>
     </listitem>
-    <listitem>
-      <para>&vim-fixes-patch;</para>
-    </listitem>
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 29c6a0303..49c8d933b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -260,14 +260,6 @@
     </varlistentry>
 
 
-    <varlistentry>
-      <term>Vim Upstream Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&vim-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&vim-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Vim Man Directories Patch - <token>&vim-mandir-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 849d613f7..5f8123a96 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -46,10 +46,7 @@
     <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. Then, patch Vim with several fixes from upstream
-    developers since the initial release of Vim-&vim-version;:</para>
-
-<screen><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
+    same directory.</para>
 
     <para>This version of Vim installs translated man pages and places
     them into directories that will not be searched by Man-DB. Patch Vim
diff --git a/packages.ent b/packages.ent
index a5218458f..4a817d17c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -506,17 +506,17 @@
 <!ENTITY util-linux-ch6-du "17.2 MB">
 <!ENTITY util-linux-ch6-sbu "0.2 SBU">
 
-<!ENTITY vim-version "7.0">
-<!ENTITY vim-size "6,152 KB">
+<!ENTITY vim-version "7.1">
+<!ENTITY vim-size "6,714 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "4ca69757678272f718b1041c810d82d8">
+<!ENTITY vim-md5 "44c6b4914f38d6f9aa959640b89da329">
 <!ENTITY vim-home "http://www.vim.org">
 <!ENTITY vim-ch6-du "47.4 MB">
 <!ENTITY vim-ch6-sbu "0.4 SBU">
 <!ENTITY vim-lang-version "&vim-version;">
-<!ENTITY vim-lang-size "1,228 KB">
+<!ENTITY vim-lang-size "1,161 KB">
 <!ENTITY vim-lang-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-lang-version;-lang.tar.gz">
-<!ENTITY vim-lang-md5 "6d43efaff570b5c86e76b833ea0c6a04">
+<!ENTITY vim-lang-md5 "144aa049ba70621acf4247f0459f3ee7">
 <!ENTITY vim-lang-home "http://www.vim.org">
 
 <!ENTITY zlib-version "1.2.3">
diff --git a/patches.ent b/patches.ent
index 5d5788b8f..0298b01e2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -141,10 +141,6 @@
 <!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
 <!ENTITY util-linux-lseek-patch-size "10 KB">
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-16.patch">
-<!ENTITY vim-fixes-patch-md5 "031bbd27553e4fac022f628c5db7094b">
-<!ENTITY vim-fixes-patch-size "386 KB">
-
 <!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
-<!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">
+<!ENTITY vim-mandir-patch-md5 "fd282a78e3afdc5dab28af48be56026c">
 <!ENTITY vim-mandir-patch-size "4.2 KB">
-- 
cgit v1.2.3-54-g00ecf