Changeset 6291d0e


Ignore:
Timestamp:
05/18/2006 05:36:34 AM (18 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
6e37e84
Parents:
ad54ac8
Message:

added sed back to luit for path, xorg7 related textual changes, and fixed nas path in nas bootscript

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6103 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rad54ac8 r6291d0e  
    1 <!ENTITY day          "17">                   <!-- Always 2 digits -->
     1<!ENTITY day          "18">                   <!-- Always 2 digits -->
    22<!ENTITY month        "05">                   <!-- Always 2 digits -->
    33<!ENTITY year         "2006">

  • introduction/welcome/changelog.xml

    rad54ac8 r6291d0e  
    4343
    4444    <listitem>
     45      <para>May 18th, 2006</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[dj] - Corrected nas bootscript after installation.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[dj] - Standardized Xorg7 PREFIX commands using
     52          XORG_PREFIX.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[dj] - Re-added sed to fix incorrect path in luit.</para>
     56        </listitem>
     57      </itemizedlist>
     58    </listitem>
     59
     60    <listitem>
    4561      <para>May 17th, 2006</para>
    4662      <itemizedlist>

  • multimedia/libdriv/nas.xml

    rad54ac8 r6291d0e  
    4646    <title>Introduction to NAS</title>
    4747
    48     <para>The Network Audio System is a network transparent, client/server audio
    49     transport system used to read , write and play audio files in many formats
    50     including <filename>.au</filename>, <filename>.snd</filename>,
     48    <para>The Network Audio System is a network transparent, client/server
     49    audio transport system used to read , write and play audio files in many
     50    formats including <filename>.au</filename>, <filename>.snd</filename>,
    5151    <filename>.voc</filename>, <filename>.wav</filename>,
    5252    <filename>.aiff</filename>, <filename>.aif</filename> and
    53     <filename>.iff</filename>. It can be described as the audio equivalent of an
    54     <application>X</application> server.</para>
     53    <filename>.iff</filename>. It can be described as the audio equivalent
     54    of an <application>X</application> server.</para>
    5555
    5656    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    104104make World</userinput></screen>
    105105
    106     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     106    <para>Now, as the <systemitem class="username">root</systemitem>
     107    user:</para>
    107108
    108109<screen role="root"><userinput>make install install.man &amp;&amp;
    … …  
    140141      <title>Configuration Information</title>
    141142
    142       <para>Create the <application>NAS</application> configuration file using the
    143       following command:</para>
     143      <para>Create the <application>NAS</application> configuration file
     144      using the following command:</para>
    144145
    145146<screen role="root"><userinput>install -v -m644 /etc/nas/nasd.conf.eg /etc/nas/nasd.conf</userinput></screen>
    … …  
    163164<screen role="root"><userinput>make install-nas</userinput></screen>
    164165
    165       <para>The init script uses a default parameter to allow access to all hosts on
    166       the network. Review the <command>nasd</command> man page for other available
    167       parameters if you need to modify the script.</para>
     166      <para>The init script uses a default prefix of
     167      <filename class="directory">/usr/X11R6</filename>.  If you've installed
     168      the X Window System into any other prefix, execute the following command
     169      to correct the script:</para>
     170
     171<screen role="root"><userinput>sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@' /etc/rc.d/init.d/nasd</userinput></screen>
     172
     173      <para>The init script uses a default parameter to allow access to all
     174      hosts on the network. Review the <command>nasd</command> man page for
     175      other available parameters if you need to modify the script.</para>
    168176
    169177    </sect3>
    … …  
    180188
    181189      <seglistitem>
    182         <seg>auconvert, auctl, audemo, audial, auedit, auinfo, aupanel, auphone,
    183         auplay, aurecord, auscope, autool, auwave, checkmail, issndfile, nasd,
    184         playbucket, and soundtoh</seg>
     190        <seg>auconvert, auctl, audemo, audial, auedit, auinfo, aupanel,
     191        auphone, auplay, aurecord, auscope, autool, auwave, checkmail,
     192        issndfile, nasd, playbucket, and soundtoh</seg>
    185193        <seg>libaudio.{so,a}</seg>
    186194        <seg>/etc/nas and /usr/X11R6/include/audio</seg>
    … …  
    197205        <listitem>
    198206          <para>are a collection of tools to convert, play, edit, record,
    199           and manipulate sound files. See the respective man page for each utility
    200           for a full description of each one.</para>
     207          and manipulate sound files. See the respective man page for each
     208          utility for a full description of each one.</para>
    201209          <indexterm zone="nas au-utilities">
    202210            <primary sortas="b-au-utilities">au{utilities}</primary>

  • x/installing/libdrm.xml

    rad54ac8 r6291d0e  
    7272
    7373<screen><userinput>autoreconf &amp;&amp;
    74 ./configure --prefix=/usr &amp;&amp;
     74./configure --prefix=$XORG_PREFIX &amp;&amp;
    7575make</userinput></screen>
    7676

  • x/installing/luit.xml

    rad54ac8 r6291d0e  
    7878    <ulink url="&patch-root;/luit-&luit-version;-race-1.patch"/>.</para>
    7979
     80    <para>The <application>luit</application> package
     81    needs a correction to fix a hard coded path.  Execute the
     82    following command to fix the broken path:</para>
     83
     84<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" parser.h</userinput></screen>
     85
    8086    <para>Install luit with the following commands:</para>
    8187

  • x/installing/mesalib.xml

    rad54ac8 r6291d0e  
    106106    commands:</para>
    107107
    108 <screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \; &amp;&amp;
     108<screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
    109109sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>
    110110
    … …  
    120120    <application>MesaLib</application>:</para>
    121121
    122 <screen role="root"><userinput>bin/installmesa <replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
     122<screen role="root"><userinput>bin/installmesa $XORG_PREFIX</userinput></screen>
    123123
    124124    <para>While still the root user, install the modules for
    125125    Xorg-&xorg7-version; with the following commands.</para>
    126126
    127 <screen role="root"><userinput>mkdir -v -p <replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/modules/dri &amp;&amp;
    128 install -v -m755 lib/*dri* <replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/modules/dri</userinput></screen>
     127<screen role="root"><userinput>mkdir -v -p $XORG_PREFIX/lib/X11/modules/dri &amp;&amp;
     128install -v -m755 lib/*dri* $XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
    129129
    130130    <para>If you've extracted the Demos package as well, then
    … …  
    138138    <systemitem class="username">root</systemitem> user:</para>
    139139
    140 <screen role="root"><userinput>install -v -m755 glxinfo glxgears <replaceable>&lt;PREFIX&gt;</replaceable>/bin</userinput></screen>
     140<screen role="root"><userinput>install -v -m755 glxinfo glxgears $XORG_PREFIX/bin</userinput></screen>
    141141
    142142    <note>
    … …  
    151151    <systemitem class="username">root</systemitem> user:</para>
    152152
    153 <screen><userinput role="root">ln -s -v <replaceable>&lt;PREFIX&gt;</replaceable>/include/GL /usr/include</userinput></screen>
     153<screen><userinput role="root">ln -s -v $XORG_PREFIX/include/GL /usr/include</userinput></screen>
    154154
    155155  </sect2>
    … …  
    159159
    160160    <para><command>find...sed -i
    161     's@/usr/X11R6@/<replaceable>&lt;PREFIX&gt;</replaceable>@'...</command>:
     161    "s@/usr/X11R6@$XORG_PREFIX@"...</command>:
    162162    This command corrects several hard coded references to the X11R6 default
    163163    installation path.</para>
    … …  
    172172
    173173    <para><command>install -v -m755 lib/*dri*
    174     <replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/modules/dri</command>:
     174    $XORG_PREFIX/lib/X11/modules/dri</command>:
    175175    installs the DRI modules.</para>
    176176
    … …  
    182182
    183183    <para><command>install -v -m755 glxinfo glxgears
    184     <replaceable>&lt;PREFIX&gt;</replaceable>/bin</command>:
     184    $XORG_PREFIX/bin</command>:
    185185    Installs only the glxinfo and glxgears programs.</para>
    186186

  • x/installing/rman.xml

    rad54ac8 r6291d0e  
    7373    the makefile to account for this:</para>
    7474
    75 <screen><userinput>sed -i -e 's@/opt/local@<replaceable>&lt;PREFIX&gt;</replaceable>@' \
    76     -e 's@/usr/local@<replaceable>&lt;PREFIX&gt;</replaceable>@' Makefile</userinput></screen>
     75<screen><userinput>sed -i -e "s@/opt/local@$XORG_PREFIX@" \
     76    -e "s@/usr/local@$XORG_PREFIX@" Makefile</userinput></screen>
    7777
    7878    <para>Build <application>rman</application> by running the

  • x/installing/xterm.xml

    rad54ac8 r6291d0e  
    7878    <para>Correct the PROJECTROOT variable with the following command:</para>
    7979
    80 <screen><userinput>sed -i 's@/usr/X11R6@/<replaceable>&lt;PREFIX&gt;</replaceable>@' main.h</userinput></screen>
     80<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</userinput></screen>
    8181
    8282    <para>Install <application>xterm</application> by running the
    8383    following commands:</para>
    8484
    85 <screen><userinput>./configure --prefix=<replaceable>&lt;PREFIX&gt;</replaceable> --sysconfdir=/etc \
    86     --localstatedir=/var --enable-luit --with-wide-chars &amp;&amp;
     85<screen><userinput>./configure $XORG_CONFIG \
     86    --enable-luit --with-wide-chars &amp;&amp;
    8787make</userinput></screen>
    8888
    8989    <para>This package does not come with a test suite.</para>
    9090
    91     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     91    <para>Now, as the <systemitem class="username">root</systemitem>
     92    user:</para>
    9293
    9394<screen role="root"><userinput>make install &amp;&amp;
    … …  
    105106    characters.</para>
    106107
    107     <para><command>sed -i 's@/usr/X11R6@/<replaceable>&lt;PREFIX&gt;</replaceable>@' main.h</command>: This command
    108     corrects the PROJECTROOT definition to match that of the installed X Window
    109     System.</para>
     108    <para><command>sed -i "s@/usr/X11R6@$XORG_PREFIX@" main.h</command>: This
     109    command corrects the PROJECTROOT definition to match that of the installed
     110    X Window System.</para>
    110111
    111112    <para><command>make install-ti</command>: This command installs corrected
    … …  
    121122    definitions to the user's <filename>~/.Xresources</filename> file, or
    122123    add them to the system-wide
    123     <filename><replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/app-defaults/Xterm</filename> file.</para>
     124    <filename>$XORG_PREFIX/lib/X11/app-defaults/Xterm</filename> file.</para>
    124125
    125126    <para>In order for xterm to follow the locale settings in the environment
    … …  
    127128    <systemitem class="username">root</systemitem> user:</para>
    128129
    129 <screen role="root"><userinput>cat &gt;&gt; <replaceable>&lt;PREFIX&gt;</replaceable>/lib/X11/app-defaults/XTerm &lt;&lt; "EOF"
     130<screen role="root"><userinput>cat &gt;&gt; $XORG_PREFIX/lib/X11/app-defaults/XTerm &lt;&lt; "EOF"
    130131*VT100*locale: true
    131132*VT100*faceName: Monospace
Note: See TracChangeset for help on using the changeset viewer.