Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision c3c67b5bc318e1b91be95b150fba25854c3e04e4)
+++ x/installing/x7app.xml	(revision ac38e9dcc56be5d8809db3492da7b3380a64b944)
@@ -5,15 +5,15 @@
   %general-entities;
 
-  <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
-  <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
+  <!ENTITY x7apps-download-http "&xorg-download-http;/app/">
+  <!ENTITY x7apps-download-ftp  "&xorg-download-ftp;/app/">
   <!ENTITY x7apps-size          "4.9 MB">
   <!ENTITY x7apps-buildsize     "51 MB">
   <!ENTITY x7apps-time          "1.9 SBU">
 
-  <!ENTITY bdftopcf-version                "1.0.4">
-  <!ENTITY bdftopcf-md5sum                 "96a648a332160a7482885800f7a506fa">
-
-  <!ENTITY iceauth-version                 "1.0.6">
-  <!ENTITY iceauth-md5sum                  "2527344acc60741a709f4858564c5ae6">
+  <!ENTITY bdftopcf-version                "1.0.5">
+  <!ENTITY bdftopcf-md5sum                 "53a48e1fdfec29ab2e89f86d4b7ca902">
+
+  <!ENTITY iceauth-version                 "1.0.7">
+  <!ENTITY iceauth-md5sum                  "25dab02f8e40d5b71ce29a07dc901b8c">
 
   <!ENTITY luit-version                    "1.1.1">
@@ -23,18 +23,18 @@
   <!ENTITY mkfontdir-md5sum                "18c429148c96c2079edda922a2b67632">
 
-  <!ENTITY mkfontscale-version             "1.1.1">
-  <!ENTITY mkfontscale-md5sum              "03de3f15db678e277f5ef9c013aca1ad">
-
-  <!ENTITY sessreg-version                 "1.0.8">
-  <!ENTITY sessreg-md5sum                  "f548e389ff68424947b87785df6a321b">
-
-  <!ENTITY setxkbmap-version               "1.3.0">
-  <!ENTITY setxkbmap-md5sum                "1001771344608e120e943a396317c33a">
-
-  <!ENTITY smproxy-version                 "1.0.5">
-  <!ENTITY smproxy-md5sum                  "edce41bd7562dcdfb813e05dbeede8ac">
-
-  <!ENTITY x11perf-version                 "1.5.4">
-  <!ENTITY x11perf-md5sum                  "5c3c7431a38775caaea6051312a49bc9">
+  <!ENTITY mkfontscale-version             "1.1.2">
+  <!ENTITY mkfontscale-md5sum              "9bdd6ebfa62b1bbd474906ac86a40fd8">
+
+  <!ENTITY sessreg-version                 "1.1.0">
+  <!ENTITY sessreg-md5sum                  "e238c89dabc566e1835e1ecb61b605b9">
+
+  <!ENTITY setxkbmap-version               "1.3.1">
+  <!ENTITY setxkbmap-md5sum                "2c47a1b8e268df73963c4eb2316b1a89">
+
+  <!ENTITY smproxy-version                 "1.0.6">
+  <!ENTITY smproxy-md5sum                  "3a93d9f0859de5d8b65a68a125d48f6a">
+
+  <!ENTITY x11perf-version                 "1.6.0">
+  <!ENTITY x11perf-md5sum                  "f0b24e4d8beb622a419e8431e1c03cd7">
 
   <!ENTITY xauth-version                   "1.0.9">
@@ -44,33 +44,33 @@
   <!ENTITY xbacklight-md5sum               "0066f23f69ca3ef62dcaeb74a87fdc48">
 
-  <!ENTITY xcmsdb-version                  "1.0.4">
-  <!ENTITY xcmsdb-md5sum                   "5812be48cbbec1068e7b718eec801766">
+  <!ENTITY xcmsdb-version                  "1.0.5">
+  <!ENTITY xcmsdb-md5sum                   "9956d751ea3ae4538c3ebd07f70736a0">
 
   <!ENTITY xcursorgen-version              "1.0.6">
   <!ENTITY xcursorgen-md5sum               "b58a87e6cd7145c70346adad551dba48">
 
-  <!ENTITY xdpyinfo-version                "1.3.1">
-  <!ENTITY xdpyinfo-md5sum                 "cacc0733f16e4f2a97a5c430fcc4420e">
-
-  <!ENTITY xdriinfo-version                "1.0.4">
-  <!ENTITY xdriinfo-md5sum                 "3d3cad4d754e10e325438193433d59fd">
-
-  <!ENTITY xev-version                     "1.2.1">
-  <!ENTITY xev-md5sum                      "5b0a0b6f589441d546da21739fa75634">
-
-  <!ENTITY xgamma-version                  "1.0.5">
-  <!ENTITY xgamma-md5sum                   "c06067f572bc4a5298f324f27340da95">
-
-  <!ENTITY xhost-version                   "1.0.6">
-  <!ENTITY xhost-md5sum                    "f1669af1fe0554e876f03319c678e79d">
+  <!ENTITY xdpyinfo-version                "1.3.2">
+  <!ENTITY xdpyinfo-md5sum                 "8809037bd48599af55dad81c508b6b39">
+
+  <!ENTITY xdriinfo-version                "1.0.5">
+  <!ENTITY xdriinfo-md5sum                 "fceddaeb08e32e027d12a71490665866">
+
+  <!ENTITY xev-version                     "1.2.2">
+  <!ENTITY xev-md5sum                      "249bdde90f01c0d861af52dc8fec379e">
+
+  <!ENTITY xgamma-version                  "1.0.6">
+  <!ENTITY xgamma-md5sum                   "90b4305157c2b966d5180e2ee61262be">
+
+  <!ENTITY xhost-version                   "1.0.7">
+  <!ENTITY xhost-md5sum                    "f5d490738b148cb7f2fe760f40f92516">
 
   <!ENTITY xinput-version                  "1.6.1">
   <!ENTITY xinput-md5sum                   "305980ac78a6954e306a14d80a54c441">
 
-  <!ENTITY xkbcomp-version                 "1.2.4">
-  <!ENTITY xkbcomp-md5sum                  "a0fc1ac3fc4fe479ade09674347c5aa0">
-
-  <!ENTITY xkbevd-version                  "1.1.3">
-  <!ENTITY xkbevd-md5sum                   "37ed71525c63a9acd42e7cde211dcc5b">
+  <!ENTITY xkbcomp-version                 "1.3.0">
+  <!ENTITY xkbcomp-md5sum                  "0012a8e3092cddf7f87b250f96bb38c5">
+
+  <!ENTITY xkbevd-version                  "1.1.4">
+  <!ENTITY xkbevd-md5sum                   "c747faf1f78f5a5962419f8bdd066501">
 
   <!ENTITY xkbutils-version                "1.0.4">
@@ -80,6 +80,6 @@
   <!ENTITY xkill-md5sum                    "0ae6bc2a8d3af68e9c76b1a6ca5f7a78">
 
-  <!ENTITY xlsatoms-version                "1.1.1">
-  <!ENTITY xlsatoms-md5sum                 "9d0e16d116d1c89e6b668c1b2672eb57">
+  <!ENTITY xlsatoms-version                "1.1.2">
+  <!ENTITY xlsatoms-md5sum                 "5dcb6e6c4b28c8d7aeb45257f5a72a7d">
 
   <!ENTITY xlsclients-version              "1.1.3">
@@ -89,6 +89,6 @@
   <!ENTITY xmessage-md5sum                 "2dd5ae46fa18abc9331bc26250a25005">
 
-  <!ENTITY xmodmap-version                 "1.0.8">
-  <!ENTITY xmodmap-md5sum                  "5511da3361eea4eaa21427652c559e1c">
+  <!ENTITY xmodmap-version                 "1.0.9">
+  <!ENTITY xmodmap-md5sum                  "723f02d3a5f98450554556205f0a9497">
 
   <!ENTITY xpr-version                     "1.0.4">
@@ -113,6 +113,6 @@
   <!ENTITY xsetroot-md5sum                 "7211b31ec70631829ebae9460999aa0b">
 
-  <!ENTITY xvinfo-version                  "1.1.2">
-  <!ENTITY xvinfo-md5sum                   "1fbd65e81323a8c0a4b5e24db0058405">
+  <!ENTITY xvinfo-version                  "1.1.3">
+  <!ENTITY xvinfo-md5sum                   "558360176b718dee3c39bc0648c0d10c">
 
   <!ENTITY xwd-version                     "1.0.6">
@@ -148,5 +148,5 @@
     implementations.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -240,5 +240,5 @@
 cd app &amp;&amp;
 grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
-    -B http://xorg.freedesktop.org/releases/individual/app/ &amp;&amp;
+    -B &xorg-download-http;/app/ &amp;&amp;
 md5sum -c ../app-&xorg-version;.md5</userinput></screen>
 
@@ -268,7 +268,10 @@
       line3="#  define _XOPEN_SOURCE 600"
       line4="#endif"
- 
+
       sed -i -e "s@#ifdef HAVE_CONFIG_H@$line1\n$line2\n$line3\n$line4\n\n&amp;@" sys.c
       unset line1 line2 line3 line4
+    ;;
+    sessreg-* )
+      sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i man/Makefile.in
     ;;
   esac
@@ -283,4 +286,18 @@
 
 <screen><userinput>exit</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i
+      man/Makefile.in</parameter>: with <application>gcc-5</application> the
+      behaviour of <command>cpp</command> was changed to emit line numbers.
+      That results in unterminated <application>sed</application> commands in
+      <filename>filenames.sed</filename>. Adding <literal>-P</literal> restores
+      the old behaviour.
+    </para>
 
   </sect2>
