Author: bdubbs
Date: Thu Sep 5 09:23:52 2013
New Revision: 11768
Log:
More tags and minor fixes for 7.4
Modified:
trunk/BOOK/general/genlib/gsl.xml
trunk/BOOK/general/genlib/libesmtp.xml
trunk/BOOK/general/genlib/libgee.xml
trunk/BOOK/general/genlib/libidl.xml
trunk/BOOK/general/genlib/libidn.xml
trunk/BOOK/general/genlib/openobex.xml
trunk/BOOK/general/genlib/sbc.xml
trunk/BOOK/general/genlib/slib.xml
trunk/BOOK/general/genlib/wv.xml
trunk/BOOK/general/genutils/compface.xml
trunk/BOOK/general/genutils/hd2u.xml
trunk/BOOK/general/genutils/rarian.xml
trunk/BOOK/general/genutils/screen.xml
trunk/BOOK/general/prog/bazaar.xml
trunk/BOOK/general/prog/cvs.xml
trunk/BOOK/general/sysutils/bluez.xml
Modified: trunk/BOOK/general/genlib/gsl.xml
==============================================================================
--- trunk/BOOK/general/genlib/gsl.xml Thu Sep 5 06:42:36 2013 (r11767)
+++ trunk/BOOK/general/genlib/gsl.xml Thu Sep 5 09:23:52 2013 (r11768)
@@ -37,7 +37,7 @@
random number generators, special functions and least-squares fitting.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -81,8 +81,7 @@
Install <application>Gsl</application> by running the following commands:
</para>
-<screen><userinput>
-./configure --prefix=/usr --disable-static &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make &&
make html</userinput></screen>
@@ -122,7 +121,7 @@
libgslcblas.so and libgsl.so.
</seg>
<seg>
- /usr/include/gsl.
+ /usr/include/gsl
</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/general/genlib/libesmtp.xml
==============================================================================
--- trunk/BOOK/general/genlib/libesmtp.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genlib/libesmtp.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -33,7 +33,7 @@
<application>libESMTP</application> libraries which are used by some
programs
to manage email submission to a mail transport layer.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genlib/libgee.xml
==============================================================================
--- trunk/BOOK/general/genlib/libgee.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genlib/libgee.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -35,7 +35,7 @@
structures.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genlib/libidl.xml
==============================================================================
--- trunk/BOOK/general/genlib/libidl.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genlib/libidl.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -33,7 +33,7 @@
contains libraries for Interface Definition Language files. This is a
specification for defining portable interfaces.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genlib/libidn.xml
==============================================================================
--- trunk/BOOK/general/genlib/libidn.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genlib/libidn.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -45,7 +45,7 @@
(ACE) form.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genlib/openobex.xml
==============================================================================
--- trunk/BOOK/general/genlib/openobex.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genlib/openobex.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -35,7 +35,7 @@
binary file transfers between devices.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -88,7 +88,7 @@
<para role="optional">
<xref linkend="doxygen"/>,
<xref linkend="libxslt"/>,
- <xref linkend="openjdk"/> and
+ <xref linkend="openjdk"/>, and
<xref linkend="xmlto"/>
</para>
@@ -106,7 +106,8 @@
</para>
<screen><userinput>mkdir build &&
-cd build &&
+cd build &&
+
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
Modified: trunk/BOOK/general/genlib/sbc.xml
==============================================================================
--- trunk/BOOK/general/genlib/sbc.xml Thu Sep 5 06:42:36 2013 (r11767)
+++ trunk/BOOK/general/genlib/sbc.xml Thu Sep 5 09:23:52 2013 (r11768)
@@ -34,7 +34,7 @@
transfer data to Bluetooth audio output devices like headphones or
loudspeakers.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -122,7 +122,7 @@
<seglistitem>
<seg>
- sbcdec, sbcenc and sbcinfo
+ sbcdec, sbcenc, and sbcinfo
</seg>
<seg>
libsbc.so
Modified: trunk/BOOK/general/genlib/slib.xml
==============================================================================
--- trunk/BOOK/general/genlib/slib.xml Thu Sep 5 06:42:36 2013 (r11767)
+++ trunk/BOOK/general/genlib/slib.xml Thu Sep 5 09:23:52 2013 (r11768)
@@ -41,7 +41,7 @@
PLT Scheme (DrScheme and MzScheme), Pocket Scheme, RScheme, scheme->C,
Scheme48, SCM, SCM Mac, scsh, Stk, T3.1, umb-scheme, and VSCM.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -105,8 +105,8 @@
<screen role="root"><userinput>make install
&&
ln -v -sf ../slib /usr/share/guile &&
-guile -c "(use-modules (ice-9 slib)) (require 'printf)" &&
mkdir -pv /usr/share/guile/site/2.0 &&
+guile -c "(use-modules (ice-9 slib)) (require 'printf)" &&
install -v -m755 -d /usr/share/doc/slib-&slib-version; &&
install -v -m644 ANNOUNCE FAQ README slib.{txt,html}
/usr/share/doc/slib-&slib-version;</userinput></screen>
Modified: trunk/BOOK/general/genlib/wv.xml
==============================================================================
--- trunk/BOOK/general/genlib/wv.xml Thu Sep 5 06:42:36 2013 (r11767)
+++ trunk/BOOK/general/genlib/wv.xml Thu Sep 5 09:23:52 2013 (r11768)
@@ -32,7 +32,7 @@
<para>This package contains tools for reading information from an MS Word
document.</para>
- &lfs73_built;
+ &lfs74_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -58,14 +58,16 @@
<bridgehead renderas="sect3">wv Dependencies</bridgehead>
-
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required"><xref linkend="libgsf"/>, <xref linkend="libpng"/>
+ <para role="required">
+ <xref linkend="libgsf"/> and
+ <xref linkend="libpng"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><ulink
- url="http://wvware.sourceforge.net/libwmf.html";>libwmf</ulink></para>
+ <para role="optional">
+ <ulink url="http://wvware.sourceforge.net/libwmf.html";>libwmf</ulink>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url='&blfs-wiki;/wv'/></para>
@@ -106,7 +108,7 @@
<segtitle>Installed Directory</segtitle>
<seglistitem>
- <seg>wvSummary, and several other wv* programs which are deprecated in
+ <seg>wvSummary and several other wv* programs which are deprecated in
favour of abiword: see
<ulink url="http://wvware.sourceforge.net/";></ulink></seg>
<seg>libwv-1.2.so</seg>
Modified: trunk/BOOK/general/genutils/compface.xml
==============================================================================
--- trunk/BOOK/general/genutils/compface.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genutils/compface.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -9,7 +9,7 @@
<!ENTITY compface-md5sum "62f4f79c0861ad292ba3cf77b4c48319">
<!ENTITY compface-size "47 KB">
<!ENTITY compface-buildsize "520 KB">
- <!ENTITY compface-time "Less than 0.1 SBU">
+ <!ENTITY compface-time "less than 0.1 SBU">
]>
<sect1 id="compface" xreflabel="Compface-&compface-version;">
@@ -33,7 +33,7 @@
convert from/to X-Face format, a 48x48 bitmap format used to carry
thumbnails
of email authors in a mail header.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genutils/hd2u.xml
==============================================================================
--- trunk/BOOK/general/genutils/hd2u.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genutils/hd2u.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -32,7 +32,7 @@
<para>The <application>hd2u</application> package contains
an any to any text format converter.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genutils/rarian.xml
==============================================================================
--- trunk/BOOK/general/genutils/rarian.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genutils/rarian.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -34,7 +34,7 @@
Rarian</application> is designed to be a replacement for <application>
ScrollKeeper</application>.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/genutils/screen.xml
==============================================================================
--- trunk/BOOK/general/genutils/screen.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/genutils/screen.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -38,7 +38,7 @@
including UTF-8. Screen sessions can be detached and resumed
later on a different terminal.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -81,7 +81,8 @@
<screen><userinput>./configure --prefix=/usr \
--with-socket-dir=/var/run/screen \
--with-pty-group=5 \
- --with-sys-screenrc=/etc/screenrc &&
+ --with-sys-screenrc=/etc/screenrc &&
+
sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &&
make</userinput></screen>
Modified: trunk/BOOK/general/prog/bazaar.xml
==============================================================================
--- trunk/BOOK/general/prog/bazaar.xml Thu Sep 5 06:42:36 2013 (r11767)
+++ trunk/BOOK/general/prog/bazaar.xml Thu Sep 5 09:23:52 2013 (r11768)
@@ -33,7 +33,7 @@
<para><application>Bazaar</application> is a version control system that
helps track project history over time and collaborate with others.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/general/prog/cvs.xml
==============================================================================
--- trunk/BOOK/general/prog/cvs.xml Thu Sep 5 06:42:36 2013 (r11767)
+++ trunk/BOOK/general/prog/cvs.xml Thu Sep 5 09:23:52 2013 (r11768)
@@ -35,7 +35,7 @@
These instructions install the client used to manipulate the repository,
creation of a repository is covered at <xref linkend="cvsserver"/>.</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -124,9 +124,12 @@
<screen><userinput>patch -Np1 -i
../cvs-&cvs-version;-zlib-1.patch</userinput></screen>
- <para>Now fix a conflict with newer libraries:</para>
+ <para>Now fix some conflicts with newer libraries and programs:</para>
-<screen><userinput>sed -i -e 's/getline /get_line /'
lib/getline.{c,h}</userinput></screen>
+<screen><userinput>
+sed -i -e 's/getline /get_line /' lib/getline.{c,h} &&
+sed -i -e 's/^@sp$/& 1/' doc/cvs.texinfo
+</userinput></screen>
<para>Install <application>CVS</application> by running
the following commands:</para>
Modified: trunk/BOOK/general/sysutils/bluez.xml
==============================================================================
--- trunk/BOOK/general/sysutils/bluez.xml Thu Sep 5 06:42:36 2013
(r11767)
+++ trunk/BOOK/general/sysutils/bluez.xml Thu Sep 5 09:23:52 2013
(r11768)
@@ -34,7 +34,7 @@
Bluetooth protocol stack for Linux.
</para>
- &lfs73_checked;
+ &lfs74_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -82,9 +82,8 @@
<para role="optional">
<xref linkend="alsa-lib"/>,
<xref linkend="check"/>,
- <!-- <xref linkend="cups"/>, -->
<xref linkend="gst-plugins-base"/>,
- <xref linkend="libsndfile"/> and
+ <xref linkend="libsndfile"/>, and
<xref linkend="libusb-compat"/>
</para>
@@ -130,19 +129,20 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr \
- --sysconfdir=/etc \
+<screen><userinput>
+./configure --prefix=/usr \
+ --sysconfdir=/etc \
--localstatedir=/var \
- --libexecdir=/lib \
- --enable-bccmd \
- --enable-dfutool \
- --enable-dund \
- --enable-hid2hci \
- --enable-hidd \
- --enable-pand \
- --enable-tools \
- --enable-wiimote \
- --disable-test \
+ --libexecdir=/lib \
+ --enable-bccmd \
+ --enable-dfutool \
+ --enable-dund \
+ --enable-hid2hci \
+ --enable-hidd \
+ --enable-pand \
+ --enable-tools \
+ --enable-wiimote \
+ --disable-test \
--without-systemdunitdir &&
make</userinput></screen>
@@ -326,7 +326,7 @@
<seg>
bccmd, bluetoothd, ciptool, dfutool, dund, gatttool,
hciattach, hciconfig, hcitool, hid2hci, hidd, l2ping,
- pand, rfcomm and sdptool
+ pand, rfcomm, and sdptool
</seg>
<seg>
libbluetooth.so
@@ -335,7 +335,7 @@
/etc/bluetooth,
/usr/include/bluetooth,
/usr/lib/bluetooth,
- /usr/share/doc/bluez-&bluez-version; and
+ /usr/share/doc/bluez-&bluez-version;, and
/var/lib/bluetooth
</seg>
</seglistitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
