Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

337 files changed, 899 insertions, 262 deletions

diff --git a/source/x/x11/arch.use.flags b/source/x/x11/arch.use.flags
index 11087c884..eb8fbb71f 100644
--- a/source/x/x11/arch.use.flags
+++ b/source/x/x11/arch.use.flags
@@ -2,6 +2,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
diff --git a/source/x/x11/build/libXfont b/source/x/x11/build/anthy
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/libXfont
+++ b/source/x/x11/build/anthy
diff --git a/source/x/x11/build/beforelight b/source/x/x11/build/beforelight
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/beforelight
+++ b/source/x/x11/build/beforelight
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/bigreqsproto b/source/x/x11/build/bigreqsproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/bigreqsproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/bitmap
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/bitmap
+++ b/source/x/x11/build/bitmap
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/compiz b/source/x/x11/build/compiz
index b8626c4cf..7ed6ff82d 100644
--- a/source/x/x11/build/compiz
+++ b/source/x/x11/build/compiz
@@ -1 +1 @@
-4
+5
diff --git a/source/x/x11/build/compositeproto b/source/x/x11/build/compositeproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/compositeproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/damageproto b/source/x/x11/build/damageproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/damageproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/dejavu-fonts-ttf b/source/x/x11/build/dejavu-fonts-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/dejavu-fonts-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/dmxproto b/source/x/x11/build/dmxproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/dmxproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/dri2proto b/source/x/x11/build/dri2proto
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/dri2proto
+++ b/source/x/x11/build/dri2proto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/dri3proto b/source/x/x11/build/dri3proto
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/dri3proto
+++ b/source/x/x11/build/dri3proto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/encodings b/source/x/x11/build/encodings
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/encodings
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/evieext b/source/x/x11/build/evieext
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/evieext
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fixesproto b/source/x/x11/build/fixesproto
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/fixesproto
+++ b/source/x/x11/build/fixesproto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/font-adobe-100dpi b/source/x/x11/build/font-adobe-100dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-adobe-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-75dpi b/source/x/x11/build/font-adobe-75dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-adobe-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-utopia-100dpi b/source/x/x11/build/font-adobe-utopia-100dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-adobe-utopia-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-utopia-75dpi b/source/x/x11/build/font-adobe-utopia-75dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-adobe-utopia-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-utopia-type1 b/source/x/x11/build/font-adobe-utopia-type1
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-adobe-utopia-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-alias b/source/x/x11/build/font-alias
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-alias
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-arabic-misc b/source/x/x11/build/font-arabic-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-arabic-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-100dpi b/source/x/x11/build/font-bh-100dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bh-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-75dpi b/source/x/x11/build/font-bh-75dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bh-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-lucidatypewriter-100dpi b/source/x/x11/build/font-bh-lucidatypewriter-100dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bh-lucidatypewriter-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-lucidatypewriter-75dpi b/source/x/x11/build/font-bh-lucidatypewriter-75dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bh-lucidatypewriter-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-ttf b/source/x/x11/build/font-bh-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bh-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-type1 b/source/x/x11/build/font-bh-type1
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bh-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-100dpi b/source/x/x11/build/font-bitstream-100dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-75dpi b/source/x/x11/build/font-bitstream-75dpi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-speedo b/source/x/x11/build/font-bitstream-speedo
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-speedo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-type1 b/source/x/x11/build/font-bitstream-type1
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-cronyx-cyrillic b/source/x/x11/build/font-cronyx-cyrillic
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-cronyx-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-cursor-misc b/source/x/x11/build/font-cursor-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-cursor-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-daewoo-misc b/source/x/x11/build/font-daewoo-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-daewoo-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-dec-misc b/source/x/x11/build/font-dec-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-dec-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-ibm-type1 b/source/x/x11/build/font-ibm-type1
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-ibm-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-isas-misc b/source/x/x11/build/font-isas-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-isas-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-jis-misc b/source/x/x11/build/font-jis-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-jis-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-micro-misc b/source/x/x11/build/font-micro-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-micro-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-cyrillic b/source/x/x11/build/font-misc-cyrillic
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-misc-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-ethiopic b/source/x/x11/build/font-misc-ethiopic
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-misc-ethiopic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-meltho b/source/x/x11/build/font-misc-meltho
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-misc-meltho
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-misc b/source/x/x11/build/font-misc-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-misc-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-mutt-misc b/source/x/x11/build/font-mutt-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-mutt-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-schumacher-misc b/source/x/x11/build/font-schumacher-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-schumacher-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-screen-cyrillic b/source/x/x11/build/font-screen-cyrillic
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-screen-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-sony-misc b/source/x/x11/build/font-sony-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-sony-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-sun-misc b/source/x/x11/build/font-sun-misc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-sun-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-util b/source/x/x11/build/font-util
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/font-util
+++ b/source/x/x11/build/font-util
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/font-winitzki-cyrillic b/source/x/x11/build/font-winitzki-cyrillic
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-winitzki-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-xfree86-type1 b/source/x/x11/build/font-xfree86-type1
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/font-xfree86-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fontcacheproto b/source/x/x11/build/fontcacheproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/fontcacheproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fontconfig b/source/x/x11/build/fontconfig
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/fontconfig
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fontsproto b/source/x/x11/build/fontsproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/fontsproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fonttosfnt b/source/x/x11/build/fonttosfnt
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/fonttosfnt
+++ b/source/x/x11/build/fonttosfnt
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/freeglut b/source/x/x11/build/freeglut
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/freeglut
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fslsfonts b/source/x/x11/build/fslsfonts
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/fslsfonts
+++ b/source/x/x11/build/fslsfonts
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/fstobdf b/source/x/x11/build/fstobdf
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/fstobdf
+++ b/source/x/x11/build/fstobdf
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/gccmakedep b/source/x/x11/build/gccmakedep
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/gccmakedep
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/glew b/source/x/x11/build/glew
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/glew
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/glproto b/source/x/x11/build/glproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/glproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/glu b/source/x/x11/build/glu
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/glu
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/imake b/source/x/x11/build/imake
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/imake
+++ b/source/x/x11/build/imake
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/inputproto b/source/x/x11/build/inputproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/inputproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/intel-gpu-tools b/source/x/x11/build/intel-gpu-tools
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/intel-gpu-tools
+++ b/source/x/x11/build/intel-gpu-tools
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/intel-vaapi-driver b/source/x/x11/build/intel-vaapi-driver
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/intel-vaapi-driver
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/kbproto b/source/x/x11/build/kbproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/kbproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libFS b/source/x/x11/build/libFS
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libFS
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libICE b/source/x/x11/build/libICE
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libICE
+++ b/source/x/x11/build/libICE
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libSM b/source/x/x11/build/libSM
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libSM
+++ b/source/x/x11/build/libSM
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXScrnSaver b/source/x/x11/build/libXScrnSaver
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXScrnSaver
+++ b/source/x/x11/build/libXScrnSaver
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXau b/source/x/x11/build/libXau
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXau
+++ b/source/x/x11/build/libXau
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXaw b/source/x/x11/build/libXaw
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXaw
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXaw3d b/source/x/x11/build/libXaw3d
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/libXaw3d
+++ b/source/x/x11/build/libXaw3d
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/libXaw3dXft b/source/x/x11/build/libXaw3dXft
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXaw3dXft
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXcm b/source/x/x11/build/libXcm
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXcm
+++ b/source/x/x11/build/libXcm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXcomposite b/source/x/x11/build/libXcomposite
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXcomposite
+++ b/source/x/x11/build/libXcomposite
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXdamage b/source/x/x11/build/libXdamage
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXdamage
+++ b/source/x/x11/build/libXdamage
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXdmcp b/source/x/x11/build/libXdmcp
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXdmcp
+++ b/source/x/x11/build/libXdmcp
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXevie b/source/x/x11/build/libXevie
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXevie
+++ b/source/x/x11/build/libXevie
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXext b/source/x/x11/build/libXext
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXext
+++ b/source/x/x11/build/libXext
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXfixes b/source/x/x11/build/libXfixes
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXfixes
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXfont2 b/source/x/x11/build/libXfont2
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXfont2
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXfontcache b/source/x/x11/build/libXfontcache
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXfontcache
+++ b/source/x/x11/build/libXfontcache
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXft b/source/x/x11/build/libXft
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/libXft
+++ b/source/x/x11/build/libXft
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/libXi b/source/x/x11/build/libXi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXinerama b/source/x/x11/build/libXinerama
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXinerama
+++ b/source/x/x11/build/libXinerama
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXmu b/source/x/x11/build/libXmu
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXmu
+++ b/source/x/x11/build/libXmu
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXp b/source/x/x11/build/libXp
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXp
+++ b/source/x/x11/build/libXp
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXpresent b/source/x/x11/build/libXpresent
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXpresent
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXrandr b/source/x/x11/build/libXrandr
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXrandr
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXrender b/source/x/x11/build/libXrender
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXrender
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXt b/source/x/x11/build/libXt
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libXt
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXxf86dga b/source/x/x11/build/libXxf86dga
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXxf86dga
+++ b/source/x/x11/build/libXxf86dga
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXxf86misc b/source/x/x11/build/libXxf86misc
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXxf86misc
+++ b/source/x/x11/build/libXxf86misc
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXxf86vm b/source/x/x11/build/libXxf86vm
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/libXxf86vm
+++ b/source/x/x11/build/libXxf86vm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libdmx b/source/x/x11/build/libdmx
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/libdmx
+++ b/source/x/x11/build/libdmx
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/libdrm b/source/x/x11/build/libdrm
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libdrm
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libepoxy b/source/x/x11/build/libepoxy
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libepoxy
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/liberation-fonts-ttf b/source/x/x11/build/liberation-fonts-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/liberation-fonts-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libevdev b/source/x/x11/build/libevdev
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libevdev
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libfontenc b/source/x/x11/build/libfontenc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libfontenc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libhangul b/source/x/x11/build/libhangul
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libhangul
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libinput b/source/x/x11/build/libinput
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libinput
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libpciaccess b/source/x/x11/build/libpciaccess
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libpciaccess
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libpthread-stubs b/source/x/x11/build/libpthread-stubs
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libpthread-stubs
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libva b/source/x/x11/build/libva
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libva
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libva-utils b/source/x/x11/build/libva-utils
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libva-utils
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libvdpau b/source/x/x11/build/libvdpau
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libvdpau
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libwacom b/source/x/x11/build/libwacom
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libwacom
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libxcb b/source/x/x11/build/libxcb
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libxcb
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libxkbfile b/source/x/x11/build/libxkbfile
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/libxkbfile
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/lndir
+++ b/source/x/x11/build/lndir
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/luit b/source/x/x11/build/luit
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/luit
+++ b/source/x/x11/build/luit
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/m17n-lib b/source/x/x11/build/m17n-lib
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/m17n-lib
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/makedepend
+++ b/source/x/x11/build/makedepend
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/mesa b/source/x/x11/build/mesa
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/mesa
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/mkcomposecache b/source/x/x11/build/mkcomposecache
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/mkcomposecache
+++ b/source/x/x11/build/mkcomposecache
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/mkfontdir b/source/x/x11/build/mkfontdir
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/mkfontdir
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/motif b/source/x/x11/build/motif
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/motif
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/mtdev b/source/x/x11/build/mtdev
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/mtdev
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/pixman b/source/x/x11/build/pixman
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/pixman
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/printproto b/source/x/x11/build/printproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/printproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/randrproto b/source/x/x11/build/randrproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/randrproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/recordproto b/source/x/x11/build/recordproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/recordproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/rendercheck
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/renderproto b/source/x/x11/build/renderproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/renderproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/resourceproto b/source/x/x11/build/resourceproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/resourceproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/rgb b/source/x/x11/build/rgb
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/rgb
+++ b/source/x/x11/build/rgb
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/sazanami-fonts-ttf b/source/x/x11/build/sazanami-fonts-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/sazanami-fonts-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim b/source/x/x11/build/scim
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-anthy b/source/x/x11/build/scim-anthy
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim-anthy
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-hangul b/source/x/x11/build/scim-hangul
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim-hangul
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-input-pad b/source/x/x11/build/scim-input-pad
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim-input-pad
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-m17n b/source/x/x11/build/scim-m17n
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim-m17n
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-pinyin b/source/x/x11/build/scim-pinyin
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim-pinyin
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-tables b/source/x/x11/build/scim-tables
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scim-tables
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scrnsaverproto b/source/x/x11/build/scrnsaverproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/scrnsaverproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/setxkbmap b/source/x/x11/build/setxkbmap
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/setxkbmap
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/showfont b/source/x/x11/build/showfont
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/showfont
+++ b/source/x/x11/build/showfont
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/sinhala_lklug-font-ttf b/source/x/x11/build/sinhala_lklug-font-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/sinhala_lklug-font-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/smproxy
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/tibmachuni-font-ttf b/source/x/x11/build/tibmachuni-font-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/tibmachuni-font-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/ttf-indic-fonts b/source/x/x11/build/ttf-indic-fonts
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/ttf-indic-fonts
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/ttf-tlwg b/source/x/x11/build/ttf-tlwg
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/ttf-tlwg
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/twm
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/urw-core35-fonts-otf b/source/x/x11/build/urw-core35-fonts-otf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/urw-core35-fonts-otf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/util-macros b/source/x/x11/build/util-macros
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/util-macros
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/videoproto b/source/x/x11/build/videoproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/videoproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/vulkan-sdk b/source/x/x11/build/vulkan-sdk
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/vulkan-sdk
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/wqy-zenhei-font-ttf b/source/x/x11/build/wqy-zenhei-font-ttf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/wqy-zenhei-font-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/x11-skel b/source/x/x11/build/x11-skel
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/x11-skel
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/x11perf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xbiff b/source/x/x11/build/xbiff
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xbiff
+++ b/source/x/x11/build/xbiff
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcalc b/source/x/x11/build/xcalc
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcalc
+++ b/source/x/x11/build/xcalc
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util b/source/x/x11/build/xcb-util
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcb-util
+++ b/source/x/x11/build/xcb-util
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-errors b/source/x/x11/build/xcb-util-errors
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xcb-util-errors
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcb-util-image b/source/x/x11/build/xcb-util-image
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcb-util-image
+++ b/source/x/x11/build/xcb-util-image
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-keysyms b/source/x/x11/build/xcb-util-keysyms
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcb-util-keysyms
+++ b/source/x/x11/build/xcb-util-keysyms
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-renderutil b/source/x/x11/build/xcb-util-renderutil
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcb-util-renderutil
+++ b/source/x/x11/build/xcb-util-renderutil
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-wm b/source/x/x11/build/xcb-util-wm
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcb-util-wm
+++ b/source/x/x11/build/xcb-util-wm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xclipboard b/source/x/x11/build/xclipboard
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xclipboard
+++ b/source/x/x11/build/xclipboard
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xclock b/source/x/x11/build/xclock
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xclock
+++ b/source/x/x11/build/xclock
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcm b/source/x/x11/build/xcm
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xcm
+++ b/source/x/x11/build/xcm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcmiscproto b/source/x/x11/build/xcmiscproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xcmiscproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcmsdb b/source/x/x11/build/xcmsdb
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xcmsdb
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xcompmgr
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcursor-themes b/source/x/x11/build/xcursor-themes
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xcursor-themes
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcursorgen b/source/x/x11/build/xcursorgen
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xcursorgen
+++ b/source/x/x11/build/xcursorgen
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xdbedizzy b/source/x/x11/build/xdbedizzy
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xdbedizzy
+++ b/source/x/x11/build/xdbedizzy
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xdg-user-dirs b/source/x/x11/build/xdg-user-dirs
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xdg-user-dirs
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xdg-utils b/source/x/x11/build/xdg-utils
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xdg-utils
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xditview
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index 1e8b31496..45a4fb75d 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-6
+8
diff --git a/source/x/x11/build/xdpyinfo b/source/x/x11/build/xdpyinfo
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xdpyinfo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xdriinfo b/source/x/x11/build/xdriinfo
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xdriinfo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xedit b/source/x/x11/build/xedit
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xedit
+++ b/source/x/x11/build/xedit
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xev b/source/x/x11/build/xev
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xev
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xextproto b/source/x/x11/build/xextproto
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xextproto
+++ b/source/x/x11/build/xextproto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-acecad
index ec635144f..48082f72f 100644
--- a/source/x/x11/build/xf86-input-acecad
+++ b/source/x/x11/build/xf86-input-acecad
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-input-aiptek b/source/x/x11/build/xf86-input-aiptek
index ec635144f..b4de39476 100644
--- a/source/x/x11/build/xf86-input-aiptek
+++ b/source/x/x11/build/xf86-input-aiptek
@@ -1 +1 @@
-9
+11
diff --git a/source/x/x11/build/xf86-input-evdev b/source/x/x11/build/xf86-input-evdev
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-input-evdev
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-input-joystick b/source/x/x11/build/xf86-input-joystick
index ec635144f..00750edc0 100644
--- a/source/x/x11/build/xf86-input-joystick
+++ b/source/x/x11/build/xf86-input-joystick
@@ -1 +1 @@
-9
+3
diff --git a/source/x/x11/build/xf86-input-keyboard b/source/x/x11/build/xf86-input-keyboard
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xf86-input-keyboard
+++ b/source/x/x11/build/xf86-input-keyboard
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-input-libinput b/source/x/x11/build/xf86-input-libinput
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-input-libinput
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-input-mouse b/source/x/x11/build/xf86-input-mouse
index b8626c4cf..00750edc0 100644
--- a/source/x/x11/build/xf86-input-mouse
+++ b/source/x/x11/build/xf86-input-mouse
@@ -1 +1 @@
-4
+3
diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-input-penmount
index ec635144f..48082f72f 100644
--- a/source/x/x11/build/xf86-input-penmount
+++ b/source/x/x11/build/xf86-input-penmount
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-input-synaptics b/source/x/x11/build/xf86-input-synaptics
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xf86-input-synaptics
+++ b/source/x/x11/build/xf86-input-synaptics
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse
index b8626c4cf..7f8f011eb 100644
--- a/source/x/x11/build/xf86-input-vmmouse
+++ b/source/x/x11/build/xf86-input-vmmouse
@@ -1 +1 @@
-4
+7
diff --git a/source/x/x11/build/xf86-input-void b/source/x/x11/build/xf86-input-void
index ec635144f..48082f72f 100644
--- a/source/x/x11/build/xf86-input-void
+++ b/source/x/x11/build/xf86-input-void
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-input-wacom
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-amdgpu b/source/x/x11/build/xf86-video-amdgpu
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-video-amdgpu
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm
index 45a4fb75d..b4de39476 100644
--- a/source/x/x11/build/xf86-video-apm
+++ b/source/x/x11/build/xf86-video-apm
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-ark b/source/x/x11/build/xf86-video-ark
index 45a4fb75d..b4de39476 100644
--- a/source/x/x11/build/xf86-video-ark
+++ b/source/x/x11/build/xf86-video-ark
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast
index 0cfbf0888..7ed6ff82d 100644
--- a/source/x/x11/build/xf86-video-ast
+++ b/source/x/x11/build/xf86-video-ast
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-ati b/source/x/x11/build/xf86-video-ati
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-video-ati
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-chips b/source/x/x11/build/xf86-video-chips
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xf86-video-chips
+++ b/source/x/x11/build/xf86-video-chips
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus
index 0cfbf0888..7ed6ff82d 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xf86-video-cirrus
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-dummy b/source/x/x11/build/xf86-video-dummy
index 7ed6ff82d..00750edc0 100644
--- a/source/x/x11/build/xf86-video-dummy
+++ b/source/x/x11/build/xf86-video-dummy
@@ -1 +1 @@
-5
+3
diff --git a/source/x/x11/build/xf86-video-geode b/source/x/x11/build/xf86-video-geode
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86-video-geode
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint
index 45a4fb75d..00750edc0 100644
--- a/source/x/x11/build/xf86-video-glint
+++ b/source/x/x11/build/xf86-video-glint
@@ -1 +1 @@
-8
+3
diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128
index 45a4fb75d..b4de39476 100644
--- a/source/x/x11/build/xf86-video-i128
+++ b/source/x/x11/build/xf86-video-i128
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-intel b/source/x/x11/build/xf86-video-intel
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/x/x11/build/xf86-video-intel
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-mach64
+++ b/source/x/x11/build/xf86-video-mach64
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xf86-video-modesetting b/source/x/x11/build/xf86-video-modesetting
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/source/x/x11/build/xf86-video-modesetting
@@ -0,0 +1 @@
+4
diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic
index 0cfbf0888..7ed6ff82d 100644
--- a/source/x/x11/build/xf86-video-neomagic
+++ b/source/x/x11/build/xf86-video-neomagic
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-nouveau b/source/x/x11/build/xf86-video-nouveau
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-video-nouveau
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-nv b/source/x/x11/build/xf86-video-nv
index ec635144f..00750edc0 100644
--- a/source/x/x11/build/xf86-video-nv
+++ b/source/x/x11/build/xf86-video-nv
@@ -1 +1 @@
-9
+3
diff --git a/source/x/x11/build/xf86-video-omap b/source/x/x11/build/xf86-video-omap
index 0cfbf0888..7ed6ff82d 100644
--- a/source/x/x11/build/xf86-video-omap
+++ b/source/x/x11/build/xf86-video-omap
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-video-openchrome
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86-video-r128
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-rendition b/source/x/x11/build/xf86-video-rendition
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/x/x11/build/xf86-video-rendition
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 45a4fb75d..b4de39476 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
index 0cfbf0888..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-s3virge
+++ b/source/x/x11/build/xf86-video-s3virge
@@ -1 +1 @@
-2
+4
diff --git a/source/x/x11/build/xf86-video-siliconmotion b/source/x/x11/build/xf86-video-siliconmotion
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xf86-video-siliconmotion
+++ b/source/x/x11/build/xf86-video-siliconmotion
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb
index 45a4fb75d..00750edc0 100644
--- a/source/x/x11/build/xf86-video-sisusb
+++ b/source/x/x11/build/xf86-video-sisusb
@@ -1 +1 @@
-8
+3
diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga
index 45a4fb75d..b4de39476 100644
--- a/source/x/x11/build/xf86-video-tga
+++ b/source/x/x11/build/xf86-video-tga
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng
index 45a4fb75d..f599e28b8 100644
--- a/source/x/x11/build/xf86-video-tseng
+++ b/source/x/x11/build/xf86-video-tseng
@@ -1 +1 @@
-8
+10
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index b1bd38b62..b6a7d89c6 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-13
+16
diff --git a/source/x/x11/build/xf86-video-vboxvideo b/source/x/x11/build/xf86-video-vboxvideo
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xf86-video-vboxvideo
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xf86-video-vesa
+++ b/source/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
index 7f8f011eb..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-vmware
+++ b/source/x/x11/build/xf86-video-vmware
@@ -1 +1 @@
-7
+1
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
index ec635144f..48082f72f 100644
--- a/source/x/x11/build/xf86-video-voodoo
+++ b/source/x/x11/build/xf86-video-voodoo
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-video-xgi b/source/x/x11/build/xf86-video-xgi
index 0cfbf0888..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-xgi
+++ b/source/x/x11/build/xf86-video-xgi
@@ -1 +1 @@
-2
+4
diff --git a/source/x/x11/build/xf86-video-xgixp b/source/x/x11/build/xf86-video-xgixp
index 45a4fb75d..f599e28b8 100644
--- a/source/x/x11/build/xf86-video-xgixp
+++ b/source/x/x11/build/xf86-video-xgixp
@@ -1 +1 @@
-8
+10
diff --git a/source/x/x11/build/xf86bigfontproto b/source/x/x11/build/xf86bigfontproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86bigfontproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86dga b/source/x/x11/build/xf86dga
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xf86dga
+++ b/source/x/x11/build/xf86dga
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86dgaproto b/source/x/x11/build/xf86dgaproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86dgaproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86driproto b/source/x/x11/build/xf86driproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86driproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86miscproto b/source/x/x11/build/xf86miscproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86miscproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86vidmodeproto b/source/x/x11/build/xf86vidmodeproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86vidmodeproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xfd
+++ b/source/x/x11/build/xfd
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xfsinfo b/source/x/x11/build/xfsinfo
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xfsinfo
+++ b/source/x/x11/build/xfsinfo
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xgamma b/source/x/x11/build/xgamma
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xgamma
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xgc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xhost b/source/x/x11/build/xhost
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xhost
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xineramaproto b/source/x/x11/build/xineramaproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xineramaproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xinput b/source/x/x11/build/xinput
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xinput
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xkbevd b/source/x/x11/build/xkbevd
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xkbevd
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xkbprint
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xkbutils b/source/x/x11/build/xkbutils
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xkbutils
+++ b/source/x/x11/build/xkbutils
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xkeyboard-config
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xlogo b/source/x/x11/build/xlogo
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xlogo
+++ b/source/x/x11/build/xlogo
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xlsatoms b/source/x/x11/build/xlsatoms
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xlsatoms
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xlsfonts
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xmag b/source/x/x11/build/xmag
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xmag
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xman b/source/x/x11/build/xman
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xman
+++ b/source/x/x11/build/xman
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xmh
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xmodmap b/source/x/x11/build/xmodmap
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xmodmap
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xmore
+++ b/source/x/x11/build/xmore
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xorg-cf-files b/source/x/x11/build/xorg-cf-files
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xorg-cf-files
+++ b/source/x/x11/build/xorg-cf-files
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xorg-docs b/source/x/x11/build/xorg-docs
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xorg-docs
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xorg-sgml-doctools b/source/x/x11/build/xorg-sgml-doctools
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xorg-sgml-doctools
+++ b/source/x/x11/build/xorg-sgml-doctools
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xorgproto b/source/x/x11/build/xorgproto
new file mode 100644
index 000000000..00750edc0
--- /dev/null
+++ b/source/x/x11/build/xorgproto
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xproto b/source/x/x11/build/xproto
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xpyb b/source/x/x11/build/xpyb
index 00750edc0..7ed6ff82d 100644
--- a/source/x/x11/build/xpyb
+++ b/source/x/x11/build/xpyb
@@ -1 +1 @@
-3
+5
diff --git a/source/x/x11/build/xrandr b/source/x/x11/build/xrandr
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xrandr
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xscope b/source/x/x11/build/xscope
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xscope
+++ b/source/x/x11/build/xscope
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xstdcmap
+++ b/source/x/x11/build/xstdcmap
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xterm b/source/x/x11/build/xterm
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xterm
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xtrans b/source/x/x11/build/xtrans
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xtrans
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xvidtune b/source/x/x11/build/xvidtune
index 0cfbf0888..00750edc0 100644
--- a/source/x/x11/build/xvidtune
+++ b/source/x/x11/build/xvidtune
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xvinfo b/source/x/x11/build/xvinfo
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xvinfo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/configure/intel-gpu-tools b/source/x/x11/configure/intel-gpu-tools
index d996de5c3..a5e0db8a2 100644
--- a/source/x/x11/configure/intel-gpu-tools
+++ b/source/x/x11/configure/intel-gpu-tools
@@ -1,6 +1,6 @@
 CFLAGS=$SLKCFLAGS \
 CXXFLAGS=$SLKCFLAGS \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -9,5 +9,5 @@ CXXFLAGS=$SLKCFLAGS \
   --mandir=/usr/man \
   --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
   --disable-static \
-  --disable-dumper \
+  --disable-tests \
   --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto
new file mode 100644
index 000000000..2df1aaf74
--- /dev/null
+++ b/source/x/x11/configure/xcb-proto
@@ -0,0 +1,35 @@
+mkdir python2 python3
+
+cd python2
+  CFLAGS=$SLKCFLAGS \
+  CXXFLAGS=$SLKCFLAGS \
+  PYTHON=python3 \
+  ../configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --infodir=/usr/info \
+    --mandir=/usr/man \
+    --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+    --with-udev-rules-dir=/lib/udev/rules.d \
+    --disable-static \
+    --build=$ARCH-slackware-linux
+cd -
+
+cd python3
+  CFLAGS=$SLKCFLAGS \
+  CXXFLAGS=$SLKCFLAGS \
+  PYTHON=python \
+  ../configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --infodir=/usr/info \
+    --mandir=/usr/man \
+    --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+    --with-udev-rules-dir=/lib/udev/rules.d \
+    --disable-static \
+    --build=$ARCH-slackware-linux
+cd -
diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel
index d744b3290..88581a1e7 100644
--- a/source/x/x11/configure/xf86-video-intel
+++ b/source/x/x11/configure/xf86-video-intel
@@ -1,5 +1,11 @@
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
+# xf86-video-intel requires SSE2 instructions on 32-bit x86:
+ALTCFLAGS="$SLKCFLAGS"
+case "$( uname -m )" in
+  i?86) ALTCFLAGS="-O2 -march=i686 -mtune=i686 -msse2" ; PKGARCH=i686 ;;
+esac
+
+CFLAGS="$ALTCFLAGS" \
+CXXFLAGS="$ALTCFLAGS" \
 ./autogen.sh \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -11,4 +17,5 @@ CXXFLAGS=$SLKCFLAGS \
   --disable-static \
   --enable-kms-only \
   --enable-uxa \
+  --with-default-dri=3 \
   --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 755b565dd..1ebd63465 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -6,11 +6,7 @@ BUILD_SERVERS="--enable-xorg \
   --enable-glamor \
   --enable-kdrive \
   --enable-xephyr \
-  --enable-xfbdev \
   --enable-config-udev \
-  --enable-kdrive-evdev \
-  --enable-kdrive-kbd \
-  --enable-kdrive-mouse \
   --disable-config-hal \
   --disable-systemd-logind"
 
@@ -36,7 +32,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-int10=x86emu \
   --with-default-font-path="${DEF_FONTPATH}" \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
-  --with-os-name="Slackware 14.2" \
+  --with-os-name="Slackware 15.0" \
   --with-os-vendor="Slackware Linux Project" \
   --with-xkb-path=/etc/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
diff --git a/source/x/x11/configure/xorgproto b/source/x/x11/configure/xorgproto
new file mode 100644
index 000000000..f95c810b3
--- /dev/null
+++ b/source/x/x11/configure/xorgproto
@@ -0,0 +1,18 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+  --prefix=/usr \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir /usr/libexec \
+  --bindir /usr/bin \
+  --sbindir /usr/sbin \
+  --includedir /usr/include \
+  --datadir /usr/share \
+  --mandir /usr/man \
+  --sysconfdir /etc \
+  --localstatedir /var \
+  --buildtype=release \
+  -Dlegacy=true \
+  .. || exit 1
diff --git a/source/x/x11/make/xcb-proto b/source/x/x11/make/xcb-proto
new file mode 100644
index 000000000..a4c380bbc
--- /dev/null
+++ b/source/x/x11/make/xcb-proto
@@ -0,0 +1,17 @@
+cd python2
+  if ! make $NUMJOBS ; then
+    touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+    continue
+  fi
+
+  make install DESTDIR=$PKG
+cd -
+
+cd python3
+  if ! make $NUMJOBS ; then
+    touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+    continue
+  fi
+
+  make install DESTDIR=$PKG
+cd -
diff --git a/source/x/x11/make/xorgproto b/source/x/x11/make/xorgproto
new file mode 100644
index 000000000..47bfc8e6c
--- /dev/null
+++ b/source/x/x11/make/xorgproto
@@ -0,0 +1,13 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+cd build
+  ninja || exit 1
+  DESTDIR=$PKG ninja install || exit 1
+cd ..
+# meson doesn't seem to care about a docdir:
+mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+for docfile in PM_spec compositeproto.txt damageproto.txt dri2proto.txt dri3proto.txt fixesproto.txt presentproto.txt randrproto.txt renderproto.txt resproto.txt xv-protocol-v2.txt ; do
+  cp -a $docfile $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+  chown root:root $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}/${docfile}
+  chmod 644 $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}/${docfile}
+done
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 8a28ed93e..35ae0636d 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -84,6 +84,7 @@ libXevie
 libXext
 libXfixes
 libXfont
+libXfont2
 libXfontcache
 libXft
 libXi
@@ -173,6 +174,7 @@ xf86-input-aiptek
 xf86-input-evdev
 xf86-input-joystick
 xf86-input-keyboard
+xf86-input-libinput
 xf86-input-mouse
 xf86-input-penmount
 xf86-input-synaptics
@@ -214,6 +216,7 @@ xf86-video-tga
 xf86-video-trident
 xf86-video-tseng
 xf86-video-v4l
+xf86-video-vboxvideo
 xf86-video-vesa
 xf86-video-vmware
 xf86-video-voodoo
@@ -259,6 +262,7 @@ xorg-server-xephyr
 xorg-server-xnest
 xorg-server-xvfb
 xorg-sgml-doctools
+xorgproto
 xpr
 xprop
 xproto
diff --git a/source/x/x11/noarch b/source/x/x11/noarch
index 8785ee527..8b8ff18ac 100644
--- a/source/x/x11/noarch
+++ b/source/x/x11/noarch
@@ -49,7 +49,6 @@ gccmakedep
 glproto
 inputproto
 kbproto
-libpthread-stubs
 mkfontdir
 printproto
 randrproto
diff --git a/source/x/x11/patch/xf86-input-mouse.patch b/source/x/x11/patch/xf86-input-mouse.patch
new file mode 100644
index 000000000..e54c5190b
--- /dev/null
+++ b/source/x/x11/patch/xf86-input-mouse.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch.gz \
+  | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch b/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch
new file mode 100644
index 000000000..5726c50ae
--- /dev/null
+++ b/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch
@@ -0,0 +1,42 @@
+From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 16 Feb 2017 09:21:21 -0500
+Subject: Adapt to removal of xf86GetOS
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/mouse.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/mouse.c b/src/mouse.c
+index dae98aa..40d97a9 100644
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -794,7 +794,6 @@ InitProtocols(void)
+ {
+     int classes;
+     int i;
+-    const char *osname = NULL;
+ 
+     if (osInfo)
+         return TRUE;
+@@ -821,11 +820,11 @@ InitProtocols(void)
+                 mouseProtocols[i].id = PROT_UNSUP;
+ 
+     /* NetBSD uses PROT_BM for "PS/2". */
+-    xf86GetOS(&osname, NULL, NULL, NULL);
+-    if (osname && xf86NameCmp(osname, "netbsd") == 0)
+-        for (i = 0; mouseProtocols[i].name; i++)
+-            if (mouseProtocols[i].id == PROT_PS2)
+-                mouseProtocols[i].id = PROT_BM;
++#if defined(__NetBSD__)
++    for (i = 0; mouseProtocols[i].name; i++)
++        if (mouseProtocols[i].id == PROT_PS2)
++            mouseProtocols[i].id = PROT_BM;
++#endif
+ 
+     return TRUE;
+ }
+-- 
+cgit v1.1
+
diff --git a/source/x/x11/patch/xf86-video-intel.patch b/source/x/x11/patch/xf86-video-intel.patch
index dab2d0d30..30c63796d 100644
--- a/source/x/x11/patch/xf86-video-intel.patch
+++ b/source/x/x11/patch/xf86-video-intel.patch
@@ -1,3 +1,9 @@
 # Disable this patch.  Latest git should support gen9 properly.
 #zcat $CWD/patch/xf86-video-intel/0001-sna-Let-modestting-glamor-handle-gen9.patch.gz \
 #  | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Some patches from Fedora's SRPM:
+zcat $CWD/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xf86-video-intel/0001-Fix-build-on-i686.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xf86-video-intel/intel-gcc-pr65873.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch
new file mode 100644
index 000000000..ca525eccc
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch
@@ -0,0 +1,101 @@
+From 9c1151b4d65c356f0d25d952fe1a10c89fdb834a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 5 Mar 2018 11:03:18 -0500
+Subject: [PATCH] Fix build on F28 and later
+
+Newer gcc complains that it doesn't know how to always-inline memcpy():
+
+  /usr/include/bits/string_fortified.h:31:1: error: inlining failed in
+  call to always_inline 'memcpy': target specific option mismatch
+
+This is because we need to wrap our declaration of memcpy() in the
+options we're trying to push at the top of blt.c. So: include compiler.h
+to define sse2, then push options, then include everything else.
+
+However if you do that, the word 'nonnull' collides with the usage in
+<X11/Xfuncproto.h>. I'm too lazy to fix that properly, just expand it to
+the __attribute__ form in the few places we say it.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/sna/blt.c         | 6 ++++--
+ src/sna/compiler.h    | 2 --
+ src/sna/gen6_common.h | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/sna/blt.c b/src/sna/blt.c
+index cb90437a..fb357d35 100644
+--- a/src/sna/blt.c
++++ b/src/sna/blt.c
+@@ -29,13 +29,15 @@
+ #include "config.h"
+ #endif
+ 
+-#include "sna.h"
+-#include <pixman.h>
++#include "compiler.h"
+ 
+ #if defined(sse2)
+ #pragma GCC push_options
+ #pragma GCC target("sse2,inline-all-stringops,fpmath=sse")
+ #pragma GCC optimize("Ofast")
++
++#include <pixman.h>
++#include "sna.h"
+ #include <xmmintrin.h>
+ 
+ #if __x86_64__
+diff --git a/src/sna/compiler.h b/src/sna/compiler.h
+index 0f3775ec..3c176a16 100644
+--- a/src/sna/compiler.h
++++ b/src/sna/compiler.h
+@@ -39,7 +39,6 @@
+ #define pure __attribute__((pure))
+ #define tightly_packed __attribute__((__packed__))
+ #define flatten __attribute__((flatten))
+-#define nonnull __attribute__((nonnull))
+ #define page_aligned __attribute__((aligned(4096)))
+ #else
+ #define likely(expr) (expr)
+@@ -52,7 +51,6 @@
+ #define pure
+ #define tighly_packed
+ #define flatten
+-#define nonnull
+ #define page_aligned
+ #endif
+ 
+diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
+index b53ec0c9..119a2d5d 100644
+--- a/src/sna/gen6_common.h
++++ b/src/sna/gen6_common.h
+@@ -133,7 +133,7 @@ inline static bool force_blt_ring(struct sna *sna, struct kgem_bo *bo)
+ 	return false;
+ }
+ 
+-nonnull inline static bool
++__attribute__((nonnull)) inline static bool
+ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
+ {
+ 	if (PREFER_RENDER)
+@@ -148,7 +148,7 @@ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
+ 	return can_switch_to_blt(sna, bo, flags);
+ }
+ 
+-nonnull inline static bool
++__attribute__((nonnull)) inline static bool
+ prefer_render_ring(struct sna *sna, struct kgem_bo *bo)
+ {
+ 	if (sna->kgem.ring == KGEM_RENDER)
+@@ -191,7 +191,7 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp)
+ 	return prefer_blt_bo(sna, tmp->src.bo, tmp->dst.bo);
+ }
+ 
+-nonnull static inline bool
++__attribute__((nonnull)) static inline bool
+ prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags)
+ {
+ 	if (PREFER_RENDER)
+-- 
+2.16.2
+
diff --git a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch
new file mode 100644
index 000000000..0851fbe4b
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch
@@ -0,0 +1,49 @@
+From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 6 Mar 2018 12:07:46 -0500
+Subject: [PATCH] Fix build on i686
+
+Presumably this only matters for i686 because amd64 implies sse2, but:
+
+BUILDSTDERR: In file included from gen4_vertex.c:34:
+BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex':
+BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch
+BUILDSTDERR:  static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y)
+BUILDSTDERR:                           ^~~~~~~~~~~~~~
+BUILDSTDERR: gen4_vertex.c:308:25: note: called from here
+BUILDSTDERR:  #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */
+BUILDSTDERR:                          ^~~~~~~~~~~~~~~~~~~~~~~~
+BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX'
+BUILDSTDERR:   OUT_VERTEX(dstX, dstY);
+BUILDSTDERR:   ^~~~~~~~~~
+
+The bug here appears to be that emit_vertex() is declared 'sse2' but
+vertex_emit_2s is merely always_inline. gcc8 decides that since you said
+always_inline you need to have explicitly cloned it for every
+permutation of targets. Merely saying inline seems to do the job of
+cloning vertex_emit_2s as much as necessary.
+
+So to reiterate: if you say always-inline, it won't, but if you just say
+maybe inline, it will. Thanks gcc, that's helpful.
+
+- ajax
+---
+ src/sna/compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sna/compiler.h b/src/sna/compiler.h
+index 3c176a16..bc447c7a 100644
+--- a/src/sna/compiler.h
++++ b/src/sna/compiler.h
+@@ -32,7 +32,7 @@
+ #define likely(expr) (__builtin_expect (!!(expr), 1))
+ #define unlikely(expr) (__builtin_expect (!!(expr), 0))
+ #define noinline __attribute__((noinline))
+-#define force_inline inline __attribute__((always_inline))
++#define force_inline inline
+ #define fastcall __attribute__((regparm(3)))
+ #define must_check __attribute__((warn_unused_result))
+ #define constant __attribute__((const))
+-- 
+2.16.2
+
diff --git a/source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch b/source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
new file mode 100644
index 000000000..cb279a786
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
@@ -0,0 +1,47 @@
+From 09bf64d69d97172f22fe08eb495bf50f920ae9ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Tue, 31 May 2016 11:11:21 +0300
+Subject: [PATCH] sna: Avoid clobbering output physical size with
+ xf86OutputSetEDID()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+---
+ src/sna/sna_display.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 10d33f2..57de410 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -3576,6 +3576,7 @@ sna_output_attach_edid(xf86OutputPtr output)
+ {
+ 	struct sna *sna = to_sna(output->scrn);
+ 	struct sna_output *sna_output = output->driver_private;
++	unsigned old_mm_width, old_mm_height;
+ 	struct drm_mode_get_blob blob;
+ 	void *old, *raw = NULL;
+ 	xf86MonPtr mon = NULL;
+@@ -3678,12 +3679,17 @@ skip_read:
+ 	}
+ 
+ done:
++	output = sna_output->base;
++	old_mm_width = output->mm_width;
++	old_mm_height = output->mm_height;
+ 	sna_output_set_parsed_edid(output, mon);
+ 	if (raw) {
+ 		sna_output->edid_raw = raw;
+ 		sna_output->edid_len = blob.length;
+ 		sna_output->edid_blob_id = blob.blob_id;
+ 	}
++	output->mm_width = old_mm_width;
++	output->mm_height = old_mm_height;
+ }
+ 
+ static void
+-- 
+2.7.4
+
diff --git a/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch b/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch
new file mode 100644
index 000000000..ed05bce9a
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-intel-20150520/src/sna/compiler.h.jx xf86-video-intel-20150520/src/sna/compiler.h
+--- xf86-video-intel-20150520/src/sna/compiler.h.jx	2015-05-19 07:44:26.000000000 -0400
++++ xf86-video-intel-20150520/src/sna/compiler.h	2015-05-20 12:53:54.797918726 -0400
+@@ -64,7 +64,7 @@
+ #endif
+ 
+ #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
+-#define fast __attribute__((optimize("Ofast")))
++#define fast __attribute__((optimize("O3")))
+ #else
+ #define fast
+ #endif
diff --git a/source/x/x11/patch/xf86-video-sisusb.patch b/source/x/x11/patch/xf86-video-sisusb.patch
deleted file mode 100644
index 17d7e8297..000000000
--- a/source/x/x11/patch/xf86-video-sisusb.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Remove obsolete references to mibstore.h and miInitializeBackingStore():
-grep -r -l '#include "mibstore.h"' * | while read file ; do
-  sed -i "s/#include \"mibstore.h\"//g" $file
-done
-grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
-  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
-done
diff --git a/source/x/x11/patch/xf86-video-vmware.patch b/source/x/x11/patch/xf86-video-vmware.patch
deleted file mode 100644
index 17d7e8297..000000000
--- a/source/x/x11/patch/xf86-video-vmware.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Remove obsolete references to mibstore.h and miInitializeBackingStore():
-grep -r -l '#include "mibstore.h"' * | while read file ; do
-  sed -i "s/#include \"mibstore.h\"//g" $file
-done
-grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
-  sed -i "s/miInitializeBackingStore(pScreen);//g" $file
-done
diff --git a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
index f51e4628d..792238074 100644
--- a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
+++ b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
@@ -1,19 +1,18 @@
---- ./startx.cpp.orig	2014-09-11 12:31:42.000000000 -0500
-+++ ./startx.cpp	2015-03-29 23:35:06.133875707 -0500
-@@ -192,10 +192,12 @@
+--- ./startx.cpp.orig	2018-03-11 16:07:52.205154560 -0500
++++ ./startx.cpp	2018-03-11 16:09:46.094163992 -0500
+@@ -201,6 +201,7 @@
+     server=$defaultserver
+ 
+ #ifdef __linux__
++  if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
      XCOMM When starting the defaultserver start X on the current tty to avoid
      XCOMM the startx session being seen as inactive:
      XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
--    tty=$(tty)
--    if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
--        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
--        vtarg="vt$tty_num"
-+    if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
-+        tty=$(tty)
-+        if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
-+            tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-+            vtarg="vt$tty_num"
-+        fi
+@@ -209,6 +210,7 @@
+         tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+         vtarg="vt$tty_num -keeptty"
      fi
++  fi
  #endif
  
+     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
diff --git a/source/x/x11/patch/xpyb.patch b/source/x/x11/patch/xpyb.patch
new file mode 100644
index 000000000..30ec5dd82
--- /dev/null
+++ b/source/x/x11/patch/xpyb.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch b/source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch
new file mode 100644
index 000000000..8227aa057
--- /dev/null
+++ b/source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch
@@ -0,0 +1,12 @@
+--- ./src/py_client.py.orig	2012-03-23 16:24:40.000000000 -0500
++++ ./src/py_client.py	2018-03-11 14:24:54.540483549 -0500
+@@ -585,7 +585,8 @@
+           'union'   : py_union,
+           'request' : py_request,
+           'event'   : py_event,
+-          'error'   : py_error
++          'error'   : py_error,
++          'eventstruct' : lambda *a, **k: None
+           }
+ 
+ # Boilerplate below this point
diff --git a/source/x/x11/post-install/libxcb.post-install b/source/x/x11/post-install/libxcb.post-install
index 76ac40c0d..ebaacfd86 100644
--- a/source/x/x11/post-install/libxcb.post-install
+++ b/source/x/x11/post-install/libxcb.post-install
@@ -31,22 +31,3 @@ rm -rf $PKG/usr/share/doc/libxcb
 rmdir $PKG/usr/share/doc
 rmdir $PKG/usr/share
 
-# Older versions of libxcb shipped a poorly libtooled .la file that caused
-# the now-gone libxcb-xlib.so module to be incorrectly linked with many
-# binaries and libraries, and cause the module to be listed (again,
-# incorrectly) in a lot of .la files.  Rather than breaking a large amount
-# of existing X programs, we will use this simple trick to allow old binaries
-# to keep running, and new things to compile even if a bogus .la file
-# referencing libxcb-xlib is in the development environment.
-#
-# References to libxcb-xlib will go away as things are recompiled in the
-# future (we've eliminated any remaining references in Slackware itself).
-#
-# It's like letting a sliver work out instead of cutting off the finger.
-
-( cd $PKG/usr/lib
-  ln -sf libxcb.so.1 libxcb-xlib.so.0
-  ln -sf libxcb-xlib.so.0 libxcb-xlib.so
-  ln -sf libxcb.la libxcb-xlib.la
-)
-
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index a88899705..8410a8fa5 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -29,6 +29,15 @@ do
   #mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
 done
 
+# Change default auth type:
+cat << EOF >> $PKG/etc/X11/xdm/xdm-config.new
+
+! In xdm-config, default to MIT-MAGIC-COOKIE-1 authorization as
+! the XDM-AUTHORIZATION-1 method (which is the default otherwise) is
+! mostly broken (i.e. with SDL2 apps):
+DisplayManager.*.authName:      MIT-MAGIC-COOKIE-1
+EOF
+
 mkdir -p $PKG/var/lib/xdm
 chown root:root $PKG/var/lib/xdm
 chmod 755 $PKG/var/lib/xdm
diff --git a/source/x/x11/post-install/xf86-input-libinput.post-install b/source/x/x11/post-install/xf86-input-libinput.post-install
index baeffe2e8..b267c28f8 100644
--- a/source/x/x11/post-install/xf86-input-libinput.post-install
+++ b/source/x/x11/post-install/xf86-input-libinput.post-install
@@ -1,4 +1,49 @@
-# Add default configuration file:
-mkdir -p $PKG/usr/share/X11/xorg.conf.d
-cp -a conf/99-libinput.conf $PKG/usr/share/X11/xorg.conf.d/
+# Create the configuration directories for xorg-server 1.9.x
+mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d
+
+# Create a sample keyboard layout 
+# Enable zapping by default
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/91-keyboard-layout-libinput.conf
+Section "InputClass"
+	Identifier "libinput keyboard catchall"
+	MatchIsKeyboard "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "libinput"
+	Option "XkbLayout" "us"
+	#Option "XkbVariant" ""
+	Option "XkbOptions" "terminate:ctrl_alt_bksp"
+EndSection
+
+# READ THIS FOR CUSTOM KEYBOARD INFORMATION
+#
+#  If you want to add a custom model/layout/variant to X, you will need to COPY
+#  this file to /etc/X11/xorg.conf.d/ and edit that copy.  After editing it to
+#  suit, you will need to restart X.
+#
+#  Here's an example of the lines from above:
+#
+# Section "InputClass"
+#	Identifier "libinput keyboard catchall"
+#	MatchIsKeyboard "on"
+#	MatchDevicePath "/dev/input/event*"
+#	Driver "libinput"
+#	Option "XkbLayout" "us"
+#	Option "XkbVariant" "intl"
+#	Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp"
+# EndSection
+#
+#  Many desktop environments, including KDE and Xfce, have their own methods to
+#  configure keyboard layouts and such if you'd like to use them.
+#
+#  If you prefer to use the "old" way of configuring keyboards (without input 
+#  device hotplugging), then you'll need to add the following lines to the 
+#  ServerFlags section of /etc/X11/xorg.conf:
+#    Option   "AllowEmptyInput"     "false"
+#    Option   "AutoAddDevices"      "false"
+#    Option   "AutoEnableDevices"   "false"
+#  Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/
+#  directory, but that's your call.  Assuming you elect to keep a monolithic 
+#  /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual.
+
+EOF
 
diff --git a/source/x/x11/post-install/xorg-server.post-install b/source/x/x11/post-install/xorg-server.post-install
index e21a0f03a..dd9e2096e 100644
--- a/source/x/x11/post-install/xorg-server.post-install
+++ b/source/x/x11/post-install/xorg-server.post-install
@@ -3,7 +3,7 @@ mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d
 
 # Create a sample keyboard layout 
 # Enable zapping by default
-cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout.conf
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf
 Section "InputClass"
 	Identifier "keyboard-all"
 	MatchIsKeyboard "on"
@@ -47,6 +47,17 @@ EndSection
 
 EOF
 
+## Nope, we will not include 91-keyboard-layout-libinput.conf in the
+## xorg-server package.  It is better to put it into the xf86-input-libinput
+## package so that if that driver is removed, then X.Org will fall back to
+## using evdev.  Perhaps we'll revisit this arrangement when evdev is a little
+## bit more obsolete.  :-)
+##
+#sed -e 's,Identifier "keyboard-all",Identifier "libinput keyboard catchall",g' \
+#    -e 's,Driver "evdev",Driver "libinput",g' \
+#    $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf > \
+#    $PKG/usr/share/X11/xorg.conf.d/91-keyboard-layout-libinput.conf
+
 # Add COPYING file:
 mkdir -p $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
 cp -a COPYING $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
@@ -57,7 +68,7 @@ rmdir $PKG/var
 
 # While I hate to have X11 take over another generic-sounding
 # piece of prime filesystem real estate, this symlink will
-# direct (for now) proprietary X drivers into the corrent
+# direct (for now) proprietary X drivers into the correct
 # location:
 
 ( cd $PKG/usr/lib
diff --git a/source/x/x11/post-install/xorgproto.post-install b/source/x/x11/post-install/xorgproto.post-install
new file mode 100644
index 000000000..7a3fa9751
--- /dev/null
+++ b/source/x/x11/post-install/xorgproto.post-install
@@ -0,0 +1,5 @@
+# These all have the arch specific library path in them, so usr/share is not
+# the right place to keep them:
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
+rmdir $PKG/usr/share 2> /dev/null
diff --git a/source/x/x11/slack-desc/appres b/source/x/x11/slack-desc/appres
index 001a3f341..116e47c05 100644
--- a/source/x/x11/slack-desc/appres
+++ b/source/x/x11/slack-desc/appres
@@ -10,7 +10,7 @@ appres: appres (X resource inspection utility)
 appres:
 appres: The appres program prints the resources seen by an application
 appres: (or subhierarchy of an application) with the specified class and
-appres: instance names.  It can be used to determine which resources a
+appres: instance names. It can be used to determine which resources a
 appres: particular program will load.
 appres:
 appres:
diff --git a/source/x/x11/slack-desc/bdftopcf b/source/x/x11/slack-desc/bdftopcf
index c9514c16e..daf8394ee 100644
--- a/source/x/x11/slack-desc/bdftopcf
+++ b/source/x/x11/slack-desc/bdftopcf
@@ -10,7 +10,7 @@ bdftopcf: bdftopcf (font compiler for the X server and font server)
 bdftopcf:
 bdftopcf: Fonts in Portable Compiled Format can be read by any architecture,
 bdftopcf: although the file is structured to allow one particular architecture
-bdftopcf: to read them directly without reformatting.  This allows fast reading
+bdftopcf: to read them directly without reformatting. This allows fast reading
 bdftopcf: on the appropriate machine, but the files are still portable (but
 bdftopcf: read more slowly) on other machines.
 bdftopcf:
diff --git a/source/x/x11/slack-desc/beforelight b/source/x/x11/slack-desc/beforelight
index a2a5f48e4..9746b7718 100644
--- a/source/x/x11/slack-desc/beforelight
+++ b/source/x/x11/slack-desc/beforelight
@@ -9,10 +9,10 @@
 beforelight: beforelight (X11 screensaver)
 beforelight:
 beforelight: The beforelight program is a sample implementation of a screen saver
-beforelight: for X servers supporting the MIT-SCREEN-SAVER extension.   It is only
+beforelight: for X servers supporting the MIT-SCREEN-SAVER extension. It is only
 beforelight: recommended for use as a code sample, as it does not include features
-beforelight: such as screen locking or configurability, and relies on the legacy
-beforelight: Xaw toolkit.
+beforelight: such as screen locking or configurability.
+beforelight:
 beforelight:
 beforelight:
 beforelight:
diff --git a/source/x/x11/slack-desc/iceauth b/source/x/x11/slack-desc/iceauth
index 54f525d6a..047077ae8 100644
--- a/source/x/x11/slack-desc/iceauth
+++ b/source/x/x11/slack-desc/iceauth
@@ -9,7 +9,7 @@
 iceauth: iceauth (display/edit ICE authorization information)
 iceauth:
 iceauth: The iceauth program is used to edit and display the authorization
-iceauth: information used in connecting with ICE.  It operates very much like
+iceauth: information used in connecting with ICE. It operates very much like
 iceauth: the xauth program for X11 connection authentication records.
 iceauth:
 iceauth:
diff --git a/source/x/x11/slack-desc/ico b/source/x/x11/slack-desc/ico
index b4aeb4a5d..75563fef7 100644
--- a/source/x/x11/slack-desc/ico
+++ b/source/x/x11/slack-desc/ico
@@ -9,7 +9,7 @@
 ico: ico (X11 test client)
 ico:
 ico: ico is a simple animation program that may be used for testing various
-ico: X11 operations and extensions.  It displays a wire-frame rotating
+ico: X11 operations and extensions. It displays a wire-frame rotating
 ico: polyhedron, with hidden lines removed, or a solid-fill polyhedron
 ico: with hidden faces removed.
 ico:
diff --git a/source/x/x11/slack-desc/imake b/source/x/x11/slack-desc/imake
index 53599ebfe..23231daa6 100644
--- a/source/x/x11/slack-desc/imake
+++ b/source/x/x11/slack-desc/imake
@@ -10,7 +10,7 @@ imake: imake (C preprocessor interface to the make utility)
 imake:
 imake: The imake package contains the imake utility, plus the following
 imake: support programs: ccmakedep, mergelib, revpath, mkdirhier, makeg,
-imake: cleanlinks, mkhtmlindex, xmkmf
+imake: cleanlinks, mkhtmlindex, and xmkmf.
 imake:
 imake:
 imake:
diff --git a/source/x/x11/slack-desc/intel-gpu-tools b/source/x/x11/slack-desc/intel-gpu-tools
index 3fcee9a3d..908475c6a 100644
--- a/source/x/x11/slack-desc/intel-gpu-tools
+++ b/source/x/x11/slack-desc/intel-gpu-tools
@@ -9,7 +9,7 @@
 intel-gpu-tools: intel-gpu-tools (Intel DRM Driver Testing Tools)
 intel-gpu-tools:
 intel-gpu-tools: This is a collection of tools for development and testing of the
-intel-gpu-tools: Intel DRM driver.  There are many macro-level test suites including
+intel-gpu-tools: Intel DRM driver. There are many macro-level test suites including
 intel-gpu-tools: xtest, rendercheck, piglit, and oglconform.
 intel-gpu-tools:
 intel-gpu-tools:
diff --git a/source/x/x11/slack-desc/libXau b/source/x/x11/slack-desc/libXau
index 6e565d76b..73db2967e 100644
--- a/source/x/x11/slack-desc/libXau
+++ b/source/x/x11/slack-desc/libXau
@@ -8,10 +8,10 @@
       |-----handy-ruler------------------------------------------------------|
 libXau: libXau (Sample Authorization Protocol for X)
 libXau:
-libXau: This is a very simple mechanism for providing individual access to 
-libXau: an X Window System display.It uses existing core protocol and library 
-libXau: hooks for specifying authorization data in the connection setup block 
-libXau: to restrict use of the display to only those clients that show that 
+libXau: This is a very simple mechanism for providing individual access to
+libXau: an X Window System display. It uses existing core protocol and library
+libXau: hooks for specifying authorization data in the connection setup block
+libXau: to restrict use of the display to only those clients that show that
 libXau: they know a server-specific key called a "magic cookie."
 libXau:
 libXau:
diff --git a/source/x/x11/slack-desc/libXaw3d b/source/x/x11/slack-desc/libXaw3d
index 48f7ddc32..73f4f1745 100644
--- a/source/x/x11/slack-desc/libXaw3d
+++ b/source/x/x11/slack-desc/libXaw3d
@@ -9,7 +9,7 @@
 libXaw3d: libXaw3d (3D enhanced version of the MIT Athena widget set)
 libXaw3d:
 libXaw3d: Xaw3d is an enhanced version of the MIT Athena Widget set for
-libXaw3d: the X Window System.  Xaw3d adds a three-dimensional look to
+libXaw3d: the X Window System. Xaw3d adds a three-dimensional look to
 libXaw3d: applications with minimal or no source code changes.
 libXaw3d:
 libXaw3d: You should install Xaw3d if you are using applications which 
diff --git a/source/x/x11/slack-desc/libXcm b/source/x/x11/slack-desc/libXcm
index 0516aaf7e..7b8edff1e 100644
--- a/source/x/x11/slack-desc/libXcm
+++ b/source/x/x11/slack-desc/libXcm
@@ -9,7 +9,7 @@
 libXcm: libXcm (reference implementation of the net-color specification)
 libXcm:
 libXcm: The libXcm library is a reference implementation of the net-color 
-libXcm: spec.  It allows to attach color regions to X windows to communicate 
+libXcm: spec. It allows to attach color regions to X windows to communicate 
 libXcm: with color servers.
 libXcm:
 libXcm:
diff --git a/source/x/x11/slack-desc/libXfont b/source/x/x11/slack-desc/libXfont
deleted file mode 100644
index d78d6a0e9..000000000
--- a/source/x/x11/slack-desc/libXfont
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-libXfont: libXfont (library for legacy X11 font system)
-libXfont:
-libXfont: libXfont provides the core of the legacy X11 font system, handling the
-libXfont: index files (fonts.dir, fonts.alias, fonts.scale), the various font
-libXfont: file formats, and rasterizing them.   It is used by the X servers, the
-libXfont: X Font Server (xfs), and some font utilities (bdftopcf for instance),
-libXfont: but should not be used by normal X11 clients.  X11 clients access fonts
-libXfont: via either the new API's in libXft, or the legacy API's in libX11.
-libXfont:
-libXfont:
-libXfont:
diff --git a/source/x/x11/slack-desc/libXfont2 b/source/x/x11/slack-desc/libXfont2
new file mode 100644
index 000000000..35081973f
--- /dev/null
+++ b/source/x/x11/slack-desc/libXfont2
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libXfont2: libXfont2 (X11 font system library)
+libXfont2:
+libXfont2: libXfont2 provides the core of the new X11 font system, handling the
+libXfont2: index files (fonts.dir, fonts.alias, fonts.scale), the various font
+libXfont2: file formats, and rasterizing them. It is used by the X servers, the
+libXfont2: X Font Server (xfs), and some font utilities (bdftopcf for instance),
+libXfont2: but should not be used by normal X11 clients. X11 clients access fonts
+libXfont2: via either the new API's in libXft, or the legacy API's in libX11.
+libXfont2:
+libXfont2:
+libXfont2:
diff --git a/source/x/x11/slack-desc/libXmu b/source/x/x11/slack-desc/libXmu
index de36044c5..d20d9536e 100644
--- a/source/x/x11/slack-desc/libXmu
+++ b/source/x/x11/slack-desc/libXmu
@@ -9,7 +9,7 @@
 libXmu: libXmu (X miscellaneous utility library)
 libXmu:
 libXmu: This library contains miscellaneous utilities and is not part of the
-libXmu: Xlib standard.  It contains routines which only use public interfaces
+libXmu: Xlib standard. It contains routines which only use public interfaces
 libXmu: so that it may be layered on top of any proprietary implementation
 libXmu: of Xlib or Xt.
 libXmu:
diff --git a/source/x/x11/slack-desc/libxcb b/source/x/x11/slack-desc/libxcb
index 35182210a..356370f37 100644
--- a/source/x/x11/slack-desc/libxcb
+++ b/source/x/x11/slack-desc/libxcb
@@ -9,8 +9,8 @@
 libxcb: libxcb (X protocol C-language Binding)
 libxcb:
 libxcb: The XCB library provides an interface to the X Window System protocol
-libxcb: which is fully capable of replacing Xlib.  In fact, libX11 makes use
-libxcb: of libxcb as much as possible.  :-)  Porting to XCB has several
+libxcb: which is fully capable of replacing Xlib. In fact, libX11 makes use
+libxcb: of libxcb as much as possible. :-) Porting to XCB has several
 libxcb: advantages such as a smaller memory footprint, latency hiding, direct
 libxcb: protocol access, and improved thread support.
 libxcb:
diff --git a/source/x/x11/slack-desc/luit b/source/x/x11/slack-desc/luit
index cd9d9664b..f2f8b5f48 100644
--- a/source/x/x11/slack-desc/luit
+++ b/source/x/x11/slack-desc/luit
@@ -9,7 +9,7 @@
 luit: luit (character encoding convertor for X11 terminals)
 luit:
 luit: Luit is a filter that can be run between an arbitrary application and
-luit: a UTF-8 terminal emulator such as xterm.  It will convert application
+luit: a UTF-8 terminal emulator such as xterm. It will convert application
 luit: output from the locale's encoding into UTF-8, and convert terminal
 luit: input from UTF-8 into the locale's encoding.
 luit:
diff --git a/source/x/x11/slack-desc/presentproto b/source/x/x11/slack-desc/presentproto
index 8443306bf..1881a9dfb 100644
--- a/source/x/x11/slack-desc/presentproto
+++ b/source/x/x11/slack-desc/presentproto
@@ -8,7 +8,7 @@
             |-----handy-ruler------------------------------------------------------|
 presentproto: presentproto (X.Org Present protocol specification)
 presentproto:
-presentproto: X.Org Present protocol specification and Xlib/Xserver headers
+presentproto: X.Org Present protocol specification and Xlib/Xserver headers.
 presentproto:
 presentproto:
 presentproto:
diff --git a/source/x/x11/slack-desc/randrproto b/source/x/x11/slack-desc/randrproto
index f97ca0952..a1d571dbd 100644
--- a/source/x/x11/slack-desc/randrproto
+++ b/source/x/x11/slack-desc/randrproto
@@ -8,7 +8,7 @@
           |-----handy-ruler------------------------------------------------------|
 randrproto: randrproto (C prototypes for RandR)
 randrproto:
-randrproto: RandR is the X11 Resize and Rotate Extension
+randrproto: RandR is the X11 Resize and Rotate Extension.
 randrproto:
 randrproto:
 randrproto:
diff --git a/source/x/x11/slack-desc/xbiff b/source/x/x11/slack-desc/xbiff
index 289c97387..699b04fe4 100644
--- a/source/x/x11/slack-desc/xbiff
+++ b/source/x/x11/slack-desc/xbiff
@@ -8,7 +8,7 @@
      |-----handy-ruler------------------------------------------------------|
 xbiff: xbiff (X11 mail notifier)
 xbiff:
-xbiff: xbiff provides graphical notification of new e-mail.  It only handles
+xbiff: xbiff provides graphical notification of new e-mail. It only handles
 xbiff: mail stored in a filesystem accessible file, not via IMAP, POP or
 xbiff: other remote access protocols.
 xbiff:
diff --git a/source/x/x11/slack-desc/xclipboard b/source/x/x11/slack-desc/xclipboard
index fc0bcb456..cfe2d8cf9 100644
--- a/source/x/x11/slack-desc/xclipboard
+++ b/source/x/x11/slack-desc/xclipboard
@@ -9,8 +9,8 @@
 xclipboard: xclipboard (X11 clipboard utility)
 xclipboard:
 xclipboard: xclipboard is used to collect and display text selections that are
-xclipboard: sent to the CLIPBOARD by other clients.  It is typically used to
-xclipboard: save CLIPBOARD selections for later use.  It stores each CLIPBOARD
+xclipboard: sent to the CLIPBOARD by other clients. It is typically used to
+xclipboard: save CLIPBOARD selections for later use. It stores each CLIPBOARD
 xclipboard: selection as a separate string, each of which can be selected.
 xclipboard:
 xclipboard:
diff --git a/source/x/x11/slack-desc/xclock b/source/x/x11/slack-desc/xclock
index 39cb9ff1d..6d426eba3 100644
--- a/source/x/x11/slack-desc/xclock
+++ b/source/x/x11/slack-desc/xclock
@@ -8,7 +8,7 @@
       |-----handy-ruler------------------------------------------------------|
 xclock: xclock (X11 on-screen clock)
 xclock:
-xclock: xclock is the classic X Window System clock utility.  It displays the
+xclock: xclock is the classic X Window System clock utility. It displays the
 xclock: time in analog or digital form, continuously updated at a frequency
 xclock: which may be specified by the user.
 xclock:
diff --git a/source/x/x11/slack-desc/xcompmgr b/source/x/x11/slack-desc/xcompmgr
index f5527a847..dc94fbc95 100644
--- a/source/x/x11/slack-desc/xcompmgr
+++ b/source/x/x11/slack-desc/xcompmgr
@@ -9,7 +9,7 @@
 xcompmgr: xcompmgr (X11 compositing manager)
 xcompmgr:
 xcompmgr: xcompmgr is a sample compositing manager for X servers supporting the
-xcompmgr: XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic
+xcompmgr: XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables basic
 xcompmgr: eye-candy effects.
 xcompmgr:
 xcompmgr:
diff --git a/source/x/x11/slack-desc/xconsole b/source/x/x11/slack-desc/xconsole
index 2a543f2e7..431184c02 100644
--- a/source/x/x11/slack-desc/xconsole
+++ b/source/x/x11/slack-desc/xconsole
@@ -9,7 +9,7 @@
 xconsole: xconsole (X11 console)
 xconsole:
 xconsole: xconsole displays in a X11 window the messages which are usually sent
-xconsole: to /dev/console
+xconsole: to /dev/console.
 xconsole:
 xconsole:
 xconsole:
diff --git a/source/x/x11/slack-desc/xev b/source/x/x11/slack-desc/xev
index 4e78a1b61..b291d74b0 100644
--- a/source/x/x11/slack-desc/xev
+++ b/source/x/x11/slack-desc/xev
@@ -10,8 +10,8 @@ xev: xev (X11 event viewer)
 xev:
 xev: xev creates a window and then asks the X server to send it X11 events
 xev: whenever anything happens to the window (such as it being moved,
-xev: resized, typed in, clicked in, etc.).  You can also attach it to an
-xev: existing window.  It is useful for seeing what causes events to occur
+xev: resized, typed in, clicked in, etc.). You can also attach it to an
+xev: existing window. It is useful for seeing what causes events to occur
 xev: and to display the information that they contain; it is essentially
 xev: a debugging and development tool, and should not be needed in normal
 xev: usage.
diff --git a/source/x/x11/slack-desc/xf86-input-keyboard b/source/x/x11/slack-desc/xf86-input-keyboard
index e72beb41a..eb3e6211c 100644
--- a/source/x/x11/slack-desc/xf86-input-keyboard
+++ b/source/x/x11/slack-desc/xf86-input-keyboard
@@ -8,7 +8,7 @@
                    |-----handy-ruler------------------------------------------------------|
 xf86-input-keyboard: kbd (Keyboard input driver for the Xorg X server)
 xf86-input-keyboard:
-xf86-input-keyboard: This is the non-evdev keyboard driver for X.  Most Linux systems
+xf86-input-keyboard: This is the non-evdev keyboard driver for X. Most Linux systems
 xf86-input-keyboard: should be using the evdev driver to handle input devices such as
 xf86-input-keyboard: keyboards and mice, but this driver may be useful as a fallback.
 xf86-input-keyboard:
diff --git a/source/x/x11/slack-desc/xf86-input-mouse b/source/x/x11/slack-desc/xf86-input-mouse
index 73bd88af3..4832ee01c 100644
--- a/source/x/x11/slack-desc/xf86-input-mouse
+++ b/source/x/x11/slack-desc/xf86-input-mouse
@@ -8,7 +8,7 @@
                 |-----handy-ruler------------------------------------------------------|
 xf86-input-mouse: xf86-input-mouse (Mouse Support for X)
 xf86-input-mouse:
-xf86-input-mouse: This is the non-evdev mouse driver for X.  Most Linux systems should
+xf86-input-mouse: This is the non-evdev mouse driver for X. Most Linux systems should
 xf86-input-mouse: be using the evdev driver to handle input devices such as keyboards
 xf86-input-mouse: and mice, but this driver may be useful as a fallback.
 xf86-input-mouse:
diff --git a/source/x/x11/slack-desc/xf86-input-wacom b/source/x/x11/slack-desc/xf86-input-wacom
index 86f4ca62c..2414a43cd 100644
--- a/source/x/x11/slack-desc/xf86-input-wacom
+++ b/source/x/x11/slack-desc/xf86-input-wacom
@@ -9,10 +9,10 @@
 xf86-input-wacom: xf86-input-wacom (driver for Wacom tablets)
 xf86-input-wacom:
 xf86-input-wacom: This package provides the X.Org X11 driver for Wacom and Wacom-like
-xf86-input-wacom: tablets.  It obsoletes the linuxwacom driver and supports X server
-xf86-input-wacom: versions 1.7 and higher. Server versions lower than 1.7 may be
-xf86-input-wacom: supported by this driver, but users are encouraged to use the old
-xf86-input-wacom: linuxwacom driver instead.
+xf86-input-wacom: tablets.
+xf86-input-wacom:
+xf86-input-wacom: Homepage: https://github.com/linuxwacom/xf86-input-wacom
+xf86-input-wacom:
 xf86-input-wacom:
 xf86-input-wacom:
 xf86-input-wacom:
diff --git a/source/x/x11/slack-desc/xf86-video-vboxvideo b/source/x/x11/slack-desc/xf86-video-vboxvideo
new file mode 100644
index 000000000..df80d0a37
--- /dev/null
+++ b/source/x/x11/slack-desc/xf86-video-vboxvideo
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                    |-----handy-ruler------------------------------------------------------|
+xf86-video-vboxvideo: xf86-video-vboxvideo (VirtualBox virtual video card driver)
+xf86-video-vboxvideo:
+xf86-video-vboxvideo: xf86-video-vboxvideo is part of X11.
+xf86-video-vboxvideo:
+xf86-video-vboxvideo: For more information about the X.Org Foundation (the providers of the
+xf86-video-vboxvideo: X.Org implementation of the X Window System), see their website:
+xf86-video-vboxvideo:
+xf86-video-vboxvideo: http://www.x.org
+xf86-video-vboxvideo:
+xf86-video-vboxvideo:
+xf86-video-vboxvideo:
diff --git a/source/x/x11/slack-desc/xf86dgaproto b/source/x/x11/slack-desc/xf86dgaproto
index cbc21ac67..faae89d31 100644
--- a/source/x/x11/slack-desc/xf86dgaproto
+++ b/source/x/x11/slack-desc/xf86dgaproto
@@ -9,7 +9,7 @@
 xf86dgaproto: xf86dgaproto (X.Org XFree86-DGA protocol headers)
 xf86dgaproto:
 xf86dgaproto: xf86dgaproto provides the wire protocol for the XFree86-DGA extension
-xf86dgaproto: in X.Org.  It provides direct, framebuffer-like, graphics access.
+xf86dgaproto: in X.Org. It provides direct, framebuffer-like, graphics access.
 xf86dgaproto:
 xf86dgaproto:
 xf86dgaproto:
diff --git a/source/x/x11/slack-desc/xf86miscproto b/source/x/x11/slack-desc/xf86miscproto
index bf1297b17..c410045f6 100644
--- a/source/x/x11/slack-desc/xf86miscproto
+++ b/source/x/x11/slack-desc/xf86miscproto
@@ -9,7 +9,7 @@
 xf86miscproto: xf86miscproto (C prototypes for XFree86-Misc)
 xf86miscproto:
 xf86miscproto: This package includes the protocol definitions of the "XFree86-Misc"
-xf86miscproto: extension to the X11 protocol.   The "XFree86-Misc" extension is
+xf86miscproto: extension to the X11 protocol. The "XFree86-Misc" extension is
 xf86miscproto: supported by the XFree86 X server and versions of the Xorg X server
 xf86miscproto: prior to Xorg 1.6.
 xf86miscproto:
diff --git a/source/x/x11/slack-desc/xinit b/source/x/x11/slack-desc/xinit
index c64cd86a2..4dd2ff052 100644
--- a/source/x/x11/slack-desc/xinit
+++ b/source/x/x11/slack-desc/xinit
@@ -8,9 +8,9 @@
      |-----handy-ruler------------------------------------------------------|
 xinit: xinit (scripts to start X11 servers)
 xinit:
-xinit: xinit is not intended for naive users.  Instead, site administrators 
+xinit: xinit is not intended for naive users. Instead, site administrators 
 xinit: should design user-friendly scripts that present the desired interface
-xinit: when starting up X.  The startx script is one such example.
+xinit: when starting up X. The startx script is one such example.
 xinit:
 xinit:
 xinit:
diff --git a/source/x/x11/slack-desc/xkill b/source/x/x11/slack-desc/xkill
index 66904b44d..b97746071 100644
--- a/source/x/x11/slack-desc/xkill
+++ b/source/x/x11/slack-desc/xkill
@@ -9,7 +9,7 @@
 xkill: xkill (X11 utility)
 xkill:
 xkill: xkill is a utility for forcing the X server to close connections to
-xkill: clients.  This program is very dangerous, but is useful for aborting
+xkill: clients. This program is very dangerous, but is useful for aborting
 xkill: programs that have displayed undesired windows on a user's screen.
 xkill:
 xkill:
diff --git a/source/x/x11/slack-desc/xmessage b/source/x/x11/slack-desc/xmessage
index 233d4aa26..c56e52e6a 100644
--- a/source/x/x11/slack-desc/xmessage
+++ b/source/x/x11/slack-desc/xmessage
@@ -9,7 +9,7 @@
 xmessage: xmessage (displays a message or query in a window)
 xmessage:
 xmessage: The user can click on an "okay" button to dismiss it or can select
-xmessage: one of several buttons to answer a question.  xmessage can also exit
+xmessage: one of several buttons to answer a question. xmessage can also exit
 xmessage: after a specified time.
 xmessage:
 xmessage:
diff --git a/source/x/x11/slack-desc/xmh b/source/x/x11/slack-desc/xmh
index 8730f1f2a..2078f5f66 100644
--- a/source/x/x11/slack-desc/xmh
+++ b/source/x/x11/slack-desc/xmh
@@ -9,7 +9,7 @@
 xmh: xmh (X11 mail handler)
 xmh:
 xmh: The xmh program provides a graphical user interface to the MH Message
-xmh: Handling System.  To actually do things with your mail, it makes
+xmh: Handling System. To actually do things with your mail, it makes
 xmh: calls to the MH package.
 xmh:
 xmh:
diff --git a/source/x/x11/slack-desc/xmodmap b/source/x/x11/slack-desc/xmodmap
index 9397f1c39..d361aabdd 100644
--- a/source/x/x11/slack-desc/xmodmap
+++ b/source/x/x11/slack-desc/xmodmap
@@ -10,7 +10,7 @@ xmodmap: xmodmap (X11 keyboard utility)
 xmodmap:
 xmodmap: The xmodmap program is used to edit and display the keyboard modifier
 xmodmap: map and keymap table that are used by client applications to convert
-xmodmap: event keycodes into keysyms.  It is usually run from a user's session
+xmodmap: event keycodes into keysyms. It is usually run from a user's session
 xmodmap: startup script to configure the keyboard according to personal tastes.
 xmodmap:
 xmodmap:
diff --git a/source/x/x11/slack-desc/xorg-server b/source/x/x11/slack-desc/xorg-server
index 9d25b405d..a67825a67 100644
--- a/source/x/x11/slack-desc/xorg-server
+++ b/source/x/x11/slack-desc/xorg-server
@@ -9,10 +9,10 @@
 xorg-server: xorg-server (The Xorg server, the core of the X Window System)
 xorg-server:
 xorg-server: Xorg is a full featured X server that was originally designed for UNIX
-xorg-server: and UNIX-like operating systems running on Intel x86 hardware.  It now
+xorg-server: and UNIX-like operating systems running on Intel x86 hardware. It now
 xorg-server: runs on a wider range of hardware and OS platforms.  This work was
 xorg-server: derived by the X.Org Foundation from the XFree86 Project's XFree86
-xorg-server: 4.4rc2  release.  The XFree86 release was originally derived from X386
+xorg-server: 4.4rc2  release. The XFree86 release was originally derived from X386
 xorg-server: 1.2 by Thomas Roell which was contributed to X11R5 by Snitily Graphics
 xorg-server: Consulting Service.
 xorg-server:
diff --git a/source/x/x11/slack-desc/xorg-server-xnest b/source/x/x11/slack-desc/xorg-server-xnest
index 393f93bdd..3995fc84d 100644
--- a/source/x/x11/slack-desc/xorg-server-xnest
+++ b/source/x/x11/slack-desc/xorg-server-xnest
@@ -9,10 +9,10 @@
 xorg-server-xnest: xorg-server-xnest (a nested X server)
 xorg-server-xnest:
 xorg-server-xnest: Xnest is an experimental nested server for X that acts as both a 
-xorg-server-xnest: client and a server.  Xnest is a client of the real server which
+xorg-server-xnest: client and a server. Xnest is a client of the real server which
 xorg-server-xnest: manages windows and graphics requests on its behalf.  Xnest is a
-xorg-server-xnest: server to its own clients.  Xnest manages windows and graphics 
-xorg-server-xnest: requests on their behalf.  To these clients Xnest appears to be a 
+xorg-server-xnest: server to its own clients. Xnest manages windows and graphics 
+xorg-server-xnest: requests on their behalf. To these clients Xnest appears to be a 
 xorg-server-xnest: conventional server.
 xorg-server-xnest:
 xorg-server-xnest:
diff --git a/source/x/x11/slack-desc/xorg-server-xvfb b/source/x/x11/slack-desc/xorg-server-xvfb
index aff9c642c..c9a0ae891 100644
--- a/source/x/x11/slack-desc/xorg-server-xvfb
+++ b/source/x/x11/slack-desc/xorg-server-xvfb
@@ -9,11 +9,11 @@
 xorg-server-xvfb: xorg-server-xvfb (virtual framebuffer X server)
 xorg-server-xvfb:
 xorg-server-xvfb: Xvfb is an X server that can run on machines with no display hardware
-xorg-server-xvfb: and no physical input devices.  It emulates a dumb framebuffer using 
-xorg-server-xvfb: virtual memory.  The primary use of this server is intended to be 
-xorg-server-xvfb: server testing.  The mfb or cfb code for any depth can be exercised
+xorg-server-xvfb: and no physical input devices. It emulates a dumb framebuffer using 
+xorg-server-xvfb: virtual memory. The primary use of this server is intended to be 
+xorg-server-xvfb: server testing. The mfb or cfb code for any depth can be exercised
 xorg-server-xvfb: with this server without the need for real hardware that supports the
-xorg-server-xvfb: desired depths.  A secondary use is testing clients against unusual
+xorg-server-xvfb: desired depths. A secondary use is testing clients against unusual
 xorg-server-xvfb: depths and screen configurations.
 xorg-server-xvfb:
 xorg-server-xvfb:
diff --git a/source/x/x11/slack-desc/xorg-sgml-doctools b/source/x/x11/slack-desc/xorg-sgml-doctools
index df8670042..6f1072946 100644
--- a/source/x/x11/slack-desc/xorg-sgml-doctools
+++ b/source/x/x11/slack-desc/xorg-sgml-doctools
@@ -10,7 +10,7 @@ xorg-sgml-doctools: xorg-sgml-doctools (X.org documentation tools)
 xorg-sgml-doctools:
 xorg-sgml-doctools: This package provides a common set of SGML entities and XML/CSS style
 xorg-sgml-doctools: sheets used in building/formatting the documentation provided in other
-xorg-sgml-doctools: X.Org packages.   It's typically only needed by people building from
+xorg-sgml-doctools: X.Org packages. It's typically only needed by people building from
 xorg-sgml-doctools: source who want to produce formatted documentation from their builds,
 xorg-sgml-doctools: or those who have installed the HTML version of the documentation,
 xorg-sgml-doctools: which refers to the included common xorg.css stylesheet.
diff --git a/source/x/x11/slack-desc/xorgproto b/source/x/x11/slack-desc/xorgproto
new file mode 100644
index 000000000..7467a11cb
--- /dev/null
+++ b/source/x/x11/slack-desc/xorgproto
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+xorgproto: xorgproto (X11 protocol headers)
+xorgproto:
+xorgproto: xorgproto is part of X11.
+xorgproto:
+xorgproto: For more information about the X.Org Foundation (the providers of the
+xorgproto: X.Org implementation of the X Window System), see their website:
+xorgproto:
+xorgproto: http://www.x.org
+xorgproto:
+xorgproto:
+xorgproto:
diff --git a/source/x/x11/slack-desc/xpr b/source/x/x11/slack-desc/xpr
index 45936d409..07ba2d2dc 100644
--- a/source/x/x11/slack-desc/xpr
+++ b/source/x/x11/slack-desc/xpr
@@ -8,8 +8,8 @@
    |-----handy-ruler------------------------------------------------------|
 xpr: xpr (dump an X window directly to a printer)
 xpr:
-xpr: xpr takes as input a window dump file produced by xwd
-xpr: and formats it for output on various types of printers.
+xpr: xpr takes as input a window dump file produced by xwd and formats it
+xpr: for output on various types of printers.
 xpr:
 xpr:
 xpr:
diff --git a/source/x/x11/slack-desc/xpyb b/source/x/x11/slack-desc/xpyb
index 4d96cc270..9a41a08b8 100644
--- a/source/x/x11/slack-desc/xpyb
+++ b/source/x/x11/slack-desc/xpyb
@@ -8,8 +8,8 @@
     |-----handy-ruler------------------------------------------------------|
 xpyb: xpyb (Python bindings for X)
 xpyb:
-xpyb: xpyb provides a Python binding to the X Window System protocol
-xpyb: via libxcb.
+xpyb: xpyb provides a Python binding to the X Window System protocol via
+xpyb: libxcb.
 xpyb:
 xpyb:
 xpyb:
diff --git a/source/x/x11/slack-desc/xrandr b/source/x/x11/slack-desc/xrandr
index 059fe1b32..8ae2e8970 100644
--- a/source/x/x11/slack-desc/xrandr
+++ b/source/x/x11/slack-desc/xrandr
@@ -8,8 +8,8 @@
       |-----handy-ruler------------------------------------------------------|
 xrandr: xrandr (X11 RandR utility)
 xrandr:
-xrandr: Primitive command line interface to X11 Resize, Rotate, and Reflect
-xrandr: (RandR) extension
+xrandr: Primitive command line interface to the X11 Resize, Rotate, and
+xrandr: Reflect (RandR) extensions.
 xrandr:
 xrandr:
 xrandr:
diff --git a/source/x/x11/slack-desc/xstdcmap b/source/x/x11/slack-desc/xstdcmap
index f659e7582..9de5b671e 100644
--- a/source/x/x11/slack-desc/xstdcmap
+++ b/source/x/x11/slack-desc/xstdcmap
@@ -9,7 +9,7 @@
 xstdcmap: xstdcmap (X11 color utility)
 xstdcmap:
 xstdcmap: The xstdcmap utility can be used to selectively define standard
-xstdcmap: colormap properties.  It is intended to be run from a user's X
+xstdcmap: colormap properties. It is intended to be run from a user's X
 xstdcmap: startup script to create standard colormap definitions in order to
 xstdcmap: facilitate sharing of scarce colormap resources among clients using
 xstdcmap: PseudoColor visuals.
diff --git a/source/x/x11/slack-desc/xtrans b/source/x/x11/slack-desc/xtrans
index 26c4866af..06274067c 100644
--- a/source/x/x11/slack-desc/xtrans
+++ b/source/x/x11/slack-desc/xtrans
@@ -10,7 +10,7 @@ xtrans: xtrans (X network transport library)
 xtrans:
 xtrans: xtrans is a library of code that is shared among various X packages
 xtrans: to handle network protocol transport in a modular fashion, allowing a
-xtrans: single place to add new transport types.  It is used by the X server,
+xtrans: single place to add new transport types. It is used by the X server,
 xtrans: libX11, libICE, the X font server, and related components.
 xtrans:
 xtrans:
diff --git a/source/x/x11/src/xf86-input-wacom.url b/source/x/x11/src/xf86-input-wacom.url
index 6bb92bba2..9550a8000 100644
--- a/source/x/x11/src/xf86-input-wacom.url
+++ b/source/x/x11/src/xf86-input-wacom.url
@@ -1 +1 @@
-https://sourceforge.net/projects/linuxwacom/files
+https://github.com/linuxwacom/xf86-input-wacom
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild
index d2d75e4f0..ffce8b0a0 100755
--- a/source/x/x11/x11.SlackBuild
+++ b/source/x/x11/x11.SlackBuild
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 2007-2014  Patrick J. Volkerding, Sebeka, MN, USA
+#!/bin/bash
+# Copyright 2007-2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,11 +26,11 @@
 # ./x11.SlackBuild lib libX11
 
 # Upgrade packages as they are built.
-# Default is to upgrade new packages (UPGRADE_PACKAGES=yes).
-# To install ALL newly built packages (even if they are already installed),
-# use UPGRADE_PACKAGES=always
-# To not upgrade, pass UPGRADE_PACKAGES=no
-UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-yes}
+# Default is to always upgrade newly-built packages (UPGRADE_PACKAGES=always).
+# To install newly built packages only if a package with the exact name is not
+# already installed, use UPGRADE_PACKAGES=yes
+# To not upgrade as packages are built, pass UPGRADE_PACKAGES=no
+UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-always}
 
 pkgbase() {
   PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
@@ -55,8 +55,18 @@ pkgbase() {
 }
 
 # Set initial variables:
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
+cd $(dirname $0) ; CWD=$(pwd)
+if [ -z "$TMP" ]; then
+  TMP=/tmp
+  # Old default output directory. If $TMP wasn't predefined, we'll default to
+  # using it unless a different value is provided:
+  SLACK_X_BUILD_DIR=${SLACK_X_BUILD_DIR:-/tmp/x11-build}
+else
+  # $TMP already set. We'll also use it for the output directory unless
+  # a different value is provided:
+  SLACK_X_BUILD_DIR=${SLACK_X_BUILD_DIR:-$TMP}
+fi
+mkdir -p $TMP $SLACK_X_BUILD_DIR
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -130,9 +140,6 @@ no_usr_share_doc() {
 # Set the compile options for the $ARCH being used:
 . $CWD/arch.use.flags
 
-SLACK_X_BUILD_DIR=$TMP/x11-build
-mkdir -p $SLACK_X_BUILD_DIR
-
 # Better have some binaries installed first, as this may not be
 # in the "magic order".  I built mine by hand through trial-and-error
 # before getting this script to work.  It wasn't that hard...  I think.  ;-)
@@ -171,9 +178,11 @@ mkdir -p $SLACK_X_BUILD_DIR
             continue
           fi
         else
-          echo
-          echo "Building from source ${x_pkg}"
-          echo
+          if [ -z "$PRINT_PACKAGE_NAME" ]; then
+            echo
+            echo "Building from source ${x_pkg}"
+            echo
+          fi
         fi
         if grep -wq "^$PKGNAME" ${CWD}/modularize ; then
           # Set $PKG to a private dir for the modular package build:
@@ -185,6 +194,25 @@ mkdir -p $SLACK_X_BUILD_DIR
         # Let's figure out the version number on the modular package:
         MODULAR_PACKAGE_VERSION=$(echo $x_pkg | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 
+        # If this variable is passed to the script, nothing will be built.
+        # Instead, a list of packages to be built will be output.
+        if [ ! -z "$PRINT_PACKAGE_NAME" ]; then
+          if [ -r $CWD/build/${PKGNAME} ]; then
+            MODBUILD=$(cat $CWD/build/${PKGNAME})
+          else
+            MODBUILD=$BUILD
+          fi
+          if [ ! "${PKGNAME}" = "xorg-server" ]; then
+            echo "${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+          else
+            echo "xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+            echo "xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+            echo "xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+            echo "xorg-server-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+          fi
+          continue
+        fi
+
         rm -rf $(pkgbase $x_pkg)
         tar xf $CWD/src/${x_source_dir}/${x_pkg} || exit 1
         cd $(pkgbase $x_pkg) || exit 1
@@ -207,12 +235,18 @@ mkdir -p $SLACK_X_BUILD_DIR
           . $CWD/configure/configure
         fi
 
-        if ! make $NUMJOBS ; then
-          touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
-          continue
-        fi
+        # Run make, using custom make script if needed:
+        if [ -r $CWD/make/${PKGNAME} ]; then
+          . $CWD/make/${PKGNAME}
+        else
+          # This is the default make && make install routine:
+          if ! make $NUMJOBS ; then
+            touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+            continue
+          fi
 
-        make install DESTDIR=$PKG
+          make install DESTDIR=$PKG
+        fi
 
         mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
         cp -a \
@@ -238,6 +272,9 @@ mkdir -p $SLACK_X_BUILD_DIR
           find . | xargs file | grep "current ar archive" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
         )
 
+        # Don't ship .la files:
+        rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
         # If there's any special post-install things to do, do them:
         if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
           RUNSCRIPT=$(mktemp -p $TMP) || exit 1