From 21308e271ca17c9a8f4ef23228eb11c242d883f5 Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Sun, 15 Feb 2004 10:48:22 +0000
Subject: [PATCH] Upgrade ncurses to 5.4

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3252 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendixa/ncurses-down.xml | 4 +---
 chapter01/changelog.xml    | 3 +++
 chapter04/chapter04.xml    | 3 ---
 chapter05/ncurses.xml      | 7 +------
 chapter06/ncurses.xml      | 7 +------
 entities/ncurses.ent       | 5 +----
 index.xml                  | 4 ++--
 7 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml
index 6347ad76d..b3bf54057 100644
--- a/appendixa/ncurses-down.xml
+++ b/appendixa/ncurses-down.xml
@@ -1,4 +1,2 @@
 <literallayout>Official download location for Ncurses (&ncurses-version;): 
-<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/>
-And for the patch:
-<ulink url="&patches-root;&ncurses-etip-patch;"/></literallayout>
+<ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/></literallayout>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a7ff154c0..fab74c2c0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,6 +6,9 @@
 
 <itemizedlist>
 
+<listitem><para>February 14th, 2004 [jeremy]: Chapters 5 & 6 - Upgraded
+ncurses to version 5.4</para></listitem>
+
 <listitem><para>February 12th, 2004 [jeremy]: Chapter 6 - Removed explicit
 paths from the pwconv and grpconv commands, since /usr/sbin is part of
 the default path</para></listitem>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index d050c8bcf..eeb826d01 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -313,9 +313,6 @@ Kbd More-Programs Patch - &kbd-patch-size;:
 Man 80-Columns Patch - &man-80cols-patch-size;:
 <ulink url="&patches-root;&man-80cols-patch;"/>
 
-Ncurses Etip Patch - &ncurses-etip-patch-size;:
-<ulink url="&patches-root;&ncurses-etip-patch;"/>
-
 Net-tools Mii-Tool-Gcc33 Patch - &net-tools-mii-patch-size;:
 <ulink url="&patches-root;&net-tools-mii-patch;"/>
 
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index f956dbaf8..e274cc5c2 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -13,12 +13,7 @@
 <sect2>
 <title>Installation of Ncurses</title>
 
-<para>Fix a minor problem related to the <filename>etip.h</filename> header
-file:</para>
-
-<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;</userinput></screen>
-
-<para>Now prepare Ncurses for compilation:</para>
+<para>Prepare Ncurses for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --with-shared \
 &nbsp;&nbsp;&nbsp;&nbsp;--without-debug --without-ada --enable-overwrite</userinput></screen>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index da9dabe69..82a9c23ba 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -16,12 +16,7 @@ handling of character screens.</para>
 <sect2>
 <title>Installation of Ncurses</title>
 
-<para>Fix a minor problem related to the <filename>etip.h</filename> header
-file:</para>
-
-<screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;</userinput></screen>
-
-<para>Now prepare Ncurses for compilation:</para>
+<para>Prepare Ncurses for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --with-shared --without-debug</userinput></screen>
 
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 76c01e50a..ba827c9c0 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -7,16 +7,13 @@
 <!ENTITY aa-ncurses-dep SYSTEM "../appendixa/ncurses-dep.xml">
 <!ENTITY aa-ncurses-down SYSTEM "../appendixa/ncurses-down.xml">
 
-<!ENTITY ncurses-version "5.3">
+<!ENTITY ncurses-version "5.4">
 <!ENTITY ncurses-depversion "5.2">
 <!ENTITY ncurses-contversion "5.3">
 <!ENTITY ncurses-dir "ncurses-&ncurses-version;">
 <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-size "2,019 KB">
 
-<!ENTITY ncurses-etip-patch "ncurses-&ncurses-version;-etip-2.patch">
-<!ENTITY ncurses-etip-patch-size "1 KB">
-
 <!ENTITY ncurses-compsize-tools "26 MB">
 <!ENTITY ncurses-time-tools "0.7 SBU">
 
diff --git a/index.xml b/index.xml
index ca3d1b121..57afdc24c 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-2004-02-12">
-<!ENTITY releasedate "February 12th, 2004">
+<!ENTITY version "CVS-2004-02-14">
+<!ENTITY releasedate "February 14th, 2004">
 <!ENTITY milestone "5.2">
 <!ENTITY nbsp " ">