r2834 - in trunk/BOOK: general/genlib general/graphlib introduction/welcome pst/sgml pst/typesetting

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Oct 18 18:31:24 PDT 2004


Author: randy
Date: 2004-10-18 19:31:22 -0600 (Mon, 18 Oct 2004)
New Revision: 2834

Modified:
   trunk/BOOK/general/genlib/libusb.xml
   trunk/BOOK/general/graphlib/fontconfig.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/sgml/docbook-utils.xml
   trunk/BOOK/pst/typesetting/jadetex.xml
Log:
Modified sed commands in JadeTex instructions; modified DocBook-utils, libusb and FontConfig instructions to account for removal of OpenSP SGML catalog definitions

Modified: trunk/BOOK/general/genlib/libusb.xml
===================================================================
--- trunk/BOOK/general/genlib/libusb.xml	2004-10-18 22:35:45 UTC (rev 2833)
+++ trunk/BOOK/general/genlib/libusb.xml	2004-10-19 01:31:22 UTC (rev 2834)
@@ -57,22 +57,16 @@
 <title>Command explanations</title>
 
 <para><option>--disable-build-docs</option>: This switch avoids building the
-documentation. If you wish to build the documentation , you may need to remove 
+documentation. If you wish to build the documentation, you may need to remove 
 the <application>OpenSP</application> catalog definitions from the system 
-<acronym>SGML</acronym> catalogs. Use the following commands before building 
+<acronym>SGML</acronym> catalogs. Use the following command before building 
 the package to accomplish this:</para>
 
-<screen><userinput><command>sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
-    /etc/sgml/catalog &&
-sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+<screen><userinput><command>sed -i.orig \
+    -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+    /etc/sgml/catalog \
     /etc/sgml/sgml-docbook.cat</command></userinput></screen>
 
-<para>If desired, restore the orginal <acronym>SGML</acronym> catalogs after 
-the build is complete using the following commands:</para>
-
-<screen><userinput><command>cp /etc/sgml/catalog.orig /etc/sgml/catalog &&
-cp /etc/sgml/sgml-docbook.cat.orig /etc/sgml/sgml-docbook.cat</command></userinput></screen>
-
 </sect2>
 
 <sect2>

Modified: trunk/BOOK/general/graphlib/fontconfig.xml
===================================================================
--- trunk/BOOK/general/graphlib/fontconfig.xml	2004-10-18 22:35:45 UTC (rev 2833)
+++ trunk/BOOK/general/graphlib/fontconfig.xml	2004-10-19 01:31:22 UTC (rev 2834)
@@ -74,20 +74,14 @@
 documentation. If you wish to build the documentation using 
 <application>DocBook-utils</application>, you may need to remove the 
 <application>OpenSP</application> catalog definitions from the system 
-<acronym>SGML</acronym> catalogs. Use the following commands before building 
+<acronym>SGML</acronym> catalogs. Use the following command before building 
 the package to accomplish this:</para>
 
-<screen><userinput><command>sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
-    /etc/sgml/catalog &&
-sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+<screen><userinput><command>sed -i.orig \
+    -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+    /etc/sgml/catalog \
     /etc/sgml/sgml-docbook.cat</command></userinput></screen>
 
-<para>If desired, restore the orginal <acronym>SGML</acronym> catalogs after 
-the build is complete using the following commands:</para>
-
-<screen><userinput><command>cp /etc/sgml/catalog.orig /etc/sgml/catalog &&
-cp /etc/sgml/sgml-docbook.cat.orig /etc/sgml/sgml-docbook.cat</command></userinput></screen>
-
 </sect2>
 
 <sect2>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-10-18 22:35:45 UTC (rev 2833)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-10-19 01:31:22 UTC (rev 2834)
@@ -23,7 +23,9 @@
 <itemizedlist>
 
 <listitem><para>October 18th, 2004 [randy]: Updated to 
-DocBook XSL Stylesheets-1.66.1</para></listitem>
+DocBook XSL Stylesheets-1.66.1; modified DocBook-utils, FontConfig and
+libusb instructions to account for the removal of the OpenSP SGML catalog
+definitions; modified sed commands in JadeTeX instructions.</para></listitem>
 
 <listitem><para>October 18th, 2004 [larry]: Added autofs-4.1.3 to
 postlfs/config.</para></listitem>

Modified: trunk/BOOK/pst/sgml/docbook-utils.xml
===================================================================
--- trunk/BOOK/pst/sgml/docbook-utils.xml	2004-10-18 22:35:45 UTC (rev 2833)
+++ trunk/BOOK/pst/sgml/docbook-utils.xml	2004-10-19 01:31:22 UTC (rev 2834)
@@ -19,7 +19,6 @@
 <?dbhtml filename="docbook-utils.html"?>
 <title>DocBook-utils-&docbook-utils-version;</title>
 
-
 <sect2>
 <title>Introduction to <application>DocBook-utils</application></title>
 
@@ -62,20 +61,33 @@
 <sect2>
 <title>Installation of <application>DocBook-utils</application></title>
 
+<note><para>Earlier versions of the <acronym>BLFS</acronym>
+<application>OpenSP</application> instructions installed a catalog
+containing an SGMLDECL <filename>unicode.sd</filename> declaration
+into the system <acronym>SGML</acronym> catalogs. This declaration
+causes some of the <application>OpenJade</application> programs to
+fail occasionally. You'll need to remove these catalog definitions
+if they exist, or the package build will fail. The following command
+can determine if you need to remove these catalog definitions:</para>
+
+<screen><userinput><command>grep "OpenSP-1.5.1" /etc/sgml/catalog</command></userinput></screen>
+
+<para>If anything was returned, run the following command to remove
+the catalog definitions:</para>
+
+<screen><userinput><command>sed -i.orig \
+    -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+    /etc/sgml/catalog \
+    /etc/sgml/sgml-docbook.cat</command></userinput></screen></note>
+
 <para>Install <application>DocBook-utils</application> by running the 
 following commands:</para>
 
-<screen><userinput><command>sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
-    /etc/sgml/catalog &&
-sed -i.orig -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
-    /etc/sgml/sgml-docbook.cat &&
-./configure --prefix=/usr &&
+<screen><userinput><command>./configure --prefix=/usr &&
 make &&
-make install &&
-cp /etc/sgml/catalog.orig /etc/sgml/catalog &&
-cp /etc/sgml/sgml-docbook.cat.orig /etc/sgml/sgml-docbook.cat</command></userinput></screen>
+make install</command></userinput></screen>
 
-<para>Many packages will use an alternate name for the 
+<para>Many packages use an alternate name for the 
 <application>DocBook-utils</application> scripts. If you wish to create these 
 alternate names, use the following command:</para>
 
@@ -87,21 +99,6 @@
 </sect2>
 
 <sect2>
-<title>Command explanations</title>
-
-<para><command>sed -i.orig -e ...</command>: These two <command>sed</command>'s 
-remove <application>OpenSP</application> catalog definitions from the
-<acronym>SGML</acronym> catalogs because the SGMLDECL unicode.sd declaration
-creates errors when <command>openjade</command> builds the 
-<application>DocBook-utils</application> documentation files. Backup copies of 
-the files are made and copied back to their original place after the build is 
-complete. Though these errors are harmless, and won't affect 
-<application>DocBook-utils</application> functionality after the build, the
-declarations are temporarily removed to provide a clean package build.</para>
-
-</sect2>
-
-<sect2>
 <title>Contents</title>
 
 <para>The <application>DocBook-utils</application> package contains 

Modified: trunk/BOOK/pst/typesetting/jadetex.xml
===================================================================
--- trunk/BOOK/pst/typesetting/jadetex.xml	2004-10-18 22:35:45 UTC (rev 2833)
+++ trunk/BOOK/pst/typesetting/jadetex.xml	2004-10-19 01:31:22 UTC (rev 2834)
@@ -52,9 +52,7 @@
 <para>Install <application>JadeTex</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>cp /usr/share/texmf/web2c/texmf.cnf \
-   /usr/share/texmf/web2c/texmf.cnf.backup &&
-sed -i -e "s at original texmf.cnf at modified texmf.cnf@" \
+<screen><userinput><command>sed -i.orig -e "s/original texmf.cnf/modified texmf.cnf/" \
    /usr/share/texmf/web2c/texmf.cnf</command></userinput></screen>
 
 <para>You'll need to make two modifications to 
@@ -116,7 +114,7 @@
 cd config &&
 tex -ini -progname=latex latex.ini &&
 mv /usr/share/texmf/web2c/latex.fmt \
-   /usr/share/texmf/web2c/latex.fmt.backup &&
+   /usr/share/texmf/web2c/latex.fmt.orig &&
 install -m 644 latex.fmt /usr/share/texmf/web2c &&
 cd ..</command></userinput></screen>
 
@@ -133,7 +131,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><command>sed -i -e "s at original texmf.cnf at modified texmf.cnf@"</command>: 
+<para><command>sed -i -e "s/original texmf.cnf/modified texmf.cnf/"</command>: 
 This changes <filename>/usr/share/texmf/web2c/texmf.cnf</filename> so that if 
 <application>TeX</application> is upgraded, this file won't get 
 overwritten.</para>




More information about the blfs-book mailing list