Index: general/genutils/mandoc.xml
===================================================================
--- general/genutils/mandoc.xml	(revision 7a91c80c31a0e9f0a4be7f7fe24e10e37cb1f21a)
+++ general/genutils/mandoc.xml	(revision 7a91c80c31a0e9f0a4be7f7fe24e10e37cb1f21a)
@@ -0,0 +1,131 @@
+<?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;
+
+  <!ENTITY mandoc-download-http "https://mandoc.bsd.lv/snapshots/mandoc-&mandoc-version;.tar.gz">
+  <!ENTITY mandoc-download-ftp  " ">
+  <!ENTITY mandoc-md5sum        "f0adf24e8fdef5f3e332191f653e422a">
+  <!ENTITY mandoc-size          "684 KB">
+  <!ENTITY mandoc-buildsize     "22 MB (with tests)">
+  <!ENTITY mandoc-time          "less than 0.1 SBU (with tests)">
+]>
+
+<sect1 id="mandoc" xreflabel="mandoc-&mandoc-version;">
+  <?dbhtml filename="mandoc.html"?>
+
+  <sect1info>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>mandoc-&mandoc-version;</title>
+
+  <indexterm zone="mandoc">
+    <primary sortas="a-mandoc">mandoc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to mandoc</title>
+
+    <para>
+      mandoc is an utility to format manual pages.
+    </para>
+
+    &lfs110a_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&mandoc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&mandoc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &mandoc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &mandoc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &mandoc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &mandoc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of mandoc</title>
+
+    <para>
+      Many utilities provided by <application>mandoc</application> conflicts
+      with <application>Man-DB</application> in LFS.  Only build the
+      <command>mandoc</command> command:
+    </para>
+
+<screen><userinput>./configure &amp;&amp;
+make mandoc</userinput></screen>
+
+    <para>
+      To test the package, issue: <command>make regress</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -vm755 mandoc   /usr/bin &amp;&amp;
+install -vm644 mandoc.1 /usr/share/man/man1</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+
+      <seglistitem>
+        <seg>
+          mandoc
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mandoc-prog">
+        <term><command>mandoc</command></term>
+        <listitem>
+          <para>
+            Formats manual pages
+          </para>
+          <indexterm zone="mandoc mandoc-prog">
+            <primary sortas="b-mandoc-prog">mandoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: packages.ent
===================================================================
--- packages.ent	(revision 6cbf1b1f97cb2f4379fd810f022e56ad71e71912)
+++ packages.ent	(revision 7a91c80c31a0e9f0a4be7f7fe24e10e37cb1f21a)
@@ -280,4 +280,5 @@
 <!ENTITY unixodbc-version             "2.3.9">
 <!ENTITY xdg-user-dirs-version        "0.17">
+<!ENTITY mandoc-version               "1.14.6">
 
 <!-- Chapter 12 -->
@@ -328,8 +329,8 @@
 
 <!-- UEFI bootloaders -->
-<!ENTITY efivar-version               "37">
+<!ENTITY efivar-version               "38">
 <!ENTITY efibootmgr-version           "17">
 <!ENTITY grub-version                 "2.06">
-<!ENTITY unifont-version              "13.0.06">
+<!ENTITY unifont-version              "14.0.01">
 
 <!-- Chapter 13 -->
Index: postlfs/filesystems/uefi-bootloaders/efibootmgr.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/efibootmgr.xml	(revision 6cbf1b1f97cb2f4379fd810f022e56ad71e71912)
+++ postlfs/filesystems/uefi-bootloaders/efibootmgr.xml	(revision 7a91c80c31a0e9f0a4be7f7fe24e10e37cb1f21a)
@@ -94,4 +94,10 @@
 
     <para>
+      Fix an issue building this package with efivar-38 or later:
+    </para>
+
+<screen><userinput>sed 's/-Werror//' -i Make.defaults</userinput></screen>
+
+    <para>
       Build <application>efibootmgr</application> with the following
       commands:
Index: postlfs/filesystems/uefi-bootloaders/efivar.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/efivar.xml	(revision 6cbf1b1f97cb2f4379fd810f022e56ad71e71912)
+++ postlfs/filesystems/uefi-bootloaders/efivar.xml	(revision 7a91c80c31a0e9f0a4be7f7fe24e10e37cb1f21a)
@@ -7,7 +7,7 @@
   <!ENTITY efivar-download-http "https://github.com/rhboot/efivar/releases/download/&efivar-version;/efivar-&efivar-version;.tar.bz2">
   <!ENTITY efivar-download-ftp  " ">
-  <!ENTITY efivar-md5sum        "9f067275c5f7aafdd75bfb364280ac9c">
-  <!ENTITY efivar-size          "108 KB">
-  <!ENTITY efivar-buildsize     "2.75 MB">
+  <!ENTITY efivar-md5sum        "243fdbc48440212695cb9c6e6fd0f44f">
+  <!ENTITY efivar-size          "316 KB">
+  <!ENTITY efivar-buildsize     "18 MB">
   <!ENTITY efivar-time          "less than 0.1 SBU">
 ]>
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70,13 +70,10 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/efivar-&efivar-version;-gcc_9-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
+    <bridgehead renderas="sect3">efivar Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="mandoc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -89,8 +86,9 @@
 
     <para>
-      First, apply a patch to fix an issue building with GCC 9 or later:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../efivar-37-gcc_9-1.patch</userinput></screen>
+      First, fix an issue in Makefile causing the package to be rebuilt
+      during installation:
+    </para>
+
+<screen><userinput>sed '/prep :/a\\ttouch prep' -i src/Makefile</userinput></screen>
 
     <para>
@@ -98,5 +96,5 @@
     </para>
 
-<screen><userinput>make CFLAGS="-O2 -Wno-stringop-truncation"</userinput></screen>
+<screen><userinput>make</userinput></screen>
 
     <para>
@@ -116,9 +114,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <parameter>CFLAGS="-O2 -Wno-stringop-truncation"</parameter>:
-      This option overrides the default compiler flags to avoid a build failure.
-    </para>
 
     <para>
@@ -141,8 +134,8 @@
       <seglistitem>
         <seg>
-          efivar
+          efisecdb and efivar
         </seg>
         <seg>
-          libefiboot.so and libefivar.so
+          libefiboot.so, libefisec.so, and libefivar.so
         </seg>
         <seg>
@@ -157,4 +150,16 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="efisecdb">
+        <term><command>efisecdb</command></term>
+        <listitem>
+          <para>
+            is an utility for managing UEFI signature lists
+          </para>
+          <indexterm zone="efivar efisecdb">
+            <primary sortas="b-efisecdb">efisecdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="efivar-prog">
         <term><command>efivar</command></term>
@@ -181,4 +186,16 @@
       </varlistentry>
 
+      <varlistentry id="libefisec">
+        <term><filename class="libraryfile">libefisec.so</filename></term>
+        <listitem>
+          <para>
+            is a library for managing UEFI signature lists
+          </para>
+          <indexterm zone="efivar libefisec">
+            <primary sortas="c-libefisec">libefisec.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libefivar">
         <term><filename class="libraryfile">libefivar.so</filename></term>
Index: postlfs/filesystems/uefi-bootloaders/grub-efi.xml
===================================================================
--- postlfs/filesystems/uefi-bootloaders/grub-efi.xml	(revision 6cbf1b1f97cb2f4379fd810f022e56ad71e71912)
+++ postlfs/filesystems/uefi-bootloaders/grub-efi.xml	(revision 7a91c80c31a0e9f0a4be7f7fe24e10e37cb1f21a)
@@ -9,9 +9,9 @@
   <!ENTITY grub-efi-md5sum        "cf0fd928b1e5479c8108ee52cb114363">
   <!ENTITY grub-efi-size          "6.3 MB">
-  <!ENTITY grub-efi-buildsize     "185 MB">
-  <!ENTITY grub-efi-time          "0.9 SBU">
+  <!ENTITY grub-efi-buildsize     "137 MB">
+  <!ENTITY grub-efi-time          "1.0 SBU">
 
   <!ENTITY unifont-download-http  "https://unifoundry.com/pub/unifont/unifont-&unifont-version;/font-builds/unifont-&unifont-version;.pcf.gz">
-  <!ENTITY unifont-md5sum         "4fbc33c8d8d25985f1bcdd4d28bc2420">
+  <!ENTITY unifont-md5sum         "8191ca4fce0eb6073d47c7573e6babc1">
   <!ENTITY unifont-size           "1.3 MB">
 ]>
