Index: archive/chrpath.xml
===================================================================
--- archive/chrpath.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
+++ archive/chrpath.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY chrpath-download-http "https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-&chrpath-version;.tar.gz">
+  <!ENTITY chrpath-download-ftp  " ">
+  <!ENTITY chrpath-md5sum        "2bf8d1d1ee345fc8a7915576f5649982">
+  <!ENTITY chrpath-size          "132 KB">
+  <!ENTITY chrpath-buildsize     "1 MB">
+  <!ENTITY chrpath-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="chrpath" xreflabel="chrpath-&chrpath-version;">
+  <?dbhtml filename="chrpath.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>chrpath-&chrpath-version;</title>
+
+  <indexterm zone="chrpath">
+    <primary sortas="a-chrpath">chrpath</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to chrpath</title>
+
+    <para>
+      The <application>chrpath</application> modify the dynamic library load
+      path (rpath and runpath) of compiled programs and libraries.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&chrpath-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&chrpath-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &chrpath-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &chrpath-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &chrpath-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &chrpath-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/chrpath"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of chrpath</title>
+
+    <para>
+      Install <application>chrpath</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>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make docdir=/usr/share/doc/chrpath-&chrpath-version; install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          chrpath
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/chrpath-&chrpath-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chrpath-prog">
+        <term><command>chrpath</command></term>
+        <listitem>
+          <para>
+            changes the rpath or runpath in ELF files.
+          </para>
+          <indexterm zone="chrpath chrpath-prog">
+            <primary sortas="b-chrpath">chrpath</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/juffed.xml
===================================================================
--- archive/juffed.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
+++ archive/juffed.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY juffed-download-http "&sources-anduin-http;/juffed/juffed-&juffed-version;.tar.xz">
+  <!ENTITY juffed-download-ftp  " ">
+  <!ENTITY juffed-md5sum        "5d211f5aadcb3d7365b5a6127d3d275f">
+  <!ENTITY juffed-size          "1.3 MB">
+  <!ENTITY juffed-buildsize     "22 MB">
+  <!ENTITY juffed-time          "0.8 SBU">
+]>
+
+<sect1 id="juffed" xreflabel="juffed-&juffed-version;">
+  <?dbhtml filename="juffed.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>juffed-&juffed-version;</title>
+
+  <indexterm zone="juffed">
+    <primary sortas="a-juffed">juffed</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JuffEd</title>
+
+    <para>
+      The <application>JuffEd</application> package is a Qt based editor with
+      support for multiple tabs. It is simple and clear, but very powerful.
+      It supports language syntax highlighting, auto-indents in accordance with
+      file type, code blocks folding, matching braces highlighting with instant
+      jumps between them, powerful search and replacing text using regular
+      expressions (including multiline ones) with the opportunity to use
+      matches \1, \2, &hellip; in substitutions, a terminal emulator, saving
+      named sessions and many other features.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&juffed-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&juffed-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &juffed-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &juffed-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &juffed-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &juffed-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para>
+      The source tarball shown above was created by the BLFS team by cloning
+      the source code repository, finding the correct version to rename
+      accordingly the source code directory, removing <filename
+      class="directory">.git</filename> directory and <filename
+      class="directory">.gitignore</filename> file, and finally making the
+      compressed tarball. No other modification has been made.
+    </para>
+
+    <bridgehead renderas="sect3">JuffEd Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="qscintilla"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="qtermwidget"/> (for the terminal)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="desktop-file-utils"/> and
+      <ulink url="http://cihar.com/software/enca/">Enca</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/juffed"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JuffEd</title>
+
+    <para>
+      For compilation with <application>Qt4</application>, see <quote>Command
+      Explanations</quote> below. Install
+      <application>JuffEd</application> by running the following commands:
+    </para>
+
+<screen><userinput>sed -i 's/"64"/""/' cmake/LibSuffix.cmake                                     &amp;&amp;
+sed -i '/JUFFED_LIBRARY/s/)$/ qtermwidget5)/' plugins/terminal/CMakeLists.txt &amp;&amp;
+
+mkdir -v build &amp;&amp;
+cd       build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
+      -DCMAKE_BUILD_TYPE=Release          \
+      -DBUILD_TERMINAL=ON                 \
+      -DUSE_QT5=true                      \
+      ..       &amp;&amp;
+
+LIBRARY_PATH=$LXQT_PREFIX/lib make</userinput></screen>
+
+    <para>
+      The choice of <filename class="directory">/usr</filename> prefix is due
+      to the general characteristics of this program, which can be used
+      without <application>LXQt</application>.
+    </para>
+
+    <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>
+      <command>sed ... LibSuffix.cmake</command>: Removes the 64 from /lib64.
+    </para>
+
+    <para>
+      <command>sed -i '/JUFFED_LIBRARY/s/)$/ qtermwidget5)/'</command>: Allows this
+      package to build against current <xref linkend="qtermwidget"/>.
+    </para>
+
+    <para>
+      <envar>LIBRARY_PATH=$LXQT_PREFIX/lib</envar>: This environment
+      variable is needed for the linker to find a required library.
+    </para>
+
+    <para>
+      <parameter>-DBUILD_TERMINAL=ON</parameter>: This switch is used in order
+      to enable building the terminal. Toggle to <quote>OFF</quote> or remove
+      the switch, if you do not wish it.
+    </para>
+
+    <para>
+      <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
+      build this application linked to <application>Qt5</application>. Toggle
+      to <quote>false</quote>, if you prefer to use
+      <application>Qt4</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          juffed
+        </seg>
+        <seg>
+          libjuff.so,
+          libjuffed-engine-qsci.so and
+          plugins under /usr/lib/juffed/plugins
+        </seg>
+        <seg>
+          /usr/{include,lib,share}/juffed
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="juffed-prog">
+        <term><command>juffed</command></term>
+        <listitem>
+          <para>
+            is a <application>Qt</application> based text editor.
+          </para>
+          <indexterm zone="juffed juffed-prog">
+            <primary sortas="b-juffed">juffed</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjuff">
+        <term><filename class="libraryfile">libjuff.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>JuffEd</application> API functions.
+          </para>
+          <indexterm zone="juffed libjuff">
+            <primary sortas="c-libjuff">libjuff.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjuffed-engine-qsci">
+        <term><filename class="libraryfile">libjuffed-engine-qsci.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>QScintilla</application> bindings.
+          </para>
+          <indexterm zone="juffed libjuffed-engine-qsci">
+            <primary sortas="c-libjuffed-engine-qsci">libjuffed-engine-qsci.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/qscintilla.xml
===================================================================
--- archive/qscintilla.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
+++ archive/qscintilla.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY qscintilla-download-http "&sourceforge-dl;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
+  <!ENTITY qscintilla-download-ftp  " ">
+  <!ENTITY qscintilla-md5sum        "48ef316ff1e2a4d45a65d42be146ca39">
+  <!ENTITY qscintilla-size          "2.6 MB">
+  <!ENTITY qscintilla-buildsize     "28 MB (with documentation)">
+  <!ENTITY qscintilla-time          "0.4 SBU (using parallelism=4; with documentation)">
+]>
+
+<sect1 id="qscintilla" xreflabel="qscintilla-&qscintilla-version;">
+  <?dbhtml filename="qscintilla.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>QScintilla-gpl-&qscintilla-version;</title>
+
+  <indexterm zone="qscintilla">
+    <primary sortas="a-qscintilla">qscintilla</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to QScintilla</title>
+
+    <para>
+      <application>QScintilla</application> is a port to
+      <application>Qt</application> of <ulink
+      url="http://www.scintilla.org/">Scintilla</ulink>. As well as features
+      found in standard text editing components, it includes features
+      especially useful when editing and debugging source code: language
+      syntax styling, error indicators, code completion, call tips, code
+      folding, margins can contain markers like those used in debuggers to
+      indicate breakpoints and the current line, recordable macros, multiple
+      views and, of course, printing.
+    </para>
+
+    &lfs82_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qscintilla-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qscintilla-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qscintilla-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qscintilla-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qscintilla-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qscintilla-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">QScintilla Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="chrpath"/> and
+      <xref linkend="qt5"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink
+      url="http://riverbankcomputing.co.uk/software/pyqt/intro">PyQt</ulink>
+      (for <application>Python</application> <application>Qt</application>
+      bindings)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qscintilla"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of QScintilla</title>
+
+    <note>
+      <para>
+        The instructions in this page are just for the
+        <application>QScintilla</application> application. Code is included in
+        the tarball for  <application>QScintilla Qt Designer</application>
+        plugin and <application>Python</application> bindings.
+      </para>
+    </note>
+
+    <para>
+      Install <application>QScintilla</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>cd Qt4Qt5             &amp;&amp;
+qmake qscintilla.pro  &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>
+
+<!-- For "DESTDIR" install, use: make INSTALL_ROOT=<destination> install -->
+<screen role="root"><userinput>make install &amp;&amp;
+ln -sfv $(readlink $QT5DIR/lib/libqscintilla2_qt5.so) $QT5DIR/lib/libqt5scintilla2.so</userinput></screen>
+
+    <para>
+      If you wish to install the documentation, issue, as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html &amp;&amp;
+install -v -m644    ../doc/html-Qt4Qt5/* \
+                    $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
+
+  </sect2>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>ln -sfv ...</command>: This command creates a compatibility 
+      symlink needed by some programs.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          $QT5DIR/lib/libqt5scintilla2.so (link to libqscintilla2_qt5.so) and
+          $QT5DIR/lib/libqscintilla2_qt5.so
+        </seg>
+        <seg>
+          $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libqscintilla2_qt5">
+        <term><filename class="libraryfile">libqscintilla2_qt5.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>QScintilla</application>
+            <application>Qt5</application> API functions.
+          </para>
+          <indexterm zone="qscintilla libqscintilla2_qt5">
+            <primary sortas="c-libqscintilla2_qt5.so">libqscintilla2_qt5.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ general.ent	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 11th, &year;">
+<!ENTITY releasedate  "June 12th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: neral/genutils/chrpath.xml
===================================================================
--- general/genutils/chrpath.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY chrpath-download-http "https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-&chrpath-version;.tar.gz">
-  <!ENTITY chrpath-download-ftp  " ">
-  <!ENTITY chrpath-md5sum        "2bf8d1d1ee345fc8a7915576f5649982">
-  <!ENTITY chrpath-size          "132 KB">
-  <!ENTITY chrpath-buildsize     "1 MB">
-  <!ENTITY chrpath-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="chrpath" xreflabel="chrpath-&chrpath-version;">
-  <?dbhtml filename="chrpath.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>chrpath-&chrpath-version;</title>
-
-  <indexterm zone="chrpath">
-    <primary sortas="a-chrpath">chrpath</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to chrpath</title>
-
-    <para>
-      The <application>chrpath</application> modify the dynamic library load
-      path (rpath and runpath) of compiled programs and libraries.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&chrpath-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&chrpath-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &chrpath-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &chrpath-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &chrpath-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &chrpath-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/chrpath"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of chrpath</title>
-
-    <para>
-      Install <application>chrpath</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>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/chrpath-&chrpath-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          chrpath
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/chrpath-&chrpath-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chrpath-prog">
-        <term><command>chrpath</command></term>
-        <listitem>
-          <para>
-            changes the rpath or runpath in ELF files.
-          </para>
-          <indexterm zone="chrpath chrpath-prog">
-            <primary sortas="b-chrpath">chrpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ general/genutils/genutils.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -26,5 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ introduction/welcome/changelog.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -43,4 +43,13 @@
 -->
     <listitem>
+      <para>June 12th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Archive juffed, QScintilla-gpl, and chrpath.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 11th, 2018</para>
       <itemizedlist>
Index: postlfs/editors/editors.xml
===================================================================
--- postlfs/editors/editors.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ postlfs/editors/editors.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -26,5 +26,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gedit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="joe.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="juffed.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mousepad.xml"/>
Index: stlfs/editors/juffed.xml
===================================================================
--- postlfs/editors/juffed.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ 	(revision )
@@ -1,252 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY juffed-download-http "&sources-anduin-http;/juffed/juffed-&juffed-version;.tar.xz">
-  <!ENTITY juffed-download-ftp  " ">
-  <!ENTITY juffed-md5sum        "5d211f5aadcb3d7365b5a6127d3d275f">
-  <!ENTITY juffed-size          "1.3 MB">
-  <!ENTITY juffed-buildsize     "22 MB">
-  <!ENTITY juffed-time          "0.8 SBU">
-]>
-
-<sect1 id="juffed" xreflabel="juffed-&juffed-version;">
-  <?dbhtml filename="juffed.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>juffed-&juffed-version;</title>
-
-  <indexterm zone="juffed">
-    <primary sortas="a-juffed">juffed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JuffEd</title>
-
-    <para>
-      The <application>JuffEd</application> package is a Qt based editor with
-      support for multiple tabs. It is simple and clear, but very powerful.
-      It supports language syntax highlighting, auto-indents in accordance with
-      file type, code blocks folding, matching braces highlighting with instant
-      jumps between them, powerful search and replacing text using regular
-      expressions (including multiline ones) with the opportunity to use
-      matches \1, \2, &hellip; in substitutions, a terminal emulator, saving
-      named sessions and many other features.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&juffed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&juffed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &juffed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &juffed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &juffed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &juffed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The source tarball shown above was created by the BLFS team by cloning
-      the source code repository, finding the correct version to rename
-      accordingly the source code directory, removing <filename
-      class="directory">.git</filename> directory and <filename
-      class="directory">.gitignore</filename> file, and finally making the
-      compressed tarball. No other modification has been made.
-    </para>
-
-    <bridgehead renderas="sect3">JuffEd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qscintilla"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="qtermwidget"/> (for the terminal)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="desktop-file-utils"/> and
-      <ulink url="http://cihar.com/software/enca/">Enca</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/juffed"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JuffEd</title>
-
-    <para>
-      For compilation with <application>Qt4</application>, see <quote>Command
-      Explanations</quote> below. Install
-      <application>JuffEd</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i 's/"64"/""/' cmake/LibSuffix.cmake                                     &amp;&amp;
-sed -i '/JUFFED_LIBRARY/s/)$/ qtermwidget5)/' plugins/terminal/CMakeLists.txt &amp;&amp;
-
-mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$LXQT_PREFIX \
-      -DCMAKE_BUILD_TYPE=Release          \
-      -DBUILD_TERMINAL=ON                 \
-      -DUSE_QT5=true                      \
-      ..       &amp;&amp;
-
-LIBRARY_PATH=$LXQT_PREFIX/lib make</userinput></screen>
-
-    <para>
-      The choice of <filename class="directory">/usr</filename> prefix is due
-      to the general characteristics of this program, which can be used
-      without <application>LXQt</application>.
-    </para>
-
-    <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>
-      <command>sed ... LibSuffix.cmake</command>: Removes the 64 from /lib64.
-    </para>
-
-    <para>
-      <command>sed -i '/JUFFED_LIBRARY/s/)$/ qtermwidget5)/'</command>: Allows this
-      package to build against current <xref linkend="qtermwidget"/>.
-    </para>
-
-    <para>
-      <envar>LIBRARY_PATH=$LXQT_PREFIX/lib</envar>: This environment
-      variable is needed for the linker to find a required library.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TERMINAL=ON</parameter>: This switch is used in order
-      to enable building the terminal. Toggle to <quote>OFF</quote> or remove
-      the switch, if you do not wish it.
-    </para>
-
-    <para>
-      <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
-      build this application linked to <application>Qt5</application>. Toggle
-      to <quote>false</quote>, if you prefer to use
-      <application>Qt4</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          juffed
-        </seg>
-        <seg>
-          libjuff.so,
-          libjuffed-engine-qsci.so and
-          plugins under /usr/lib/juffed/plugins
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/juffed
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="juffed-prog">
-        <term><command>juffed</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt</application> based text editor.
-          </para>
-          <indexterm zone="juffed juffed-prog">
-            <primary sortas="b-juffed">juffed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjuff">
-        <term><filename class="libraryfile">libjuff.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JuffEd</application> API functions.
-          </para>
-          <indexterm zone="juffed libjuff">
-            <primary sortas="c-libjuff">libjuff.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjuffed-engine-qsci">
-        <term><filename class="libraryfile">libjuffed-engine-qsci.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>QScintilla</application> bindings.
-          </para>
-          <indexterm zone="juffed libjuffed-engine-qsci">
-            <primary sortas="c-libjuffed-engine-qsci">libjuffed-engine-qsci.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ x/lib/lib.xml	(revision 82b5ea224a8ae62bc1518bbd3a16eaa3df8a817b)
@@ -66,5 +66,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebengine.xml"/>
Index: lib/qscintilla.xml
===================================================================
--- x/lib/qscintilla.xml	(revision cd428fd4db198739a9e7c248fa5193d6f3c73b61)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY qscintilla-download-http "&sourceforge-dl;/pyqt/QScintilla_gpl-&qscintilla-version;.tar.gz">
-  <!ENTITY qscintilla-download-ftp  " ">
-  <!ENTITY qscintilla-md5sum        "48ef316ff1e2a4d45a65d42be146ca39">
-  <!ENTITY qscintilla-size          "2.6 MB">
-  <!ENTITY qscintilla-buildsize     "28 MB (with documentation)">
-  <!ENTITY qscintilla-time          "0.4 SBU (using parallelism=4; with documentation)">
-]>
-
-<sect1 id="qscintilla" xreflabel="qscintilla-&qscintilla-version;">
-  <?dbhtml filename="qscintilla.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>QScintilla-gpl-&qscintilla-version;</title>
-
-  <indexterm zone="qscintilla">
-    <primary sortas="a-qscintilla">qscintilla</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QScintilla</title>
-
-    <para>
-      <application>QScintilla</application> is a port to
-      <application>Qt</application> of <ulink
-      url="http://www.scintilla.org/">Scintilla</ulink>. As well as features
-      found in standard text editing components, it includes features
-      especially useful when editing and debugging source code: language
-      syntax styling, error indicators, code completion, call tips, code
-      folding, margins can contain markers like those used in debuggers to
-      indicate breakpoints and the current line, recordable macros, multiple
-      views and, of course, printing.
-    </para>
-
-    &lfs82_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qscintilla-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qscintilla-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qscintilla-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qscintilla-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qscintilla-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qscintilla-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">QScintilla Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="chrpath"/> and
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink
-      url="http://riverbankcomputing.co.uk/software/pyqt/intro">PyQt</ulink>
-      (for <application>Python</application> <application>Qt</application>
-      bindings)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/qscintilla"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of QScintilla</title>
-
-    <note>
-      <para>
-        The instructions in this page are just for the
-        <application>QScintilla</application> application. Code is included in
-        the tarball for  <application>QScintilla Qt Designer</application>
-        plugin and <application>Python</application> bindings.
-      </para>
-    </note>
-
-    <para>
-      Install <application>QScintilla</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd Qt4Qt5             &amp;&amp;
-qmake qscintilla.pro  &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>
-
-<!-- For "DESTDIR" install, use: make INSTALL_ROOT=<destination> install -->
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sfv $(readlink $QT5DIR/lib/libqscintilla2_qt5.so) $QT5DIR/lib/libqt5scintilla2.so</userinput></screen>
-
-    <para>
-      If you wish to install the documentation, issue, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html &amp;&amp;
-install -v -m644    ../doc/html-Qt4Qt5/* \
-                    $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
-
-  </sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -sfv ...</command>: This command creates a compatibility 
-      symlink needed by some programs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $QT5DIR/lib/libqt5scintilla2.so (link to libqscintilla2_qt5.so) and
-          $QT5DIR/lib/libqscintilla2_qt5.so
-        </seg>
-        <seg>
-          $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libqscintilla2_qt5">
-        <term><filename class="libraryfile">libqscintilla2_qt5.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>QScintilla</application>
-            <application>Qt5</application> API functions.
-          </para>
-          <indexterm zone="qscintilla libqscintilla2_qt5">
-            <primary sortas="c-libqscintilla2_qt5.so">libqscintilla2_qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
