Replace pkg-config with pkgconf

7 files changed, 152 insertions, 144 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 204ef4c78..f7d0606d1 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1607,7 +1607,7 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
-          Gzip, Make, OpenSSL, Pkg-config, Sed, Xz, and Zlib</seg>
+          Gzip, Make, OpenSSL, Pkgconf, Sed, Xz, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2484,9 +2484,9 @@
       </segmentedlist>
 
 <!-- Begin Pkg-config dependency info -->
-  <bridgehead renderas="sect2" id="pkgconfig-dep">Pkg-config</bridgehead>
+  <bridgehead renderas="sect2" id="pkgconf-dep">Pkgconf</bridgehead>
 
-      <segmentedlist id="pkgconfig-depends">
+      <segmentedlist id="pkgconf-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
@@ -2494,33 +2494,31 @@
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="pkgconfig-rundeps">
+      <segmentedlist id="pkgconf-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
           <seg>Glibc</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="pkgconfig-testdeps">
+      <segmentedlist id="pkgconf-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
           <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="pkgoonfig-before">
+      <segmentedlist id="pkgconf-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>Kmod</seg>
         </seglistitem>
       </segmentedlist>
 
-      <segmentedlist id="pkgconfig-optdeps">
+      <segmentedlist id="pkgconf-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg>
-            <ulink url="&blfs-book;general/glib2.html">Glib2</ulink>
-          </seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8d3e1de56..03732c156 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2023-06-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rahul] - Changed from pkg-config to pkgconf 1.9.5.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-06-09</para>
       <itemizedlist>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 87238724d..569d6b6aa 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -609,11 +609,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Pkg-config (&pkgconfig-version;) - <token>&pkgconfig-size;</token>:</term>
+      <term>Pkgconf (&pkgconf-version;) - <token>&pkgconf-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&pkgconfig-home;"/></para>
-        <para>Download: <ulink url="&pkgconfig-url;"/></para>
-        <para>MD5 sum: <literal>&pkgconfig-md5;</literal></para>
+        <para>Home page: <ulink url="&pkgconf-home;"/></para>
+        <para>Download: <ulink url="&pkgconf-url;"/></para>
+        <para>MD5 sum: <literal>&pkgconf-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 91827b88e..605d26782 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -29,7 +29,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
@@ -39,7 +38,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.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="pkgconf.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="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml
new file mode 100644
index 000000000..73630f817
--- /dev/null
+++ b/chapter08/pkgconf.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-pkgconf" role="wrap">
+  <?dbhtml filename="pkgconf.html"?>
+
+  <sect1info condition="script">
+    <productname>pkgconf</productname>
+    <productnumber>&pkgconf-version;</productnumber>
+    <address>&pkgconf-url;</address>
+  </sect1info>
+
+  <title>Pkgconf-&pkgconf-version;</title>
+
+  <indexterm zone="ch-system-pkgconf">
+    <primary sortas="a-pkgconf">Pkgconf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The pkgconf package is a 
+    successor to pkg-config and contains a tool for passing the include path
+    and/or library paths to build tools during the configure and make phases
+    of package installations.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&pkgconf-fin-sbu;</seg>
+        <seg>&pkgconf-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Pkgconf</title>
+
+    <para>Prepare Pkgconf for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr              \
+            --disable-static           \
+            --docdir=/usr/share/doc/pkgconf-&pkgconf-version;</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+    <para>To maintain compatibility with the original Pkg-config create a
+    symlink:</para>
+
+<screen><userinput remap="install">ln -sfv pkgconf /usr/bin/pkg-config</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-pkgconf" role="content">
+    <title>Contents of Pkgconf</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>pkgconf, pkg-config (link to pkgconf), and bomtool</seg>
+        <seg>libpkgconf.so</seg>
+        <seg>/usr/share/doc/pkgconf-&pkgconf-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pkgconf">
+        <term><command>pkgconf</command></term>
+        <listitem>
+          <para>Returns meta information for the specified library or
+          package</para>
+          <indexterm zone="ch-system-pkgconf pkgconf">
+            <primary sortas="b-pkgconf">pkgconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bomtool">
+        <term><command>bomtool</command></term>
+        <listitem>
+          <para>Generates a Software Bill Of Materials from pkg-config .pc
+          files</para>
+          <indexterm zone="ch-system-pkgconf bomtool">
+            <primary sortas="b-bomtool">bomtool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpkgconf">
+        <term><filename class="libraryfile">libpkgconf</filename></term>
+        <listitem>
+          <para>Contains most of pkgconf's functionality, while allowing
+          other tools like IDEs and compilers to use its frameworks</para>
+          <indexterm zone="ch-system-pkgconf libpkgconf">
+            <primary sortas="c-libpkgconf">libpkgconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+
+</sect1>
diff --git a/chapter08/pkgconfig.xml b/chapter08/pkgconfig.xml
deleted file mode 100644
index b987a7652..000000000
--- a/chapter08/pkgconfig.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-pkgconfig" role="wrap">
-  <?dbhtml filename="pkg-config.html"?>
-
-  <sect1info condition="script">
-    <productname>pkg-config</productname>
-    <productnumber>&pkgconfig-version;</productnumber>
-    <address>&pkgconfig-url;</address>
-  </sect1info>
-
-  <title>Pkg-config-&pkgconfig-version;</title>
-
-  <indexterm zone="ch-system-pkgconfig">
-    <primary sortas="a-pkgconfig">Pkgconfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The pkg-config package contains a tool for passing the include path
-    and/or library paths to build tools during the configure and make phases
-    of package installations.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&pkgconfig-fin-sbu;</seg>
-        <seg>&pkgconfig-fin-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pkg-config</title>
-
-    <para>Prepare Pkg-config for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr              \
-            --with-internal-glib       \
-            --disable-host-tool        \
-            --docdir=/usr/share/doc/pkg-config-&pkgconfig-version;</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-internal-glib</parameter></term>
-        <listitem>
-          <para>This will allow pkg-config to use its internal version of
-          Glib because an external version is not available in LFS.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-host-tool</parameter></term>
-        <listitem>
-          <para>This option disables the creation of an undesired hard link
-          to the pkg-config program.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-pkgconfig" role="content">
-    <title>Contents of Pkg-config</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>pkg-config</seg>
-        <seg>/usr/share/doc/pkg-config-&pkgconfig-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkgconfig">
-         <!-- Don't remove the extra space, it prevents a FOP warning. -->
-        <term><command>pkg-config </command></term>
-        <listitem>
-          <para>Returns meta information for the specified library or package
-          </para>
-          <indexterm zone="ch-system-pkgconfig pkgconfig">
-            <primary sortas="b-pkgconfig">pkg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
diff --git a/packages.ent b/packages.ent
index c7046659e..fb731435c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -566,13 +566,13 @@
 <!ENTITY perl-fin-du "234 MB">
 <!ENTITY perl-fin-sbu "7.9 SBU">
 
-<!ENTITY pkgconfig-version "0.29.2">
-<!ENTITY pkgconfig-size "1,970 KB">
-<!ENTITY pkgconfig-url "https://pkg-config.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-<!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a">
-<!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config">
-<!ENTITY pkgconfig-fin-du "29 MB">
-<!ENTITY pkgconfig-fin-sbu "0.1 SBU">
+<!ENTITY pkgconf-version "1.9.5">
+<!ENTITY pkgconf-size "304 KB">
+<!ENTITY pkgconf-url "https://distfiles.dereferenced.org/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
+<!ENTITY pkgconf-md5 "0a8b69723bef4ebad83e9c8b43a75cc7">
+<!ENTITY pkgconf-home "http://pkgconf.org/">
+<!ENTITY pkgconf-fin-du "8.1 MB">
+<!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
 
 <!ENTITY procps-ng-version "4.0.3">
 <!ENTITY procps-ng-size "1,268 KB">