Slackware 14.0slackware-14.0

Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
author: Patrick J Volkerding <volkerdi@slackware.com> 2012-09-26 01:10:42 +0000
committer: Eric Hameleers <alien@slackware.com> 2018-05-31 22:51:55 +0200
commit: 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
tree: b428a16618e36ed864a8d76ea3435e19a452bf90 /source/x
parent: 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
download: current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
418 files changed, 2502 insertions, 2648 deletions
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 5feb6fd9..bb3b192f 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -87,6 +87,7 @@ CFLAGS=$SLKCFLAGS \
   --mandir=/usr/man \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --enable-static=no \
   --build=$ARCH-slackware-linux
 
 # Uses a currently non-functional sgml tool, thus '-i':
diff --git a/source/x/fontconfig/fontconfig.dejavu.diff b/source/x/fontconfig/fontconfig.dejavu.diff
index af71a44b..6edcfd37 100644
--- a/source/x/fontconfig/fontconfig.dejavu.diff
+++ b/source/x/fontconfig/fontconfig.dejavu.diff
@@ -1,42 +1,5 @@
-diff -Nur fontconfig-2.8.0.orig/conf.d/45-latin.conf fontconfig-2.8.0/conf.d/45-latin.conf
---- fontconfig-2.8.0.orig/conf.d/45-latin.conf	2009-11-16 11:24:52.000000000 -0600
-+++ fontconfig-2.8.0/conf.d/45-latin.conf	2009-12-01 21:45:42.639936724 -0600
-@@ -10,9 +10,9 @@
-   Serif faces
-  -->
- 	<alias>
--		<family>Bitstream Vera Serif</family>
- 		<family>DejaVu Serif</family>
- 		<family>Liberation Serif</family>
-+		<family>Bitstream Vera Serif</family>
- 		<family>Times New Roman</family>
- 		<family>Times</family>
- 		<family>Nimbus Roman No9 L</family>
-@@ -25,9 +25,9 @@
-   Sans-serif faces
-  -->
- 	<alias>
--		<family>Bitstream Vera Sans</family>
- 		<family>DejaVu Sans</family>
- 		<family>Liberation Sans</family>
-+		<family>Bitstream Vera Sans</family>
- 		<family>Arial</family>
- 		<family>Helvetica</family>
- 		<family>Verdana</family>
-@@ -41,9 +41,9 @@
-   Monospace faces
-  -->
-  	<alias>
--		<family>Bitstream Vera Sans Mono</family>
- 		<family>DejaVu Sans Mono</family>
- 		<family>Liberation Mono</family>
-+		<family>Bitstream Vera Sans Mono</family>
- 		<family>Inconsolata</family>
- 		<family>Courier New</family>
- 		<family>Courier</family>
-diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-latin.conf
---- fontconfig-2.8.0.orig/conf.d/60-latin.conf	2009-11-16 11:24:52.000000000 -0600
-+++ fontconfig-2.8.0/conf.d/60-latin.conf	2009-12-01 21:46:39.925935327 -0600
+--- ./conf.d/60-latin.conf.orig	2012-03-10 00:24:45.000000000 -0600
++++ ./conf.d/60-latin.conf	2012-07-03 15:57:40.109978298 -0500
 @@ -4,8 +4,8 @@
  	<alias>
  		<family>serif</family>
@@ -67,3 +30,65 @@ diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-
  			<family>Inconsolata</family>
  			<family>Andale Mono</family>
  			<family>Courier New</family>
+--- ./conf.d/45-latin.conf.orig	2012-03-10 00:24:45.000000000 -0600
++++ ./conf.d/45-latin.conf	2012-07-03 15:57:28.685978786 -0500
+@@ -10,15 +10,15 @@
+   Serif faces
+  -->
+ 	<alias>
+-		<family>Bitstream Vera Serif</family>
++		<family>DejaVu Serif</family>
+ 		<default><family>serif</family></default>
+ 	</alias>
+ 	<alias>
+-		<family>DejaVu Serif</family>
++		<family>Liberation Serif</family>
+ 		<default><family>serif</family></default>
+ 	</alias>
+ 	<alias>
+-		<family>Liberation Serif</family>
++		<family>Bitstream Vera Serif</family>
+ 		<default><family>serif</family></default>
+ 	</alias>
+ 	<alias>
+@@ -49,15 +49,15 @@
+   Sans-serif faces
+  -->
+ 	<alias>
+-		<family>Bitstream Vera Sans</family>
++		<family>DejaVu Sans</family>
+ 		<default><family>sans-serif</family></default>
+ 	</alias>
+ 	<alias>
+-		<family>DejaVu Sans</family>
++		<family>Liberation Sans</family>
+ 		<default><family>sans-serif</family></default>
+ 	</alias>
+ 	<alias>
+-		<family>Liberation Sans</family>
++		<family>Bitstream Vera Sans</family>
+ 		<default><family>sans-serif</family></default>
+ 	</alias>
+ 	<alias>
+@@ -91,10 +91,6 @@
+ <!--
+   Monospace faces
+  -->
+- 	<alias>
+-		<family>Bitstream Vera Sans Mono</family>
+-		<default><family>monospace</family></default>
+-	</alias>
+ 	<alias>
+ 		<family>DejaVu Sans Mono</family>
+ 		<default><family>monospace</family></default>
+@@ -103,6 +99,10 @@
+ 		<family>Liberation Mono</family>
+ 		<default><family>monospace</family></default>
+ 	</alias>
++ 	<alias>
++		<family>Bitstream Vera Sans Mono</family>
++		<default><family>monospace</family></default>
++	</alias>
+ 	<alias>
+ 		<family>Inconsolata</family>
+ 		<default><family>monospace</family></default>
diff --git a/source/x/freeglut/RATIONALE b/source/x/freeglut/RATIONALE
new file mode 100644
index 00000000..0e2c59ba
--- /dev/null
+++ b/source/x/freeglut/RATIONALE
@@ -0,0 +1,14 @@
+From mesa-8.0 git log:
+
+    commit 34a28ccbf459ed5710aafba5e7149e8291cb808c
+    Author: José Fonseca <jose.r.fonseca@gmail.com>
+    Date:   Sat Jul 9 11:07:14 2011 +0100
+    
+        glut: Remove GLUT source.
+    
+        Most distros ship freeglut, and most people don't care one vs the other,
+        and it hasn't been really maintained.
+    
+        So it is better to have Mesa GLUT be revisioned and built separately
+        from Mesa.
+
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
new file mode 100755
index 00000000..e209f82e
--- /dev/null
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for freeglut
+
+# Copyright 2012  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=freeglut
+VERSION=${VERSION:-2.8.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --disable-static \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.{html,png} $PKG/usr/doc/$PRGNAM-$VERSION/html
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/freeglut/slack-desc b/source/x/freeglut/slack-desc
new file mode 100644
index 00000000..9fcda6f5
--- /dev/null
+++ b/source/x/freeglut/slack-desc
@@ -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 ':' except on otherwise blank lines.
+
+        |-----handy-ruler------------------------------------------------------|
+freeglut: freeglut (alternative GLUT library)
+freeglut:
+freeglut: freeglut is a completely OpenSourced alternative to the OpenGL 
+freeglut: Utility Toolkit (GLUT) library.  GLUT (and hence freeglut) allows 
+freeglut: the user to create and manage windows containing OpenGL contexts 
+freeglut: on a wide range of platforms and also read the mouse, keyboard, and 
+freeglut: joystick functions.
+freeglut:
+freeglut: Homepage: http://freeglut.sourceforge.net/
+freeglut:
+freeglut:
diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild
index fff398a1..31181fb5 100755
--- a/source/x/libdrm/libdrm.SlackBuild
+++ b/source/x/libdrm/libdrm.SlackBuild
@@ -60,9 +60,6 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
-# Fix missing definitions in drm_mode.h:
-zcat $CWD/libdrm.uint32_t.diff.gz | patch -p1 --verbose || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -79,6 +76,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-udev \
   --enable-nouveau-experimental-api \
   --enable-vmwgfx-experimental-api \
+  --enable-omap-experimental-api \
   --build=$ARCH-slackware-linux
 
 # Build and install:
diff --git a/source/x/libdrm/libdrm.uint32_t.diff b/source/x/libdrm/libdrm.uint32_t.diff
deleted file mode 100644
index 571d72ac..00000000
--- a/source/x/libdrm/libdrm.uint32_t.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/drm/drm_mode.h.orig	2010-01-21 12:45:40.000000000 -0600
-+++ ./include/drm/drm_mode.h	2010-02-22 13:16:36.000000000 -0600
-@@ -307,6 +307,8 @@
- #define DRM_MODE_PAGE_FLIP_EVENT 0x01
- #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
- 
-+#include <stdint.h> /* needed for uint32_t and uint64_t typedefs */
-+
- struct drm_mode_crtc_page_flip {
- 	uint32_t crtc_id;
- 	uint32_t fb_id;
diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
index 9dcecac1..97a92cb4 100755
--- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
+++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.06.0.20100721
+VERSION=1.07.2
 ARCH=noarch
-BUILD=3
+BUILD=1
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild
index 92a9ed16..9394cc07 100755
--- a/source/x/libhangul/libhangul.SlackBuild
+++ b/source/x/libhangul/libhangul.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Eric Hameleers , Eindhoven, NL
-# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Eric Hameleers , Eindhoven, NL
+# Copyright 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,23 +32,27 @@
 #
 # -----------------------------------------------------------------------------
 
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
 
 PKGNAM=libhangul
-VERSION=${VERSION:-0.0.12}
+VERSION=${VERSION:-0.1.0}
 BUILD=${BUILD:-1}
 
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -58,11 +62,19 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+case "$ARCH" in
+    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+    *)    TARGET=$ARCH-slackware-linux ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -93,7 +105,7 @@ CFLAGS="$SLKCFLAGS" \
   --disable-static \
   --program-prefix= \
   --program-suffix= \
-  --build=$ARCH-slackware-linux
+  --build=$TARGET
 
 make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
@@ -129,5 +141,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/libhangul/slack-desc b/source/x/libhangul/slack-desc
index 8d76a757..49b2eec1 100644
--- a/source/x/libhangul/slack-desc
+++ b/source/x/libhangul/slack-desc
@@ -12,7 +12,7 @@ libhangul: This library implements Hangul keyboard input with various types of
 libhangul: Korean keyboards. It is intended to be a base library of Korean
 libhangul: input methods on multiple platforms.
 libhangul:
-libhangul: libhangul home: http://kldp.net/projects/hangul/
+libhangul: libhangul home: http://code.google.com/p/libhangul/
 libhangul:
 libhangul:
 libhangul:
diff --git a/source/x/mesa/get-mesa.sh b/source/x/mesa/get-mesa.sh
index c014d8a1..253deeb4 100755
--- a/source/x/mesa/get-mesa.sh
+++ b/source/x/mesa/get-mesa.sh
@@ -1,5 +1,5 @@
 # Pull a stable branch + patches
-BRANCH=7.9
+BRANCH=7.10
 
 rm -rf mesa
 git clone git://anongit.freedesktop.org/git/mesa/mesa
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 7bdc273e..ca670188 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -21,14 +21,14 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=mesa
-VERSION=7.9.2
+VERSION=8.0.4
 DEMOVERS=8.0.1
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j8}
 
 # Be sure this list is up-to-date:
-DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
+DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -59,11 +59,6 @@ cd $TMP
 rm -rf Mesa-${VERSION}
 
 tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1
-# If MesaLib came from git, we might already have GLUT.
-if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then
-  tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1
-fi
-
 cd Mesa-$VERSION
 
 # Make sure ownerships and permissions are sane:
@@ -76,21 +71,14 @@ find . \
 
 # Apply patches from git (and maybe elsewhere):
 # Patches obtained by:
-#   git checkout origin/7.9
-#   git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1..
+#   git checkout origin/8.0
+#   git format-patch 3d657b14b4cab98a2945904823e78cd8950944f4.. # 8.0.3 release
 if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
   for patch in $CWD/patches/*.patch ; do
     patch -p1 < $patch || exit 1 ; 
   done
 fi
 
-# Revert "i915: Enable ARB_fragment_shader by default."
-# https://bugzilla.redhat.com/show_bug.cgi?id=643399 
-zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1
-
-# Allow to build against libdrm-2.4.23:
-zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1
-
 if [ ! -r configure ]; then
   autoreconf || exit 1
 fi
@@ -104,17 +92,13 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/mesa-$VERSION \
   --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
   --with-dri-drivers="$DRI_DRIVERS" \
-  --enable-xcb \
-  --enable-gallium-nouveau \
+  --with-gallium-drivers=nouveau,swrast,r300,r600 \
+  --enable-gallium-llvm \
   --build=$ARCH-slackware-linux
 
-#  --enable-gallium-llvm \
-#  --enable-gallium-swrast \
-#  --disable-gallium-svga \
-#  --disable-gallium-i915 \
-#  --disable-gallium-i965 \
-#  --disable-gallium-radeon \
-#  --disable-gallium-r600 \
+# r300 requires llvm
+# Other gallium drivers:
+# galahad,i915,identity,llvmpipe,noop,nv50,nvc0,nvfx,rbug,softpipe,svga,trace
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/x/mesa/patches/i915_fragment_shader_disable.patch b/source/x/mesa/patches/i915_fragment_shader_disable.patch
deleted file mode 100644
index d2aee8e7..00000000
--- a/source/x/mesa/patches/i915_fragment_shader_disable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Wed, 8 Sep 2010 12:33:09 -0400
-Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
-
-This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
----
- src/mesa/drivers/dri/intel/intel_screen.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index 0a542a7..8ae2cd2 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
- 	 DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
-       DRI_CONF_OPT_END
- 
--      DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
-+      DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
- 	 DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
-       DRI_CONF_OPT_END
- 
--- 
-1.7.2
-
diff --git a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
deleted file mode 100644
index d0ce04d2..00000000
--- a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
---- a/src/gallium/drivers/nouveau/nouveau_screen.c	2010-10-02 00:51:28.000000000 +0200
-+++ b/src/gallium/drivers/nouveau/nouveau_screen.c	2010-12-11 18:18:20.527000045 +0100
-@@ -236,7 +236,7 @@
- 	int ret;
- 
- 	ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
--				    &screen->channel);
-+				    512*1024, &screen->channel);
- 	if (ret)
- 		return ret;
- 	screen->device = dev;
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c	2010-12-11 18:18:20.528000045 +0100
-@@ -129,7 +129,7 @@
- 
- 	/* Allocate a hardware channel. */
- 	ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
--				    &nctx->hw.chan);
-+				    512*1024, &nctx->hw.chan);
- 	if (ret) {
- 		nouveau_error("Error initializing the FIFO.\n");
- 		return GL_FALSE;
-Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-04-27 23:41:21.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c	2010-12-11 18:09:19.750000046 +0100
-@@ -34,8 +34,8 @@
- 		      unsigned flags, unsigned format,
- 		      unsigned width, unsigned height)
- {
--	unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
--	int ret;
-+	unsigned tile_mode = 0, tile_flags = 0;
-+	int ret, cpp = _mesa_get_format_bytes(format);
- 
- 	nouveau_bo_ref(NULL, &s->bo);
- 
-@@ -51,13 +51,21 @@
- 	if (layout == TILED) {
- 		s->pitch = align(s->pitch, 256);
- 		tile_mode = s->pitch;
-+
-+		if (cpp == 4)
-+			tile_flags = NOUVEAU_BO_TILE_32BPP;
-+		else if (cpp == 2)
-+			tile_flags = NOUVEAU_BO_TILE_16BPP;
-+
-+		if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
-+			tile_flags |= NOUVEAU_BO_TILE_ZETA;
-+
- 	} else {
- 		s->pitch = align(s->pitch, 64);
--		tile_mode = 0;
- 	}
- 
- 	ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
--				  tile_mode, 0, &s->bo);
-+				  tile_mode, tile_flags, &s->bo);
- 	assert(!ret);
- }
- 
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c	2010-12-11 18:18:20.528000045 +0100
-@@ -32,7 +32,7 @@
- 
- /* Arbitrary pushbuf length we can assume we can get with a single
-  * WAIT_RING. */
--#define PUSHBUF_DWORDS 2048
-+#define PUSHBUF_DWORDS 65536
- 
- /* Functions to set up struct nouveau_array_state from something like
-  * a GL array or index buffer. */
-diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
---- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c	2010-12-11 18:15:17.756000046 +0100
-@@ -64,8 +64,8 @@
- 
- 	if (!nfb->lma_bo || nfb->lma_bo->size != size) {
- 		nouveau_bo_ref(NULL, &nfb->lma_bo);
--		nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
--			       &nfb->lma_bo);
-+		nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
-+				    0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
- 	}
- 
- 	nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,
diff --git a/source/x/mtdev/mtdev.SlackBuild b/source/x/mtdev/mtdev.SlackBuild
new file mode 100755
index 00000000..e973ed34
--- /dev/null
+++ b/source/x/mtdev/mtdev.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for mtdev
+
+# Copyright 2012  Robby Workman, Northport, Alabama, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=mtdev
+VERSION=${VERSION:-1.1.2}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PRGNAM
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --disable-static
+
+make
+make install DESTDIR=$PKG
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING ChangeLog INSTALL README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/mtdev/mtdev.url b/source/x/mtdev/mtdev.url
new file mode 100644
index 00000000..f1989e19
--- /dev/null
+++ b/source/x/mtdev/mtdev.url
@@ -0,0 +1 @@
+http://bitmath.org/code/mtdev/
diff --git a/source/x/mtdev/slack-desc b/source/x/mtdev/slack-desc
new file mode 100644
index 00000000..0eaaae9e
--- /dev/null
+++ b/source/x/mtdev/slack-desc
@@ -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 ':' except on otherwise blank lines.
+
+     |-----handy-ruler------------------------------------------------------|
+mtdev: mtdev (multitouch device library)
+mtdev:
+mtdev: mtdev is a stand-alone library which transforms all variants of
+mtdev: kernel MT events to the slotted type B protocol.  The events put
+mtdev: into mtdev may be from any MT device, specifically type A without
+mtdev: contact tracking, type A with contact tracking, or type B with
+mtdev: contact tracking.
+mtdev: The bulk of the mtdev code has been out there since 2008 as part of
+mtdev: the Multitouch X Driver.  With this package, finger tracking and 
+mtdev: seamless MT protocol handling is available under a free license. 
+mtdev:
diff --git a/source/x/radeon_ucode/slack-desc b/source/x/radeon_ucode/slack-desc
deleted file mode 100644
index 01810b94..00000000
--- a/source/x/radeon_ucode/slack-desc
+++ /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------------------------------------------------------|
-radeon_ucode: radeon_ucode (microcode/firmware for some Radeon graphics cards)
-radeon_ucode:
-radeon_ucode: radeon_ucode contains the microcode/firmware for some models of
-radeon_ucode: ATI/AMD Radeon graphics cards.  
-radeon_ucode:
-radeon_ucode: http://people.freedesktop.org/~agd5f/radeon_ucode/
-radeon_ucode:
-radeon_ucode:
-radeon_ucode:
-radeon_ucode:
-radeon_ucode:
diff --git a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
deleted file mode 100644
index 2542d649..00000000
--- a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
+++ /dev/null
@@ -1,51 +0,0 @@
-Copyright (C) 2009-2011  Advanced Micro Devices, Inc. All rights reserved.
-
-REDISTRIBUTION: Permission is hereby granted, free of any license fees,
-to any person obtaining a copy of this microcode (the "Software"), to
-install, reproduce, copy and distribute copies, in binary form only, of
-the Software and to permit persons to whom the Software is provided to
-do the same, provided that the following conditions are met:
-
-No reverse engineering, decompilation, or disassembly of this Software
-is permitted.
-
-Redistributions must reproduce the above copyright notice, this
-permission notice, and the following disclaimers and notices in the
-Software documentation and/or other materials provided with the
-Software.
-
-DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK.  THE SOFTWARE
-IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
-HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
-MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
-UNINTERRUPTED OR ERROR-FREE.  THE ENTIRE RISK ASSOCIATED WITH THE USE OF
-THE SOFTWARE IS ASSUMED BY YOU.  FURTHERMORE, COPYRIGHT HOLDER AND ITS
-LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
-OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
-ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
-
-DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
-HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
-("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
-PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
-LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
-BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
-INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
-PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
-REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  IN
-NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
-LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
-CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
-US$10.
-
-Notice:  The Software is subject to United States export laws and
-regulations.  You agree to comply with all domestic and international
-export laws and regulations that apply to the Software, including but
-not limited to the Export Administration Regulations administered by the
-U.S. Department of Commerce and International Traffic in Arm Regulations
-administered by the U.S. Department of State.  These laws include
-restrictions on destinations, end users and end use.
diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild
index 36850635..ee43c38b 100755
--- a/source/x/scim-anthy/scim-anthy.SlackBuild
+++ b/source/x/scim-anthy/scim-anthy.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,12 +33,22 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-anthy
-VERSION=${VERSION:-1.2.4}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-anthy
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -52,14 +62,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 
 zcat $CWD/scim-anthy.gcc43.diff.gz | patch -p1 --verbose || exit 1
 
@@ -87,10 +97,10 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -109,5 +119,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild
index c3494c8b..8501d9c4 100755
--- a/source/x/scim-bridge/scim-bridge.SlackBuild
+++ b/source/x/scim-bridge/scim-bridge.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2011, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,18 +33,19 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-bridge
-VERSION=${VERSION:-0.4.16}
+PKGNAM=scim-bridge
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -68,14 +69,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 #sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * )
 
 zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1
@@ -101,7 +102,7 @@ CFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
   --enable-agent \
   --enable-ltdl-install \
   --enable-gtk2-immodule \
@@ -129,10 +130,10 @@ fi
 EOINS
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -151,5 +152,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
index 1731a202..58f17654 100755
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ b/source/x/scim-hangul/scim-hangul.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-hangul
-VERSION=${VERSION:-0.3.2}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-hangul
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -52,17 +62,18 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 
 zcat $CWD/scim-hangul.gcc43.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/scim-hangul.gcc47.diff.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
@@ -89,10 +100,10 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING NEWS README ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -111,5 +122,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim-hangul/scim-hangul.gcc47.diff b/source/x/scim-hangul/scim-hangul.gcc47.diff
new file mode 100644
index 00000000..7e0c52c6
--- /dev/null
+++ b/source/x/scim-hangul/scim-hangul.gcc47.diff
@@ -0,0 +1,11 @@
+--- ./src/scim_hangul_imengine.cpp.orig	2012-05-11 22:51:39.653751057 -0500
++++ ./src/scim_hangul_imengine.cpp	2012-05-11 22:53:45.793739278 -0500
+@@ -33,6 +33,8 @@
+   #include <config.h>
+ #endif
+ 
++#include <unistd.h>
++
+ #include <scim.h>
+ #include "scim_hangul_imengine.h"
+ 
diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild
index a836a3fa..e5985946 100755
--- a/source/x/scim-input-pad/scim-input-pad.SlackBuild
+++ b/source/x/scim-input-pad/scim-input-pad.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -24,11 +24,21 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-input-pad
-VERSION=${VERSION:-0.1.2}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-input-pad
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-4}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -50,14 +60,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -85,11 +95,11 @@ make DESTDIR=$PKG install || exit 1
 sed -i -e "s#/usr/lib${LIBDIRSUFFIX}/scim-.*/scim-helper-launcher#$(ls /usr/lib${LIBDIRSUFFIX}/scim-*/scim-helper-launcher)#" $PKG/usr/bin/scim-input-pad
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+  $PKG/usr/doc/$PKGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
 
 # Strip binaries:
 cd $PKG
@@ -102,5 +112,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim-input-pad/slack-desc b/source/x/scim-input-pad/slack-desc
index add837f7..d6275692 100644
--- a/source/x/scim-input-pad/slack-desc
+++ b/source/x/scim-input-pad/slack-desc
@@ -9,7 +9,7 @@
 scim-input-pad: scim-input-pad (on-screen input pad for scim)
 scim-input-pad:
 scim-input-pad: This is scim-input-pad, which provides an on-screen input pad
-scim-input-pad: to enter symbols and chinese characters.
+scim-input-pad: to enter symbols and Chinese characters.
 scim-input-pad:
 scim-input-pad:
 scim-input-pad:
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
index e624ca80..cf060221 100755
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ b/source/x/scim-m17n/scim-m17n.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-m17n
-VERSION=${VERSION:-0.2.3}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-m17n
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -59,14 +69,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -91,10 +101,10 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
@@ -119,5 +129,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild
index 79337b1e..9eefad63 100755
--- a/source/x/scim-pinyin/scim-pinyin.SlackBuild
+++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,12 +33,22 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-pinyin
-VERSION=${VERSION:-0.5.91}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-pinyin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j7 "}
 BUILD=${BUILD:-2}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -52,14 +62,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 
 # Apply fix for our gcc 4.3.x
 zcat $CWD/scim-pinyin.gcc43.diff.gz | patch -p1 --verbose || exit 1
@@ -103,11 +113,11 @@ make DESTDIR=$PKG install || exit 1
 #cd -
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+  $PKG/usr/doc/$PKGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
 
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
@@ -125,5 +135,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild
index 8f577345..a6d219c2 100755
--- a/source/x/scim-tables/scim-tables.SlackBuild
+++ b/source/x/scim-tables/scim-tables.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim-tables
-VERSION=${VERSION:-0.5.9}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-tables
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-3}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -59,14 +69,14 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -92,11 +102,11 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+  $PKG/usr/doc/$PKGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
 
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
@@ -115,5 +125,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
deleted file mode 100644
index 1d9590fd..00000000
--- a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scim-1.4.9/src/ltdl.cpp.bak	2008-11-02 14:42:40.000000000 +0800
-+++ scim-1.4.9/src/ltdl.cpp	2010-09-12 00:23:24.085978400 +0800
-@@ -3361,7 +3361,7 @@
- {
-   lt_dlhandle	handle		= 0;
-   char *	tmp		= 0;
--  char *	ext		= 0;
-+  const char *	ext		= 0;
-   size_t	len;
-   int		errors		= 0;
- 
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
index c0c50fb4..d03adc6e 100755
--- a/source/x/scim/scim.SlackBuild
+++ b/source/x/scim/scim.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Copyright 2006,2007,2008  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2006, 2007, 2008  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2011, 2012  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,18 +33,19 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=scim
-VERSION=${VERSION:-1.4.9}
-BUILD=${BUILD:-5}
+PKGNAM=scim
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i486 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 if [ "$ARCH" = "i486" ]; then
@@ -68,17 +69,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
-
-zcat $CWD/scim-1.4.9-fix-ltdl.cpp.patch.gz | patch -p1 --verbose || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
 
 chown -R root:root .
 find . \
@@ -95,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
             --localstatedir=/var \
             --sysconfdir=/etc \
             --disable-static \
+            --with-gtk-version=2 \
             --program-prefix= \
             --program-suffix= \
             --build=$ARCH-slackware-linux
@@ -265,15 +265,15 @@ fi
 EOINS
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures
 cp -a \
   ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 # Install documentation and user manual
 cp -a docs/manual/zh_CN/user-manual.html \
-  $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/
+  $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/
 cp -a docs/manual/zh_CN/figures/*.png \
-   $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures/
+   $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures/
 
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -285,5 +285,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig
index 944207bf..724242ab 100644
--- a/source/x/x11-skel/scripts/xwmconfig
+++ b/source/x/x11-skel/scripts/xwmconfig
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999, 2002  Patrick Volkerding, Moorhead, Minnesota USA
+# Copyright 1999, 2002, 2012  Patrick Volkerding, Moorhead, Minnesota USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -50,7 +50,7 @@ fi
 if [ "$USER" = "root" ]; then
   BACKTITLE="--backtitle \"Setting system-wide default window manager in /etc/X11/xinit/\""
 else
-  BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc\""
+  BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc and $HOME/.xsession\""
 fi
 
 # This stops --backtitle from cluttering the initial install:
@@ -211,13 +211,19 @@ if [ "$USER" = "root" ]; then
   fi
 fi
 
-# Also set up a new $HOME/.xinitrc:
+# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc:
 if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then
   if [ -r $HOME/.xinitrc ]; then
     rm -f $HOME/.xinitrc-backup
     mv $HOME/.xinitrc $HOME/.xinitrc-backup
   fi
   cat /etc/X11/xinit/$OUTPUT > $HOME/.xinitrc
+  if [ -r $HOME/.xsession ]; then
+    rm -f $HOME/.xsession-backup
+    mv $HOME/.xsession $HOME/.xsession-backup
+  fi
+  cat /etc/X11/xinit/$OUTPUT > $HOME/.xsession
+  chmod 755 $HOME/.xsession
 fi
 
 rm -f $TMP/tmpscript.sh $TMP/output
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index cd8559b7..98381b68 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011, 2012  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=7.4
-BUILD=${BUILD:-2}
+VERSION=7.7
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libXaw3d
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libX11
+++ b/source/x/x11/build/libXaw3d
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xcb-proto
index 00750edc..00750edc 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xcb-proto
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xdm
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/xcompmgr
+++ b/source/x/x11/build/xdm
diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-wacom
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/xf86-input-acecad
+++ b/source/x/x11/build/xf86-input-wacom
diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-video-apm
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/xf86-input-penmount
+++ b/source/x/x11/build/xf86-video-apm
diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-chips
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/xf86-video-openchrome
+++ b/source/x/x11/build/xf86-video-chips
diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-i740
+++ b/source/x/x11/build/xf86-video-i740
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/xf86-video-mach64
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/xf86-video-r128
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/xf86-video-s3virge
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-radeonhd b/source/x/x11/build/xf86-video-sisusb
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/xf86-video-radeonhd
+++ b/source/x/x11/build/xf86-video-sisusb
diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/xf86-video-tdfx
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga
index 0cfbf088..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-tga
+++ b/source/x/x11/build/xf86-video-tga
@@ -1 +1 @@
-2
+4
diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86-video-tseng
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index b8626c4c..7ed6ff82 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-4
+5
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/xf86-video-vesa
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86-video-voodoo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-xgi b/source/x/x11/build/xf86-video-xgi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86-video-xgi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xorg-server
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xpyb b/source/x/x11/build/xpyb
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xpyb
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
index aebd49a2..8a960f3d 100644
--- a/source/x/x11/configure/compiz
+++ b/source/x/x11/configure/compiz
@@ -11,6 +11,6 @@ CXXFLAGS=$SLKCFLAGS \
   --disable-static \
   --disable-gconf \
   --disable-kde \
-  --enable-kde4 \
+  --disable-kde4 \
   --enable-librsvg \
   --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d
new file mode 100644
index 00000000..0d802fa3
--- /dev/null
+++ b/source/x/x11/configure/libXaw3d
@@ -0,0 +1,16 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --infodir=/usr/info \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+  --disable-static \
+  --enable-multiplane-bitmaps \
+  --enable-gray-stipples \
+  --enable-arrow-scrollbars \
+  --enable-internationalization \
+  --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
deleted file mode 100644
index 0eacb0c3..00000000
--- a/source/x/x11/configure/xf86-video-ati
+++ /dev/null
@@ -1,21 +0,0 @@
-xserver_source="/tmp/x11-build/xorg-server-1.9.3"
-
-# Let these just fail to build.  In any case, an "exit 1"
-# here is just plain wrong.
-#if [ ! -d "$xserver_source" ]; then
-#  echo "$xserver_source does not exist, and you need it."
-#  exit 1
-#fi
-
-CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-static \
-  --with-xserver-source=${xserver_source} \
-  --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index cf9bd843..778d7668 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -27,14 +27,15 @@ CFLAGS="$SLKCFLAGS" \
   --with-int10=x86emu \
   --with-default-font-path="${DEF_FONTPATH}" \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
-  --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
-  --with-os-name="Slackware 13.37" \
+  --with-os-name="Slackware 14.0" \
   --with-os-vendor="Slackware Linux Project" \
   --with-xkb-path=/etc/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
   $BUILD_SERVERS \
   --build=$ARCH-slackware-linux
 
+#  --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri
+
 if [ "$ARCH" = "x86_64" ]; then
   # To prevent the error "No rule to make target `-ldl'"
   sed -i -e 's#-ldl##' hw/xfree86/Makefile
diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm
index bb08dc5f..e1d72520 100644
--- a/source/x/x11/doinst.sh/xdm
+++ b/source/x/x11/doinst.sh/xdm
@@ -1,15 +1,18 @@
-#!/bin/sh
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config etc/X11/xdm/xdm-config.new
-config etc/X11/xdm/Xservers.new
-config etc/X11/xdm/Xsession.new
+for conffile in \
+  Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \
+  GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ;
+do
+  config etc/X11/xdm/${conffile}.new
+done
+
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 47da583f..d6eb2f68 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -1,7 +1,6 @@
 # If a package is listed here, it will be built apart from the
 # usual "grab bag" package that's made from each source directory.
 
-applewmproto
 appres
 bdftopcf
 beforelight
@@ -9,7 +8,6 @@ bigreqsproto
 bitmap
 compiz
 compositeproto
-constype
 damageproto
 dmxproto
 dri2proto
@@ -67,16 +65,15 @@ imake
 inputproto
 intel-gpu-tools
 kbproto
-libAppleWM
 libFS
 libICE
 libSM
-libWindowsWM
 libX11
 libXScrnSaver
-libXTrap
 libXau
 libXaw
+libXaw3d
+libXcm
 libXcomposite
 libXcursor
 libXdamage
@@ -92,8 +89,6 @@ libXinerama
 libXmu
 libXp
 libXpm
-libXprintAppUtil
-libXprintUtil
 libXrandr
 libXrender
 libXres
@@ -110,38 +105,31 @@ libpciaccess
 libpthread-stubs
 libxcb
 libxkbfile
-libxkbui
 listres
 lndir
 luit
 makedepend
-mkcfm
 mkcomposecache
 mkfontdir
 mkfontscale
 oclock
 pixman
 printproto
-proxymngr
 randrproto
 recordproto
 rendercheck
 renderproto
 resourceproto
 rgb
-rstart
-scripts
 scrnsaverproto
 sessreg
 setxkbmap
 showfont
 smproxy
-trapproto
 twm
 util-macros
 videoproto
 viewres
-windowswmproto
 x11perf
 xauth
 xbacklight
@@ -150,6 +138,10 @@ xbitmaps
 xcalc
 xcb-proto
 xcb-util
+xcb-util-image
+xcb-util-keysyms
+xcb-util-renderutil
+xcb-util-wm
 xclipboard
 xclock
 xcmiscproto
@@ -169,17 +161,13 @@ xextproto
 xeyes
 xf86-input-acecad
 xf86-input-aiptek
-xf86-input-citron
 xf86-input-evdev
 xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
 xf86-input-penmount
 xf86-input-synaptics
 xf86-input-vmmouse
 xf86-input-void
 xf86-input-wacom
-xf86-video-geode
 xf86-video-apm
 xf86-video-ark
 xf86-video-ast
@@ -187,19 +175,19 @@ xf86-video-ati
 xf86-video-chips
 xf86-video-cirrus
 xf86-video-dummy
-xf86-video-fbdev
+xf86-video-geode
 xf86-video-glint
 xf86-video-i128
 xf86-video-i740
-xf86-video-i810
 xf86-video-intel
 xf86-video-mach64
 xf86-video-mga
+xf86-video-modesetting
 xf86-video-neomagic
 xf86-video-nouveau
-xf86-video-nsc
 xf86-video-nv
 xf86-video-openchrome
+xf86-video-qxl
 xf86-video-r128
 xf86-video-rendition
 xf86-video-s3
@@ -208,13 +196,6 @@ xf86-video-savage
 xf86-video-siliconmotion
 xf86-video-sis
 xf86-video-sisusb
-xf86-video-sunbw2
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
 xf86-video-tdfx
 xf86-video-tga
 xf86-video-trident
@@ -223,22 +204,17 @@ xf86-video-v4l
 xf86-video-vesa
 xf86-video-vmware
 xf86-video-voodoo
-xf86-video-wsfb
 xf86-video-xgi
-xf86-video-xgixp
 xf86bigfontproto
 xf86dga
 xf86dgaproto
 xf86driproto
 xf86miscproto
-xf86rushproto
 xf86vidmodeproto
 xfd
-xfindproxy
 xfontsel
 xfs
 xfsinfo
-xfwp
 xgamma
 xgc
 xhost
@@ -265,27 +241,23 @@ xmore
 xorg-cf-files
 xorg-docs
 xorg-server
+xorg-server-xephyr
+xorg-server-xnest
+xorg-server-xvfb
 xorg-sgml-doctools
-xphelloworld
-xplsprinters
 xpr
-xprehashprinterlist
 xprop
 xproto
-xproxymanagementprotocol
 xpyb
 xrandr
 xrdb
 xrefresh
 xscope
 xset
-xsetmode
-xsetpointer
 xsetroot
 xsm
 xstdcmap
 xtrans
-xtrap
 xvidtune
 xvinfo
 xwd
diff --git a/source/x/x11/noarch b/source/x/x11/noarch
index 79eb0e56..480ffc26 100644
--- a/source/x/x11/noarch
+++ b/source/x/x11/noarch
@@ -56,26 +56,21 @@ randrproto
 recordproto
 renderproto
 resourceproto
-scripts
 scrnsaverproto
-trapproto
 ttf-indic-fonts
 util-macros
 videoproto
 x11-skel
-xcb-proto
 xcmiscproto
 xcursor-themes
 xf86bigfontproto
 xf86dgaproto
 xf86driproto
 xf86miscproto
-xf86rushproto
 xf86vidmodeproto
 xineramaproto
 xkeyboard-config
 xorg-cf-files
 xorg-docs
 xproto
-xproxymanagementprotocol
 xtrans
diff --git a/source/x/x11/patch/xf86-video-chips.patch b/source/x/x11/patch/xf86-video-chips.patch
new file mode 100644
index 00000000..a5a54ac0
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips.patch
@@ -0,0 +1,4 @@
+for patchfile in $CWD/patch/xf86-video-chips/*.patch ; do 
+  cat $patchfile | patch -p1 --verbose \
+    || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } ;
+done
diff --git a/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch
new file mode 100644
index 00000000..a52e4103
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch
@@ -0,0 +1,588 @@
+From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Tue, 29 Mar 2011 13:53:31 +1000
+Subject: [PATCH 1/9] chips: gut the overlay 8/16 support from driver.
+
+This driver is for chips that were bought by Intel in 1997,
+this feature means maintaining a lot of code in the X server
+for little gain.
+
+Drop it like its hot.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ man/chips.man   |    3 -
+ src/ct_accel.c  |   46 ++---------
+ src/ct_driver.c |  234 ++++++-------------------------------------------------
+ src/ct_driver.h |    1 -
+ src/ct_video.c  |    3 +-
+ 5 files changed, 28 insertions(+), 259 deletions(-)
+
+diff --git a/man/chips.man b/man/chips.man
+index 740af38..0c022ee 100644
+--- a/man/chips.man
++++ b/man/chips.man
+@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
+ Force driver to leave centering and stretching registers alone. This
+ can fix some laptop suspend/resume problems. Default: off
+ .TP
+-.BI "Option \*qOverlay\*q"
+-Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
+-.TP
+ .BI "Option \*qColorKey\*q \*q" integer \*q
+ Set the colormap index used for the transparency key for the depth 8 plane
+ when operating in 8+16 overlay mode.  The value must be in the range
+diff --git a/src/ct_accel.c b/src/ct_accel.c
+index 3920b0a..4b5776a 100644
+--- a/src/ct_accel.c
++++ b/src/ct_accel.c
+@@ -428,19 +428,7 @@ chips_imagewrite:
+         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
+ #endif
+ 
+-
+-#ifdef CHIPS_HIQV
+-    if (XAAInit(pScreen, infoPtr)) {
+-	if (cPtr->Flags & ChipsOverlay8plus16)      
+-	    return(XAAInitDualFramebufferOverlay(pScreen,
+-						 CTNAME(DepthChange)));
+-	else
+-	    return TRUE;
+-    } else
+-	return FALSE;
+-#else
+     return(XAAInit(pScreen, infoPtr));
+-#endif
+ }
+ 
+ #ifdef CHIPS_HIQV
+@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
+ #endif
+     w *= cAcl->BytesPerPixel;
+     ctBLTWAIT;
+-#ifdef CHIPS_HIQV
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
+-	    (pScrn->depth == 8))
+-	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
+-#endif
+     ctSETSRCADDR(srcaddr);
+     ctSETDSTADDR(destaddr);
+ #ifdef CHIPS_HIQV
+@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+     patternaddr = (paty * pScrn->displayWidth + 
+ 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
+     cAcl->patternyrot = (patx & 0x3F) >> 3;
+-#ifdef CHIPS_HIQV
+-    if (cPtr->Flags & ChipsOverlay8plus16)
+-	patternaddr += cPtr->FbOffset16;
+-#endif
+ 
+     ctBLTWAIT;
+     ctSETPATSRCADDR(patternaddr);
+@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+ 
+ #ifdef CHIPS_HIQV
+     patternaddr = paty * pScrn->displayWidth + patx;
+-    if (cPtr->Flags & ChipsOverlay8plus16)
+-	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
+-    else
+-	patternaddr *= cAcl->BytesPerPixel;
++    patternaddr *= cAcl->BytesPerPixel;
+ #else
+     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
+ #endif
+@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
+     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+     destpitch = pScrn->displayWidth * (bpp >> 3);
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	destaddr += cPtr->FbOffset16;
+-    else
+-	destaddr += cAcl->FbOffset;
++    destaddr += cAcl->FbOffset;
+ 
+     ctBLTWAIT;
+ 
+@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ 	y++;
+ 
+ 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+-	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    destaddr += cPtr->FbOffset16;
+-	else
+-	    destaddr += cAcl->FbOffset;
++	destaddr += cAcl->FbOffset;
+ 
+ 	ctBLTWAIT;
+ 	ctSETDSTADDR(destaddr);
+@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
+     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+     srcpitch = pScrn->displayWidth * (bpp >> 3);
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	srcaddr += cPtr->FbOffset16;
+-    else
+-	srcaddr += cAcl->FbOffset;
++    srcaddr += cAcl->FbOffset;
+ 
+     ctBLTWAIT;
+     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
+@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ 	dst += dstwidth;
+ 	y++;
+ 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+-	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    srcaddr += cPtr->FbOffset16;
+-	else
+-	    srcaddr += cAcl->FbOffset;
++	srcaddr += cAcl->FbOffset;
+ 	ctBLTWAIT;
+ 	ctSETSRCADDR(srcaddr);
+ 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6624b79..08df050 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ 	}
+     }
+     
+-    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
+-	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
+-	  if (pScrn->bitsPerPixel == 16) {
+-	    if (cPtr->Flags & ChipsLinearSupport) {
+-		cPtr->Flags |= ChipsOverlay8plus16;
+-		if(!xf86GetOptValInteger(
+-			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
+-		    pScrn->colorKey = TRANSPARENCY_KEY;
+-		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
+-		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
+-			   "PseudoColor overlay enabled.\n");
+-		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                             - Forcing option \"Stretch\" \"ON\".\n");
+-		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
+-		if (cPtr->Flags & ChipsShadowFB) {
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-		           "                             - Disabling \"Shadow Framebuffer\".\n");
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                               Not support with option \"8Plus16\".\n");
+-		    cPtr->Flags &= ~ChipsShadowFB;
+-		    cPtr->Rotate = 0;
+-		}
+-	    } else {
+-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
+-	    }
+-	  } else {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-		"Option \"Overlay\" is not supported in this configuration\n");
+-	  }
+-	} else {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
+-	}
+-    }
+-
+-    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
+-	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
+-		&(cPtr->videoKey))) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
++    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
++	&(cPtr->videoKey))) {
++         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
+ 		cPtr->videoKey);
+-	} else {
+-	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
++    } else {
++       cPtr->videoKey =  (1 << pScrn->offset.red) | 
+ 			(1 << pScrn->offset.green) |
+ 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
+ 			<< pScrn->offset.blue); 
+-	}
+     }
+ 
+     if (cPtr->Flags & ChipsShadowFB) {
+@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+     /* and 32bits on the others. Thus multiply by a suitable factor      */  
+     if (cPtr->Flags & Chips64BitMemory) {
+ 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+-	    if (cPtr->Flags & ChipsOverlay8plus16 )
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock,
+ 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
+ 	else
+-	    if (cPtr->Flags & ChipsOverlay8plus16)
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock, 
+ 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
+     } else {
+ 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+-	    if (cPtr->Flags & ChipsOverlay8plus16 )
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock,
+ 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
+ 	else
+-	    if (cPtr->Flags & ChipsOverlay8plus16)
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock, 
+ 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
+     }
+@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
+     /* Should we re-save the text mode on each VT enter? */
+     if(!chipsModeInit(pScrn, pScrn->currentMode))
+       return FALSE;
+-    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
+-	&& (cPtr->Flags & ChipsVideoSupport)
++    if ((cPtr->Flags & ChipsVideoSupport)
+ 	&& (cPtr->Flags & ChipsLinearSupport)) 
+         CHIPSResetVideo(pScrn); 
+ 
+@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
+     int i, index, shift ;
+     CHIPSEntPtr cPtrEnt;    
+ 
+-    shift = ((pScrn->depth == 15) && 
+-	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
++    shift = (pScrn->depth == 15) ? 3 : 0;
+ 
+     if (cPtr->UseDualChannel) {
+         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
+@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
+     hwp->disablePalette(hwp);
+ }
+ 
+-static Bool
+-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+-                  int xsize, int ysize, int dpix, int dpiy,
+-                  int width16, int width8)
+-{
+-    return
+-        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+-                              dpix, dpiy, width16, width8, 16, 8) &&
+-         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+-                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
+-}
+-
+ /* Mandatory */
+ static Bool
+ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     if (!chipsMapMem(pScrn))
+ 	return FALSE;
+ 
+-    /* Setup a pointer to the overlay if needed */
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
+-	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
+-	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Too little memory for overlay. Disabling.\n");
+-	    cPtr->Flags &= ~ChipsOverlay8plus16;
+-	}
+-	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
+-	    cPtr->Flags &= ~ChipsOverlay8plus16;
+-	}
+-    }
+-
+     /* Setup the MMIO register access functions if need */
+     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
+ 	CHIPSSetMmioExtFuncs(cPtr);
+@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     miClearVisualTypes();
+ 
+     /* Setup the visuals we support. */
+-    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
+-	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
+-			      pScrn->rgbBits, PseudoColor))
+-		return FALSE;
+-	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
+-		return FALSE;
+-    } else {
+-      if (!miSetVisualTypes(pScrn->depth,
++    if (!miSetVisualTypes(pScrn->depth,
+ 			    miGetDefaultVisualMask(pScrn->depth),
+ 			    pScrn->rgbBits, pScrn->defaultVisual))
+-	return FALSE;
+-    }
++        return FALSE;
+     miSetPixmapDepths ();
+ 
+     /*
+@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	break;
+ #endif
+     case 16:
+-      if (cPtr->Flags & ChipsOverlay8plus16) {
+-	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
+-				  cPtr->FbOffset16, FBStart, width, 
+-				  height, pScrn->xDpi, pScrn->yDpi,
+-				  displayWidth, displayWidth);
+-	  break;
+-      }
+     default:
+ 	ret = fbScreenInit(pScreen, FBStart,
+  		        width,height,
+@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	if (pScrn->bitsPerPixel < 8)
+ 	    freespace = allocatebase - pScrn->displayWidth * 
+ 		    pScrn->virtualY / 2;
+-	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    freespace = allocatebase - pScrn->displayWidth * 
+-		    pScrn->virtualY - cPtr->FbSize16;
+ 	else	
+ 	    freespace = allocatebase - pScrn->displayWidth * 
+ 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
+@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	    AvailFBArea.y2 = cAcl->CacheEnd /
+ 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
+ 
+-	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
+-		xf86InitFBManager(pScreen, &AvailFBArea); 
+-	    }
++	    xf86InitFBManager(pScreen, &AvailFBArea); 
+ 	}
+ 	if (cPtr->Flags & ChipsAccelSupport) {
+ 	    if (IS_HiQV(cPtr)) {
+@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     if (!miCreateDefColormap(pScreen))
+ 	return FALSE;
+     
+-    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
+-	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
+-		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
+-	    return FALSE;
+-    } else {
+-	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
++    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
+ 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
+ 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
+-	    return FALSE;
+-    }
++	return FALSE;
+     
+ #ifndef XSERVER_LIBPCIACCESS
+     racflag = RAC_COLORMAP;
+@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	xf86SetSilkenMouse(pScreen);
+ #endif
+ 
+-	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
+-	    && (cPtr->Flags & ChipsVideoSupport)
++	if ((cPtr->Flags & ChipsVideoSupport)
+ 	    && (cPtr->Flags & ChipsLinearSupport)) {
+ 	    CHIPSInitVideo(pScreen);
+     }
+@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ 	Base >>= 3;
+ 	break;
+     case 16:
+-	if (!(cPtr->Flags & ChipsOverlay8plus16))
+-	   Base >>= 1;
+-	else
+-	   Base >>= 2;
++	Base >>= 1;
+ 	break;
+     case 24:
+ 	if (!IS_HiQV(cPtr))
+@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ 	cPtr->writeMSS(cPtr, hwp, MSS);
+     }
+ 
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	Base = (Base << 3) & ~(unsigned long)0xF;
+-
+-	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
+-	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
+-	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
+-    }
+-
+ }
+ 
+ /* Mandatory */
+@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     CHIPSPtr cPtr = CHIPSPTR(pScrn);
+ 
+-    if (flags & MODECHECK_FINAL) {
+-    /* Don't subtract FrambufferSize here as it should be subtracted already */
+-    if ((cPtr->Flags & ChipsOverlay8plus16) 
+-      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
+-	  < 0))
+-	return MODE_MEM;
+-    }
+     /* The tests here need to be expanded */
+     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
+ 	return MODE_NO_INTERLACE;
+@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     } else {
+ 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
+     }
+-    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
+-	/* Make sure that the overlay isn't visible in the overscan region */
+-	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
+-	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
+-    } else
+-	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
++    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
+     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
+     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
+ 
+@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     /* set virtual screen width */
+     tmp = pScrn->displayWidth >> 3;
+     if (pScrn->bitsPerPixel == 16) {
+-	if (!(cPtr->Flags & ChipsOverlay8plus16))
+-	    tmp <<= 1;		       /* double the width of the buffer */
++	tmp <<= 1;		       /* double the width of the buffer */
+     } else if (pScrn->bitsPerPixel == 24) {
+ 	tmp += tmp << 1;
+     } else if (pScrn->bitsPerPixel == 32) {
+@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 
+     /* centering/stretching */
+     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
+-	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
+-	(cPtr->Flags & ChipsOverlay8plus16)) {
++	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
+ 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
+ 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
+ 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
+@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	}
+     }
+ 
+-    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
+-		|| (cPtr->Flags & ChipsOverlay8plus16)) {
++    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
+ 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
+ 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
+     } else {
+@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	ChipsNew->XR[0x82] |=0x02;
+ 
+     /* software mode flag */
+-    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
+-	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
++    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
+ 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
+ 	mode->CrtcHDisplay, mode->CrtcVDisplay);
+ #ifdef DEBUG
+@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     	}
+     }	    
+     /* bpp depend */
+-    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
++    if (pScrn->bitsPerPixel == 16) {
+ 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
+ 	if (cPtr->Flags & ChipsGammaSupport)
+ 	    ChipsNew->XR[0x82] |= 0x0C;
+@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     /* Turn off multimedia by default as it degrades performance */
+     ChipsNew->XR[0xD0] &= 0x0f;	 
+     
+-    /* Setup the video/overlay */
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+-#ifdef SAR04
+-	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
+-#endif
+-	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
+-	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
+-	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
+-	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
+-	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
+-	if (pScrn->weight.green == 5)
+-	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
+-
+-	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
+-	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
+-	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
+-	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
+-	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
+-	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
+-	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
+-	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
+-	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
+-	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
+-
+-	/* Left Edge of Overlay */
+-	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
+-	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
+-	/* Right Edge of Overlay */
+-	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
+-							1) & 0xFF;
+-	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
+-							1) >> 8) & 0x07;
+-	/* Top Edge of Overlay */
+-	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
+-	ChipsNew->MR[0x2F] &= 0xF8;
+-	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
+-	/* Bottom Edge of Overlay*/
+-	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
+-	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
+-							1 ) >> 8) & 0x07;
+-
+-	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
+-	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
+-	ChipsNew->MR[0x3D] = 0x00;
+-	ChipsNew->MR[0x3E] = 0x00;
+-	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
+-	ChipsNew->MR[0x40] = 0xFF;
+-	ChipsNew->MR[0x41] = 0xFF;
+-	ChipsNew->MR[0x42] = 0x00;
+-    } else if (cPtr->Flags & ChipsVideoSupport) {
++    if (cPtr->Flags & ChipsVideoSupport) {
+ #if 0   /* if we do this even though video isn't playing we kill performance */
+ 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+ #endif
+@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
+ 	}
+ 
+ 	/* Set SAR04 multimedia register correctly */
+-	if ((cPtr->Flags & ChipsOverlay8plus16)
+-	    || (cPtr->Flags & ChipsVideoSupport)) {
++	if ((cPtr->Flags & ChipsVideoSupport)) {
+ #ifdef SAR04
+ 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
+ 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index d8ce228..10a24d4 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -114,7 +114,6 @@ typedef struct {
+ /* Options flags for the C&T chipsets */
+ #define ChipsHWCursor		0x00001000
+ #define ChipsShadowFB		0x00002000
+-#define ChipsOverlay8plus16	0x00004000
+ #define ChipsUseNewFB		0x00008000
+ 
+ /* Architecture type flags */
+diff --git a/src/ct_video.c b/src/ct_video.c
+index a68acb9..c9e5bb4 100644
+--- a/src/ct_video.c
++++ b/src/ct_video.c
+@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
+     CHIPSPtr cPtr = CHIPSPTR(pScrn);
+     int num_adaptors;
+ 	
+-    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
+-       (cPtr->Flags & ChipsVideoSupport)) {
++    if ((cPtr->Flags & ChipsVideoSupport)) {
+ 	newAdaptor = CHIPSSetupImageVideo(pScreen);
+ 	CHIPSInitOffscreenImages(pScreen);
+     }
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch
new file mode 100644
index 00000000..6caaa210
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch
@@ -0,0 +1,29 @@
+From 5f8a7320123255408b393eab9ecfae783920622a Mon Sep 17 00:00:00 2001
+From: Mark Kettenis <kettenis@openbsd.org>
+Date: Mon, 26 Sep 2011 21:26:26 +0200
+Subject: [PATCH 2/9] PciTag is unused when using libpciaccess
+
+Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
+Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+---
+ src/ct_driver.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index 10a24d4..39eeb6e 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -271,7 +271,9 @@ typedef struct {
+ 
+ typedef struct _CHIPSRec {
+     pciVideoPtr		PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+     PCITAG		PciTag;
++#endif
+     int			Chipset;
+     EntityInfoPtr       pEnt;
+     IOADDRESS		PIOBase;
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch
new file mode 100644
index 00000000..de379e4d
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch
@@ -0,0 +1,50 @@
+From 7ca1840f39d0216e44fe1ca938cfc3ced048da1d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 22:24:54 -0700
+Subject: [PATCH 3/9] Use malloc/calloc/realloc/free directly
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ src/ct_driver.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 08df050..e6538c6 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags)
+ 		}
+ 
+ 	    }
+-	    xfree(usedChips);
++	    free(usedChips);
+ 	}
+     }
+ 
+@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags)
+ 		pScrn->ValidMode     = CHIPSValidMode;
+ 		foundScreen = TRUE;
+ 	    }
+-	    xfree(usedChips);
++	    free(usedChips);
+ 	}
+     }
+ #endif
+     
+-    xfree(devSections);
++    free(devSections);
+     return foundScreen;
+ }
+ #endif
+@@ -4126,7 +4126,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	}
+ 	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
+ 				 pScrn->displayWidth, pBankInfo)) {
+-	    xfree(pBankInfo);
++	    free(pBankInfo);
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch
new file mode 100644
index 00000000..bcf6355a
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch
@@ -0,0 +1,27 @@
+From f5191838b70d67e991bef3491d2a60915988079c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 22:37:00 -0700
+Subject: [PATCH 4/9] configure.ac: Remove AM_PROG_CC_C_O
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ configure.ac |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 225e516..c0ed508 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ 
+-# Checks for programs.
+-AM_PROG_CC_C_O
+-
+ AH_TOP([#include "xorg-server.h"])
+ 
+ # Define a configure option for an alternate module directory
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch
new file mode 100644
index 00000000..77d0d5bc
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch
@@ -0,0 +1,283 @@
+From 94a8b34528b42a4fe6f81c8b8bd1ddb6bebaeea9 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 23:04:32 -0700
+Subject: [PATCH 5/9] util: Consolidate common macros
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ util/dRegs.c    |   57 +------------------------------------------------------
+ util/iopl.h     |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ util/mRegs.c    |   57 +------------------------------------------------------
+ util/modClock.c |   53 ++-------------------------------------------------
+ 4 files changed, 58 insertions(+), 163 deletions(-)
+ create mode 100644 util/iopl.h
+
+diff --git a/util/dRegs.c b/util/dRegs.c
+index b7edc8f..0d2f0cb 100644
+--- a/util/dRegs.c
++++ b/util/dRegs.c
+@@ -1,63 +1,8 @@
+-
+-
+-
+-
+-
+-
+-#ifdef __NetBSD__
+-#  include <sys/types.h>
+-#  include <machine/pio.h>
+-#  include <machine/sysarch.h>
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    include <sys/types.h>
+-#    ifdef NCR
+-       /* broken NCR <sys/sysi86.h> */
+-#      define __STDC
+-#      include <sys/sysi86.h>
+-#      undef __STDC
+-#    else
+-#      include <sys/sysi86.h>
+-#    endif
+-#    ifdef SVR4
+-#      if !defined(sun)
+-#        include <sys/seg.h>
+-#      endif
+-#    endif
+-#    include <sys/v86.h>
+-#    if defined(sun)
+-#      include <sys/psw.h>
+-#    endif
+-#  endif
+-#  include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#ifdef __NetBSD__
+-#  define SET_IOPL() i386_iopl(3)
+-#  define RESET_IOPL() i386_iopl(0)
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    ifndef SI86IOPL
+-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-#    else
+-#      define SET_IOPL() sysi86(SI86IOPL,3)
+-#      define RESET_IOPL() sysi86(SI86IOPL,0)
+-#    endif
+-#  else
+-#    ifdef linux
+-#      define SET_IOPL() iopl(3)
+-#      define RESET_IOPL() iopl(0)
+-#    else
+-#      define SET_IOPL() (void)0
+-#      define RESET_IOPL() (void)0
+-#    endif
+-#  endif
+-#endif
++#include "iopl.h"
+ 
+ int main(void)
+ {
+diff --git a/util/iopl.h b/util/iopl.h
+new file mode 100644
+index 0000000..d7890b3
+--- /dev/null
++++ b/util/iopl.h
+@@ -0,0 +1,54 @@
++#ifdef __NetBSD__
++#  include <sys/types.h>
++#  include <machine/pio.h>
++#  include <machine/sysarch.h>
++#else
++#  if defined(SVR4) && defined(i386)
++#    include <sys/types.h>
++#    ifdef NCR
++       /* broken NCR <sys/sysi86.h> */
++#      define __STDC
++#      include <sys/sysi86.h>
++#      undef __STDC
++#    else
++#      include <sys/sysi86.h>
++#    endif
++#    ifdef SVR4
++#      if !defined(sun)
++#        include <sys/seg.h>
++#      endif
++#    endif
++#    include <sys/v86.h>
++#    if defined(sun)
++#      include <sys/psw.h>
++#    endif
++#  endif
++#  include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++#  define SET_IOPL() i386_iopl(3)
++#  define RESET_IOPL() i386_iopl(0)
++#else
++#  if defined(SVR4) && defined(i386)
++#    ifndef SI86IOPL
++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++#    else
++#      define SET_IOPL() sysi86(SI86IOPL,3)
++#      define RESET_IOPL() sysi86(SI86IOPL,0)
++#    endif
++#  else
++#    ifdef linux
++#      define SET_IOPL() iopl(3)
++#      define RESET_IOPL() iopl(0)
++#    else
++#      define SET_IOPL() (void)0
++#      define RESET_IOPL() (void)0
++#    endif
++#  endif
++#endif
+diff --git a/util/mRegs.c b/util/mRegs.c
+index f359738..843d01d 100644
+--- a/util/mRegs.c
++++ b/util/mRegs.c
+@@ -1,63 +1,8 @@
+-
+-
+-
+-
+-
+-
+-#ifdef __NetBSD__
+-#  include <sys/types.h>
+-#  include <machine/pio.h>
+-#  include <machine/sysarch.h>
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    include <sys/types.h>
+-#    ifdef NCR
+-       /* broken NCR <sys/sysi86.h> */
+-#      define __STDC
+-#      include <sys/sysi86.h>
+-#      undef __STDC
+-#    else
+-#      include <sys/sysi86.h>
+-#    endif
+-#    ifdef SVR4
+-#      if !defined(sun)
+-#        include <sys/seg.h>
+-#      endif
+-#    endif
+-#    include <sys/v86.h>
+-#    if defined(sun)
+-#      include <sys/psw.h>
+-#    endif
+-#  endif
+-#  include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#ifdef __NetBSD__
+-#  define SET_IOPL() i386_iopl(3)
+-#  define RESET_IOPL() i386_iopl(0)
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    ifndef SI86IOPL
+-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-#    else
+-#      define SET_IOPL() sysi86(SI86IOPL,3)
+-#      define RESET_IOPL() sysi86(SI86IOPL,0)
+-#    endif
+-#  else
+-#    ifdef linux
+-#      define SET_IOPL() iopl(3)
+-#      define RESET_IOPL() iopl(0)
+-#    else
+-#      define SET_IOPL() (void)0
+-#      define RESET_IOPL() (void)0
+-#    endif
+-#  endif
+-#endif
++#include "iopl.h"
+ 
+ int hex2int(char* str);
+ 
+diff --git a/util/modClock.c b/util/modClock.c
+index 89a291a..45af19b 100644
+--- a/util/modClock.c
++++ b/util/modClock.c
+@@ -1,61 +1,12 @@
+-
+-#ifdef __NetBSD__
+-#  include <sys/types.h>
+-#  include <machine/pio.h>
+-#  include <machine/sysarch.h>
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    include <sys/types.h>
+-#    ifdef NCR
+-       /* broken NCR <sys/sysi86.h> */
+-#      define __STDC
+-#      include <sys/sysi86.h>
+-#      undef __STDC
+-#    else
+-#      include <sys/sysi86.h>
+-#    endif
+-#    ifdef SVR4
+-#      if !defined(sun)
+-#        include <sys/seg.h>
+-#      endif
+-#    endif
+-#    include <sys/v86.h>
+-#    if defined(sun)
+-#      include <sys/psw.h>
+-#    endif
+-#  endif
+-#  include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++
+ #ifndef Lynx
+ #include <fnmatch.h>
+ #endif
+ 
+-#ifdef __NetBSD__
+-#  define SET_IOPL() i386_iopl(3)
+-#  define RESET_IOPL() i386_iopl(0)
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    ifndef SI86IOPL
+-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-#    else
+-#      define SET_IOPL() sysi86(SI86IOPL,3)
+-#      define RESET_IOPL() sysi86(SI86IOPL,0)
+-#    endif
+-#  else
+-#    ifdef linux
+-#      define SET_IOPL() iopl(3)
+-#      define RESET_IOPL() iopl(0)
+-#    else
+-#      define SET_IOPL() (void)0
+-#      define RESET_IOPL() (void)0
+-#    endif
+-#  endif
+-#endif
++#include "iopl.h"
+ 
+ #define tolerance 0.01 /* +/- 1% */
+ 
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch
new file mode 100644
index 00000000..a0b4bb4b
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch
@@ -0,0 +1,35 @@
+From c421f2477c99990d0dc712d6aece981fa6c961e5 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 23:09:09 -0700
+Subject: [PATCH 6/9] Fix implicit declaration of iopl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+warning: implicit declaration of function ‘iopl’ [-Wimplicit-function-declaration]
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ util/iopl.h |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/util/iopl.h b/util/iopl.h
+index d7890b3..e08207c 100644
+--- a/util/iopl.h
++++ b/util/iopl.h
+@@ -3,6 +3,12 @@
+ #  include <machine/pio.h>
+ #  include <machine/sysarch.h>
+ #else
++#  if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * #    include <sys/io.h>
++ */
++int iopl(int level);
++#  endif
+ #  if defined(SVR4) && defined(i386)
+ #    include <sys/types.h>
+ #    ifdef NCR
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch
new file mode 100644
index 00000000..12dc5131
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch
@@ -0,0 +1,51 @@
+From 8a5ea07f30cc71ecc413fad0713facff72f77472 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 23:21:33 -0700
+Subject: [PATCH 7/9] Build fix for ABI Version 12
+
+ABI Version 12 removes support for multiple PCI domains.  If you need to
+use this driver on a system with more than one PCI domain, you should
+either port this driver to using libpciaccess directly or stick with an
+older server.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ src/ct_driver.c |    5 +++++
+ src/ct_driver.h |    4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index e6538c6..a2e5c94 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ 
+     hwp = VGAHWPTR(pScrn);
+     vgaHWGetIOBase(hwp);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     cPtr->PIOBase = hwp->PIOOffset;
++#else
++    cPtr->PIOBase = 0;
++#endif
++
+     /*
+      * Must allow ensure that storage for the 2nd set of vga registers is
+      * allocated for dual channel cards
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index 39eeb6e..9033867 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -276,8 +276,8 @@ typedef struct _CHIPSRec {
+ #endif
+     int			Chipset;
+     EntityInfoPtr       pEnt;
+-    IOADDRESS		PIOBase;
+-    CARD32		IOAddress;
++    unsigned long	PIOBase;
++    unsigned long	IOAddress;
+     unsigned long	FbAddress;
+     unsigned int	IOBase;
+     unsigned char *	FbBase;
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch
new file mode 100644
index 00000000..3478fa34
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch
@@ -0,0 +1,31 @@
+From 5d5753551609f1483801e5edd8d42b11713c981e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 16:18:34 -0500
+Subject: [PATCH 8/9] Fall back to shadowfb if XAA is unavailable
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/ct_driver.c |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index a2e5c94..95092a2 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1345,10 +1345,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
+     
+     if (cPtr->Flags & ChipsAccelSupport) {
+ 	if (!xf86LoadSubModule(pScrn, "xaa")) {
+-	    vbeFree(cPtr->pVbe);
+-	    cPtr->pVbe = NULL;
+-	    CHIPSFreeRec(pScrn);
+-	    return FALSE;
++	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
++	    cPtr->Flags &= ~(ChipsAccelSupport);
++	    cPtr->Flags |= ChipsShadowFB;
+ 	}
+     }
+ 
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch
new file mode 100644
index 00000000..74ec3722
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch
@@ -0,0 +1,25 @@
+From 989cf4f1fb2ac57f38d363734b71a5cf749db146 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 17:45:41 -0500
+Subject: [PATCH 9/9] Fix for new vgaHW ABI
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/ct_driver.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 95092a2..08ccd72 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1444,6 +1444,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+         return FALSE;
+ 
+     hwp = VGAHWPTR(pScrn);
++    vgaHWSetStdFuncs(hwp);
+     vgaHWGetIOBase(hwp);
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     cPtr->PIOBase = hwp->PIOOffset;
+-- 
+1.7.9.4
+
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index e3218a03..01be43a3 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -1,3 +1 @@
 zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
index bfa9c305..8c0e3b54 100644
--- a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
+++ b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
@@ -1,13 +1,14 @@
---- ./dix/window.c.orig	2007-01-22 23:39:15.000000000 -0600
-+++ ./dix/window.c	2007-02-14 03:21:03.000000000 -0600
-@@ -140,8 +140,8 @@
-  *
-  ******/
+diff -Nur xorg-server-1.12.1.orig/dix/window.c xorg-server-1.12.1/dix/window.c
+--- xorg-server-1.12.1.orig/dix/window.c	2012-03-29 21:57:25.000000000 -0500
++++ xorg-server-1.12.1/dix/window.c	2012-04-13 22:01:24.456073603 -0500
+@@ -145,8 +145,8 @@
  
--static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
--static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
-+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
-+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
+ Bool bgNoneRoot = FALSE;
  
- _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
+-static unsigned char _back_lsb[4] = { 0x88, 0x22, 0x44, 0x11 };
+-static unsigned char _back_msb[4] = { 0x11, 0x44, 0x22, 0x88 };
++static unsigned char _back_lsb[4] = { 0x00, 0x00, 0x00, 0x00 };
++static unsigned char _back_msb[4] = { 0x00, 0x00, 0x00, 0x00 };
  
+ static Bool WindowParentHasDeviceCursor(WindowPtr pWin,
+                                         DeviceIntPtr pDev, CursorPtr pCurs);
diff --git a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff
deleted file mode 100644
index f8abdccb..00000000
--- a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fb/fbpict.c.orig	2010-03-11 22:38:21.000000000 -0600
-+++ ./fb/fbpict.c	2010-04-29 14:14:52.000000000 -0500
-@@ -37,7 +37,7 @@
- #include "mipict.h"
- #include "fbpict.h"
- 
--#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
-+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b))
- 
- void
- fbWalkCompositeRegion (CARD8 op,
diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
deleted file mode 100644
index 74f799a1..00000000
--- a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./hw/xfree86/common/xf86pciBus.c.orig	2010-07-01 12:17:35.000000000 -0500
-+++ ./hw/xfree86/common/xf86pciBus.c	2010-11-18 16:56:57.633003654 -0600
-@@ -1118,7 +1118,7 @@
- 	    break;
- 	case 0x102b:		    driverList[0] = "mga";	break;
- 	case 0x10c8:		    driverList[0] = "neomagic"; break;
--	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-+	case 0x10de: case 0x12d2:   driverList[0] = "nouveau" ; driverList[1] = "nv";	break;
- 	case 0x1106:		    driverList[0] = "openchrome"; break;
-         case 0x1b36:		    driverList[0] = "qxl"; break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
diff --git a/source/x/x11/post-install/lbxproxy.post-install b/source/x/x11/post-install/lbxproxy.post-install
deleted file mode 100644
index 9bb11032..00000000
--- a/source/x/x11/post-install/lbxproxy.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
-  mv lbxproxy $PKG/etc/X11
-  ln -sf ../../../etc/X11/lbxproxy .
-)
diff --git a/source/x/radeon_ucode/radeon_ucode.SlackBuild b/source/x/x11/post-install/libXaw3d.post-install
index 7482b4cc..5b2d5bf2 100755..100644
--- a/source/x/radeon_ucode/radeon_ucode.SlackBuild
+++ b/source/x/x11/post-install/libXaw3d.post-install
@@ -1,9 +1,5 @@
-#!/bin/sh
 
-# Slackware build script for radeon_ucode
-
-# Copyright 2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2010, 2011  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -12,7 +8,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -22,32 +18,12 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 
-PKGNAM=radeon_ucode
-VERSION=20110302
-BUILD=${BUILD:-1}
-
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $PKG/lib/firmware/radeon $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a $CWD/ucode-$VERSION/* $PKG/lib/firmware/radeon
-mv $PKG/lib/firmware/radeon/LICENSE.radeon $PKG/usr/doc/$PKGNAM-$VERSION
-
-chown -R root:root $PKG
-find $PKG \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+# Create some compat symlinks for older versions:
 
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+( cd $PKG/usr/lib
+  ln -sf libXaw3d.so.8 libXaw3d.so.6
+  ln -sf libXaw3d.so.8 libXaw3d.so.7
+)
 
diff --git a/source/x/x11/post-install/proxymngr.post-install b/source/x/x11/post-install/proxymngr.post-install
deleted file mode 100644
index 29c647c3..00000000
--- a/source/x/x11/post-install/proxymngr.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
-  mv proxymngr $PKG/etc/X11
-  ln -sf ../../../etc/X11/proxymngr .
-)
diff --git a/source/x/x11/post-install/rstart.post-install b/source/x/x11/post-install/rstart.post-install
deleted file mode 100644
index d51ad34d..00000000
--- a/source/x/x11/post-install/rstart.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
-  mv rstart $PKG/etc/X11
-  ln -sf ../../../etc/X11/rstart .
-)
diff --git a/source/x/x11/post-install/util-macros.post-install b/source/x/x11/post-install/util-macros.post-install
deleted file mode 100644
index b25fb344..00000000
--- a/source/x/x11/post-install/util-macros.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p $PKG/usr/lib
-mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xcb-util.post-install b/source/x/x11/post-install/xcb-util.post-install
new file mode 100644
index 00000000..ac269177
--- /dev/null
+++ b/source/x/x11/post-install/xcb-util.post-install
@@ -0,0 +1,8 @@
+# The libraries libxcb-{atom,aux,event} have been merged into the
+# libxcb-util library.  To maintain compatibility with existing
+# binaries, add some runtime-only compat symlinks:
+( cd $PKG/usr/lib
+  ln -sf libxcb-util.so.?.?.? libxcb-atom.so.1
+  ln -sf libxcb-util.so.?.?.? libxcb-aux.so.0
+  ln -sf libxcb-util.so.?.?.? libxcb-event.so.1
+)
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index 83dcf788..73611b47 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -1,19 +1,30 @@
 mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
-  mv xdm $PKG/etc/X11
-  ln -sf ../../../etc/X11/xdm .
-)
-mv $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsession.orig
-mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0.orig
+mv $PKG/usr/lib/X11/xdm $PKG/etc/X11
+ln -sf ../../../etc/X11/xdm $PKG/usr/lib/X11/xdm
+
+#( cd $PKG/usr/lib/X11
+#  mv xdm $PKG/etc/X11
+#  ln -sf ../../../etc/X11/xdm .
+#)
+
+mkdir -p $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION
+mv $PKG/etc/X11/xdm/Xsession $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsession.orig
+mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0.orig
+
 cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession
 cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0
+
 chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-( cd $PKG/etc/X11/xdm
-  mv xdm-config xdm-config.new
-  mv Xservers Xservers.new
-  mv Xsession Xsession.new
-)
+chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
+
+for conffile in \
+  Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \
+  GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ; 
+do
+  mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
+done
+
 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-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install
new file mode 100644
index 00000000..d2b17ecc
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom.post-install
@@ -0,0 +1,5 @@
+# I'm not sure we need this any more, so let's wait for a bug report
+# https://wiki.archlinux.org/index.php/Wacom_Tablet
+mkdir -p $PKG/lib/udev/rules.d
+cat $CWD/post-install/xf86-input-wacom/60-wacom.rules > \
+   $PKG/lib/udev/rules.d/60-wacom.rules
diff --git a/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules
new file mode 100644
index 00000000..59224786
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules
@@ -0,0 +1,6 @@
+# From https://wiki.archlinux.org/index.php/Wacom_Tablet
+ACTION!="add|change", GOTO="wacom_end"
+   # Match all wacom tablets with a serial ID starting with WACf or FUJ*
+   ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+   ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+LABEL="wacom_end"
diff --git a/source/x/x11/slack-desc/applewmproto b/source/x/x11/slack-desc/applewmproto
deleted file mode 100644
index 4a81b79b..00000000
--- a/source/x/x11/slack-desc/applewmproto
+++ /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------------------------------------------------------|
-applewmproto: applewmproto
-applewmproto:
-applewmproto: applewmproto is part of X11.
-applewmproto:
-applewmproto: For more information about the X.Org Foundation (the providers of the
-applewmproto: X.Org implementation of the X Window System), see their website:
-applewmproto:
-applewmproto: http://www.x.org
-applewmproto:
-applewmproto:
-applewmproto:
diff --git a/source/x/x11/slack-desc/appres b/source/x/x11/slack-desc/appres
index e397c8cd..001a3f34 100644
--- a/source/x/x11/slack-desc/appres
+++ b/source/x/x11/slack-desc/appres
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-appres: appres
+appres: appres (X resource inspection utility)
 appres:
-appres: appres is part of X11.
+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: particular program will load.
 appres:
-appres: For more information about the X.Org Foundation (the providers of the
-appres: X.Org implementation of the X Window System), see their website:
 appres:
-appres: http://www.x.org
 appres:
 appres:
 appres:
diff --git a/source/x/x11/slack-desc/bdftopcf b/source/x/x11/slack-desc/bdftopcf
index cb2a80a1..c9514c16 100644
--- a/source/x/x11/slack-desc/bdftopcf
+++ b/source/x/x11/slack-desc/bdftopcf
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-bdftopcf: bdftopcf
+bdftopcf: bdftopcf (font compiler for the X server and font server)
 bdftopcf:
-bdftopcf: bdftopcf is part of X11.
+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: on the appropriate machine, but the files are still portable (but
+bdftopcf: read more slowly) on other machines.
 bdftopcf:
-bdftopcf: For more information about the X.Org Foundation (the providers of the
-bdftopcf: X.Org implementation of the X Window System), see their website:
-bdftopcf:
-bdftopcf: http://www.x.org
 bdftopcf:
 bdftopcf:
 bdftopcf:
diff --git a/source/x/x11/slack-desc/beforelight b/source/x/x11/slack-desc/beforelight
index 20549ac4..a2a5f48e 100644
--- a/source/x/x11/slack-desc/beforelight
+++ b/source/x/x11/slack-desc/beforelight
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-beforelight: beforelight
+beforelight: beforelight (X11 screensaver)
 beforelight:
-beforelight: beforelight is part of X11.
+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: 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:
-beforelight: For more information about the X.Org Foundation (the providers of the
-beforelight: X.Org implementation of the X Window System), see their website:
-beforelight:
-beforelight: http://www.x.org
 beforelight:
 beforelight:
 beforelight:
diff --git a/source/x/x11/slack-desc/bigreqsproto b/source/x/x11/slack-desc/bigreqsproto
index 55c66bbc..8b35e52f 100644
--- a/source/x/x11/slack-desc/bigreqsproto
+++ b/source/x/x11/slack-desc/bigreqsproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
             |-----handy-ruler------------------------------------------------------|
-bigreqsproto: bigreqsproto
+bigreqsproto: bigreqsproto (C prototypes for X11 Big Requests Extension)
 bigreqsproto:
 bigreqsproto: bigreqsproto is part of X11.
 bigreqsproto:
diff --git a/source/x/x11/slack-desc/bitmap b/source/x/x11/slack-desc/bitmap
index 72423e76..60ed7c74 100644
--- a/source/x/x11/slack-desc/bitmap
+++ b/source/x/x11/slack-desc/bitmap
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-bitmap: bitmap
+bitmap: bitmap (X bitmap (XBM) editor and converter utilities)
+bitmap:
+bitmap: The bitmap package includes the bitmap, bmtoa, and atobm programs.
+bitmap:
+bitmap:
 bitmap:
-bitmap: bitmap is part of X11.
 bitmap:
-bitmap: For more information about the X.Org Foundation (the providers of the
-bitmap: X.Org implementation of the X Window System), see their website:
 bitmap:
-bitmap: http://www.x.org
 bitmap:
 bitmap:
 bitmap:
diff --git a/source/x/x11/slack-desc/compiz b/source/x/x11/slack-desc/compiz
index e1399119..c81aae0e 100644
--- a/source/x/x11/slack-desc/compiz
+++ b/source/x/x11/slack-desc/compiz
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-compiz: compiz
+compiz: compiz (OpenGL window and compositing manager)
 compiz:
-compiz: compiz is part of X11.
+compiz: Compiz is an OpenGL compositing manager that use
+compiz: GLX_EXT_texture_from_pixmap for binding redirected top-level windows
+compiz: to texture objects. It has a flexible plug-in system and it is designed
+compiz: to run well on most graphics hardware.
 compiz:
-compiz: For more information about the X.Org Foundation (the providers of the
-compiz: X.Org implementation of the X Window System), see their website:
 compiz:
-compiz: http://www.x.org
 compiz:
 compiz:
 compiz:
diff --git a/source/x/x11/slack-desc/compositeproto b/source/x/x11/slack-desc/compositeproto
index 63e26c77..197ece99 100644
--- a/source/x/x11/slack-desc/compositeproto
+++ b/source/x/x11/slack-desc/compositeproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-compositeproto: compositeproto
+compositeproto: compositeproto (C prototypes for X11 Composite Extension)
 compositeproto:
 compositeproto: compositeproto is part of X11.
 compositeproto:
diff --git a/source/x/x11/slack-desc/constype b/source/x/x11/slack-desc/constype
deleted file mode 100644
index ddcf95df..00000000
--- a/source/x/x11/slack-desc/constype
+++ /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------------------------------------------------------|
-constype: constype
-constype:
-constype: constype is part of X11.
-constype:
-constype: For more information about the X.Org Foundation (the providers of the
-constype: X.Org implementation of the X Window System), see their website:
-constype:
-constype: http://www.x.org
-constype:
-constype:
-constype:
diff --git a/source/x/x11/slack-desc/damageproto b/source/x/x11/slack-desc/damageproto
index 98c085fe..5998b60a 100644
--- a/source/x/x11/slack-desc/damageproto
+++ b/source/x/x11/slack-desc/damageproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-damageproto: damageproto
+damageproto: damageproto (C prototypes for X11 Damage Extension)
 damageproto:
 damageproto: damageproto is part of X11.
 damageproto:
diff --git a/source/x/x11/slack-desc/dmxproto b/source/x/x11/slack-desc/dmxproto
index a9598f9a..7df2c84f 100644
--- a/source/x/x11/slack-desc/dmxproto
+++ b/source/x/x11/slack-desc/dmxproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-dmxproto: dmxproto
+dmxproto: dmxproto (C prototypes for X11 Distributed Multihead X Extension)
 dmxproto:
 dmxproto: dmxproto is part of X11.
 dmxproto:
diff --git a/source/x/x11/slack-desc/dri2proto b/source/x/x11/slack-desc/dri2proto
index c416449a..06ac495d 100644
--- a/source/x/x11/slack-desc/dri2proto
+++ b/source/x/x11/slack-desc/dri2proto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-dri2proto: dri2proto
+dri2proto: dri2proto (C prototypes for X11 Direct Rendering Infrastructure 2)
 dri2proto:
 dri2proto: dri2proto is part of X11.
 dri2proto:
diff --git a/source/x/x11/slack-desc/editres b/source/x/x11/slack-desc/editres
index efdc8d75..01fe56c8 100644
--- a/source/x/x11/slack-desc/editres
+++ b/source/x/x11/slack-desc/editres
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-editres: editres
+editres: editres (X11 resource editor)
 editres:
 editres: editres is part of X11.
 editres:
diff --git a/source/x/x11/slack-desc/encodings b/source/x/x11/slack-desc/encodings
index a6de3517..9d35da9f 100644
--- a/source/x/x11/slack-desc/encodings
+++ b/source/x/x11/slack-desc/encodings
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-encodings: encodings
+encodings: encodings (X11 font encodings)
 encodings:
 encodings: encodings is part of X11.
 encodings:
diff --git a/source/x/x11/slack-desc/evieext b/source/x/x11/slack-desc/evieext
index 36a135e6..cff1b67d 100644
--- a/source/x/x11/slack-desc/evieext
+++ b/source/x/x11/slack-desc/evieext
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-evieext: evieext
+evieext: evieext (C prototypes for X11 Extended Visual Information Extension)
 evieext:
 evieext: evieext is part of X11.
 evieext:
diff --git a/source/x/x11/slack-desc/fixesproto b/source/x/x11/slack-desc/fixesproto
index 7e1a1eab..83cfded0 100644
--- a/source/x/x11/slack-desc/fixesproto
+++ b/source/x/x11/slack-desc/fixesproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-fixesproto: fixesproto
+fixesproto: fixesproto (C prototypes for X11 X Fixes Extension)
 fixesproto:
 fixesproto: fixesproto is part of X11.
 fixesproto:
diff --git a/source/x/x11/slack-desc/font-adobe-100dpi b/source/x/x11/slack-desc/font-adobe-100dpi
index 50996b1b..ea59df87 100644
--- a/source/x/x11/slack-desc/font-adobe-100dpi
+++ b/source/x/x11/slack-desc/font-adobe-100dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-font-adobe-100dpi: font-adobe-100dpi
+font-adobe-100dpi: font-adobe-100dpi (bitmap fonts for X11)
 font-adobe-100dpi:
 font-adobe-100dpi: font-adobe-100dpi is part of X11.
 font-adobe-100dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-75dpi b/source/x/x11/slack-desc/font-adobe-75dpi
index ca91ae5e..fac2cc42 100644
--- a/source/x/x11/slack-desc/font-adobe-75dpi
+++ b/source/x/x11/slack-desc/font-adobe-75dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-font-adobe-75dpi: font-adobe-75dpi
+font-adobe-75dpi: font-adobe-75dpi (bitmap fonts for X11)
 font-adobe-75dpi:
 font-adobe-75dpi: font-adobe-75dpi is part of X11.
 font-adobe-75dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-utopia-100dpi b/source/x/x11/slack-desc/font-adobe-utopia-100dpi
index 956f6d53..29cebe23 100644
--- a/source/x/x11/slack-desc/font-adobe-utopia-100dpi
+++ b/source/x/x11/slack-desc/font-adobe-utopia-100dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                         |-----handy-ruler------------------------------------------------------|
-font-adobe-utopia-100dpi: font-adobe-utopia-100dpi
+font-adobe-utopia-100dpi: font-adobe-utopia-100dpi (bitmap fonts for X11)
 font-adobe-utopia-100dpi:
 font-adobe-utopia-100dpi: font-adobe-utopia-100dpi is part of X11.
 font-adobe-utopia-100dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-utopia-75dpi b/source/x/x11/slack-desc/font-adobe-utopia-75dpi
index 73571791..1c941b8a 100644
--- a/source/x/x11/slack-desc/font-adobe-utopia-75dpi
+++ b/source/x/x11/slack-desc/font-adobe-utopia-75dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                        |-----handy-ruler------------------------------------------------------|
-font-adobe-utopia-75dpi: font-adobe-utopia-75dpi
+font-adobe-utopia-75dpi: font-adobe-utopia-75dpi (bitmap fonts for X11)
 font-adobe-utopia-75dpi:
 font-adobe-utopia-75dpi: font-adobe-utopia-75dpi is part of X11.
 font-adobe-utopia-75dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-utopia-type1 b/source/x/x11/slack-desc/font-adobe-utopia-type1
index 5f6d7d1b..7c6141c4 100644
--- a/source/x/x11/slack-desc/font-adobe-utopia-type1
+++ b/source/x/x11/slack-desc/font-adobe-utopia-type1
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                        |-----handy-ruler------------------------------------------------------|
-font-adobe-utopia-type1: font-adobe-utopia-type1
+font-adobe-utopia-type1: font-adobe-utopia-type1 (scalable fonts for X11)
 font-adobe-utopia-type1:
 font-adobe-utopia-type1: font-adobe-utopia-type1 is part of X11.
 font-adobe-utopia-type1:
diff --git a/source/x/x11/slack-desc/font-alias b/source/x/x11/slack-desc/font-alias
index d5e513d5..8f34e389 100644
--- a/source/x/x11/slack-desc/font-alias
+++ b/source/x/x11/slack-desc/font-alias
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-font-alias: font-alias
+font-alias: font-alias (X11 font aliases)
 font-alias:
 font-alias: font-alias is part of X11.
 font-alias:
diff --git a/source/x/x11/slack-desc/font-arabic-misc b/source/x/x11/slack-desc/font-arabic-misc
index bf9d34e2..8f2d661b 100644
--- a/source/x/x11/slack-desc/font-arabic-misc
+++ b/source/x/x11/slack-desc/font-arabic-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-font-arabic-misc: font-arabic-misc
+font-arabic-misc: font-arabic-misc (bitmap fonts for X11)
 font-arabic-misc:
 font-arabic-misc: font-arabic-misc is part of X11.
 font-arabic-misc:
diff --git a/source/x/x11/slack-desc/font-bh-100dpi b/source/x/x11/slack-desc/font-bh-100dpi
index 3db086b4..2ec64078 100644
--- a/source/x/x11/slack-desc/font-bh-100dpi
+++ b/source/x/x11/slack-desc/font-bh-100dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-font-bh-100dpi: font-bh-100dpi
+font-bh-100dpi: font-bh-100dpi (bitmap fonts for X11)
 font-bh-100dpi:
 font-bh-100dpi: font-bh-100dpi is part of X11.
 font-bh-100dpi:
diff --git a/source/x/x11/slack-desc/font-bh-75dpi b/source/x/x11/slack-desc/font-bh-75dpi
index ab93f8a9..36f1efd3 100644
--- a/source/x/x11/slack-desc/font-bh-75dpi
+++ b/source/x/x11/slack-desc/font-bh-75dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-font-bh-75dpi: font-bh-75dpi
+font-bh-75dpi: font-bh-75dpi (bitmap fonts for X11)
 font-bh-75dpi:
 font-bh-75dpi: font-bh-75dpi is part of X11.
 font-bh-75dpi:
diff --git a/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi b/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
index d289f9a2..30805c87 100644
--- a/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
+++ b/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                                |-----handy-ruler------------------------------------------------------|
-font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi (bitmap fonts for X11)
 font-bh-lucidatypewriter-100dpi:
 font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi is part of X11.
 font-bh-lucidatypewriter-100dpi:
diff --git a/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi b/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
index a9ae87e3..23c5b8e4 100644
--- a/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
+++ b/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                               |-----handy-ruler------------------------------------------------------|
-font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi
+font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi (bitmap fonts for X11)
 font-bh-lucidatypewriter-75dpi:
 font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi is part of X11.
 font-bh-lucidatypewriter-75dpi:
diff --git a/source/x/x11/slack-desc/font-bh-ttf b/source/x/x11/slack-desc/font-bh-ttf
index 5965002d..2d695562 100644
--- a/source/x/x11/slack-desc/font-bh-ttf
+++ b/source/x/x11/slack-desc/font-bh-ttf
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-font-bh-ttf: font-bh-ttf
+font-bh-ttf: font-bh-ttf (scalable fonts for X11)
 font-bh-ttf:
 font-bh-ttf: font-bh-ttf is part of X11.
 font-bh-ttf:
diff --git a/source/x/x11/slack-desc/font-bh-type1 b/source/x/x11/slack-desc/font-bh-type1
index eb61ed80..7d988cd3 100644
--- a/source/x/x11/slack-desc/font-bh-type1
+++ b/source/x/x11/slack-desc/font-bh-type1
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-font-bh-type1: font-bh-type1
+font-bh-type1: font-bh-type1 (scalable fonts for X11)
 font-bh-type1:
 font-bh-type1: font-bh-type1 is part of X11.
 font-bh-type1:
diff --git a/source/x/x11/slack-desc/font-bitstream-100dpi b/source/x/x11/slack-desc/font-bitstream-100dpi
index 3ebccefc..d2461bb0 100644
--- a/source/x/x11/slack-desc/font-bitstream-100dpi
+++ b/source/x/x11/slack-desc/font-bitstream-100dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                      |-----handy-ruler------------------------------------------------------|
-font-bitstream-100dpi: font-bitstream-100dpi
+font-bitstream-100dpi: font-bitstream-100dpi (bitmap fonts for X11)
 font-bitstream-100dpi:
 font-bitstream-100dpi: font-bitstream-100dpi is part of X11.
 font-bitstream-100dpi:
diff --git a/source/x/x11/slack-desc/font-bitstream-75dpi b/source/x/x11/slack-desc/font-bitstream-75dpi
index 49b1f262..8604be9f 100644
--- a/source/x/x11/slack-desc/font-bitstream-75dpi
+++ b/source/x/x11/slack-desc/font-bitstream-75dpi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-font-bitstream-75dpi: font-bitstream-75dpi
+font-bitstream-75dpi: font-bitstream-75dpi (bitmap fonts for X11)
 font-bitstream-75dpi:
 font-bitstream-75dpi: font-bitstream-75dpi is part of X11.
 font-bitstream-75dpi:
diff --git a/source/x/x11/slack-desc/font-bitstream-speedo b/source/x/x11/slack-desc/font-bitstream-speedo
index f5db39e8..51236f96 100644
--- a/source/x/x11/slack-desc/font-bitstream-speedo
+++ b/source/x/x11/slack-desc/font-bitstream-speedo
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                      |-----handy-ruler------------------------------------------------------|
-font-bitstream-speedo: font-bitstream-speedo
+font-bitstream-speedo: font-bitstream-speedo (scalable fonts for X11)
 font-bitstream-speedo:
 font-bitstream-speedo: font-bitstream-speedo is part of X11.
 font-bitstream-speedo:
diff --git a/source/x/x11/slack-desc/font-bitstream-type1 b/source/x/x11/slack-desc/font-bitstream-type1
index c2c8c89c..ce26f50a 100644
--- a/source/x/x11/slack-desc/font-bitstream-type1
+++ b/source/x/x11/slack-desc/font-bitstream-type1
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-font-bitstream-type1: font-bitstream-type1
+font-bitstream-type1: font-bitstream-type1 (scalable fonts for X11)
 font-bitstream-type1:
 font-bitstream-type1: font-bitstream-type1 is part of X11.
 font-bitstream-type1:
diff --git a/source/x/x11/slack-desc/font-cronyx-cyrillic b/source/x/x11/slack-desc/font-cronyx-cyrillic
index 1d8aa0cd..5e5dd4f8 100644
--- a/source/x/x11/slack-desc/font-cronyx-cyrillic
+++ b/source/x/x11/slack-desc/font-cronyx-cyrillic
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-font-cronyx-cyrillic: font-cronyx-cyrillic
+font-cronyx-cyrillic: font-cronyx-cyrillic (bitmap fonts for X11)
 font-cronyx-cyrillic:
 font-cronyx-cyrillic: font-cronyx-cyrillic is part of X11.
 font-cronyx-cyrillic:
diff --git a/source/x/x11/slack-desc/font-cursor-misc b/source/x/x11/slack-desc/font-cursor-misc
index 846a7ee5..99b22e06 100644
--- a/source/x/x11/slack-desc/font-cursor-misc
+++ b/source/x/x11/slack-desc/font-cursor-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-font-cursor-misc: font-cursor-misc
+font-cursor-misc: font-cursor-misc (bitmap fonts for X11)
 font-cursor-misc:
 font-cursor-misc: font-cursor-misc is part of X11.
 font-cursor-misc:
diff --git a/source/x/x11/slack-desc/font-daewoo-misc b/source/x/x11/slack-desc/font-daewoo-misc
index ea2a14fe..82cedda0 100644
--- a/source/x/x11/slack-desc/font-daewoo-misc
+++ b/source/x/x11/slack-desc/font-daewoo-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-font-daewoo-misc: font-daewoo-misc
+font-daewoo-misc: font-daewoo-misc (bitmap fonts for X11)
 font-daewoo-misc:
 font-daewoo-misc: font-daewoo-misc is part of X11.
 font-daewoo-misc:
diff --git a/source/x/x11/slack-desc/font-dec-misc b/source/x/x11/slack-desc/font-dec-misc
index 9f1f8457..be0b1bea 100644
--- a/source/x/x11/slack-desc/font-dec-misc
+++ b/source/x/x11/slack-desc/font-dec-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-font-dec-misc: font-dec-misc
+font-dec-misc: font-dec-misc (bitmap fonts for X11)
 font-dec-misc:
 font-dec-misc: font-dec-misc is part of X11.
 font-dec-misc:
diff --git a/source/x/x11/slack-desc/font-ibm-type1 b/source/x/x11/slack-desc/font-ibm-type1
index 773d7c57..44388e4e 100644
--- a/source/x/x11/slack-desc/font-ibm-type1
+++ b/source/x/x11/slack-desc/font-ibm-type1
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-font-ibm-type1: font-ibm-type1
+font-ibm-type1: font-ibm-type1 (scalable fonts for X11)
 font-ibm-type1:
 font-ibm-type1: font-ibm-type1 is part of X11.
 font-ibm-type1:
diff --git a/source/x/x11/slack-desc/font-isas-misc b/source/x/x11/slack-desc/font-isas-misc
index 2be2ce73..437bb423 100644
--- a/source/x/x11/slack-desc/font-isas-misc
+++ b/source/x/x11/slack-desc/font-isas-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-font-isas-misc: font-isas-misc
+font-isas-misc: font-isas-misc (bitmap fonts for X11)
 font-isas-misc:
 font-isas-misc: font-isas-misc is part of X11.
 font-isas-misc:
diff --git a/source/x/x11/slack-desc/font-jis-misc b/source/x/x11/slack-desc/font-jis-misc
index bbdf362e..6541bbcd 100644
--- a/source/x/x11/slack-desc/font-jis-misc
+++ b/source/x/x11/slack-desc/font-jis-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-font-jis-misc: font-jis-misc
+font-jis-misc: font-jis-misc (bitmap fonts for X11)
 font-jis-misc:
 font-jis-misc: font-jis-misc is part of X11.
 font-jis-misc:
diff --git a/source/x/x11/slack-desc/font-micro-misc b/source/x/x11/slack-desc/font-micro-misc
index f26eae31..aa2a3895 100644
--- a/source/x/x11/slack-desc/font-micro-misc
+++ b/source/x/x11/slack-desc/font-micro-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-font-micro-misc: font-micro-misc
+font-micro-misc: font-micro-misc (bitmap fonts for X11)
 font-micro-misc:
 font-micro-misc: font-micro-misc is part of X11.
 font-micro-misc:
diff --git a/source/x/x11/slack-desc/font-misc-cyrillic b/source/x/x11/slack-desc/font-misc-cyrillic
index 4e443cba..8317cb63 100644
--- a/source/x/x11/slack-desc/font-misc-cyrillic
+++ b/source/x/x11/slack-desc/font-misc-cyrillic
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-font-misc-cyrillic: font-misc-cyrillic
+font-misc-cyrillic: font-misc-cyrillic (bitmap fonts for X11)
 font-misc-cyrillic:
 font-misc-cyrillic: font-misc-cyrillic is part of X11.
 font-misc-cyrillic:
diff --git a/source/x/x11/slack-desc/font-misc-ethiopic b/source/x/x11/slack-desc/font-misc-ethiopic
index edaa2278..16f735a2 100644
--- a/source/x/x11/slack-desc/font-misc-ethiopic
+++ b/source/x/x11/slack-desc/font-misc-ethiopic
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-font-misc-ethiopic: font-misc-ethiopic
+font-misc-ethiopic: font-misc-ethiopic (bitmap fonts for X11)
 font-misc-ethiopic:
 font-misc-ethiopic: font-misc-ethiopic is part of X11.
 font-misc-ethiopic:
diff --git a/source/x/x11/slack-desc/font-misc-meltho b/source/x/x11/slack-desc/font-misc-meltho
index a30da3d0..7af6d1ba 100644
--- a/source/x/x11/slack-desc/font-misc-meltho
+++ b/source/x/x11/slack-desc/font-misc-meltho
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-font-misc-meltho: font-misc-meltho
+font-misc-meltho: font-misc-meltho (bitmap fonts for X11)
 font-misc-meltho:
 font-misc-meltho: font-misc-meltho is part of X11.
 font-misc-meltho:
diff --git a/source/x/x11/slack-desc/font-misc-misc b/source/x/x11/slack-desc/font-misc-misc
index 99c7d8ae..bdf59a80 100644
--- a/source/x/x11/slack-desc/font-misc-misc
+++ b/source/x/x11/slack-desc/font-misc-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-font-misc-misc: font-misc-misc
+font-misc-misc: font-misc-misc (bitmap fonts for X11)
 font-misc-misc:
 font-misc-misc: font-misc-misc is part of X11.
 font-misc-misc:
diff --git a/source/x/x11/slack-desc/font-mutt-misc b/source/x/x11/slack-desc/font-mutt-misc
index f1f7a248..c273a72b 100644
--- a/source/x/x11/slack-desc/font-mutt-misc
+++ b/source/x/x11/slack-desc/font-mutt-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-font-mutt-misc: font-mutt-misc
+font-mutt-misc: font-mutt-misc (bitmap fonts for X11)
 font-mutt-misc:
 font-mutt-misc: font-mutt-misc is part of X11.
 font-mutt-misc:
diff --git a/source/x/x11/slack-desc/font-schumacher-misc b/source/x/x11/slack-desc/font-schumacher-misc
index 4d7c58b0..55546ea4 100644
--- a/source/x/x11/slack-desc/font-schumacher-misc
+++ b/source/x/x11/slack-desc/font-schumacher-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-font-schumacher-misc: font-schumacher-misc
+font-schumacher-misc: font-schumacher-misc (bitmap fonts for X11)
 font-schumacher-misc:
 font-schumacher-misc: font-schumacher-misc is part of X11.
 font-schumacher-misc:
diff --git a/source/x/x11/slack-desc/font-screen-cyrillic b/source/x/x11/slack-desc/font-screen-cyrillic
index 9d65d38d..b60e6da4 100644
--- a/source/x/x11/slack-desc/font-screen-cyrillic
+++ b/source/x/x11/slack-desc/font-screen-cyrillic
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-font-screen-cyrillic: font-screen-cyrillic
+font-screen-cyrillic: font-screen-cyrillic (bitmap fonts for X11)
 font-screen-cyrillic:
 font-screen-cyrillic: font-screen-cyrillic is part of X11.
 font-screen-cyrillic:
diff --git a/source/x/x11/slack-desc/font-sony-misc b/source/x/x11/slack-desc/font-sony-misc
index 8fc8b85e..8a539888 100644
--- a/source/x/x11/slack-desc/font-sony-misc
+++ b/source/x/x11/slack-desc/font-sony-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-font-sony-misc: font-sony-misc
+font-sony-misc: font-sony-misc (bitmap fonts for X11)
 font-sony-misc:
 font-sony-misc: font-sony-misc is part of X11.
 font-sony-misc:
diff --git a/source/x/x11/slack-desc/font-sun-misc b/source/x/x11/slack-desc/font-sun-misc
index d2fd1a33..d941087d 100644
--- a/source/x/x11/slack-desc/font-sun-misc
+++ b/source/x/x11/slack-desc/font-sun-misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-font-sun-misc: font-sun-misc
+font-sun-misc: font-sun-misc (bitmap fonts for X11)
 font-sun-misc:
 font-sun-misc: font-sun-misc is part of X11.
 font-sun-misc:
diff --git a/source/x/x11/slack-desc/font-util b/source/x/x11/slack-desc/font-util
index 4c6a2b2a..05e2f054 100644
--- a/source/x/x11/slack-desc/font-util
+++ b/source/x/x11/slack-desc/font-util
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-font-util: font-util
+font-util: font-util (X.Org font package creation/installation utilities)
 font-util:
 font-util: font-util is part of X11.
 font-util:
diff --git a/source/x/x11/slack-desc/font-winitzki-cyrillic b/source/x/x11/slack-desc/font-winitzki-cyrillic
index c278dfff..573c09fd 100644
--- a/source/x/x11/slack-desc/font-winitzki-cyrillic
+++ b/source/x/x11/slack-desc/font-winitzki-cyrillic
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                       |-----handy-ruler------------------------------------------------------|
-font-winitzki-cyrillic: font-winitzki-cyrillic
+font-winitzki-cyrillic: font-winitzki-cyrillic (bitmap fonts for X11)
 font-winitzki-cyrillic:
 font-winitzki-cyrillic: font-winitzki-cyrillic is part of X11.
 font-winitzki-cyrillic:
diff --git a/source/x/x11/slack-desc/font-xfree86-type1 b/source/x/x11/slack-desc/font-xfree86-type1
index 57ab76c6..1e70a7d4 100644
--- a/source/x/x11/slack-desc/font-xfree86-type1
+++ b/source/x/x11/slack-desc/font-xfree86-type1
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-font-xfree86-type1: font-xfree86-type1
+font-xfree86-type1: font-xfree86-type1 (scalable fonts for X11)
 font-xfree86-type1:
 font-xfree86-type1: font-xfree86-type1 is part of X11.
 font-xfree86-type1:
diff --git a/source/x/x11/slack-desc/fontcacheproto b/source/x/x11/slack-desc/fontcacheproto
index 8388f4c3..eaec530c 100644
--- a/source/x/x11/slack-desc/fontcacheproto
+++ b/source/x/x11/slack-desc/fontcacheproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-fontcacheproto: fontcacheproto
+fontcacheproto: fontcacheproto (C prototypes for X11 Font Cache Extension)
 fontcacheproto:
 fontcacheproto: fontcacheproto is part of X11.
 fontcacheproto:
diff --git a/source/x/x11/slack-desc/fontsproto b/source/x/x11/slack-desc/fontsproto
index 7f5c20a2..a46da298 100644
--- a/source/x/x11/slack-desc/fontsproto
+++ b/source/x/x11/slack-desc/fontsproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-fontsproto: fontsproto
+fontsproto: fontsproto (C prototypes for X11 X Fonts Extension)
 fontsproto:
 fontsproto: fontsproto is part of X11.
 fontsproto:
diff --git a/source/x/x11/slack-desc/fonttosfnt b/source/x/x11/slack-desc/fonttosfnt
index 158fe2e3..1f809734 100644
--- a/source/x/x11/slack-desc/fonttosfnt
+++ b/source/x/x11/slack-desc/fonttosfnt
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-fonttosfnt: fonttosfnt
+fonttosfnt: fonttosfnt (utility to wrap a bitmap font in a sfnt wrapper)
 fonttosfnt:
 fonttosfnt: fonttosfnt is part of X11.
 fonttosfnt:
diff --git a/source/x/x11/slack-desc/fslsfonts b/source/x/x11/slack-desc/fslsfonts
index ca4c416f..53957d1a 100644
--- a/source/x/x11/slack-desc/fslsfonts
+++ b/source/x/x11/slack-desc/fslsfonts
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-fslsfonts: fslsfonts
+fslsfonts: fslsfonts (produces a list of fonts served by an X font server)
 fslsfonts:
 fslsfonts: fslsfonts is part of X11.
 fslsfonts:
diff --git a/source/x/x11/slack-desc/fstobdf b/source/x/x11/slack-desc/fstobdf
index ada9e2ac..4a28eb7b 100644
--- a/source/x/x11/slack-desc/fstobdf
+++ b/source/x/x11/slack-desc/fstobdf
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-fstobdf: fstobdf
+fstobdf: fstobdf (copy fonts from an X11 font server)
 fstobdf:
-fstobdf: fstobdf is part of X11.
+fstobdf: The fstobdf program reads a font from a font server and prints a BDF
+fstobdf: file on the standard output that may be used to recreate the font.
+fstobdf: This is useful in testing servers, debugging font metrics, and
+fstobdf: reproducing lost BDF files.
 fstobdf:
-fstobdf: For more information about the X.Org Foundation (the providers of the
-fstobdf: X.Org implementation of the X Window System), see their website:
 fstobdf:
-fstobdf: http://www.x.org
 fstobdf:
 fstobdf:
 fstobdf:
diff --git a/source/x/x11/slack-desc/gccmakedep b/source/x/x11/slack-desc/gccmakedep
index 1220112e..21db55cd 100644
--- a/source/x/x11/slack-desc/gccmakedep
+++ b/source/x/x11/slack-desc/gccmakedep
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-gccmakedep: gccmakedep
+gccmakedep: gccmakedep (create dependencies in makefiles)
 gccmakedep:
 gccmakedep: gccmakedep is part of X11.
 gccmakedep:
diff --git a/source/x/x11/slack-desc/glproto b/source/x/x11/slack-desc/glproto
index 2c2ddb6f..6d0b506a 100644
--- a/source/x/x11/slack-desc/glproto
+++ b/source/x/x11/slack-desc/glproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-glproto: glproto
+glproto: glproto (C prototypes for X11 OpenGL Extension)
 glproto:
 glproto: glproto is part of X11.
 glproto:
diff --git a/source/x/x11/slack-desc/iceauth b/source/x/x11/slack-desc/iceauth
index 17b0197f..54f525d6 100644
--- a/source/x/x11/slack-desc/iceauth
+++ b/source/x/x11/slack-desc/iceauth
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-iceauth: iceauth
+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: the xauth program for X11 connection authentication records.
 iceauth:
-iceauth: iceauth is part of X11.
 iceauth:
-iceauth: For more information about the X.Org Foundation (the providers of the
-iceauth: X.Org implementation of the X Window System), see their website:
 iceauth:
-iceauth: http://www.x.org
 iceauth:
 iceauth:
 iceauth:
diff --git a/source/x/x11/slack-desc/ico b/source/x/x11/slack-desc/ico
index 025dd68c..b4aeb4a5 100644
--- a/source/x/x11/slack-desc/ico
+++ b/source/x/x11/slack-desc/ico
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-ico: ico
+ico: ico (X11 test client)
 ico:
-ico: ico is part of X11.
+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: polyhedron, with hidden lines removed, or a solid-fill polyhedron
+ico: with hidden faces removed.
 ico:
-ico: For more information about the X.Org Foundation (the providers of the
-ico: X.Org implementation of the X Window System), see their website:
 ico:
-ico: http://www.x.org
 ico:
 ico:
 ico:
diff --git a/source/x/x11/slack-desc/imake b/source/x/x11/slack-desc/imake
index 8b1d5631..53599ebf 100644
--- a/source/x/x11/slack-desc/imake
+++ b/source/x/x11/slack-desc/imake
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-imake: imake
+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:
-imake: imake is part of X11.
 imake:
-imake: For more information about the X.Org Foundation (the providers of the
-imake: X.Org implementation of the X Window System), see their website:
 imake:
-imake: http://www.x.org
 imake:
 imake:
 imake:
diff --git a/source/x/x11/slack-desc/inputproto b/source/x/x11/slack-desc/inputproto
index 6b9a3302..d5e58679 100644
--- a/source/x/x11/slack-desc/inputproto
+++ b/source/x/x11/slack-desc/inputproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-inputproto: inputproto
+inputproto: inputproto (C prototypes for X Input extension)
 inputproto:
 inputproto: inputproto is part of X11.
 inputproto:
diff --git a/source/x/x11/slack-desc/intel-gpu-tools b/source/x/x11/slack-desc/intel-gpu-tools
index b9cdf7c1..3fcee9a3 100644
--- a/source/x/x11/slack-desc/intel-gpu-tools
+++ b/source/x/x11/slack-desc/intel-gpu-tools
@@ -7,13 +7,13 @@
 
                |-----handy-ruler------------------------------------------------------|
 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
-intel-gpu-tools: DRM driver.  There are many macro-level test suites including xtest,
-intel-gpu-tools: rendercheck, piglit, and oglconform.
-intel-gpu-tools: 
-intel-gpu-tools: 
-intel-gpu-tools: 
-intel-gpu-tools: 
-intel-gpu-tools: 
-intel-gpu-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: xtest, rendercheck, piglit, and oglconform.
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
diff --git a/source/x/x11/slack-desc/kbproto b/source/x/x11/slack-desc/kbproto
index c9703ab3..822d8cfd 100644
--- a/source/x/x11/slack-desc/kbproto
+++ b/source/x/x11/slack-desc/kbproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-kbproto: kbproto
+kbproto: kbproto (C prototypes for X11 X Keyboard Extension)
 kbproto:
 kbproto: kbproto is part of X11.
 kbproto:
diff --git a/source/x/x11/slack-desc/lbxproxy b/source/x/x11/slack-desc/lbxproxy
deleted file mode 100644
index 578f938f..00000000
--- a/source/x/x11/slack-desc/lbxproxy
+++ /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------------------------------------------------------|
-lbxproxy: lbxproxy
-lbxproxy:
-lbxproxy: lbxproxy is part of X11.
-lbxproxy:
-lbxproxy: For more information about the X.Org Foundation (the providers of the
-lbxproxy: X.Org implementation of the X Window System), see their website:
-lbxproxy:
-lbxproxy: http://www.x.org
-lbxproxy:
-lbxproxy:
-lbxproxy:
diff --git a/source/x/x11/slack-desc/libAppleWM b/source/x/x11/slack-desc/libAppleWM
deleted file mode 100644
index d5562510..00000000
--- a/source/x/x11/slack-desc/libAppleWM
+++ /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------------------------------------------------------|
-libAppleWM: libAppleWM
-libAppleWM:
-libAppleWM: libAppleWM is part of X11.
-libAppleWM:
-libAppleWM: For more information about the X.Org Foundation (the providers of the
-libAppleWM: X.Org implementation of the X Window System), see their website:
-libAppleWM:
-libAppleWM: http://www.x.org
-libAppleWM:
-libAppleWM:
-libAppleWM:
diff --git a/source/x/x11/slack-desc/libFS b/source/x/x11/slack-desc/libFS
index 6fe37f3e..6554f511 100644
--- a/source/x/x11/slack-desc/libFS
+++ b/source/x/x11/slack-desc/libFS
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-libFS: libFS
+libFS: libFS (X Font Service client library)
 libFS:
 libFS: libFS is part of X11.
 libFS:
diff --git a/source/x/x11/slack-desc/libICE b/source/x/x11/slack-desc/libICE
index 78a4761c..47b74926 100644
--- a/source/x/x11/slack-desc/libICE
+++ b/source/x/x11/slack-desc/libICE
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libICE: libICE
+libICE: libICE (X Inter-Client Exchange Library)
 libICE:
 libICE: libICE is part of X11.
 libICE:
diff --git a/source/x/x11/slack-desc/libSM b/source/x/x11/slack-desc/libSM
index 06803b32..19292900 100644
--- a/source/x/x11/slack-desc/libSM
+++ b/source/x/x11/slack-desc/libSM
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-libSM: libSM
+libSM: libSM (X Session Management Library)
 libSM:
 libSM: libSM is part of X11.
 libSM:
diff --git a/source/x/x11/slack-desc/libWindowsWM b/source/x/x11/slack-desc/libWindowsWM
deleted file mode 100644
index 162e44be..00000000
--- a/source/x/x11/slack-desc/libWindowsWM
+++ /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------------------------------------------------------|
-libWindowsWM: libWindowsWM
-libWindowsWM:
-libWindowsWM: libWindowsWM is part of X11.
-libWindowsWM:
-libWindowsWM: For more information about the X.Org Foundation (the providers of the
-libWindowsWM: X.Org implementation of the X Window System), see their website:
-libWindowsWM:
-libWindowsWM: http://www.x.org
-libWindowsWM:
-libWindowsWM:
-libWindowsWM:
diff --git a/source/x/x11/slack-desc/libX11 b/source/x/x11/slack-desc/libX11
index e7f01273..2ec4f39a 100644
--- a/source/x/x11/slack-desc/libX11
+++ b/source/x/x11/slack-desc/libX11
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libX11: libX11
+libX11: libX11 (Core X11 protocol client library)
 libX11:
 libX11: libX11 is part of X11.
 libX11:
diff --git a/source/x/x11/slack-desc/libXScrnSaver b/source/x/x11/slack-desc/libXScrnSaver
index dea8d864..ae6eea7c 100644
--- a/source/x/x11/slack-desc/libXScrnSaver
+++ b/source/x/x11/slack-desc/libXScrnSaver
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-libXScrnSaver: libXScrnSaver
+libXScrnSaver: libXScrnSaver (X11 Screen Saver extension client library)
 libXScrnSaver:
 libXScrnSaver: libXScrnSaver is part of X11.
 libXScrnSaver:
diff --git a/source/x/x11/slack-desc/libXau b/source/x/x11/slack-desc/libXau
index f2b09201..6e565d76 100644
--- a/source/x/x11/slack-desc/libXau
+++ b/source/x/x11/slack-desc/libXau
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libXau: libXau
+libXau: libXau (Sample Authorization Protocol for X)
 libXau:
-libXau: libXau is part of X11.
+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: For more information about the X.Org Foundation (the providers of the
-libXau: X.Org implementation of the X Window System), see their website:
-libXau:
-libXau: http://www.x.org
 libXau:
 libXau:
 libXau:
diff --git a/source/x/x11/slack-desc/libXaw b/source/x/x11/slack-desc/libXaw
index 3174674b..727adeac 100644
--- a/source/x/x11/slack-desc/libXaw
+++ b/source/x/x11/slack-desc/libXaw
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libXaw: libXaw
+libXaw: libXaw (client library for the X Athena Widget Set)
+libXaw:
+libXaw: Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
+libXaw:
+libXaw:
 libXaw:
-libXaw: libXaw is part of X11.
 libXaw:
-libXaw: For more information about the X.Org Foundation (the providers of the
-libXaw: X.Org implementation of the X Window System), see their website:
 libXaw:
-libXaw: http://www.x.org
 libXaw:
 libXaw:
 libXaw:
diff --git a/source/x/x11/slack-desc/libXaw3d b/source/x/x11/slack-desc/libXaw3d
new file mode 100644
index 00000000..48f7ddc3
--- /dev/null
+++ b/source/x/x11/slack-desc/libXaw3d
@@ -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------------------------------------------------------|
+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: applications with minimal or no source code changes.
+libXaw3d:
+libXaw3d: You should install Xaw3d if you are using applications which 
+libXaw3d: incorporate the MIT Athena widget set and you'd like to 
+libXaw3d: incorporate a 3D look into those applications.
+libXaw3d:
+libXaw3d:
diff --git a/source/x/x11/slack-desc/rstart b/source/x/x11/slack-desc/libXcm
index e009e289..0516aaf7 100644
--- a/source/x/x11/slack-desc/rstart
+++ b/source/x/x11/slack-desc/libXcm
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-rstart: rstart
-rstart:
-rstart: rstart is part of X11.
-rstart:
-rstart: For more information about the X.Org Foundation (the providers of the
-rstart: X.Org implementation of the X Window System), see their website:
-rstart:
-rstart: http://www.x.org
-rstart:
-rstart:
-rstart:
+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: with color servers.
+libXcm:
+libXcm:
+libXcm:
+libXcm:
+libXcm:
+libXcm:
diff --git a/source/x/x11/slack-desc/libXcomposite b/source/x/x11/slack-desc/libXcomposite
index 2fcbe069..cf43dc4f 100644
--- a/source/x/x11/slack-desc/libXcomposite
+++ b/source/x/x11/slack-desc/libXcomposite
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-libXcomposite: libXcomposite
+libXcomposite: libXcomposite (client library for the X Composite extension)
 libXcomposite:
 libXcomposite: libXcomposite is part of X11.
 libXcomposite:
diff --git a/source/x/x11/slack-desc/libXcursor b/source/x/x11/slack-desc/libXcursor
index 1e911648..2906c6aa 100644
--- a/source/x/x11/slack-desc/libXcursor
+++ b/source/x/x11/slack-desc/libXcursor
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-libXcursor: libXcursor
+libXcursor: libXcursor (X Window System Cursor management library)
 libXcursor:
 libXcursor: libXcursor is part of X11.
 libXcursor:
diff --git a/source/x/x11/slack-desc/libXdamage b/source/x/x11/slack-desc/libXdamage
index 58f917df..05c618bf 100644
--- a/source/x/x11/slack-desc/libXdamage
+++ b/source/x/x11/slack-desc/libXdamage
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-libXdamage: libXdamage
+libXdamage: libXdamage (client library for the X Damage Extension)
 libXdamage:
 libXdamage: libXdamage is part of X11.
 libXdamage:
diff --git a/source/x/x11/slack-desc/libXdmcp b/source/x/x11/slack-desc/libXdmcp
index fc03f5bb..f3dc2396 100644
--- a/source/x/x11/slack-desc/libXdmcp
+++ b/source/x/x11/slack-desc/libXdmcp
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-libXdmcp: libXdmcp
+libXdmcp: libXdmcp (X Display Manager Control Protocol library)
 libXdmcp:
 libXdmcp: libXdmcp is part of X11.
 libXdmcp:
diff --git a/source/x/x11/slack-desc/libXevie b/source/x/x11/slack-desc/libXevie
index c9701592..2af8d875 100644
--- a/source/x/x11/slack-desc/libXevie
+++ b/source/x/x11/slack-desc/libXevie
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-libXevie: libXevie
+libXevie: libXevie (X Event Interception Extension (XEvIE) library)
 libXevie:
 libXevie: libXevie is part of X11.
 libXevie:
diff --git a/source/x/x11/slack-desc/libXext b/source/x/x11/slack-desc/libXext
index cb5b395b..a636363a 100644
--- a/source/x/x11/slack-desc/libXext
+++ b/source/x/x11/slack-desc/libXext
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-libXext: libXext
+libXext: libXext (library for common extensions to the X11 protocol)
 libXext:
 libXext: libXext is part of X11.
 libXext:
diff --git a/source/x/x11/slack-desc/libXfixes b/source/x/x11/slack-desc/libXfixes
index 9b6b9df7..3c44fa46 100644
--- a/source/x/x11/slack-desc/libXfixes
+++ b/source/x/x11/slack-desc/libXfixes
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-libXfixes: libXfixes
+libXfixes: libXfixes (client library for the Xfixes extension)
 libXfixes:
 libXfixes: libXfixes is part of X11.
 libXfixes:
diff --git a/source/x/x11/slack-desc/libXfont b/source/x/x11/slack-desc/libXfont
index 109b391c..d78d6a0e 100644
--- a/source/x/x11/slack-desc/libXfont
+++ b/source/x/x11/slack-desc/libXfont
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-libXfont: libXfont
+libXfont: libXfont (library for legacy X11 font system)
 libXfont:
-libXfont: libXfont is part of X11.
-libXfont:
-libXfont: For more information about the X.Org Foundation (the providers of the
-libXfont: X.Org implementation of the X Window System), see their website:
-libXfont:
-libXfont: http://www.x.org
+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/libXfontcache b/source/x/x11/slack-desc/libXfontcache
index 735bdaa7..fdf8ca36 100644
--- a/source/x/x11/slack-desc/libXfontcache
+++ b/source/x/x11/slack-desc/libXfontcache
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-libXfontcache: libXfontcache
+libXfontcache: libXfontcache (X-TrueType font cache extension client library)
 libXfontcache:
 libXfontcache: libXfontcache is part of X11.
 libXfontcache:
diff --git a/source/x/x11/slack-desc/libXft b/source/x/x11/slack-desc/libXft
index a87a87d4..856e2828 100644
--- a/source/x/x11/slack-desc/libXft
+++ b/source/x/x11/slack-desc/libXft
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libXft: libXft
+libXft: libXft (X FreeType library)
 libXft:
 libXft: libXft is part of X11.
 libXft:
diff --git a/source/x/x11/slack-desc/libXi b/source/x/x11/slack-desc/libXi
index f3f0c633..4585f82e 100644
--- a/source/x/x11/slack-desc/libXi
+++ b/source/x/x11/slack-desc/libXi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-libXi: libXi
+libXi: libXi (library for the X Input Extension)
 libXi:
 libXi: libXi is part of X11.
 libXi:
diff --git a/source/x/x11/slack-desc/libXinerama b/source/x/x11/slack-desc/libXinerama
index e01ab025..3b16b81f 100644
--- a/source/x/x11/slack-desc/libXinerama
+++ b/source/x/x11/slack-desc/libXinerama
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-libXinerama: libXinerama
+libXinerama: libXinerama (library for Xinerama extension to X11 Protocol)
 libXinerama:
 libXinerama: libXinerama is part of X11.
 libXinerama:
diff --git a/source/x/x11/slack-desc/libXmu b/source/x/x11/slack-desc/libXmu
index dd6aff00..de36044c 100644
--- a/source/x/x11/slack-desc/libXmu
+++ b/source/x/x11/slack-desc/libXmu
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libXmu: libXmu
+libXmu: libXmu (X miscellaneous utility library)
 libXmu:
-libXmu: libXmu is part of X11.
+libXmu: This library contains miscellaneous utilities and is not part of the
+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:
-libXmu: For more information about the X.Org Foundation (the providers of the
-libXmu: X.Org implementation of the X Window System), see their website:
 libXmu:
-libXmu: http://www.x.org
 libXmu:
 libXmu:
 libXmu:
diff --git a/source/x/x11/slack-desc/libXp b/source/x/x11/slack-desc/libXp
index 16eb84a1..b68a6664 100644
--- a/source/x/x11/slack-desc/libXp
+++ b/source/x/x11/slack-desc/libXp
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-libXp: libXp
+libXp: libXp (X Print Client Library)
 libXp:
 libXp: libXp is part of X11.
 libXp:
diff --git a/source/x/x11/slack-desc/libXpm b/source/x/x11/slack-desc/libXpm
index 82d04380..77c809a5 100644
--- a/source/x/x11/slack-desc/libXpm
+++ b/source/x/x11/slack-desc/libXpm
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libXpm: libXpm
+libXpm: libXpm (X Pixmap (XPM) image file format library)
 libXpm:
 libXpm: libXpm is part of X11.
 libXpm:
diff --git a/source/x/x11/slack-desc/libXprintUtil b/source/x/x11/slack-desc/libXprintUtil
deleted file mode 100644
index bcad3415..00000000
--- a/source/x/x11/slack-desc/libXprintUtil
+++ /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------------------------------------------------------|
-libXprintUtil: libXprintUtil
-libXprintUtil:
-libXprintUtil: libXprintUtil is part of X11.
-libXprintUtil:
-libXprintUtil: For more information about the X.Org Foundation (the providers of the
-libXprintUtil: X.Org implementation of the X Window System), see their website:
-libXprintUtil:
-libXprintUtil: http://www.x.org
-libXprintUtil:
-libXprintUtil:
-libXprintUtil:
diff --git a/source/x/x11/slack-desc/libXrandr b/source/x/x11/slack-desc/libXrandr
index c86d49ab..ad2e243b 100644
--- a/source/x/x11/slack-desc/libXrandr
+++ b/source/x/x11/slack-desc/libXrandr
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-libXrandr: libXrandr
+libXrandr: libXrandr (X Resize, Rotate and Reflection extension library)
 libXrandr:
 libXrandr: libXrandr is part of X11.
 libXrandr:
diff --git a/source/x/x11/slack-desc/libXrender b/source/x/x11/slack-desc/libXrender
index fe9f3b54..c5fe7269 100644
--- a/source/x/x11/slack-desc/libXrender
+++ b/source/x/x11/slack-desc/libXrender
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-libXrender: libXrender
+libXrender: libXrender (library for the Render Extension to the X11 protocol)
 libXrender:
 libXrender: libXrender is part of X11.
 libXrender:
diff --git a/source/x/x11/slack-desc/libXres b/source/x/x11/slack-desc/libXres
index 783719f2..4582cd5f 100644
--- a/source/x/x11/slack-desc/libXres
+++ b/source/x/x11/slack-desc/libXres
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-libXres: libXres
+libXres: libXres (X-Resource extension client library)
 libXres:
 libXres: libXres is part of X11.
 libXres:
diff --git a/source/x/x11/slack-desc/libXt b/source/x/x11/slack-desc/libXt
index 9a03bd98..3b8df4b0 100644
--- a/source/x/x11/slack-desc/libXt
+++ b/source/x/x11/slack-desc/libXt
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-libXt: libXt
+libXt: libXt (X Toolkit Intrinsics library)
 libXt:
 libXt: libXt is part of X11.
 libXt:
diff --git a/source/x/x11/slack-desc/libXtst b/source/x/x11/slack-desc/libXtst
index f71c8475..63b93c01 100644
--- a/source/x/x11/slack-desc/libXtst
+++ b/source/x/x11/slack-desc/libXtst
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-libXtst: libXtst
+libXtst: libXtst (client library for the XTEST & RECORD extensions)
 libXtst:
 libXtst: libXtst is part of X11.
 libXtst:
diff --git a/source/x/x11/slack-desc/libXv b/source/x/x11/slack-desc/libXv
index 3bfe0299..d72865bf 100644
--- a/source/x/x11/slack-desc/libXv
+++ b/source/x/x11/slack-desc/libXv
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-libXv: libXv
+libXv: libXv (library for the X Video (Xv) extension to the X Window System)
 libXv:
 libXv: libXv is part of X11.
 libXv:
diff --git a/source/x/x11/slack-desc/libXvMC b/source/x/x11/slack-desc/libXvMC
index 5557fdb8..aecd7f3a 100644
--- a/source/x/x11/slack-desc/libXvMC
+++ b/source/x/x11/slack-desc/libXvMC
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-libXvMC: libXvMC
+libXvMC: libXvMC (X.Org X11 libXvMC runtime library)
 libXvMC:
 libXvMC: libXvMC is part of X11.
 libXvMC:
diff --git a/source/x/x11/slack-desc/libXxf86dga b/source/x/x11/slack-desc/libXxf86dga
index 99492bc2..88023255 100644
--- a/source/x/x11/slack-desc/libXxf86dga
+++ b/source/x/x11/slack-desc/libXxf86dga
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-libXxf86dga: libXxf86dga
+libXxf86dga: libXxf86dga (client library for the XFree86-DGA extension)
 libXxf86dga:
 libXxf86dga: libXxf86dga is part of X11.
 libXxf86dga:
diff --git a/source/x/x11/slack-desc/libXxf86misc b/source/x/x11/slack-desc/libXxf86misc
index 8c69dedb..ccc2c29b 100644
--- a/source/x/x11/slack-desc/libXxf86misc
+++ b/source/x/x11/slack-desc/libXxf86misc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
             |-----handy-ruler------------------------------------------------------|
-libXxf86misc: libXxf86misc
+libXxf86misc: libXxf86misc (Extension library for the XFree86-Misc X extension)
 libXxf86misc:
 libXxf86misc: libXxf86misc is part of X11.
 libXxf86misc:
diff --git a/source/x/x11/slack-desc/libXxf86vm b/source/x/x11/slack-desc/libXxf86vm
index 0c4820a0..872c8926 100644
--- a/source/x/x11/slack-desc/libXxf86vm
+++ b/source/x/x11/slack-desc/libXxf86vm
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-libXxf86vm: libXxf86vm
+libXxf86vm: libXxf86vm (library for the XFree86-VidMode X extension)
 libXxf86vm:
 libXxf86vm: libXxf86vm is part of X11.
 libXxf86vm:
diff --git a/source/x/x11/slack-desc/libdmx b/source/x/x11/slack-desc/libdmx
index f757df99..893fa670 100644
--- a/source/x/x11/slack-desc/libdmx
+++ b/source/x/x11/slack-desc/libdmx
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-libdmx: libdmx
+libdmx: libdmx (DMX (Distributed Multihead X) extension library)
 libdmx:
 libdmx: libdmx is part of X11.
 libdmx:
diff --git a/source/x/x11/slack-desc/libfontenc b/source/x/x11/slack-desc/libfontenc
index 78b26b02..0172d1ae 100644
--- a/source/x/x11/slack-desc/libfontenc
+++ b/source/x/x11/slack-desc/libfontenc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-libfontenc: libfontenc
+libfontenc: libfontenc (font encoding library)
 libfontenc:
 libfontenc: libfontenc is part of X11.
 libfontenc:
diff --git a/source/x/x11/slack-desc/liblbxutil b/source/x/x11/slack-desc/liblbxutil
deleted file mode 100644
index 0a42196e..00000000
--- a/source/x/x11/slack-desc/liblbxutil
+++ /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------------------------------------------------------|
-liblbxutil: liblbxutil
-liblbxutil:
-liblbxutil: liblbxutil is part of X11.
-liblbxutil:
-liblbxutil: For more information about the X.Org Foundation (the providers of the
-liblbxutil: X.Org implementation of the X Window System), see their website:
-liblbxutil:
-liblbxutil: http://www.x.org
-liblbxutil:
-liblbxutil:
-liblbxutil:
diff --git a/source/x/x11/slack-desc/liboldX b/source/x/x11/slack-desc/liboldX
deleted file mode 100644
index d8e65ba4..00000000
--- a/source/x/x11/slack-desc/liboldX
+++ /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------------------------------------------------------|
-liboldX: liboldX
-liboldX:
-liboldX: liboldX is part of X11.
-liboldX:
-liboldX: For more information about the X.Org Foundation (the providers of the
-liboldX: X.Org implementation of the X Window System), see their website:
-liboldX:
-liboldX: http://www.x.org
-liboldX:
-liboldX:
-liboldX:
diff --git a/source/x/x11/slack-desc/libpciaccess b/source/x/x11/slack-desc/libpciaccess
index 0c499f77..c3d6d648 100644
--- a/source/x/x11/slack-desc/libpciaccess
+++ b/source/x/x11/slack-desc/libpciaccess
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
             |-----handy-ruler------------------------------------------------------|
-libpciaccess: libpciaccess
+libpciaccess: libpciaccess (Generic PCI access library)
 libpciaccess:
 libpciaccess: libpciaccess is part of X11.
 libpciaccess:
diff --git a/source/x/x11/slack-desc/libpthread-stubs b/source/x/x11/slack-desc/libpthread-stubs
index 8c0c0e5d..e64f33d3 100644
--- a/source/x/x11/slack-desc/libpthread-stubs
+++ b/source/x/x11/slack-desc/libpthread-stubs
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-libpthread-stubs: libpthread-stubs
+libpthread-stubs: libpthread-stubs (thread support stubs)
 libpthread-stubs:
-libpthread-stubs: libpthread-stubs is part of X11.
+libpthread-stubs: This library provides weak aliases for pthread functions not provided
+libpthread-stubs: in libc or otherwise available by default. Libraries like libxcb rely
+libpthread-stubs: on pthread stubs to use pthreads optionally, becoming thread-safe
+libpthread-stubs: when linked to libpthread, while avoiding any performance hit when
+libpthread-stubs: running single-threaded.
 libpthread-stubs:
-libpthread-stubs: For more information about the X.Org Foundation (the providers of the
-libpthread-stubs: X.Org implementation of the X Window System), see their website:
-libpthread-stubs:
-libpthread-stubs: http://www.x.org
 libpthread-stubs:
 libpthread-stubs:
 libpthread-stubs:
diff --git a/source/x/x11/slack-desc/libxkbfile b/source/x/x11/slack-desc/libxkbfile
index ffaa00a4..fe2d59f2 100644
--- a/source/x/x11/slack-desc/libxkbfile
+++ b/source/x/x11/slack-desc/libxkbfile
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-libxkbfile: libxkbfile
+libxkbfile: libxkbfile (X11 keyboard file manipulation library)
 libxkbfile:
 libxkbfile: libxkbfile is part of X11.
 libxkbfile:
diff --git a/source/x/x11/slack-desc/libxkbui b/source/x/x11/slack-desc/libxkbui
deleted file mode 100644
index 332ad414..00000000
--- a/source/x/x11/slack-desc/libxkbui
+++ /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------------------------------------------------------|
-libxkbui: libxkbui
-libxkbui:
-libxkbui: libxkbui is part of X11.
-libxkbui:
-libxkbui: For more information about the X.Org Foundation (the providers of the
-libxkbui: X.Org implementation of the X Window System), see their website:
-libxkbui:
-libxkbui: http://www.x.org
-libxkbui:
-libxkbui:
-libxkbui:
diff --git a/source/x/x11/slack-desc/listres b/source/x/x11/slack-desc/listres
index 16ae55b5..f14aa2ce 100644
--- a/source/x/x11/slack-desc/listres
+++ b/source/x/x11/slack-desc/listres
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-listres: listres
+listres: listres (X11 resource lister)
+listres:
+listres: The listres program generates a list of X resources for a widget in
+listres: an X client written using a toolkit based on libXt.
+listres:
 listres:
-listres: listres is part of X11.
 listres:
-listres: For more information about the X.Org Foundation (the providers of the
-listres: X.Org implementation of the X Window System), see their website:
 listres:
-listres: http://www.x.org
 listres:
 listres:
 listres:
diff --git a/source/x/x11/slack-desc/lndir b/source/x/x11/slack-desc/lndir
index 0a73ae95..c9a27e20 100644
--- a/source/x/x11/slack-desc/lndir
+++ b/source/x/x11/slack-desc/lndir
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-lndir: lndir
+lndir: lndir (create shadow directory of symbolic links to another directory)
 lndir:
 lndir: lndir is part of X11.
 lndir:
diff --git a/source/x/x11/slack-desc/luit b/source/x/x11/slack-desc/luit
index ab7f144f..cd9d9664 100644
--- a/source/x/x11/slack-desc/luit
+++ b/source/x/x11/slack-desc/luit
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-luit: luit
+luit: luit (character encoding convertor for X11 terminals)
 luit:
-luit: luit is part of X11.
+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: output from the locale's encoding into UTF-8, and convert terminal
+luit: input from UTF-8 into the locale's encoding.
 luit:
-luit: For more information about the X.Org Foundation (the providers of the
-luit: X.Org implementation of the X Window System), see their website:
 luit:
-luit: http://www.x.org
 luit:
 luit:
 luit:
diff --git a/source/x/x11/slack-desc/makedepend b/source/x/x11/slack-desc/makedepend
index 444713af..ec831dd4 100644
--- a/source/x/x11/slack-desc/makedepend
+++ b/source/x/x11/slack-desc/makedepend
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-makedepend: makedepend
+makedepend: makedepend (create dependencies in makefiles)
 makedepend:
 makedepend: makedepend is part of X11.
 makedepend:
diff --git a/source/x/x11/slack-desc/mkcomposecache b/source/x/x11/slack-desc/mkcomposecache
index c219f99f..ed04a554 100644
--- a/source/x/x11/slack-desc/mkcomposecache
+++ b/source/x/x11/slack-desc/mkcomposecache
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-mkcomposecache: mkcomposecache
+mkcomposecache: mkcomposecache (creates global (system-wide) Compose cache files)
 mkcomposecache:
 mkcomposecache: mkcomposecache is part of X11.
 mkcomposecache:
diff --git a/source/x/x11/slack-desc/mkfontdir b/source/x/x11/slack-desc/mkfontdir
index 681db8f2..3f97b7e8 100644
--- a/source/x/x11/slack-desc/mkfontdir
+++ b/source/x/x11/slack-desc/mkfontdir
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-mkfontdir: mkfontdir
+mkfontdir: mkfontdir (X11 font utility)
 mkfontdir:
-mkfontdir: mkfontdir is part of X11.
+mkfontdir: mkfontdir creates the fonts.dir files needed by the legacy X server
+mkfontdir: core font system. The current implementation is a simple wrapper
+mkfontdir: script around the mkfontscale program, which must be built and
+mkfontdir: installed first.
 mkfontdir:
-mkfontdir: For more information about the X.Org Foundation (the providers of the
-mkfontdir: X.Org implementation of the X Window System), see their website:
 mkfontdir:
-mkfontdir: http://www.x.org
 mkfontdir:
 mkfontdir:
 mkfontdir:
diff --git a/source/x/x11/slack-desc/mkfontscale b/source/x/x11/slack-desc/mkfontscale
index 57c6f825..176336f7 100644
--- a/source/x/x11/slack-desc/mkfontscale
+++ b/source/x/x11/slack-desc/mkfontscale
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-mkfontscale: mkfontscale
+mkfontscale: mkfontscale (X11 font utility)
+mkfontscale:
+mkfontscale: mkfontscale creates the fonts.scale and fonts.dir index files used
+mkfontscale: by the legacy X11 font system.
+mkfontscale:
 mkfontscale:
-mkfontscale: mkfontscale is part of X11.
 mkfontscale:
-mkfontscale: For more information about the X.Org Foundation (the providers of the
-mkfontscale: X.Org implementation of the X Window System), see their website:
 mkfontscale:
-mkfontscale: http://www.x.org
 mkfontscale:
 mkfontscale:
 mkfontscale:
diff --git a/source/x/x11/slack-desc/oclock b/source/x/x11/slack-desc/oclock
index 7e4b2acd..1ec87ceb 100644
--- a/source/x/x11/slack-desc/oclock
+++ b/source/x/x11/slack-desc/oclock
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-oclock: oclock
+oclock: oclock (X11 on-screen clock)
+oclock:
+oclock: oclock is a simple analog clock using the SHAPE extension to make a
+oclock: round (possibly transparent) window.
+oclock:
 oclock:
-oclock: oclock is part of X11.
 oclock:
-oclock: For more information about the X.Org Foundation (the providers of the
-oclock: X.Org implementation of the X Window System), see their website:
 oclock:
-oclock: http://www.x.org
 oclock:
 oclock:
 oclock:
diff --git a/source/x/x11/slack-desc/pixman b/source/x/x11/slack-desc/pixman
index 350e53dd..73c93440 100644
--- a/source/x/x11/slack-desc/pixman
+++ b/source/x/x11/slack-desc/pixman
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-pixman: pixman
+pixman: pixman (pixel manipulation library)
 pixman:
 pixman: pixman contains low-level pixel manipulation routines and is used by
 pixman: both xorg and cairo.
diff --git a/source/x/x11/slack-desc/printproto b/source/x/x11/slack-desc/printproto
index 3aa4fe07..28fb1a2a 100644
--- a/source/x/x11/slack-desc/printproto
+++ b/source/x/x11/slack-desc/printproto
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-printproto: printproto
+printproto: printproto (C prototypes for X11 Xprint extension)
+printproto:
+printproto: Xprint extension to the X11 protocol - a portable, network-transparent
+printproto: printing system
+printproto:
 printproto:
-printproto: printproto is part of X11.
 printproto:
-printproto: For more information about the X.Org Foundation (the providers of the
-printproto: X.Org implementation of the X Window System), see their website:
 printproto:
-printproto: http://www.x.org
 printproto:
 printproto:
 printproto:
diff --git a/source/x/x11/slack-desc/proxymngr b/source/x/x11/slack-desc/proxymngr
deleted file mode 100644
index 63a90660..00000000
--- a/source/x/x11/slack-desc/proxymngr
+++ /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------------------------------------------------------|
-proxymngr: proxymngr
-proxymngr:
-proxymngr: proxymngr is part of X11.
-proxymngr:
-proxymngr: For more information about the X.Org Foundation (the providers of the
-proxymngr: X.Org implementation of the X Window System), see their website:
-proxymngr:
-proxymngr: http://www.x.org
-proxymngr:
-proxymngr:
-proxymngr:
diff --git a/source/x/x11/slack-desc/randrproto b/source/x/x11/slack-desc/randrproto
index a56827c9..f97ca095 100644
--- a/source/x/x11/slack-desc/randrproto
+++ b/source/x/x11/slack-desc/randrproto
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-randrproto: randrproto
+randrproto: randrproto (C prototypes for RandR)
+randrproto:
+randrproto: RandR is the X11 Resize and Rotate Extension
+randrproto:
+randrproto:
 randrproto:
-randrproto: randrproto is part of X11.
 randrproto:
-randrproto: For more information about the X.Org Foundation (the providers of the
-randrproto: X.Org implementation of the X Window System), see their website:
 randrproto:
-randrproto: http://www.x.org
 randrproto:
 randrproto:
 randrproto:
diff --git a/source/x/x11/slack-desc/recordproto b/source/x/x11/slack-desc/recordproto
index caecfd7e..4fc28e90 100644
--- a/source/x/x11/slack-desc/recordproto
+++ b/source/x/x11/slack-desc/recordproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-recordproto: recordproto
+recordproto: recordproto (C prototypes for X Record Extension)
 recordproto:
 recordproto: recordproto is part of X11.
 recordproto:
diff --git a/source/x/x11/slack-desc/rendercheck b/source/x/x11/slack-desc/rendercheck
index 9503468e..e8a502ea 100644
--- a/source/x/x11/slack-desc/rendercheck
+++ b/source/x/x11/slack-desc/rendercheck
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-rendercheck: rendercheck
+rendercheck: rendercheck (test X11 Render support)
+rendercheck:
+rendercheck: rendercheck is a program to test a Render extension implementation
+rendercheck: against separate calculations of expected output.
+rendercheck:
 rendercheck:
-rendercheck: rendercheck is part of X11.
 rendercheck:
-rendercheck: For more information about the X.Org Foundation (the providers of the
-rendercheck: X.Org implementation of the X Window System), see their website:
 rendercheck:
-rendercheck: http://www.x.org
 rendercheck:
 rendercheck:
 rendercheck:
diff --git a/source/x/x11/slack-desc/renderproto b/source/x/x11/slack-desc/renderproto
index cdc21f01..ef667f97 100644
--- a/source/x/x11/slack-desc/renderproto
+++ b/source/x/x11/slack-desc/renderproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-renderproto: renderproto
+renderproto: renderproto (C prototypes for X Rendering Extension)
 renderproto:
 renderproto: renderproto is part of X11.
 renderproto:
diff --git a/source/x/x11/slack-desc/resourceproto b/source/x/x11/slack-desc/resourceproto
index 8303f74d..6881a8e5 100644
--- a/source/x/x11/slack-desc/resourceproto
+++ b/source/x/x11/slack-desc/resourceproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-resourceproto: resourceproto
+resourceproto: resourceproto (C prototypes for X Resource Extension)
 resourceproto:
 resourceproto: resourceproto is part of X11.
 resourceproto:
diff --git a/source/x/x11/slack-desc/rgb b/source/x/x11/slack-desc/rgb
index 34263a01..f339502e 100644
--- a/source/x/x11/slack-desc/rgb
+++ b/source/x/x11/slack-desc/rgb
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-rgb: rgb
+rgb: rgb (X color name database)
 rgb:
 rgb: rgb is part of X11.
 rgb:
diff --git a/source/x/x11/slack-desc/scripts b/source/x/x11/slack-desc/scripts
deleted file mode 100644
index 549159b2..00000000
--- a/source/x/x11/slack-desc/scripts
+++ /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------------------------------------------------------|
-scripts: scripts
-scripts:
-scripts: scripts is part of X11.
-scripts:
-scripts: For more information about the X.Org Foundation (the providers of the
-scripts: X.Org implementation of the X Window System), see their website:
-scripts:
-scripts: http://www.x.org
-scripts:
-scripts:
-scripts:
diff --git a/source/x/x11/slack-desc/scrnsaverproto b/source/x/x11/slack-desc/scrnsaverproto
index 70142f89..3218b7e7 100644
--- a/source/x/x11/slack-desc/scrnsaverproto
+++ b/source/x/x11/slack-desc/scrnsaverproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-scrnsaverproto: scrnsaverproto
+scrnsaverproto: scrnsaverproto (C prototypes for X11 MIT Screen Saver Extension)
 scrnsaverproto:
 scrnsaverproto: scrnsaverproto is part of X11.
 scrnsaverproto:
diff --git a/source/x/x11/slack-desc/sessreg b/source/x/x11/slack-desc/sessreg
index 8a85e326..0da458bb 100644
--- a/source/x/x11/slack-desc/sessreg
+++ b/source/x/x11/slack-desc/sessreg
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-sessreg: sessreg
+sessreg: sessreg (simple program for managing utmp/wtmp entries for X sessions)
+sessreg:
+sessreg: sessreg was originally written for use with xdm, but it may also be 
+sessreg: used with other display managers such as gdm or kdm.
+sessreg:
 sessreg:
-sessreg: sessreg is part of X11.
 sessreg:
-sessreg: For more information about the X.Org Foundation (the providers of the
-sessreg: X.Org implementation of the X Window System), see their website:
 sessreg:
-sessreg: http://www.x.org
 sessreg:
 sessreg:
 sessreg:
diff --git a/source/x/x11/slack-desc/setxkbmap b/source/x/x11/slack-desc/setxkbmap
index 99beaa92..a3b1841a 100644
--- a/source/x/x11/slack-desc/setxkbmap
+++ b/source/x/x11/slack-desc/setxkbmap
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-setxkbmap: setxkbmap
+setxkbmap: setxkbmap (change X11 keyboard layout)
 setxkbmap:
 setxkbmap: setxkbmap is part of X11.
 setxkbmap:
diff --git a/source/x/x11/slack-desc/showfont b/source/x/x11/slack-desc/showfont
index b53ce29a..24665efe 100644
--- a/source/x/x11/slack-desc/showfont
+++ b/source/x/x11/slack-desc/showfont
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-showfont: showfont
+showfont: showfont (displays data about a font from an X font server)
+showfont:
+showfont: The information shown includes font information, font properties,
+showfont: character metrics, and character bitmaps.
+showfont:
 showfont:
-showfont: showfont is part of X11.
 showfont:
-showfont: For more information about the X.Org Foundation (the providers of the
-showfont: X.Org implementation of the X Window System), see their website:
 showfont:
-showfont: http://www.x.org
 showfont:
 showfont:
 showfont:
diff --git a/source/x/x11/slack-desc/smproxy b/source/x/x11/slack-desc/smproxy
index a8bc5976..c40480a9 100644
--- a/source/x/x11/slack-desc/smproxy
+++ b/source/x/x11/slack-desc/smproxy
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-smproxy: smproxy
+smproxy: smproxy (X11 session management proxy)
+smproxy:
+smproxy: smproxy allows X applications that do not support X11R6 session
+smproxy: management to participate in an X11R6 session.
+smproxy:
 smproxy:
-smproxy: smproxy is part of X11.
 smproxy:
-smproxy: For more information about the X.Org Foundation (the providers of the
-smproxy: X.Org implementation of the X Window System), see their website:
 smproxy:
-smproxy: http://www.x.org
 smproxy:
 smproxy:
 smproxy:
diff --git a/source/x/x11/slack-desc/libXTrap b/source/x/x11/slack-desc/transset
index 51443def..1e1128c5 100644
--- a/source/x/x11/slack-desc/libXTrap
+++ b/source/x/x11/slack-desc/transset
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-libXTrap: libXTrap
-libXTrap:
-libXTrap: libXTrap is part of X11.
-libXTrap:
-libXTrap: For more information about the X.Org Foundation (the providers of the
-libXTrap: X.Org implementation of the X Window System), see their website:
-libXTrap:
-libXTrap: http://www.x.org
-libXTrap:
-libXTrap:
-libXTrap:
+transset: transset (utility for setting opacity property)
+transset:
+transset: transset is a utility for setting opacity property.
+transset:
+transset: Some of the features:
+transset:   * select window by clicking (as transset)
+transset:   * select actual focused X11 window
+transset:   * select window by pointing
+transset:   * select by window name or id
+transset:   * force toggle
+transset:   * increase or decrease opacity
diff --git a/source/x/x11/slack-desc/trapproto b/source/x/x11/slack-desc/trapproto
deleted file mode 100644
index 5b0a2174..00000000
--- a/source/x/x11/slack-desc/trapproto
+++ /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------------------------------------------------------|
-trapproto: trapproto
-trapproto:
-trapproto: trapproto is part of X11.
-trapproto:
-trapproto: For more information about the X.Org Foundation (the providers of the
-trapproto: X.Org implementation of the X Window System), see their website:
-trapproto:
-trapproto: http://www.x.org
-trapproto:
-trapproto:
-trapproto:
diff --git a/source/x/x11/slack-desc/twm b/source/x/x11/slack-desc/twm
index 78c09f21..590eec46 100644
--- a/source/x/x11/slack-desc/twm
+++ b/source/x/x11/slack-desc/twm
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-twm: twm
+twm: twm (Tab Window Manager for the X Window System)
 twm:
 twm: twm is part of X11.
 twm:
diff --git a/source/x/x11/slack-desc/util-macros b/source/x/x11/slack-desc/util-macros
index 39426633..f339dfa8 100644
--- a/source/x/x11/slack-desc/util-macros
+++ b/source/x/x11/slack-desc/util-macros
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-util-macros: util-macros
+util-macros: util-macros (autoconf support for X11)
+util-macros:
+util-macros: This is a set of autoconf macros used by the configure.ac scripts in
+util-macros: other Xorg modular packages, and is needed to generate new versions
+util-macros: of their configure scripts with autoconf.
 util-macros:
-util-macros: util-macros is part of X11.
 util-macros:
-util-macros: For more information about the X.Org Foundation (the providers of the
-util-macros: X.Org implementation of the X Window System), see their website:
 util-macros:
-util-macros: http://www.x.org
 util-macros:
 util-macros:
 util-macros:
diff --git a/source/x/x11/slack-desc/videoproto b/source/x/x11/slack-desc/videoproto
index e90690c2..f65573bc 100644
--- a/source/x/x11/slack-desc/videoproto
+++ b/source/x/x11/slack-desc/videoproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-videoproto: videoproto
+videoproto: videoproto (C prototypes for X Video Extension)
 videoproto:
 videoproto: videoproto is part of X11.
 videoproto:
diff --git a/source/x/x11/slack-desc/viewres b/source/x/x11/slack-desc/viewres
index e710f02b..05682ea7 100644
--- a/source/x/x11/slack-desc/viewres
+++ b/source/x/x11/slack-desc/viewres
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-viewres: viewres
+viewres: viewres (view widget class hierarchy of the Athena Widget Set)
 viewres:
 viewres: viewres is part of X11.
 viewres:
diff --git a/source/x/x11/slack-desc/x11-app b/source/x/x11/slack-desc/x11-app
deleted file mode 100644
index 2667d321..00000000
--- a/source/x/x11/slack-desc/x11-app
+++ /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------------------------------------------------------|
-x11-app: x11-app (the traditional collection of basic X apps)
-x11-app:
-x11-app: These are the basic X programs that come with the X Window System.
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
diff --git a/source/x/x11/slack-desc/x11-data b/source/x/x11/slack-desc/x11-data
deleted file mode 100644
index 0b8ef63b..00000000
--- a/source/x/x11/slack-desc/x11-data
+++ /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------------------------------------------------------|
-x11-data: x11-data (data files used by X)
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
diff --git a/source/x/x11/slack-desc/x11-doc b/source/x/x11/slack-desc/x11-doc
deleted file mode 100644
index 8ac7b8b9..00000000
--- a/source/x/x11/slack-desc/x11-doc
+++ /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------------------------------------------------------|
-x11-doc: x11-doc (documentation for X)
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
diff --git a/source/x/x11/slack-desc/x11-driver b/source/x/x11/slack-desc/x11-driver
deleted file mode 100644
index 3196549e..00000000
--- a/source/x/x11/slack-desc/x11-driver
+++ /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------------------------------------------------------|
-x11-driver: x11-driver (input and output drivers for X)
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
diff --git a/source/x/x11/slack-desc/x11-font b/source/x/x11/slack-desc/x11-font
deleted file mode 100644
index b0bf50f6..00000000
--- a/source/x/x11/slack-desc/x11-font
+++ /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------------------------------------------------------|
-x11-font: x11-font (fonts for X)
-x11-font:
-x11-font: Fonts for X.
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
diff --git a/source/x/x11/slack-desc/x11-lib b/source/x/x11/slack-desc/x11-lib
deleted file mode 100644
index 3090338c..00000000
--- a/source/x/x11/slack-desc/x11-lib
+++ /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------------------------------------------------------|
-x11-lib: x11-lib (X11 libraries and header files)
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
diff --git a/source/x/x11/slack-desc/x11-proto b/source/x/x11/slack-desc/x11-proto
deleted file mode 100644
index 1c1f9766..00000000
--- a/source/x/x11/slack-desc/x11-proto
+++ /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------------------------------------------------------|
-x11-proto: x11-proto (files used for developing X)
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
diff --git a/source/x/x11/slack-desc/x11-util b/source/x/x11/slack-desc/x11-util
deleted file mode 100644
index a5d30280..00000000
--- a/source/x/x11/slack-desc/x11-util
+++ /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------------------------------------------------------|
-x11-util: x11-util (a set of handy utilities for X11)
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
diff --git a/source/x/x11/slack-desc/x11perf b/source/x/x11/slack-desc/x11perf
index 8d6996ac..fc51a61e 100644
--- a/source/x/x11/slack-desc/x11perf
+++ b/source/x/x11/slack-desc/x11perf
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-x11perf: x11perf
+x11perf: x11perf (X11 server performance test program)
 x11perf:
 x11perf: x11perf is part of X11.
 x11perf:
diff --git a/source/x/x11/slack-desc/xauth b/source/x/x11/slack-desc/xauth
index 71829a5d..837b45bb 100644
--- a/source/x/x11/slack-desc/xauth
+++ b/source/x/x11/slack-desc/xauth
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xauth: xauth
+xauth: xauth (X11 authorization utility)
+xauth:
+xauth: The xauth program is used to edit and display the authorization
+xauth: information used in connecting to the X server.
+xauth:
 xauth:
-xauth: xauth is part of X11.
 xauth:
-xauth: For more information about the X.Org Foundation (the providers of the
-xauth: X.Org implementation of the X Window System), see their website:
 xauth:
-xauth: http://www.x.org
 xauth:
 xauth:
 xauth:
diff --git a/source/x/x11/slack-desc/xbacklight b/source/x/x11/slack-desc/xbacklight
index 914a6a79..45d0a7ab 100644
--- a/source/x/x11/slack-desc/xbacklight
+++ b/source/x/x11/slack-desc/xbacklight
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler------------------------------------------------------|
-xbacklight: xbacklight
+          |-----handy-ruler------------------------------------------------------|
+xbacklight: xbacklight (adjust the backlight brightness where supported)
+xbacklight:
+xbacklight: It uses the RandR extension to find all outputs on the X server
+xbacklight: supporting backlight brightness control and changes them all in the
+xbacklight: same way.
 xbacklight:
-xbacklight: xbacklight is part of X11.
 xbacklight:
-xbacklight: For more information about the X.Org Foundation (the providers of the
-xbacklight: X.Org implementation of the X Window System), see their website:
 xbacklight:
-xbacklight: http://www.x.org
 xbacklight:
 xbacklight:
 xbacklight:
diff --git a/source/x/x11/slack-desc/xbiff b/source/x/x11/slack-desc/xbiff
index ef65aff3..289c9738 100644
--- a/source/x/x11/slack-desc/xbiff
+++ b/source/x/x11/slack-desc/xbiff
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xbiff: xbiff
+xbiff: xbiff (X11 mail notifier)
+xbiff:
+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:
-xbiff: xbiff is part of X11.
 xbiff:
-xbiff: For more information about the X.Org Foundation (the providers of the
-xbiff: X.Org implementation of the X Window System), see their website:
 xbiff:
-xbiff: http://www.x.org
 xbiff:
 xbiff:
 xbiff:
diff --git a/source/x/x11/slack-desc/xbitmaps b/source/x/x11/slack-desc/xbitmaps
index 91b0a4d2..cdcd8149 100644
--- a/source/x/x11/slack-desc/xbitmaps
+++ b/source/x/x11/slack-desc/xbitmaps
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xbitmaps: xbitmaps
+xbitmaps: xbitmaps (miscellaneous X bitmap files)
 xbitmaps:
 xbitmaps: xbitmaps is part of X11.
 xbitmaps:
diff --git a/source/x/x11/slack-desc/xcalc b/source/x/x11/slack-desc/xcalc
index d0f6d2e1..4e1101e6 100644
--- a/source/x/x11/slack-desc/xcalc
+++ b/source/x/x11/slack-desc/xcalc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xcalc: xcalc
+xcalc: xcalc (X11 calculator)
+xcalc:
+xcalc: xcalc is a scientific calculator X11 client that can emulate a TI-30
+xcalc: or an HP-10C.
+xcalc:
 xcalc:
-xcalc: xcalc is part of X11.
 xcalc:
-xcalc: For more information about the X.Org Foundation (the providers of the
-xcalc: X.Org implementation of the X Window System), see their website:
 xcalc:
-xcalc: http://www.x.org
 xcalc:
 xcalc:
 xcalc:
diff --git a/source/x/x11/slack-desc/xcb-proto b/source/x/x11/slack-desc/xcb-proto
index 72736593..c66b7140 100644
--- a/source/x/x11/slack-desc/xcb-proto
+++ b/source/x/x11/slack-desc/xcb-proto
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-xcb-proto: xcb-proto
+xcb-proto: xcb-proto (X protocol C-language Binding protocol descriptions)
 xcb-proto:
-xcb-proto: xcb-proto is part of X11.
+xcb-proto: xcb-proto provides the XML-XCB protocol descriptions that libxcb
+xcb-proto: uses to generate the majority of its code and API. We provide them
+xcb-proto: separately from libxcb to allow reuse by other projects, such as
+xcb-proto: additional language bindings, protocol dissectors, or documentation
+xcb-proto: generators.
 xcb-proto:
-xcb-proto: For more information about the X.Org Foundation (the providers of the
-xcb-proto: X.Org implementation of the X Window System), see their website:
-xcb-proto:
-xcb-proto: http://www.x.org
 xcb-proto:
 xcb-proto:
 xcb-proto:
diff --git a/source/x/x11/slack-desc/xcb-util b/source/x/x11/slack-desc/xcb-util
index 45072298..040881be 100644
--- a/source/x/x11/slack-desc/xcb-util
+++ b/source/x/x11/slack-desc/xcb-util
@@ -5,8 +5,8 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler-------------------------------------------------------|
-xcb-util: xcb-util
+        |-----handy-ruler------------------------------------------------------|
+xcb-util: xcb-util (utility libraries for X protocol C-language Binding)
 xcb-util:
 xcb-util: xcb-util is part of X11.
 xcb-util:
diff --git a/source/x/x11/slack-desc/windowswmproto b/source/x/x11/slack-desc/xcb-util-image
index 38e97728..ffa50aa9 100644
--- a/source/x/x11/slack-desc/windowswmproto
+++ b/source/x/x11/slack-desc/xcb-util-image
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-windowswmproto: windowswmproto
-windowswmproto:
-windowswmproto: windowswmproto is part of X11.
-windowswmproto:
-windowswmproto: For more information about the X.Org Foundation (the providers of the
-windowswmproto: X.Org implementation of the X Window System), see their website:
-windowswmproto:
-windowswmproto: http://www.x.org
-windowswmproto:
-windowswmproto:
-windowswmproto:
+xcb-util-image: xcb-util-image (port of Xlib's XImage and XShmImage functions)
+xcb-util-image:
+xcb-util-image: xcb-util-image provides a port of Xlib's XImage and XShmImage 
+xcb-util-image: functions.
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
diff --git a/source/x/x11/slack-desc/libXprintAppUtil b/source/x/x11/slack-desc/xcb-util-keysyms
index 4ef7b3ed..a629d39e 100644
--- a/source/x/x11/slack-desc/libXprintAppUtil
+++ b/source/x/x11/slack-desc/xcb-util-keysyms
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-libXprintAppUtil: libXprintAppUtil
-libXprintAppUtil:
-libXprintAppUtil: libXprintAppUtil is part of X11.
-libXprintAppUtil:
-libXprintAppUtil: For more information about the X.Org Foundation (the providers of the
-libXprintAppUtil: X.Org implementation of the X Window System), see their website:
-libXprintAppUtil:
-libXprintAppUtil: http://www.x.org
-libXprintAppUtil:
-libXprintAppUtil:
-libXprintAppUtil:
+xcb-util-keysyms: xcb-util-keysyms (keysyms library for XCB)
+xcb-util-keysyms:
+xcb-util-keysyms: xcb-util-keysyms provides the keysyms library, which handles
+xcb-util-keysyms: standard X key constants and conversion to/from keycodes.
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
diff --git a/source/x/x11/slack-desc/xf86-input-hyperpen b/source/x/x11/slack-desc/xcb-util-renderutil
index f6d6bda8..1cec3346 100644
--- a/source/x/x11/slack-desc/xf86-input-hyperpen
+++ b/source/x/x11/slack-desc/xcb-util-renderutil
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                    |-----handy-ruler------------------------------------------------------|
-xf86-input-hyperpen: xf86-input-hyperpen
-xf86-input-hyperpen:
-xf86-input-hyperpen: xf86-input-hyperpen is part of X11.
-xf86-input-hyperpen:
-xf86-input-hyperpen: For more information about the X.Org Foundation (the providers of the
-xf86-input-hyperpen: X.Org implementation of the X Window System), see their website:
-xf86-input-hyperpen:
-xf86-input-hyperpen: http://www.x.org
-xf86-input-hyperpen:
-xf86-input-hyperpen:
-xf86-input-hyperpen:
+xcb-util-renderutil: xcb-util-renderutil (XCB renderutil library)
+xcb-util-renderutil:
+xcb-util-renderutil: xcb-util-renderutil provides the XCB renderutil library, which
+xcb-util-renderutil: includes some convenience functions for the Render extension.
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
diff --git a/source/x/x11/slack-desc/xsetpointer b/source/x/x11/slack-desc/xcb-util-wm
index cbfaa0c2..8d5103a5 100644
--- a/source/x/x11/slack-desc/xsetpointer
+++ b/source/x/x11/slack-desc/xcb-util-wm
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-xsetpointer: xsetpointer
-xsetpointer:
-xsetpointer: xsetpointer is part of X11.
-xsetpointer:
-xsetpointer: For more information about the X.Org Foundation (the providers of the
-xsetpointer: X.Org implementation of the X Window System), see their website:
-xsetpointer:
-xsetpointer: http://www.x.org
-xsetpointer:
-xsetpointer:
-xsetpointer:
+xcb-util-wm: xcb-util-wm (XCB libraries for EWMH and ICCCM)
+xcb-util-wm:
+xcb-util-wm: xcb-util-wm provides the XCB ewmh and iccm libraries, which include
+xcb-util-wm: client and window manager helpers for EWMH and ICCCM.
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
diff --git a/source/x/x11/slack-desc/xclipboard b/source/x/x11/slack-desc/xclipboard
index 9f309205..fc0bcb45 100644
--- a/source/x/x11/slack-desc/xclipboard
+++ b/source/x/x11/slack-desc/xclipboard
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-xclipboard: xclipboard
+xclipboard: xclipboard (X11 clipboard utility)
 xclipboard:
-xclipboard: xclipboard is part of X11.
+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: selection as a separate string, each of which can be selected.
 xclipboard:
-xclipboard: For more information about the X.Org Foundation (the providers of the
-xclipboard: X.Org implementation of the X Window System), see their website:
 xclipboard:
-xclipboard: http://www.x.org
 xclipboard:
 xclipboard:
 xclipboard:
diff --git a/source/x/x11/slack-desc/xclock b/source/x/x11/slack-desc/xclock
index 04781f5e..39cb9ff1 100644
--- a/source/x/x11/slack-desc/xclock
+++ b/source/x/x11/slack-desc/xclock
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xclock: xclock
+xclock: xclock (X11 on-screen clock)
+xclock:
+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:
-xclock: xclock is part of X11.
 xclock:
-xclock: For more information about the X.Org Foundation (the providers of the
-xclock: X.Org implementation of the X Window System), see their website:
 xclock:
-xclock: http://www.x.org
 xclock:
 xclock:
 xclock:
diff --git a/source/x/x11/slack-desc/xcmiscproto b/source/x/x11/slack-desc/xcmiscproto
index a8c9dcc4..d7291251 100644
--- a/source/x/x11/slack-desc/xcmiscproto
+++ b/source/x/x11/slack-desc/xcmiscproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-xcmiscproto: xcmiscproto
+xcmiscproto: xcmiscproto (C prototypes for X11 XC-MISC Extension)
 xcmiscproto:
 xcmiscproto: xcmiscproto is part of X11.
 xcmiscproto:
diff --git a/source/x/x11/slack-desc/xcmsdb b/source/x/x11/slack-desc/xcmsdb
index 9075a18f..058adf03 100644
--- a/source/x/x11/slack-desc/xcmsdb
+++ b/source/x/x11/slack-desc/xcmsdb
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xcmsdb: xcmsdb
+xcmsdb: xcmsdb (X11 color utility)
 xcmsdb:
-xcmsdb: xcmsdb is part of X11.
+xcmsdb: xcmsdb is used to load, query, or remove Device Color Characterization
+xcmsdb: data stored in properties on the root window of a screen as specified
+xcmsdb: in section 7, Device Color Characterization, of the X11 Inter-Client
+xcmsdb: Communication Conventions Manual (ICCCM).
 xcmsdb:
-xcmsdb: For more information about the X.Org Foundation (the providers of the
-xcmsdb: X.Org implementation of the X Window System), see their website:
 xcmsdb:
-xcmsdb: http://www.x.org
 xcmsdb:
 xcmsdb:
 xcmsdb:
diff --git a/source/x/x11/slack-desc/xcompmgr b/source/x/x11/slack-desc/xcompmgr
index 1381b7be..f5527a84 100644
--- a/source/x/x11/slack-desc/xcompmgr
+++ b/source/x/x11/slack-desc/xcompmgr
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xcompmgr: xcompmgr
+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: eye-candy effects.
 xcompmgr:
-xcompmgr: xcompmgr is part of X11.
 xcompmgr:
-xcompmgr: For more information about the X.Org Foundation (the providers of the
-xcompmgr: X.Org implementation of the X Window System), see their website:
 xcompmgr:
-xcompmgr: http://www.x.org
 xcompmgr:
 xcompmgr:
 xcompmgr:
diff --git a/source/x/x11/slack-desc/xconsole b/source/x/x11/slack-desc/xconsole
index f3a8f2bd..2a543f2e 100644
--- a/source/x/x11/slack-desc/xconsole
+++ b/source/x/x11/slack-desc/xconsole
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xconsole: xconsole
+xconsole: xconsole (X11 console)
+xconsole:
+xconsole: xconsole displays in a X11 window the messages which are usually sent
+xconsole: to /dev/console
+xconsole:
 xconsole:
-xconsole: xconsole is part of X11.
 xconsole:
-xconsole: For more information about the X.Org Foundation (the providers of the
-xconsole: X.Org implementation of the X Window System), see their website:
 xconsole:
-xconsole: http://www.x.org
 xconsole:
 xconsole:
 xconsole:
diff --git a/source/x/x11/slack-desc/xcursor-themes b/source/x/x11/slack-desc/xcursor-themes
index d3ffeeb5..dbe8023e 100644
--- a/source/x/x11/slack-desc/xcursor-themes
+++ b/source/x/x11/slack-desc/xcursor-themes
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xcursor-themes: xcursor-themes
+xcursor-themes: xcursor-themes (X11 cursor themes)
+xcursor-themes:
+xcursor-themes: This is a default set of cursor themes for use with libXcursor,
+xcursor-themes: originally created for the XFree86 Project, and now shipped as part
+xcursor-themes: of the X.Org software distribution.
 xcursor-themes:
-xcursor-themes: xcursor-themes is part of X11.
 xcursor-themes:
-xcursor-themes: For more information about the X.Org Foundation (the providers of the
-xcursor-themes: X.Org implementation of the X Window System), see their website:
 xcursor-themes:
-xcursor-themes: http://www.x.org
 xcursor-themes:
 xcursor-themes:
 xcursor-themes:
diff --git a/source/x/x11/slack-desc/xcursorgen b/source/x/x11/slack-desc/xcursorgen
index bce69340..b084b9d3 100644
--- a/source/x/x11/slack-desc/xcursorgen
+++ b/source/x/x11/slack-desc/xcursorgen
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-xcursorgen: xcursorgen
+xcursorgen: xcursorgen (prepares X11 cursor sets for use with libXcursor)
 xcursorgen:
 xcursorgen: xcursorgen is part of X11.
 xcursorgen:
diff --git a/source/x/x11/slack-desc/xdbedizzy b/source/x/x11/slack-desc/xdbedizzy
index 03ecda05..122d3cfc 100644
--- a/source/x/x11/slack-desc/xdbedizzy
+++ b/source/x/x11/slack-desc/xdbedizzy
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-xdbedizzy: xdbedizzy
+xdbedizzy: xdbedizzy (X11 test utility)
+xdbedizzy:
+xdbedizzy: xdbedizzy is a demo of the X11 Double Buffer Extension (DBE) creating
+xdbedizzy: a double buffered spinning scene.
+xdbedizzy:
 xdbedizzy:
-xdbedizzy: xdbedizzy is part of X11.
 xdbedizzy:
-xdbedizzy: For more information about the X.Org Foundation (the providers of the
-xdbedizzy: X.Org implementation of the X Window System), see their website:
 xdbedizzy:
-xdbedizzy: http://www.x.org
 xdbedizzy:
 xdbedizzy:
 xdbedizzy:
diff --git a/source/x/x11/slack-desc/xditview b/source/x/x11/slack-desc/xditview
index 82b175fb..60eebb74 100644
--- a/source/x/x11/slack-desc/xditview
+++ b/source/x/x11/slack-desc/xditview
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xditview: xditview
+xditview: xditview (displays ditroff output on an X display)
 xditview:
 xditview: xditview is part of X11.
 xditview:
diff --git a/source/x/x11/slack-desc/xdm b/source/x/x11/slack-desc/xdm
index 88446a5e..12169808 100644
--- a/source/x/x11/slack-desc/xdm
+++ b/source/x/x11/slack-desc/xdm
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xdm: xdm
+xdm: xdm (X11 display manager)
 xdm:
 xdm: xdm is part of X11.
 xdm:
diff --git a/source/x/x11/slack-desc/xdpyinfo b/source/x/x11/slack-desc/xdpyinfo
index 80af8f41..8c6c48ff 100644
--- a/source/x/x11/slack-desc/xdpyinfo
+++ b/source/x/x11/slack-desc/xdpyinfo
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xdpyinfo: xdpyinfo
+xdpyinfo: xdpyinfo (utility for displaying information about an X server)
 xdpyinfo:
 xdpyinfo: xdpyinfo is part of X11.
 xdpyinfo:
diff --git a/source/x/x11/slack-desc/xdriinfo b/source/x/x11/slack-desc/xdriinfo
index e5850b3a..bcddebfd 100644
--- a/source/x/x11/slack-desc/xdriinfo
+++ b/source/x/x11/slack-desc/xdriinfo
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xdriinfo: xdriinfo
+xdriinfo: xdriinfo (query configuration information of X11 DRI drivers)
 xdriinfo:
 xdriinfo: xdriinfo is part of X11.
 xdriinfo:
diff --git a/source/x/x11/slack-desc/xedit b/source/x/x11/slack-desc/xedit
index 00e969ce..6916c0c7 100644
--- a/source/x/x11/slack-desc/xedit
+++ b/source/x/x11/slack-desc/xedit
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xedit: xedit
+xedit: xedit (simple text editor for X)
 xedit:
 xedit: xedit is part of X11.
 xedit:
diff --git a/source/x/x11/slack-desc/xev b/source/x/x11/slack-desc/xev
index 6e95b7f9..4e78a1b6 100644
--- a/source/x/x11/slack-desc/xev
+++ b/source/x/x11/slack-desc/xev
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xev: xev
-xev:
-xev: xev is part of X11.
-xev:
-xev: For more information about the X.Org Foundation (the providers of the
-xev: X.Org implementation of the X Window System), see their website:
-xev:
-xev: http://www.x.org
+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: 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.
 xev:
 xev:
diff --git a/source/x/x11/slack-desc/xextproto b/source/x/x11/slack-desc/xextproto
index 53df9fed..6ea870d0 100644
--- a/source/x/x11/slack-desc/xextproto
+++ b/source/x/x11/slack-desc/xextproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-xextproto: xextproto
+xextproto: xextproto (C prototypes for X Protocol Extensions)
 xextproto:
 xextproto: xextproto is part of X11.
 xextproto:
diff --git a/source/x/x11/slack-desc/xeyes b/source/x/x11/slack-desc/xeyes
index ddf82f0d..7e1297ee 100644
--- a/source/x/x11/slack-desc/xeyes
+++ b/source/x/x11/slack-desc/xeyes
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xeyes: xeyes
+xeyes: xeyes (a follow the mouse X demo, using the X SHAPE extension)
 xeyes:
 xeyes: xeyes is part of X11.
 xeyes:
diff --git a/source/x/x11/slack-desc/xf86-input-acecad b/source/x/x11/slack-desc/xf86-input-acecad
index 26ca95ce..e3421df5 100644
--- a/source/x/x11/slack-desc/xf86-input-acecad
+++ b/source/x/x11/slack-desc/xf86-input-acecad
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-input-acecad: xf86-input-acecad
+xf86-input-acecad: xf86-input-acecad (Acecad Flair input driver for the Xorg X server)
 xf86-input-acecad:
 xf86-input-acecad: xf86-input-acecad is part of X11.
 xf86-input-acecad:
diff --git a/source/x/x11/slack-desc/xf86-input-aiptek b/source/x/x11/slack-desc/xf86-input-aiptek
index f7721e57..1ed24243 100644
--- a/source/x/x11/slack-desc/xf86-input-aiptek
+++ b/source/x/x11/slack-desc/xf86-input-aiptek
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-input-aiptek: xf86-input-aiptek
+xf86-input-aiptek: xf86-input-aiptek (Aiptek USB Digital Tablet Input Driver for Linux)
 xf86-input-aiptek:
 xf86-input-aiptek: xf86-input-aiptek is part of X11.
 xf86-input-aiptek:
diff --git a/source/x/x11/slack-desc/xf86-input-calcomp b/source/x/x11/slack-desc/xf86-input-calcomp
deleted file mode 100644
index 76dd2653..00000000
--- a/source/x/x11/slack-desc/xf86-input-calcomp
+++ /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------------------------------------------------------|
-xf86-input-calcomp: xf86-input-calcomp
-xf86-input-calcomp:
-xf86-input-calcomp: xf86-input-calcomp is part of X11.
-xf86-input-calcomp:
-xf86-input-calcomp: For more information about the X.Org Foundation (the providers of the
-xf86-input-calcomp: X.Org implementation of the X Window System), see their website:
-xf86-input-calcomp:
-xf86-input-calcomp: http://www.x.org
-xf86-input-calcomp:
-xf86-input-calcomp:
-xf86-input-calcomp:
diff --git a/source/x/x11/slack-desc/xf86-input-citron b/source/x/x11/slack-desc/xf86-input-citron
deleted file mode 100644
index 5548268a..00000000
--- a/source/x/x11/slack-desc/xf86-input-citron
+++ /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------------------------------------------------------|
-xf86-input-citron: xf86-input-citron
-xf86-input-citron:
-xf86-input-citron: xf86-input-citron is part of X11.
-xf86-input-citron:
-xf86-input-citron: For more information about the X.Org Foundation (the providers of the
-xf86-input-citron: X.Org implementation of the X Window System), see their website:
-xf86-input-citron:
-xf86-input-citron: http://www.x.org
-xf86-input-citron:
-xf86-input-citron:
-xf86-input-citron:
diff --git a/source/x/x11/slack-desc/xf86-input-dynapro b/source/x/x11/slack-desc/xf86-input-dynapro
deleted file mode 100644
index 346eefe8..00000000
--- a/source/x/x11/slack-desc/xf86-input-dynapro
+++ /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------------------------------------------------------|
-xf86-input-dynapro: xf86-input-dynapro
-xf86-input-dynapro:
-xf86-input-dynapro: xf86-input-dynapro is part of X11.
-xf86-input-dynapro:
-xf86-input-dynapro: For more information about the X.Org Foundation (the providers of the
-xf86-input-dynapro: X.Org implementation of the X Window System), see their website:
-xf86-input-dynapro:
-xf86-input-dynapro: http://www.x.org
-xf86-input-dynapro:
-xf86-input-dynapro:
-xf86-input-dynapro:
diff --git a/source/x/x11/slack-desc/xf86-input-elo2300 b/source/x/x11/slack-desc/xf86-input-elo2300
deleted file mode 100644
index 6c0bdd57..00000000
--- a/source/x/x11/slack-desc/xf86-input-elo2300
+++ /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------------------------------------------------------|
-xf86-input-elo2300: xf86-input-elo2300
-xf86-input-elo2300:
-xf86-input-elo2300: xf86-input-elo2300 is part of X11.
-xf86-input-elo2300:
-xf86-input-elo2300: For more information about the X.Org Foundation (the providers of the
-xf86-input-elo2300: X.Org implementation of the X Window System), see their website:
-xf86-input-elo2300:
-xf86-input-elo2300: http://www.x.org
-xf86-input-elo2300:
-xf86-input-elo2300:
-xf86-input-elo2300:
diff --git a/source/x/x11/slack-desc/xf86-input-elographics b/source/x/x11/slack-desc/xf86-input-elographics
deleted file mode 100644
index 1e256565..00000000
--- a/source/x/x11/slack-desc/xf86-input-elographics
+++ /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------------------------------------------------------|
-xf86-input-elographics: xf86-input-elographics
-xf86-input-elographics:
-xf86-input-elographics: xf86-input-elographics is part of X11.
-xf86-input-elographics:
-xf86-input-elographics: For more information about the X.Org Foundation (the providers of the
-xf86-input-elographics: X.Org implementation of the X Window System), see their website:
-xf86-input-elographics:
-xf86-input-elographics: http://www.x.org
-xf86-input-elographics:
-xf86-input-elographics:
-xf86-input-elographics:
diff --git a/source/x/x11/slack-desc/xf86-input-evdev b/source/x/x11/slack-desc/xf86-input-evdev
index 0adcb026..93aeb3f6 100644
--- a/source/x/x11/slack-desc/xf86-input-evdev
+++ b/source/x/x11/slack-desc/xf86-input-evdev
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-input-evdev: xf86-input-evdev
+xf86-input-evdev: xf86-input-evdev (Generic Linux input driver for the Xorg X server)
 xf86-input-evdev:
 xf86-input-evdev: xf86-input-evdev is part of X11.
 xf86-input-evdev:
diff --git a/source/x/x11/slack-desc/xf86-input-fpit b/source/x/x11/slack-desc/xf86-input-fpit
deleted file mode 100644
index 51ee433e..00000000
--- a/source/x/x11/slack-desc/xf86-input-fpit
+++ /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------------------------------------------------------|
-xf86-input-fpit: xf86-input-fpit
-xf86-input-fpit:
-xf86-input-fpit: xf86-input-fpit is part of X11.
-xf86-input-fpit:
-xf86-input-fpit: For more information about the X.Org Foundation (the providers of the
-xf86-input-fpit: X.Org implementation of the X Window System), see their website:
-xf86-input-fpit:
-xf86-input-fpit: http://www.x.org
-xf86-input-fpit:
-xf86-input-fpit:
-xf86-input-fpit:
diff --git a/source/x/x11/slack-desc/xf86-input-jamstudio b/source/x/x11/slack-desc/xf86-input-jamstudio
deleted file mode 100644
index 70426117..00000000
--- a/source/x/x11/slack-desc/xf86-input-jamstudio
+++ /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------------------------------------------------------|
-xf86-input-jamstudio: xf86-input-jamstudio
-xf86-input-jamstudio:
-xf86-input-jamstudio: xf86-input-jamstudio is part of X11.
-xf86-input-jamstudio:
-xf86-input-jamstudio: For more information about the X.Org Foundation (the providers of the
-xf86-input-jamstudio: X.Org implementation of the X Window System), see their website:
-xf86-input-jamstudio:
-xf86-input-jamstudio: http://www.x.org
-xf86-input-jamstudio:
-xf86-input-jamstudio:
-xf86-input-jamstudio:
diff --git a/source/x/x11/slack-desc/xf86-input-joystick b/source/x/x11/slack-desc/xf86-input-joystick
index 3a43a254..46963b88 100644
--- a/source/x/x11/slack-desc/xf86-input-joystick
+++ b/source/x/x11/slack-desc/xf86-input-joystick
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                    |-----handy-ruler------------------------------------------------------|
-xf86-input-joystick: xf86-input-joystick
+xf86-input-joystick: xf86-input-joystick (Joystick input driver for the Xorg X server)
 xf86-input-joystick:
 xf86-input-joystick: xf86-input-joystick is part of X11.
 xf86-input-joystick:
diff --git a/source/x/x11/slack-desc/xf86-input-keyboard b/source/x/x11/slack-desc/xf86-input-keyboard
index 640e2b55..e72beb41 100644
--- a/source/x/x11/slack-desc/xf86-input-keyboard
+++ b/source/x/x11/slack-desc/xf86-input-keyboard
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                    |-----handy-ruler------------------------------------------------------|
-xf86-input-keyboard: xf86-input-keyboard
+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: 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:
-xf86-input-keyboard: xf86-input-keyboard is part of X11.
 xf86-input-keyboard:
-xf86-input-keyboard: For more information about the X.Org Foundation (the providers of the
-xf86-input-keyboard: X.Org implementation of the X Window System), see their website:
 xf86-input-keyboard:
-xf86-input-keyboard: http://www.x.org
 xf86-input-keyboard:
 xf86-input-keyboard:
 xf86-input-keyboard:
diff --git a/source/x/x11/slack-desc/xf86-input-magellan b/source/x/x11/slack-desc/xf86-input-magellan
deleted file mode 100644
index 70ef4382..00000000
--- a/source/x/x11/slack-desc/xf86-input-magellan
+++ /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------------------------------------------------------|
-xf86-input-magellan: xf86-input-magellan
-xf86-input-magellan:
-xf86-input-magellan: xf86-input-magellan is part of X11.
-xf86-input-magellan:
-xf86-input-magellan: For more information about the X.Org Foundation (the providers of the
-xf86-input-magellan: X.Org implementation of the X Window System), see their website:
-xf86-input-magellan:
-xf86-input-magellan: http://www.x.org
-xf86-input-magellan:
-xf86-input-magellan:
-xf86-input-magellan:
diff --git a/source/x/x11/slack-desc/xf86-input-magictouch b/source/x/x11/slack-desc/xf86-input-magictouch
deleted file mode 100644
index 72d02f52..00000000
--- a/source/x/x11/slack-desc/xf86-input-magictouch
+++ /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------------------------------------------------------|
-xf86-input-magictouch: xf86-input-magictouch
-xf86-input-magictouch:
-xf86-input-magictouch: xf86-input-magictouch is part of X11.
-xf86-input-magictouch:
-xf86-input-magictouch: For more information about the X.Org Foundation (the providers of the
-xf86-input-magictouch: X.Org implementation of the X Window System), see their website:
-xf86-input-magictouch:
-xf86-input-magictouch: http://www.x.org
-xf86-input-magictouch:
-xf86-input-magictouch:
-xf86-input-magictouch:
diff --git a/source/x/x11/slack-desc/xf86-input-microtouch b/source/x/x11/slack-desc/xf86-input-microtouch
deleted file mode 100644
index 412cb01a..00000000
--- a/source/x/x11/slack-desc/xf86-input-microtouch
+++ /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------------------------------------------------------|
-xf86-input-microtouch: xf86-input-microtouch
-xf86-input-microtouch:
-xf86-input-microtouch: xf86-input-microtouch is part of X11.
-xf86-input-microtouch:
-xf86-input-microtouch: For more information about the X.Org Foundation (the providers of the
-xf86-input-microtouch: X.Org implementation of the X Window System), see their website:
-xf86-input-microtouch:
-xf86-input-microtouch: http://www.x.org
-xf86-input-microtouch:
-xf86-input-microtouch:
-xf86-input-microtouch:
diff --git a/source/x/x11/slack-desc/xf86-input-mouse b/source/x/x11/slack-desc/xf86-input-mouse
index 5ce1494d..73bd88af 100644
--- a/source/x/x11/slack-desc/xf86-input-mouse
+++ b/source/x/x11/slack-desc/xf86-input-mouse
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-input-mouse: xf86-input-mouse
+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: 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:
-xf86-input-mouse: xf86-input-mouse is part of X11.
 xf86-input-mouse:
-xf86-input-mouse: For more information about the X.Org Foundation (the providers of the
-xf86-input-mouse: X.Org implementation of the X Window System), see their website:
 xf86-input-mouse:
-xf86-input-mouse: http://www.x.org
 xf86-input-mouse:
 xf86-input-mouse:
 xf86-input-mouse:
diff --git a/source/x/x11/slack-desc/xf86-input-mutouch b/source/x/x11/slack-desc/xf86-input-mutouch
deleted file mode 100644
index 7c8c7f83..00000000
--- a/source/x/x11/slack-desc/xf86-input-mutouch
+++ /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------------------------------------------------------|
-xf86-input-mutouch: xf86-input-mutouch
-xf86-input-mutouch:
-xf86-input-mutouch: xf86-input-mutouch is part of X11.
-xf86-input-mutouch:
-xf86-input-mutouch: For more information about the X.Org Foundation (the providers of the
-xf86-input-mutouch: X.Org implementation of the X Window System), see their website:
-xf86-input-mutouch:
-xf86-input-mutouch: http://www.x.org
-xf86-input-mutouch:
-xf86-input-mutouch:
-xf86-input-mutouch:
diff --git a/source/x/x11/slack-desc/xf86-input-palmax b/source/x/x11/slack-desc/xf86-input-palmax
deleted file mode 100644
index 73328d76..00000000
--- a/source/x/x11/slack-desc/xf86-input-palmax
+++ /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------------------------------------------------------|
-xf86-input-palmax: xf86-input-palmax
-xf86-input-palmax:
-xf86-input-palmax: xf86-input-palmax is part of X11.
-xf86-input-palmax:
-xf86-input-palmax: For more information about the X.Org Foundation (the providers of the
-xf86-input-palmax: X.Org implementation of the X Window System), see their website:
-xf86-input-palmax:
-xf86-input-palmax: http://www.x.org
-xf86-input-palmax:
-xf86-input-palmax:
-xf86-input-palmax:
diff --git a/source/x/x11/slack-desc/xf86-input-penmount b/source/x/x11/slack-desc/xf86-input-penmount
index ca7e48b8..94218788 100644
--- a/source/x/x11/slack-desc/xf86-input-penmount
+++ b/source/x/x11/slack-desc/xf86-input-penmount
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                    |-----handy-ruler------------------------------------------------------|
-xf86-input-penmount: xf86-input-penmount
+xf86-input-penmount: xf86-input-penmount (PenMount input driver for the Xorg X server)
 xf86-input-penmount:
 xf86-input-penmount: xf86-input-penmount is part of X11.
 xf86-input-penmount:
diff --git a/source/x/x11/slack-desc/xf86-input-spaceorb b/source/x/x11/slack-desc/xf86-input-spaceorb
deleted file mode 100644
index b127b895..00000000
--- a/source/x/x11/slack-desc/xf86-input-spaceorb
+++ /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------------------------------------------------------|
-xf86-input-spaceorb: xf86-input-spaceorb
-xf86-input-spaceorb:
-xf86-input-spaceorb: xf86-input-spaceorb is part of X11.
-xf86-input-spaceorb:
-xf86-input-spaceorb: For more information about the X.Org Foundation (the providers of the
-xf86-input-spaceorb: X.Org implementation of the X Window System), see their website:
-xf86-input-spaceorb:
-xf86-input-spaceorb: http://www.x.org
-xf86-input-spaceorb:
-xf86-input-spaceorb:
-xf86-input-spaceorb:
diff --git a/source/x/x11/slack-desc/xf86-input-summa b/source/x/x11/slack-desc/xf86-input-summa
deleted file mode 100644
index c69177bc..00000000
--- a/source/x/x11/slack-desc/xf86-input-summa
+++ /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------------------------------------------------------|
-xf86-input-summa: xf86-input-summa
-xf86-input-summa:
-xf86-input-summa: xf86-input-summa is part of X11.
-xf86-input-summa:
-xf86-input-summa: For more information about the X.Org Foundation (the providers of the
-xf86-input-summa: X.Org implementation of the X Window System), see their website:
-xf86-input-summa:
-xf86-input-summa: http://www.x.org
-xf86-input-summa:
-xf86-input-summa:
-xf86-input-summa:
diff --git a/source/x/x11/slack-desc/xf86-input-synaptics b/source/x/x11/slack-desc/xf86-input-synaptics
index 20858404..1425e129 100644
--- a/source/x/x11/slack-desc/xf86-input-synaptics
+++ b/source/x/x11/slack-desc/xf86-input-synaptics
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-xf86-input-synaptics: xf86-input-synaptics
+xf86-input-synaptics: xf86-input-synaptics (Synaptics touchpad driver for X.Org)
 xf86-input-synaptics:
 xf86-input-synaptics: xf86-input-synaptics is part of X11.
 xf86-input-synaptics:
diff --git a/source/x/x11/slack-desc/xf86-input-tek4957 b/source/x/x11/slack-desc/xf86-input-tek4957
deleted file mode 100644
index 2e0a13ff..00000000
--- a/source/x/x11/slack-desc/xf86-input-tek4957
+++ /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------------------------------------------------------|
-xf86-input-tek4957: xf86-input-tek4957
-xf86-input-tek4957:
-xf86-input-tek4957: xf86-input-tek4957 is part of X11.
-xf86-input-tek4957:
-xf86-input-tek4957: For more information about the X.Org Foundation (the providers of the
-xf86-input-tek4957: X.Org implementation of the X Window System), see their website:
-xf86-input-tek4957:
-xf86-input-tek4957: http://www.x.org
-xf86-input-tek4957:
-xf86-input-tek4957:
-xf86-input-tek4957:
diff --git a/source/x/x11/slack-desc/xf86-input-ur98 b/source/x/x11/slack-desc/xf86-input-ur98
deleted file mode 100644
index 66680d8c..00000000
--- a/source/x/x11/slack-desc/xf86-input-ur98
+++ /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------------------------------------------------------|
-xf86-input-ur98: xf86-input-ur98
-xf86-input-ur98:
-xf86-input-ur98: xf86-input-ur98 is part of X11.
-xf86-input-ur98:
-xf86-input-ur98: For more information about the X.Org Foundation (the providers of the
-xf86-input-ur98: X.Org implementation of the X Window System), see their website:
-xf86-input-ur98:
-xf86-input-ur98: http://www.x.org
-xf86-input-ur98:
-xf86-input-ur98:
-xf86-input-ur98:
diff --git a/source/x/x11/slack-desc/xf86-input-vmmouse b/source/x/x11/slack-desc/xf86-input-vmmouse
index 640cc71a..d5638965 100644
--- a/source/x/x11/slack-desc/xf86-input-vmmouse
+++ b/source/x/x11/slack-desc/xf86-input-vmmouse
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-xf86-input-vmmouse: xf86-input-vmmouse
+xf86-input-vmmouse: xf86-input-vmmouse (support for VMWare's VMMouse guest mouse device)
 xf86-input-vmmouse:
 xf86-input-vmmouse: xf86-input-vmmouse is part of X11.
 xf86-input-vmmouse:
diff --git a/source/x/x11/slack-desc/xf86-input-void b/source/x/x11/slack-desc/xf86-input-void
index 889017af..ef38f7d5 100644
--- a/source/x/x11/slack-desc/xf86-input-void
+++ b/source/x/x11/slack-desc/xf86-input-void
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-xf86-input-void: xf86-input-void
+xf86-input-void: xf86-input-void (null input driver for Xorg server)
 xf86-input-void:
 xf86-input-void: xf86-input-void is part of X11.
 xf86-input-void:
diff --git a/source/x/x11/slack-desc/xf86-input-wacom b/source/x/x11/slack-desc/xf86-input-wacom
index 88f68c1d..86f4ca62 100644
--- a/source/x/x11/slack-desc/xf86-input-wacom
+++ b/source/x/x11/slack-desc/xf86-input-wacom
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-input-wacom: xf86-input-wacom
+xf86-input-wacom: xf86-input-wacom (driver for Wacom tablets)
 xf86-input-wacom:
-xf86-input-wacom: xf86-input-wacom is part of X11.
+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:
-xf86-input-wacom: For more information about the X.Org Foundation (the providers of the
-xf86-input-wacom: X.Org implementation of the X Window System), see their website:
-xf86-input-wacom:
-xf86-input-wacom: http://www.x.org
 xf86-input-wacom:
 xf86-input-wacom:
 xf86-input-wacom:
diff --git a/source/x/x11/slack-desc/xf86-video-apm b/source/x/x11/slack-desc/xf86-video-apm
index b433ed1d..2ee130c9 100644
--- a/source/x/x11/slack-desc/xf86-video-apm
+++ b/source/x/x11/slack-desc/xf86-video-apm
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-apm: xf86-video-apm
+xf86-video-apm: xf86-video-apm (driver for Alliance Promotion graphics chipsets)
 xf86-video-apm:
 xf86-video-apm: xf86-video-apm is part of X11.
 xf86-video-apm:
diff --git a/source/x/x11/slack-desc/xf86-video-ark b/source/x/x11/slack-desc/xf86-video-ark
index 20abb224..eba356f7 100644
--- a/source/x/x11/slack-desc/xf86-video-ark
+++ b/source/x/x11/slack-desc/xf86-video-ark
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-ark: xf86-video-ark
+xf86-video-ark: xf86-video-ark (Ark Logic video driver for Xorg X server)
 xf86-video-ark:
 xf86-video-ark: xf86-video-ark is part of X11.
 xf86-video-ark:
diff --git a/source/x/x11/slack-desc/xf86-video-ast b/source/x/x11/slack-desc/xf86-video-ast
index 8861724b..57efd5df 100644
--- a/source/x/x11/slack-desc/xf86-video-ast
+++ b/source/x/x11/slack-desc/xf86-video-ast
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-ast: xf86-video-ast
+xf86-video-ast: xf86-video-ast (ASpeed Technologies graphics driver for Xorg X server)
 xf86-video-ast:
 xf86-video-ast: xf86-video-ast is part of X11.
 xf86-video-ast:
diff --git a/source/x/x11/slack-desc/xf86-video-ati b/source/x/x11/slack-desc/xf86-video-ati
index b6847e1d..7387c43c 100644
--- a/source/x/x11/slack-desc/xf86-video-ati
+++ b/source/x/x11/slack-desc/xf86-video-ati
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-ati: xf86-video-ati
+xf86-video-ati: xf86-video-ati (ATI Radeon video driver for the Xorg X server)
 xf86-video-ati:
 xf86-video-ati: xf86-video-ati is part of X11.
 xf86-video-ati:
diff --git a/source/x/x11/slack-desc/xf86-video-chips b/source/x/x11/slack-desc/xf86-video-chips
index 2422bc20..f615b79c 100644
--- a/source/x/x11/slack-desc/xf86-video-chips
+++ b/source/x/x11/slack-desc/xf86-video-chips
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-chips: xf86-video-chips
+xf86-video-chips: xf86-video-chips (Chips and Technologies video driver for Xorg)
 xf86-video-chips:
 xf86-video-chips: xf86-video-chips is part of X11.
 xf86-video-chips:
diff --git a/source/x/x11/slack-desc/xf86-video-cirrus b/source/x/x11/slack-desc/xf86-video-cirrus
index f7188813..ef65ecc2 100644
--- a/source/x/x11/slack-desc/xf86-video-cirrus
+++ b/source/x/x11/slack-desc/xf86-video-cirrus
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-video-cirrus: xf86-video-cirrus
+xf86-video-cirrus: xf86-video-cirrus (Cirrus Logic video driver for the Xorg X server)
 xf86-video-cirrus:
 xf86-video-cirrus: xf86-video-cirrus is part of X11.
 xf86-video-cirrus:
diff --git a/source/x/x11/slack-desc/xf86-video-cyrix b/source/x/x11/slack-desc/xf86-video-cyrix
deleted file mode 100644
index aebae006..00000000
--- a/source/x/x11/slack-desc/xf86-video-cyrix
+++ /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------------------------------------------------------|
-xf86-video-cyrix: xf86-video-cyrix
-xf86-video-cyrix:
-xf86-video-cyrix: xf86-video-cyrix is part of X11.
-xf86-video-cyrix:
-xf86-video-cyrix: For more information about the X.Org Foundation (the providers of the
-xf86-video-cyrix: X.Org implementation of the X Window System), see their website:
-xf86-video-cyrix:
-xf86-video-cyrix: http://www.x.org
-xf86-video-cyrix:
-xf86-video-cyrix:
-xf86-video-cyrix:
diff --git a/source/x/x11/slack-desc/xf86-video-dummy b/source/x/x11/slack-desc/xf86-video-dummy
index 389e9e3b..98cac335 100644
--- a/source/x/x11/slack-desc/xf86-video-dummy
+++ b/source/x/x11/slack-desc/xf86-video-dummy
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-dummy: xf86-video-dummy
+xf86-video-dummy: xf86-video-dummy (virtual frame buffer driver for the Xorg X server)
 xf86-video-dummy:
 xf86-video-dummy: xf86-video-dummy is part of X11.
 xf86-video-dummy:
diff --git a/source/x/x11/slack-desc/xf86-video-fbdev b/source/x/x11/slack-desc/xf86-video-fbdev
index ba6e4a6b..08a636a1 100644
--- a/source/x/x11/slack-desc/xf86-video-fbdev
+++ b/source/x/x11/slack-desc/xf86-video-fbdev
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-fbdev: xf86-video-fbdev
+xf86-video-fbdev: xf86-video-fbdev (X.Org generic framebuffer video driver)
+xf86-video-fbdev:
+xf86-video-fbdev: xf86-video-fbdev is the generic framebuffer video driver for X.Org,
+xf86-video-fbdev: designed to draw into a video framebuffer provided by the
+xf86-video-fbdev: underlying operating system.
 xf86-video-fbdev:
-xf86-video-fbdev: xf86-video-fbdev is part of X11.
 xf86-video-fbdev:
-xf86-video-fbdev: For more information about the X.Org Foundation (the providers of the
-xf86-video-fbdev: X.Org implementation of the X Window System), see their website:
 xf86-video-fbdev:
-xf86-video-fbdev: http://www.x.org
 xf86-video-fbdev:
 xf86-video-fbdev:
 xf86-video-fbdev:
diff --git a/source/x/x11/slack-desc/xf86-video-geode b/source/x/x11/slack-desc/xf86-video-geode
index f9658047..003286bf 100644
--- a/source/x/x11/slack-desc/xf86-video-geode
+++ b/source/x/x11/slack-desc/xf86-video-geode
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-geode: xf86-video-geode (AMD Geode GX and LX video driver)
+xf86-video-geode: xf86-video-geode (AMD Geode GX and LX graphics driver for X.org)
 xf86-video-geode:
 xf86-video-geode: xf86-video-geode is part of X11.
 xf86-video-geode:
diff --git a/source/x/x11/slack-desc/xf86-video-glint b/source/x/x11/slack-desc/xf86-video-glint
index 32fb11c4..7e4eeae0 100644
--- a/source/x/x11/slack-desc/xf86-video-glint
+++ b/source/x/x11/slack-desc/xf86-video-glint
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-glint: xf86-video-glint
+xf86-video-glint: xf86-video-glint (GLINT/Permedia video driver for the Xorg X server)
 xf86-video-glint:
 xf86-video-glint: xf86-video-glint is part of X11.
 xf86-video-glint:
diff --git a/source/x/x11/slack-desc/xf86-video-i128 b/source/x/x11/slack-desc/xf86-video-i128
index bab53780..bbf2aa00 100644
--- a/source/x/x11/slack-desc/xf86-video-i128
+++ b/source/x/x11/slack-desc/xf86-video-i128
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-xf86-video-i128: xf86-video-i128
+xf86-video-i128: xf86-video-i128 (Number Nine I128 video driver for the Xorg X server)
 xf86-video-i128:
 xf86-video-i128: xf86-video-i128 is part of X11.
 xf86-video-i128:
diff --git a/source/x/x11/slack-desc/xf86-video-i740 b/source/x/x11/slack-desc/xf86-video-i740
index e31e5ad4..3b61c6aa 100644
--- a/source/x/x11/slack-desc/xf86-video-i740
+++ b/source/x/x11/slack-desc/xf86-video-i740
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-xf86-video-i740: xf86-video-i740
+xf86-video-i740: xf86-video-i740 (Intel i740 video driver for the Xorg X server)
 xf86-video-i740:
 xf86-video-i740: xf86-video-i740 is part of X11.
 xf86-video-i740:
diff --git a/source/x/x11/slack-desc/xf86-video-i810 b/source/x/x11/slack-desc/xf86-video-i810
deleted file mode 100644
index 99eb5b47..00000000
--- a/source/x/x11/slack-desc/xf86-video-i810
+++ /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------------------------------------------------------|
-xf86-video-i810: xf86-video-i810
-xf86-video-i810:
-xf86-video-i810: xf86-video-i810 is part of X11.
-xf86-video-i810:
-xf86-video-i810: For more information about the X.Org Foundation (the providers of the
-xf86-video-i810: X.Org implementation of the X Window System), see their website:
-xf86-video-i810:
-xf86-video-i810: http://www.x.org
-xf86-video-i810:
-xf86-video-i810:
-xf86-video-i810:
diff --git a/source/x/x11/slack-desc/xf86-video-impact b/source/x/x11/slack-desc/xf86-video-impact
deleted file mode 100644
index 9990fc3b..00000000
--- a/source/x/x11/slack-desc/xf86-video-impact
+++ /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------------------------------------------------------|
-xf86-video-impact: xf86-video-impact
-xf86-video-impact:
-xf86-video-impact: xf86-video-impact is part of X11.
-xf86-video-impact:
-xf86-video-impact: For more information about the X.Org Foundation (the providers of the
-xf86-video-impact: X.Org implementation of the X Window System), see their website:
-xf86-video-impact:
-xf86-video-impact: http://www.x.org
-xf86-video-impact:
-xf86-video-impact:
-xf86-video-impact:
diff --git a/source/x/x11/slack-desc/xf86-video-imstt b/source/x/x11/slack-desc/xf86-video-imstt
deleted file mode 100644
index 71614b67..00000000
--- a/source/x/x11/slack-desc/xf86-video-imstt
+++ /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------------------------------------------------------|
-xf86-video-imstt: xf86-video-imstt
-xf86-video-imstt:
-xf86-video-imstt: xf86-video-imstt is part of X11.
-xf86-video-imstt:
-xf86-video-imstt: For more information about the X.Org Foundation (the providers of the
-xf86-video-imstt: X.Org implementation of the X Window System), see their website:
-xf86-video-imstt:
-xf86-video-imstt: http://www.x.org
-xf86-video-imstt:
-xf86-video-imstt:
-xf86-video-imstt:
diff --git a/source/x/x11/slack-desc/xf86-video-intel b/source/x/x11/slack-desc/xf86-video-intel
index 55be1e31..c51417a7 100644
--- a/source/x/x11/slack-desc/xf86-video-intel
+++ b/source/x/x11/slack-desc/xf86-video-intel
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-intel: xf86-video-intel
+xf86-video-intel: xf86-video-intel (X.org graphics driver for Intel graphics)
 xf86-video-intel:
 xf86-video-intel: xf86-video-intel is part of X11.
 xf86-video-intel:
diff --git a/source/x/x11/slack-desc/xf86-video-mach64 b/source/x/x11/slack-desc/xf86-video-mach64
index ae70d099..46c7f7f6 100644
--- a/source/x/x11/slack-desc/xf86-video-mach64
+++ b/source/x/x11/slack-desc/xf86-video-mach64
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-video-mach64: xf86-video-mach64
+xf86-video-mach64: xf86-video-mach64 (ATI Mach64 driver for the Xorg X server)
 xf86-video-mach64:
 xf86-video-mach64: xf86-video-mach64 is part of X11.
 xf86-video-mach64:
diff --git a/source/x/x11/slack-desc/xf86-video-mga b/source/x/x11/slack-desc/xf86-video-mga
index e0df509f..34e34e61 100644
--- a/source/x/x11/slack-desc/xf86-video-mga
+++ b/source/x/x11/slack-desc/xf86-video-mga
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-mga: xf86-video-mga
+xf86-video-mga: xf86-video-mga (Matrox video driver for the Xorg X server)
 xf86-video-mga:
 xf86-video-mga: xf86-video-mga is part of X11.
 xf86-video-mga:
diff --git a/source/x/x11/slack-desc/xf86-input-digitaledge b/source/x/x11/slack-desc/xf86-video-modesetting
index a199da40..d6ffe28e 100644
--- a/source/x/x11/slack-desc/xf86-input-digitaledge
+++ b/source/x/x11/slack-desc/xf86-video-modesetting
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                       |-----handy-ruler------------------------------------------------------|
-xf86-input-digitaledge: xf86-input-digitaledge
-xf86-input-digitaledge:
-xf86-input-digitaledge: xf86-input-digitaledge is part of X11.
-xf86-input-digitaledge:
-xf86-input-digitaledge: For more information about the X.Org Foundation (the providers of the
-xf86-input-digitaledge: X.Org implementation of the X Window System), see their website:
-xf86-input-digitaledge:
-xf86-input-digitaledge: http://www.x.org
-xf86-input-digitaledge:
-xf86-input-digitaledge:
-xf86-input-digitaledge:
+xf86-video-modesetting: xf86-video-modesetting (X.org modesetting fallback driver)
+xf86-video-modesetting:
+xf86-video-modesetting: xf86-video-modesetting is part of X11.
+xf86-video-modesetting:
+xf86-video-modesetting: For more information about the X.Org Foundation (the providers of the
+xf86-video-modesetting: X.Org implementation of the X Window System), see their website:
+xf86-video-modesetting:
+xf86-video-modesetting: http://www.x.org
+xf86-video-modesetting:
+xf86-video-modesetting:
+xf86-video-modesetting:
diff --git a/source/x/x11/slack-desc/xf86-video-neomagic b/source/x/x11/slack-desc/xf86-video-neomagic
index 89676c27..862a4306 100644
--- a/source/x/x11/slack-desc/xf86-video-neomagic
+++ b/source/x/x11/slack-desc/xf86-video-neomagic
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                    |-----handy-ruler------------------------------------------------------|
-xf86-video-neomagic: xf86-video-neomagic
+xf86-video-neomagic: xf86-video-neomagic (NeoMagic video driver for the Xorg X server)
 xf86-video-neomagic:
 xf86-video-neomagic: xf86-video-neomagic is part of X11.
 xf86-video-neomagic:
diff --git a/source/x/x11/slack-desc/xf86-video-newport b/source/x/x11/slack-desc/xf86-video-newport
deleted file mode 100644
index 18d0daf9..00000000
--- a/source/x/x11/slack-desc/xf86-video-newport
+++ /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------------------------------------------------------|
-xf86-video-newport: xf86-video-newport
-xf86-video-newport:
-xf86-video-newport: xf86-video-newport is part of X11.
-xf86-video-newport:
-xf86-video-newport: For more information about the X.Org Foundation (the providers of the
-xf86-video-newport: X.Org implementation of the X Window System), see their website:
-xf86-video-newport:
-xf86-video-newport: http://www.x.org
-xf86-video-newport:
-xf86-video-newport:
-xf86-video-newport:
diff --git a/source/x/x11/slack-desc/xf86-video-nouveau b/source/x/x11/slack-desc/xf86-video-nouveau
index 8697a60e..ef207622 100644
--- a/source/x/x11/slack-desc/xf86-video-nouveau
+++ b/source/x/x11/slack-desc/xf86-video-nouveau
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-xf86-video-nouveau: xf86-video-nouveau
+xf86-video-nouveau: xf86-video-nouveau (accelerated open source driver for nVidia cards)
 xf86-video-nouveau:
 xf86-video-nouveau: xf86-video-nouveau is part of X11.
 xf86-video-nouveau:
diff --git a/source/x/x11/slack-desc/xf86-video-nsc b/source/x/x11/slack-desc/xf86-video-nsc
deleted file mode 100644
index 1081a9f5..00000000
--- a/source/x/x11/slack-desc/xf86-video-nsc
+++ /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------------------------------------------------------|
-xf86-video-nsc: xf86-video-nsc
-xf86-video-nsc:
-xf86-video-nsc: xf86-video-nsc is part of X11.
-xf86-video-nsc:
-xf86-video-nsc: For more information about the X.Org Foundation (the providers of the
-xf86-video-nsc: X.Org implementation of the X Window System), see their website:
-xf86-video-nsc:
-xf86-video-nsc: http://www.x.org
-xf86-video-nsc:
-xf86-video-nsc:
-xf86-video-nsc:
diff --git a/source/x/x11/slack-desc/xf86-video-nv b/source/x/x11/slack-desc/xf86-video-nv
index dfed5106..cd866957 100644
--- a/source/x/x11/slack-desc/xf86-video-nv
+++ b/source/x/x11/slack-desc/xf86-video-nv
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-xf86-video-nv: xf86-video-nv
+xf86-video-nv: xf86-video-nv (old NVIDIA video driver for the Xorg X server)
 xf86-video-nv:
 xf86-video-nv: xf86-video-nv is part of X11.
 xf86-video-nv:
diff --git a/source/x/x11/slack-desc/xf86-video-openchrome b/source/x/x11/slack-desc/xf86-video-openchrome
index 263de315..32e4c312 100644
--- a/source/x/x11/slack-desc/xf86-video-openchrome
+++ b/source/x/x11/slack-desc/xf86-video-openchrome
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                      |-----handy-ruler------------------------------------------------------|
-xf86-video-openchrome: xf86-video-openchrome
+xf86-video-openchrome: xf86-video-openchrome (VIA video driver for the Xorg X server)
 xf86-video-openchrome:
 xf86-video-openchrome: xf86-video-openchrome is part of X11.
 xf86-video-openchrome:
diff --git a/source/x/x11/slack-desc/xf86-input-dmc b/source/x/x11/slack-desc/xf86-video-qxl
index 890f92e9..e5eae0ce 100644
--- a/source/x/x11/slack-desc/xf86-input-dmc
+++ b/source/x/x11/slack-desc/xf86-video-qxl
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-input-dmc: xf86-input-dmc
-xf86-input-dmc:
-xf86-input-dmc: xf86-input-dmc is part of X11.
-xf86-input-dmc:
-xf86-input-dmc: For more information about the X.Org Foundation (the providers of the
-xf86-input-dmc: X.Org implementation of the X Window System), see their website:
-xf86-input-dmc:
-xf86-input-dmc: http://www.x.org
-xf86-input-dmc:
-xf86-input-dmc:
-xf86-input-dmc:
+xf86-video-qxl: xf86-video-qxl (driver for the spice virtual GPU)
+xf86-video-qxl:
+xf86-video-qxl: QXL is a driver for the spice virtual GPU.
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
diff --git a/source/x/x11/slack-desc/xf86-video-r128 b/source/x/x11/slack-desc/xf86-video-r128
index 6a5807bc..ae700aa9 100644
--- a/source/x/x11/slack-desc/xf86-video-r128
+++ b/source/x/x11/slack-desc/xf86-video-r128
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-xf86-video-r128: xf86-video-r128
+xf86-video-r128: xf86-video-r128 (ATI Rage 128 video driver for the Xorg X server)
 xf86-video-r128:
 xf86-video-r128: xf86-video-r128 is part of X11.
 xf86-video-r128:
diff --git a/source/x/x11/slack-desc/xf86-video-radeonhd b/source/x/x11/slack-desc/xf86-video-radeonhd
deleted file mode 100644
index ce2e7265..00000000
--- a/source/x/x11/slack-desc/xf86-video-radeonhd
+++ /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------------------------------------------------------|
-xf86-video-radeonhd: xf86-video-radeonhd (driver for AMD GPG (ATI) R5xx/R6xx chipsets)
-xf86-video-radeonhd:
-xf86-video-radeonhd: xf86-video-radeonhd is part of X11.
-xf86-video-radeonhd:
-xf86-video-radeonhd: For more information about the X.Org Foundation (the providers of the
-xf86-video-radeonhd: X.Org implementation of the X Window System), see their website:
-xf86-video-radeonhd:
-xf86-video-radeonhd: http://www.x.org
-xf86-video-radeonhd:
-xf86-video-radeonhd:
-xf86-video-radeonhd:
diff --git a/source/x/x11/slack-desc/xf86-video-rendition b/source/x/x11/slack-desc/xf86-video-rendition
index 99561b3a..a4c4dac5 100644
--- a/source/x/x11/slack-desc/xf86-video-rendition
+++ b/source/x/x11/slack-desc/xf86-video-rendition
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                     |-----handy-ruler------------------------------------------------------|
-xf86-video-rendition: xf86-video-rendition
+xf86-video-rendition: xf86-video-rendition (Rendition video driver for the Xorg X server)
 xf86-video-rendition:
 xf86-video-rendition: xf86-video-rendition is part of X11.
 xf86-video-rendition:
diff --git a/source/x/x11/slack-desc/xf86-video-s3 b/source/x/x11/slack-desc/xf86-video-s3
index f91fd6e9..960fd1f0 100644
--- a/source/x/x11/slack-desc/xf86-video-s3
+++ b/source/x/x11/slack-desc/xf86-video-s3
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-xf86-video-s3: xf86-video-s3
+xf86-video-s3: xf86-video-s3 (Xorg driver for S3 chipsets other than ViRGE or Savage)
 xf86-video-s3:
 xf86-video-s3: xf86-video-s3 is part of X11.
 xf86-video-s3:
diff --git a/source/x/x11/slack-desc/xf86-video-s3virge b/source/x/x11/slack-desc/xf86-video-s3virge
index 52fe0a34..87042f44 100644
--- a/source/x/x11/slack-desc/xf86-video-s3virge
+++ b/source/x/x11/slack-desc/xf86-video-s3virge
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-xf86-video-s3virge: xf86-video-s3virge
+xf86-video-s3virge: xf86-video-s3virge (S3 ViRGE video driver for the Xorg X server)
 xf86-video-s3virge:
 xf86-video-s3virge: xf86-video-s3virge is part of X11.
 xf86-video-s3virge:
diff --git a/source/x/x11/slack-desc/xf86-video-savage b/source/x/x11/slack-desc/xf86-video-savage
index f31d670c..b789b634 100644
--- a/source/x/x11/slack-desc/xf86-video-savage
+++ b/source/x/x11/slack-desc/xf86-video-savage
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-video-savage: xf86-video-savage
+xf86-video-savage: xf86-video-savage (S3 Savage video driver for the Xorg X server)
 xf86-video-savage:
 xf86-video-savage: xf86-video-savage is part of X11.
 xf86-video-savage:
diff --git a/source/x/x11/slack-desc/xf86-video-siliconmotion b/source/x/x11/slack-desc/xf86-video-siliconmotion
index 97a28f01..3a50a9a9 100644
--- a/source/x/x11/slack-desc/xf86-video-siliconmotion
+++ b/source/x/x11/slack-desc/xf86-video-siliconmotion
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                         |-----handy-ruler------------------------------------------------------|
-xf86-video-siliconmotion: xf86-video-siliconmotion
+xf86-video-siliconmotion: xf86-video-siliconmotion (Silicon Motion video driver for Xorg)
 xf86-video-siliconmotion:
 xf86-video-siliconmotion: xf86-video-siliconmotion is part of X11.
 xf86-video-siliconmotion:
diff --git a/source/x/x11/slack-desc/xf86-video-sis b/source/x/x11/slack-desc/xf86-video-sis
index d0261754..f08c5495 100644
--- a/source/x/x11/slack-desc/xf86-video-sis
+++ b/source/x/x11/slack-desc/xf86-video-sis
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-sis: xf86-video-sis
+xf86-video-sis: xf86-video-sis (SiS and XGI video driver for the Xorg X server)
 xf86-video-sis:
 xf86-video-sis: xf86-video-sis is part of X11.
 xf86-video-sis:
diff --git a/source/x/x11/slack-desc/xf86-video-sisusb b/source/x/x11/slack-desc/xf86-video-sisusb
index 9ab8bcbb..bda16ac5 100644
--- a/source/x/x11/slack-desc/xf86-video-sisusb
+++ b/source/x/x11/slack-desc/xf86-video-sisusb
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-video-sisusb: xf86-video-sisusb
+xf86-video-sisusb: xf86-video-sisusb (SiS Net2280-based USB video driver for Xorg)
 xf86-video-sisusb:
 xf86-video-sisusb: xf86-video-sisusb is part of X11.
 xf86-video-sisusb:
diff --git a/source/x/x11/slack-desc/xf86-video-sunbw2 b/source/x/x11/slack-desc/xf86-video-sunbw2
deleted file mode 100644
index f432ae42..00000000
--- a/source/x/x11/slack-desc/xf86-video-sunbw2
+++ /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------------------------------------------------------|
-xf86-video-sunbw2: xf86-video-sunbw2
-xf86-video-sunbw2:
-xf86-video-sunbw2: xf86-video-sunbw2 is part of X11.
-xf86-video-sunbw2:
-xf86-video-sunbw2: For more information about the X.Org Foundation (the providers of the
-xf86-video-sunbw2: X.Org implementation of the X Window System), see their website:
-xf86-video-sunbw2:
-xf86-video-sunbw2: http://www.x.org
-xf86-video-sunbw2:
-xf86-video-sunbw2:
-xf86-video-sunbw2:
diff --git a/source/x/x11/slack-desc/xf86-video-suncg14 b/source/x/x11/slack-desc/xf86-video-suncg14
deleted file mode 100644
index de038ed1..00000000
--- a/source/x/x11/slack-desc/xf86-video-suncg14
+++ /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------------------------------------------------------|
-xf86-video-suncg14: xf86-video-suncg14
-xf86-video-suncg14:
-xf86-video-suncg14: xf86-video-suncg14 is part of X11.
-xf86-video-suncg14:
-xf86-video-suncg14: For more information about the X.Org Foundation (the providers of the
-xf86-video-suncg14: X.Org implementation of the X Window System), see their website:
-xf86-video-suncg14:
-xf86-video-suncg14: http://www.x.org
-xf86-video-suncg14:
-xf86-video-suncg14:
-xf86-video-suncg14:
diff --git a/source/x/x11/slack-desc/xf86-video-suncg3 b/source/x/x11/slack-desc/xf86-video-suncg3
deleted file mode 100644
index c4b70a91..00000000
--- a/source/x/x11/slack-desc/xf86-video-suncg3
+++ /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------------------------------------------------------|
-xf86-video-suncg3: xf86-video-suncg3
-xf86-video-suncg3:
-xf86-video-suncg3: xf86-video-suncg3 is part of X11.
-xf86-video-suncg3:
-xf86-video-suncg3: For more information about the X.Org Foundation (the providers of the
-xf86-video-suncg3: X.Org implementation of the X Window System), see their website:
-xf86-video-suncg3:
-xf86-video-suncg3: http://www.x.org
-xf86-video-suncg3:
-xf86-video-suncg3:
-xf86-video-suncg3:
diff --git a/source/x/x11/slack-desc/xf86-video-suncg6 b/source/x/x11/slack-desc/xf86-video-suncg6
deleted file mode 100644
index e9efb940..00000000
--- a/source/x/x11/slack-desc/xf86-video-suncg6
+++ /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------------------------------------------------------|
-xf86-video-suncg6: xf86-video-suncg6
-xf86-video-suncg6:
-xf86-video-suncg6: xf86-video-suncg6 is part of X11.
-xf86-video-suncg6:
-xf86-video-suncg6: For more information about the X.Org Foundation (the providers of the
-xf86-video-suncg6: X.Org implementation of the X Window System), see their website:
-xf86-video-suncg6:
-xf86-video-suncg6: http://www.x.org
-xf86-video-suncg6:
-xf86-video-suncg6:
-xf86-video-suncg6:
diff --git a/source/x/x11/slack-desc/xf86-video-sunffb b/source/x/x11/slack-desc/xf86-video-sunffb
deleted file mode 100644
index 17400a0e..00000000
--- a/source/x/x11/slack-desc/xf86-video-sunffb
+++ /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------------------------------------------------------|
-xf86-video-sunffb: xf86-video-sunffb
-xf86-video-sunffb:
-xf86-video-sunffb: xf86-video-sunffb is part of X11.
-xf86-video-sunffb:
-xf86-video-sunffb: For more information about the X.Org Foundation (the providers of the
-xf86-video-sunffb: X.Org implementation of the X Window System), see their website:
-xf86-video-sunffb:
-xf86-video-sunffb: http://www.x.org
-xf86-video-sunffb:
-xf86-video-sunffb:
-xf86-video-sunffb:
diff --git a/source/x/x11/slack-desc/xf86-video-sunleo b/source/x/x11/slack-desc/xf86-video-sunleo
deleted file mode 100644
index 03b0c2ea..00000000
--- a/source/x/x11/slack-desc/xf86-video-sunleo
+++ /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------------------------------------------------------|
-xf86-video-sunleo: xf86-video-sunleo
-xf86-video-sunleo:
-xf86-video-sunleo: xf86-video-sunleo is part of X11.
-xf86-video-sunleo:
-xf86-video-sunleo: For more information about the X.Org Foundation (the providers of the
-xf86-video-sunleo: X.Org implementation of the X Window System), see their website:
-xf86-video-sunleo:
-xf86-video-sunleo: http://www.x.org
-xf86-video-sunleo:
-xf86-video-sunleo:
-xf86-video-sunleo:
diff --git a/source/x/x11/slack-desc/xf86-video-suntcx b/source/x/x11/slack-desc/xf86-video-suntcx
deleted file mode 100644
index 800bade3..00000000
--- a/source/x/x11/slack-desc/xf86-video-suntcx
+++ /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------------------------------------------------------|
-xf86-video-suntcx: xf86-video-suntcx
-xf86-video-suntcx:
-xf86-video-suntcx: xf86-video-suntcx is part of X11.
-xf86-video-suntcx:
-xf86-video-suntcx: For more information about the X.Org Foundation (the providers of the
-xf86-video-suntcx: X.Org implementation of the X Window System), see their website:
-xf86-video-suntcx:
-xf86-video-suntcx: http://www.x.org
-xf86-video-suntcx:
-xf86-video-suntcx:
-xf86-video-suntcx:
diff --git a/source/x/x11/slack-desc/xf86-video-tdfx b/source/x/x11/slack-desc/xf86-video-tdfx
index 8d375baf..dddcaf59 100644
--- a/source/x/x11/slack-desc/xf86-video-tdfx
+++ b/source/x/x11/slack-desc/xf86-video-tdfx
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-xf86-video-tdfx: xf86-video-tdfx
+xf86-video-tdfx: xf86-video-tdfx (3Dfx video driver for the Xorg X server)
 xf86-video-tdfx:
 xf86-video-tdfx: xf86-video-tdfx is part of X11.
 xf86-video-tdfx:
diff --git a/source/x/x11/slack-desc/xf86-video-tga b/source/x/x11/slack-desc/xf86-video-tga
index 52a30eb0..fead6cbe 100644
--- a/source/x/x11/slack-desc/xf86-video-tga
+++ b/source/x/x11/slack-desc/xf86-video-tga
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-tga: xf86-video-tga
+xf86-video-tga: xf86-video-tga (DEC21030/TGA video driver for the Xorg X server)
 xf86-video-tga:
 xf86-video-tga: xf86-video-tga is part of X11.
 xf86-video-tga:
diff --git a/source/x/x11/slack-desc/xf86-video-trident b/source/x/x11/slack-desc/xf86-video-trident
index f4b6a570..69197278 100644
--- a/source/x/x11/slack-desc/xf86-video-trident
+++ b/source/x/x11/slack-desc/xf86-video-trident
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-xf86-video-trident: xf86-video-trident
+xf86-video-trident: xf86-video-trident (Trident video driver for the Xorg X server)
 xf86-video-trident:
 xf86-video-trident: xf86-video-trident is part of X11.
 xf86-video-trident:
diff --git a/source/x/x11/slack-desc/xf86-video-tseng b/source/x/x11/slack-desc/xf86-video-tseng
index 3192fe14..8e0a12b4 100644
--- a/source/x/x11/slack-desc/xf86-video-tseng
+++ b/source/x/x11/slack-desc/xf86-video-tseng
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86-video-tseng: xf86-video-tseng
+xf86-video-tseng: xf86-video-tseng (Tseng Labs video driver for the Xorg X server)
 xf86-video-tseng:
 xf86-video-tseng: xf86-video-tseng is part of X11.
 xf86-video-tseng:
diff --git a/source/x/x11/slack-desc/xf86-video-v4l b/source/x/x11/slack-desc/xf86-video-v4l
index 27e7795f..e6e1aab1 100644
--- a/source/x/x11/slack-desc/xf86-video-v4l
+++ b/source/x/x11/slack-desc/xf86-video-v4l
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-v4l: xf86-video-v4l
+xf86-video-v4l: xf86-video-v4l (Video 4 Linux adaptor driver for X)
 xf86-video-v4l:
 xf86-video-v4l: xf86-video-v4l is part of X11.
 xf86-video-v4l:
diff --git a/source/x/x11/slack-desc/xf86-video-vermilion b/source/x/x11/slack-desc/xf86-video-vermilion
deleted file mode 100644
index 2ca79f3e..00000000
--- a/source/x/x11/slack-desc/xf86-video-vermilion
+++ /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------------------------------------------------------|
-xf86-video-vermilion: xf86-video-vermilion
-xf86-video-vermilion:
-xf86-video-vermilion: xf86-video-vermilion supports the Intel Vermilion Range of chipsets.
-xf86-video-vermilion:
-xf86-video-vermilion: For more information about the X.Org Foundation (the providers of the
-xf86-video-vermilion: X.Org implementation of the X Window System), see their website:
-xf86-video-vermilion:
-xf86-video-vermilion: http://www.x.org
-xf86-video-vermilion:
-xf86-video-vermilion:
-xf86-video-vermilion:
diff --git a/source/x/x11/slack-desc/xf86-video-vesa b/source/x/x11/slack-desc/xf86-video-vesa
index 5a1edcaf..0c7e742d 100644
--- a/source/x/x11/slack-desc/xf86-video-vesa
+++ b/source/x/x11/slack-desc/xf86-video-vesa
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-xf86-video-vesa: xf86-video-vesa
+xf86-video-vesa: xf86-video-vesa (Generic VESA video driver for the Xorg X server)
 xf86-video-vesa:
 xf86-video-vesa: xf86-video-vesa is part of X11.
 xf86-video-vesa:
diff --git a/source/x/x11/slack-desc/xf86-video-vga b/source/x/x11/slack-desc/xf86-video-vga
deleted file mode 100644
index 5a4dde64..00000000
--- a/source/x/x11/slack-desc/xf86-video-vga
+++ /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------------------------------------------------------|
-xf86-video-vga: xf86-video-vga
-xf86-video-vga:
-xf86-video-vga: xf86-video-vga is part of X11.
-xf86-video-vga:
-xf86-video-vga: For more information about the X.Org Foundation (the providers of the
-xf86-video-vga: X.Org implementation of the X Window System), see their website:
-xf86-video-vga:
-xf86-video-vga: http://www.x.org
-xf86-video-vga:
-xf86-video-vga:
-xf86-video-vga:
diff --git a/source/x/x11/slack-desc/xf86-video-via b/source/x/x11/slack-desc/xf86-video-via
deleted file mode 100644
index 90193181..00000000
--- a/source/x/x11/slack-desc/xf86-video-via
+++ /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------------------------------------------------------|
-xf86-video-via: xf86-video-via
-xf86-video-via:
-xf86-video-via: xf86-video-via is part of X11.
-xf86-video-via:
-xf86-video-via: For more information about the X.Org Foundation (the providers of the
-xf86-video-via: X.Org implementation of the X Window System), see their website:
-xf86-video-via:
-xf86-video-via: http://www.x.org
-xf86-video-via:
-xf86-video-via:
-xf86-video-via:
diff --git a/source/x/x11/slack-desc/xf86-video-vmware b/source/x/x11/slack-desc/xf86-video-vmware
index d3d818b2..7ca2802e 100644
--- a/source/x/x11/slack-desc/xf86-video-vmware
+++ b/source/x/x11/slack-desc/xf86-video-vmware
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-video-vmware: xf86-video-vmware
+xf86-video-vmware: xf86-video-vmware (VMWare SVGA video driver for the Xorg X server)
 xf86-video-vmware:
 xf86-video-vmware: xf86-video-vmware is part of X11.
 xf86-video-vmware:
diff --git a/source/x/x11/slack-desc/xf86-video-voodoo b/source/x/x11/slack-desc/xf86-video-voodoo
index 5ba59ab2..357315d4 100644
--- a/source/x/x11/slack-desc/xf86-video-voodoo
+++ b/source/x/x11/slack-desc/xf86-video-voodoo
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                  |-----handy-ruler------------------------------------------------------|
-xf86-video-voodoo: xf86-video-voodoo
+xf86-video-voodoo: xf86-video-voodoo (3DFX Voodoo/Voodoo2 video driver for Xorg)
 xf86-video-voodoo:
 xf86-video-voodoo: xf86-video-voodoo is part of X11.
 xf86-video-voodoo:
diff --git a/source/x/x11/slack-desc/xf86-video-wsfb b/source/x/x11/slack-desc/xf86-video-wsfb
deleted file mode 100644
index 0253575e..00000000
--- a/source/x/x11/slack-desc/xf86-video-wsfb
+++ /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------------------------------------------------------|
-xf86-video-wsfb: xf86-video-wsfb
-xf86-video-wsfb:
-xf86-video-wsfb: xf86-video-wsfb is part of X11.
-xf86-video-wsfb:
-xf86-video-wsfb: For more information about the X.Org Foundation (the providers of the
-xf86-video-wsfb: X.Org implementation of the X Window System), see their website:
-xf86-video-wsfb:
-xf86-video-wsfb: http://www.x.org
-xf86-video-wsfb:
-xf86-video-wsfb:
-xf86-video-wsfb:
diff --git a/source/x/x11/slack-desc/xf86-video-xgi b/source/x/x11/slack-desc/xf86-video-xgi
index a92ec854..1792db1b 100644
--- a/source/x/x11/slack-desc/xf86-video-xgi
+++ b/source/x/x11/slack-desc/xf86-video-xgi
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-xf86-video-xgi: xf86-video-xgi
+xf86-video-xgi: xf86-video-xgi (XGI video driver for the Xorg X server)
 xf86-video-xgi:
 xf86-video-xgi: xf86-video-xgi is part of X11.
 xf86-video-xgi:
diff --git a/source/x/x11/slack-desc/xf86-video-xgixp b/source/x/x11/slack-desc/xf86-video-xgixp
deleted file mode 100644
index 32aea9fd..00000000
--- a/source/x/x11/slack-desc/xf86-video-xgixp
+++ /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------------------------------------------------------|
-xf86-video-xgixp: xf86-video-xgixp
-xf86-video-xgixp:
-xf86-video-xgixp: xf86-video-xgixp is part of X11.
-xf86-video-xgixp:
-xf86-video-xgixp: For more information about the X.Org Foundation (the providers of the
-xf86-video-xgixp: X.Org implementation of the X Window System), see their website:
-xf86-video-xgixp:
-xf86-video-xgixp: http://www.x.org
-xf86-video-xgixp:
-xf86-video-xgixp:
-xf86-video-xgixp:
diff --git a/source/x/x11/slack-desc/xf86bigfontproto b/source/x/x11/slack-desc/xf86bigfontproto
index d42c5419..d9f1cc2e 100644
--- a/source/x/x11/slack-desc/xf86bigfontproto
+++ b/source/x/x11/slack-desc/xf86bigfontproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86bigfontproto: xf86bigfontproto
+xf86bigfontproto: xf86bigfontproto (X.Org XF86BIGFONT protocol headers)
 xf86bigfontproto:
 xf86bigfontproto: xf86bigfontproto is part of X11.
 xf86bigfontproto:
diff --git a/source/x/x11/slack-desc/xf86dga b/source/x/x11/slack-desc/xf86dga
index 08c928a9..70d189ea 100644
--- a/source/x/x11/slack-desc/xf86dga
+++ b/source/x/x11/slack-desc/xf86dga
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-xf86dga: xf86dga
+xf86dga: xf86dga (simple test client for the XFree86-DGA extension)
 xf86dga:
 xf86dga: xf86dga is part of X11.
 xf86dga:
diff --git a/source/x/x11/slack-desc/xf86dgaproto b/source/x/x11/slack-desc/xf86dgaproto
index c9ca3fc2..cbc21ac6 100644
--- a/source/x/x11/slack-desc/xf86dgaproto
+++ b/source/x/x11/slack-desc/xf86dgaproto
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
             |-----handy-ruler------------------------------------------------------|
-xf86dgaproto: xf86dgaproto
+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:
 xf86dgaproto:
-xf86dgaproto: xf86dgaproto is part of X11.
 xf86dgaproto:
-xf86dgaproto: For more information about the X.Org Foundation (the providers of the
-xf86dgaproto: X.Org implementation of the X Window System), see their website:
 xf86dgaproto:
-xf86dgaproto: http://www.x.org
 xf86dgaproto:
 xf86dgaproto:
 xf86dgaproto:
diff --git a/source/x/x11/slack-desc/xf86driproto b/source/x/x11/slack-desc/xf86driproto
index c327a43b..e9466bde 100644
--- a/source/x/x11/slack-desc/xf86driproto
+++ b/source/x/x11/slack-desc/xf86driproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
             |-----handy-ruler------------------------------------------------------|
-xf86driproto: xf86driproto
+xf86driproto: xf86driproto (C prototypes for XFree86 DRI)
 xf86driproto:
 xf86driproto: xf86driproto is part of X11.
 xf86driproto:
diff --git a/source/x/x11/slack-desc/xf86miscproto b/source/x/x11/slack-desc/xf86miscproto
index 883ef9fe..bf1297b1 100644
--- a/source/x/x11/slack-desc/xf86miscproto
+++ b/source/x/x11/slack-desc/xf86miscproto
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-xf86miscproto: xf86miscproto
+xf86miscproto: xf86miscproto (C prototypes for XFree86-Misc)
 xf86miscproto:
-xf86miscproto: xf86miscproto is part of X11.
+xf86miscproto: This package includes the protocol definitions of the "XFree86-Misc"
+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:
-xf86miscproto: For more information about the X.Org Foundation (the providers of the
-xf86miscproto: X.Org implementation of the X Window System), see their website:
 xf86miscproto:
-xf86miscproto: http://www.x.org
 xf86miscproto:
 xf86miscproto:
 xf86miscproto:
diff --git a/source/x/x11/slack-desc/xf86rushproto b/source/x/x11/slack-desc/xf86rushproto
deleted file mode 100644
index 0013da93..00000000
--- a/source/x/x11/slack-desc/xf86rushproto
+++ /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------------------------------------------------------|
-xf86rushproto: xf86rushproto
-xf86rushproto:
-xf86rushproto: xf86rushproto is part of X11.
-xf86rushproto:
-xf86rushproto: For more information about the X.Org Foundation (the providers of the
-xf86rushproto: X.Org implementation of the X Window System), see their website:
-xf86rushproto:
-xf86rushproto: http://www.x.org
-xf86rushproto:
-xf86rushproto:
-xf86rushproto:
diff --git a/source/x/x11/slack-desc/xf86vidmodeproto b/source/x/x11/slack-desc/xf86vidmodeproto
index 13acda81..2e6d8ea0 100644
--- a/source/x/x11/slack-desc/xf86vidmodeproto
+++ b/source/x/x11/slack-desc/xf86vidmodeproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xf86vidmodeproto: xf86vidmodeproto
+xf86vidmodeproto: xf86vidmodeproto (C prototypes for XFree86 Video Mode Extension)
 xf86vidmodeproto:
 xf86vidmodeproto: xf86vidmodeproto is part of X11.
 xf86vidmodeproto:
diff --git a/source/x/x11/slack-desc/xfd b/source/x/x11/slack-desc/xfd
index 31f646f5..4d47163e 100644
--- a/source/x/x11/slack-desc/xfd
+++ b/source/x/x11/slack-desc/xfd
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xfd: xfd
+xfd: xfd (X11 font utility)
+xfd:
+xfd: xfd displays all the characters in a font using either the X11 core
+xfd: protocol or libXft2.
+xfd:
 xfd:
-xfd: xfd is part of X11.
 xfd:
-xfd: For more information about the X.Org Foundation (the providers of the
-xfd: X.Org implementation of the X Window System), see their website:
 xfd:
-xfd: http://www.x.org
 xfd:
 xfd:
 xfd:
diff --git a/source/x/x11/slack-desc/xfindproxy b/source/x/x11/slack-desc/xfindproxy
deleted file mode 100644
index 64125d2c..00000000
--- a/source/x/x11/slack-desc/xfindproxy
+++ /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------------------------------------------------------|
-xfindproxy: xfindproxy
-xfindproxy:
-xfindproxy: xfindproxy is part of X11.
-xfindproxy:
-xfindproxy: For more information about the X.Org Foundation (the providers of the
-xfindproxy: X.Org implementation of the X Window System), see their website:
-xfindproxy:
-xfindproxy: http://www.x.org
-xfindproxy:
-xfindproxy:
-xfindproxy:
diff --git a/source/x/x11/slack-desc/xfontsel b/source/x/x11/slack-desc/xfontsel
index cb4594c2..0638c5e8 100644
--- a/source/x/x11/slack-desc/xfontsel
+++ b/source/x/x11/slack-desc/xfontsel
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xfontsel: xfontsel
+xfontsel: xfontsel (X11 font selector)
+xfontsel:
+xfontsel: xfontsel application provides a simple way to display the X11 core
+xfontsel: protocol fonts known to your X server, examine samples of each, and
+xfontsel: retrieve the X Logical Font Description ("XLFD") full name for a font.
 xfontsel:
-xfontsel: xfontsel is part of X11.
 xfontsel:
-xfontsel: For more information about the X.Org Foundation (the providers of the
-xfontsel: X.Org implementation of the X Window System), see their website:
 xfontsel:
-xfontsel: http://www.x.org
 xfontsel:
 xfontsel:
 xfontsel:
diff --git a/source/x/x11/slack-desc/xfs b/source/x/x11/slack-desc/xfs
index 33ea3687..63d8766e 100644
--- a/source/x/x11/slack-desc/xfs
+++ b/source/x/x11/slack-desc/xfs
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xfs: xfs
+xfs: xfs (font server for X11)
 xfs:
 xfs: xfs is part of X11.
 xfs:
diff --git a/source/x/x11/slack-desc/xfsinfo b/source/x/x11/slack-desc/xfsinfo
index 87abf1e4..85e5ef22 100644
--- a/source/x/x11/slack-desc/xfsinfo
+++ b/source/x/x11/slack-desc/xfsinfo
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-xfsinfo: xfsinfo
+xfsinfo: xfsinfo (X11 font server utility)
 xfsinfo:
-xfsinfo: xfsinfo is part of X11.
+xfsinfo: xfsinfo is a utility for displaying information about an X font server.
+xfsinfo: It is used to examine the capabilities of a server, the predefined
+xfsinfo: values for various parameters used in communicating between clients
+xfsinfo: and the server, and the font catalogues and alternate servers that
+xfsinfo: are available.
 xfsinfo:
-xfsinfo: For more information about the X.Org Foundation (the providers of the
-xfsinfo: X.Org implementation of the X Window System), see their website:
-xfsinfo:
-xfsinfo: http://www.x.org
 xfsinfo:
 xfsinfo:
 xfsinfo:
diff --git a/source/x/x11/slack-desc/xfwp b/source/x/x11/slack-desc/xfwp
deleted file mode 100644
index 572036c6..00000000
--- a/source/x/x11/slack-desc/xfwp
+++ /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------------------------------------------------------|
-xfwp: xfwp
-xfwp:
-xfwp: xfwp is part of X11.
-xfwp:
-xfwp: For more information about the X.Org Foundation (the providers of the
-xfwp: X.Org implementation of the X Window System), see their website:
-xfwp:
-xfwp: http://www.x.org
-xfwp:
-xfwp:
-xfwp:
diff --git a/source/x/x11/slack-desc/xgamma b/source/x/x11/slack-desc/xgamma
index 69df14aa..c7ebcb95 100644
--- a/source/x/x11/slack-desc/xgamma
+++ b/source/x/x11/slack-desc/xgamma
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xgamma: xgamma
+xgamma: xgamma (X11 gamma utility)
+xgamma:
+xgamma: xgamma allows X users to query and alter the gamma correction of a
+xgamma: monitor via the X video mode extension (XFree86-VidModeExtension).
+xgamma:
 xgamma:
-xgamma: xgamma is part of X11.
 xgamma:
-xgamma: For more information about the X.Org Foundation (the providers of the
-xgamma: X.Org implementation of the X Window System), see their website:
 xgamma:
-xgamma: http://www.x.org
 xgamma:
 xgamma:
 xgamma:
diff --git a/source/x/x11/slack-desc/xgc b/source/x/x11/slack-desc/xgc
index 0de84bc0..e07e9bad 100644
--- a/source/x/x11/slack-desc/xgc
+++ b/source/x/x11/slack-desc/xgc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xgc: xgc
+xgc: xgc (X11 demo client)
+xgc:
+xgc: xgc is an X11 graphics demo that shows various features of the X11
+xgc: core protocol graphics primitives.
+xgc:
 xgc:
-xgc: xgc is part of X11.
 xgc:
-xgc: For more information about the X.Org Foundation (the providers of the
-xgc: X.Org implementation of the X Window System), see their website:
 xgc:
-xgc: http://www.x.org
 xgc:
 xgc:
 xgc:
diff --git a/source/x/x11/slack-desc/xhost b/source/x/x11/slack-desc/xhost
index 53f9620b..a4b9501d 100644
--- a/source/x/x11/slack-desc/xhost
+++ b/source/x/x11/slack-desc/xhost
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xhost: xhost
+xhost: xhost (X11 authorization utility)
+xhost:
+xhost: xhost is used to manage the list of host names or user names allowed
+xhost: to make connections to the X server.
+xhost:
 xhost:
-xhost: xhost is part of X11.
 xhost:
-xhost: For more information about the X.Org Foundation (the providers of the
-xhost: X.Org implementation of the X Window System), see their website:
 xhost:
-xhost: http://www.x.org
 xhost:
 xhost:
 xhost:
diff --git a/source/x/x11/slack-desc/xineramaproto b/source/x/x11/slack-desc/xineramaproto
index dbdde800..6a39b1a1 100644
--- a/source/x/x11/slack-desc/xineramaproto
+++ b/source/x/x11/slack-desc/xineramaproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-xineramaproto: xineramaproto
+xineramaproto: xineramaproto (C prototypes for X11 Xinerama Extension)
 xineramaproto:
 xineramaproto: xineramaproto is part of X11.
 xineramaproto:
diff --git a/source/x/x11/slack-desc/xinit b/source/x/x11/slack-desc/xinit
index c1b05318..c64cd86a 100644
--- a/source/x/x11/slack-desc/xinit
+++ b/source/x/x11/slack-desc/xinit
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xinit: xinit
+xinit: xinit (scripts to start X11 servers)
+xinit:
+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:
-xinit: xinit is part of X11.
 xinit:
-xinit: For more information about the X.Org Foundation (the providers of the
-xinit: X.Org implementation of the X Window System), see their website:
 xinit:
-xinit: http://www.x.org
 xinit:
 xinit:
 xinit:
diff --git a/source/x/x11/slack-desc/xinput b/source/x/x11/slack-desc/xinput
index 758a6ba6..6ae25aec 100644
--- a/source/x/x11/slack-desc/xinput
+++ b/source/x/x11/slack-desc/xinput
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-    |-----handy-ruler------------------------------------------------------|
-xinput: xinput
+      |-----handy-ruler------------------------------------------------------|
+xinput: xinput (utility to configure and test X11 input devices)
 xinput:
 xinput: xinput is a utility to configure and test XInput devices. It wasn't
 xinput: originally designed to be the primary tool for doing this but it's
 xinput: still pretty much the only program out there for doing it. :-)
 xinput:
-xinput: xinput is part of X11.
-xinput:
 xinput: For more information about the X.Org Foundation (the providers of the
 xinput: X.Org implementation of the X Window System), see their website:
 xinput: http://www.x.org
+xinput:
+xinput:
diff --git a/source/x/x11/slack-desc/xkbcomp b/source/x/x11/slack-desc/xkbcomp
index ab3fc9b7..dc0da9b2 100644
--- a/source/x/x11/slack-desc/xkbcomp
+++ b/source/x/x11/slack-desc/xkbcomp
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-xkbcomp: xkbcomp
+xkbcomp: xkbcomp (X Keyboard Extension)
 xkbcomp:
 xkbcomp: xkbcomp is part of X11.
 xkbcomp:
diff --git a/source/x/x11/slack-desc/xkbdata b/source/x/x11/slack-desc/xkbdata
deleted file mode 100644
index 5fafad26..00000000
--- a/source/x/x11/slack-desc/xkbdata
+++ /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------------------------------------------------------|
-xkbdata: xkbdata
-xkbdata:
-xkbdata: xkbdata is part of X11.
-xkbdata:
-xkbdata: For more information about the X.Org Foundation (the providers of the
-xkbdata: X.Org implementation of the X Window System), see their website:
-xkbdata:
-xkbdata: http://www.x.org
-xkbdata:
-xkbdata:
-xkbdata:
diff --git a/source/x/x11/slack-desc/xkbevd b/source/x/x11/slack-desc/xkbevd
index 9909e676..59b3f14e 100644
--- a/source/x/x11/slack-desc/xkbevd
+++ b/source/x/x11/slack-desc/xkbevd
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xkbevd: xkbevd
+xkbevd: xkbevd (X11 keyboard event daemon)
 xkbevd:
 xkbevd: xkbevd is part of X11.
 xkbevd:
diff --git a/source/x/x11/slack-desc/xkbprint b/source/x/x11/slack-desc/xkbprint
index efbe7ab9..ab30d051 100644
--- a/source/x/x11/slack-desc/xkbprint
+++ b/source/x/x11/slack-desc/xkbprint
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xkbprint: xkbprint
+xkbprint: xkbprint (X11 keyboard utility)
+xkbprint:
+xkbprint: xkbprint generates a printable or encapsulated PostScript description
+xkbprint: of an XKB keyboard description.
+xkbprint:
 xkbprint:
-xkbprint: xkbprint is part of X11.
 xkbprint:
-xkbprint: For more information about the X.Org Foundation (the providers of the
-xkbprint: X.Org implementation of the X Window System), see their website:
 xkbprint:
-xkbprint: http://www.x.org
 xkbprint:
 xkbprint:
 xkbprint:
diff --git a/source/x/x11/slack-desc/xkbutils b/source/x/x11/slack-desc/xkbutils
index 1e98d49d..80f8ee9e 100644
--- a/source/x/x11/slack-desc/xkbutils
+++ b/source/x/x11/slack-desc/xkbutils
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xkbutils: xkbutils
+xkbutils: xkbutils (X11 keyboard utilities)
+xkbutils:
+xkbutils: xkbutils is a collection of small utilities utilizing the XKeyboard
+xkbutils: (XKB) extension to the X11 protocol.
+xkbutils:
 xkbutils:
-xkbutils: xkbutils is part of X11.
 xkbutils:
-xkbutils: For more information about the X.Org Foundation (the providers of the
-xkbutils: X.Org implementation of the X Window System), see their website:
 xkbutils:
-xkbutils: http://www.x.org
 xkbutils:
 xkbutils:
 xkbutils:
diff --git a/source/x/x11/slack-desc/xkeyboard-config b/source/x/x11/slack-desc/xkeyboard-config
index 3b9b0bb7..01454254 100644
--- a/source/x/x11/slack-desc/xkeyboard-config
+++ b/source/x/x11/slack-desc/xkeyboard-config
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                 |-----handy-ruler------------------------------------------------------|
-xkeyboard-config: xkeyboard-config
+xkeyboard-config: xkeyboard-config (X Keyboard Extension config files)
 xkeyboard-config:
-xkeyboard-config: xkeyboard-config is part of X11.
-xkeyboard-config:
-xkeyboard-config: For more information about the X.Org Foundation (the providers of the
-xkeyboard-config: X.Org implementation of the X Window System), see their website:
-xkeyboard-config:
-xkeyboard-config: http://www.x.org
+xkeyboard-config: The X Keyboard Extension essentially replaces the core protocol
+xkeyboard-config: definition of keyboard. The extension makes possible to clearly and
+xkeyboard-config: explicitly specify most aspects of keyboard behaviour on per-key
+xkeyboard-config: basis and to more closely track the logical and physical state of the
+xkeyboard-config: keyboard. It also includes a number of keyboard controls designed to
+xkeyboard-config: make keyboards more accessible to people with physical impairments.
 xkeyboard-config:
 xkeyboard-config:
 xkeyboard-config:
diff --git a/source/x/x11/slack-desc/xkill b/source/x/x11/slack-desc/xkill
index 82aedb48..66904b44 100644
--- a/source/x/x11/slack-desc/xkill
+++ b/source/x/x11/slack-desc/xkill
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xkill: xkill
+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: programs that have displayed undesired windows on a user's screen.
 xkill:
-xkill: xkill is part of X11.
 xkill:
-xkill: For more information about the X.Org Foundation (the providers of the
-xkill: X.Org implementation of the X Window System), see their website:
 xkill:
-xkill: http://www.x.org
 xkill:
 xkill:
 xkill:
diff --git a/source/x/x11/slack-desc/xload b/source/x/x11/slack-desc/xload
index b95b6b6c..24adeac7 100644
--- a/source/x/x11/slack-desc/xload
+++ b/source/x/x11/slack-desc/xload
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xload: xload
+xload: xload (displays a histogram of the system load average)
 xload:
 xload: xload is part of X11.
 xload:
diff --git a/source/x/x11/slack-desc/xlogo b/source/x/x11/slack-desc/xlogo
index fbd28cc1..e97b3e25 100644
--- a/source/x/x11/slack-desc/xlogo
+++ b/source/x/x11/slack-desc/xlogo
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xlogo: xlogo
+xlogo: xlogo (displays the X Window System logo)
 xlogo:
 xlogo: xlogo is part of X11.
 xlogo:
diff --git a/source/x/x11/slack-desc/xlsatoms b/source/x/x11/slack-desc/xlsatoms
index f4e7e79c..c6e958ae 100644
--- a/source/x/x11/slack-desc/xlsatoms
+++ b/source/x/x11/slack-desc/xlsatoms
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xlsatoms: xlsatoms
+xlsatoms: xlsatoms (lists the interned atoms defined on an X11 server)
 xlsatoms:
 xlsatoms: xlsatoms is part of X11.
 xlsatoms:
diff --git a/source/x/x11/slack-desc/xlsclients b/source/x/x11/slack-desc/xlsclients
index 2bcf25fb..2cf50b06 100644
--- a/source/x/x11/slack-desc/xlsclients
+++ b/source/x/x11/slack-desc/xlsclients
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-xlsclients: xlsclients
+xlsclients: xlsclients (X11 utility for listing X client info)
+xlsclients:
+xlsclients: xlsclients is a utility for listing information about the client
+xlsclients: applications running on a X11 server.
+xlsclients:
 xlsclients:
-xlsclients: xlsclients is part of X11.
 xlsclients:
-xlsclients: For more information about the X.Org Foundation (the providers of the
-xlsclients: X.Org implementation of the X Window System), see their website:
 xlsclients:
-xlsclients: http://www.x.org
 xlsclients:
 xlsclients:
 xlsclients:
diff --git a/source/x/x11/slack-desc/xlsfonts b/source/x/x11/slack-desc/xlsfonts
index 25e25afc..d285ab05 100644
--- a/source/x/x11/slack-desc/xlsfonts
+++ b/source/x/x11/slack-desc/xlsfonts
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xlsfonts: xlsfonts
+xlsfonts: xlsfonts (X11 font utility to list available fonts)
+xlsfonts:
+xlsfonts: xlsfonts lists fonts available from an X server via the X11 core
+xlsfonts: protocol.
+xlsfonts:
 xlsfonts:
-xlsfonts: xlsfonts is part of X11.
 xlsfonts:
-xlsfonts: For more information about the X.Org Foundation (the providers of the
-xlsfonts: X.Org implementation of the X Window System), see their website:
 xlsfonts:
-xlsfonts: http://www.x.org
 xlsfonts:
 xlsfonts:
 xlsfonts:
diff --git a/source/x/x11/slack-desc/xmag b/source/x/x11/slack-desc/xmag
index 38174dd7..50c329f8 100644
--- a/source/x/x11/slack-desc/xmag
+++ b/source/x/x11/slack-desc/xmag
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-xmag: xmag
+xmag: xmag (X11 accessibility utility)
+xmag:
+xmag: xmag displays a magnified snapshot of a portion of an X11 screen.
+xmag:
+xmag:
 xmag:
-xmag: xmag is part of X11.
 xmag:
-xmag: For more information about the X.Org Foundation (the providers of the
-xmag: X.Org implementation of the X Window System), see their website:
 xmag:
-xmag: http://www.x.org
 xmag:
 xmag:
 xmag:
diff --git a/source/x/x11/slack-desc/xman b/source/x/x11/slack-desc/xman
index 98ce929c..206da5c8 100644
--- a/source/x/x11/slack-desc/xman
+++ b/source/x/x11/slack-desc/xman
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-xman: xman
+xman: xman (graphical manual page browser using the Xaw toolkit)
 xman:
 xman: xman is part of X11.
 xman:
diff --git a/source/x/x11/slack-desc/xmessage b/source/x/x11/slack-desc/xmessage
index 12c9c0df..233d4aa2 100644
--- a/source/x/x11/slack-desc/xmessage
+++ b/source/x/x11/slack-desc/xmessage
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xmessage: xmessage
+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: after a specified time.
 xmessage:
-xmessage: xmessage is part of X11.
 xmessage:
-xmessage: For more information about the X.Org Foundation (the providers of the
-xmessage: X.Org implementation of the X Window System), see their website:
 xmessage:
-xmessage: http://www.x.org
 xmessage:
 xmessage:
 xmessage:
diff --git a/source/x/x11/slack-desc/xmh b/source/x/x11/slack-desc/xmh
index a1415c8b..8730f1f2 100644
--- a/source/x/x11/slack-desc/xmh
+++ b/source/x/x11/slack-desc/xmh
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xmh: xmh
+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: calls to the MH package.
 xmh:
-xmh: xmh is part of X11.
 xmh:
-xmh: For more information about the X.Org Foundation (the providers of the
-xmh: X.Org implementation of the X Window System), see their website:
 xmh:
-xmh: http://www.x.org
 xmh:
 xmh:
 xmh:
diff --git a/source/x/x11/slack-desc/xmodmap b/source/x/x11/slack-desc/xmodmap
index aeb77cff..9397f1c3 100644
--- a/source/x/x11/slack-desc/xmodmap
+++ b/source/x/x11/slack-desc/xmodmap
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-xmodmap: xmodmap
+xmodmap: xmodmap (X11 keyboard utility)
 xmodmap:
-xmodmap: xmodmap is part of X11.
+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: startup script to configure the keyboard according to personal tastes.
 xmodmap:
-xmodmap: For more information about the X.Org Foundation (the providers of the
-xmodmap: X.Org implementation of the X Window System), see their website:
 xmodmap:
-xmodmap: http://www.x.org
 xmodmap:
 xmodmap:
 xmodmap:
diff --git a/source/x/x11/slack-desc/xmore b/source/x/x11/slack-desc/xmore
index a714db3d..c8696b87 100644
--- a/source/x/x11/slack-desc/xmore
+++ b/source/x/x11/slack-desc/xmore
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xmore: xmore
+xmore: xmore (plain text display program for the X Window System)
 xmore:
 xmore: xmore is part of X11.
 xmore:
diff --git a/source/x/x11/slack-desc/xorg-cf-files b/source/x/x11/slack-desc/xorg-cf-files
index a5f15784..343f5037 100644
--- a/source/x/x11/slack-desc/xorg-cf-files
+++ b/source/x/x11/slack-desc/xorg-cf-files
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
-xorg-cf-files: xorg-cf-files
+xorg-cf-files: xorg-cf-files (X11 config files for imake)
 xorg-cf-files:
-xorg-cf-files: xorg-cf-files is part of X11.
+xorg-cf-files: The xorg-cf-files package contains the data files for the imake
+xorg-cf-files: utility, defining the known settings for a wide variety of platforms
+xorg-cf-files: (many of which have not been verified or tested in over a decade) and
+xorg-cf-files: for many of the libraries formerly delivered in the X.Org monolithic
+xorg-cf-files: releases.
 xorg-cf-files:
-xorg-cf-files: For more information about the X.Org Foundation (the providers of the
-xorg-cf-files: X.Org implementation of the X Window System), see their website:
-xorg-cf-files:
-xorg-cf-files: http://www.x.org
 xorg-cf-files:
 xorg-cf-files:
 xorg-cf-files:
diff --git a/source/x/x11/slack-desc/xorg-docs b/source/x/x11/slack-desc/xorg-docs
index aee2a992..dfe9e249 100644
--- a/source/x/x11/slack-desc/xorg-docs
+++ b/source/x/x11/slack-desc/xorg-docs
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-xorg-docs: xorg-docs
+xorg-docs: xorg-docs (documentation for X11)
 xorg-docs:
-xorg-docs: xorg-docs is part of X11.
+xorg-docs: This package provides miscellaneous documentation for the X Window
+xorg-docs: System that doesn't better fit into other packages.
+xorg-docs:
+xorg-docs: The preferred documentation format for these documents is DocBook XML.
 xorg-docs:
-xorg-docs: For more information about the X.Org Foundation (the providers of the
-xorg-docs: X.Org implementation of the X Window System), see their website:
 xorg-docs:
-xorg-docs: http://www.x.org
 xorg-docs:
 xorg-docs:
 xorg-docs:
diff --git a/source/x/x11/slack-desc/xorg-server-xdmx b/source/x/x11/slack-desc/xorg-server-xdmx
deleted file mode 100644
index 0cfe5c8f..00000000
--- a/source/x/x11/slack-desc/xorg-server-xdmx
+++ /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------------------------------------------------------|
-xorg-server-xdmx: xorg-server-xdmx (Distributed Multi-head X server)
-xorg-server-xdmx:
-xorg-server-xdmx: Xdmx is a proxy X server that uses one or more other X servers as its
-xorg-server-xdmx: display devices.  It provides multi-head X functionality for displays
-xorg-server-xdmx: that might be located on different machines.
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
diff --git a/source/x/x11/slack-desc/xorg-sgml-doctools b/source/x/x11/slack-desc/xorg-sgml-doctools
index 1467fb82..df867004 100644
--- a/source/x/x11/slack-desc/xorg-sgml-doctools
+++ b/source/x/x11/slack-desc/xorg-sgml-doctools
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                   |-----handy-ruler------------------------------------------------------|
-xorg-sgml-doctools: xorg-sgml-doctools
+xorg-sgml-doctools: xorg-sgml-doctools (X.org documentation tools)
 xorg-sgml-doctools:
-xorg-sgml-doctools: xorg-sgml-doctools is part of X11.
-xorg-sgml-doctools:
-xorg-sgml-doctools: For more information about the X.Org Foundation (the providers of the
-xorg-sgml-doctools: X.Org implementation of the X Window System), see their website:
-xorg-sgml-doctools:
-xorg-sgml-doctools: http://www.x.org
+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: 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.
 xorg-sgml-doctools:
 xorg-sgml-doctools:
 xorg-sgml-doctools:
diff --git a/source/x/x11/slack-desc/xphelloworld b/source/x/x11/slack-desc/xphelloworld
deleted file mode 100644
index e5ae0f3b..00000000
--- a/source/x/x11/slack-desc/xphelloworld
+++ /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------------------------------------------------------|
-xphelloworld: xphelloworld
-xphelloworld:
-xphelloworld: xphelloworld is part of X11.
-xphelloworld:
-xphelloworld: For more information about the X.Org Foundation (the providers of the
-xphelloworld: X.Org implementation of the X Window System), see their website:
-xphelloworld:
-xphelloworld: http://www.x.org
-xphelloworld:
-xphelloworld:
-xphelloworld:
diff --git a/source/x/x11/slack-desc/xplsprinters b/source/x/x11/slack-desc/xplsprinters
deleted file mode 100644
index b4201593..00000000
--- a/source/x/x11/slack-desc/xplsprinters
+++ /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------------------------------------------------------|
-xplsprinters: xplsprinters
-xplsprinters:
-xplsprinters: xplsprinters is part of X11.
-xplsprinters:
-xplsprinters: For more information about the X.Org Foundation (the providers of the
-xplsprinters: X.Org implementation of the X Window System), see their website:
-xplsprinters:
-xplsprinters: http://www.x.org
-xplsprinters:
-xplsprinters:
-xplsprinters:
diff --git a/source/x/x11/slack-desc/xpr b/source/x/x11/slack-desc/xpr
index 1e7795ca..45936d40 100644
--- a/source/x/x11/slack-desc/xpr
+++ b/source/x/x11/slack-desc/xpr
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xpr: xpr
+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:
-xpr: xpr is part of X11.
 xpr:
-xpr: For more information about the X.Org Foundation (the providers of the
-xpr: X.Org implementation of the X Window System), see their website:
 xpr:
-xpr: http://www.x.org
 xpr:
 xpr:
 xpr:
diff --git a/source/x/x11/slack-desc/xprehashprinterlist b/source/x/x11/slack-desc/xprehashprinterlist
deleted file mode 100644
index 3444a5ee..00000000
--- a/source/x/x11/slack-desc/xprehashprinterlist
+++ /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------------------------------------------------------|
-xprehashprinterlist: xprehashprinterlist
-xprehashprinterlist:
-xprehashprinterlist: xprehashprinterlist is part of X11.
-xprehashprinterlist:
-xprehashprinterlist: For more information about the X.Org Foundation (the providers of the
-xprehashprinterlist: X.Org implementation of the X Window System), see their website:
-xprehashprinterlist:
-xprehashprinterlist: http://www.x.org
-xprehashprinterlist:
-xprehashprinterlist:
-xprehashprinterlist:
diff --git a/source/x/x11/slack-desc/xprop b/source/x/x11/slack-desc/xprop
index 8996f509..99788723 100644
--- a/source/x/x11/slack-desc/xprop
+++ b/source/x/x11/slack-desc/xprop
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-xprop: xprop
+xprop: xprop (displays window and font properties of an X server)
 xprop:
 xprop: xprop is part of X11.
 xprop:
diff --git a/source/x/x11/slack-desc/xproto b/source/x/x11/slack-desc/xproto
index e57551ab..1c230b1e 100644
--- a/source/x/x11/slack-desc/xproto
+++ b/source/x/x11/slack-desc/xproto
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xproto: xproto
+xproto: xproto (C prototypes for X Window System Core Protocol)
 xproto:
 xproto: xproto is part of X11.
 xproto:
diff --git a/source/x/x11/slack-desc/xproxymanagementprotocol b/source/x/x11/slack-desc/xproxymanagementprotocol
deleted file mode 100644
index a5586dc6..00000000
--- a/source/x/x11/slack-desc/xproxymanagementprotocol
+++ /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------------------------------------------------------|
-xproxymanagementprotocol: xproxymanagementprotocol
-xproxymanagementprotocol:
-xproxymanagementprotocol: xproxymanagementprotocol is part of X11.
-xproxymanagementprotocol:
-xproxymanagementprotocol: For more information about the X.Org Foundation (the providers of the
-xproxymanagementprotocol: X.Org implementation of the X Window System), see their website:
-xproxymanagementprotocol:
-xproxymanagementprotocol: http://www.x.org
-xproxymanagementprotocol:
-xproxymanagementprotocol:
-xproxymanagementprotocol:
diff --git a/source/x/x11/slack-desc/xpyb b/source/x/x11/slack-desc/xpyb
index 92baab77..4d96cc27 100644
--- a/source/x/x11/slack-desc/xpyb
+++ b/source/x/x11/slack-desc/xpyb
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-    |-----handy-ruler-------------------------------------------------------|
-xpyb: xpyb
+    |-----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:
-xpyb: xpyb is part of X11.
 xpyb:
-xpyb: For more information about the X.Org Foundation (the providers of the
-xpyb: X.Org implementation of the X Window System), see their website:
 xpyb:
-xpyb: http://www.x.org
 xpyb:
 xpyb:
 xpyb:
diff --git a/source/x/x11/slack-desc/xrandr b/source/x/x11/slack-desc/xrandr
index 8f158dd0..059fe1b3 100644
--- a/source/x/x11/slack-desc/xrandr
+++ b/source/x/x11/slack-desc/xrandr
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xrandr: xrandr
+xrandr: xrandr (X11 RandR utility)
+xrandr:
+xrandr: Primitive command line interface to X11 Resize, Rotate, and Reflect
+xrandr: (RandR) extension
+xrandr:
 xrandr:
-xrandr: xrandr is part of X11.
 xrandr:
-xrandr: For more information about the X.Org Foundation (the providers of the
-xrandr: X.Org implementation of the X Window System), see their website:
 xrandr:
-xrandr: http://www.x.org
 xrandr:
 xrandr:
 xrandr:
diff --git a/source/x/x11/slack-desc/xrdb b/source/x/x11/slack-desc/xrdb
index 26ea4786..9adef974 100644
--- a/source/x/x11/slack-desc/xrdb
+++ b/source/x/x11/slack-desc/xrdb
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-xrdb: xrdb
+xrdb: xrdb (X server resource database utility)
 xrdb:
 xrdb: xrdb is part of X11.
 xrdb:
diff --git a/source/x/x11/slack-desc/xrefresh b/source/x/x11/slack-desc/xrefresh
index 65e7140c..f641dcf8 100644
--- a/source/x/x11/slack-desc/xrefresh
+++ b/source/x/x11/slack-desc/xrefresh
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xrefresh: xrefresh
+xrefresh: xrefresh (refresh all or part of an X screen)
 xrefresh:
 xrefresh: xrefresh is part of X11.
 xrefresh:
diff --git a/source/x/x11/slack-desc/xrx b/source/x/x11/slack-desc/xrx
deleted file mode 100644
index 3a6e369c..00000000
--- a/source/x/x11/slack-desc/xrx
+++ /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------------------------------------------------------|
-xrx: xrx
-xrx:
-xrx: xrx is part of X11.
-xrx:
-xrx: For more information about the X.Org Foundation (the providers of the
-xrx: X.Org implementation of the X Window System), see their website:
-xrx:
-xrx: http://www.x.org
-xrx:
-xrx:
-xrx:
diff --git a/source/x/x11/slack-desc/xscope b/source/x/x11/slack-desc/xscope
index 5008a745..a513cba6 100644
--- a/source/x/x11/slack-desc/xscope
+++ b/source/x/x11/slack-desc/xscope
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xscope: xscope
+xscope: xscope (program to monitor X11/Client conversations)
 xscope:
 xscope: xscope is part of X11.
 xscope:
diff --git a/source/x/x11/slack-desc/xset b/source/x/x11/slack-desc/xset
index e434079c..da54a274 100644
--- a/source/x/x11/slack-desc/xset
+++ b/source/x/x11/slack-desc/xset
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-xset: xset
+xset: xset (get and set various preferences and properties)
+xset:
+xset: xset is a command line utility to get and set various preferences
+xset: and properties for the current session.
+xset:
 xset:
-xset: xset is part of X11.
 xset:
-xset: For more information about the X.Org Foundation (the providers of the
-xset: X.Org implementation of the X Window System), see their website:
 xset:
-xset: http://www.x.org
 xset:
 xset:
 xset:
diff --git a/source/x/x11/slack-desc/xsetmode b/source/x/x11/slack-desc/xsetmode
deleted file mode 100644
index b727c3e9..00000000
--- a/source/x/x11/slack-desc/xsetmode
+++ /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------------------------------------------------------|
-xsetmode: xsetmode
-xsetmode:
-xsetmode: xsetmode is part of X11.
-xsetmode:
-xsetmode: For more information about the X.Org Foundation (the providers of the
-xsetmode: X.Org implementation of the X Window System), see their website:
-xsetmode:
-xsetmode: http://www.x.org
-xsetmode:
-xsetmode:
-xsetmode:
diff --git a/source/x/x11/slack-desc/xsetroot b/source/x/x11/slack-desc/xsetroot
index 8a9a4be3..569396ae 100644
--- a/source/x/x11/slack-desc/xsetroot
+++ b/source/x/x11/slack-desc/xsetroot
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xsetroot: xsetroot
+xsetroot: xsetroot (root window parameter setting utility for X)
 xsetroot:
 xsetroot: xsetroot is part of X11.
 xsetroot:
diff --git a/source/x/x11/slack-desc/xsm b/source/x/x11/slack-desc/xsm
index 8fe6ba3c..0034f323 100644
--- a/source/x/x11/slack-desc/xsm
+++ b/source/x/x11/slack-desc/xsm
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xsm: xsm
+xsm: xsm (X11 Session Manager)
 xsm:
 xsm: xsm is part of X11.
 xsm:
diff --git a/source/x/x11/slack-desc/xstdcmap b/source/x/x11/slack-desc/xstdcmap
index b1bd5e6a..f659e758 100644
--- a/source/x/x11/slack-desc/xstdcmap
+++ b/source/x/x11/slack-desc/xstdcmap
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xstdcmap: xstdcmap
+xstdcmap: xstdcmap (X11 color utility)
 xstdcmap:
-xstdcmap: xstdcmap is part of X11.
+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: startup script to create standard colormap definitions in order to
+xstdcmap: facilitate sharing of scarce colormap resources among clients using
+xstdcmap: PseudoColor visuals.
 xstdcmap:
-xstdcmap: For more information about the X.Org Foundation (the providers of the
-xstdcmap: X.Org implementation of the X Window System), see their website:
-xstdcmap:
-xstdcmap: http://www.x.org
 xstdcmap:
 xstdcmap:
 xstdcmap:
diff --git a/source/x/x11/slack-desc/xtrans b/source/x/x11/slack-desc/xtrans
index f7ea71c3..26c4866a 100644
--- a/source/x/x11/slack-desc/xtrans
+++ b/source/x/x11/slack-desc/xtrans
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xtrans: xtrans
+xtrans: xtrans (X network transport library)
 xtrans:
-xtrans: xtrans is part of X11.
+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: libX11, libICE, the X font server, and related components.
 xtrans:
-xtrans: For more information about the X.Org Foundation (the providers of the
-xtrans: X.Org implementation of the X Window System), see their website:
 xtrans:
-xtrans: http://www.x.org
 xtrans:
 xtrans:
 xtrans:
diff --git a/source/x/x11/slack-desc/xtrap b/source/x/x11/slack-desc/xtrap
deleted file mode 100644
index bdf77e43..00000000
--- a/source/x/x11/slack-desc/xtrap
+++ /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------------------------------------------------------|
-xtrap: xtrap
-xtrap:
-xtrap: xtrap is part of X11.
-xtrap:
-xtrap: For more information about the X.Org Foundation (the providers of the
-xtrap: X.Org implementation of the X Window System), see their website:
-xtrap:
-xtrap: http://www.x.org
-xtrap:
-xtrap:
-xtrap:
diff --git a/source/x/x11/slack-desc/xvidtune b/source/x/x11/slack-desc/xvidtune
index bdadf298..d55fae9f 100644
--- a/source/x/x11/slack-desc/xvidtune
+++ b/source/x/x11/slack-desc/xvidtune
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xvidtune: xvidtune
+xvidtune: xvidtune (X11 video utility)
+xvidtune:
+xvidtune: xvidtune is a client interface to the X server video mode extension
+xvidtune: (XFree86-VidModeExtension).
+xvidtune:
 xvidtune:
-xvidtune: xvidtune is part of X11.
 xvidtune:
-xvidtune: For more information about the X.Org Foundation (the providers of the
-xvidtune: X.Org implementation of the X Window System), see their website:
 xvidtune:
-xvidtune: http://www.x.org
 xvidtune:
 xvidtune:
 xvidtune:
diff --git a/source/x/x11/slack-desc/xvinfo b/source/x/x11/slack-desc/xvinfo
index 54a44c8a..84f50e6f 100644
--- a/source/x/x11/slack-desc/xvinfo
+++ b/source/x/x11/slack-desc/xvinfo
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-xvinfo: xvinfo
+xvinfo: xvinfo (X11 X-Video utility)
+xvinfo:
+xvinfo: xvinfo prints out the capabilities of any video adaptors associated
+xvinfo: with the display that are accessible through the X-Video extension.
+xvinfo:
 xvinfo:
-xvinfo: xvinfo is part of X11.
 xvinfo:
-xvinfo: For more information about the X.Org Foundation (the providers of the
-xvinfo: X.Org implementation of the X Window System), see their website:
 xvinfo:
-xvinfo: http://www.x.org
 xvinfo:
 xvinfo:
 xvinfo:
diff --git a/source/x/x11/slack-desc/xwd b/source/x/x11/slack-desc/xwd
index 6b2450a0..8230f336 100644
--- a/source/x/x11/slack-desc/xwd
+++ b/source/x/x11/slack-desc/xwd
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
-xwd: xwd
+xwd: xwd (dump an image of an X window)
 xwd:
 xwd: xwd is part of X11.
 xwd:
diff --git a/source/x/x11/slack-desc/xwininfo b/source/x/x11/slack-desc/xwininfo
index 03e11ddf..9545fbfa 100644
--- a/source/x/x11/slack-desc/xwininfo
+++ b/source/x/x11/slack-desc/xwininfo
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-xwininfo: xwininfo
+xwininfo: xwininfo (prints information about windows on an X server)
+xwininfo:
+xwininfo: Various information is displayed depending on which options are
+xwininfo: selected.
+xwininfo:
 xwininfo:
-xwininfo: xwininfo is part of X11.
 xwininfo:
-xwininfo: For more information about the X.Org Foundation (the providers of the
-xwininfo: X.Org implementation of the X Window System), see their website:
 xwininfo:
-xwininfo: http://www.x.org
 xwininfo:
 xwininfo:
 xwininfo:
diff --git a/source/x/x11/slack-desc/xwud b/source/x/x11/slack-desc/xwud
index f0c22d34..6ae90864 100644
--- a/source/x/x11/slack-desc/xwud
+++ b/source/x/x11/slack-desc/xwud
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-xwud: xwud
+xwud: xwud (X screen dump viewer)
+xwud:
+xwud: xwud allows X users to display in a window an image saved in a
+xwud: specially formatted dump file, such as produced by xwd.
+xwud:
 xwud:
-xwud: xwud is part of X11.
 xwud:
-xwud: For more information about the X.Org Foundation (the providers of the
-xwud: X.Org implementation of the X Window System), see their website:
 xwud:
-xwud: http://www.x.org
 xwud:
 xwud:
 xwud:
diff --git a/source/x/x11/src/get-xf86-video-nouveau.sh b/source/x/x11/src/get-xf86-video-nouveau.sh
index 72d3efd3..9a21febd 100755
--- a/source/x/x11/src/get-xf86-video-nouveau.sh
+++ b/source/x/x11/src/get-xf86-video-nouveau.sh
@@ -1,8 +1,14 @@
 # Pull a stable branch + patches
 BRANCH=master
 
-rm -rf xf86-video-nouveau
-git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+#rm -rf xf86-video-nouveau
+if [ -d xf86-video-nouveau ]; then
+  cd xf86-video-nouveau
+  git pull -f
+  cd ..
+else
+  git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+fi
 
 # use master branch
 #( cd xf86-video-nouveau 
diff --git a/source/x/xaw3d/pull-xaw3d.sh b/source/x/xaw3d/pull-xaw3d.sh
deleted file mode 100755
index 96141a6d..00000000
--- a/source/x/xaw3d/pull-xaw3d.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-rm -rf xaw3d
-git clone git://gitorious.org/xaw3d/xaw3d.git
-( cd xaw3d && rm -rf .git* )
-mv xaw3d xaw3d-$(date +%Y%m%d)git
-tar cf xaw3d-$(date +%Y%m%d)git.tar xaw3d-$(date +%Y%m%d)git
-xz -9 xaw3d-$(date +%Y%m%d)git.tar
-
diff --git a/source/x/xaw3d/slack-desc b/source/x/xaw3d/slack-desc
deleted file mode 100644
index 75ce0e1d..00000000
--- a/source/x/xaw3d/slack-desc
+++ /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------------------------------------------------------|
-xaw3d: xaw3d (3D version of libXaw)
-xaw3d:
-xaw3d: Xaw3d is a set of 3D widgets by Kaleb S. Keithley based on the Athena
-xaw3d: Widget set.  The Three-D Athena may be used as a replacement for the
-xaw3d: Athena (Xaw) Widget set -- you may relink almost any Athena Widget
-xaw3d: based application and obtain a three dimensional appearance on some of
-xaw3d: the widgets.  You can also replace your shared libXaw with libXaw3d
-xaw3d: and obtain the three dimensional appearance without even relinking.
-xaw3d:
-xaw3d:
-xaw3d:
diff --git a/source/x/xaw3d/xaw3d.SlackBuild b/source/x/xaw3d/xaw3d.SlackBuild
deleted file mode 100755
index 1574d7f3..00000000
--- a/source/x/xaw3d/xaw3d.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 2011  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-PKGNAM=xaw3d
-VERSION=${VERSION:-20110415git}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686" 
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-xaw3d
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $TMP/xaw3d-$VERSION
-tar xvf $CWD/xaw3d-$VERSION.tar.?z* || exit 1
-cd xaw3d-$VERSION/xc || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-cd lib/Xaw3d
-ln -s .. X11
-xmkmf
-make CCOPTIONS="$SLKCFLAGS -I." || exit 1
-make install DESTDIR=$PKG
-
-strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.*
-# Make compat symlinks.  For whatever reason, Xaw3d has had more random
-# numbers assigned to it over the years than about anything, so we need
-# to make links that work for at least .6 and .8 in addition to .7.
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libXaw3d.so.7 libXaw3d.so.8
-  ln -sf libXaw3d.so.7 libXaw3d.so.6
-)
-mkdir -p $PKG/usr/doc/Xaw3d-$VERSION
-cp -a README.XAW3D $PKG/usr/doc/Xaw3d-$VERSION
-chmod 644 $PKG/usr/doc/Xaw3d-$VERSION/README.XAW3D
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c y $TMP/xaw3d-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
index d3b96542..0b5b65dc 100755
--- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
+++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=xdg-user-dirs
-VERSION=${VERSION:-0.13}
+VERSION=${VERSION:-0.14}
 BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
@@ -89,6 +89,14 @@ cp -a \
   AUTHORS COPYING* INSTALL NEWS README* TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/x/xterm/doinst.sh b/source/x/xterm/doinst.sh
new file mode 100644
index 00000000..1f8ff67d
--- /dev/null
+++ b/source/x/xterm/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 863ccae4..392d3053 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -88,12 +88,19 @@ CFLAGS="$SLKCFLAGS" \
   --enable-wide-chars \
   --enable-88-color \
   --enable-256-color \
+  --with-icon-theme=hicolor \
+  --with-icondir=/usr/share/icons \
+  --with-pixmapdir=/usr/share/pixmaps \
   --build=$ARCH-slackware-linux
 
 # Build and install:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Not sure why "make install" doesn't do this:
+mkdir -p $PKG/usr/share/applications
+cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
+
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -129,6 +136,7 @@ cp -a \
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
author	Patrick J Volkerding <volkerdi@slackware.com>	2012-09-26 01:10:42 +0000
committer	Eric Hameleers <alien@slackware.com>	2018-05-31 22:51:55 +0200
commit	9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
tree	b428a16618e36ed864a8d76ea3435e19a452bf90 /source/x
parent	75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
download	current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz