Index: general/genlib/libinput.xml
===================================================================
--- general/genlib/libinput.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/genlib/libinput.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY libinput-version "1.2.4">
+  <!ENTITY libinput-version "1.3.0">
 
   <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "1cbaa34f04a336f2703906d564e0a37a">
-  <!ENTITY libinput-size          "840 KB">
-  <!ENTITY libinput-buildsize     "31 MB (with documentation)">
-  <!ENTITY libinput-time          "0.3 SBU (with documentation)">
+  <!ENTITY libinput-md5sum        "5f8bc2c746bfbc9454143f78e5b477a9">
+  <!ENTITY libinput-size          "860 KB">
+  <!ENTITY libinput-buildsize     "32 MB">
+  <!ENTITY libinput-time          "0.3 SBU">
 ]>
 
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/genlib/libksba.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -7,7 +7,7 @@
   <!ENTITY libksba-download-http " ">
   <!ENTITY libksba-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2">
-  <!ENTITY libksba-md5sum        "a5dd3c57fca254935f5cf8db26e39065">
+  <!ENTITY libksba-md5sum        "2bfc3d69053db7b6983b5627706033f4">
   <!ENTITY libksba-size          "608 KB">
-  <!ENTITY libksba-buildsize     "6.5 MB">
+  <!ENTITY libksba-buildsize     "9.1 MB">
   <!ENTITY libksba-time          "0.1 SBU">
 ]>
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/genlib/talloc.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -7,8 +7,8 @@
   <!ENTITY talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
   <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "707010c6ede5821fd34397f5d9ec6ab8">
+  <!ENTITY talloc-md5sum        "d6763d65d03d627816ae1d50c74576fe">
   <!ENTITY talloc-size          "428 KB">
-  <!ENTITY talloc-buildsize     "7.1 MB (additional 0.2 MB for tests)">
-  <!ENTITY talloc-time          "0.2 SBU (additional 0.2 SBU for tests)">
+  <!ENTITY talloc-buildsize     "6.9 MB (add 0.2 MB for tests)">
+  <!ENTITY talloc-time          "0.2 SBU (add 0.2 SBU for tests)">
 ]>
 
@@ -100,4 +100,5 @@
     <para>
       To check the results, issue <command>make check</command>.
+      The python tests fail due to missing files.
     </para>
 
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/genutils/imagemagick.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "5">
+  <!ENTITY imagemagick-patch-version "1">
 
   <!ENTITY imagemagick-download-http "https://www.imagemagick.org/pub/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "af1c85b8b8f817e919f9ca4408d86782">
-  <!ENTITY imagemagick-size          "8.4 MB">
-  <!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)">
+  <!ENTITY imagemagick-md5sum        "24673d00fcc8aa00313eeca6aa20fd3c">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies (add 31 MB for the test suite)">
+  <!ENTITY imagemagick-time          "2.9 SBU - typical build (add 1.8 SBU for the test suite and 1.5 SBU for the validation suite)">
 ]>
 
@@ -22,6 +22,11 @@
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+
+     [bdubbs] I do; at least the interal ones. I still only got 200 MB.
+
      Saved the "full" 450MB as a comment - feel free to update this iff you
      do build all dependencies, it's probably a lot bigger now.
+
+     [bdubbs] - Just removed it. I don't think it adds anything.
 
      Also, please look over the output from the configure command for any
@@ -158,4 +163,5 @@
       <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
       FlashPIX (libfpx)</ulink>,
+      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
@@ -211,5 +217,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>sed -i '/seems to be moved/ s/^/true #/' config/ltmain.sh &amp;&amp;
+
+./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-hdri     \
@@ -246,4 +254,8 @@
 
     <para>
+      <command>sed ...</command>: Removes a lot of invalid warnings.
+    </para>
+
+    <para>
       <parameter>--enable-hdri</parameter>: Enables building of a
       high dynamic range version of ImageMagick.
@@ -321,20 +333,21 @@
       <seglistitem>
         <seg>
-          animate, compare, composite, conjure, convert, display,
-          identify, import, Magick-config, Magick++-config, MagickCore-config,
-          MagickWand-config, mogrify, montage, stream, and Wand-config
+          magick, Magick++-config, MagickCore-config, and MagickWand-config.
+          (animate, compare, composite, conjure, convert, display,
+          identify, import, magick-script, mogrify, montage, and stream
+          are all symbolic links to magick)
         </seg>
         <seg>
-          libMagickCore-6.Q16HDRI.so,
-          libMagickWand-6.Q16HDRI.so and
-          libMagick++-6.Q16HDRI.so
+          libMagickCore-7.Q16HDRI.so,
+          libMagickWand-7.Q16HDRI.so and
+          libMagick++-7.Q16HDRI.so
         </seg>
         <seg>
-          /etc/ImageMagick-6,
-          /usr/include/ImageMagick-6,
+          /etc/ImageMagick-7,
+          /usr/include/ImageMagick-7,
           /usr/lib/ImageMagick-&imagemagick-version;,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname -m)-linux/{,auto}/Image/Magick,
           /usr/share/doc/ImageMagick-&imagemagick-version;, and
-          /usr/share/ImageMagick-6
+          /usr/share/ImageMagick-7
         </seg>
       </seglistitem>
@@ -427,5 +440,5 @@
 
     <varlistentry id="magick-config">
-      <term><command>Magick{,++,Core,Wand}-config</command></term>
+      <term><command>Magick{++,Core,Wand}-config</command></term>
       <listitem>
         <para>show information about the installed versions of the
@@ -464,14 +477,4 @@
         <indexterm zone="imagemagick stream">
           <primary sortas="b-stream">stream</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="wand-config">
-      <term><command>Wand-config</command></term>
-      <listitem>
-        <para>shows the options required to use the Wand library.</para>
-        <indexterm zone="imagemagick wand-config">
-          <primary sortas="b-Wand-config">Wand-config</primary>
         </indexterm>
       </listitem>
Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/prog/java.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -7,10 +7,10 @@
   <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "41f3f4f87573e92ca4ab0350f0ff0d2f">
+  <!ENTITY openjdk-bin-md5sum-x86      "ce3fc99377496a27d56ba0728bc7c776">
   <!ENTITY openjdk-bin-size-x86        "57 MB">
   <!ENTITY openjdk-bin-buildsize-x86   "166 MB">
 
   <!ENTITY openjdk-download-binary-x64 "&anduin-download;/OpenJDK-&openjdk-version;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "5a9b1b6d2e105eef2fbb1a965b17b3e9">
+  <!ENTITY openjdk-bin-md5sum-x64      "6f81546ce8284d692e77ba95b0c88068">
   <!ENTITY openjdk-bin-size-x64        "58 MB">
   <!ENTITY openjdk-bin-buildsize-x64   "169 MB">
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/prog/openjdk.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY ojdk-upd                  "77">
-  <!ENTITY ojdk-bd                   "b03">
+  <!ENTITY ojdk-upd                  "92">
+  <!ENTITY ojdk-bd                   "b14">
   <!ENTITY ojdk-tarball              "jdk8u&ojdk-upd;-&ojdk-bd;.tar.bz2">
   <!ENTITY ojdk-repo                 "http://hg.openjdk.java.net/jdk8u/jdk8u">
@@ -13,14 +13,14 @@
   <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
-  <!ENTITY ojdk-md5sum               "1954ffeb123a7f4552472ba9f9e38b0d">
-  <!ENTITY ojdk-size                 "398 KB">
-
-  <!ENTITY corba-md5sum              "eb7695323d3340214792114ad8e3bdce">
-  <!ENTITY hotspot-md5sum            "434e3dd4272d39b255ba9269838647b9">
-  <!ENTITY jaxp-md5sum               "fcc49430937eba2c64f8a53475edf99d">
-  <!ENTITY jaxws-md5sum              "f05a009f2e0fdb710c3405723ed42199">
-  <!ENTITY jdk-md5sum                "ffe70c01fc0fe513e329f170f4c922c1">
-  <!ENTITY langtools-md5sum          "a7e0ff3378d02e075284db7fe4a8dfbf">
-  <!ENTITY nashorn-md5sum            "1dee0e478002e80f87b235ae982edf6e">
+  <!ENTITY ojdk-md5sum               "226f9051e34b70fbff031ec9d959773d">
+  <!ENTITY ojdk-size                 "399 KB">
+
+  <!ENTITY corba-md5sum              "9619e84a600aaf81737f7ed71430d3aa">
+  <!ENTITY hotspot-md5sum            "21e8fdc20ab17e7399752ef74c8e03e2">
+  <!ENTITY jaxp-md5sum               "567189edafbe0aabaff2d75d86c05456">
+  <!ENTITY jaxws-md5sum              "3e7db7d843ebbcd5eb2ba0a9e7e275d7">
+  <!ENTITY jdk-md5sum                "b06f2e3504357820bb3dd29e19ccfc0d">
+  <!ENTITY langtools-md5sum          "afbe0e3a8c0e9e2beac5567e1084f3ee">
+  <!ENTITY nashorn-md5sum            "e3641526c2875b5d4d1414980769f6ea">
   <!ENTITY total-download-size       "63 MB">
 
@@ -32,6 +32,6 @@
   <!ENTITY icedtea-web-download      "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
 
-  <!ENTITY ojdk-buildsize           "3.7 GB (additional 547 MB for tests)">
-  <!ENTITY ojdk-time                "11 SBU (additional 108 SBU for tests)">
+  <!ENTITY ojdk-buildsize           "3.7 GB (additional 546 MB for tests)">
+  <!ENTITY ojdk-time                "12 SBU (additional 130 SBU for tests)">
 ]>
 
@@ -274,5 +274,7 @@
    --with-zlib=system         \
    --with-giflib=system       &amp;&amp;
-make DEBUG_BINARIES=true all  &amp;&amp;
+   --with-extra-cflags="-std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" \
+   --with-extra-cxxflags="-std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" &amp;&amp;
+make DEBUG_BINARIES=true SCTP_WERROR= all  &amp;&amp;
 find build/*/images/j2sdk-image -iname \*.diz -delete
 </userinput></screen>
@@ -484,4 +486,11 @@
 
     <para>
+      <parameter>--with-extra-cflags=... --with-extra-cxxflags=...</parameter>:
+      Works around some defects in the code brought to light by the GCC 6
+      compiler's more rigorous checking of the C/C++ constructs. Remove these
+      switches if compiling with GCC 5.
+    </para>
+
+    <para>
       <option>--with-jobs=N</option>: Allows setting the number
       of jobs for <command>make</command> equal to N. The default is the
@@ -501,6 +510,8 @@
 
     <para>
-      <command>make DEBUG_BINARIES=true all</command>: The build fails on
-      32 bit machines if DEBUG_BINARIES is not set to true.
+      <command>make DEBUG_BINARIES=true SCTP_WERROR=  all</command>: The build 
+      fails on 32 bit machines if DEBUG_BINARIES is not set to true. Unsetting
+      SCTP_WERROR is part of the workarounds needed to use GCC 6. You may omit
+      that part of the command if you are using GCC 5.
     </para>
 
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/prog/perl-modules.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -62,5 +62,5 @@
 
   <!ENTITY List-AllUtils-download-http "http://www.cpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
-  <!ENTITY List-AllUtils-md5sum "3e2dfeeef80c4e1952443c6b7d48583c">
+  <!ENTITY List-AllUtils-md5sum "a17e4239bd9bdfa272a104954678336a">
 
   <!ENTITY List-MoreUtils-download-http "http://www.cpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision 2e633b6fdc8b1b90b4d30f174c87347cf145551b)
+++ general/sysutils/mc.xml	(revision f080ae0e6dfc8e7799ebe9febac53658f20f3ff8)
@@ -7,7 +7,7 @@
   <!ENTITY mc-download-http "http://ftp.midnight-commander.org/mc-&mc-version;.tar.xz">
   <!ENTITY mc-download-ftp  "ftp://ftp.osuosl.org/pub/midnightcommander/mc-&mc-version;.tar.xz">
-  <!ENTITY mc-md5sum        "5df626a64592ccc5891afd3923edcdbf">
+  <!ENTITY mc-md5sum        "0b3965f3267a76d895ce8ab90df2402b">
   <!ENTITY mc-size          "2.3 MB">
-  <!ENTITY mc-buildsize     "169 MB (with tests)">
+  <!ENTITY mc-buildsize     "198 MB (with tests)">
   <!ENTITY mc-time          "1.1 SBU (with tests)">
 ]>
