From 7027db5944782f1d1330e49f4f7767ee75525137 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Fri, 18 May 2012 21:14:54 +0000
Subject: Remove resizecons.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9859 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter06/kbd.xml       | 17 ++++++++++++++---
 general.ent             |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8d7a425db..5c1bc3ef5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-05-18</para>
+      <itemizedlist>
+         <listitem>
+           <para>[ken] - Remove the redundant program resizecons from kbd and
+           remove its man page (program was only installed on i?86, but man page
+           was always installed).</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-05-14</para>
       <itemizedlist>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index fa6133bda..7ff1e06d8 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -5,6 +5,9 @@
   %general-entities;
 ]>
 
+<!-- FIXME: upstream git has been persuaded by SuSe to build resizecons on x86_64,
+so the sed will need attention if that change is not removed before the next release -->
+
 <sect1 id="ch-system-kbd" role="wrap">
   <?dbhtml filename="kbd.html"?>
 
@@ -60,6 +63,14 @@
 
 <screen><userinput remap="pre">sed -i '/guardado\ el/s/\(^.*en\ %\)\(.*\)/\14\$\2/' po/es.po</userinput></screen>
 
+    <para>Remove the redundant <command>resizecons</command> program (32-bit x86
+    only, needs the defunct svgalib, which predates linux-2.6 and is incompatible
+    with modern KMS, to provide the video mode files - for normal use
+    <command>setfont</command> sizes the console appropriately) and its manpage:</para>
+
+<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/' configure &amp;&amp;
+sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
+
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
@@ -123,7 +134,7 @@ cp -R -v doc/* \
         <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
         kbdrate, loadkeys, loadunimap,
         mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
-        psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
+        psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,-->
         setfont, setkeycodes, setleds, setmetamode,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
         <seg>/lib/kbd</seg>
@@ -287,7 +298,7 @@ cp -R -v doc/* \
         </listitem>
       </varlistentry>
 
-      <varlistentry id="resizecons">
+  <!--<varlistentry id="resizecons">
         <term><command>resizecons</command></term>
         <listitem>
           <para>Changes the kernel idea of the console size</para>
@@ -295,7 +306,7 @@ cp -R -v doc/* \
             <primary sortas="b-resizecons">resizecons</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="setfont">
         <term><command>setfont</command></term>
diff --git a/general.ent b/general.ent
index 1e9017787..37faddf6b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120514">
-<!ENTITY releasedate "May 14, 2012">
+<!ENTITY version "SVN-20120518">
+<!ENTITY releasedate "May 18, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
-- 
cgit v1.2.3-54-g00ecf