Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,298 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 balsa-download-http "https://pawsa.fedorapeople.org/balsa/balsa-&balsa-version;.tar.xz">
-  <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "bebd22cb6bac87ee05255c48ee1d28dd">
-  <!ENTITY balsa-size          "3.5 MB">
-  <!ENTITY balsa-buildsize     "66 MB">
-  <!ENTITY balsa-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="balsa" xreflabel="Balsa-&balsa-version;">
-  <?dbhtml filename="balsa.html" ?>
-
-
-  <title>Balsa-&balsa-version;</title>
-
-  <indexterm zone="balsa">
-    <primary sortas="a-Balsa">Balsa</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Balsa</title>
-
-    <para>
-      The <application>Balsa</application> package contains a
-      <application>GNOME</application>-2 based mail client.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&balsa-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&balsa-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &balsa-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &balsa-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &balsa-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &balsa-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/balsa-&balsa-version;-upstream_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Balsa Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="gmime3"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libnotify"/>
-      <!--<xref linkend="rarian"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="compface"/>,
-      <xref linkend="gcr"/>,
-      <xref linkend="gtksourceview"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="procmail"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="webkitgtk"/>,
-      <ulink url="https://pypi.python.org/pypi/html2text/">html2text</ulink>,
-      <ulink url="https://osmo-pim.sourceforge.net/">osmo</ulink>,
-      <ulink url="https://sourceforge.net/projects/rubrica.berlios/">rubrica</ulink>,
-      <ulink url="&gnome-download-http;/yelp-tools/">yelp-tools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Balsa</title>
-
-    <para>
-      First, fix build issues when configuring without WebKitGTK, or when
-      using WebKitGTK-2.38 or later.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../balsa-&balsa-version;-upstream_fixes-2.patch</userinput></screen>
-
-    <para>
-      Install <application>Balsa</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr            \
-            --sysconfdir=/etc        \
-            --localstatedir=/var/lib \
-            --without-html-widget    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role='root'><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- Support has been added for this, but the option is still unrecognized.
-    <para>
-      <parameter>- -with-rubrica</parameter>: This parameter is used
-      to provide Rubrica2 address book support.
-    </para>
-    -->
-
-    <!-- configure says this is an invalid option with 2.5.11
-    <para>
-      <option>- -enable-smime</option>: Use this option to enable S/MIME
-      support if <application>GnuPG-2.x.x</application> is installed.
-    </para>
-    -->
-
-    <para>
-      <parameter>--without-html-widget</parameter>: This option disables
-      building the HTML renderer. If you want the HTML renderer to be built,
-      verify that you have <xref linkend="webkitgtk"/> installed, and then
-      remove this option.
-    </para>
-
-    <para>
-      <option>--with-canberra</option>: Enable libcanberra support.
-    </para>
-
-    <para>
-      <option>--with-compface</option>: Enable compface support.
-    </para>
-
-    <para>
-      <option>--with-gcr</option>: Use libgcr for TLS support.
-    </para>
-
-    <para>
-      <option>--with-gss</option>: Enable GSSAPI support.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: Use this option to enable LDAP address
-      book support if <application>OpenLDAP</application> is installed.
-    </para>
-
-    <para>
-      <option>--with-libsecret</option>: Enable strong password
-      support and support for gnome-keyring to store passwords.
-    </para>
-
-    <!-- configure says this is an invalid option with 2.5.11
-    <para>
-      <option>- -with-gpgme</option>: Use this option to enable GPG support
-      if <quote><application>GnuPG</application> Made Easy</quote>
-      (<application>GPGME</application>) is installed.
-    </para>
-    -->
-
-    <para>
-      <option>--with-sqlite</option>: Use this option to enable SQLite
-      address book support if <application>SQLite</application> is
-      installed.
-    </para>
-
-  </sect2>
-
-<!-- All of this information is invalid. These options no longer exist since
-     Balsa was ported to GTK3.
-  <sect2 role="configuration">
-    <title>Configuring Balsa</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        All configuration of <application>Balsa</application> is done
-        through the <application>Balsa</application> menu system, with mailbox
-        configuration done with the Settings&mdash;&gt;Preferences menu.
-      </para>
-
-      <para>
-        If you are unable to connect to your ISP, they probably don't
-        support APOP.  Disable it in Settings/Preferences/POP3/advanced.
-      </para>
-
-      <para>
-        If you enable filters for your incoming POP3 mail, you must have
-        <xref linkend="procmail"/> installed, as the incoming mail will be
-        handed off to <command>procmail</command> for processing.
-      </para>
-
-    </sect3>
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>balsa and balsa-ab</seg>
-        <seg>None</seg>
-        <seg>/etc/sounds/events,
-             /usr/share/balsa,
-             and /usr/share/sounds/balsa</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="balsa-prog">
-        <term><command>balsa</command></term>
-        <listitem>
-          <para>
-            is a glib based mail client
-          </para>
-          <indexterm zone="balsa balsa-prog">
-            <primary sortas="b-balsa">balsa</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="balsa-ab">
-        <term><command>balsa-ab</command></term>
-        <listitem>
-          <para>
-            is the address-book application used by <command>balsa</command>
-          </para>
-          <indexterm zone="balsa balsa-ab">
-            <primary sortas="b-balsa">balsa-ab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/feh.xml
===================================================================
--- xsoft/other/feh.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 feh-download-http "https://feh.finalrewind.org/feh-&feh-version;.tar.bz2">
-  <!ENTITY feh-download-ftp  " ">
-  <!ENTITY feh-md5sum        "0a780bf321c0653d03e3e18410f4d1ba">
-  <!ENTITY feh-size          "2.1 MB">
-  <!ENTITY feh-buildsize     "6.9 MB (with tests)">
-  <!ENTITY feh-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="feh" xreflabel="feh-&feh-version;">
-  <?dbhtml filename="feh.html"?>
-
-
-  <title>feh-&feh-version;</title>
-
-  <indexterm zone="feh">
-    <primary sortas="a-feh">feh</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to feh</title>
-
-    <para>
-      <application>feh</application> is a fast, lightweight image viewer which
-      uses Imlib2. It is commandline-driven and supports multiple images
-      through slideshows, thumbnail browsing or multiple windows, and montages
-      or index prints (using TrueType fonts to display file info). Advanced
-      features include fast dynamic zooming, progressive loading, loading via
-      HTTP (with reload support for watching webcams), recursive file opening
-      (slideshow of a directory hierarchy), and mouse wheel/keyboard control.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-
-<!--  Seems to work OK now
-    <note>
-      <para>
-        For some reason, using a browser, the link will not download the
-        package as a tarball, but instead, as a page. Therefore, you will need
-        to use <quote>Save link as</quote> or the <command>wget</command> or
-        another similar command, in the command line.
-      </para>
-    </note>
--->
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&feh-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&feh-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &feh-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &feh-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &feh-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &feh-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- I don't think this is needed as of 2.17. -renodr -->
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch, for the test suite:
-          <ulink
-            url="&patch-root;/feh-&feh-version;-disable_some_tests-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">feh Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/> and
-      <xref linkend="imlib2"/> (built with
-      <xref linkend="giflib"/> support, for the tests)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libexif"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="libjpeg"/> (for lossless image rotation) and
-      <xref role="runtime" linkend="imagemagick"/> (to load unsupported formats)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (test suite)</bridgehead>
-    <para role="optional">
-      <xref linkend="perl-test-command"/> (required) and
-      <xref linkend="mandoc"/> (optional)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of feh</title>
-
-<!--
-    <para>
-      Due to well-known problems when <application>feh</application> try to
-      load gif images (sometimes <application>imlib2</application> being blamed
-      for that), some tests fail. To avoid that, apply the following patch, if
-      you intend to run the test suite:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../feh-&feh-version;-disable_some_tests-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>feh</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i "s:doc/feh:&amp;-&feh-version;:" config.mk &amp;&amp;
-make PREFIX=/usr</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "s:doc/feh:&amp;-&feh-version;:" config.mk</command>: This
-      sed fixes the doc directory to a versioned one, as used in BLFS.
-   </para>
-
-    <para>
-      <option>curl=0</option>: Use this make flag if you don't have the cURL
-      package installed.
-    </para>
-
-    <para>
-      <option>exif=1</option>: This make flag enables builtin Exif tag display
-      support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          feh
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/feh-&feh-version; and
-          /usr/share/feh
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="feh-prog">
-        <term><command>feh</command></term>
-        <listitem>
-          <para>
-            is an image viewer and cataloguer
-          </para>
-          <indexterm zone="feh feh-prog">
-            <primary sortas="b-feh">feh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-dist-&fontforge-version;.tar.xz">
--->
- <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.xz">
-
-  <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "7043f25368ed25bcd75d168564919fb7">
-  <!ENTITY fontforge-size          "13 MB">
-  <!ENTITY fontforge-buildsize     "102 MB (add 52 MB for the tests)">
-  <!ENTITY fontforge-time          "0.4 SBU (with parallelism=4, add 0.1 SBU for the tests)">
-]>
-
-<sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
-  <?dbhtml filename="fontforge.html"?>
-
-
-  <title>FontForge-&fontforge-version;</title>
-
-  <indexterm zone="fontforge">
-    <primary sortas="a-FontForge">FontForge</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FontForge</title>
-
-    <para>
-      The <application>FontForge</application> package contains an
-      outline font editor that lets you create your own postscript,
-      truetype, opentype, cid-keyed, multi-master, cff, svg and
-      bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fontforge-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fontforge-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fontforge-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fontforge-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fontforge-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fontforge-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fontforge-&fontforge-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libspiro"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <!-- not mentioned:
-      glib is required for gtk3
-      pango is required for gtk3
-      cairo is recommended for pango
-      xorg libs pulled in by gtk3 via libepoxy.
-      -->
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <!-- the following references in the source appear not to be used:
-      curl is mentioned in appveyor.yml for msys2 (integration tests, I think)
-      wget is referenced in Unicode/charset/generate.sh which will fail if
-      wget is not on the PATH, and in Unicode/dump.c - with wget moved off the
-      PATH, no problems, i.e. they are never run and never built.
-
-      Some of the others are at a minimum pulled in for recommended deps -
-       libpng from freetype from fontconfig from xorg libs.
-       harfbuzz is the same
-
-      Also, adding or removing optional deps other than Sphinx doesn't seem
-      to materially alter the build time or size.
-      -->
-      <xref linkend="giflib"/>,
-      <xref linkend="git"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="sphinx"/> (to build html documentation), and
-      <xref linkend="woff2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FontForge</title>
-
-    <para>
-      First, fix two security vulnerabilities in the Splinefont functionality:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../fontforge-&fontforge-version;-security_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, fix a problem with old translations exposed by gettext-0.22:
-    </para>
-
-<screen><userinput>sed -i.orig 's/\(%[^%[:space:]]*\)hs/\1s/g' \
- fontforgeexe/searchview.c po/de.po po/ca.po \
- po/hr.po po/it.po po/pl.po po/uk.po po/en_GB.po \
- po/fr.po po/vi.po po/ko.po po/ja.po</userinput></screen>
-
-    <para>
-      Install <application>FontForge</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have installed <command>sphinx-build</command>, HTML documentation
-      was built and installed in
-      <filename class="directory">/usr/share/doc/fontforge</filename>.
-      To be able to access it as a versioned directory, create a
-      symlink as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>ln -sv fontforge /usr/share/doc/fontforge-&fontforge-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      create an optimized release without debug information.
-    </para>
-
-    <para>
-      <parameter>-Wno-dev</parameter>: This switch is used to suppress warnings
-      intended for the package's developers.
-    </para>
-
-    <para>
-      <option>-DENABLE_X11=ON</option>: use an X11 backend instead of GDK3
-      (gtk+-3) for basic Xorg graphics.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fontforge, fontimage, fontlint and sfddiff
-        </seg>
-        <seg>
-          libfontforge.so and
-          /usr/lib/python&python3-version;/site-packages/{fontforge,psMat}.so
-        </seg>
-        <seg>
-          /usr/share/fontforge and optionally
-          /usr/share/doc/fontforge{,-&fontforge-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fontforge-prog">
-        <term><command>fontforge</command></term>
-        <listitem>
-          <para>
-            is a program that allows you to create and
-            modify font files
-          </para>
-          <indexterm zone="fontforge fontforge-prog">
-            <primary sortas="b-fontforge">fontforge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontimage">
-        <term><command>fontimage</command></term>
-        <listitem>
-          <para>
-            is a program that produces an image showing
-            representative glyphs of the font
-          </para>
-          <indexterm zone="fontforge fontimage">
-            <primary sortas="b-fontimage">fontimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontlint">
-        <term><command>fontlint</command></term>
-        <listitem>
-          <para>
-            is a program that checks the font for certain
-            common errors
-          </para>
-          <indexterm zone="fontforge fontlint">
-            <primary sortas="b-fontlint">fontlint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfddiff">
-        <term><command>sfddiff</command></term>
-        <listitem>
-          <para>
-            is a program that compares two font files
-          </para>
-          <indexterm zone="fontforge sfddiff">
-            <primary sortas="b-sfddiff">sfddiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,569 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gimp-download-http "https://download.gimp.org/pub/gimp/v2.10/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-download-ftp  " ">
-  <!ENTITY gimp-md5sum        "e44e1c91b09db8fcdc9ef5797ce11b77">
-  <!ENTITY gimp-size          "30 MB">
-  <!ENTITY gimp-buildsize     "882 MB (197 MB installed, add 835 MB for tests)">
-  <!ENTITY gimp-time          "2.3 SBU (Using parallelism=4; add 0.7 SBU for tests)">
-
-  <!-- pro-tem, a pull of gimp-help, https://gitlab.gnome.org/GNOME/gimp-help.git
-  git archive - -format=tar - -prefix=${DIRNAME}/ HEAD | xz >../${DIRNAME}.tar.xz -->
-
-  <!-- renodr: I generated the git tarball using the following instructions:
-       cd /tmp &&
-       mkdir gimp-help &&
-       cd gimp-help &&
-       git clone https://gitlab.gnome.org/GNOME/gimp-help.git &&
-       cd gimp-help &&
-       git checkout gimp-help-2-10 &&
-       cd .. &&
-       rm -rv gimp-help/.git &&
-       mv -v gimp-help gimp-help-<DATE>
-       tar -cJvf gimp-help-<DATE>.tar.xz gimp-help-<DATE>
-
-       After you've completed this, run a test build, and upload the tarball to
-       anduin.-->
-
-  <!ENTITY gimp-help-version    "&gimp-version;">
-<!--  <!ENTITY gimp-help-download   "&sources-anduin-http;/gimp/gimp-help-&gimp-help-version;.tar.xz"> -->
-  <!ENTITY gimp-help-download   "https://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
-  <!ENTITY gimp-help-md5sum     "5e393d61c802e73ffe6c550759ed0853">
-  <!ENTITY gimp-help-size       "158 MB">
-  <!ENTITY gimp-help-buildsize  "From 412 MB (en only) to 1.8 GB (for all
-                                 languages)">
-  <!ENTITY gimp-help-time       "2.1 SBU (en only), 13 SBU, with parallelism=4,
-                                 for all languages">
-]>
-
-<sect1 id="gimp" xreflabel="Gimp-&gimp-version;">
-  <?dbhtml filename="gimp.html" ?>
-
-
-  <title>Gimp-&gimp-version;</title>
-
-  <indexterm zone="gimp">
-    <primary sortas="a-Gimp">Gimp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gimp</title>
-
-    <para>
-      The <application>Gimp</application> package contains
-      the GNU Image Manipulation Program which is useful for
-      photo retouching, image composition and image authoring.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gimp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gimp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gimp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gimp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gimp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gimp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-<!--
-    <note>
-      <para>
-       The creation of local html files with recent versions of the necessary
-       packages is somewhat broken (some png images are not sourced by the
-       generated HTML, only their captions are visible).
-      </para>
-    </note>
--->
-    <note>
-      <para>
-        The help files English version is complete, but large
-        parts of the text for many other languages are not yet translated.
-      </para>
-    </note>
-
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gimp-help-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gimp-help-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gimp-help-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gimp-help-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gimp-help-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gimp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gegl"/>,
-      <xref linkend="gexiv2"/>,
-      <xref linkend="glib-networking"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="harfbuzz"/>.
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmypaint"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <!-- en can be built without this -->
-      <xref linkend="libxml2"/> (to build the translated help files),
-      <xref linkend="lcms2"/>,
-      <xref linkend="mypaint-brushes"/>,
-      <xref linkend="poppler"/> (including poppler-data) and
-      <!-- some parts of Xorg appear to be required, as are deps it pulls in -->
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="gs"/> (with libgs installed),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="pygtk"/> (including the gtk, pango and pangocairo modules) and
-      <xref linkend="xdg-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gvfs"/> (to access the online help),
-      <xref linkend="libmng"/>,
-      <xref linkend="libunwind"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> program),
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://people.freedesktop.org/~hughsient/appstream-glib">appstream-glib</ulink>,
-      <ulink url="https://github.com/ianlancetaylor/libbacktrace">libbacktrace</ulink>,
-      <ulink url="https://github.com/strukturag/libheif/">libheif</ulink> with
-      <ulink url="https://github.com/strukturag/libde265/">libde265</ulink>
-      (both needed to read macOS heic images),
-      <ulink url="https://wvware.sourceforge.net/libwmf.html">libwmf</ulink>, and
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
-    </para>
-
-    <para>
-      When you have run configure, you will see that WebKit is not found -
-      that dependency is for the legacy webkit-1.0 which should never be used
-      on a modern system exposed to the internet.
-    </para>
-
-    <bridgehead renderas="sect4">Optional, for building the help system</bridgehead>
-    <para role="optional">
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink> (for PDF docs),
-      <ulink url="https://pngnq.sourceforge.net/">pngnq</ulink> and
-      <ulink url="https://pmt.sourceforge.net/pngcrush/">pngcrush</ulink>
-      to optimize the png files, but see the note on the help download above
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/gimp"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gimp</title>
-
-    <para>
-      Install <application>Gimp</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results (requires an X-Windowed terminal) issue:
-      <command>make check</command>.
-      <!-- km: in 2.10.16 no failures, 2 tests were skipped -->
-
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gimp-Help</title>
-
-    <para>
-      The <filename>gimp-help</filename> tarball contains images and English
-      text help for help files, together with translations. <!--
-      The documentation generated by gimp-help-2.10.34 and online help have
-      the same contents, so I comment this out. [pierre Nov. 2023]
-      Because of the
-      issues mentioned in the note above, you are recommended to use the online
-      help, either by building against <xref linkend="gvfs"/> so that 'help'
-      can open the latest XML files in your browser, or else you can manually
-      open the html in your browser by going to <ulink
-      url="https://docs.gimp.org/2.10/en/">https://docs.gimp.org/2.10/en</ulink>
-     (change the language code if desired).-->
-    </para>
-
-    <para>
-      <!--     If you nevertheless wish to install local copies of the help files to read
-      offline, u-->Unpack the <filename>gimp-help</filename> tarball
-      and change into the root of the newly created source tree. Prepare for
-      the build with the following command:
-    </para>
-
-<screen><userinput>ALL_LINGUAS=&quot;ca cs da de en en_GB es fa fr hr ko lt nl nn pt pt_BR ro sl sv uk zh_CN&quot; \
-./configure --prefix=/usr</userinput></screen>
-
-    <para>
-      Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
-      you do not wish to install. Alternatively, remove the line starting with
-      <envar>ALL_LINGUAS</envar>, if you wish to build all languages.
-    </para>
-
-    <para>
-      Now build the help files:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user to install the help
-      files:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands" id="gimp-cmd-explanations">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>ALL_LINGUAS=&quot;ca cs da de en en_GB es fa...&quot;</envar>: by
-      default, the help files will be rendered in all the available languages.
-      Remove the codes of any languages you do not wish to build.
-    </para>
-
-    <para>
-      <option>--disable-python</option>: This option is necessary if
-      you have not installed <application>PyGTK</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring The Gimp</title>
-
-    <sect3 id="gimp-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gimp/2.0/*</filename> and
-        <filename>~/.gimp-2.8/gimprc</filename>
-      </para>
-
-      <indexterm zone="gimp gimp-config">
-        <primary sortas="e-AA.gimp-2.0/gimprc">~/.g/GIMP/2.10/*</primary>
-      </indexterm>
-
-      <indexterm zone="gimp gimp-config">
-        <primary sortas="e-etc-gimp-2.0-star">/etc/gimp/2.0/*</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gimp (symlink), gimp-2.10,
-          gimp-console (symlink), gimp-console-2.10,
-          gimp-test-clipboard-2.0, and
-          gimptool-2.0
-        </seg>
-        <seg>
-          libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
-          libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
-          libgimpthumb-2.0.so, libgimpui-2.0.so, and libgimpwidgets-2.0.so
-        </seg>
-        <seg>
-          /etc/gimp,
-          /usr/include/gimp-2.0,
-          /usr/{lib,share}/gimp,
-          /usr/share/gtk-doc/html/libgimp{,base,color,config}, and
-          /usr/share/gtk-doc/html/libgimp{math,module,thumb,widgets}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gimp-prog">
-        <term><command>gimp</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>gimp-2.10</command>
-          </para>
-          <indexterm zone="gimp gimp-prog">
-            <primary sortas="b-gimp">gimp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-2.10">
-        <term><command>gimp-2.10</command></term>
-        <listitem>
-          <para>
-            is the Gnu Image Manipulation Program. It works with a variety
-            of image formats and provides a large selection of tools
-          </para>
-          <indexterm zone="gimp gimp-2.10">
-            <primary sortas="b-gimp-2.10">gimp-2.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-console">
-        <term><command>gimp-console</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>gimp-console-2.10</command>
-          </para>
-          <indexterm zone="gimp gimp-console">
-            <primary sortas="b-gimp-console">gimp-console</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-console-2.10">
-        <term><command>gimp-console-2.10</command></term>
-        <listitem>
-          <para>
-            is a console program that behaves as if The
-            <application>Gimp</application> was called with the
-            <option>--no-interface</option> command-line option
-          </para>
-          <indexterm zone="gimp gimp-console-2.10">
-            <primary sortas="b-gimp-console-2.10">gimp-console-2.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimptool-2.0">
-        <term><command>gimptool-2.0</command></term>
-        <listitem>
-          <para>
-            is a tool that can build plug-ins or scripts and install them
-            if they are distributed in one source file.
-            <command>gimptool-2.0</command> can also be used by programs that
-            need to know what libraries and include-paths The
-            <application>Gimp</application> was compiled with
-          </para>
-          <indexterm zone="gimp gimptool-2.0">
-            <primary sortas="b-gimptool-2.0">gimptool-2.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimp-2.0">
-        <term><filename class="libraryfile">libgimp-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides C bindings for The <application>Gimp</application>'s
-            Procedural Database (PDB) which offers an interface to core functions
-            and to functionality provided by plug-ins
-          </para>
-          <indexterm zone="gimp libgimp-2.0">
-            <primary sortas="c-libgimp-2.0">libgimp-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpbase-2.0">
-        <term><filename class="libraryfile">libgimpbase-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions for basic
-            <application>Gimp</application> functionality such as determining
-            enumeration data types, gettext translation, determining The
-            <application>Gimp</application>'s version number and capabilities,
-            handling data files and accessing the environment
-          </para>
-          <indexterm zone="gimp libgimpbase-2.0">
-            <primary sortas="c-libgimpbase-2.0">libgimpbase-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpcolor-2.0">
-        <term><filename class="libraryfile">libgimpcolor-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions relating to RGB, HSV and CMYK colors as
-            well as converting colors between different color models and
-            performing adaptive supersampling on an area
-          </para>
-          <indexterm zone="gimp libgimpcolor-2.0">
-            <primary sortas="c-libgimpcolor-2.0">libgimpcolor-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpconfig-2.0">
-        <term><filename class="libraryfile">libgimpconfig-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains C functions for reading and writing config information
-          </para>
-          <indexterm zone="gimp libgimpconfig-2.0">
-            <primary sortas="c-libgimpconfig-2.0">libgimpconfig-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpmath-2.0">
-        <term><filename class="libraryfile">libgimpmath-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains C functions which provide mathematical definitions and
-            macros, manipulate 3x3 transformation matrices, set up and manipulate
-            vectors and the MD5 message-digest algorithm
-          </para>
-          <indexterm zone="gimp libgimpmath-2.0">
-            <primary sortas="c-libgimpmath-2.0">libgimpmath-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpmodule-2.0">
-        <term><filename class="libraryfile">libgimpmodule-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions which implement module loading using
-            GModule and supports keeping a list of GimpModule's found in a given
-            searchpath
-          </para>
-          <indexterm zone="gimp libgimpmodule-2.0">
-            <primary sortas="c-libgimpmodule-2.0">libgimpmodule-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpthumb-2.0">
-        <term><filename class="libraryfile">libgimpthumb-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions for handling The
-            <application>Gimp</application>'s thumbnail objects
-          </para>
-          <indexterm zone="gimp libgimpthumb-2.0">
-            <primary sortas="c-libgimpthumb-2.0">libgimpthumb-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpui-2.0">
-        <term><filename class="libraryfile">libgimpui-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains The <application>Gimp</application>'s common user
-            interface functions
-          </para>
-          <indexterm zone="gimp libgimpui-2.0">
-            <primary sortas="c-libgimpui-2.0">libgimpui-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpwidgets-2.0">
-        <term><filename class="libraryfile">libgimpwidgets-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains The <application>Gimp</application>
-            and <application>GTK</application>'s widget creation and
-            manipulation functions
-          </para>
-          <indexterm zone="gimp libgimpwidgets-2.0">
-            <primary sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,323 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gparted-download-http "&sourceforge-dl;/gparted/gparted-&gparted-version;.tar.gz">
-  <!ENTITY gparted-download-ftp  " ">
-  <!ENTITY gparted-md5sum        "b2006a0a3f35853e7d7dc34c87db11f2">
-  <!ENTITY gparted-size          "5.2 MB">
-  <!ENTITY gparted-buildsize     "72 MB (add 70 MB for tests)">
-  <!ENTITY gparted-time          "0.3 SBU (using parallelism=4; add 0.3 SBU for tests)">
-]>
-
-<sect1 id="gparted" xreflabel="Gparted-&gparted-version;">
-  <?dbhtml filename="gparted.html"?>
-
-
-  <title>Gparted-&gparted-version;</title>
-
-  <indexterm zone="gparted">
-    <primary sortas="a-Gparted">Gparted</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gparted</title>
-
-    <para>
-      Gparted is the Gnome Partition Editor, a Gtk 3 GUI for other command line
-      tools that can create, reorganise or delete disk partitions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gparted-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gparted-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gparted-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gparted-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gparted-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gparted-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gparted Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- GTKMM2 is no longer used since 1.0.0, see #12110 -->
-      <xref linkend="gtkmm3"/> and
-      <xref linkend="parted"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="btrfs-progs"/> (if using a btrfs filesystem),
-      <ulink url="https://github.com/exfatprogs/exfatprogs">exfatprogs</ulink>, and
-      <ulink url="https://github.com/pali/udftools">udftools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gparted</title>
-
-    <para>
-      Install <application>Gparted</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-doc    \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-doc</parameter>: This switch disables building of
-      the optional documentation. Remove it if you have installed
-      <application>GNOME Doc Utils</application>.
-    </para>
-
-<!-- this is an option, not a parameter, but is it still necessary for
-     wayland? -->
-    <para>
-      <option>--enable-xhost-root</option>: This switch  provides an
-      interim workaround to allow GParted to run under Wayland by using xhost
-      to grant and revoke root access to the X11 display.
-    </para>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using Gparted</title>
-
-    <para>
-      To manipulate file systems Gparted has a run time dependency on various
-      file system tools (you only need to install the tools for file systems you
-      actually use):
-      <xref linkend="hdparm"/>
-      (required for optionally displaying serial number device information),
-      <xref linkend="btrfs-progs"/>,
-      <xref role="runtime" linkend="dosfstools"/>,
-      e2fsprogs (installed as part of LFS),
-      <xref linkend="jfsutils"/>,
-      <!--<xref linkend="ntfs-3g"/>,-->
-      <!--<xref linkend="reiserfs"/>,-->
-      <xref linkend="xfsprogs"/>,
-      <ulink url="https://ftp.gnu.org/pub/gnu/mtools/">mtools</ulink> (required
-      to read and write FAT16/32 volume labels and UUIDs),
-      <ulink url="ftp://ftp.mars.org/pub/hfs/">hfsutils</ulink>,
-      <ulink url="https://packages.debian.org/sid/hfsprogs">hfsprogs</ulink>,
-      <ulink url="https://nilfs.sourceforge.io/en/">nilfs-utils</ulink>,
-      <ulink url="https://reiser4.wiki.kernel.org/index.php/Reiser4progs">
-      Reiser4progs</ulink>, and
-      <ulink
-        url='https://mirrors.edge.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/'>
-        reiserfsprogs</ulink>.
-    </para>
-
-    <para>
-      Root privileges are required to run Gparted. If you wish to run the
-      application from the menu, further applications and configurations are
-      necessary. Examples of applications that may be used:
-      <ulink url="https://people.debian.org/~kov/gksu/">gksu</ulink>,
-      <ulink url="https://launchpad.net/kdesudo">kdesudo</ulink>, or
-      <ulink url="https://github.com/tarakbumba/xdg-su">xdg-su</ulink>.
-      <!--Another solution is to use <application>pkexec</application>, from
-      <xref linkend="polkit"/>, but some configuration is necessary.-->
-      Another simple solution is <xref linkend="ssh-askpass"/>. <!--Below, we
-      describe these two alternatives: "ssh-askpass" and "pkexec".-->
-    </para>
-
-    <sect3 role="ssh-askpass">
-      <title>ssh-askpass</title>
-        <para>
-          To optionally use <xref linkend="ssh-askpass"/> if it is installed in
-          your system, run the following commands as the
-          <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="root"><userinput>cp -v /usr/share/applications/gparted.desktop /usr/share/applications/gparted.desktop.back &amp;&amp;
-sed -i 's/Exec=/Exec=sudo -A /'               /usr/share/applications/gparted.desktop</userinput></screen>
-
-        <para>
-         Now, clicking on the menu item for Gparted, a dialog appears on the
-         screen, asking for the administrator password.</para>
-
-    </sect3>
-<!--
-    <sect3 role="pkexec" revision="sysv">
-      <title>pkexec</title>
-        <para>
-          To optionally use <application>pkexec</application>, you need <xref
-          linkend="polkit-gnome"/><!- - or <xref linkend="lxpolkit"/>- ->, and
-          <xref linkend="consolekit"/> installed with support to <xref
-          linkend="linux-pam"/> and <xref linkend="polkit"/>. As the
-          <systemitem class="username">root</systemitem> user, configure <xref
-          linkend="gparted"/> and <xref linkend="polkit"/> with the following
-          commands:
-        </para>
-
-<screen role="root"><userinput>cp -v /usr/share/applications/gparted.desktop \
-                                     /usr/share/applications/gparted.desktop.back &amp;&amp;
-sed -i 's:/usr/bin/gparted:/usr/bin/gparted_polkit:' \
-                                   /usr/share/applications/gparted.desktop      &amp;&amp;
-
-cat &gt; /usr/bin/gparted_polkit &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/bash
-
-pkexec /usr/bin/gparted $@</literal>
-EOF
-chmod -v 0755 /usr/bin/gparted_polkit</userinput></screen>
-
-        <para>
-          Still as the <systemitem class="username">root</systemitem> user,
-          configure <xref linkend="polkit"/> and <xref linkend="gparted"/> to
-          use <application>pkexec</application>:
-        </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/polkit-1/actions/org.gnome.gparted.policy &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"&gt;
-&lt;policyconfig&gt;
-
-  &lt;action id="org.freedesktop.policykit.pkexec.run-gparted"&gt;
-    &lt;description&gt;Run GParted&lt;/description&gt;
-    &lt;message&gt;Authentication is required to run GParted&lt;/message&gt;
-    &lt;defaults&gt;
-      &lt;allow_any&gt;no&lt;/allow_any&gt;
-      &lt;allow_inactive&gt;no&lt;/allow_inactive&gt;
-      &lt;allow_active&gt;auth_admin_keep&lt;/allow_active&gt;
-    &lt;/defaults&gt;
-    &lt;annotate key="org.freedesktop.policykit.exec.path"&gt;/usr/bin/gparted&lt;/annotate&gt;
-    &lt;annotate key="org.freedesktop.policykit.exec.allow_gui"&gt;true&lt;/annotate&gt;
-  &lt;/action&gt;
-
-&lt;/policyconfig&gt;</literal>
-EOF
-chmod -v 0644 /usr/share/polkit-1/actions/org.gnome.gparted.policy</userinput></screen>
-
-        <para>
-         Now, clicking in the menu item for Gparted, a dialog appears in the
-         screen, asking for the administrator password.</para>
-
-    </sect3>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gparted<!--, gpartedbin--> and gparted_polkit (optional)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gparted-prog">
-        <term><command>gparted</command></term>
-        <listitem>
-          <para>
-            is a shell script which sets up the environment before calling
-            <command>gpartedbin</command>
-          </para>
-          <indexterm zone="gparted gparted-prog">
-            <primary sortas="b-gparted">gparted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="gpartedbin">
-        <term><command>gpartedbin</command></term>
-        <listitem>
-          <para>
-            is the Gparted binary
-          </para>
-          <indexterm zone="gparted gpartedbin">
-            <primary sortas="b-gpartedbin">gpartedbin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="gparted_polkit">
-        <term><command>gparted_polkit</command></term>
-        <listitem>
-          <para>
-            is an optional script which can be used to run gparted with polkit,
-            from a menu
-          </para>
-          <indexterm zone="gparted gparted_polkit">
-            <primary sortas="b-gparted_polkit">gparted_polkit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/hexchat.xml
===================================================================
--- xsoft/other/hexchat.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,230 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- For the next version, remove the -repack -->
-  <!ENTITY hexchat-download-http "https://github.com/hexchat/hexchat/releases/download/v&hexchat-version;/hexchat-&hexchat-version;.tar.xz">
-  <!ENTITY hexchat-download-ftp  " ">
-  <!ENTITY hexchat-md5sum        "6970b1eef39db56c9f5380efd81e55bf">
-  <!ENTITY hexchat-size          "1.3 MB">
-  <!ENTITY hexchat-buildsize     "22 MB">
-  <!ENTITY hexchat-time          "0.2 SBU">
-]>
-
-<sect1 id="hexchat" xreflabel="HexChat-&hexchat-version;">
-  <?dbhtml filename="hexchat.html"?>
-
-
-  <title>HexChat-&hexchat-version;</title>
-
-  <indexterm zone="hexchat">
-    <primary sortas="a-HexChat">HexChat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to HexChat</title>
-
-    <para>
-      <application>HexChat</application> is an IRC chat program.  It allows
-      you to join multiple IRC channels (chat rooms) at the same time, talk
-      publicly, have private one-on-one conversations, etc.  File transfers are
-      also possible.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hexchat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hexchat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hexchat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hexchat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hexchat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hexchat-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/hexchat-&hexchat-version;-add_libera_chat-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">HexChat Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk2"/> and
-      <xref linkend="libcanberra"/>
-      <!--<xref linkend="lua"/> -->
-      <!-- Lua plugin support is currently broken and causes Hexchat to crash
-           upon startup.
-           FIXME: Check upstream in a few days.-->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="iso-codes"/>,
- <!-- <xref linkend="libcanberra"/>, -->
-      <xref linkend="libnotify"/>,
-      <xref linkend="pciutils"/>,
-      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>,
-      <ulink url="https://luajit.org/">luajit</ulink>,
-      if python is enabled
-      <ulink url="https://cffi.readthedocs.io/en/latest/">cffi</ulink> and
-      <ulink url="https://github.com/eliben/pycparser">pycparser</ulink>.
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of HexChat</title>
-
-<!-- Since 2.16.0 its not longer required, even when python is enabled
-    <para>
-      First, fix the python plugin:
-    </para>
--->
-<!-- Since 2.16.0 its added and default:
-<screen><userinput remap="pre">sed -i "s/(python_opt/&amp; + '-embed'/" plugins/python/meson.build</userinput></screen>
-
-    <para>
-      Next, apply an optional patch to have the "libera.chat" network
-      preconfigured in the client:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../hexchat-&hexchat-version;-add_libera_chat-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>HexChat</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..              \
-      --prefix=/usr         \
-      --buildtype=release   \
-      -Dwith-lua=false      \
-      -Dwith-python=false   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!--
-    <para>
-      <parameter>-Dwith-lua=lua</parameter>: By default, this package
-      will look for luajit. Use the normal lua instead.
-    </para>
-    -->
-
-    <para>
-      <parameter>-Dwith-lua=false</parameter>: By default, this package will
-      look for luajit. However, the Lua plugin support is currently broken
-      and will cause the application to crash on startup.
-    </para>
-
-    <para>
-      <parameter>-Dwith-python=false</parameter>: If the Python interface
-      should be enabled, remove this switch or set it to <literal>true</literal>.
-      When enabling Python, two additional modules (cffi and pycparser)
-      needs to be installed prior to installation of <application>Hexchat</application>.
-    </para>
-
-    <para>
-      <option>-Dwith-libcanberra=false</option>: Use this switch if you have
-      libcanberra not installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>hexchat</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/hexchat</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hexchat-prog">
-        <term><command>hexchat</command></term>
-        <listitem>
-          <para>
-            is a graphical Internet Relay Chat (IRC) client
-          </para>
-          <indexterm zone="hexchat hexchat-prog">
-            <primary sortas="b-hexchat">hexchat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,313 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 inkscape-download-http "https://inkscape.org/gallery/item/44615/inkscape-&inkscape-minor-version;.tar.xz">
-
-  <!-- When updating, remember to change the numeric part of the URL -->
-
-  <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "76ed1f4b13065e80de8b2d77b6427b83">
-  <!ENTITY inkscape-size          "43 MB">
-  <!ENTITY inkscape-buildsize     "817 MB (189 MB installed)">
-  <!ENTITY inkscape-time          "4.6 SBU (with parallelism=8)">
-
-  <!-- To find newer tarballs, look here:
-       https://inkscape.org/release/all/source/archive/?pre=0
-  -->
-]>
-
-<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-minor-version;">
-  <?dbhtml filename="inkscape.html"?>
-
-
-  <title>Inkscape-&inkscape-minor-version;</title>
-
-  <indexterm zone="inkscape">
-    <primary sortas="a-Inkscape">Inkscape</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Inkscape</title>
-
-    <para>
-      <application>Inkscape</application> is a what you see is what you get
-      Scalable Vector Graphics editor. It is useful for creating, viewing and
-      changing SVG images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&inkscape-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&inkscape-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &inkscape-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &inkscape-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &inkscape-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &inkscape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-minor-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The tarball <filename>inkscape-&inkscape-minor-version;.tar.xz</filename>
-        will extract to the directory <filename
-        class="directory">inkscape-&inkscape-version;/</filename>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="double-conversion"/>,
-      <xref linkend="gc"/>,
-      <xref linkend="gsl"/>,
-      <xref linkend="gtkmm3"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="poppler"/>,
-      <xref linkend="popt"/> and
-      <xref linkend="wget"/> (to download the test dependencies)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- Imagemagick is used for two different purposes:
-           For raster extensions and image import resolution, Imagemagick
-           libraries are needed but this requires Imagemagick 6:
-           https://gitlab.com/inkscape/inkscape/-/issues/1294
-           TODO: add Imagemagick 6 back or add GraphicsMagick, or port
-                 inkscape to Imagemagick 7 API.
-           For WebSlicer export to JPG or GIF, Imagemagick program
-           "convert" is needed and this is only a runtime dependency.  -->
-      <xref role="runtime" linkend="imagemagick"/> (runtime),
-      <xref linkend="lcms2"/>,
-      <xref linkend="libcanberra"/> (to eliminate plugin warnings),
-      <xref linkend="potrace"/> (for the bucket-fill tool), also
-      various Python modules at runtime for the core extensions:
-      <!-- there might be others, or other needed dependencies:
-       needs someone who knows how to use *all" the core extensions -->
-      <xref role="runtime" linkend="cachecontrol"/>,
-      <xref role="runtime" linkend="cssselect"/>,
-      <xref role="runtime" linkend="lxml"/>,
-      <xref role="runtime" linkend="numpy"/>,
-      <xref role="runtime" linkend="pyserial"/>, and
-      <xref role="runtime" linkend="scour"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="dbus"/> (to run inkscape from scripts),
-      <xref linkend="doxygen"/>,
-      <xref linkend="gspell"/>,
-
-      <!-- these document foundation links work from firefox's address bar, or
-      from google (pages telling you how to get it from git), but when I link
-      them here I get "There is currently no text in this page...". Ken or
-      developer: wiki.documentfoundation.org pages don't like trailing / -->
-      <!--<ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,-->
-      <!--<ulink url="https://gtkspell.sourceforge.net">gtkspell</ulink>,-->
-      <ulink url="https://sourceforge.net/projects/graphicsmagick">GraphicsMagick</ulink>,
-      <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
-      <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
-      <ulink url="https://libwpg.sourceforge.net/">libwpg</ulink> (or
-      <ulink url="https://libwpd.sourceforge.net/">libwpd</ulink>)
-    </para>
-
-<!-- no trace of this perl module in the core extensions for 1.2.2
-    <bridgehead renderas="sect4">Optional Runtime Dependencies
-    (for some of the Inkscape extensions)</bridgehead>
-    <para role="optional">
-      <ulink role="runtime"
-             url="https://metacpan.org/pod/release/TJMATHER/XML-XQL-0.68/lib/XML/XQL.pm">XML::XQL</ulink>
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Inkscape</title>
-
-    <para>
-      First, fix Inkscape to build with poppler-24.03.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-minor-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      First, fix a build failure caused by libxml2-2.12.0:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/uri.h/a #include &lt;libxml/xmlmemory.h&gt;' src/object/uri.h</userinput></screen>
-
-    <para>
-      Install <application>Inkscape</application> by running the following
-      commands:
-    </para>
-<!--
-<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_21.11.0-1.patch &amp;&amp;
--->
-<screen><userinput>mkdir build                       &amp;&amp;
-cd    build                       &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      ..                          &amp;&amp;
-make</userinput></screen>
-
-<!-- A race condition has been observed with inkscape-1.2.2, cmake-3.25.1,
-     and make-4.4. Reported by "Dragan" on the blfs-dev list -->
-&parallel_issues;
-
-<!--
-    <para>
-      To test the results, issue: <command>make check</command>.<!- - Ken or
-      other devs, there is no test suite in this package. -renodr
-      A small test suite is built if you download the necessary programs
-      with the command above (bash download-gtest.sh) -pierre
-      This package does not come with a test suite. - ->
-
-      At the moment, the test suite does not function with the
-      "bash download-gtest.sh". CMake is unable to find gtest.
-    </para>
--->
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      build the release library without any debug `assert` in the code.
-    </para>
-
-    <para>
-      <option>-DWITH_DBUS=ON</option>: use this if you wish to use
-      <command>inkscape</command> in interactive scripts which manipulate
-      images.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          inkscape and inkview
-        </seg>
-        <seg>
-          <!--lib2geom.so and-->
-          libinkscape_base.so (in /usr/lib/inkscape)
-        </seg>
-        <seg>
-          <!--/usr/include/2geom-&lib2geom-version;,-->
-          /usr/lib/inkscape, and
-          /usr/share/inkscape
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="inkscape-prog">
-        <term><command>inkscape</command></term>
-        <listitem>
-          <para>
-            is a SVG (Scalable Vector Graphics) editing program
-          </para>
-          <indexterm zone="inkscape inkscape-prog">
-            <primary sortas="b-inkscape">inkscape</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="inkview">
-        <term><command>inkview</command></term>
-        <listitem>
-          <para>
-            is a simple program for displaying SVG files
-          </para>
-          <indexterm zone="inkscape inkview">
-            <primary sortas="b-inkview">inkview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libinkscape_base">
-        <term><filename class="libraryfile">libinkscape_base.so</filename></term>
-        <listitem>
-          <para>
-            provides the routines used by inkscape and inkview
-          </para>
-          <indexterm zone="inkscape libinkscape_base">
-            <primary sortas="c-libinkscape_base">libinkscape_base.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ xsoft/other/other.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,36 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="xsoft-other">
+<?dbhtml filename="other.html" dir="xsoft"?>
+<title>Other X-based Internet Programs</title>
 
-<chapter id="xsoft-other">
-  <?dbhtml filename="other.html" ?>
-
-  <title>Other X-based Programs</title>
-
-  <para>
-    These programs use the X Window System and don't fit easily into any
-    of the other chapters.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="feh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hexchat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rox-filer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rxvt-unicode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunderbird.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tigervnc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transmission.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xarchiver.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xscreensaver.xml"/>
+<para>Other X software packages go here.</para>
 
 </chapter>
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,405 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pidgin-download-http "&sourceforge-dl;/pidgin/pidgin-&pidgin-version;.tar.bz2">
-  <!ENTITY pidgin-download-ftp  " ">
-  <!ENTITY pidgin-md5sum        "7fa88c8734d22c96ef298b25cd0db0c4">
-  <!ENTITY pidgin-size          "7.9 MB">
-  <!ENTITY pidgin-buildsize     "202 MB (with tests and docs)">
-  <!ENTITY pidgin-time          "0.5 SBU (using parallelism=4; with tests and docs)">
-]>
-
-<sect1 id="pidgin" xreflabel="Pidgin-&pidgin-version;">
-  <?dbhtml filename="pidgin.html"?>
-
-
-  <title>Pidgin-&pidgin-version;</title>
-
-  <indexterm zone="pidgin">
-    <primary sortas="a-Pidgin">Pidgin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pidgin</title>
-
-    <para>
-      <application>Pidgin</application> is a Gtk+ 2 instant messaging client
-      that can connect with a wide range of networks including Bonjour, ICQ,
-      GroupWise, Jabber/XMPP, IRC, Gadu-Gadu, SILC, SIMPLE, and Zephyr.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pidgin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pidgin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pidgin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pidgin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pidgin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pidgin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pidgin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="gstreamer10"/> (required for audio support), and
-      <xref linkend="gnutls"/> or
-      <xref role="nodep" linkend="nss"/>
-    </para>
-
-    <!--
-    <para>
-      SSL support is required for the MSN Messenger, Yahoo!, Novel Groupwise and
-      Google Talk protocol plugins. <application>GnuTLS</application> is the
-      preferred method (the Mozilla NSS API is more likely to change and this
-      can cause problems).
-    </para>
-    -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (required for the Bonjour plugin),
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="libidn"/> (required, if you wish to run the test suite),
-      <xref linkend="libnsl"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="sqlite"/> (required for the Contact Availability Prediction
-      plugin),
-      <xref linkend="startup-notification"/>,
-      <!-- <xref linkend="tcl"/>, -->
-      <xref linkend="tk"/>,
-      <ulink url="https://www.freedesktop.org/wiki/Software/Farstream">
-      Farstream</ulink>
-      (required for video and voice support),
-      <ulink url="https://gtkspell.sourceforge.net/">Gtkspell</ulink>,
-      <ulink url="https://libgadu.net/">libgadu</ulink>,
-      <ulink url="https://keep.imfreedom.org/libgnt/libgnt">libgnt</ulink>,
-      <ulink url="https://meanwhile.sourceforge.net/">Meanwhile</ulink>
-      (required for Sametime protocol support),
-      <ulink url="https://www.mono-project.com/">Mono</ulink>,
-      <ulink url="http://silcnet.org/client.html">SILC Client</ulink>,
-      <ulink url="http://silcnet.org/client.html">SILC Toolkit</ulink>,
-      <ulink url="https://packages.debian.org/stable/source/zephyr">Zephyr</ulink>, and
-      <xref linkend="mitkrb"/> (required for Kerberos support in the Zephyr
-      module)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="xdg-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pidgin</title>
-<!-- Seems to pass now (version 2.4.19)
-    <para>
-      First, fix a test that fails:
-    </para>
-
-<screen><userinput>sed '/09-13/s@^@//@' -i libpurple/tests/test_util.c</userinput></screen>
--->
-    <para>
-      Compile <application>Pidgin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --with-gstreamer=1.0 \
-            --disable-avahi      \
-            --disable-gtkspell   \
-            --disable-meanwhile  \
-            --disable-idn        \
-            --disable-nm         \
-            --disable-tk         \
-            --disable-vv         &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed
-      (<xref linkend="graphviz"/> can be used also) and you wish to create the
-      API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mkdir -pv /usr/share/doc/pidgin-&pidgin-version; &amp;&amp;
-cp -v README doc/gtkrc-2.0 /usr/share/doc/pidgin-&pidgin-version;</userinput></screen>
-
-    <para>
-      If you created the API documentation, install it using the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>mkdir -pv /usr/share/doc/pidgin-&pidgin-version;/api &amp;&amp;
-cp -rv doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gstreamer=1.0</parameter>: Remove this switch
-      and add <option>--disable-gstreamer</option>
-      if you've not installed <xref linkend="gstreamer10"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-avahi</parameter>: Remove this switch if you've
-      installed <xref linkend="avahi"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-gtkspell</parameter>: Remove this
-      switch if you've installed
-      <ulink url="https://gtkspell.sourceforge.net/">Gtkspell</ulink> and wish
-      to enable spellchecking support.
-    </para>
-
-    <para>
-      <parameter>--disable-meanwhile</parameter>: Remove this switch if you've
-      installed <ulink url="https://meanwhile.sourceforge.net/">Meanwhile</ulink>.
-    </para>
-
-    <para>
-      <parameter>--disable-idn</parameter>: Remove this switch if you've
-      installed <xref linkend="libidn"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-tk</parameter>: Remove this switch if you've
-      installed <xref linkend="tk"/> and you wish to use the TCL bindings.
-    </para>
-
-    <para>
-      <parameter>--disable-nm</parameter>: Remove this switch if you've
-      installed <xref linkend="NetworkManager"/>.
-    </para>
-
-    <para>
-      <parameter>--disable-vv</parameter>: Remove this
-      switch if you've installed
-      <ulink url="https://www.freedesktop.org/wiki/Software/Farstream">
-      Farstream</ulink> and wish to enable voice and video
-      communication support. You should also remove the --disable-gstreamer
-      flag.
-    </para>
-
-    <para>
-      <option>--enable-cyrus-sasl</option>: Use this switch if you've installed
-      <xref linkend="cyrus-sasl"/> and wish to build
-      <application>Pidgin</application> with SASL support.
-    </para>
-
-    <para>
-      <option>--disable-gnutls</option>: Use this switch if you've got both
-      <xref linkend="gnutls"/> and <xref linkend="nss"/> installed, but want
-      to use <xref linkend="nss"/> for the SSL support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Pidgin</title>
-
-    <sect3 id="pidgin-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.purple/*</filename> and
-        <filename>~/.gtkrc-2.0</filename>
-      </para>
-
-      <indexterm zone="pidgin pidgin-config">
-        <primary sortas="e-AA.purple-*">~/.purple/*</primary>
-      </indexterm>
-
-      <indexterm zone="pidgin pidgin-config">
-        <primary sortas="e-AA.gtkrc-20">~/.gtkrc-2.0</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Most configuration can be accomplished by using the various preference
-        settings inside the programs. Additionally, you can create a
-        <filename>~/.gtkrc-2.0</filename> file which can store gtk+-2 theme
-        settings that affect <application>Pidgin</application> and other Gtk+ 2
-        applications. Note that an example <filename>gtkrc-2.0</filename> file
-        was installed during the package installation and can be used as a
-        starting point or reference.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pidgin, purple-client-example,
-          purple-remote, purple-send, purple-send-async, and
-          purple-url-handler
-        </seg>
-        <seg>
-          libpurple.so, and libpurple-client.so
-        </seg>
-        <seg>
-          /usr/include/libpurple,
-          /usr/include/pidgin,
-          /usr/lib/pidgin,
-          /usr/lib/purple-2,
-          /usr/share/doc/pidgin-&pidgin-version;,
-          /usr/share/pixmaps/pidgin,
-          /usr/share/purple, and
-          /usr/share/sounds/purple
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pidgin-prog">
-        <term><command>pidgin</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> 2 instant messaging client
-          </para>
-          <indexterm zone="pidgin pidgin-prog">
-            <primary sortas="b-pidgin">pidgin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-client-example">
-        <term><command>purple-client-example</command></term>
-        <listitem>
-          <para>
-            is an example that demonstrates how to use the libpurple-client
-            library to communicate with purple
-          </para>
-          <indexterm zone="pidgin purple-client-example">
-            <primary sortas="b-purple-client-example">purple-client-example</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-remote">
-        <term><command>purple-remote</command></term>
-        <listitem>
-          <para>
-            sends remote commands to Pidgin/Finch
-          </para>
-          <indexterm zone="pidgin purple-remote">
-            <primary sortas="b-purple-remote">purple-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-send">
-        <term><command>purple-send</command></term>
-        <listitem>
-          <para>
-            calls purple API functions using DBus and prints the return value
-          </para>
-          <indexterm zone="pidgin purple-send">
-            <primary sortas="b-purple-send">purple-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-send-async">
-        <term><command>purple-send-async</command></term>
-        <listitem>
-          <para>
-            calls purple API functions using DBus. As opposed to
-            <command>purple-send</command>, it does not print the return value
-          </para>
-          <indexterm zone="pidgin purple-send-async">
-            <primary sortas="b-purple-send-async">purple-send-async</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purple-url-handler">
-        <term><command>purple-url-handler</command></term>
-        <listitem>
-          <para>
-            is a python script to handle URLs with purple
-          </para>
-          <indexterm zone="pidgin purple-url-handler">
-            <primary sortas="b-purple-url-handler">purple-url-handler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/rox-filer-kernel.xml
===================================================================
--- xsoft/other/rox-filer-kernel.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] <emphasis role='blue'>D</emphasis>notify support                                                  [DNOTIFY]</screen>
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,300 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rox-filer-download-http "&sourceforge-dl;/rox/rox-filer-&rox-filer-version;.tar.bz2">
-  <!ENTITY rox-filer-download-ftp  " ">
-  <!ENTITY rox-filer-md5sum        "0eebf05a67f7932367750ebf9faf215d">
-  <!ENTITY rox-filer-size          "1.8 MB">
-  <!ENTITY rox-filer-buildsize     "19 MB">
-  <!ENTITY rox-filer-time          "0.3 SBU">
-]>
-
-<sect1 id="rox-filer" xreflabel="Rox-Filer-&rox-filer-version;">
-  <?dbhtml filename="rox-filer.html"?>
-
-
-  <title>Rox-Filer-&rox-filer-version;</title>
-
-  <indexterm zone="rox-filer">
-    <primary sortas="a-rox-filer">rox-filer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rox-Filer</title>
-
-    <para>
-      <application>rox-filer</application> is a fast, lightweight, gtk2 file
-      manager.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rox-filer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rox-filer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rox-filer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rox-filer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rox-filer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rox-filer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rox-filer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libglade"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="rox-filer-kernel">
-    <title>Kernel Configuration</title>
-
-      <para>
-        If you want <application>rox-filer</application> to be able to update
-        the contents of a directory when changes are made to the files by other
-        applications (eg, if a script is running) you will need to enable
-        dnotify support in your kernel. In <command>make menuconfig</command>:
-      </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="rox-filer-kernel.xml"/>
-
-    <para>
-      Save the new <filename>.config</filename> and then compile the kernel.
-    </para>
-
-    <indexterm zone="rox-filer rox-filer-kernel">
-      <primary sortas="d-rox-filer">rox-filer</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rox-Filer</title>
-
-    <para>
-      Compile <application>rox-filer</application> with the following commands:
-    </para>
-
-<screen><userinput>cd ROX-Filer                                                        &amp;&amp;
-sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &amp;&amp;
-sed -i 's/gboolean/extern &amp;/' src/session.h                     &amp;&amp;
-
-mkdir build                        &amp;&amp;
-pushd build                        &amp;&amp;
-  ../src/configure LIBS="-lm -ldl" &amp;&amp;
-  make                             &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      Now install it as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/rox                              &amp;&amp;
-cp -av Help Messages Options.xml ROX images style.css .DirIcon /usr/share/rox &amp;&amp;
-
-cp -av ../rox.1 /usr/share/man/man1                  &amp;&amp;
-cp -v  ROX-Filer /usr/bin/rox                        &amp;&amp;
-chown -Rv root:root /usr/bin/rox /usr/share/rox      &amp;&amp;
-
-cd /usr/share/rox/ROX/MIME                           &amp;&amp;
-ln -sv text-x-{diff,patch}.png                       &amp;&amp;
-ln -sv application-x-font-{afm,type1}.png            &amp;&amp;
-ln -sv application-xml{,-dtd}.png                    &amp;&amp;
-ln -sv application-xml{,-external-parsed-entity}.png &amp;&amp;
-ln -sv application-{,rdf+}xml.png                    &amp;&amp;
-ln -sv application-x{ml,-xbel}.png                   &amp;&amp;
-ln -sv application-{x-shell,java}script.png          &amp;&amp;
-ln -sv application-x-{bzip,xz}-compressed-tar.png    &amp;&amp;
-ln -sv application-x-{bzip,lzma}-compressed-tar.png  &amp;&amp;
-ln -sv application-x-{bzip-compressed-tar,lzo}.png   &amp;&amp;
-ln -sv application-x-{bzip,xz}.png                   &amp;&amp;
-ln -sv application-x-{gzip,lzma}.png                 &amp;&amp;
-ln -sv application-{msword,rtf}.png</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":'
-      src/main.c</command>: This command hard codes /usr/share/rox as the
-      directory for <application>rox-filer</application>'s private files.
-      Without this sed rox needs the environment variable ${APP_DIR} to be set.
-    </para>
-
-    <para>
-      <command>sed -i 's/gboolean/extern &amp;/' src/session.h</command>:
-      This command fixes a multiple definition flagged as an error
-      by GCC 10 and higher.
-    </para>
-
-    <para>
-      <command>ln -sv application-...</command>: These commands duplicate the
-      icons for some common mime types. Without these links
-      <application>rox-filer</application> would just display the default
-      "unknown binary blob" icon.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring RoxFiler</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Most of the configuration of <application>rox-filer</application> is
-        achieved by right clicking on a <application>rox-filer</application>
-        window and choosing "Options" from the menu. It stores its settings in
-        <filename class="directory">~/.config/rox.sourceforge.net</filename>.
-      </para>
-
-      <para>
-        A <application>rox-filer</application> feature is that if there is an
-        executable file called <filename>AppRun</filename> in a directory
-        <application>rox-filer</application> will first run
-        <command>AppRun</command> before it opens the folder.
-      </para>
-
-      <para>
-        As an example of how this may be used, if you have ssh access to another
-        computer (perhaps another computer on your local network) with ssh
-        configured for passwordless logins and you have
-        <xref linkend="sshfs"/> installed you can use AppRun to mount the
-        remote computer in a local folder using <command>sshfs</command>. For
-        this example AppRun script to work the folder must have the same name as
-        the hostname of the remote computer:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /path/to/hostname/AppRun &lt;&lt; "HERE_DOC"
-#!/bin/bash
-
-MOUNT_PATH="${0%/*}"
-HOST=${MOUNT_PATH##*/}
-export MOUNT_PATH HOST
-sshfs -o nonempty ${HOST}:/ ${MOUNT_PATH}
-rox -x ${MOUNT_PATH}
-HERE_DOC
-
-chmod 755 /path/to/hostname/AppRun</userinput></screen>
-
-      <para>
-        That works fine for mounting, but to unmount it the
-        command <command>fusermount -u ${MOUNTPOINT}</command> is ran. You could set
-        that as your default umount command in your rox preferences, but you
-        would then be unable to unmount any normal mountpoints (that need
-        umount). A script is needed that will unmount a Fuse mountpoint
-        with <command>fusermount -u ${MOUNTPOINT}</command> and everything else
-        with <command>umount</command>. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/myumount &lt;&lt; "HERE_DOC" &amp;&amp;
-#!/bin/bash
-sync
-if mount | grep "${@}" | grep -q fuse
-then fusermount -u "${@}"
-else umount "${@}"
-fi
-HERE_DOC
-
-chmod 755 /usr/bin/myumount</userinput></screen>
-
-      <para>
-        Now, to make Rox use this simple script, open a Rox window, right click
-        on it and choose Options from the menu. In the left hand list choose
-        "Action windows" and then on the right hand side, where it says
-        "Unmount command" change <command>umount</command> to
-        <command>myumount</command>.
-      </para>
-
-      <para>
-        If you use a desktop environment like
-        <application>Gnome</application> or <application>KDE</application> you
-        may like to create a <filename>rox.desktop</filename> file so that
-        <application>rox-filer</application> appears in the panel's menus. As
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -s ../rox/.DirIcon /usr/share/pixmaps/rox.png &amp;&amp;
-mkdir -p /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/rox.desktop &lt;&lt; "HERE_DOC"
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Rox
-Comment=The Rox File Manager
-Icon=rox
-Exec=rox
-Categories=GTK;Utility;Application;System;Core;
-StartupNotify=true
-Terminal=false
-HERE_DOC</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rox</seg>
-        <seg>None</seg>
-        <seg>/usr/share/rox</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rox-filer-prog">
-        <term><command>rox</command></term>
-        <listitem>
-          <para>
-            is the rox file manager
-          </para>
-          <indexterm zone="rox-filer rox-filer-prog">
-            <primary sortas="b-rox-filer">rox-filer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: xsoft/other/rxvt-unicode.xml
===================================================================
--- xsoft/other/rxvt-unicode.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,322 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rxvt-unicode-download-http "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-&rxvt-unicode-version;.tar.bz2">
-  <!ENTITY rxvt-unicode-download-ftp  " ">
-  <!ENTITY rxvt-unicode-md5sum        "3d0ec83705c9b9ff301a4b9965b3cd9f">
-  <!ENTITY rxvt-unicode-size          "860 KB">
-  <!ENTITY rxvt-unicode-buildsize     "22 MB">
-  <!ENTITY rxvt-unicode-time          "0.2 SBU">
-]>
-
-<sect1 id="rxvt-unicode" xreflabel="rxvt-unicode-&rxvt-unicode-version;">
-  <?dbhtml filename="rxvt-unicode.html"?>
-
-
-  <title>rxvt-unicode-&rxvt-unicode-version;</title>
-
-  <indexterm zone="rxvt-unicode">
-    <primary sortas="a-rxvt-unicode">rxvt-unicode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rxvt-unicode</title>
-
-    <para>
-      <application>rxvt-unicode</application> is a clone of the terminal
-      emulator <application>rxvt</application>, an X Window System terminal
-      emulator which includes support for XFT and Unicode.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        <!-- https://github.com/Perl/perl5/issues/12349 -->
-        Please be aware that <application>rxvt-unicode</application> is
-        affected by an issue in <application>perl</application> where
-        the SIGFPE handler is set to SIG_IGN (i.e. the signal is ignored).
-        If you are building an LFS system from within <command>urxvt</command>
-        and running the test suites, tests in <application>bash</application> and
-        <application>check</application> which test raising this signal will fail.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rxvt-unicode-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rxvt-unicode-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rxvt-unicode-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rxvt-unicode-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rxvt-unicode-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rxvt-unicode-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">rxvt-unicode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libptytty"/> and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdk-pixbuf"/> (for background images) and
-      <xref linkend="startup-notification"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rxvt-unicode</title>
-
-    <para>
-      Install <application>rxvt-unicode</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-everything &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-everything</parameter>: Add support for all
-      non-multichoice options. Details about the different options can be
-      found in the file <filename>README.configure</filename>.
-    </para>
-
-    <para>
-      <option>--disable-xft</option>: Remove support for Xft fonts.
-    </para>
-
-    <para>
-      <option>--disable-perl</option>: Disable the embedded
-      <application>Perl</application> interpreter.
-    </para>
-
-    <para>
-      <option>--disable-afterimage</option>: Remove support for
-      libAfterImage.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring rxvt-unicode</title>
-
-    <para>
-      The <application>rxvt-unicode</application> terminal emulator uses the
-      resource class <classname>URxvt</classname> and the resource name
-      <classname>urxvt</classname>. You can add X resource definitions to a
-      user's <filename>~/.Xresources</filename> or
-      <filename>~/.Xdefaults</filename> files or to the system-wide
-      <filename>/etc/X11/app-defaults/URxvt</filename> file. The following
-      example will load the <classname>matcher</classname>
-      <application>Perl</application> extension (assuming
-      <application>Perl</application> support wasn't disabled), which enables
-      a left button click to open an underlined URL in the specified browser,
-      sets a background and foreground color and loads an Xft font (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/URxvt &lt;&lt; "EOF"
-<literal>! Use the specified colour as the windows background colour [default white]
-URxvt*background: black
-
-! Use the specified colour as the windows foreground colour [default black]
-URxvt*foreground: yellow
-
-! Select the fonts to be used. This is a comma separated list of font names
-URxvt*font: xft:Monospace:pixelsize=18
-
-! Comma-separated list(s) of perl extension scripts (default: "default")
-URxvt*perl-ext: matcher
-
-! Specifies the program to be started with a URL argument. Used by
-URxvt*url-launcher: firefox
-
-! When clicked with the mouse button specified in the "matcher.button" resource
-! (default 2, or middle), the program specified in the "matcher.launcher"
-! resource (default, the "url-launcher" resource, "sensible-browser") will be
-! started with the matched text as first argument.
-! Below, default modified to mouse left button.
-URxvt*matcher.button:     1</literal>
-EOF</userinput></screen>
-
-    <para>
-      In order to view the defined X resources, issue:
-    </para>
-
-<screen role="nodump"><userinput>xrdb -query</userinput></screen>
-
-    <para>
-      In order to add the modifications of the new user configuration file,
-      keeping previously X configurations (of course, unless you are changing
-      any on previously define), issue:
-    </para>
-
-<screen role="nodump"><userinput>xrdb -merge ~/.Xresources</userinput></screen>
-
-    <para>
-      The <application>rxvt-unicode</application> application can also run
-      in a daemon mode, which makes it possible to open multiple terminal
-      windows within the same process. The <command>urxvtc</command> client
-      then connects to the <command>urxvtd</command> daemon and requests a
-      new terminal window.  Use this option with caution. If the daemon
-      crashes, all the running processes in the terminal windows are
-      terminated.
-    </para>
-
-    <para>
-      You can start the <command>urxvtd</command> daemon in the system or
-      personal startup <command>X</command> session script (e.g.,
-      <filename>~/.xinitrc</filename>) by adding the following lines near the
-      top of the script:
-    </para>
-
-<screen role="nodump"><userinput><literal># Start the urxvtd daemon
-urxvtd -q -f -o &amp;</literal></userinput></screen>
-
-    <para>
-      For more information, examine the <command>urxvt</command>,
-      <command>urxvtd</command>, <command>urxvtc</command>, and
-      <filename>urxvtperl</filename> man pages.
-    </para>
-
-    <para>
-      If you use a Desktop Environment, a menu entry can be included,
-      issuing, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/applications/urxvt.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=Rxvt-Unicode Terminal
-Comment=Use the command line
-GenericName=Terminal
-Exec=urxvt
-Terminal=false
-Type=Application
-Icon=utilities-terminal
-Categories=GTK;Utility;TerminalEmulator;
-#StartupNotify=true
-Keywords=console;command line;execute;</literal>
-EOF
-
-update-desktop-database -q</userinput></screen>
-
-    <para>
-      For that, you need <xref linkend="desktop-file-utils"/> and at least
-      one of <xref linkend="gnome-icon-theme"/>, <xref linkend="oxygen-icons"/>
-      and <xref linkend="lxde-icon-theme"/>. Uncomment the line with
-      <quote>StartupNotify=true</quote> if <xref
-      linkend="startup-notification"/> is installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>urxvt, urxvtd, and urxvtc</seg>
-        <seg>Many <application>Perl</application> extensions located under
-        <filename class="directory">/usr/lib/urxvt/perl</filename></seg>
-        <seg>/usr/lib/urxvt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="urxvt-bin">
-        <term><command>urxvt</command></term>
-        <listitem>
-          <para>
-            is a terminal emulator for the X Window System
-          </para>
-          <indexterm zone="rxvt-unicode urxvt-bin">
-            <primary sortas="b-urxvt-bin">urxvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="urxvtd">
-        <term><command>urxvtd</command></term>
-        <listitem>
-          <para>
-            is the <command>urxvt</command> terminal daemon
-          </para>
-          <indexterm zone="rxvt-unicode urxvtd">
-            <primary sortas="b-urxvtd">urxvtd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="urxvtc">
-        <term><command>urxvtc</command></term>
-        <listitem>
-          <para>
-            controls the <command>urxvtd</command> daemon
-          </para>
-          <indexterm zone="rxvt-unicode urxvtc">
-            <primary sortas="b-urxvtc">urxvtc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,486 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
-  <!ENTITY thunderbird-download-ftp  " ">
-  <!ENTITY thunderbird-md5sum        "27a4fa01ed76c106afda4aa59d94eca3">
-  <!ENTITY thunderbird-size          "508 MB">
-  <!ENTITY thunderbird-buildsize     "6.5 GB (229 MB installed)">
-  <!ENTITY thunderbird-time          "12 SBU (on a 8-core machine)">
-  <!-- Removed the -j1 time because python and rust do not obey it, although
-       the C/C++ code appears to obey it.
-
-       Version 102.3.3: I disabled all but 4 cores.  SBU was 20 (2019 seconds)
-       -->
-]>
-
-<sect1 id="thunderbird" xreflabel="Thunderbird-&thunderbird-version;">
-  <?dbhtml filename="thunderbird.html" ?>
-
-
-  <title>Thunderbird-&thunderbird-version;</title>
-
-  <indexterm zone="thunderbird">
-    <primary sortas="a-Thunderbird">Thunderbird</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Thunderbird</title>
-
-    <para>
-      <application>Thunderbird</application> is a stand-alone mail/news client
-      based on the <application>Mozilla</application> codebase. It uses the
-      Gecko rendering engine to enable it to display and compose HTML emails.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunderbird-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunderbird-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunderbird-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunderbird-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunderbird-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunderbird-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cbindgen"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="llvm"/> including clang, <!-- used by default if found -->
-      <xref linkend="nodejs"/>,
-      <xref linkend="pulseaudio"/> (or <xref linkend="alsa-lib"/> if you edit
-      the mozconfig; although it is now deprecated by mozilla),
-      <xref linkend="python311"/> (rebuilt with the sqlite module),
-      <xref linkend="startup-notification"/>, and
-      <xref linkend="unzip"/>
-      <!--<xref linkend="yasm"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- When using system ICU, a problem occurs where the calendar and mail
-           functions do not render correctly and it causes other strange
-           behavior to occur. See Ticket #18323 for more details, as well as
-           https://lore.kernel.org/distributions/075a20b1-869b-78f3-9ace-e106a4d43ac4@linuxlounge.net/T/#u -->
-      <!--<xref linkend="icu"/>,-->
-      <xref linkend="libevent"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="nasm"/>,
-      <xref linkend="nspr"/>, and
-      <xref linkend="nss"/>
-    </para>
-
-    <note>
-      <para>
-        If you don't install recommended dependencies,
-        then internal copies of those packages will
-        be used. They might be tested to work, but
-        they can be out of date or contain security
-        holes.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="pciutils"/> (runtime),
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
-      <ulink url="https://facebook.github.io/watchman/">watchman</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Thunderbird</title>
-
-    <note>
-      <para>
-        The build process for Thunderbird can use 8GB+ of RAM when linking.
-        Make sure that you have adequate swap or RAM before continuing.
-      </para>
-    </note>
-
- <!-- Restore after Python 3.12 is usable for this package again
-    <para>
-      The building system ships several internal copies of the Python 3
-      modules <application>setuptools</application> and
-      <filename>six.py</filename>.  The shipped copies are too old
-      to work well with Python 3.12 or later.  Replace them with the
-      symlinks to the LFS <application>setuptools</application> package and
-      <xref linkend='six'/> already installed on the system, and adapt the
-      building system for these updated Python modules.  We also need to
-      rewrite the code based on the <filename>imp</filename> module removed
-      in Python 3.12 and later using the <filename>importlib</filename>
-      module:
-    </para>
-
-<screen><userinput>(for i in $(find -name six.py); do
-   ln -sfv /usr/lib/python&python3-majorver;/site-packages/six.py $i
-   [ $? = 0 ] || exit $?
- done) &amp;&amp;
-
-sed '/ConfigParser/s/Safe//'                          \
-    -i testing/mozbase/mozprofile/mozprofile/prefs.py &amp;&amp;
-
-(for i in setuptools distutils-precedence.pth  \
-          pkg_resources _distutils_hack; do
-   rm -rf third_party/python/setuptools/$i     &amp;&amp;
-   ln -sv /usr/lib/python&python3-majorver;/site-packages/$i \
-          third_party/python/setuptools
-   [ $? = 0 ] || exit $?
- done) &amp;&amp;
-
-sed 's/distutils/setuptools._&amp;/'            \
-    -i python/mozbuild/mozbuild/nodeutil.py &amp;&amp;
-
-sed -e '/^import/s/imp$/importlib.util/'             \
-    -e 's/imp.new_module/__import__/'                \
-    -e "s/imp.load_source\(.*\)/spec =               \
-        importlib.util.spec_from_file_location\1;    \
-        mod = importlib.util.module_from_spec(spec); \
-        spec.loader.exec_module(mod)/" -i python/mach/mach/main.py &amp;&amp;
-sed '/import imp/d' -i netwerk/dns/prepare_tlds.py
-</userinput></screen>
--->
-
-    <para>
-      The configuration of <application>Thunderbird</application> is
-      accomplished by creating a <filename>mozconfig</filename> file containing
-      the desired configuration options. A default
-      <filename>mozconfig</filename> is created below. To see the entire list
-      of available configuration options (and a brief description of each),
-      issue <command>./mach configure -- --help | less</command>. Create the file with
-      the following command:
-    </para>
-
-<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, all cores will be used.
-
-# If you have installed wireless-tools comment out this line:
-ac_add_options --disable-necko-wifi
-
-# Uncomment the following option if you have not installed PulseAudio
-#ac_add_options --enable-audio-backends=alsa
-
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-webp
-<!-- With Thunderbird ESR 128 we'd replace the following part with
-"- -enable-elf-hack=relr", or remove it if relr becomes the default. -->
-# on some machines. It is supposed to improve startup time and it shrinks
-# libxul.so by a few MB.  With recent Binutils releases the linker already
-# supports a much safer and generic way for this.
-ac_add_options --disable-elf-hack
-export LDFLAGS="$LDFLAGS -Wl,-z,pack-relative-relocs"
-
-# The BLFS editors recommend not changing anything below this line:
-ac_add_options --prefix=/usr
-ac_add_options --enable-application=comm/mail
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-tests
-
-# This enables SIMD optimization in the shipped encoding_rs crate.
-ac_add_options --enable-rust-simd
-
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-
-# You cannot distribute the binary if you do this.
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# Using sandboxed wasm libraries has been moved to all builds instead
-# of only mozilla automation builds. It requires extra llvm packages
-# and was reported to seriously slow the build. Disable it.
-ac_add_options --without-wasm-sandboxed-libraries</literal>
-EOF</userinput></screen>
-
-    <!-- https://github.com/rust-lang/rust-bindgen/pull/2689 -->
-    <para>
-      Adapt the shipped <application>rust-bindgen</application> copy for
-      LLVM-18 and later, and tell <command>cargo</command> we've modified
-      the code of <application>rust-bindgen</application> so the checksum
-      verification of this crate should be skipped:
-    </para>
-
-    <screen><userinput>sed -e "/match cursor.kind()/a                                    \
-        CXCursor_LinkageSpec => return Err(ParseError::Recurse)," \
-    -i third_party/rust/bindgen/ir/item.rs                        &amp;&amp;
-
-cat &gt;&gt; Cargo.toml &lt;&lt; EOF &amp;&amp;
-<literal>[patch.crates-io.bindgen_0_64_0]
-package = "bindgen"
-version = "0.64.0"
-path = "third_party/rust/bindgen"</literal>
-EOF
-
-sed -r '/name = "bindgen"/,+5 s/^source|^checksum/#&amp;/' \
-    -i Cargo.lock</userinput></screen>
-
-    <!-- https://hg.mozilla.org/mozilla-central/rev/ba6abbd36b49 -->
-    <para>
-      Adapt the WebRTC code to use 64-bit timestamp to fix a build
-      failure with Clang-18 and later:
-    </para>
-
-    <screen><userinput>sed 's/uint32_t timestamp/uint64_t timestamp/'                \
-    -i dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp    \
-       dom/media/gtest/TestGMPRemoveAndDelete.cpp             \
-       dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp &amp;&amp;
-
-sed '/mInputImageMap/s/uint32_t/uint64_t/' \
-    -i dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h</userinput></screen>
-
-    <para>
-      Now invoke the Python <command>mach</command> script to compile
-      <application>Thunderbird</application>:
-    </para>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozshm.xml"/>
-    </note>
-
-<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
-export MOZBUILD_STATE_PATH=./mozbuild               &amp;&amp;
-export PYTHON311=/opt/python3.11/bin/python3.11     &amp;&amp;
-$PYTHON311 ./mach build</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Install <application>Thunderbird</application> by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $PYTHON311 ./mach install</userinput></screen>
-<!-- devs: For DESTDIR install, prepend DESTDIR=<dest> to the above -->
-
-    <para>
-      Empty the environment variables which were set above:
-    </para>
-
-<screen><userinput>unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE &amp;&amp;
-unset MOZBUILD_STATE_PATH                     &amp;&amp;
-unset PYTHON311</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none</command>: Use the
-      system python to create a virtual environment for <command>mach</command>
-      without downloading any python wheels nor using the system python modules.
-      This prevent version mismatches between system modules and bundled ones.
-    </para>
-
-<!--
-    <para>
-      <command>./mach configure</command>: This validates the supplied
-      dependencies and the <filename>mozconfig</filename>.
-    </para>
--->
-
-    <para>
-      <option>./mach build --verbose</option>: Use this alternative if you
-      need details of which files are being compiled, together with any C or
-      C++ flags being used.
-    </para>
-
-    <para>
-      <option>./mach build -jN</option>: The build should, by default, use
-      all the online CPU cores. If using all the cores causes the build to swap
-      because you have insufficient memory, using fewer cores can be faster.
-    </para>
-
-    <para>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Set these environment variables
-      <emphasis>before you run the configure script</emphasis>
-      if you wish to continue to use gcc, g++. Building
-      with GCC on i?86 is currently broken.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Thunderbird</title>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        If your Window Manager or Desktop Environment does not allow you to
-        configure a default browser, you can add a configuration parameter to
-        <application>Thunderbird</application> so that a browser will start when
-        you click on an Internet/intranet/local URL. The procedure to check
-        or modify any of the configuration parameters is quite simple and the
-        instructions here can be used to view or modify any of the parameters.
-      </para>
-
-      <para>
-        First, open the configuration dialog by opening the <quote>Edit</quote>
-        drop-down menu. Choose <quote>Preferences</quote> and then scroll down
-        to the bottom of the page. Then, click the <quote>Config Editor</quote>
-        button. Click on the <quote>I accept the risk!</quote> button.
-        This will display a list of the configuration preferences and
-        information related to each one. You can use the <quote>Filter:</quote>
-        bar to enter search criteria and narrow down the listed items. Changing
-        a preference can be done using two methods. One, if the preference has a
-        boolean value (True/False), simply double-click on the preference to
-        toggle the value and two, for other preferences simply right-click on
-        the desired line, choose <quote>Modify</quote> from the menu and change
-        the value. Creating new preference items is accomplished in the same
-        way, except choose <quote>New</quote> from the menu and provide the
-        desired data into the fields when prompted.
-      </para>
-
-      <para>
-        The configuration preference item you need to check so that
-        <application>Thunderbird</application> uses a specified browser is the
-        <parameter>network.protocol-handler.app.http</parameter> which should be
-        set to the path of the desired browser, e.g.
-        <option>/usr/bin/firefox</option>.
-      </para>
-<!--  Bad URL
-      <tip>
-        <para>
-          There is a multitude of configuration parameters you can tweak to
-          customize <application>Thunderbird</application>. A very extensive,
-          but not so up-to-date list of these parameters can be found at
-          <ulink url="http://preferential.mozdev.org/preferences.html"/>.
-        </para>
-      </tip>
--->
-    <para>
-
-      If you use a desktop environment such as <application>GNOME</application>
-      or <application>KDE</application>, a desktop file
-      <filename>thunderbird.desktop</filename> may be created, in order to
-      include a <quote><application>Thunderbird</application></quote> entry in
-      the menu. <!--If you didn't enable
-      <application>startup-notification</application> in your mozconfig, then
-      change the StartupNotify line to false.--> Run the following commands as the
-      <systemitem class="username">root</systemitem> user:
-
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
-
-cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Name=Thunderbird Mail
-Comment=Send and receive mail with Thunderbird
-GenericName=Mail Client
-Exec=thunderbird %u
-Terminal=false
-Type=Application
-Icon=thunderbird
-Categories=Network;Email;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
-StartupNotify=true</literal>
-EOF
-
-ln -sfv /usr/lib/thunderbird/chrome/icons/default/default256.png \
-        /usr/share/pixmaps/thunderbird.png</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          thunderbird
-        </seg>
-        <seg>
-          Numerous libraries and modules in the /usr/lib/thunderbird directory
-        </seg>
-        <seg>
-          /usr/lib/thunderbird
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="thunderbird-prog">
-        <term><command>thunderbird</command></term>
-        <listitem>
-          <para>
-            is <application>Mozilla</application>'s email and newsgroup client
-          </para>
-          <indexterm zone="thunderbird thunderbird-prog">
-            <primary sortas="b-thunderbird">thunderbird</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,522 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tigervnc-download-http "https://github.com/TigerVNC/tigervnc/archive/v&tigervnc-version;/tigervnc-&tigervnc-version;.tar.gz">
-  <!ENTITY tigervnc-download-ftp  " ">
-  <!ENTITY tigervnc-md5sum        "3a794e3a063443e07250de8e99e2e05a">
-  <!ENTITY tigervnc-size          "1.8 MB">
-  <!ENTITY tigervnc-buildsize     "97 MB">
-  <!ENTITY tigervnc-time          "0.4 SBU (Using parallelism=4)">
-  <!--<!ENTITY tigervnc-xorg-version  "21.1.12">-->
-]>
-
-<sect1 id="tigervnc" xreflabel="tigervnc-&tigervnc-version;">
-  <?dbhtml filename="tigervnc.html"?>
-
-
-  <title>Tigervnc-&tigervnc-version;</title>
-
-  <indexterm zone="tigervnc">
-    <primary sortas="a-tigervnc">tigervnc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tigervnc</title>
-
-    <para>
-      <application>Tigervnc</application> is an advanced VNC (Virtual
-      Network Computing) implementation.  It allows creation of an Xorg server
-      not tied to a physical console and also provides a client for
-      viewing of the remote graphical desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tigervnc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tigervnc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tigervnc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tigervnc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tigervnc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tigervnc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required file:
-          <ulink url="&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Commented out since we're tracking the same xorg-server right now
-    <note>
-      <para>
-        The version of <application>Xorg</application> may eventually be a few
-        versions out of date, but is required for the customizations needed
-        for this package.
-      </para>
-    </note>
--->
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/tigervnc-&tigervnc-version;-configuration_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem revision='sysv'>
-        <para>
-          Optional file to start the server without a display manager:
-          <ulink url="&sources-anduin-http;/tigervnc/vncserver"/>
-        </para>
-      </listitem>
-      <listitem revision='sysv'>
-        <para>
-          Optional manual page:
-          <ulink url="&sources-anduin-http;/tigervnc/vncserver.1"/>
-        </para>
-      </listitem>
-      <listitem revision='systemd'>
-        <para>
-          Optional file to start the server without a display manager:
-          <ulink url="&sources-anduin-http;/tigervnc/Xsession"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tigervnc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="fltk"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libjpeg"/>,
-      <phrase revision='sysv'><xref linkend="linux-pam"/>,</phrase>
-      <xref linkend="pixman"/>,
-      <phrase revision='systemd'><xref linkend="systemd"/>
-        (with <xref linkend="linux-pam"/>),</phrase>
-      <xref linkend="xorg7-app"/>,
-      <xref linkend="xinit"/>, and
-      <xref linkend="xorg7-legacy"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="imagemagick"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tigervnc</title>
-
-    <para>
-      First, make adjustments to the configuration files to make them
-      compatible with LFS systems:
-      <!-- Replaces an incompatible PAM file and disables SELinux support
-           in systemd units. Also modifies the search path for
-           /usr/libexec/vncserver to include /etc/X11/tigervnc -->
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../tigervnc-&tigervnc-version;-configuration_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>tigervnc</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput># Put code in place
-mkdir -p unix/xserver &amp;&amp;
-tar -xf ../xorg-server-&xorg-server-version;.tar.xz \
-    --strip-components=1              \
-    -C unix/xserver                   &amp;&amp;
-( cd unix/xserver &amp;&amp;
-  patch -Np1 -i ../xserver21.1.1.patch ) &amp;&amp;
-
-# Build viewer
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DINSTALL_SYSTEMD_UNITS=OFF \
-      -Wno-dev . &amp;&amp;
-make &amp;&amp;
-
-# Build server
-pushd unix/xserver &amp;&amp;
-  autoreconf -fiv  &amp;&amp;
-
-  CPPFLAGS="-I/usr/include/drm"       \
-  ./configure $XORG_CONFIG            \
-      --disable-xwayland    --disable-dri        --disable-dmx         \
-      --disable-xorg        --disable-xnest      --disable-xvfb        \
-      --disable-xwin        --disable-xephyr     --disable-kdrive      \
-      --disable-devel-docs  --disable-config-hal --disable-config-udev \
-      --disable-unit-tests  --disable-selective-werror                 \
-      --disable-static      --enable-dri3                              \
-      --without-dtrace      --enable-dri2        --enable-glx          \
-      --with-pic &amp;&amp;
-  make  &amp;&amp;
-popd</userinput></screen>
-
-<screen revision="systemd"><userinput># Put code in place
-mkdir -p unix/xserver &amp;&amp;
-tar -xf ../xorg-server-&xorg-server-version;.tar.xz \
-    --strip-components=1              \
-    -C unix/xserver                   &amp;&amp;
-( cd unix/xserver &amp;&amp;
-  patch -Np1 -i ../xserver21.1.1.patch ) &amp;&amp;
-
-# Build viewer
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev . &amp;&amp;
-make &amp;&amp;
-
-# Build server
-pushd unix/xserver &amp;&amp;
-  autoreconf -fiv  &amp;&amp;
-
-  CPPFLAGS="-I/usr/include/drm"       \
-  ./configure $XORG_CONFIG            \
-      --disable-xwayland    --disable-dri        --disable-dmx         \
-      --disable-xorg        --disable-xnest      --disable-xvfb        \
-      --disable-xwin        --disable-xephyr     --disable-kdrive      \
-      --disable-devel-docs  --disable-config-hal --disable-config-udev \
-      --disable-unit-tests  --disable-selective-werror                 \
-      --disable-static      --enable-dri3                              \
-      --without-dtrace      --enable-dri2        --enable-glx          \
-      --with-pic &amp;&amp;
-  make  &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>#Install viewer
-make install &amp;&amp;
-
-#Install server
-( cd unix/xserver/hw/vnc &amp;&amp; make install ) &amp;&amp;
-
-[ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
-
-   <para revision="sysv">
-     Finally, modify the PAM file to be compatible with elogind:
-   </para>
-
-<screen role="root" revision="sysv"><userinput>sed -i 's/pam_systemd.so/pam_elogind.so/' /etc/pam.d/tigervnc</userinput></screen>
-
-<!-- These are installed as part of 'make install' for the client.
-    <para>
-      Finally, create a menu entry.  As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/applications/vncviewer.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Type=Application
-Name=TigerVNC Viewer
-Comment=VNC client
-Exec=/usr/bin/vncviewer
-Icon=tigervnc
-Terminal=false
-StartupNotify=false
-Categories=Network;RemoteAccess;</literal>
-EOF
-
-install -vm644 media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
-ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>tar -xf .. xorg-server...</command>: This command extracts the
-      standard Xorg package into the tree in a location needed for modification.
-    </para>
-
-    <para>
-      <parameter>--disable ...</parameter>: Most options that are usually
-      needed for the standard Xorg server are not needed for the Xvnc
-      instance being built.
-    </para>
-
-    <para>
-      <command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server
-      is not installed in the <filename class='directory'>/usr/bin</filename>
-      directory, then create a link so the <command>vncserver</command> script
-      can find it.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tigervnc</title>
-
-    <para revision='sysv'>
-      The default installation of this package makes some changes in the way it
-      is used.  The vncserver perl script is placed in /usr/bin/libexec and the
-      server is designed to be run via a systemd style .service file or the
-      vncsession script as the root user.  The man page for vncserver is placed
-      in section 8 of the man pages.  The new procedures require a display
-      manager to be installed.
-    </para>
-
-    <para revision='sysv'>
-      To restore the previous behavior, install the additional downloaded
-      files as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root" revision='sysv'><userinput>install -m755 --owner=root ../vncserver /usr/bin &amp;&amp;
-cp ../vncserver.1 /usr/share/man/man1</userinput></screen>
-
-    <para revision='sysv'>
-      Using the previous procedures, the user specific configuration files of
-      vncserver reside in the <filename class='directory'>.vnc</filename>
-      directory in the user's home directory.  The
-      <filename>xstartup</filename> file in that directory is a script
-      specifying what commands to run when a VNC desktop is started.  If no
-      <filename>xstartup</filename> file exists, <command>vncserver</command>
-      will try to start an xterm in a twm session.  An example
-      <filename>xstartup</filename> would be:
-    </para>
-
-<screen revision='sysv'>#!/bin/sh
-[ -x /etc/vnc/xstartup ] &amp;&amp; exec /etc/vnc/xstartup
-[ -r $HOME/.Xresources ] &amp;&amp; xrdb $HOME/.Xresources
-startlxde &amp;</screen>
-
-    <para revision='sysv'>
-      The <filename>xstartup</filename> file must be executable for the
-      commands in it to be executed, so run <command>chmod a+x
-      ~/.vnc/xstartup</command>.
-    </para>
-
-    <para revision='sysv'>
-      Set up the vnc passwd with <command>vncpasswd</command>. The
-      server can then be started with the <command>vncserver</command>
-      command.
-      See the man pages in section 1 for the vncserver for the server
-      system and vncviewer for the remote system.
-    </para>
-
-    <bridgehead renderas="sect3" revision="systemd">Server Configuration</bridgehead>
-
-    <!--
-    <note revision="systemd">
-      <para>
-        This section is optional and is only useful if you want to have VNC
-        sessions launch on system startup. Both configuration methods can
-        coexist on the same system.
-      </para>
-    </note>
-    -->
-    <para revision="systemd">
-      On systemd systems, another method of configuration is available.
-      This configuration provides the added benefit of making tigervnc
-      systemd aware for VNC sessions and allows desktop environments like
-      <application>GNOME</application> to autostart services once the VNC
-      session is started. This configuration also gives the added benefit
-      of starting VNC Sessions on system startup. To set up the VNC server
-      in this fashion, follow these instructions.
-    </para>
-
-    <para revision="systemd">
-       First, install a rudimentary Xsession file so that the VNC server
-       can initialize X sessions properly:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -vdm755 /etc/X11/tigervnc &amp;&amp;
-install -v -m755 ../Xsession /etc/X11/tigervnc</userinput></screen>
-
-    <para revision="systemd">
-      Next, set up a user mapping in
-      <filename>/etc/tigervnc/vncserver.users</filename>. This tells the VNC
-      Server which session is allocated to a user.
-      <!-- For example: :1=renodr will assign 'renodr' to :1 -->
-    </para>
-
-<screen role="root" revision="systemd"><userinput>echo ":1=$(whoami)" >> /etc/tigervnc/vncserver.users</userinput></screen>
-
-    <para revision="systemd">
-      Next, set up a configuration file to tell
-      <application>vncserver</application> which desktop environment should be
-      used and what display geometry should be used. There are several other
-      options that can be defined in this file, but they are outside the scope
-      of BLFS.
-    </para>
-
-<screen revision="systemd"><userinput>install -vdm 755 ~/.vnc &amp;&amp;
-cat &gt; ~/.vnc/config &lt;&lt; EOF
-<literal># Begin ~/.vnc/config
-# The session must match one listed in /usr/share/xsessions.
-# Ensure that there are no spaces at the end of the lines.
-
-session=lxqt
-geometry=1024x768
-
-# End ~/.vnc/config</literal>
-EOF</userinput></screen>
-
-    <para revision="systemd">
-      To start the VNC Server, run the following command:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl start vncserver@:1</userinput></screen>
-
-    <para revision="systemd">
-      To start the VNC Server when the system boots, run the following command:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable vncserver@:1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Xvnc,
-             vncconfig,
-             vncpasswd,
-             vncserver,
-             vncviewer, and
-             x0vncserver</seg>
-
-        <seg>libvnc.so</seg>
-        <seg>/usr/share/doc/tigervnc-&tigervnc-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xvnc">
-        <term><command>Xvnc</command></term>
-        <listitem>
-          <para>
-            is a X VNC (Virtual Network Computing) server.
-             It is based on a standard X server, but it has a
-             <quote>virtual</quote> screen rather than a physical one
-          </para>
-          <indexterm zone="tigervnc xvnc">
-            <primary sortas="b-xvnc">Xvnc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncconfig">
-        <term><command>vncconfig</command></term>
-        <listitem>
-          <para>
-            is a program to configure and control a VNC server
-          </para>
-          <indexterm zone="tigervnc vncconfig">
-            <primary sortas="b-vncconfig">vncconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncpasswd">
-        <term><command>vncpasswd</command></term>
-        <listitem>
-          <para>
-            allows you to set the password used to access VNC desktops
-          </para>
-          <indexterm zone="tigervnc vncpasswd">
-            <primary sortas="b-vncpasswd">vncpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncserver">
-        <term><command>vncserver</command></term>
-        <listitem>
-          <para>
-            is a perl script used to start or stop a VNC server
-          </para>
-          <indexterm zone="tigervnc vncserver">
-            <primary sortas="b-vncserver">vncserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vncviewer">
-        <term><command>vncviewer</command></term>
-        <listitem>
-          <para>
-            is a client used to connect to VNC desktops
-          </para>
-          <indexterm zone="tigervnc vncviewer">
-            <primary sortas="b-vncviewer">vncviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="x0vncserver">
-        <term><command>x0vncserver</command></term>
-        <listitem>
-          <para>
-            is a program to make an X display on a physical
-            terminal accessible via TigerVNC or compatible viewers
-          </para>
-          <indexterm zone="tigervnc x0vncserver">
-            <primary sortas="b-x0vncserver">x0vncserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 transmission-download-http "https://github.com/transmission/transmission/releases/download/&transmission-version;/transmission-&transmission-version;.tar.xz">
-  <!ENTITY transmission-download-ftp  " ">
-  <!ENTITY transmission-md5sum        "d3cda868215246644c429b18a30f7e47">
-  <!ENTITY transmission-size          "9.2 MB">
-  <!ENTITY transmission-buildsize     "229 MB (with both GUI interfaces)">
-  <!ENTITY transmission-time          "2.3 SBU (with both GUI interfaces; using parallelism=4)">
-]>
-
-<sect1 id="transmission" xreflabel="Transmission-&transmission-version;">
-  <?dbhtml filename="transmission.html"?>
-
-
-  <title>Transmission-&transmission-version;</title>
-
-  <indexterm zone="transmission">
-    <primary sortas="a-Transmission">Transmission</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Transmission</title>
-
-    <para>
-      <application>Transmission</application> is a cross-platform, open source
-      BitTorrent client. This is useful for downloading large files (such as
-      Linux ISOs) and reduces the need for the distributors to provide server
-      bandwidth.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&transmission-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&transmission-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &transmission-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &transmission-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &transmission-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &transmission-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libevent"/> and
-      <xref linkend="libpsl"/>
-      (to use system libraries instead of bundled ones)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtkmm4"/> or
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nodejs"/> (for building the web client, not needed at run time),
-      <ulink url="https://github.com/ubuntu/gnome-shell-extension-appindicator">appindicator</ulink>,
-      <ulink url="https://github.com/jech/dht">dht</ulink>,
-      <ulink url="https://github.com/libb64/libb64">libb64</ulink>,
-      <ulink url="https://github.com/ebiggers/libdeflate">libdeflate</ulink>,
-      <ulink url="https://github.com/miniupnp/libnatpmp">libnatpmp</ulink>,
-      <ulink url="https://github.com/bittorrent/libutp">libutp</ulink>, and
-      <ulink url="https://github.com/miniupnp/miniupnp">miniupnp</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/transmission"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Transmission</title>
-
-    <para>
-      Install <application>Transmission</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/transmission-&transmission-version; \
-      .. &amp;&amp;
-
-make</userinput></screen>
-
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Next, create transmission.png from the SVG file:
-    </para>
-
-<screen role="root"><userinput>rsvg-convert                                               \
-   /usr/share/icons/hicolor/scalable/apps/transmission.svg \
-   -o /usr/share/pixmaps/transmission.png</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DENABLE_QT=OFF</option>: This switch disables building
-      the <application>Qt</application> interface. The default is to build it
-      if &qt5-deps; or <xref linkend="qt6"/> is installed.
-    </para>
-
-    <para>
-      <option>-DENABLE_GTK=OFF</option>: This switch disables building
-      the GTK-4 interface. The default is to build it if
-      <xref linkend="gtkmm4"/> is installed.
-    </para>
-
-    <para>
-      <option>-DENABLE_WEB=OFF</option>: This switch disables building
-      the web client. The default is to build it if <xref linkend="nodejs"/>
-      is installed.
-    </para>
-
-    <para>
-      <option>-DREBUILD_WEB=ON</option>: This switch forces rebuilding
-      the web client. This option needs <xref linkend="nodejs"/> to be
-      installed as well as an internet connection. The default is to not
-      rebuild the client.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          <!--transmission-cli,-->
-          transmission-create,
-          transmission-daemon,
-          transmission-edit,
-          transmission-gtk,
-          transmission-qt,
-          transmission-remote, and
-          transmission-show
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/transmission (contains the web client) and
-          /usr/share/doc/transmission-&transmission-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!-- Not seen in 4.0.4 or 4.0.5
-      <varlistentry id="transmission-cli">
-        <term><command>transmission-cli</command></term>
-        <listitem>
-          <para>
-            is a lightweight, command line BitTorrent client with scripting
-            capabilities
-          </para>
-          <indexterm zone="transmission transmission-cli">
-            <primary sortas="b-transmission-cli">transmission-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="transmission-create">
-        <term><command>transmission-create</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to create .torrent files
-          </para>
-          <indexterm zone="transmission transmission-create">
-            <primary sortas="b-transmission-create">transmission-create</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-daemon">
-        <term><command>transmission-daemon</command></term>
-        <listitem>
-          <para>
-            is a daemon-based Transmission session that can be controlled via
-            RPC commands from Transmission's web interface or
-            <command>transmission-remote</command>
-          </para>
-          <indexterm zone="transmission transmission-daemon">
-            <primary sortas="b-transmission-daemon">transmission-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-edit">
-        <term><command>transmission-edit</command></term>
-        <listitem>
-          <para>
-            is a command line tool to modify .torrent files' announce URLs
-          </para>
-          <indexterm zone="transmission transmission-edit">
-            <primary sortas="b-transmission-edit">transmission-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-gtk">
-        <term><command>transmission-gtk</command></term>
-        <listitem>
-          <para>
-            is a GTK+ bittorrent client
-          </para>
-          <indexterm zone="transmission transmission-gtk">
-            <primary sortas="b-transmission-gtk">transmission-gtk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-qt">
-        <term><command>transmission-qt</command></term>
-        <listitem>
-          <para>
-            is a Qt-based bittorrent client
-          </para>
-          <indexterm zone="transmission transmission-qt">
-            <primary sortas="b-transmission-qt">transmission-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-remote">
-        <term><command>transmission-remote</command></term>
-        <listitem>
-          <para>
-            is a remote control utility for transmission-daemon and transmission
-          </para>
-          <indexterm zone="transmission transmission-remote">
-            <primary sortas="b-transmission-remote">transmission-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-show">
-        <term><command>transmission-show</command></term>
-        <listitem>
-          <para>
-            is a command line tool to display bittorrent .torrent file metadata
-          </para>
-          <indexterm zone="transmission transmission-show">
-            <primary sortas="b-transmission-show">transmission-show</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/xarchiver.xml
===================================================================
--- xsoft/other/xarchiver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xarchiver-download-http  "https://github.com/ib/xarchiver/archive/&xarchiver-version;/xarchiver-&xarchiver-version;.tar.gz">
-  <!ENTITY xarchiver-download-ftp  " ">
-  <!ENTITY xarchiver-md5sum        "bfdace2b113417e1bc77ef304280d103">
-  <!ENTITY xarchiver-size          "1.1 MB">
-  <!ENTITY xarchiver-buildsize     "11 MB">
-  <!ENTITY xarchiver-time          "0.1 SBU">
-]>
-
-<sect1 id="xarchiver" xreflabel="xarchiver-&xarchiver-version;">
-  <?dbhtml filename="xarchiver.html"?>
-
-
-  <title>xarchiver-&xarchiver-version;</title>
-
-  <indexterm zone="xarchiver">
-    <primary sortas="a-xarchiver">xarchiver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xarchiver</title>
-
-    <para>
-      <application>XArchiver</application> is a <application>GTK+</application>
-      archive manager with support for tar, xz, bzip2, gzip, zip, 7z, rar, lzo
-      and many other archive formats.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        <application>xarchiver</application> is only a command line or graphical
-        interface to archiving utilities such as <application>tar</application>
-        and <application>zip</application>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xarchiver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xarchiver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xarchiver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xarchiver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xarchiver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xarchiver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/xarchiver-&xarchiver-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">xarchiver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="cpio"/>,
-      <xref role="runtime" linkend="lzo"/>,
-      <xref role="runtime" linkend="p7zip"/>,
-      <xref role="runtime" linkend="unrar"/>,
-      <xref role="runtime" linkend="unzip"/>, and
-      <xref role="runtime" linkend="zip"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xarchiver</title>
-
-    <para>
-      Install <application>xarchiver</application> by running the
-      following commands:
-    </para>
-
-<!-- Previously there was a command here to run ./autogen.sh.
-     With 0.5.4.15, the download that I had included the
-     configure script and the rest of the build machinery with it. -->
-<screen><userinput>./configure  --prefix=/usr               \
-             --libexecdir=/usr/lib/xfce4 \
-             --docdir=/usr/share/doc/xarchiver-&xarchiver-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--libexecdir=/usr/lib/xfce4</parameter>: This switch fixes the
-      location for the thunar-archive-plugin, so it will work if
-      <xref linkend="thunar"/> is installed.
-    </para>
-
-<!--
-    <para>
-      <option>- -disable-gtk3</option>: This switch allows building
-      against GTK+2 or use <option>- -disable-gtk2</option> to force
-      building against GTK+3 when GTK+2 is installed.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xarchiver
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/xfce4/thunar-archive-plugin,
-          /usr/share/doc/xarchiver-&xarchiver-version;, and
-          /usr/share/pixmaps/xarchiver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xarchiver-prog">
-        <term><command>xarchiver</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+</application> archive manager
-          </para>
-          <indexterm zone="xarchiver xarchiver-prog">
-            <primary sortas="b-xarchiver">xarchiver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/xdg-utils.xml
===================================================================
--- xsoft/other/xdg-utils.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,251 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-utils-download-http "http://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-&xdg-utils-version;.tar.gz">-->
-  <!ENTITY xdg-utils-download-http "https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v&xdg-utils-version;/xdg-utils-v&xdg-utils-version;.tar.gz">
-  <!ENTITY xdg-utils-download-ftp  " ">
-  <!ENTITY xdg-utils-md5sum        "4c72585a98ba8f775cb9e72b066cc0df">
-  <!ENTITY xdg-utils-size          "304 KB">
-  <!ENTITY xdg-utils-buildsize     "3.3 MB (with tests)">
-  <!ENTITY xdg-utils-time          "2.5 SBU (with tests)">
-]>
-
-<sect1 id="xdg-utils" xreflabel="xdg-utils-&xdg-utils-version;">
-  <?dbhtml filename="xdg-utils.html"?>
-
-
-  <title>xdg-utils-&xdg-utils-version;</title>
-
-  <indexterm zone="xdg-utils">
-    <primary sortas="a-xdg-utils">xdg-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-utils</title>
-
-    <para>
-      <application>xdg-utils</application> is a set of command line
-      tools that assist applications with a variety of desktop integration tasks.
-      It is required for Linux Standards Base (LSB) conformance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xmlto"/> with one of
-      <xref linkend="lynx"/>,
-      <xref role="nodep" linkend="Links"/>, or
-      <ulink url="&w3m-url;">W3m</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="xorg7-app"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="dbus"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-utils</title>
-
-    <para>
-      Compile <application>xdg-utils</application> with the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <caution>
-      <para>
-        The tests for the scripts must be made from an X-Window
-        based session.  There are several run-time requirements to run
-        the tests including a browser and an MTA.
-        Running the tests as <systemitem class="username">root</systemitem>
-        user is not recommended.
-      </para>
-    </caution>
-
-    <para>
-      To run the tests, issue: <command>make -k test</command>.
-    </para>
-
-    <para>
-      Now install it as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>xdg-desktop-menu, xdg-desktop-icon, xdg-mime, xdg-icon-resource,
-        xdg-open, xdg-email, xdg-screensaver, xdg-settings</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdg-desktop-menu">
-        <term><command>xdg-desktop-menu</command></term>
-        <listitem>
-          <para>
-            is a command line tool for (un)installing desktop menu items
-          </para>
-          <indexterm zone="xdg-utils xdg-desktop-menu">
-            <primary sortas="b-xdg-desktop-menu">xdg-desktop-menu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-desktop-icon">
-        <term><command>xdg-desktop-icon</command></term>
-        <listitem>
-          <para>
-            is a command line tool for (un)installing icons to the desktop
-          </para>
-          <indexterm zone="xdg-utils xdg-desktop-icon">
-            <primary sortas="b-xdg-desktop-icon">xdg-desktop-icon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-mime">
-        <term><command>xdg-mime</command></term>
-        <listitem>
-          <para>
-            is a command line tool for querying information about file
-            type handling and adding descriptions for new file types
-          </para>
-          <indexterm zone="xdg-utils xdg-mime">
-            <primary sortas="b-xdg-mime">xdg-mime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-icon-resource">
-        <term><command>xdg-icon-resource</command></term>
-        <listitem>
-          <para>
-            is a command line tool for (un)installing icon resources
-          </para>
-          <indexterm zone="xdg-utils xdg-icon-resource">
-            <primary sortas="b-xdg-icon-resource">xdg-icon-resource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-open">
-        <term><command>xdg-open</command></term>
-        <listitem>
-          <para>
-            opens a file or URL in the user's preferred application
-          </para>
-          <indexterm zone="xdg-utils xdg-open">
-            <primary sortas="b-xdg-open">xdg-open</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-email">
-        <term><command>xdg-email</command></term>
-        <listitem>
-          <para>
-            opens the user's preferred e-mail composer in order to send a mail
-            message
-          </para>
-          <indexterm zone="xdg-utils xdg-email">
-            <primary sortas="b-xdg-email">xdg-email</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-screensaver">
-        <term><command>xdg-screensaver</command></term>
-        <listitem>
-          <para>
-            is a command line tool for controlling the screensaver
-          </para>
-          <indexterm zone="xdg-utils xdg-screensaver">
-            <primary sortas="b-xdg-screensaver">xdg-screensaver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-settings">
-        <term><command>xdg-settings</command></term>
-        <listitem>
-          <para>
-            is a command line tool for managing various settings from
-            the desktop environment
-          </para>
-          <indexterm zone="xdg-utils xdg-settings">
-            <primary sortas="b-xdg-settings">xdg-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: xsoft/other/xscreensaver.xml
===================================================================
--- xsoft/other/xscreensaver.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xscreensaver-download-http "https://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
-  <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "d64f3fdb8881c735fff4601ec5d88e1f">
-  <!ENTITY xscreensaver-size          "19 MB">
-  <!ENTITY xscreensaver-buildsize     "250 MB">
-  <!ENTITY xscreensaver-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="xscreensaver" xreflabel="XScreenSaver-&xscreensaver-version;">
-  <?dbhtml filename="xscreensaver.html"?>
-
-
-  <title>XScreenSaver-&xscreensaver-version;</title>
-
-  <indexterm zone="xscreensaver">
-    <primary sortas="a-XScreenSaver">XScreenSaver</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XScreenSaver</title>
-
-    <para>
-      The <application>XScreenSaver</application> package is a modular screen
-      saver and locker for the X Window System. It is highly customizable and
-      allows the use of any program that can draw on the root window as a
-      display mode. The purpose of <application>XScreenSaver</application> is
-      to display pretty pictures on your screen when it is not in use, in
-      keeping with the philosophy that unattended monitors should always be
-      doing something interesting, just like they do in the movies. However,
-      <application>XScreenSaver</application> can also be used as a screen
-      locker, to prevent others from using your terminal while you are away.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xscreensaver-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xscreensaver-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xscreensaver-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xscreensaver-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xscreensaver-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xscreensaver-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XScreenSaver Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="xorg7-app"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glu"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdm"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>, and
-      <ulink url="https://linas.org/gle/">GLE</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XScreenSaver</title>
-
-    <para revision="sysv">
-      Change a hardcoded library name, which prevents using the settings found
-      by <command>configure</command>:
-    </para>
-
-<screen revision="sysv"><userinput>sed -i 's/-lsystemd/-lelogind/' driver/Makefile.in</userinput></screen>
-
-    <para>
-      Install <application>XScreenSaver</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <!-- EDITORS NOTE: Use install_prefix instead of DESTDIR -->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-setuid-hacks</option>: This switch allows some demos
-      to be installed setuid <systemitem class="username">root</systemitem>
-      which is needed in order to ping other hosts.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring XScreenSaver</title>
-
-    <sect3 id="xscreensaver-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/X11/app-defaults/XScreenSaver</filename> and
-        <filename>~/.xscreensaver</filename>
-      </para>
-
-      <indexterm zone="xscreensaver xscreensaver-config">
-        <primary sortas="e-etc-X11-app-defaults-XScreenSaver">/etc/X11/app-defaults/XScreenSaver</primary>
-      </indexterm>
-      <indexterm zone="xscreensaver xscreensaver-config">
-        <primary sortas="e-AA.xscreensaver">~/.xscreensaver</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>XScreenSaver</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file, to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following commands as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/xscreensaver &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/xscreensaver
-
-auth    include system-auth
-account include system-account
-
-# End /etc/pam.d/xscreensaver</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xscreensaver, xscreensaver-command, xscreensaver-demo, and
-          xscreensaver-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/libexec/xscreensaver and
-          /usr/share/xscreensaver
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xscreensaver-prog">
-        <term><command>xscreensaver</command></term>
-        <listitem>
-          <para>
-            is a screen saver and locker daemon
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-prog">
-            <primary sortas="b-xscreensaver">xscreensaver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscreensaver-command">
-        <term><command>xscreensaver-command</command></term>
-        <listitem>
-          <para>
-            controls a running <command>xscreensaver</command>
-            process by sending it client messages
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-command">
-            <primary sortas="b-xscreensaver-command">xscreensaver-command</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscreensaver-demo">
-        <term><command>xscreensaver-demo</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>xscreensaver-settings</command>
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-demo">
-            <primary sortas="b-xscreensaver-demo">xscreensaver-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscreensaver-settings">
-        <term><command>xscreensaver-settings</command></term>
-        <listitem>
-          <para>
-            is a graphical front-end for setting the parameters used
-            by the background <command>xscreensaver</command> daemon
-          </para>
-          <indexterm zone="xscreensaver xscreensaver-settings">
-            <primary sortas="b-xscreensaver-settings">xscreensaver-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
