r8911 - in trunk/BOOK: . introduction/welcome pst/sgml

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sun Oct 23 12:13:51 PDT 2011


Author: bdubbs
Date: 2011-10-23 13:13:45 -0600 (Sun, 23 Oct 2011)
New Revision: 8911

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/sgml/openjade.xml
   trunk/BOOK/pst/sgml/opensp.xml
   trunk/BOOK/pst/sgml/sgml-dtd-3.xml
   trunk/BOOK/pst/sgml/sgml-dtd.xml
Log:
Add gcc-4.6.1 patch to openjade.
Reformat some instructions for readability.
Mark some files as LFS 7.0 checked.


Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-10-23 00:19:32 UTC (rev 8910)
+++ trunk/BOOK/general.ent	2011-10-23 19:13:45 UTC (rev 8911)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "September &day;nd, &year;">
+<!ENTITY releasedate  "September &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-10-23 00:19:32 UTC (rev 8910)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-10-23 19:13:45 UTC (rev 8911)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>October 23rd, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add gcc-4.6.1 patch to openjade.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 22nd, 2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/pst/sgml/openjade.xml
===================================================================
--- trunk/BOOK/pst/sgml/openjade.xml	2011-10-23 00:19:32 UTC (rev 8910)
+++ trunk/BOOK/pst/sgml/openjade.xml	2011-10-23 19:13:45 UTC (rev 8911)
@@ -33,7 +33,7 @@
     DSSSL engine. This is useful for SGML and XML transformations into
     RTF, TeX, SGML and XML.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -57,6 +57,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patches: <ulink
+              url="&patch-root;/openjade-&openjade-version;-gcc_4.6-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">OpenJade Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -70,31 +78,42 @@
   <sect2 role="installation">
     <title>Installation of OpenJade</title>
 
+    <para>First fix a compilation problem identified in gcc-4.6 and later:</para>
+
+<screen><userinput>patch -Np1 -i ../openjade-&openjade-version;-gcc_4.6-1.patch</userinput></screen>
+
     <para>Install <application>OpenJade</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-http --disable-static \
-    --enable-default-catalog=/etc/sgml/catalog \
-    --enable-default-search-path=/usr/share/sgml \
-    --datadir=/usr/share/sgml/openjade-&openjade-version; &&
+<screen><userinput>./configure --prefix=/usr                                \
+            --enable-http                                \
+            --disable-static                             \
+            --enable-default-catalog=/etc/sgml/catalog   \
+            --enable-default-search-path=/usr/share/sgml \
+            --datadir=/usr/share/sgml/openjade-&openjade-version;   &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &&
-make install-man &&
-ln -v -sf openjade /usr/bin/jade &&
-ln -v -sf libogrove.so /usr/lib/libgrove.so &&
-ln -v -sf libospgrove.so /usr/lib/libspgrove.so &&
-ln -v -sf libostyle.so /usr/lib/libstyle.so &&
+<!-- Be careful of spacing here -->
+<screen role="root"><userinput>make install                                                   &&
+make install-man                                               &&
+ln -v -sf openjade /usr/bin/jade                               &&
+ln -v -sf libogrove.so /usr/lib/libgrove.so                    &&
+ln -v -sf libospgrove.so /usr/lib/libspgrove.so                &&
+ln -v -sf libostyle.so /usr/lib/libstyle.so                    &&
+
 install -v -m644 dsssl/catalog /usr/share/sgml/openjade-&openjade-version;/ &&
-install -v -m644 dsssl/*.{dtd,dsl,sgm} \
-    /usr/share/sgml/openjade-&openjade-version; &&
-install-catalog --add /etc/sgml/openjade-&openjade-version;.cat \
-    /usr/share/sgml/openjade-&openjade-version;/catalog &&
-install-catalog --add /etc/sgml/sgml-docbook.cat \
+
+install -v -m644 dsssl/*.{dtd,dsl,sgm}              \
+    /usr/share/sgml/openjade-&openjade-version;                             &&
+
+install-catalog --add /etc/sgml/openjade-&openjade-version;.cat  \
+    /usr/share/sgml/openjade-&openjade-version;/catalog                     &&
+
+install-catalog --add /etc/sgml/sgml-docbook.cat    \
     /etc/sgml/openjade-&openjade-version;.cat</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/pst/sgml/opensp.xml
===================================================================
--- trunk/BOOK/pst/sgml/opensp.xml	2011-10-23 00:19:32 UTC (rev 8910)
+++ trunk/BOOK/pst/sgml/opensp.xml	2011-10-23 19:13:45 UTC (rev 8911)
@@ -37,7 +37,7 @@
     This is useful for validating, parsing and manipulating SGML and XML
     documents.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -80,16 +80,19 @@
     <para>Install <application>OpenSP</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i 's:32,:253,:' lib/Syntax.cxx &&
-sed -i 's:LITLEN          240 :LITLEN          8092:' \
+<screen><userinput>sed -i 's/32,/253,/' lib/Syntax.cxx &&
+sed -i 's/LITLEN          240 /LITLEN          8092/' \
     unicode/{gensyntax.pl,unicode.syn} &&
-./configure --prefix=/usr --disable-static --disable-doc-build \
-    --enable-default-catalog=/etc/sgml/catalog --enable-http \
-    --enable-default-search-path=/usr/share/sgml &&
+./configure --prefix=/usr                              \
+            --disable-static                           \ 
+            --disable-doc-build                        \
+            --enable-default-catalog=/etc/sgml/catalog \
+            --enable-http                              \
+            --enable-default-search-path=/usr/share/sgml &&
 make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>. As many as
-    eight of the 22 tests may fail. Do not be alarmed.</para>
+    nine of the 23 tests may fail. Do not be alarmed.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -108,7 +111,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>sed -i 's:32,:253,:...unicode.syn}</parameter>:
+    <para><parameter>sed -i 's/32,/253,/...unicode.syn}</parameter>:
     These seds prevent some annoying messages that may otherwise appear
     while running <command>openjade</command>.</para>
 

Modified: trunk/BOOK/pst/sgml/sgml-dtd-3.xml
===================================================================
--- trunk/BOOK/pst/sgml/sgml-dtd-3.xml	2011-10-23 00:19:32 UTC (rev 8910)
+++ trunk/BOOK/pst/sgml/sgml-dtd-3.xml	2011-10-23 19:13:45 UTC (rev 8911)
@@ -36,7 +36,7 @@
     documentation to a standard allowing you to utilize transformations
     already written for that standard.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/pst/sgml/sgml-dtd.xml
===================================================================
--- trunk/BOOK/pst/sgml/sgml-dtd.xml	2011-10-23 00:19:32 UTC (rev 8910)
+++ trunk/BOOK/pst/sgml/sgml-dtd.xml	2011-10-23 19:13:45 UTC (rev 8911)
@@ -36,7 +36,7 @@
     documentation to a standard allowing you to utilize transformations
     already written for that standard.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">




More information about the blfs-book mailing list