Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/genlib/libgsf.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -7,5 +7,5 @@
   <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
   <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
-  <!ENTITY libgsf-md5sum        "a3e9622b31ab88422d519da72e6f0fa4">
+  <!ENTITY libgsf-md5sum        "fcd6a9c2b1d939ca57823eb9c0bfa5cd">
   <!ENTITY libgsf-size          "596 KB">
   <!ENTITY libgsf-buildsize     "18 MB (with tests)">
Index: general/genlib/libinput.xml
===================================================================
--- general/genlib/libinput.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/genlib/libinput.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -5,12 +5,10 @@
   %general-entities;
 
-  <!ENTITY libinput-version "1.1.7">
-
   <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "a501715a6135ac1f772bb5f3e3183481">
-  <!ENTITY libinput-size          "808 KB">
-  <!ENTITY libinput-buildsize     "32 MB">
-  <!ENTITY libinput-time          "0.2 SBU">
+  <!ENTITY libinput-md5sum        "3dda3e6dd7d0e865896dfe67f4fa0346">
+  <!ENTITY libinput-size          "792 KB">
+  <!ENTITY libinput-buildsize     "14 MB">
+  <!ENTITY libinput-time          "0.1 SBU">
 ]>
 
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/genlib/nspr.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -8,5 +8,5 @@
 <!--  <!ENTITY nspr-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">-->
   <!ENTITY nspr-download-ftp " ">
-  <!ENTITY nspr-md5sum        "4f24b2fb88ca03b5d6d6931d6a67ef9a">
+  <!ENTITY nspr-md5sum        "0de760c1e00a92e180e611cf06ce9589">
   <!ENTITY nspr-size          "1.1 MB">
   <!ENTITY nspr-buildsize     "12 MB">
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/genlib/wayland.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -7,7 +7,7 @@
   <!ENTITY wayland-download-http "http://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz">
   <!ENTITY wayland-download-ftp  " ">
-  <!ENTITY wayland-md5sum        "5e141b3f2a7005d6c89d6f233c87c317">
-  <!ENTITY wayland-size          "344 KB">
-  <!ENTITY wayland-buildsize     "10.1 MB">
+  <!ENTITY wayland-md5sum        "e7751c38807c231afaba9d6b68f2a2b7">
+  <!ENTITY wayland-size          "361 KB">
+  <!ENTITY wayland-buildsize     "7.4 MB (plus 3.7 MB if tests are run)">
   <!ENTITY wayland-time          "0.1 SBU">
 ]>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/genutils/imagemagick.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "0">
+  <!ENTITY imagemagick-patch-version "5">
 
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "87939f4f82d6f24a28d3106a58d523d8">
+  <!ENTITY imagemagick-md5sum        "af1c85b8b8f817e919f9ca4408d86782">
   <!ENTITY imagemagick-size          "8.4 MB">
-  <!ENTITY imagemagick-buildsize     "192 MB, with typical dependencies (226 MB with the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time          "2.2 SBU - typical build (additional 3.5 SBU to run the test suite and 3.4 SBU to run the validation suite)">
+  <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 MB with the test suite, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 SBU to run the test suite and 1.4 SBU to run the validation suite)">
 ]>
 
@@ -27,5 +27,10 @@
      Also, please look over the output from the configure command for any
      additional dependencies that need to be listed, as ImageMagick is
-     constantly adding additional features and dependencies. -->
+     constantly adding additional features and dependencies.
+
+     For those of us who touch this infrequently:
+     DPS/dpsXclient is from apple so not relevant to linux builds
+     GVC is part of Graphviz and documented in the explanations
+     LQR is Liquid Rescale  -->
 
 <sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
@@ -53,5 +58,5 @@
     </para>
 
-    &lfs78_checked;
+<!--&lfs78_checked;-->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -155,4 +160,5 @@
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
+      <ulink url="https://github.com/HOST-Oman/libraqm/">libraqm</ulink>,
       <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
       <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
@@ -228,6 +234,8 @@
       "validation suite" validate.log</command>. Note that the EPS, PS, and PDF
       tests require a working <application>Ghostscript</application>. One test
-      needs <quote>Helvetica</quote> from <quote>Ghostscript Standard
-      Fonts</quote>, which are optionally installed in <xref linkend="gs"/>.
+      in 'make check' needs <quote>Helvetica</quote> from <quote>Ghostscript
+      Standard Fonts</quote>, which are optionally installed in
+      <xref linkend="gs"/> - that test, and one other, might fail, but all the
+      validation can still pass.
     </para>
 
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/graphlib/freetype2.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -138,5 +138,5 @@
     -i modules.cfg              &amp;&amp;
 
-sed -e 's:.*\(#.*SUBPIXEL.*\) .*:\1:' \
+sed -r -e 's:.*(#.*SUBPIXEL.*) .*:\1:' \
     -i include/freetype/config/ftoption.h  &amp;&amp;
 
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/graphlib/poppler.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -7,8 +7,8 @@
   <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "2fec3b2401a1722418b1f5bf64cd00cd">
-  <!ENTITY poppler-size               "1.6 MB (additional 9 MB for the test suite)">
-  <!ENTITY poppler-buildsize          "65 MB (with Qt4 and Qt5 libraries, and tests)">
-  <!ENTITY poppler-time               "1.6 SBU (with Qt4 and Qt5 libraries, and tests)">
+  <!ENTITY poppler-md5sum             "849a8bd6af5794efb961b70418414e5a">
+  <!ENTITY poppler-size               "1.6 MB">
+  <!ENTITY poppler-buildsize          "42 MB (with Qt4 and Qt5 libraries)">
+  <!ENTITY poppler-time               "0.7 SBU (with Qt4 and Qt5 libraries)">
 
 
@@ -45,5 +45,5 @@
     </para>
 
-    &lfs78_checked;
+<!--&lfs78_checked;-->
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -158,4 +158,5 @@
     <title>Installation of Poppler</title>
 
+<!-- as of 0.41.0, nothing to be done for check
     <para>
       In order to optionally run the test suite, an additional download using
@@ -165,4 +166,5 @@
 <screen><userinput>rm -rf testfiles &amp;&amp;
 git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen>
+-->
 
     <note>
@@ -188,7 +190,7 @@
 make</userinput></screen>
 
-    <para>
+<!--<para>
       To test the results, issue: <command>LC_ALL=en_US.UTF-8 make check</command>.
-    </para>
+    </para>-->
 
     <para>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/prog/git.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -9,8 +9,9 @@
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "0214e04f7041f835c5c38f2b78eccced">
-  <!ENTITY git-size          "3.7 MB">
-  <!ENTITY git-buildsize     "349 MB (add 28 MB for building documentation)">
-  <!ENTITY git-time          "0.7 SBU (add 12 SBU for tests and 2.4 SBU for building documentation)">
+  <!ENTITY git-md5sum        "eece7b1e87983271621a0cb6aab37a25">
+  <!ENTITY git-size          "3.8 MB">
+  <!ENTITY git-buildsize     "364 MB (including the pre-built documentation)">
+  <!ENTITY git-time          "0.8 SBU (add 2.4 SBU for building documentation)">
+  <!-- tests used to take 12 SBU, grep-2.23 causes them to fail after 4.0 SBU -->
 ]>
 
@@ -170,6 +171,9 @@
 
     <para>
-      The test suite can be run in parallel mode. To run the test suite, issue:
-      <command>make test</command>.
+<!--  The test suite can be run in parallel mode. To run the test suite, issue: -->
+      The test suite fails early, in 'blame respects encoding', because grep-2.23
+      treats data in the locale tests as binary.  To run the tests up to that
+      point issue:
+      <command>make test</command>. -->
     </para>
 
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/prog/lua.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -120,38 +120,8 @@
     <title>Installation of Lua</title>
 
-    <para>
-      Install <application>Lua</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
-
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
-
-make linux</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <quote>This will run the interpreter and print its version.</quote>.
-      More comprehensive tests can be performed if you downloaded the "Test
-      suite" tarball. Those tests need to be executed after the package is
-      installed, thus we defer to describe then below.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
-     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
-
-mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
-cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;</userinput></screen>
-
     <para>Some packages check for the <application>pkg-config</application> file
-    for <application>Lua</application>. As the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/lua.pc &lt;&lt; "EOF"
+    for <application>Lua</application>, wich is created with:</para>
+
+<screen role="root"><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
 <literal>V=5.3
 R=&lua-version;
@@ -177,4 +147,35 @@
 
     <para>
+      Install <application>Lua</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
+
+sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
+
+make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+      <quote>This will run the interpreter and print its version.</quote>.
+      More comprehensive tests can be performed if you downloaded the "Test
+      suite" tarball. Those tests need to be executed after the package is
+      installed, thus we defer to describe then below.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
+     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
+
+mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
+cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &amp;&amp;
+
+install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc</userinput></screen>
+
+    <para>
       We are going to describe only the "Basic tests". Untar the tarball and
       change to the
@@ -194,4 +195,10 @@
       <command>sed -i ... src/luaconf.h</command>: This command changes
       <application>Lua</application> search path to match the install paths.
+    </para>
+
+    <para>
+      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
+      environment variable includes compatibility layers with Lua 5.1 and 5.2
+      in the build.
     </para>
 
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/sysutils/sg3_utils.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -7,7 +7,7 @@
   <!ENTITY sg3_utils-download-http "http://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
   <!ENTITY sg3_utils-download-ftp  " ">
-  <!ENTITY sg3_utils-md5sum        "79c8e3c0b2e4bad7dcba3e1ab090f3b4">
-  <!ENTITY sg3_utils-size          "736 KB">
-  <!ENTITY sg3_utils-buildsize     "18 MB">
+  <!ENTITY sg3_utils-md5sum        "913ac2c9069d2ba44e05565a445810ab">
+  <!ENTITY sg3_utils-size          "752 KB">
+  <!ENTITY sg3_utils-buildsize     "23 MB">
   <!ENTITY sg3_utils-time          "0.2 SBU">
 ]>
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision a91856d1818be575497845e4ac1c193d94aa1a92)
+++ general/sysutils/usbutils.xml	(revision 9a3e4baa5e8d645f96924df05d71ae7dc0301b58)
@@ -149,5 +149,5 @@
     </para>
 
-<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
+<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/misc/usb.ids</userinput></screen>
 
     <para>
