Index: general/prog/gcc-ada.xml
===================================================================
--- general/prog/gcc-ada.xml	(revision a81583488d2105d66d3bfbfb96afe4e0648d37e8)
+++ general/prog/gcc-ada.xml	(revision 7ff0948bb04b838f538d1996f93aa15a2930f745)
@@ -5,15 +5,15 @@
   %general-entities;
 
-  <!ENTITY gcc-download-http     "https://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
+  <!ENTITY gcc-download-http     "http://ftpmirror.gnu.org/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
   <!ENTITY gcc-download-ftp      "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-  <!ENTITY gcc-md5sum            "d5525b1127d07d215960e6051c5da35e">
+  <!ENTITY gcc-md5sum            "a51bcfeb3da7dd4c623e27207ed43467">
   <!ENTITY gcc-size              "91 MB">
-  <!ENTITY gcc-ada-buildsize     "6.4 GB (0.7 GB added if GNAT install dir is not removed)">
-  <!ENTITY gcc-ada-time          "125 SBU (including 73 SBU for tests)">
+  <!ENTITY gcc-ada-buildsize     "6.0 GB (0.2 GB added if GNAT install dir is not removed)">
+  <!ENTITY gcc-ada-time          "119 SBU (including 68 SBU for tests)">
 
   <!ENTITY gnat-download-http    "https://libre.adacore.com/download/">
-  <!ENTITY gnat-64-download-http "http://mirrors.cdn.adacore.com/art/7427735035ecc98968ebfcee17494161b0de28ef">
-  <!ENTITY gnat-64-md5sum        "c0863ed75109b5aa737becfd5a6ec038">
-  <!ENTITY gnat-64-size          "225 MB">
+  <!ENTITY gnat-64-download-http "http://mirrors.cdn.adacore.com/art/9ed9164f59a40cc295307a85bebd6c38d5da84ba">
+  <!ENTITY gnat-64-md5sum        "1ab69af79f981b1321f6e989403f5e7d">
+  <!ENTITY gnat-64-size          "308 MB">
   <!ENTITY gnat-32-download-http "http://mirrors.cdn.adacore.com/art/3fc05fc61cbc7ab4f291ed19ea4cb269fffd17bd">
   <!ENTITY gnat-32-md5sum        "69423c7ad8d9759377d4fff71a78992d">
@@ -118,5 +118,6 @@
         temporarily to satisfy the circular dependency. You may point your
         browser to the <ulink url="&gnat-download-http;">AdaCore download
-        page</ulink>, choose your platform and 2014, then select the file
+        page</ulink>, choose your platform and 2015 (64-bit machines) or
+        2014 (32-bit machines), then select the file
         to download. Alternatively, direct links to the 64 bit and 32 bit
         linux versions are given below.
@@ -155,10 +156,10 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           Required patch:
           <ulink url="&patch-root;/gcc-&gcc-version;-upstream_fixes-1.patch"/>
         </para>
-      </listitem>
+      </listitem> -->
     </itemizedlist>
 
@@ -228,10 +229,4 @@
   <sect2 role="installation">
     <title>Installation of GCC Ada</title>
-
-    <para>
-      As in LFS, fix some problems identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>
@@ -506,5 +501,5 @@
           <para>
             is the <application>Ada</application> compiler, which performs
-            compilaton, binding and linking.
+            compilation, binding and linking.
           </para>
           <indexterm zone="gcc-ada gnatmake">
Index: general/prog/gcc-java.xml
===================================================================
--- general/prog/gcc-java.xml	(revision a81583488d2105d66d3bfbfb96afe4e0648d37e8)
+++ general/prog/gcc-java.xml	(revision 7ff0948bb04b838f538d1996f93aa15a2930f745)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gcc-java-download-http  "https://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
+  <!ENTITY gcc-java-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
   <!ENTITY gcc-java-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-  <!ENTITY gcc-java-md5sum         "d5525b1127d07d215960e6051c5da35e">
+  <!ENTITY gcc-java-md5sum         "a51bcfeb3da7dd4c623e27207ed43467">
   <!ENTITY gcc-java-size           "91 MB">
-  <!ENTITY gcc-java-buildsize      "4.1 GB">
-  <!ENTITY gcc-java-time           "78 SBU (including 65 SBU for tests)">
+  <!ENTITY gcc-java-buildsize      "3.3 GB">
+  <!ENTITY gcc-java-time           "80 SBU (including 67 SBU for tests)">
 
   <!ENTITY ecj-download-ftp    "ftp://sourceware.org/pub/java/ecj-latest.jar">
@@ -104,10 +104,10 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           Required patch:
           <ulink url="&patch-root;/gcc-&gcc-version;-upstream_fixes-1.patch"/>
         </para>
-      </listitem>
+      </listitem> -->
     </itemizedlist>
 
@@ -149,10 +149,4 @@
       the <command>./configure</command> options below.
     </para>
-
-    <para>
-      As in LFS, fix some problems identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-upstream_fixes-1.patch</userinput></screen>
 
     <para>
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision a81583488d2105d66d3bfbfb96afe4e0648d37e8)
+++ general/prog/gcc.xml	(revision 7ff0948bb04b838f538d1996f93aa15a2930f745)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gcc-download-http  "https://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
+  <!ENTITY gcc-download-http  "http://ftpmirror.gnu.org/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
   <!ENTITY gcc-download-ftp   "ftp://ftp.gnu.org/gnu/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-  <!ENTITY gcc-md5sum         "d5525b1127d07d215960e6051c5da35e">
+  <!ENTITY gcc-md5sum         "a51bcfeb3da7dd4c623e27207ed43467">
   <!ENTITY gcc-size           "91 MB">
-  <!ENTITY gcc-buildsize      "6.7 GB">
-  <!ENTITY gcc-time           "130 SBU (including 80 SBU for tests)">
+  <!ENTITY gcc-buildsize      "5.9 GB">
+  <!ENTITY gcc-time           "132 SBU (including 82 SBU for tests)">
 ]>
 
@@ -106,5 +106,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+<!--    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -115,5 +115,5 @@
       </listitem>
     </itemizedlist>
-
+-->
 
     <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
@@ -165,11 +165,4 @@
 
     <para>
-      As in LFS, fix some problems identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gcc-5.1.0-upstream_fixes-1.patch</userinput></screen>
-
-
-    <para>
       Install <application>GCC</application> by running the following commands:
     </para>
@@ -321,13 +314,14 @@
       <seglistitem>
         <seg>
-          gccgo and gfortran, hard-linked to architecture specific names
+          gccgo, go, gofmt, and gfortran, hard-linked to architecture specific 
+          names
         </seg>
         <seg>
           libgfortran.{so,a},
-          libgo.{so,a}, libgobegin.a, libnetgo.a, libobjc.{so,a}, and numerous
-          other run-time libraries and executables in <filename class="directory">
-          /usr/lib/gcc</filename>, <filename class="directory">
-          /usr/libexec/gcc</filename>, and <filename class="directory">
-          /usr/lib/go</filename>
+          libgo.{so,a}, libgobegin.a, libgolibbegin.a, libnetgo.a, 
+          libobjc.{so,a}, and numerous other run-time libraries and executables
+          in <filename class="directory">/usr/lib/gcc</filename>, 
+          <filename class="directory">/usr/libexec/gcc</filename>, and 
+          <filename class="directory">/usr/lib/go</filename>
         </seg>
         <seg>
@@ -351,4 +345,28 @@
           <indexterm zone="gcc gccgo">
             <primary sortas="b-gccgo">gccgo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="go">
+        <term><command>go</command></term>
+        <listitem>
+          <para>
+            is a tool for managing <application>Go</application> source code.
+          </para>
+          <indexterm zone="gcc go">
+            <primary sortas="b-go">go</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gofmt">
+        <term><command>gofmt</command></term>
+        <listitem>
+          <para>
+            is a tool for formatting <application>Go</application> source code.
+          </para>
+          <indexterm zone="gcc gofmt">
+            <primary sortas="b-gofmt">gofmt</primary>
           </indexterm>
         </listitem>
Index: general/prog/php-systemd.xml
===================================================================
--- general/prog/php-systemd.xml	(revision a81583488d2105d66d3bfbfb96afe4e0648d37e8)
+++ general/prog/php-systemd.xml	(revision 7ff0948bb04b838f538d1996f93aa15a2930f745)
@@ -7,8 +7,8 @@
   <!ENTITY php-download-http "http://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.xz">
-  <!ENTITY php-md5sum        "4631ef265253d2f496b3574d297f26ed">
-  <!ENTITY php-size          "11 MB">
-  <!ENTITY php-buildsize     "488 MB (additional 1 MB to run the test suite)">
-  <!ENTITY php-time          "3.2 SBU (additional 1.9 SBU to run the test suite)">
+  <!ENTITY php-md5sum        "f2cc602602eb2b121779f2c4b8bacaba">
+  <!ENTITY php-size          "12 MB">
+  <!ENTITY php-buildsize     "394 MB (with tests)">
+  <!ENTITY php-time          "5.6 SBU (with tests)">
 ]>
 
@@ -93,30 +93,30 @@
     <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
     <para role="optional">
+      <xref linkend="aspell"/>,
+      <xref linkend="enchant"/>,
       <xref linkend="libxslt"/>,
       <xref linkend="pcre"/>,
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
       <xref linkend="pth"/>,
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> command)
+      <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
+      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
       <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
       <ulink url="http://re2c.org/">re2c</ulink>,
       <ulink url="http://xmlrpc-epi.sourceforge.net/main.php?t=php_about">XMLRPC-EPI</ulink>, and
-      <ulink url="http://dmalloc.com/">Dmalloc</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
     <para role="optional">
+      <xref linkend="freetype2"/>,
+      <xref linkend="libexif"/>,
       <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="freetype2"/>,
       <xref linkend="x-window-system"/>,
       <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
-      <ulink url="https://bitbucket.org/libgd/gd-libgd/downloads">GD</ulink>,
-      <ulink url="http://fossies.org/linux/misc/t1lib-5.1.2.tar.gz/">t1lib</ulink>, and
-      <ulink url="http://www.adobe.com/devnet/acrobat/fdftoolkit.html">FDF Toolkit</ulink>
+      <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="http://fossies.org/linux/misc/t1lib-5.1.2.tar.gz/">t1lib</ulink>
     </para>
 
@@ -125,8 +125,8 @@
       <xref linkend="curl"/>,
       <xref linkend="html-tidy"/>,
+      <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>,
+      <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
       <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
-      <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
-      <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>,
-      <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>, and
+      <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>, and
       <ulink url="https://wddxnet.codeplex.com/">WDDX</ulink>
     </para>
@@ -134,19 +134,19 @@
     <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
     <para role="optional">
-      <xref linkend="openldap"/>,
       <xref linkend="db"/>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="openldap"/>,
       <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>,
       <xref linkend="unixodbc"/>,
-      <xref linkend="sqlite"/>,
-      <ulink url="http://sourceforge.net/projects/qdbm">QDBM</ulink>,
+      <ulink url="http://www.softwareag.com/">Abadas</ulink>,
+      <ulink url="http://www.birdstep.com/">Birdstep</ulink>,
       <ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
+      <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
+      <ulink url="http://www.empress.com/">Empress</ulink>,
+      <ulink url="http://www.frontbase.com/">FrontBase</ulink>,
       <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
-      <ulink url="http://www.empress.com/">Empress</ulink>,
-      <ulink url="http://www.birdstep.com/">Birdstep</ulink>,
-      <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
-      <ulink url="http://www.softwareag.com/">Adabas</ulink>,
-      <ulink url="http://www.frontbase.com/">FrontBase</ulink>, and
-      <ulink url="http://www.mainstreetsoftworks.com/">Monetra</ulink>
+      <ulink url="http://www.monetra.com/">Monetra</ulink>, and
+      <ulink url="http://sourceforge.net/projects/qdbm">QDBM</ulink>
     </para>
 
@@ -160,7 +160,7 @@
     <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/>,
       <xref linkend="cyrus-sasl"/>,
       <xref linkend="mitkrb"/>,
+      <xref linkend="openssl"/>,
       <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink>, and
       <ulink url="http://mhash.sourceforge.net/">mhash</ulink>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision a81583488d2105d66d3bfbfb96afe4e0648d37e8)
+++ general/prog/ruby.xml	(revision 7ff0948bb04b838f538d1996f93aa15a2930f745)
@@ -10,8 +10,8 @@
   <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/2.2/ruby-&ruby-version;.tar.xz">
 -->
-  <!ENTITY ruby-md5sum        "dbce9b9d79d90f213ba8d448b0b6ed86">
+  <!ENTITY ruby-md5sum        "2a8bc1f46aba8938add70f742e8af1ff">
   <!ENTITY ruby-size          "10 MB">
-  <!ENTITY ruby-buildsize     "585 MB (additional 467 MB for C API docs)">
-  <!ENTITY ruby-time          "2.3 SBU (additional 0.4 SBU for C API docs and 0.1 SBU for tests)">
+  <!ENTITY ruby-buildsize     "483 MB (Without CAPI Docs)">
+  <!ENTITY ruby-time          "3 SBU (with tests)">
 ]>
 
