Index: general/prog/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision c46efd3ce90536778997a31711a018d57f214e1c)
+++ general/prog/lxml.xml	(revision eb056a193c11ed313e4f677897c042f8721d31bc)
@@ -7,7 +7,7 @@
   <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
   <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "4242c749bacda939853c418cf52a89aa">
-  <!ENTITY lxml-size          "2.4 MB">
-  <!ENTITY lxml-buildsize     "127 MB (add 27 MB for the testsuite)">
+  <!ENTITY lxml-md5sum        "d2b2eb305bfa9ed15aebe61affb3ffa4">
+  <!ENTITY lxml-size          "4.2 MB">
+  <!ENTITY lxml-buildsize     "179 MB (add 39 MB for the testsuite)">
   <!ENTITY lxml-time          "1.9 SBU (add 1.7 SBU for the testsuite)">
 ]>
@@ -81,6 +81,6 @@
       <bridgehead renderas="sect5">Optional (to run more tests)</bridgehead>
       <para role="optional">
-        <xref linkend="gdb"/>
-        <xref linkend="valgrind"/>
+        <xref linkend="gdb"/>,
+        <xref linkend="valgrind"/>, and
         <ulink url="&pypi;/cssselect/">cssselect</ulink>
       </para>
Index: general/prog/ninja.xml
===================================================================
--- general/prog/ninja.xml	(revision c46efd3ce90536778997a31711a018d57f214e1c)
+++ general/prog/ninja.xml	(revision eb056a193c11ed313e4f677897c042f8721d31bc)
@@ -7,7 +7,7 @@
   <!ENTITY ninja-download-http "https://github.com/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
   <!ENTITY ninja-download-ftp  " ">
-  <!ENTITY ninja-md5sum        "5fdb04461cc7f5d02536b3bfc0300166">
-  <!ENTITY ninja-size          "184 KB">
-  <!ENTITY ninja-buildsize     "48 MB">
+  <!ENTITY ninja-md5sum        "f340be768a76724b83e6daab69009902">
+  <!ENTITY ninja-size          "186 KB">
+  <!ENTITY ninja-buildsize     "65 MB">
   <!ENTITY ninja-time          "0.2 SBU">
 ]>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision c46efd3ce90536778997a31711a018d57f214e1c)
+++ general/prog/php.xml	(revision eb056a193c11ed313e4f677897c042f8721d31bc)
@@ -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        "9c4df46b64582d3c3e8fb6f01a08158e">
+  <!ENTITY php-md5sum        "92a237d2f4075eb00dd2b1f36e71ae4c">
   <!ENTITY php-size          "11 MB">
-  <!ENTITY php-buildsize     "577 MB (add 5 MB for tests, add 112 MB for documentation)">
-  <!ENTITY php-time          "1.2 SBU (with parallelism=4; add 2.7 SBU for tests)">
+  <!ENTITY php-buildsize     "789 MB (add 5 MB for tests, add 112 MB for documentation)">
+  <!ENTITY php-time          "1.9 SBU (with parallelism=4; add 2.8 SBU for tests)">
 ]>
 
@@ -100,4 +100,5 @@
       <xref linkend="pcre"/>,
       <xref linkend="pth"/>,
+      <ulink url="https://wiki.ubuntu.com/AppArmor">AppArmor</ulink>,
       <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
       <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
@@ -117,5 +118,5 @@
       <!--<ulink url="http://www.fastio.com/">ClibPDF</ulink>, - site asks for username/password-->
       <ulink url="http://www.adobe.com/devnet/acrobat/fdftoolkit.html">FDF Toolkit</ulink>,
-      <ulink url="https://bitbucket.org/libgd/gd-libgd/downloads">GD</ulink>, and
+      <ulink url="https://github.com/libgd/libgd">GD</ulink>, and
       <ulink url="http://fossies.org/linux/misc/old/t1lib-5.1.2.tar.gz/">t1lib</ulink>
     </para>
@@ -128,5 +129,5 @@
       <ulink url="https://www.hyperwave.com/en/">Hyperwave</ulink>,
       <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
-      <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>, and
+      <ulink url="http://download.roxen.com/6.1/">Roxen WebServer</ulink>, and
       <ulink url="https://wddxnet.codeplex.com/">WDDX</ulink>
     </para>
@@ -135,5 +136,7 @@
     <para role="optional">
       <xref linkend="db"/> (Note that PHP does not officially support versions
- above 5.3),
+      above 5.3),
+      <xref linkend="libiodbc"/>,
+      <xref linkend="lmdb"/>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openldap"/>,
@@ -147,4 +150,5 @@
       <ulink url="http://www.empress.com/">Empress</ulink>,
       <ulink url="http://www.frontbase.com/cgi-bin/WebObjects/FBWebSite">FrontBase</ulink>,
+      <ulink url="https://www.ibm.com/analytics/us/en/db2/">IBM DB2</ulink>,
       <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
       <ulink url="http://www.monetra.com/">Monetra</ulink>, and
@@ -340,10 +344,10 @@
   <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
@@ -611,5 +615,5 @@
 
         <seg>dba.{so,a} and opcache.{so,a} in
-       /usr/lib/php/extensions/no-debug-non-zts-20170718</seg>
+       /usr/lib/php/extensions/no-debug-non-zts-20180731</seg>
 
         <seg>/etc/php-fpm.d, /usr/{include,lib,share}/php and
@@ -641,5 +645,5 @@
           <para>
             is the PHP Extension and Application Repository (PEAR) package
-            manager.
+            manager. This isn't installed by default.
           </para>
           <indexterm zone="php pear">
