Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml (revision dc477899715bb281ad982077c069cd7c1b01c608)
+++ general/genlib/libusb.xml (revision 04af8b245cf06e98d775cfa7d26ba92ed9d5981b)
@@ -58,19 +58,13 @@
: 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 OpenSP catalog definitions from the system
-SGML catalogs. Use the following commands before building
+SGML catalogs. Use the following command before building
the package to accomplish this:
-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" \
+sed -i.orig \
+ -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+ /etc/sgml/catalog \
/etc/sgml/sgml-docbook.cat
-
-If desired, restore the orginal SGML catalogs after
-the build is complete using the following commands:
-
-cp /etc/sgml/catalog.orig /etc/sgml/catalog &&
-cp /etc/sgml/sgml-docbook.cat.orig /etc/sgml/sgml-docbook.cat
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml (revision dc477899715bb281ad982077c069cd7c1b01c608)
+++ general/graphlib/fontconfig.xml (revision 04af8b245cf06e98d775cfa7d26ba92ed9d5981b)
@@ -75,17 +75,11 @@
DocBook-utils, you may need to remove the
OpenSP catalog definitions from the system
-SGML catalogs. Use the following commands before building
+SGML catalogs. Use the following command before building
the package to accomplish this:
-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" \
+sed -i.orig \
+ -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+ /etc/sgml/catalog \
/etc/sgml/sgml-docbook.cat
-
-If desired, restore the orginal SGML catalogs after
-the build is complete using the following commands:
-
-cp /etc/sgml/catalog.orig /etc/sgml/catalog &&
-cp /etc/sgml/sgml-docbook.cat.orig /etc/sgml/sgml-docbook.cat
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision dc477899715bb281ad982077c069cd7c1b01c608)
+++ introduction/welcome/changelog.xml (revision 04af8b245cf06e98d775cfa7d26ba92ed9d5981b)
@@ -24,5 +24,7 @@
October 18th, 2004 [randy]: Updated to
-DocBook XSL Stylesheets-1.66.1
+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.
October 18th, 2004 [larry]: Added autofs-4.1.3 to
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml (revision dc477899715bb281ad982077c069cd7c1b01c608)
+++ pst/sgml/docbook-utils.xml (revision 04af8b245cf06e98d775cfa7d26ba92ed9d5981b)
@@ -19,5 +19,4 @@
DocBook-utils-&docbook-utils-version;
-
@@ -63,18 +62,31 @@
Installation of DocBook-utils
+Earlier versions of the BLFS
+OpenSP instructions installed a catalog
+containing an SGMLDECL unicode.sd declaration
+into the system SGML catalogs. This declaration
+causes some of the OpenJade 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:
+
+grep "OpenSP-1.5.1" /etc/sgml/catalog
+
+If anything was returned, run the following command to remove
+the catalog definitions:
+
+sed -i.orig \
+ -e "/CATALOG \/etc\/sgml\/OpenSP-1.5.1.cat/d" \
+ /etc/sgml/catalog \
+ /etc/sgml/sgml-docbook.cat
+
Install DocBook-utils by running the
following commands:
-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 &&
+./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
+make install
-Many packages will use an alternate name for the
+Many packages use an alternate name for the
DocBook-utils scripts. If you wish to create these
alternate names, use the following command:
@@ -84,19 +96,4 @@
ln -s docbook2$doctype /usr/bin/db2$doctype
done
-
-
-
-
-Command explanations
-
-sed -i.orig -e ...: These two sed's
-remove OpenSP catalog definitions from the
-SGML catalogs because the SGMLDECL unicode.sd declaration
-creates errors when openjade builds the
-DocBook-utils 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
-DocBook-utils functionality after the build, the
-declarations are temporarily removed to provide a clean package build.
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml (revision dc477899715bb281ad982077c069cd7c1b01c608)
+++ pst/typesetting/jadetex.xml (revision 04af8b245cf06e98d775cfa7d26ba92ed9d5981b)
@@ -53,7 +53,5 @@
commands:
-cp /usr/share/texmf/web2c/texmf.cnf \
- /usr/share/texmf/web2c/texmf.cnf.backup &&
-sed -i -e "s@original texmf.cnf@modified texmf.cnf@" \
+sed -i.orig -e "s/original texmf.cnf/modified texmf.cnf/" \
/usr/share/texmf/web2c/texmf.cnf
@@ -117,5 +115,5 @@
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 ..
@@ -134,5 +132,5 @@
Command explanations
-sed -i -e "s@original texmf.cnf@modified texmf.cnf@":
+sed -i -e "s/original texmf.cnf/modified texmf.cnf/":
This changes /usr/share/texmf/web2c/texmf.cnf so that if
TeX is upgraded, this file won't get