From 421011f840a36f4e710feb5fa9c168f55d953e58 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 23 Jul 2012 15:15:49 +0000
Subject: [PATCH] Moved a few things around for ordering/convenience.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9918 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter03/patches.xml   | 16 ++++++++--------
 chapter06/chapter06.xml |  2 +-
 chapter06/e2fsprogs.xml |  8 +++-----
 packages.ent            |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1043fc5aa..daa9f2581 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -99,14 +99,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Kmod Testsuite Patch - <token>&kmod-testsuite-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kmod-testsuite-patch;"/></para>
-        <para>MD5 sum: <literal>&kmod-testsuite-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
@@ -115,6 +107,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Kmod Testsuite Patch - <token>&kmod-testsuite-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&kmod-testsuite-patch;"/></para>
+        <para>MD5 sum: <literal>&kmod-testsuite-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Patch Testsuite Fix Patch - <token>&patch-test-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3d15ebf75..b99e74ab6 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -30,6 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
@@ -46,7 +47,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 22b6ba24f..1ebbe6a55 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -52,9 +52,7 @@ cd build</userinput></screen>
 
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true         \
-LDFLAGS="-lblkid -luuid"           \
-../configure --prefix=/usr         \
+<screen><userinput remap="configure">../configure --prefix=/usr         \
              --with-root-prefix="" \
              --enable-elf-shlibs   \
              --disable-libblkid    \
@@ -64,7 +62,7 @@ LDFLAGS="-lblkid -luuid"           \
 
     <variablelist>
       <title>The meaning of the configure options:</title>
-
+<!--
       <varlistentry>
         <term><parameter>PKG_CONFIG...</parameter></term>
         <listitem>
@@ -72,7 +70,7 @@ LDFLAGS="-lblkid -luuid"           \
           to be built and installed first.</para>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry>
         <term><parameter>--with-root-prefix=""</parameter></term>
         <listitem>
diff --git a/packages.ent b/packages.ent
index 122b2aef1..098474e37 100644
--- a/packages.ent
+++ b/packages.ent
@@ -431,7 +431,7 @@
 
 <!ENTITY pkgconfig-version "0.27">
 <!ENTITY pkgconfig-size "1872 KB">
-<!ENTITY pkgconfig-url "http://people.freedesktop.org/pkg-config-&pkgconfig-version;.tar.gz">
+<!ENTITY pkgconfig-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
 <!ENTITY pkgconfig-md5 "3a4c9feab14b6719afd8904945d9b4e4">
 <!ENTITY pkgconfig-home "http://www.freedesktop.org/wiki/Software/pkg-config">
 <!ENTITY pkgconfig-ch6-du "38 MB">