Index: general/genlib/gspell.xml
===================================================================
--- general/genlib/gspell.xml	(revision e162f3d3754f79485a7c0e151d48b930f5c9f365)
+++ general/genlib/gspell.xml	(revision cfc1f98155c3e960da4783461492fb00eafe7793)
@@ -9,8 +9,8 @@
   <!ENTITY gspell-download-http "https://&gspell-site;/gspell-&gspell-version;.tar.xz">
   <!ENTITY gspell-download-ftp  "ftp://&gspell-site;/gspell-&gspell-version;.tar.xz">
-  <!ENTITY gspell-md5sum        "d0892000d944e87fd74e8611ef400cdb">
-  <!ENTITY gspell-size          "412 KB">
-  <!ENTITY gspell-buildsize     "12 MB (with tests)">
-  <!ENTITY gspell-time          "0.2 SBU (with tests)">
+  <!ENTITY gspell-md5sum        "378dee938c08c24b559953cbcad83942">
+  <!ENTITY gspell-size          "414 KB">
+  <!ENTITY gspell-buildsize     "13 MB (with tests)">
+  <!ENTITY gspell-time          "0.1 SBU (using parallelism=4; with tests)">
 ]>
 
@@ -131,5 +131,5 @@
 
       <seglistitem>
-        <seg>gspell-appl</seg>
+        <seg>gspell-app1</seg>
         <seg>libgspell-1.so</seg>
         <seg>/usr/include/gspell-1 and
Index: general/genlib/js68.xml
===================================================================
--- general/genlib/js68.xml	(revision e162f3d3754f79485a7c0e151d48b930f5c9f365)
+++ general/genlib/js68.xml	(revision cfc1f98155c3e960da4783461492fb00eafe7793)
@@ -7,8 +7,8 @@
   <!ENTITY js68-download-http "&mozilla-http;/firefox/releases/&JS68-version;esr/source/firefox-&JS68-version;esr.source.tar.xz">
   <!ENTITY js68-download-ftp  " ">
-  <!ENTITY js68-md5sum        "a8f860f31725d914c02918ff2b2aecf8">
-  <!ENTITY js68-size          "306 MB">
+  <!ENTITY js68-md5sum        "80ae7816399f20cc61c9b15495b2341d">
+  <!ENTITY js68-size          "299 MB">
   <!ENTITY js68-buildsize     "2.8 GB (30 MB installed after removing 31MB static lib)">
-  <!ENTITY js68-time          "2.2 SBU (with parallelism = 4)">
+  <!ENTITY js68-time          "2.1 SBU (with parallelism = 4)">
 ]>
 
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision e162f3d3754f79485a7c0e151d48b930f5c9f365)
+++ general/prog/mercurial.xml	(revision cfc1f98155c3e960da4783461492fb00eafe7793)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "17b21729cbc61dda80b2e3dfc046319f">
+  <!ENTITY mercurial-md5sum        "2288a0be73d33f050c1fd4332ea9e28e">
   <!ENTITY mercurial-size          "7.4 MB">
-  <!ENTITY mercurial-buildsize     "111 MB (with docs, add 1.2 GB for tests)">
-  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 18 SBU for tests using -j4)">
+  <!ENTITY mercurial-buildsize     "111 MB (with docs, add 1.1 GB for tests)">
+  <!ENTITY mercurial-time          "0.3 SBU (with docs, add 18 SBU for tests using -j4)">
 ]>
 
@@ -134,5 +134,5 @@
 <screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
 <!-- The blacklists have to be checked every release of Mercurial, do a listing
-     of tests/blacklists, but do not include the makefile. -->
+     of tests/blacklists, but do not include the README. -->
 
     <para>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision e162f3d3754f79485a7c0e151d48b930f5c9f365)
+++ general/prog/php.xml	(revision cfc1f98155c3e960da4783461492fb00eafe7793)
@@ -7,8 +7,8 @@
   <!ENTITY php-download-http "http://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "b623bef0da0b7c48477853ca50c989c5">
+  <!ENTITY php-md5sum        "48cd5acc0bb3e81dbf9c98a343d6149c">
   <!ENTITY php-size          "9.8 MB">
-  <!ENTITY php-buildsize     "474 MB (add 2 MB for tests, add 117 MB for documentation)">
-  <!ENTITY php-time          "1.7 SBU (with parallelism=4; add 1.7 SBU for tests)">
+  <!ENTITY php-buildsize     "644 MB (add 1.2 MB for tests, add 182 MB for documentation)">
+  <!ENTITY php-time          "1.6 SBU (with parallelism=4; add 1.9 SBU for tests)">
 ]>
 
@@ -217,15 +217,5 @@
       </para>
     </note>
-<!--
-    <para>
-      If you wish to build <application>PHP</application> with the
-      <application>tidy-html5</application> library, due to API changes, in the
-      <application>PHP</application> source, <filename>buffio.h</filename>
-      header needs to be changed to <filename>tidybuffio.h</filename> in the
-      file <filename>ext/tidy/tidy.c</filename>:
-    </para>
-
-<screen><userinput>sed -i 's/buffio.h/tidy&amp;/' ext/tidy/tidy.c</userinput></screen>
--->
+
     <para>
       Install <application>PHP</application> by running the following commands:
@@ -300,8 +290,4 @@
 install -v -m644    CODING_STANDARDS* EXTENSIONS NEWS README* UPGRADING* \
                     /usr/share/doc/php-&php-version;</userinput></screen>
-<!--ln -v -sfn          /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
-                    /usr/share/doc/php-&php-version; &amp;&amp;
-ln -v -sfn          /usr/lib/php/doc/Structures_Graph/docs \
-                    /usr/share/doc/php-&php-version;</userinput></screen>-->
 
     <para>
@@ -356,10 +342,5 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!-- Seems to be obsolete?
-      <para revision="systemd">
-        <command>sed -i "s|lsystemd-daemon|lsystemd|g" configure</command>:
-        This command fixes the detection of the systemd library.
-      </para>
--->
+
       <para>
         <parameter>--datadir=/usr/share/php</parameter>: This works
@@ -632,5 +613,6 @@
 
       <seglistitem>
-        <seg>pear, peardev, pecl, phar (symlink), phar.phar, php,
+        <seg><!-- not built anymore pear, peardev, pecl,-->
+        phar (symlink), phar.phar, php,
         php-cgi, php-config, php-fpm, phpdbg, and phpize</seg>
 
@@ -638,5 +620,5 @@
         /usr/lib/php/extensions/no-debug-non-zts-20190902</seg>
 
-        <seg>/etc/php-fpm.d, /usr/{include,lib,share}/php and
+        <seg>/etc/php-fpm.d, /usr/{include,lib,share}/php, and
         /usr/share/doc/php-&php-version;</seg>
       </seglistitem>
