r6103 - in trunk/BOOK: . introduction/welcome multimedia/libdriv x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Wed May 17 22:36:36 PDT 2006


Author: dj
Date: 2006-05-17 23:36:34 -0600 (Wed, 17 May 2006)
New Revision: 6103

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/nas.xml
   trunk/BOOK/x/installing/libdrm.xml
   trunk/BOOK/x/installing/luit.xml
   trunk/BOOK/x/installing/mesalib.xml
   trunk/BOOK/x/installing/rman.xml
   trunk/BOOK/x/installing/xterm.xml
Log:
added sed back to luit for path, xorg7 related textual changes, and fixed nas path in nas bootscript

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/general.ent	2006-05-18 05:36:34 UTC (rev 6103)
@@ -1,4 +1,4 @@
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -42,6 +42,22 @@
 -->
 
     <listitem>
+      <para>May 18th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Corrected nas bootscript after installation.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Standardized Xorg7 PREFIX commands using 
+          XORG_PREFIX.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Re-added sed to fix incorrect path in luit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 17th, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/multimedia/libdriv/nas.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/nas.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/multimedia/libdriv/nas.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -45,13 +45,13 @@
   <sect2 role="package">
     <title>Introduction to NAS</title>
 
-    <para>The Network Audio System is a network transparent, client/server audio
-    transport system used to read , write and play audio files in many formats
-    including <filename>.au</filename>, <filename>.snd</filename>,
+    <para>The Network Audio System is a network transparent, client/server 
+    audio transport system used to read , write and play audio files in many 
+    formats including <filename>.au</filename>, <filename>.snd</filename>,
     <filename>.voc</filename>, <filename>.wav</filename>,
     <filename>.aiff</filename>, <filename>.aif</filename> and
-    <filename>.iff</filename>. It can be described as the audio equivalent of an
-    <application>X</application> server.</para>
+    <filename>.iff</filename>. It can be described as the audio equivalent 
+    of an <application>X</application> server.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -103,7 +103,8 @@
 xmkmf &&
 make World</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> 
+    user:</para>
 
 <screen role="root"><userinput>make install install.man &&
 install -v -m755 -d /usr/share/doc/nas-&nas-version;/pdf &&
@@ -139,8 +140,8 @@
     <sect3>
       <title>Configuration Information</title>
 
-      <para>Create the <application>NAS</application> configuration file using the
-      following command:</para>
+      <para>Create the <application>NAS</application> configuration file 
+      using the following command:</para>
 
 <screen role="root"><userinput>install -v -m644 /etc/nas/nasd.conf.eg /etc/nas/nasd.conf</userinput></screen>
 
@@ -162,10 +163,17 @@
 
 <screen role="root"><userinput>make install-nas</userinput></screen>
 
-      <para>The init script uses a default parameter to allow access to all hosts on
-      the network. Review the <command>nasd</command> man page for other available
-      parameters if you need to modify the script.</para>
+      <para>The init script uses a default prefix of 
+      <filename class="directory">/usr/X11R6</filename>.  If you've installed
+      the X Window System into any other prefix, execute the following command
+      to correct the script:</para>
 
+<screen role="root"><userinput>sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@' /etc/rc.d/init.d/nasd</userinput></screen>
+
+      <para>The init script uses a default parameter to allow access to all 
+      hosts on the network. Review the <command>nasd</command> man page for 
+      other available parameters if you need to modify the script.</para>
+
     </sect3>
 
   </sect2>
@@ -179,9 +187,9 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>auconvert, auctl, audemo, audial, auedit, auinfo, aupanel, auphone,
-        auplay, aurecord, auscope, autool, auwave, checkmail, issndfile, nasd,
-        playbucket, and soundtoh</seg>
+        <seg>auconvert, auctl, audemo, audial, auedit, auinfo, aupanel, 
+        auphone, auplay, aurecord, auscope, autool, auwave, checkmail, 
+        issndfile, nasd, playbucket, and soundtoh</seg>
         <seg>libaudio.{so,a}</seg>
         <seg>/etc/nas and /usr/X11R6/include/audio</seg>
       </seglistitem>
@@ -196,8 +204,8 @@
         <term><command>au{utilities}</command></term>
         <listitem>
           <para>are a collection of tools to convert, play, edit, record,
-          and manipulate sound files. See the respective man page for each utility
-          for a full description of each one.</para>
+          and manipulate sound files. See the respective man page for each 
+          utility for a full description of each one.</para>
           <indexterm zone="nas au-utilities">
             <primary sortas="b-au-utilities">au{utilities}</primary>
           </indexterm>

Modified: trunk/BOOK/x/installing/libdrm.xml
===================================================================
--- trunk/BOOK/x/installing/libdrm.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/x/installing/libdrm.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -71,7 +71,7 @@
     commands:</para>
 
 <screen><userinput>autoreconf &&
-./configure --prefix=/usr &&
+./configure --prefix=$XORG_PREFIX &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

Modified: trunk/BOOK/x/installing/luit.xml
===================================================================
--- trunk/BOOK/x/installing/luit.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/x/installing/luit.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -77,6 +77,12 @@
     release.  Download the patch from
     <ulink url="&patch-root;/luit-&luit-version;-race-1.patch"/>.</para>
 
+    <para>The <application>luit</application> package
+    needs a correction to fix a hard coded path.  Execute the
+    following command to fix the broken path:</para>
+
+<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" parser.h</userinput></screen>
+
     <para>Install luit with the following commands:</para>
 
 <screen><userinput>patch -Np1 -i luit-&luit-version;-race-1.patch &&

Modified: trunk/BOOK/x/installing/mesalib.xml
===================================================================
--- trunk/BOOK/x/installing/mesalib.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/x/installing/mesalib.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -105,7 +105,7 @@
     hard coded directories in the source files with the following 
     commands:</para>
 
-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {} \; &&
+<screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX at g" {} \; &&
 sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
 
     <para>Build <application>MesaLib</application>
@@ -119,13 +119,13 @@
     issue the following commands to install 
     <application>MesaLib</application>:</para>
 
-<screen role="root"><userinput>bin/installmesa <replaceable><PREFIX></replaceable></userinput></screen>
+<screen role="root"><userinput>bin/installmesa $XORG_PREFIX</userinput></screen>
 
     <para>While still the root user, install the modules for 
     Xorg-&xorg7-version; with the following commands.</para>
 
-<screen role="root"><userinput>mkdir -v -p <replaceable><PREFIX></replaceable>/lib/X11/modules/dri &&
-install -v -m755 lib/*dri* <replaceable><PREFIX></replaceable>/lib/X11/modules/dri</userinput></screen>
+<screen role="root"><userinput>mkdir -v -p $XORG_PREFIX/lib/X11/modules/dri &&
+install -v -m755 lib/*dri* $XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
 
     <para>If you've extracted the Demos package as well, then
     build the test programs with the following commands:</para>
@@ -137,7 +137,7 @@
     <para>Install the demos as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 glxinfo glxgears <replaceable><PREFIX></replaceable>/bin</userinput></screen>
+<screen role="root"><userinput>install -v -m755 glxinfo glxgears $XORG_PREFIX/bin</userinput></screen>
 
     <note>
       <para>Do not remove the Mesa source tree yet, it will be required to 
@@ -150,7 +150,7 @@
     Execute the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role="root">ln -s -v <replaceable><PREFIX></replaceable>/include/GL /usr/include</userinput></screen>
+<screen><userinput role="root">ln -s -v $XORG_PREFIX/include/GL /usr/include</userinput></screen>
 
   </sect2>
 
@@ -158,7 +158,7 @@
     <title>Command Explanations</title>
 
     <para><command>find...sed -i 
-    's@/usr/X11R6@/<replaceable><PREFIX></replaceable>@'...</command>: 
+    "s@/usr/X11R6@$XORG_PREFIX@"...</command>: 
     This command corrects several hard coded references to the X11R6 default
     installation path.</para>
 
@@ -171,7 +171,7 @@
     target.</para>
 
     <para><command>install -v -m755 lib/*dri*
-    <replaceable><PREFIX></replaceable>/lib/X11/modules/dri</command>: 
+    $XORG_PREFIX/lib/X11/modules/dri</command>: 
     installs the DRI modules.</para>
 
     <para><command>sed -i 's at -l$(GLUT_LIB)@@g' configs/default</command>:
@@ -181,7 +181,7 @@
     the glxinfo and glxgears programs.</para>
 
     <para><command>install -v -m755 glxinfo glxgears 
-    <replaceable><PREFIX></replaceable>/bin</command>:
+    $XORG_PREFIX/bin</command>:
     Installs only the glxinfo and glxgears programs.</para>
 
   </sect2>

Modified: trunk/BOOK/x/installing/rman.xml
===================================================================
--- trunk/BOOK/x/installing/rman.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/x/installing/rman.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -72,8 +72,8 @@
     same location as your <application>Xorg</application> programs.  Adjust
     the makefile to account for this:</para>
 
-<screen><userinput>sed -i -e 's@/opt/local@<replaceable><PREFIX></replaceable>@' \
-    -e 's@/usr/local@<replaceable><PREFIX></replaceable>@' Makefile</userinput></screen>
+<screen><userinput>sed -i -e "s@/opt/local@$XORG_PREFIX@" \
+    -e "s@/usr/local@$XORG_PREFIX@" Makefile</userinput></screen>
 
     <para>Build <application>rman</application> by running the
     following command:</para>

Modified: trunk/BOOK/x/installing/xterm.xml
===================================================================
--- trunk/BOOK/x/installing/xterm.xml	2006-05-18 04:10:49 UTC (rev 6102)
+++ trunk/BOOK/x/installing/xterm.xml	2006-05-18 05:36:34 UTC (rev 6103)
@@ -77,18 +77,19 @@
 
     <para>Correct the PROJECTROOT variable with the following command:</para>
 
-<screen><userinput>sed -i 's@/usr/X11R6@/<replaceable><PREFIX></replaceable>@' main.h</userinput></screen>
+<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</userinput></screen>
 
     <para>Install <application>xterm</application> by running the
     following commands:</para>
 
-<screen><userinput>./configure --prefix=<replaceable><PREFIX></replaceable> --sysconfdir=/etc \
-    --localstatedir=/var --enable-luit --with-wide-chars &&
+<screen><userinput>./configure $XORG_CONFIG \
+    --enable-luit --with-wide-chars &&
 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>
+    <para>Now, as the <systemitem class="username">root</systemitem> 
+    user:</para>
 
 <screen role="root"><userinput>make install &&
 make install-ti</userinput></screen>
@@ -104,9 +105,9 @@
     <para><parameter>--with-wide-chars</parameter>: adds support for wide
     characters.</para>
 
-    <para><command>sed -i 's@/usr/X11R6@/<replaceable><PREFIX></replaceable>@' main.h</command>: This command
-    corrects the PROJECTROOT definition to match that of the installed X Window
-    System.</para>
+    <para><command>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</command>: This 
+    command corrects the PROJECTROOT definition to match that of the installed 
+    X Window System.</para>
 
     <para><command>make install-ti</command>: This command installs corrected
     terminfo description files for use with
@@ -120,13 +121,13 @@
     <para>There are two ways to configure xterm.  You can add X resource
     definitions to the user's <filename>~/.Xresources</filename> file, or
     add them to the system-wide
-    <filename><replaceable><PREFIX></replaceable>/lib/X11/app-defaults/Xterm</filename> file.</para>
+    <filename>$XORG_PREFIX/lib/X11/app-defaults/Xterm</filename> file.</para>
 
     <para>In order for xterm to follow the locale settings in the environment
     and use TrueType fonts, add the following definitions as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>cat >> <replaceable><PREFIX></replaceable>/lib/X11/app-defaults/XTerm << "EOF"
+<screen role="root"><userinput>cat >> $XORG_PREFIX/lib/X11/app-defaults/XTerm << "EOF"
 *VT100*locale: true
 *VT100*faceName: Monospace
 *VT100*faceSize: 10




More information about the blfs-book mailing list