r5318 - in trunk/BOOK: general/graphlib introduction/welcome

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Nov 27 08:11:02 PST 2005


Author: randy
Date: 2005-11-27 09:11:01 -0700 (Sun, 27 Nov 2005)
New Revision: 5318

Modified:
   trunk/BOOK/general/graphlib/fontconfig.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added an FTP download URL and changed the documentation installation to a versioned directory in the Fontconfig instructions

Modified: trunk/BOOK/general/graphlib/fontconfig.xml
===================================================================
--- trunk/BOOK/general/graphlib/fontconfig.xml	2005-11-27 02:11:30 UTC (rev 5317)
+++ trunk/BOOK/general/graphlib/fontconfig.xml	2005-11-27 16:11:01 UTC (rev 5318)
@@ -5,12 +5,11 @@
   %general-entities;
 
   <!ENTITY fontconfig-download-http "http://fontconfig.org/release/fontconfig-&fontconfig-version;.tar.gz">
-  <!-- <!ENTITY fontconfig-download-ftp "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/fontconfig-&fontconfig-version;.tar.gz"> -->
-  <!ENTITY fontconfig-download-ftp " ">
-  <!ENTITY fontconfig-md5sum "7354f9f125ea78a8f2851cb9c31d4866">
-  <!ENTITY fontconfig-size "942 KB">
-  <!ENTITY fontconfig-buildsize "13.0 MB">
-  <!ENTITY fontconfig-time "0.2 SBU">
+  <!ENTITY fontconfig-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/fontconfig-&fontconfig-version;.tar.gz">
+  <!ENTITY fontconfig-md5sum        "7354f9f125ea78a8f2851cb9c31d4866">
+  <!ENTITY fontconfig-size          "942 KB">
+  <!ENTITY fontconfig-buildsize     "13.0 MB">
+  <!ENTITY fontconfig-time          "0.2 SBU">
 ]>
 
 <sect1 id="fontconfig" xreflabel="Fontconfig-&fontconfig-version;">
@@ -57,9 +56,10 @@
 
     <note>
       <para>The numbering system of <application>Fontconfig</application> is
-      unusual. The beta versions of the package are numbered with a 9x in the last
-      portion of the release number. This means that 2.3.90 is a beta release and
-      the most current release is of the form &fontconfig-version;</para>
+      unusual. The beta versions of the package are numbered with a 9x in the
+      last portion of the release number. This means that 2.3.92 is a beta
+      release and the most current release is of the form
+      &fontconfig-version;</para>
     </note>
 
     <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
@@ -86,7 +86,8 @@
     <para>Install <application>Fontconfig</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --disable-docs &&
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --disable-docs \
+    --with-docdir=/usr/share/doc/fontconfig-&fontconfig-version; &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -94,12 +95,14 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
-install -v -m755 -d /usr/share/doc/fontconfig/fontconfig-devel &&
 install -v -m644 doc/*.3 /usr/share/man/man3 &&
 install -v -m644 doc/*.5 /usr/share/man/man5 &&
-install -v -m644 doc/*.{html,pdf,txt} /usr/share/doc/fontconfig &&
+install -v -m755 \
+        -d /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &&
+install -v -m644 doc/*.{html,pdf,txt} \
+        /usr/share/doc/fontconfig-&fontconfig-version; &&
 install -v -m644 doc/fontconfig-devel/* \
-    /usr/share/doc/fontconfig/fontconfig-devel</userinput></screen>
+        /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel</userinput></screen>
 
   </sect2>
 
@@ -110,17 +113,14 @@
     the documentation (the release tarball includes pre-generated
     documentation).</para>
 
-    <!-- If you wish to build the documentation using
-    <application>DocBook-utils</application>, you may need to remove the
-    <application>OpenSP</application> catalog definitions from the system
-    SGML catalogs. Use the following command before building
-    the package to accomplish this:</para>
+    <para><parameter>--with-docdir=/usr/share/doc/fontconfig-&fontconfig-version;</parameter>:
+    Though this parameter seems counter-intuitive following the preceding
+    parameter to the <command>configure</command> command, it is used so that
+    if the builder removes the <parameter>--disable-docs</parameter> parameter,
+    the documentation will be installed in a versioned directory name instead
+    of the default
+    <filename class='directory'>/usr/share/doc/fontconfig</filename>.</para>
 
-<screen role="root"><userinput>sed -i.orig \
-    -e "\%CATALOG /etc/sgml/OpenSP-1.5.1.cat%d" \
-    /etc/sgml/catalog \
-    /etc/sgml/sgml-docbook.cat</userinput></screen> -->
-
   </sect2>
 
   <sect2 role="configuration">
@@ -145,10 +145,10 @@
       <title>Configuration Information</title>
 
       <para>The configuration file for <application>Fontconfig</application> is
-      <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want to edit
-      this file. To put a new font directory in the configuration, create (or
-      update) the <filename>/etc/fonts/local.conf</filename> file with your local
-      information. The default location of fonts in
+      <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want to
+      edit this file. To put a new font directory in the configuration, create
+      (or update) the <filename>/etc/fonts/local.conf</filename> file with your
+      local information. The default location of fonts in
       <application>Fontconfig</application> is:</para>
 
       <itemizedlist spacing='compact'>
@@ -170,11 +170,11 @@
 
       <note>
         <para><application>X</application> also includes an internal (and
-        older) version of <application>Fontconfig</application> and unless it is
-        explicitly disabled when building <application>Xorg</application> or
-        <application>XFree86</application>, the internal version is created leaving
-        two slightly incompatible libraries on your system. It is recommended that
-        you only install one version.</para>
+        older) version of <application>Fontconfig</application> and unless it
+        is explicitly disabled when building <application>Xorg</application> or
+        <application>XFree86</application>, the internal version is created
+        leaving two slightly incompatible libraries on your system. It is
+        recommended that you only install one version.</para>
       </note>
 
     </sect3>
@@ -192,7 +192,8 @@
       <seglistitem>
         <seg>fc-cache, fc-list, and fc-match</seg>
         <seg>libfontconfig.[so,a]</seg>
-        <seg>/etc/fonts and /usr/include/fontconfig</seg>
+        <seg>/etc/fonts, /usr/include/fontconfig and
+        /usr/share/doc/fontconfig-&fontconfig-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-11-27 02:11:30 UTC (rev 5317)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-11-27 16:11:01 UTC (rev 5318)
@@ -45,6 +45,11 @@
       <para>November 27th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added an FTP download URL and changed the
+          documentation installation to a versioned directory in the Fontconfig
+          instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added documentation installation and clarified the
           purpose of the sed command in the FreeType instructions.</para>
         </listitem>




More information about the blfs-book mailing list