From 36350dabd7d6cc9edb0c3f86e8eae9def76c3d63 Mon Sep 17 00:00:00 2001
From: Tushar Teredesai <tushar@linuxfromscratch.org>
Date: Sat, 22 Nov 2003 18:10:18 +0000
Subject: [PATCH] sgml-common patch and whois upgrade

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1544 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 basicnet/netutils/whois/whois.ent          | 2 +-
 introduction/welcome/changelog.xml         | 4 ++++
 pst/sgml/sgml-common/sgml-common-inst.xml  | 9 +++++++--
 pst/sgml/sgml-common/sgml-common-intro.xml | 4 ++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/basicnet/netutils/whois/whois.ent b/basicnet/netutils/whois/whois.ent
index 7e454fac74..91123b35aa 100644
--- a/basicnet/netutils/whois/whois.ent
+++ b/basicnet/netutils/whois/whois.ent
@@ -2,7 +2,7 @@
 <!ENTITY whois-intro SYSTEM "whois-intro.xml">
 <!ENTITY whois-inst SYSTEM "whois-inst.xml">
 <!ENTITY whois-desc SYSTEM "whois-desc.xml">
-<!ENTITY whois-version "4.6.7">
+<!ENTITY whois-version "4.6.8">
 <!ENTITY whois-download-http "http://www.linux.it/~md/software/whois_&whois-version;.tar.gz">
 <!ENTITY whois-download-ftp "ftp://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.gz">
 <!ENTITY whois-size "46 KB">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index cd04330504..d5cc43a57b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -11,6 +11,10 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>November 22nd, 2003 [tushar]: Updated to whois 4.6.8.</para></listitem>
+
+<listitem><para>November 22nd, 2003 [tushar]: Added sgml-common patch.</para></listitem>
+
 <listitem><para>November 21st, 2003 [igor]: Updated to
 XFce-4.0.1.</para></listitem>
 
diff --git a/pst/sgml/sgml-common/sgml-common-inst.xml b/pst/sgml/sgml-common/sgml-common-inst.xml
index 5c7a21a093..2e756007e2 100644
--- a/pst/sgml/sgml-common/sgml-common-inst.xml
+++ b/pst/sgml/sgml-common/sgml-common-inst.xml
@@ -1,10 +1,16 @@
 <sect2>
 <title>Installation of <application><acronym>SGML</acronym> Common</application></title>
 
+<para>First apply the patch</para>
+
+<screen><userinput><command>patch -Np1 -i ../sgml-common-0.6.3-manpage-1.patch</command></userinput></screen>
+
 <para>The autotools files included along with sgml-common are old. Use the following
 commands to regenrate the files.</para>
 
-<screen><userinput><command>aclocal ; automake -acf ; autoconf</command></userinput></screen>
+<screen><userinput><command>aclocal &amp;&amp;
+automake -acf &amp;&amp;
+autoconf</command></userinput></screen>
 
 <para>Install <application><acronym>SGML</acronym> Common</application> by 
 running the following commands:</para>
@@ -12,7 +18,6 @@ running the following commands:</para>
 <screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-install -m 644 doc/man/*.8 /usr/share/man/man8/ &amp;&amp;
 install-catalog --add /etc/sgml/sgml-ent.cat \
 /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &amp;&amp;
 install-catalog --add /etc/sgml/sgml-docbook.cat \
diff --git a/pst/sgml/sgml-common/sgml-common-intro.xml b/pst/sgml/sgml-common/sgml-common-intro.xml
index f050a1d288..5b008f7817 100644
--- a/pst/sgml/sgml-common/sgml-common-intro.xml
+++ b/pst/sgml/sgml-common/sgml-common-intro.xml
@@ -18,5 +18,9 @@ url="&sgml-common-download-ftp;"/></para></listitem>
 &sgml-common-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink url="&patch-root;/sgml-common-&sgml-common-version;-manpage-1.patch"/></para></listitem>
+</itemizedlist></sect3>
 
 </sect2>